Qt4: use var_Inherit

diff --git a/modules/gui/qt4/components/controller.cpp b/modules/gui/qt4/components/controller.cpp
index ed3f9c190a9701d54a4635c896e4ac4627752967..021db0dcfe3ea65bdc7ca257dd274ed0e3aaea38 100644 (file)
--- a/modules/gui/qt4/components/controller.cpp
+++ b/modules/gui/qt4/components/controller.cpp
@@ -688,7 +688,7 @@ FullscreenControllerWidget::FullscreenControllerWidget( intf_thread_t *_p_i, QWi
     /* First Move */
     QRect rect1 = getSettings()->value( "FullScreen/screen" ).toRect();
     QPoint pos1 = getSettings()->value( "FullScreen/pos" ).toPoint();
-    int number =  config_GetInt( p_intf, "qt-fullscreen-screennumber" );
+    int number =  var_InheritInteger( p_intf, "qt-fullscreen-screennumber" );
     if( number == -1 || number > QApplication::desktop()->numScreens() )
         number = QApplication::desktop()->screenNumber( p_intf->p_sys->p_mi );
 
@@ -746,7 +746,7 @@ void FullscreenControllerWidget::showFSC()
     }
 
 #if HAVE_TRANSPARENCY
-    setWindowOpacity( config_GetFloat( p_intf, "qt-fs-opacity" )  );
+    setWindowOpacity( var_InheritFloat( p_intf, "qt-fs-opacity" )  );
 #endif
 
     show();

diff --git a/modules/gui/qt4/components/controller_widget.cpp b/modules/gui/qt4/components/controller_widget.cpp
index 27f7de1f9e0f7f4cafc7df60c6486efff486c8e6..2085e1217f3aa867b88d25ab65335968acfa7dab 100644 (file)
--- a/modules/gui/qt4/components/controller_widget.cpp
+++ b/modules/gui/qt4/components/controller_widget.cpp
@@ -87,15 +87,15 @@ SoundWidget::SoundWidget( QWidget *_parent, intf_thread_t * _p_intf,
     {
         volumeSlider = new SoundSlider( this,
             config_GetInt( p_intf, "volume-step" ),
-            config_GetInt( p_intf, "qt-volume-complete" ),
-            config_GetPsz( p_intf, "qt-slider-colours" ) );
+            var_InheritInteger( p_intf, "qt-volume-complete" ),
+            var_InheritString( p_intf, "qt-slider-colours" ) );
     }
     else
     {
         volumeSlider = new QSlider( NULL );
         volumeSlider->setOrientation( b_special ? Qt::Vertical
                                                 : Qt::Horizontal );
-        volumeSlider->setMaximum( config_GetInt( p_intf, "qt-volume-complete" )
+        volumeSlider->setMaximum( var_InheritBool( p_intf, "qt-volume-complete" )
                                   ? 400 : 200 );
     }
     if( volumeSlider->orientation() ==  Qt::Horizontal )

diff --git a/modules/gui/qt4/components/interface_widgets.cpp b/modules/gui/qt4/components/interface_widgets.cpp
index d4d33f4bad6edb99761e4346673690e8796d1c62..930b6ded7f4dd1cea0c43e2092c3e5ef8be93138 100644 (file)
--- a/modules/gui/qt4/components/interface_widgets.cpp
+++ b/modules/gui/qt4/components/interface_widgets.cpp
@@ -202,7 +202,7 @@ void VideoWidget::SetFullScreen( bool b_fs )
 
     if( b_fs )
     {   /* Go full-screen */
-        int numscreen =  config_GetInt( p_intf, "qt-fullscreen-screennumber" );
+        int numscreen = var_InheritInteger( p_intf, "qt-fullscreen-screennumber" );
         /* if user hasn't defined screennumber, or screennumber that is bigger
          * than current number of screens, take screennumber where current interface
          * is

diff --git a/modules/gui/qt4/components/open_panels.cpp b/modules/gui/qt4/components/open_panels.cpp
index e283227c83e9e27c221d6de2d4a4d3ca97c2d40d..6e4afb5bcd073018e41fe387200bf9734701616e 100644 (file)
--- a/modules/gui/qt4/components/open_panels.cpp
+++ b/modules/gui/qt4/components/open_panels.cpp
@@ -76,7 +76,7 @@ FileOpenPanel::FileOpenPanel( QWidget *_parent, intf_thread_t *_p_intf ) :
     QCompleter *fileCompleter = new QCompleter( fileCompleteList, this );
     fileCompleter->setModel( new QDirModel( fileCompleter ) );
     lineFileEdit->setCompleter( fileCompleter );*/
-    if( config_GetInt( p_intf, "qt-embedded-open" ) )
+    if( var_InheritBool( p_intf, "qt-embedded-open" ) )
     {
         ui.tempWidget->hide();
         BuildOldPanel();
@@ -274,9 +274,9 @@ DiscOpenPanel::DiscOpenPanel( QWidget *_parent, intf_thread_t *_p_intf ) :
     ui.setupUi( this );
 
     /* Get the default configuration path for the devices */
-    psz_dvddiscpath = config_GetPsz( p_intf, "dvd" );
-    psz_vcddiscpath = config_GetPsz( p_intf, "vcd" );
-    psz_cddadiscpath = config_GetPsz( p_intf, "cd-audio" );
+    psz_dvddiscpath = var_InheritString( p_intf, "dvd" );
+    psz_vcddiscpath = var_InheritString( p_intf, "vcd" );
+    psz_cddadiscpath = var_InheritString( p_intf, "cd-audio" );
 
     /* State to avoid overwritting the users changes with the configuration */
     b_firstdvd = true;
@@ -494,7 +494,7 @@ NetOpenPanel::NetOpenPanel( QWidget *_parent, intf_thread_t *_p_intf ) :
     /* CONNECTs */
     CONNECT( ui.urlText, textChanged( const QString& ), this, updateMRL());
 
-    if( config_GetInt( p_intf, "qt-recentplay" ) )
+    if( var_InheritBool( p_intf, "qt-recentplay" ) )
     {
         mrlList = new QStringListModel(
                 getSettings()->value( "Open/netMRL" ).toStringList() );

diff --git a/modules/gui/qt4/dialogs/bookmarks.cpp b/modules/gui/qt4/dialogs/bookmarks.cpp
index 4feaf515fc686ceca35a9109062430bc7a0142de..fb1f5a6e9f6cd6bb5ef71378a40a4c0e6ace447f 100644 (file)
--- a/modules/gui/qt4/dialogs/bookmarks.cpp
+++ b/modules/gui/qt4/dialogs/bookmarks.cpp
@@ -34,7 +34,7 @@
 BookmarksDialog::BookmarksDialog( intf_thread_t *_p_intf ):QVLCFrame( _p_intf )
 {
     setWindowFlags( Qt::Tool );
-    setWindowOpacity( config_GetFloat( p_intf, "qt-opacity" ) );
+    setWindowOpacity( var_InheritFloat( p_intf, "qt-opacity" ) );
     setWindowTitle( qtr( "Edit Bookmarks" ) );
     setWindowRole( "vlc-bookmarks" );
 

diff --git a/modules/gui/qt4/dialogs/extended.cpp b/modules/gui/qt4/dialogs/extended.cpp
index 87cfff67886c882028ffc39792ccf1cc75db450c..37c3558f210285c411dcc570e55517e887cd2978 100644 (file)
--- a/modules/gui/qt4/dialogs/extended.cpp
+++ b/modules/gui/qt4/dialogs/extended.cpp
@@ -36,7 +36,7 @@
 ExtendedDialog::ExtendedDialog( intf_thread_t *_p_intf ): QVLCFrame( _p_intf )
 {
     setWindowFlags( Qt::Tool );
-    setWindowOpacity( config_GetFloat( p_intf, "qt-opacity" ) );
+    setWindowOpacity( var_InheritFloat( p_intf, "qt-opacity" ) );
     setWindowTitle( qtr( "Adjustments and Effects" ) );
     setWindowRole( "vlc-extended" );
 

diff --git a/modules/gui/qt4/dialogs/external.cpp b/modules/gui/qt4/dialogs/external.cpp
index 8ad7940869b1da1e57950f11f5319f44ac6ff607..1913b497ffb8af4dab1bc8ce3623e1e8e1d575af 100644 (file)
--- a/modules/gui/qt4/dialogs/external.cpp
+++ b/modules/gui/qt4/dialogs/external.cpp
@@ -81,7 +81,7 @@ int DialogHandler::error (vlc_object_t *obj, const char *,
     const dialog_fatal_t *dialog = (const dialog_fatal_t *)value.p_address;
     DialogHandler *self = static_cast<DialogHandler *>(data);
 
-    if (config_GetInt (obj, "qt-error-dialogs"))
+    if (var_InheritBool (obj, "qt-error-dialogs"))
         emit self->error (qfu(dialog->title), qfu(dialog->message));
     return VLC_SUCCESS;
 }

diff --git a/modules/gui/qt4/dialogs/firstrun.hpp b/modules/gui/qt4/dialogs/firstrun.hpp
index f1e71678c0fcfbcaa4fb186e1c9e152ace878b4f..3d2cbb45747a92d5445f58f6fcc7fd92216b3e11 100644 (file)
--- a/modules/gui/qt4/dialogs/firstrun.hpp
+++ b/modules/gui/qt4/dialogs/firstrun.hpp
@@ -35,7 +35,7 @@ class FirstRun : public QWidget
         {
             if( getSettings()->value( "IsFirstRun", 1 ).toInt() )
             {
-                if( config_GetInt( p_intf, "qt-privacy-ask") )
+                if( var_InheritBool( p_intf, "qt-privacy-ask") )
                 {
                     new FirstRun( _p, p_intf );
                 }

diff --git a/modules/gui/qt4/dialogs/messages.cpp b/modules/gui/qt4/dialogs/messages.cpp
index 84d7259a19055ca221a6d2ff3fe02094d408ee86..e31a780b4cd6d478adda4b663c8dc7db69156ddc 100644 (file)
--- a/modules/gui/qt4/dialogs/messages.cpp
+++ b/modules/gui/qt4/dialogs/messages.cpp
@@ -114,7 +114,7 @@ MessagesDialog::MessagesDialog( intf_thread_t *_p_intf)
 
     verbosityBox = new QSpinBox();
     verbosityBox->setRange( 0, 2 );
-    verbosityBox->setValue( config_GetInt( p_intf, "verbose" ) );
+    verbosityBox->setValue( var_InheritInteger( p_intf, "verbose" ) );
     verbosityBox->setWrapping( true );
     verbosityBox->setMaximumWidth( 50 );
 

diff --git a/modules/gui/qt4/dialogs/open.cpp b/modules/gui/qt4/dialogs/open.cpp
index b2a782ed65a318e8046758ab97d526b041009fc0..bb45cfafdd0e0417eb7d1a29149fc981cc288cf5 100644 (file)
--- a/modules/gui/qt4/dialogs/open.cpp
+++ b/modules/gui/qt4/dialogs/open.cpp
@@ -167,7 +167,7 @@ OpenDialog::OpenDialog( QWidget *parent,
     BUTTONACT( cancelButton, cancel() );
 
     /* Hide the advancedPanel */
-    if( !config_GetInt( p_intf, "qt-adv-options" ) )
+    if( !var_InheritBool( p_intf, "qt-adv-options" ) )
         ui.advancedFrame->hide();
     else
         ui.advancedCheckBox->setChecked( true );
@@ -406,11 +406,8 @@ void OpenDialog::updateMRL() {
     if( ui.slaveCheckbox->isChecked() ) {
         mrl += " :input-slave=" + ui.slaveText->text();
     }
-    int i_cache = config_GetInt( p_intf, qtu( storedMethod ) );
-    if( i_cache != ui.cacheSpinBox->value() ) {
-        mrl += QString( " :%1=%2" ).arg( storedMethod ).
-                                  arg( ui.cacheSpinBox->value() );
-    }
+    mrl += QString( " :%1=%2" ).arg( storedMethod ).
+                                arg( ui.cacheSpinBox->value() );
     if( ui.startTimeDoubleSpinBox->value() ) {
         mrl += " :start-time=" + QString::number( ui.startTimeDoubleSpinBox->value() );
     }
@@ -422,7 +419,7 @@ void OpenDialog::newCachingMethod( const QString& method )
 {
     if( method != storedMethod ) {
         storedMethod = method;
-        int i_value = config_GetInt( p_intf, qtu( storedMethod ) );
+        int i_value = var_InheritInteger( p_intf, qtu( storedMethod ) );
         ui.cacheSpinBox->setValue( i_value );
     }
 }

diff --git a/modules/gui/qt4/dialogs/playlist.cpp b/modules/gui/qt4/dialogs/playlist.cpp
index f64cc7d023ad5089751a8ee97b558a9132767376..7250090550553396f2452b5115dccca5ae208af1 100644 (file)
--- a/modules/gui/qt4/dialogs/playlist.cpp
+++ b/modules/gui/qt4/dialogs/playlist.cpp
@@ -40,7 +40,7 @@ PlaylistDialog::PlaylistDialog( intf_thread_t *_p_intf )
     setCentralWidget( main );
     setWindowTitle( qtr( "Playlist" ) );
     setWindowRole( "vlc-playlist" );
-    setWindowOpacity( config_GetFloat( p_intf, "qt-opacity" ) );
+    setWindowOpacity( var_InheritFloat( p_intf, "qt-opacity" ) );
 
     QHBoxLayout *l = new QHBoxLayout( centralWidget() );
 

diff --git a/modules/gui/qt4/dialogs/preferences.cpp b/modules/gui/qt4/dialogs/preferences.cpp
index 961404c73977c819c5b6cfd5704d175fe9eb6cda..32b6704fbbc81e95be1f8779d2e10fd62bef26fb 100644 (file)
--- a/modules/gui/qt4/dialogs/preferences.cpp
+++ b/modules/gui/qt4/dialogs/preferences.cpp
@@ -115,7 +115,8 @@ PrefsDialog::PrefsDialog( QWidget *parent, intf_thread_t *_p_intf )
     setMaximumHeight( p_intf->p_sys->i_screenHeight );
     for( int i = 0; i < SPrefsMax ; i++ ) simple_panels[i] = NULL;
 
-    if( config_GetInt( p_intf, "qt-advanced-pref" ) || config_GetInt( p_intf, "advanced" ) )
+    if( var_InheritBool( p_intf, "qt-advanced-pref" )
+     || var_InheritBool( p_intf, "advanced" ) )
         setAdvanced();
     else
         setSmall();

diff --git a/modules/gui/qt4/input_manager.cpp b/modules/gui/qt4/input_manager.cpp
index e0150772c05f75a34ca042abe1aae52272b82c50..0eb04156439c835e695be9c22d8f2faee023676f 100644 (file)
--- a/modules/gui/qt4/input_manager.cpp
+++ b/modules/gui/qt4/input_manager.cpp
@@ -834,7 +834,7 @@ void InputManager::setRate( int new_rate )
 
 void InputManager::jumpFwd()
 {
-    int i_interval = config_GetInt( p_input, "short-jump-size" );
+    int i_interval = var_InheritInteger( p_input, "short-jump-size" );
     if( i_interval > 0 )
     {
         mtime_t val = (mtime_t)(i_interval) * 1000000L;
@@ -844,7 +844,7 @@ void InputManager::jumpFwd()
 
 void InputManager::jumpBwd()
 {
-    int i_interval = config_GetInt( p_input, "short-jump-size" );
+    int i_interval = var_InheritInteger( p_input, "short-jump-size" );
     if( i_interval > 0 )
     {
         mtime_t val = -1 *(mtime_t)(i_interval) * 1000000L;

diff --git a/modules/gui/qt4/main_interface.cpp b/modules/gui/qt4/main_interface.cpp
index 9d33afdd4c9c8c172511d74813e8b8d402dd35eb..f0083fb2cb127d61648004ecbdccd9fba2b585d5 100644 (file)
--- a/modules/gui/qt4/main_interface.cpp
+++ b/modules/gui/qt4/main_interface.cpp
@@ -111,19 +111,19 @@ MainInterface::MainInterface( intf_thread_t *_p_intf ) : QVLCMW( _p_intf )
     setAcceptDrops( true );
     setWindowRole( "vlc-main" );
     setWindowIcon( QApplication::windowIcon() );
-    setWindowOpacity( config_GetFloat( p_intf, "qt-opacity" ) );
+    setWindowOpacity( var_InheritFloat( p_intf, "qt-opacity" ) );
 
     /* Set The Video In emebedded Mode or not */
-    videoEmbeddedFlag = config_GetInt( p_intf, "embedded-video" );
+    videoEmbeddedFlag = var_InheritBool( p_intf, "embedded-video" );
 
     /* Does the interface resize to video size or the opposite */
-    b_keep_size = !config_GetInt( p_intf, "qt-video-autoresize" );
+    b_keep_size = !var_InheritBool( p_intf, "qt-video-autoresize" );
 
     /* Are we in the enhanced always-video mode or not ? */
-    i_visualmode = config_GetInt( p_intf, "qt-display-mode" );
+    i_visualmode = var_InheritInteger( p_intf, "qt-display-mode" );
 
     /* Do we want anoying popups or not */
-    notificationEnabled = (bool)config_GetInt( p_intf, "qt-notification" );
+    notificationEnabled = (bool)var_InheritBool( p_intf, "qt-notification" );
 
     /* Set the other interface settings */
     settings = getSettings();
@@ -190,7 +190,7 @@ MainInterface::MainInterface( intf_thread_t *_p_intf ) : QVLCMW( _p_intf )
     }
 #endif
     /* and title of the Main Interface*/
-    if( config_GetInt( p_intf, "qt-name-in-title" ) )
+    if( var_InheritBool( p_intf, "qt-name-in-title" ) )
     {
         CONNECT( THEMIM->getIM(), nameChanged( const QString& ),
                  this, setVLCWindowsTitle( const QString& ) );
@@ -443,7 +443,7 @@ void MainInterface::createMainWidget( QSettings *settings )
     if ( depth() > 8 )
 #endif
     /* Create the FULLSCREEN CONTROLS Widget */
-    if( config_GetInt( p_intf, "qt-fs-controller" ) )
+    if( var_InheritBool( p_intf, "qt-fs-controller" ) )
     {
         fullscreenControls = new FullscreenControllerWidget( p_intf, this );
         CONNECT( fullscreenControls, keyPressed( QKeyEvent * ),
@@ -455,9 +455,9 @@ inline void MainInterface::initSystray()
 {
 #ifndef HAVE_MAEMO
     bool b_systrayAvailable = QSystemTrayIcon::isSystemTrayAvailable();
-    bool b_systrayWanted = config_GetInt( p_intf, "qt-system-tray" );
+    bool b_systrayWanted = var_InheritBool( p_intf, "qt-system-tray" );
 
-    if( config_GetInt( p_intf, "qt-start-minimized") > 0 )
+    if( var_InheritBool( p_intf, "qt-start-minimized") )
     {
         if( b_systrayAvailable )
         {

diff --git a/modules/gui/qt4/menus.cpp b/modules/gui/qt4/menus.cpp
index 776835e8e0152e088ff36f0884c74407cefb05ae..5aa45a2836feddf4d844d4634e58dd977f0cc5be 100644 (file)
--- a/modules/gui/qt4/menus.cpp
+++ b/modules/gui/qt4/menus.cpp
@@ -325,7 +325,7 @@ QMenu *QVLCMenu::FileMenu( intf_thread_t *p_intf, QWidget *parent )
     addDPStaticEntry( menu, qtr( "Open &Location from clipboard" ),
                       NULL, SLOT( openUrlDialog() ), "Ctrl+V" );
 
-    if( config_GetInt( p_intf, "qt-recentplay" ) )
+    if( var_InheritBool( p_intf, "qt-recentplay" ) )
     {
         recentsMenu = new QMenu( qtr( "&Recent Media" ), menu );
         updateRecents( p_intf );

diff --git a/modules/gui/qt4/qt4.cpp b/modules/gui/qt4/qt4.cpp
index e7e724ff3209cd0a56a9399ca6845fc908dc6ba0..010758c84768651e6d1f7864c8758f5bb48b50b7 100644 (file)
--- a/modules/gui/qt4/qt4.cpp
+++ b/modules/gui/qt4/qt4.cpp
@@ -394,10 +394,10 @@ static void *Thread( void *obj )
 
 #ifdef UPDATE_CHECK
     /* Checking for VLC updates */
-    if( config_GetInt( p_intf, "qt-updates-notif" ) &&
-        !config_GetInt( p_intf, "qt-privacy-ask" ) )
+    if( var_InheritBool( p_intf, "qt-updates-notif" ) &&
+        !var_InheritBool( p_intf, "qt-privacy-ask" ) )
     {
-        int interval = config_GetInt( p_intf, "qt-updates-days" );
+        int interval = var_InheritInteger( p_intf, "qt-updates-days" );
         if( QDate::currentDate() >
              getSettings()->value( "updatedate" ).toDate().addDays( interval ) )
         {

diff --git a/modules/gui/qt4/recents.cpp b/modules/gui/qt4/recents.cpp
index 7a210f00b67f4e747889616c5c17ed24a7ebfd97..99fb82749607a237ad16cc7bc6b6abb8fcd8a7b5 100644 (file)
--- a/modules/gui/qt4/recents.cpp
+++ b/modules/gui/qt4/recents.cpp
@@ -49,7 +49,7 @@ RecentsMRL::RecentsMRL( intf_thread_t *_p_intf ) : p_intf( _p_intf )
             playMRL( const QString & ) );
 
     /* Load the filter psz */
-    char* psz_tmp = config_GetPsz( p_intf, "qt-recentplay-filter" );
+    char* psz_tmp = var_InheritString( p_intf, "qt-recentplay-filter" );
     if( psz_tmp && *psz_tmp )
         filter = new QRegExp( psz_tmp, Qt::CaseInsensitive );
     else
@@ -57,7 +57,7 @@ RecentsMRL::RecentsMRL( intf_thread_t *_p_intf ) : p_intf( _p_intf )
     free( psz_tmp );
 
     load();
-    isActive = config_GetInt( p_intf, "qt-recentplay" );
+    isActive = var_InheritBool( p_intf, "qt-recentplay" );
     if( !isActive ) clear();
 }