[vlmc-devel] commit: Removing non Q_OBJECT class from CMakeLists + fixing UserType in GraphicsAudioItem ( Hugo Beauzée-Luyssen )

[git at videolan.org]

vlmc | branch: master | Hugo Beauzée-Luyssen <beauze.h at gmail.com> | Mon Sep  6 18:36:58 2010 +0200| [3c5fdfa0d6da2075641ea8a39f32b9ca1249e17f] | committer: Hugo Beauzée-Luyssen 

Removing non Q_OBJECT class from CMakeLists + fixing UserType in GraphicsAudioItem

> http://git.videolan.org/gitweb.cgi/vlmc.git/?a=commit;h=3c5fdfa0d6da2075641ea8a39f32b9ca1249e17f
---

 src/CMakeLists.txt                              |    7 -------
 src/Gui/effectsengine/EffectInstanceListModel.h |    1 -
 src/Gui/timeline/GraphicsAudioItem.h            |    3 +--
 src/Gui/timeline/GraphicsMovieItem.h            |    1 -
 4 files changed, 1 insertions(+), 11 deletions(-)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 0cc680d..4362fae 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -60,9 +60,6 @@ ENDIF(WIN32)
 
 SET (VLMC_HDRS
     EffectsEngine/EffectsEngine.h
-    EffectsEngine/Effect.h
-    EffectsEngine/EffectUser.h
-    EffectsEngine/EffectInstance.h
     EffectsEngine/EffectSettingValue.h
     Library/Library.h
     Library/MediaContainer.h
@@ -231,7 +228,6 @@ ELSE(NOT WITH_GUI)
         Gui/UndoStack.h
         Gui/WorkflowFileRendererDialog.h
         Gui/effectsengine/EffectInstanceWidget.h
-        Gui/effectsengine/EffectInstanceListModel.h
         Gui/effectsengine/EffectsList.h
         Gui/effectsengine/EffectsListView.h
         Gui/effectsengine/EffectStack.h
@@ -270,10 +266,7 @@ ELSE(NOT WITH_GUI)
         Gui/settings/StringWidget.h
         Gui/timeline/AbstractGraphicsItem.h
         Gui/timeline/AbstractGraphicsMediaItem.h
-        Gui/timeline/GraphicsAudioItem.h 
         Gui/timeline/GraphicsCursorItem.h
-        Gui/timeline/GraphicsEffectItem.h 
-        Gui/timeline/GraphicsMovieItem.h 
         Gui/timeline/GraphicsTrack.h
         Gui/timeline/Timeline.h
         Gui/timeline/TracksControls.h
diff --git a/src/Gui/effectsengine/EffectInstanceListModel.h b/src/Gui/effectsengine/EffectInstanceListModel.h
index e5f8456..14e18a9 100644
--- a/src/Gui/effectsengine/EffectInstanceListModel.h
+++ b/src/Gui/effectsengine/EffectInstanceListModel.h
@@ -26,7 +26,6 @@
 #include "EffectsEngine.h"
 class   EffectUser;
 
-
 #include <QAbstractListModel>
 
 class EffectInstanceListModel : public QAbstractListModel
diff --git a/src/Gui/timeline/GraphicsAudioItem.h b/src/Gui/timeline/GraphicsAudioItem.h
index 346a6ed..125c9f5 100644
--- a/src/Gui/timeline/GraphicsAudioItem.h
+++ b/src/Gui/timeline/GraphicsAudioItem.h
@@ -33,12 +33,11 @@
  */
 class GraphicsAudioItem : public AbstractGraphicsMediaItem
 {
-    Q_OBJECT
 public:
     /**
      * \brief See http://doc.trolltech.com/4.5/qgraphicsitem.html#type
      */
-    enum { Type = UserType + 1 };
+    enum { Type = UserType + 4 };
     GraphicsAudioItem( Clip* clip );
     GraphicsAudioItem( ClipHelper *ch );
     virtual ~GraphicsAudioItem();
diff --git a/src/Gui/timeline/GraphicsMovieItem.h b/src/Gui/timeline/GraphicsMovieItem.h
index 019c9f7..c41bd64 100644
--- a/src/Gui/timeline/GraphicsMovieItem.h
+++ b/src/Gui/timeline/GraphicsMovieItem.h
@@ -33,7 +33,6 @@ class   Clip;
  */
 class GraphicsMovieItem : public AbstractGraphicsMediaItem
 {
-    Q_OBJECT
 public:
     /**
      * \brief See http://doc.trolltech.com/4.5/qgraphicsitem.html#type