[Qt] move some static const int to enum

diff --git a/modules/gui/qt4/components/extended_panels.hpp b/modules/gui/qt4/components/extended_panels.hpp
index aaffd02ec838419e2b6237b902cb23e58eb90c02..41a18d1ce012c9c5ffa9c2e94272ac684ee1cb30 100644 (file)
--- a/modules/gui/qt4/components/extended_panels.hpp
+++ b/modules/gui/qt4/components/extended_panels.hpp
@@ -37,7 +37,6 @@
 #include "ui/video_effects.h"
 #include "ui/v4l2.h"
 
-
 #include <QTabWidget>
 
 #define BANDS EQZ_BANDS_MAX

diff --git a/modules/gui/qt4/components/playlist/playlist_model.hpp b/modules/gui/qt4/components/playlist/playlist_model.hpp
index a097fa63ccde04b3970be195344bce27c994e0c1..3f2d5412458844359459fffcbf33d93ba08d7768 100644 (file)
--- a/modules/gui/qt4/components/playlist/playlist_model.hpp
+++ b/modules/gui/qt4/components/playlist/playlist_model.hpp
@@ -50,10 +50,12 @@ class PLItem;
 #define DEPTH_PL -1
 #define DEPTH_SEL 1
 
-static const int ItemUpdate_Type = QEvent::User + PLEventType + 2;
-static const int ItemDelete_Type = QEvent::User + PLEventType + 3;
-static const int ItemAppend_Type = QEvent::User + PLEventType + 4;
-static const int PLUpdate_Type   = QEvent::User + PLEventType + 5;
+enum {
+    ItemUpdate_Type = QEvent::User + PLEventType + 2,
+    ItemDelete_Type = QEvent::User + PLEventType + 3,
+    ItemAppend_Type = QEvent::User + PLEventType + 4,
+    PLUpdate_Type   = QEvent::User + PLEventType + 5,
+};
 
 class PLEvent : public QEvent
 {

diff --git a/modules/gui/qt4/components/simple_preferences.hpp b/modules/gui/qt4/components/simple_preferences.hpp
index e3414ab7ccff25f0703837fd97d715f7e0eb7f9f..8ec1676f90b09f681188a330277011b844f23f0a 100644 (file)
--- a/modules/gui/qt4/components/simple_preferences.hpp
+++ b/modules/gui/qt4/components/simple_preferences.hpp
@@ -55,9 +55,9 @@ enum {
 enum {
     CachingCustom = 0,
     CachingLowest = 100,
-    CachingLow = 200,
+    CachingLow    = 200,
     CachingNormal = 300,
-    CachingHigh = 400,
+    CachingHigh   = 400,
     CachingHigher = 500
 };
 

diff --git a/modules/gui/qt4/input_manager.hpp b/modules/gui/qt4/input_manager.hpp
index 609790d918fac6bfb266437f64cb068df5efefca..9cda65c9a78c9e6dec370b0606c33eb5c010667d 100644 (file)
--- a/modules/gui/qt4/input_manager.hpp
+++ b/modules/gui/qt4/input_manager.hpp
@@ -36,21 +36,23 @@
 #include <QObject>
 #include <QEvent>
 
-static int const PositionUpdate_Type     = QEvent::User + IMEventType + 1;
-static int const ItemChanged_Type        = QEvent::User + IMEventType + 2;
-static int const ItemStateChanged_Type   = QEvent::User + IMEventType + 3;
-static int const ItemTitleChanged_Type   = QEvent::User + IMEventType + 4;
-static int const ItemRateChanged_Type    = QEvent::User + IMEventType + 5;
-static int const VolumeChanged_Type      = QEvent::User + IMEventType + 6;
-static int const ItemSpuChanged_Type     = QEvent::User + IMEventType + 7;
-static int const ItemTeletextChanged_Type= QEvent::User + IMEventType + 8;
-static int const InterfaceVoutUpdate_Type= QEvent::User + IMEventType + 9;
-static int const StatisticsUpdate_Type   = QEvent::User + IMEventType + 10;
-
-static int const FullscreenControlToggle_Type = QEvent::User + IMEventType + 11;
-static int const FullscreenControlShow_Type = QEvent::User + IMEventType + 12;
-static int const FullscreenControlHide_Type = QEvent::User + IMEventType + 13;
-static int const FullscreenControlPlanHide_Type = QEvent::User + IMEventType + 14;
+enum {
+    PositionUpdate_Type = QEvent::User + IMEventType + 1,
+    ItemChanged_Type,
+    ItemStateChanged_Type,
+    ItemTitleChanged_Type,
+    ItemRateChanged_Type,
+    VolumeChanged_Type,
+    ItemSpuChanged_Type,
+    ItemTeletextChanged_Type,
+    InterfaceVoutUpdate_Type,
+    StatisticsUpdate_Type,
+
+    FullscreenControlToggle_Type = QEvent::User + IMEventType + 20,
+    FullscreenControlShow_Type,
+    FullscreenControlHide_Type,
+    FullscreenControlPlanHide_Type,
+};
 
 class IMEvent : public QEvent
 {
@@ -102,7 +104,7 @@ private:
     void UpdateTeletext();
     void UpdateArt();
     void UpdateVout();
-    void UpdateStats(); // FIXME, remove from this file.
+    void UpdateStats();
 
     void AtoBLoop( int );
 

diff --git a/modules/gui/qt4/main_interface.hpp b/modules/gui/qt4/main_interface.hpp
index 8be4405576bc65a00824ca42ed50e820a4ac3596..25b84e25b88be8e8d0e39eabdaea86ae93fde7cc 100644 (file)
--- a/modules/gui/qt4/main_interface.hpp
+++ b/modules/gui/qt4/main_interface.hpp
@@ -49,7 +49,6 @@ class FullscreenControllerWidget;
 class SpeedControlWidget;
 class QMenu;
 class QSize;
-//class QDockWidet;
 
 enum {
     CONTROLS_HIDDEN = 0x0,

diff --git a/modules/gui/qt4/qt4.hpp b/modules/gui/qt4/qt4.hpp
index e4adaba3cd8e46b84a732d1c419604fd0f8cf169..7b75944f661d711df796172e5f288825a38b79ef 100755 (executable)
--- a/modules/gui/qt4/qt4.hpp
+++ b/modules/gui/qt4/qt4.hpp
@@ -37,9 +37,24 @@
 
 #define HAS_QT43 ( QT_VERSION >= 0x040300 )
 
-#define QT_NORMAL_MODE 0
-#define QT_ALWAYS_VIDEO_MODE 1
-#define QT_MINIMAL_MODE 2
+enum {
+    QT_NORMAL_MODE = 0,
+    QT_ALWAYS_VIDEO_MODE,
+    QT_MINIMAL_MODE
+};
+
+enum {
+    DialogEventType = 0,
+    IMEventType     = 100,
+    PLEventType     = 200
+};
+
+enum {
+    DialogEvent_Type = QEvent::User + DialogEventType + 1,
+    //PLUndockEvent_Type = QEvent::User + DialogEventType + 2;
+    //PLDockEvent_Type = QEvent::User + DialogEventType + 3;
+    SetVideoOnTopEvent_Type = QEvent::User + DialogEventType + 4,
+};
 
 class QApplication;
 class QMenu;
@@ -123,12 +138,6 @@ struct intf_sys_t
 
 #define getSettings() p_intf->p_sys->mainSettings
 
-enum {
-    DialogEventType = 0,
-    IMEventType     = 100,
-    PLEventType     = 200
-};
-
 
 #include <QString>
 /* Replace separators on Windows because Qt is always using / */
@@ -153,11 +162,6 @@ static inline QString removeTrailingSlash( QString s )
 
 #define toNativeSepNoSlash( a ) toNativeSeparators( removeTrailingSlash( a ) )
 
-static const int DialogEvent_Type = QEvent::User + DialogEventType + 1;
-//static const int PLUndockEvent_Type = QEvent::User + DialogEventType + 2;
-//static const int PLDockEvent_Type = QEvent::User + DialogEventType + 3;
-static const int SetVideoOnTopEvent_Type = QEvent::User + DialogEventType + 4;
-
 class DialogEvent : public QEvent
 {
 public: