[Qt] Split the QtWinApp to its own file and rename it.

diff --git a/modules/gui/qt4/Modules.am b/modules/gui/qt4/Modules.am
index 1f43ac20bf9862f19532fe7972bdc136852356cb..5f9769a8c931e56c7748caf48df3643daca2d217 100644 (file)
--- a/modules/gui/qt4/Modules.am
+++ b/modules/gui/qt4/Modules.am
@@ -242,6 +242,7 @@ noinst_HEADERS = \
        util/input_slider.hpp \
        util/customwidgets.hpp \
        util/qvlcframe.hpp \
+       util/qvlcapp.hpp \
        util/registry.hpp
 
 EXTRA_DIST += \

diff --git a/modules/gui/qt4/dialogs_provider.cpp b/modules/gui/qt4/dialogs_provider.cpp
index 19ebedfc5ce383c8cd65a3d0371997d3ce723dc8..879980ad931433737e7c8df605024f4bff7a75d3 100644 (file)
--- a/modules/gui/qt4/dialogs_provider.cpp
+++ b/modules/gui/qt4/dialogs_provider.cpp
@@ -35,6 +35,7 @@
 #include "menus.hpp"
 #include "input_manager.hpp"
 #include "recents.hpp"
+#include "util/qvlcapp.hpp"
 
 /* The dialogs */
 #include "dialogs/playlist.hpp"

diff --git a/modules/gui/qt4/main_interface.cpp b/modules/gui/qt4/main_interface.cpp
index 8782c41e52148aea464b9f8389832f2d46278f64..9915cdf8b0ff3987be07a8f7365d50a27051cd8f 100644 (file)
--- a/modules/gui/qt4/main_interface.cpp
+++ b/modules/gui/qt4/main_interface.cpp
@@ -31,6 +31,7 @@
 #include "main_interface.hpp"
 #include "input_manager.hpp"
 #include "util/qvlcframe.hpp"
+#include "util/qvlcapp.hpp"
 #include "util/customwidgets.hpp"
 #include "dialogs_provider.hpp"
 #include "components/interface_widgets.hpp"

diff --git a/modules/gui/qt4/qt4.cpp b/modules/gui/qt4/qt4.cpp
index 913c7454389d0c3dc7caf5516584bbae95d6786f..57de94e7e068686bd6577cbb3b1c41b93fe26262 100755 (executable)
--- a/modules/gui/qt4/qt4.cpp
+++ b/modules/gui/qt4/qt4.cpp
@@ -21,6 +21,7 @@
  * 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
@@ -40,6 +41,7 @@
 #include "main_interface.hpp"
 #include "dialogs/help.hpp" /* update */
 #include "recents.hpp"
+#include "util/qvlcapp.hpp"
 
 #ifdef HAVE_X11_XLIB_H
 #include <X11/Xlib.h>
@@ -232,19 +234,6 @@ vlc_module_begin();
 #endif
 vlc_module_end();
 
-#if defined(Q_WS_WIN)
-bool WinQtApp::winEventFilter( MSG *msg, long *result )
-{
-    switch( msg->message )
-    {
-        case 0x0319: /* WM_APPCOMMAND 0x0319 */
-        DefWindowProc( msg->hwnd, msg->message, msg->wParam, msg->lParam );
-        break;
-    }
-    return false;
-}
-#endif /* Q_WS_WIN */
-
 /*****************************************************************************
  * Module callbacks
  *****************************************************************************/

diff --git a/modules/gui/qt4/qt4.hpp b/modules/gui/qt4/qt4.hpp
index e7b07f1546fde50359ead477e75d998d06127a55..38b8f3a338794497ab9fb2ab5c3d523024aebac5 100755 (executable)
--- a/modules/gui/qt4/qt4.hpp
+++ b/modules/gui/qt4/qt4.hpp
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * qt4.hpp : QT4 interface
  ****************************************************************************
- * Copyright (C) 2006-2007 the VideoLAN team
+ * Copyright (C) 2006-2008 the VideoLAN team
  * $Id$
  *
  * Authors: Clément Stenac <zorglub@videolan.org>
@@ -63,20 +63,6 @@ class DialogsProvider;
 class VideoWidget;
 class QSettings;
 
-
-#include <QApplication>
-#if defined(Q_WS_WIN)
-
-class WinQtApp : public QApplication
-{
-public:
-    WinQtApp ( int & argc, char ** argv, bool GUIenabled ) : QApplication( argc, argv, GUIenabled ) {}
-    ~WinQtApp() {}
-protected:
-    bool winEventFilter(MSG *msg, long *result);
-};
-#endif /* Q_WS_WIN */
-
 struct intf_sys_t
 {
     QApplication *p_app;
@@ -162,20 +148,4 @@ static inline QString removeTrailingSlash( QString s )
 
 #define toNativeSepNoSlash( a ) toNativeSeparators( removeTrailingSlash( a ) )
 
-class DialogEvent : public QEvent
-{
-public:
-    DialogEvent( int _i_dialog, int _i_arg, intf_dialog_args_t *_p_arg ) :
-                 QEvent( (QEvent::Type)(DialogEvent_Type) )
-    {
-        i_dialog = _i_dialog;
-        i_arg = _i_arg;
-        p_arg = _p_arg;
-    };
-    virtual ~DialogEvent() {};
-
-    int i_arg, i_dialog;
-    intf_dialog_args_t *p_arg;
-};
-
 #endif