Qt: Remove some dialogs_provider.hpp and input_manager.hpp dependencies.

Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

diff --git a/modules/gui/qt4/components/controller.cpp b/modules/gui/qt4/components/controller.cpp
index a931591dcd565ac73dcc186a4de4e098f8b9b195..fd62a97e30bc724b6e22726994026752278642aa 100644 (file)
--- a/modules/gui/qt4/components/controller.cpp
+++ b/modules/gui/qt4/components/controller.cpp
@@ -33,7 +33,7 @@
 #include "components/controller_widget.hpp"
 #include "components/interface_widgets.hpp"
 
-#include "dialogs_provider.hpp"
+#include "dialogs_provider.hpp" /* Opening Dialogs */
 #include "input_manager.hpp"
 
 #include "util/input_slider.hpp" /* InputSlider */

diff --git a/modules/gui/qt4/components/extended_panels.cpp b/modules/gui/qt4/components/extended_panels.cpp
index a03747aa80792f02b5646711187362b6bb921f30..181c5abf0b41379712f5c77f773d7fa6d6242f5e 100644 (file)
--- a/modules/gui/qt4/components/extended_panels.cpp
+++ b/modules/gui/qt4/components/extended_panels.cpp
@@ -36,7 +36,6 @@
 
 #include "components/extended_panels.hpp"
 #include "dialogs/preferences.hpp"
-#include "dialogs_provider.hpp"
 #include "qt4.hpp"
 #include "input_manager.hpp"
 

diff --git a/modules/gui/qt4/components/interface_widgets.cpp b/modules/gui/qt4/components/interface_widgets.cpp
index e0fd180badbd1b238ddfba6e436d126007995e9f..c74188c1d9dd24b061feb7cbbd1d668fdad9f911 100644 (file)
--- a/modules/gui/qt4/components/interface_widgets.cpp
+++ b/modules/gui/qt4/components/interface_widgets.cpp
@@ -30,7 +30,6 @@
 
 #include "components/interface_widgets.hpp"
 
-#include "input_manager.hpp"     /* Rate control */
 #include "menus.hpp"             /* Popup menu on bgWidget */
 
 #include <vlc_vout.h>

diff --git a/modules/gui/qt4/components/interface_widgets.hpp b/modules/gui/qt4/components/interface_widgets.hpp
index f042806a2e7123abfa2e5d735b9ad4d68bf89bf6..f4c9f98c01efb36a7c98e8cb34d06a7b3b869903 100644 (file)
--- a/modules/gui/qt4/components/interface_widgets.hpp
+++ b/modules/gui/qt4/components/interface_widgets.hpp
@@ -30,8 +30,8 @@
 # include "config.h"
 #endif
 
-#include "main_interface.hpp"
-#include "input_manager.hpp"
+#include "main_interface.hpp" /* Interface integration */
+#include "input_manager.hpp"  /* Speed control */
 
 #include "components/controller.hpp"
 #include "components/controller_widget.hpp"

diff --git a/modules/gui/qt4/components/open_panels.cpp b/modules/gui/qt4/components/open_panels.cpp
index c5cd2cb7b559a27435d8c6f9b98af68d7af30ea6..b3368c8fdb8e47fa4d9bfdbd4a189b3481cc2cb6 100644 (file)
--- a/modules/gui/qt4/components/open_panels.cpp
+++ b/modules/gui/qt4/components/open_panels.cpp
@@ -33,7 +33,7 @@
 #include "qt4.hpp"
 #include "components/open_panels.hpp"
 #include "dialogs/open.hpp"
-#include "dialogs_provider.hpp"
+#include "dialogs_provider.hpp" /* Open Subtitle file */
 
 #include <QFileDialog>
 #include <QDialogButtonBox>

diff --git a/modules/gui/qt4/components/playlist/playlist.cpp b/modules/gui/qt4/components/playlist/playlist.cpp
index b570b82b321ea5963306075303fdac51b22f30cc..5ac5f8374ac888ab76c9ca0008cd5f81566d1047 100644 (file)
--- a/modules/gui/qt4/components/playlist/playlist.cpp
+++ b/modules/gui/qt4/components/playlist/playlist.cpp
@@ -29,7 +29,9 @@
 #include "components/playlist/panels.hpp"
 #include "components/playlist/selector.hpp"
 #include "components/playlist/playlist.hpp"
+
 #include "input_manager.hpp" /* art signal */
+#include "main_interface.hpp" /* DropEvent TODO remove this*/
 
 #include <QSettings>
 #include <QLabel>
@@ -132,13 +134,12 @@ PlaylistWidget::~PlaylistWidget()
     msg_Dbg( p_intf, "Playlist Destroyed" );
 }
 
-#include "main_interface.hpp"
-void PlaylistWidget::dropEvent(QDropEvent *event)
+void PlaylistWidget::dropEvent( QDropEvent *event )
 {
     if( p_intf->p_sys->p_mi )
         p_intf->p_sys->p_mi->dropEventPlay( event, false );
 }
-void PlaylistWidget::dragEnterEvent(QDragEnterEvent *event)
+void PlaylistWidget::dragEnterEvent( QDragEnterEvent *event )
 {
     event->acceptProposedAction();
 }

diff --git a/modules/gui/qt4/components/playlist/playlist.hpp b/modules/gui/qt4/components/playlist/playlist.hpp
index 71b7fd955c9ba50985707c25f6808c2af1cf8bbb..673f3f2b50135f55c7397969eb7a239297b0f675 100644 (file)
--- a/modules/gui/qt4/components/playlist/playlist.hpp
+++ b/modules/gui/qt4/components/playlist/playlist.hpp
@@ -30,9 +30,9 @@
 # include "config.h"
 #endif
 
-#include <vlc_common.h>
 #include "qt4.hpp"
-#include "dialogs_provider.hpp"
+
+#include "dialogs_provider.hpp" /* Media Info from ArtLabel */
 #include "components/interface_widgets.hpp"
 
 #include <QSplitter>

diff --git a/modules/gui/qt4/dialogs/bookmarks.cpp b/modules/gui/qt4/dialogs/bookmarks.cpp
index e84cb4fd62b8a4fc4a5ebf4935e649a163ad7064..e83423358ec7f9e0496a24d966efbd6cbb4f21af 100644 (file)
--- a/modules/gui/qt4/dialogs/bookmarks.cpp
+++ b/modules/gui/qt4/dialogs/bookmarks.cpp
@@ -19,12 +19,12 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
+
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
 
 #include "dialogs/bookmarks.hpp"
-#include "dialogs_provider.hpp"
 #include "input_manager.hpp"
 
 #include <QGridLayout>

diff --git a/modules/gui/qt4/dialogs/extended.cpp b/modules/gui/qt4/dialogs/extended.cpp
index a67d0b1fa3dc20c98004bc8199e50cffb9103341..364c20580b907b217acf6267ec899cbf3d79bc03 100644 (file)
--- a/modules/gui/qt4/dialogs/extended.cpp
+++ b/modules/gui/qt4/dialogs/extended.cpp
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * extended.cpp : Extended controls - Undocked
  ****************************************************************************
- * Copyright (C) 2006 the VideoLAN team
+ * Copyright (C) 2006-2008 the VideoLAN team
  * $Id$
  *
  * Authors: Clément Stenac <zorglub@videolan.org>
@@ -26,9 +26,8 @@
 #endif
 
 #include "dialogs/extended.hpp"
-#include "dialogs_provider.hpp"
 
-#include "main_interface.hpp"
+#include "main_interface.hpp" /* Needed for external MI size */
 #include "input_manager.hpp"
 
 #include <QTabWidget>
@@ -92,7 +91,7 @@ ExtendedDialog::ExtendedDialog( intf_thread_t *_p_intf ): QVLCFrame( _p_intf )
     if( !restoreGeometry(getSettings()->value("EPanel/geometry").toByteArray()))
     {
         resize( QSize( 400, 280 ) );
-        
+
         MainInterface *p_mi = p_intf->p_sys->p_mi;
         if( p_mi )
             move( ( p_mi->x() - frameGeometry().width() - 10 ), p_mi->y() );

diff --git a/modules/gui/qt4/dialogs/gototime.cpp b/modules/gui/qt4/dialogs/gototime.cpp
index 2e7b802696218814f751aae4bd4b30d671f55541..78ecbc1e84e4e7b55dbed804648ba2abe775c442 100644 (file)
--- a/modules/gui/qt4/dialogs/gototime.cpp
+++ b/modules/gui/qt4/dialogs/gototime.cpp
@@ -26,8 +26,6 @@
 
 #include "dialogs/gototime.hpp"
 
-#include "dialogs_provider.hpp"
-#include "main_interface.hpp"
 #include "input_manager.hpp"
 
 #include <QTabWidget>

diff --git a/modules/gui/qt4/dialogs/help.cpp b/modules/gui/qt4/dialogs/help.cpp
index dd5204231393131431a9c43b11bcc2b1eb19d678..41422a6fd924dcc50febae7a6481fc810fcc672e 100644 (file)
--- a/modules/gui/qt4/dialogs/help.cpp
+++ b/modules/gui/qt4/dialogs/help.cpp
@@ -26,19 +26,16 @@
 # include "config.h"
 #endif
 
-#include <vlc_common.h>
-
 #include "dialogs/help.hpp"
+
+#include <vlc_common.h>
 #include <vlc_about.h>
+#include <vlc_intf_strings.h>
 
 #ifdef UPDATE_CHECK
-#include <vlc_update.h>
+# include <vlc_update.h>
 #endif
 
-#include "dialogs_provider.hpp"
-
-#include <vlc_intf_strings.h>
-
 #include <QTextBrowser>
 #include <QTabWidget>
 #include <QLabel>

diff --git a/modules/gui/qt4/dialogs/interaction.cpp b/modules/gui/qt4/dialogs/interaction.cpp
index cf18662b3f9ded6aa44f48d91ec591c933bcc9f3..447d0afb99b5d06d04350446c70773aba58ff6f7 100644 (file)
--- a/modules/gui/qt4/dialogs/interaction.cpp
+++ b/modules/gui/qt4/dialogs/interaction.cpp
@@ -27,7 +27,6 @@
 
 #include "dialogs/errors.hpp"
 #include "dialogs/interaction.hpp"
-#include "main_interface.hpp"
 
 #include <QLabel>
 #include <QLineEdit>

diff --git a/modules/gui/qt4/dialogs/mediainfo.cpp b/modules/gui/qt4/dialogs/mediainfo.cpp
index 606603dc72f78b937e9b56a7a51cc84a634a1a97..d36ba2b6266a32ef2a459734907c0e8b60b29c1a 100644 (file)
--- a/modules/gui/qt4/dialogs/mediainfo.cpp
+++ b/modules/gui/qt4/dialogs/mediainfo.cpp
@@ -27,7 +27,6 @@
 
 #include "dialogs/mediainfo.hpp"
 #include "input_manager.hpp"
-#include "dialogs_provider.hpp"
 
 #include <QTabWidget>
 #include <QGridLayout>

diff --git a/modules/gui/qt4/dialogs/messages.cpp b/modules/gui/qt4/dialogs/messages.cpp
index decb546406fe4770b5fc39dca799f3630b72c681..44c8d4a5a832f723c59587bf5cf787e9bea8fe13 100644 (file)
--- a/modules/gui/qt4/dialogs/messages.cpp
+++ b/modules/gui/qt4/dialogs/messages.cpp
@@ -25,9 +25,7 @@
 #endif
 
 #include "dialogs/messages.hpp"
-#include "dialogs_provider.hpp"
 
-#include <QSpacerItem>
 #include <QSpinBox>
 #include <QLabel>
 #include <QTextEdit>

diff --git a/modules/gui/qt4/dialogs/open.cpp b/modules/gui/qt4/dialogs/open.cpp
index dbbbfde4e85d46d4d00399acab7ede7d327a3b49..b30f08eeef0647281f0fe592c021fa867910d233 100644 (file)
--- a/modules/gui/qt4/dialogs/open.cpp
+++ b/modules/gui/qt4/dialogs/open.cpp
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * open.cpp : Advanced open dialog
  *****************************************************************************
- * Copyright © 2006-2007 the VideoLAN team
+ * Copyright © 2006-2008 the VideoLAN team
  * $Id$
  *
  * Authors: Jean-Baptiste Kempf <jb@videolan.org>
@@ -24,10 +24,11 @@
 # include "config.h"
 #endif
 
-#include "input_manager.hpp"
-
 #include "dialogs/open.hpp"
 
+#include "input_manager.hpp"
+#include "dialogs_provider.hpp"
+
 #include "recents.hpp"
 
 #include <QTabWidget>

diff --git a/modules/gui/qt4/dialogs/open.hpp b/modules/gui/qt4/dialogs/open.hpp
index ba4bb26e149ec539204bb0d317c74c78ccb6bd05..05d8a38cfe304850d6c8c1e0b8e416747277bec0 100644 (file)
--- a/modules/gui/qt4/dialogs/open.hpp
+++ b/modules/gui/qt4/dialogs/open.hpp
@@ -31,7 +31,6 @@
 #include <vlc_common.h>
 
 #include "util/qvlcframe.hpp"
-#include "dialogs_provider.hpp"
 #include "ui/open.h"
 #include "components/open_panels.hpp"
 

diff --git a/modules/gui/qt4/dialogs/playlist.cpp b/modules/gui/qt4/dialogs/playlist.cpp
index f15e584e9ae1473f12f7410796bdbc7af3046546..3ed3cf4450bb78a8aa3ab77b00c569e0340e5e6a 100644 (file)
--- a/modules/gui/qt4/dialogs/playlist.cpp
+++ b/modules/gui/qt4/dialogs/playlist.cpp
@@ -26,17 +26,10 @@
 
 #include "dialogs/playlist.hpp"
 
-#include "main_interface.hpp"
 #include "components/playlist/playlist.hpp"
-#include "dialogs_provider.hpp"
-#include "menus.hpp"
 
 #include <QUrl>
 #include <QHBoxLayout>
-#include <QSignalMapper>
-#include <QMenu>
-#include <QAction>
-#include <QMenuBar>
 
 PlaylistDialog *PlaylistDialog::instance = NULL;
 

diff --git a/modules/gui/qt4/dialogs/preferences.cpp b/modules/gui/qt4/dialogs/preferences.cpp
index 2d8bab8f3a2fff0a208a597262e8839020ea75ad..3853337e6a66015d605b2b8e5e61beaa71a38f7b 100644 (file)
--- a/modules/gui/qt4/dialogs/preferences.cpp
+++ b/modules/gui/qt4/dialogs/preferences.cpp
@@ -27,7 +27,6 @@
 #endif
 
 #include "dialogs/preferences.hpp"
-#include "dialogs_provider.hpp"
 #include "util/qvlcframe.hpp"
 
 #include "components/complete_preferences.hpp"
@@ -36,9 +35,7 @@
 #include <QHBoxLayout>
 #include <QGroupBox>
 #include <QRadioButton>
-#include <QVBoxLayout>
 #include <QPushButton>
-#include <QCheckBox>
 #include <QMessageBox>
 #include <QDialogButtonBox>
 

diff --git a/modules/gui/qt4/dialogs_provider.cpp b/modules/gui/qt4/dialogs_provider.cpp
index 877e5020db793b6458f8c7bf7f478640cc688ffe..f9c6aec1d9602c145ef54d08c862dc6f8b0ecce2 100644 (file)
--- a/modules/gui/qt4/dialogs_provider.cpp
+++ b/modules/gui/qt4/dialogs_provider.cpp
@@ -31,7 +31,6 @@
 
 #include "qt4.hpp"
 #include "dialogs_provider.hpp"
-#include "main_interface.hpp"
 #include "menus.hpp"
 #include "input_manager.hpp"
 #include "recents.hpp"

diff --git a/modules/gui/qt4/input_manager.cpp b/modules/gui/qt4/input_manager.cpp
index dc3066ec3cc84c2aba6a9790c2a2420d38111877..70ffcf3afe426970c46d3bd1109f1884b65e75a4 100644 (file)
--- a/modules/gui/qt4/input_manager.cpp
+++ b/modules/gui/qt4/input_manager.cpp
@@ -22,13 +22,15 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
+
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
 
 #include "qt4.hpp"
 #include "input_manager.hpp"
-#include "dialogs_provider.hpp"
+
+#include <QApplication>
 
 static int ItemChanged( vlc_object_t *, const char *,
                         vlc_value_t, vlc_value_t, void * );
@@ -616,7 +618,6 @@ MainInputManager::MainInputManager( intf_thread_t *_p_intf )
     var_Change( THEPL, "playlist-current", VLC_VAR_CHOICESCOUNT, &val, NULL );
     IMEvent *event = new IMEvent( ItemChanged_Type, val.i_int);
     QApplication::postEvent( this, static_cast<QEvent*>(event) );
-
 }
 
 MainInputManager::~MainInputManager()

diff --git a/modules/gui/qt4/main_interface.cpp b/modules/gui/qt4/main_interface.cpp
index a153800d0ad4561bd887a8e708a6c7b5fb327571..b6001e7de2724dc9c14a973ecf2ae35a8c6dbf9c 100644 (file)
--- a/modules/gui/qt4/main_interface.cpp
+++ b/modules/gui/qt4/main_interface.cpp
@@ -33,7 +33,6 @@
 #include "util/qvlcframe.hpp"
 #include "util/qvlcapp.hpp"
 #include "util/customwidgets.hpp"
-#include "dialogs_provider.hpp"
 #include "components/interface_widgets.hpp"
 #include "components/controller.hpp"
 #include "components/playlist/playlist.hpp"

diff --git a/modules/gui/qt4/menus.cpp b/modules/gui/qt4/menus.cpp
index 18b1aae26b87a0d9eea1b2fb3286bc098230b8b7..6079ddf90b174541d381d3f709fda2668b043a9d 100644 (file)
--- a/modules/gui/qt4/menus.cpp
+++ b/modules/gui/qt4/menus.cpp
@@ -35,8 +35,9 @@
 
 #include <vlc_intf_strings.h>
 
-#include "main_interface.hpp"
 #include "menus.hpp"
+
+#include "main_interface.hpp"    /* View modifications */
 #include "dialogs_provider.hpp"
 #include "input_manager.hpp"
 #include "recents.hpp"

diff --git a/modules/gui/qt4/qt4.cpp b/modules/gui/qt4/qt4.cpp
index 964604583711ebffeae1a5bdc6bdf1924abb0102..3f7d7c5985b49edb846fb2af492cec7f507d73a4 100644 (file)
--- a/modules/gui/qt4/qt4.cpp
+++ b/modules/gui/qt4/qt4.cpp
@@ -35,11 +35,11 @@
 #include <QWaitCondition>
 
 #include "qt4.hpp"
-#include "dialogs_provider.hpp"
-#include "input_manager.hpp"
-#include "main_interface.hpp"
-#include "dialogs/help.hpp" /* update */
-#include "recents.hpp"
+#include "input_manager.hpp"    /* THEMIM creation */
+#include "dialogs_provider.hpp" /* THEDP creation */
+#include "main_interface.hpp"   /* MainInterface creation */
+#include "dialogs/help.hpp"     /* Launch Update */
+#include "recents.hpp"          /* Recents Item destruction */
 #include "util/qvlcapp.hpp"
 
 #ifdef HAVE_X11_XLIB_H