Qt: Remove some dialogs_provider.hpp and input_manager.hpp dependencies.
authorJean-Baptiste Kempf <jb@videolan.org>
Mon, 29 Dec 2008 16:18:10 +0000 (17:18 +0100)
committerJean-Baptiste Kempf <jb@videolan.org>
Tue, 30 Dec 2008 12:19:34 +0000 (13:19 +0100)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
23 files changed:
modules/gui/qt4/components/controller.cpp
modules/gui/qt4/components/extended_panels.cpp
modules/gui/qt4/components/interface_widgets.cpp
modules/gui/qt4/components/interface_widgets.hpp
modules/gui/qt4/components/open_panels.cpp
modules/gui/qt4/components/playlist/playlist.cpp
modules/gui/qt4/components/playlist/playlist.hpp
modules/gui/qt4/dialogs/bookmarks.cpp
modules/gui/qt4/dialogs/extended.cpp
modules/gui/qt4/dialogs/gototime.cpp
modules/gui/qt4/dialogs/help.cpp
modules/gui/qt4/dialogs/interaction.cpp
modules/gui/qt4/dialogs/mediainfo.cpp
modules/gui/qt4/dialogs/messages.cpp
modules/gui/qt4/dialogs/open.cpp
modules/gui/qt4/dialogs/open.hpp
modules/gui/qt4/dialogs/playlist.cpp
modules/gui/qt4/dialogs/preferences.cpp
modules/gui/qt4/dialogs_provider.cpp
modules/gui/qt4/input_manager.cpp
modules/gui/qt4/main_interface.cpp
modules/gui/qt4/menus.cpp
modules/gui/qt4/qt4.cpp

index a931591..fd62a97 100644 (file)
@@ -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 */
index a03747a..181c5ab 100644 (file)
@@ -36,7 +36,6 @@
 
 #include "components/extended_panels.hpp"
 #include "dialogs/preferences.hpp"
-#include "dialogs_provider.hpp"
 #include "qt4.hpp"
 #include "input_manager.hpp"
 
index e0fd180..c74188c 100644 (file)
@@ -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>
index f042806..f4c9f98 100644 (file)
@@ -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"
index c5cd2cb..b3368c8 100644 (file)
@@ -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>
index b570b82..5ac5f83 100644 (file)
@@ -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();
 }
index 71b7fd9..673f3f2 100644 (file)
@@ -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>
index e84cb4f..e834233 100644 (file)
  * 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>
index a67d0b1..364c205 100644 (file)
@@ -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() );
index 2e7b802..78ecbc1 100644 (file)
@@ -26,8 +26,6 @@
 
 #include "dialogs/gototime.hpp"
 
-#include "dialogs_provider.hpp"
-#include "main_interface.hpp"
 #include "input_manager.hpp"
 
 #include <QTabWidget>
index dd52042..41422a6 100644 (file)
 # 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>
index cf18662..447d0af 100644 (file)
@@ -27,7 +27,6 @@
 
 #include "dialogs/errors.hpp"
 #include "dialogs/interaction.hpp"
-#include "main_interface.hpp"
 
 #include <QLabel>
 #include <QLineEdit>
index 606603d..d36ba2b 100644 (file)
@@ -27,7 +27,6 @@
 
 #include "dialogs/mediainfo.hpp"
 #include "input_manager.hpp"
-#include "dialogs_provider.hpp"
 
 #include <QTabWidget>
 #include <QGridLayout>
index decb546..44c8d4a 100644 (file)
@@ -25,9 +25,7 @@
 #endif
 
 #include "dialogs/messages.hpp"
-#include "dialogs_provider.hpp"
 
-#include <QSpacerItem>
 #include <QSpinBox>
 #include <QLabel>
 #include <QTextEdit>
index dbbbfde..b30f08e 100644 (file)
@@ -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>
 # 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>
index ba4bb26..05d8a38 100644 (file)
@@ -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"
 
index f15e584..3ed3cf4 100644 (file)
 
 #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;
 
index 2d8bab8..3853337 100644 (file)
@@ -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>
 
index 877e502..f9c6aec 100644 (file)
@@ -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"
index dc3066e..70ffcf3 100644 (file)
  * 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()
index a153800..b6001e7 100644 (file)
@@ -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"
index 18b1aae..6079ddf 100644 (file)
@@ -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"
index 9646045..3f7d7c5 100644 (file)
 #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