X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fqt4%2Fqt4.hpp;h=7670514801884e3a386ac79b931cbd30c2cc8d93;hb=240dc04a1d7e24b9d3c8260c7f6265cb0c95bfe0;hp=3c2de020e581f6bbacd17fa3f6fc959a7635e3ff;hpb=f29d7dfebbb783a98122047f4c0510dc6b8542aa;p=vlc

diff --git a/modules/gui/qt4/qt4.hpp b/modules/gui/qt4/qt4.hpp
index 3c2de020e5..7670514801 100644
--- a/modules/gui/qt4/qt4.hpp
+++ b/modules/gui/qt4/qt4.hpp
@@ -5,6 +5,7 @@
  * $Id$
  *
  * Authors: Clément Stenac <zorglub@videolan.org>
+ *          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
@@ -30,12 +31,11 @@
 
 #include <QEvent>
 
-#define QT43 ( QT_VERSION >= 0x040300 )
+#define HAS_QT43 ( QT_VERSION >= 0x040300 )
 
 /* Add define for duration, VLC_META_ENGINE doesn't include it */
 #define VLC_META_ENGINE_DURATION   0x00000002
-#define VLC_META_DURATION          N_("Duration")
-
+#define VLC_META_DURATION          N_( "Duration" )
 
 class QApplication;
 class QMenu;
@@ -65,8 +65,8 @@ struct intf_sys_t
 
 #define qfu( i ) QString::fromUtf8( i )
 #define qtr( i ) QString::fromUtf8( _(i) )
-#define qtu( i ) i.toUtf8().data()
-#define qta( i ) i.toAscii().data()
+#define qtu( i ) (i).toUtf8().data()
+#define qta( i ) (i).toAscii().data()
 
 #define CONNECT( a, b, c, d ) connect( a, SIGNAL( b ), c, SLOT(d) )
 #define BUTTONACT( b, a ) connect( b, SIGNAL( clicked() ), this, SLOT(a) )
@@ -94,8 +94,8 @@ struct intf_sys_t
             else  x->show(); }
 
 static int DialogEvent_Type = QEvent::User + 1;
-static int PLUndockEvent_Type = QEvent::User + 2;
-static int PLDockEvent_Type = QEvent::User + 3;
+//static int PLUndockEvent_Type = QEvent::User + 2;
+//static int PLDockEvent_Type = QEvent::User + 3;
 static int SetVideoOnTopEvent_Type = QEvent::User + 4;
 
 class DialogEvent : public QEvent
@@ -114,16 +114,4 @@ public:
     intf_dialog_args_t *p_arg;
 };
 
-/* Ugly to put it here, but don't want more files ... */
-#if 0
-#include <QFrame>
-class BasePlaylistWidget : public QFrame
-{
-public:
-    BasePlaylistWidget( intf_thread_t *_p_i ) : p_intf( _p_i)  {};
-    virtual ~BasePlaylistWidget() {};
-protected:
-    intf_thread_t *p_intf;
-};
-#endif
 #endif