[vlc-commits] commit: Qt: use forward declaration when possible and remove includes ( Jean-Baptiste Kempf )

[git at videolan.org]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Wed Mar 17 22:09:52 2010 +0100| [a65e67d9ab989b588314273fbdf4ca9af0024ded] | committer: Jean-Baptiste Kempf 

Qt: use forward declaration when possible and remove includes

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=a65e67d9ab989b588314273fbdf4ca9af0024ded
---

 modules/gui/qt4/components/interface_widgets.cpp |    2 ++
 modules/gui/qt4/components/interface_widgets.hpp |    1 +
 modules/gui/qt4/dialogs/toolbar.cpp              |    3 +++
 modules/gui/qt4/main_interface.hpp               |    1 -
 4 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/modules/gui/qt4/components/interface_widgets.cpp b/modules/gui/qt4/components/interface_widgets.cpp
index 7537959..dc405d6 100644
--- a/modules/gui/qt4/components/interface_widgets.cpp
+++ b/modules/gui/qt4/components/interface_widgets.cpp
@@ -44,6 +44,7 @@
 #include <QDesktopWidget>
 #include <QPainter>
 #include <QTimer>
+#include <QSlider>
 
 #ifdef Q_WS_X11
 # include <X11/Xlib.h>
@@ -60,6 +61,7 @@ static void videoSync( void )
 #endif
 
 #include <math.h>
+#include <assert.h>
 
 class ReparentableWidget : public QWidget
 {
diff --git a/modules/gui/qt4/components/interface_widgets.hpp b/modules/gui/qt4/components/interface_widgets.hpp
index 4bda22b..85cbe24 100644
--- a/modules/gui/qt4/components/interface_widgets.hpp
+++ b/modules/gui/qt4/components/interface_widgets.hpp
@@ -45,6 +45,7 @@ class ResizeEvent;
 class QPixmap;
 class QHBoxLayout;
 class QMenu;
+class QSlider;
 class ReparentableWidget;
 
 /******************** Video Widget ****************/
diff --git a/modules/gui/qt4/dialogs/toolbar.cpp b/modules/gui/qt4/dialogs/toolbar.cpp
index 8feaa7a..17ec24d 100644
--- a/modules/gui/qt4/dialogs/toolbar.cpp
+++ b/modules/gui/qt4/dialogs/toolbar.cpp
@@ -36,11 +36,14 @@
 #include <QLabel>
 #include <QComboBox>
 #include <QListWidget>
+#include <QSpinBox>
 
 #include <QDragEnterEvent>
 #include <QDialogButtonBox>
 #include <QInputDialog>
 
+#include <assert.h>
+
 ToolbarEditDialog::ToolbarEditDialog( QWidget *_w, intf_thread_t *_p_intf)
                   : QVLCDialog( _w,  _p_intf )
 {
diff --git a/modules/gui/qt4/main_interface.hpp b/modules/gui/qt4/main_interface.hpp
index 9fc9a4b..b2f561e 100644
--- a/modules/gui/qt4/main_interface.hpp
+++ b/modules/gui/qt4/main_interface.hpp
@@ -28,7 +28,6 @@
 #include "qt4.hpp"
 
 #include "util/qvlcframe.hpp"
-#include "components/preferences_widgets.hpp" /* First Start */
 
 #ifdef WIN32
  #include <vlc_windows_interfaces.h>