Qt forced default value is different than libvlc's saved

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

diff --git a/modules/gui/qt4/qt4.hpp b/modules/gui/qt4/qt4.hpp
index ce465341a112ed204be18ae2bcc600bbaf1f5cd0..577d43417ff312bf3e36ccb8fc554c37984cb819 100644 (file)
--- a/modules/gui/qt4/qt4.hpp
+++ b/modules/gui/qt4/qt4.hpp
@@ -32,22 +32,19 @@
 #include <vlc_common.h>    /* VLC_COMMON_MEMBERS for vlc_interface.h */
 #include <vlc_interface.h> /* intf_thread_t */
 #include <vlc_playlist.h>  /* playlist_t */
+#include <vlc_aout.h>      /* AOUT_VOLUME_ */
 
-#include <QEvent>
+#define QT_NO_CAST_TO_ASCII
 #include <QString>
 
 #if ( QT_VERSION < 0x040400 )
-# error Update your Qt version
+# error Update your Qt version to at least 4.4.0
 #endif
 #if QT_VERSION == 0x040500
-# error Please update Qt version to 4.5.1.
+# error Please update Qt version to 4.5.1. 4.5.0 is too buggy
 #endif
 
-enum {
-    QT_NORMAL_MODE = 0,
-    QT_ALWAYS_VIDEO_MODE,
-    QT_MINIMAL_MODE
-};
+#define HAS_QT45 ( QT_VERSION >= 0x040500 )
 
 enum {
     DialogEventType = 0,
@@ -78,7 +75,6 @@ struct intf_sys_t
 
     QString filepath;        /* Last path used in dialogs */
 
-    QMenu * p_popup_menu;    /* The right click menu */
 };
 
 #define THEPL p_intf->p_sys->p_playlist
@@ -87,12 +83,16 @@ struct intf_sys_t
 
 #define THEDP DialogsProvider::getInstance()
 #define THEMIM MainInputManager::getInstance( p_intf )
+#define THEAM ActionsManager::getInstance( p_intf )
 
 #define qfu( i ) QString::fromUtf8( i )
 #define qtr( i ) QString::fromUtf8( vlc_gettext(i) )
 #define qtu( i ) ((i).toUtf8().constData())
 
-#define CONNECT( a, b, c, d ) connect( a, SIGNAL( b ), c, SLOT(d) )
+#define CONNECT( a, b, c, d ) \
+        connect( a, SIGNAL( b ), c, SLOT(d) )
+#define DCONNECT( a, b, c, d ) \
+        connect( a, SIGNAL( b ), c, SLOT(d), Qt::DirectConnection )
 #define BUTTONACT( b, a ) connect( b, SIGNAL( clicked() ), this, SLOT(a) )
 
 #define BUTTON_SET( button, text, tooltip )  \
@@ -116,9 +116,19 @@ struct intf_sys_t
 #define TOGGLEV( x ) { if( x->isVisible() ) x->hide();          \
             else  x->show(); }
 
-#define setLayoutMargins( a, b, c, d, e) setContentsMargins( a, b, c, d )
-
 #define getSettings() p_intf->p_sys->mainSettings
 
+#define QT_VOLUME_DEFAULT AOUT_VOLUME_DEFAULT
+#define QT_VOLUME_MAX (AOUT_VOLUME_DEFAULT * 2)
+
+static inline QString QVLCUserDir( vlc_userdir_t type )
+{
+    char *dir = config_GetUserDir( type );
+    if( !dir )
+        return "";
+    QString res = qfu( dir );
+    free( dir );
+    return res;
+}
 
 #endif