vlc | branch: master | Francois Cartegnie <[email protected]> | Thu Aug 16 19:35:00 2012 +0200| [a73b86a582109d869c60f9381a2e31a7c7657fa8] | committer: Francois Cartegnie
Qt: rename even ID offsets as what they are > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=a73b86a582109d869c60f9381a2e31a7c7657fa8 --- modules/gui/qt4/dialogs/help.hpp | 4 ++-- modules/gui/qt4/dialogs/messages.cpp | 2 +- modules/gui/qt4/dialogs_provider.hpp | 4 ++-- modules/gui/qt4/input_manager.hpp | 6 +++--- modules/gui/qt4/qt4.hpp | 8 ++++---- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/modules/gui/qt4/dialogs/help.hpp b/modules/gui/qt4/dialogs/help.hpp index f5dfdfa..bd09ae9 100644 --- a/modules/gui/qt4/dialogs/help.hpp +++ b/modules/gui/qt4/dialogs/help.hpp @@ -65,8 +65,8 @@ public slots: #ifdef UPDATE_CHECK -static const int UDOkEvent = QEvent::User + DialogEventType + 21; -static const int UDErrorEvent = QEvent::User + DialogEventType + 22; +static const int UDOkEvent = QEvent::User + DialogEventTypeOffset + 21; +static const int UDErrorEvent = QEvent::User + DialogEventTypeOffset + 22; class UpdateDialog : public QVLCFrame, public Singleton<UpdateDialog> { diff --git a/modules/gui/qt4/dialogs/messages.cpp b/modules/gui/qt4/dialogs/messages.cpp index 4071346..8e7ad31 100644 --- a/modules/gui/qt4/dialogs/messages.cpp +++ b/modules/gui/qt4/dialogs/messages.cpp @@ -44,7 +44,7 @@ #include <assert.h> enum { - MsgEvent_Type = QEvent::User + MsgEventType + 1, + MsgEvent_Type = QEvent::User + MsgEventTypeOffset + 1, }; class MsgEvent : public QEvent diff --git a/modules/gui/qt4/dialogs_provider.hpp b/modules/gui/qt4/dialogs_provider.hpp index 7429057..57cc38d 100644 --- a/modules/gui/qt4/dialogs_provider.hpp +++ b/modules/gui/qt4/dialogs_provider.hpp @@ -58,10 +58,10 @@ enum { }; enum { - DialogEvent_Type = QEvent::User + DialogEventType + 1, + DialogEvent_Type = QEvent::User + DialogEventTypeOffset + 1, //PLUndockEvent_Type = QEvent::User + DialogEventType + 2; //PLDockEvent_Type = QEvent::User + DialogEventType + 3; - SetVideoOnTopEvent_Type = QEvent::User + DialogEventType + 4, + SetVideoOnTopEvent_Type = QEvent::User + DialogEventTypeOffset + 4, }; class QEvent; diff --git a/modules/gui/qt4/input_manager.hpp b/modules/gui/qt4/input_manager.hpp index c3a6cd3..10e9a9e 100644 --- a/modules/gui/qt4/input_manager.hpp +++ b/modules/gui/qt4/input_manager.hpp @@ -40,7 +40,7 @@ #include <QEvent> enum { - PositionUpdate_Type = QEvent::User + IMEventType + 1, + PositionUpdate_Type = QEvent::User + IMEventTypeOffset + 1, ItemChanged_Type, ItemStateChanged_Type, ItemTitleChanged_Type, @@ -63,7 +63,7 @@ enum { EPGEvent_Type, /* SignalChanged_Type, */ - FullscreenControlToggle_Type = QEvent::User + IMEventType + 20, + FullscreenControlToggle_Type = QEvent::User + IMEventTypeOffset + 20, FullscreenControlShow_Type, FullscreenControlHide_Type, FullscreenControlPlanHide_Type, @@ -103,7 +103,7 @@ class PLEvent : public QEvent public: enum PLEventTypes { - PLItemAppended_Type = QEvent::User + PLEventType + 1, + PLItemAppended_Type = QEvent::User + PLEventTypeOffset + 1, PLItemRemoved_Type, LeafToParent_Type, PLEmpty_Type diff --git a/modules/gui/qt4/qt4.hpp b/modules/gui/qt4/qt4.hpp index 65d7a1a..b048e5a 100644 --- a/modules/gui/qt4/qt4.hpp +++ b/modules/gui/qt4/qt4.hpp @@ -43,10 +43,10 @@ #define HAS_QT47 ( QT_VERSION >= 0x040700 ) enum { - DialogEventType = 0, - IMEventType = 100, - PLEventType = 200, - MsgEventType = 300, + DialogEventTypeOffset = 0, + IMEventTypeOffset = 100, + PLEventTypeOffset = 200, + MsgEventTypeOffset = 300, }; enum{ _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
