Simplifications

[vlc] / modules / gui / qt4 / qt4.hpp

diff --git a/modules/gui/qt4/qt4.hpp b/modules/gui/qt4/qt4.hpp
old mode 100644 (file)
new mode 100755 (executable)
index f5951d4..a429b96
--- 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>
@@ -37,9 +37,24 @@
 
 #define HAS_QT43 ( QT_VERSION >= 0x040300 )
 
-#define QT_NORMAL_MODE 0
-#define QT_ALWAYS_VIDEO_MODE 1
-#define QT_MINIMAL_MODE 2
+enum {
+    QT_NORMAL_MODE = 0,
+    QT_ALWAYS_VIDEO_MODE,
+    QT_MINIMAL_MODE
+};
+
+enum {
+    DialogEventType = 0,
+    IMEventType     = 100,
+    PLEventType     = 200
+};
+
+enum {
+    DialogEvent_Type = QEvent::User + DialogEventType + 1,
+    //PLUndockEvent_Type = QEvent::User + DialogEventType + 2;
+    //PLDockEvent_Type = QEvent::User + DialogEventType + 3;
+    SetVideoOnTopEvent_Type = QEvent::User + DialogEventType + 4,
+};
 
 class QApplication;
 class QMenu;
@@ -50,16 +65,15 @@ class QSettings;
 
 struct intf_sys_t
 {
+    vlc_thread_t thread;
     QApplication *p_app;
     MainInterface *p_mi;
-    DialogsProvider *p_dp;
 
     QSettings *mainSettings;
 
     bool b_isDialogProvider;
 
     playlist_t *p_playlist;
-    msg_subscription_t *p_sub; ///< Subscription to the message bank
 
     VideoWidget *p_video;
 
@@ -81,7 +95,6 @@ struct intf_sys_t
 
 #define CONNECT( a, b, c, d ) connect( a, SIGNAL( b ), c, SLOT(d) )
 #define BUTTONACT( b, a ) connect( b, SIGNAL( clicked() ), this, SLOT(a) )
-#define ON_TIMEOUT( act ) CONNECT( THEDP->fixed_timer, timeout(), this, act )
 
 #define BUTTON_SET( button, text, tooltip )  \
     button->setText( text );                 \
@@ -104,7 +117,7 @@ struct intf_sys_t
 #define TOGGLEV( x ) { if( x->isVisible() ) x->hide();          \
             else  x->show(); }
 
-#if QT43
+#if HAS_QT43
     #define setLayoutMargins( a, b, c, d, e) setContentsMargins( a, b, c, d )
 #else
     #define setLayoutMargins( a, b, c, d, e) setMargin( e )
@@ -112,31 +125,28 @@ struct intf_sys_t
 
 #define getSettings() p_intf->p_sys->mainSettings
 
-enum {
-    DialogEventType = 0,
-    IMEventType     = 100,
-    PLEventType     = 200
-};
-
-static const int DialogEvent_Type = QEvent::User + DialogEventType + 1;
-//static const int PLUndockEvent_Type = QEvent::User + DialogEventType + 2;
-//static const int PLDockEvent_Type = QEvent::User + DialogEventType + 3;
-static const int SetVideoOnTopEvent_Type = QEvent::User + DialogEventType + 4;
 
-class DialogEvent : public QEvent
+#include <QString>
+/* Replace separators on Windows because Qt is always using / */
+static inline QString toNativeSeparators( QString s )
 {
-public:
-    DialogEvent( int _i_dialog, int _i_arg, intf_dialog_args_t *_p_arg ) :
-                 QEvent( (QEvent::Type)(DialogEvent_Type) )
+#ifdef WIN32
+    for (int i=0; i<(int)s.length(); i++)
     {
-        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;
-};
+        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