Qt: Remove unneeded stuffs from qt4.hpp

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

modules/gui/qt4/Modules.am

@@ -259,6 +259,7 @@ noinst_HEADERS = \
 	util/customwidgets.hpp \
 	util/qvlcframe.hpp \
 	util/qvlcapp.hpp \
+	util/qt_dirs.hpp \
 	util/registry.hpp
 
 EXTRA_DIST += \

modules/gui/qt4/components/open_panels.cpp

@@ -34,6 +34,7 @@
 #include "components/open_panels.hpp"
 #include "dialogs/open.hpp"
 #include "dialogs_provider.hpp" /* Open Subtitle file */
+#include "util/qt_dirs.hpp"
 
 #include <QFileDialog>
 #include <QDialogButtonBox>

modules/gui/qt4/components/preferences_widgets.cpp

@@ -36,6 +36,7 @@
 
 #include "components/preferences_widgets.hpp"
 #include "util/customwidgets.hpp"
+#include "util/qt_dirs.hpp"
 #include <vlc_keys.h>
 
 #include <QString>

modules/gui/qt4/dialogs/help.cpp

@@ -27,6 +27,7 @@
 #endif
 
 #include "dialogs/help.hpp"
+#include "util/qt_dirs.hpp"
 
 #include <vlc_about.h>
 #include <vlc_intf_strings.h>

modules/gui/qt4/dialogs/playlist.cpp

@@ -28,6 +28,8 @@
 
 #include "components/playlist/playlist.hpp"
 
+#include "util/qt_dirs.hpp"
+
 #include <QUrl>
 #include <QHBoxLayout>
 

modules/gui/qt4/dialogs/sout.cpp

@@ -32,6 +32,7 @@
 #endif
 
 #include "dialogs/sout.hpp"
+#include "util/qt_dirs.hpp"
 
 #include <QString>
 #include <QFileDialog>

modules/gui/qt4/dialogs_provider.cpp

@@ -33,7 +33,7 @@
 #include "input_manager.hpp" /* Load Subtitles */
 #include "menus.hpp"
 #include "recents.hpp"
-#include "util/qvlcapp.hpp" /* DialogEvent */
+#include "util/qt_dirs.hpp"
 
 /* The dialogs */
 #include "dialogs/playlist.hpp"

modules/gui/qt4/main_interface.cpp

@@ -33,7 +33,7 @@
 #include "input_manager.hpp"
 
 #include "util/customwidgets.hpp"
-#include "util/qvlcapp.hpp" /* DialogEvent defintion */
+#include "util/qt_dirs.hpp"
 
 #include "components/interface_widgets.hpp"
 #include "components/controller.hpp"

modules/gui/qt4/qt4.hpp

@@ -115,27 +115,4 @@ struct intf_sys_t
 #define getSettings() p_intf->p_sys->mainSettings
 
 
-#include <QString>
-/* Replace separators on Windows because Qt is always using / */
-static inline QString toNativeSeparators( QString s )
-{
-#ifdef WIN32
-    for (int i=0; i<(int)s.length(); i++)
-    {
-        if (s[i] == QLatin1Char('/'))
-            s[i] = QLatin1Char('\\');
-    }
-#endif
-    return s;
-}
-
-static inline QString removeTrailingSlash( QString s )
-{
-    if( ( s.length() > 1 ) && ( s[s.length()-1] == QLatin1Char( '/' ) ) )
-        s.remove( s.length() - 1, 1 );
-    return s;
-}
-
-#define toNativeSepNoSlash( a ) toNativeSeparators( removeTrailingSlash( a ) )
-
 #endif

modules/gui/qt4/util/input_slider.hpp

@@ -27,7 +27,6 @@
 
 #include "qt4.hpp"
 
-#include <QAbstractSlider>
 #include <QSlider>
 
 #include <QMouseEvent>

modules/gui/qt4/util/qt_dirs.hpp

+/*****************************************************************************
+ * dirs.hpp : String Directory helpers
+ ****************************************************************************
+ * Copyright (C) 2006-2008 the VideoLAN team
+ * $Id$
+ *
+ * Authors:       Jean-Baptiste Kempf <jb@videolan.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ *****************************************************************************/
+
+#ifndef _QT_DIR_H_
+#define _QT_DIR_H_
+
+#include <QString>
+/* Replace separators on Windows because Qt is always using / */
+static inline QString toNativeSeparators( QString s )
+{
+#ifdef WIN32
+    for (int i=0; i<(int)s.length(); i++)
+    {
+        if (s[i] == QLatin1Char('/'))
+            s[i] = QLatin1Char('\\');
+    }
+#endif
+    return s;
+}
+
+static inline QString removeTrailingSlash( QString s )
+{
+    if( ( s.length() > 1 ) && ( s[s.length()-1] == QLatin1Char( '/' ) ) )
+        s.remove( s.length() - 1, 1 );
+    return s;
+}
+
+#define toNativeSepNoSlash( a ) toNativeSeparators( removeTrailingSlash( a ) )
+
+#endif
+

modules/gui/qt4/util/qvlcapp.hpp

@@ -50,5 +50,4 @@ protected:
 #endif
 };
 
-
 #endif