Changeset 121 for smplayer/vendor/current/src/floatingwidget.h

Timestamp:

Mar 15, 2012, 5:14:10 PM (13 years ago)

Author:

Silvan Scherrer

Message:

SMPlayer 0.7.1: vendor update

File:

• smplayer/vendor/current/src/floatingwidget.h (modified) (5 diffs)

smplayer/vendor/current/src/floatingwidget.h

@@ -1 +1 @@
 /*  smplayer, GUI front-end for mplayer.
-    Copyright (C) 2006-2011 Ricardo Villalba <rvm@escomposlinux.org>
+    Copyright (C) 2006-2012 Ricardo Villalba <rvm@users.sourceforge.net>
 
     This program is free software; you can redistribute it and/or modify
@@ -24 +24 @@
 
 class QToolBar;
+
+#if QT_VERSION < 0x040600
+#define OLD_ANIMATION
+#endif
+
+#ifndef OLD_ANIMATION
+class QPropertyAnimation;
+#endif
 
 class FloatingWidget : public QWidget
@@ -59 +67 @@
 
 private slots:
+#ifdef OLD_ANIMATION
         void animate();
+#endif
         void checkUnderMouse();
 
@@ -65 +75 @@
         // Animation variables
         bool _animated;
+#ifdef OLD_ANIMATION
         QTimer * animation_timer;
+#endif
         int final_y;
         int current_y;
@@ -74 +86 @@
 
         int _margin;
+
+#ifndef OLD_ANIMATION
+        QPropertyAnimation * animation;
+#endif
+
 };