[vlmc-devel] commit: kill warnings (Ludovic Fauvet )

[git at videolan.org]

vlmc | branch: master | Ludovic Fauvet <etix at l0cal.com> | Sun Mar 14 22:54:18 2010 +0100| [14190296ada01f02a99ed97c44e2857858fee717] | committer: Ludovic Fauvet 

kill warnings

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

 src/CMakeLists.txt                           |    9 +--------
 src/Gui/import/ui/ImportController.ui        |    1 -
 src/Gui/timeline/AbstractGraphicsMediaItem.h |    1 +
 src/Gui/timeline/GraphicsCursorItem.h        |    1 +
 src/Gui/ui/MainWindow.ui                     |    5 -----
 5 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index e2168db..f27d59b 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -123,17 +123,10 @@ SET (VLMC_HDRS
     Gui/MainWindow.h
     Gui/preview/PreviewRuler.h
     Gui/preview/PreviewWidget.h
-    Gui/settings/BoolWidget.h
-    Gui/settings/DoubleWidget.h
-    Gui/settings/IntWidget.h
-    Gui/settings/ISettingsCategorieWidget.h
-    Gui/settings/KeyboardShortcut.h
     Gui/settings/KeyboardShortcutInput.h
-    Gui/settings/LanguageWidget.h
     Gui/settings/Panel.h
     Gui/settings/PreferenceWidget.h
     Gui/settings/Settings.h
-    Gui/settings/StringWidget.h
     Gui/import/TagWidget.h
     Gui/timeline/AbstractGraphicsMediaItem.h
     Gui/timeline/GraphicsAudioItem.h 
@@ -213,7 +206,7 @@ IF (WITH_CRASHHANDLER_GUI)
     ELSE ( CMAKE_SYSTEM_NAME STREQUAL "Linux" )
         LIST( APPEND VLMC_SRCS Tools/Win32BacktraceGenerator.cpp )
     ENDIF( CMAKE_SYSTEM_NAME STREQUAL "Linux" )
-    LIST( APPEND VLMC_HDRS Gui/widgets/CrashHandler.h Tools/BacktraceGenerator.h )
+    LIST( APPEND VLMC_HDRS Gui/widgets/CrashHandler.h )
     LIST( APPEND VLMC_UIS Gui/widgets/CrashHandler.ui )
     
 ENDIF(WITH_CRASHHANDLER_GUI)
diff --git a/src/Gui/import/ui/ImportController.ui b/src/Gui/import/ui/ImportController.ui
index 7c9742e..6e5829b 100644
--- a/src/Gui/import/ui/ImportController.ui
+++ b/src/Gui/import/ui/ImportController.ui
@@ -229,7 +229,6 @@
     </widget>
    </item>
   </layout>
-  <zorder>horizontalLayoutWidget</zorder>
   <zorder>buttonBox</zorder>
   <zorder>stackViewContainer</zorder>
  </widget>
diff --git a/src/Gui/timeline/AbstractGraphicsMediaItem.h b/src/Gui/timeline/AbstractGraphicsMediaItem.h
index a52c48a..4794fdd 100644
--- a/src/Gui/timeline/AbstractGraphicsMediaItem.h
+++ b/src/Gui/timeline/AbstractGraphicsMediaItem.h
@@ -40,6 +40,7 @@ class GraphicsTrack;
 class AbstractGraphicsMediaItem : public QObject, public QGraphicsItem
 {
     Q_OBJECT
+    Q_INTERFACES( QGraphicsItem )
     friend class TracksView;
 public:
     enum From
diff --git a/src/Gui/timeline/GraphicsCursorItem.h b/src/Gui/timeline/GraphicsCursorItem.h
index eac70d6..febb6d5 100644
--- a/src/Gui/timeline/GraphicsCursorItem.h
+++ b/src/Gui/timeline/GraphicsCursorItem.h
@@ -35,6 +35,7 @@
 class GraphicsCursorItem : public QObject, public QGraphicsItem
 {
     Q_OBJECT
+    Q_INTERFACES( QGraphicsItem )
 public:
     GraphicsCursorItem( const QPen& pen );
     int                 cursorPos() const { return ( int )pos().x(); }
diff --git a/src/Gui/ui/MainWindow.ui b/src/Gui/ui/MainWindow.ui
index 0d42d0e..923b3a6 100644
--- a/src/Gui/ui/MainWindow.ui
+++ b/src/Gui/ui/MainWindow.ui
@@ -180,11 +180,6 @@
     <string>Import</string>
    </property>
   </action>
-  <action name="actionProject_Preferences">
-   <property name="text">
-    <string>Project Preferences</string>
-   </property>
-  </action>
   <action name="actionBypass_effects_engine">
    <property name="checkable">
     <bool>true</bool>