Commit d0ed93fe authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

[Qt] move some static const int to enum

parent d7f3af84
...@@ -37,7 +37,6 @@ ...@@ -37,7 +37,6 @@
#include "ui/video_effects.h" #include "ui/video_effects.h"
#include "ui/v4l2.h" #include "ui/v4l2.h"
#include <QTabWidget> #include <QTabWidget>
#define BANDS EQZ_BANDS_MAX #define BANDS EQZ_BANDS_MAX
......
...@@ -50,10 +50,12 @@ class PLItem; ...@@ -50,10 +50,12 @@ class PLItem;
#define DEPTH_PL -1 #define DEPTH_PL -1
#define DEPTH_SEL 1 #define DEPTH_SEL 1
static const int ItemUpdate_Type = QEvent::User + PLEventType + 2; enum {
static const int ItemDelete_Type = QEvent::User + PLEventType + 3; ItemUpdate_Type = QEvent::User + PLEventType + 2,
static const int ItemAppend_Type = QEvent::User + PLEventType + 4; ItemDelete_Type = QEvent::User + PLEventType + 3,
static const int PLUpdate_Type = QEvent::User + PLEventType + 5; ItemAppend_Type = QEvent::User + PLEventType + 4,
PLUpdate_Type = QEvent::User + PLEventType + 5,
};
class PLEvent : public QEvent class PLEvent : public QEvent
{ {
......
...@@ -36,21 +36,23 @@ ...@@ -36,21 +36,23 @@
#include <QObject> #include <QObject>
#include <QEvent> #include <QEvent>
static int const PositionUpdate_Type = QEvent::User + IMEventType + 1; enum {
static int const ItemChanged_Type = QEvent::User + IMEventType + 2; PositionUpdate_Type = QEvent::User + IMEventType + 1,
static int const ItemStateChanged_Type = QEvent::User + IMEventType + 3; ItemChanged_Type,
static int const ItemTitleChanged_Type = QEvent::User + IMEventType + 4; ItemStateChanged_Type,
static int const ItemRateChanged_Type = QEvent::User + IMEventType + 5; ItemTitleChanged_Type,
static int const VolumeChanged_Type = QEvent::User + IMEventType + 6; ItemRateChanged_Type,
static int const ItemSpuChanged_Type = QEvent::User + IMEventType + 7; VolumeChanged_Type,
static int const ItemTeletextChanged_Type= QEvent::User + IMEventType + 8; ItemSpuChanged_Type,
static int const InterfaceVoutUpdate_Type= QEvent::User + IMEventType + 9; ItemTeletextChanged_Type,
static int const StatisticsUpdate_Type = QEvent::User + IMEventType + 10; InterfaceVoutUpdate_Type,
StatisticsUpdate_Type,
static int const FullscreenControlToggle_Type = QEvent::User + IMEventType + 11;
static int const FullscreenControlShow_Type = QEvent::User + IMEventType + 12; FullscreenControlToggle_Type = QEvent::User + IMEventType + 20,
static int const FullscreenControlHide_Type = QEvent::User + IMEventType + 13; FullscreenControlShow_Type,
static int const FullscreenControlPlanHide_Type = QEvent::User + IMEventType + 14; FullscreenControlHide_Type,
FullscreenControlPlanHide_Type,
};
class IMEvent : public QEvent class IMEvent : public QEvent
{ {
...@@ -102,7 +104,7 @@ private: ...@@ -102,7 +104,7 @@ private:
void UpdateTeletext(); void UpdateTeletext();
void UpdateArt(); void UpdateArt();
void UpdateVout(); void UpdateVout();
void UpdateStats(); // FIXME, remove from this file. void UpdateStats();
void AtoBLoop( int ); void AtoBLoop( int );
......
...@@ -49,7 +49,6 @@ class FullscreenControllerWidget; ...@@ -49,7 +49,6 @@ class FullscreenControllerWidget;
class SpeedControlWidget; class SpeedControlWidget;
class QMenu; class QMenu;
class QSize; class QSize;
//class QDockWidet;
enum { enum {
CONTROLS_HIDDEN = 0x0, CONTROLS_HIDDEN = 0x0,
......
...@@ -37,9 +37,24 @@ ...@@ -37,9 +37,24 @@
#define HAS_QT43 ( QT_VERSION >= 0x040300 ) #define HAS_QT43 ( QT_VERSION >= 0x040300 )
#define QT_NORMAL_MODE 0 enum {
#define QT_ALWAYS_VIDEO_MODE 1 QT_NORMAL_MODE = 0,
#define QT_MINIMAL_MODE 2 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 QApplication;
class QMenu; class QMenu;
...@@ -123,12 +138,6 @@ struct intf_sys_t ...@@ -123,12 +138,6 @@ struct intf_sys_t
#define getSettings() p_intf->p_sys->mainSettings #define getSettings() p_intf->p_sys->mainSettings
enum {
DialogEventType = 0,
IMEventType = 100,
PLEventType = 200
};
#include <QString> #include <QString>
/* Replace separators on Windows because Qt is always using / */ /* Replace separators on Windows because Qt is always using / */
...@@ -153,11 +162,6 @@ static inline QString removeTrailingSlash( QString s ) ...@@ -153,11 +162,6 @@ static inline QString removeTrailingSlash( QString s )
#define toNativeSepNoSlash( a ) toNativeSeparators( removeTrailingSlash( a ) ) #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 class DialogEvent : public QEvent
{ {
public: public:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment