[vlc-commits] commit: Qt: move view names to the StandardPanel file (Jean-Baptiste Kempf )

[git at videolan.org]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Wed Oct 27 08:50:08 2010 +0200| [4a88683bf98808913bc91310667690fa911a23bc] | committer: Jean-Baptiste Kempf 

Qt: move view names to the StandardPanel file

And cleanup includes of StandardPanel

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

 modules/gui/qt4/components/playlist/playlist.hpp   |    4 ---
 .../gui/qt4/components/playlist/standardpanel.cpp  |   25 +++++++------------
 .../gui/qt4/components/playlist/standardpanel.hpp  |    5 ++++
 3 files changed, 14 insertions(+), 20 deletions(-)

diff --git a/modules/gui/qt4/components/playlist/playlist.hpp b/modules/gui/qt4/components/playlist/playlist.hpp
index 04db3a8..45d4481 100644
--- a/modules/gui/qt4/components/playlist/playlist.hpp
+++ b/modules/gui/qt4/components/playlist/playlist.hpp
@@ -43,10 +43,6 @@ class QSignalMapper;
 class SearchLineEdit;
 class QModelIndex;
 
-static const QString viewNames[] = { qtr( "Detailed View" ),
-                                     qtr( "Icon View" ),
-                                     qtr( "List View" ) };
-
 class PlaylistWidget : public QSplitter
 {
     Q_OBJECT
diff --git a/modules/gui/qt4/components/playlist/standardpanel.cpp b/modules/gui/qt4/components/playlist/standardpanel.cpp
index b8abb60..daad1af 100644
--- a/modules/gui/qt4/components/playlist/standardpanel.cpp
+++ b/modules/gui/qt4/components/playlist/standardpanel.cpp
@@ -26,36 +26,29 @@
 # include "config.h"
 #endif
 
-#include "dialogs_provider.hpp"
-
-#include "components/playlist/playlist_model.hpp"
 #include "components/playlist/standardpanel.hpp"
-#include "components/playlist/views.hpp"
-#include "components/playlist/selector.hpp"
-#include "util/customwidgets.hpp"
-#include "menus.hpp"
-#include "input_manager.hpp"
 
-#include <vlc_intf_strings.h>
-#include <vlc_services_discovery.h>
+#include "components/playlist/playlist_model.hpp" /* PLModel */
+#include "components/playlist/views.hpp"          /* 3 views */
+#include "components/playlist/selector.hpp"       /* PLSelector */
+#include "menus.hpp"                              /* Popup */
+#include "input_manager.hpp"                      /* THEMIM */
+
+#include <vlc_services_discovery.h> /* SD_CMD_SEARCH */
 
-#include <QPushButton>
 #include <QHeaderView>
-#include <QKeyEvent>
 #include <QModelIndexList>
-#include <QLabel>
 #include <QMenu>
+#include <QKeyEvent>
 #include <QWheelEvent>
-#include <QToolButton>
-#include <QFontMetrics>
 #include <QStackedLayout>
 #include <QSignalMapper>
+#include <QSettings>
 
 #include <assert.h>
 
 #include "sorting.h"
 
-
 StandardPLPanel::StandardPLPanel( PlaylistWidget *_parent,
                                   intf_thread_t *_p_intf,
                                   playlist_t *p_playlist,
diff --git a/modules/gui/qt4/components/playlist/standardpanel.hpp b/modules/gui/qt4/components/playlist/standardpanel.hpp
index d5546e5..4fb4ec7 100644
--- a/modules/gui/qt4/components/playlist/standardpanel.hpp
+++ b/modules/gui/qt4/components/playlist/standardpanel.hpp
@@ -51,6 +51,11 @@ class LocationBar;
 class PLSelector;
 class PlaylistWidget;
 
+static const QString viewNames[3 /* VIEW_COUNT */]
+                                = { qtr( "Detailed View" ),
+                                    qtr( "Icon View" ),
+                                    qtr( "List View" ) };
+
 class StandardPLPanel: public QWidget
 {
     Q_OBJECT