[vlc-commits] Use qt iso qt4

[Jean-Baptiste Kempf]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Wed Jul  4 01:30:25 2012 +0200| [6ef3c715489451ae36a1e6bfcc30bd2fc5d1395c] | committer: Jean-Baptiste Kempf

Use qt iso qt4

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=6ef3c715489451ae36a1e6bfcc30bd2fc5d1395c
---

 modules/gui/qt4/components/simple_preferences.cpp |    6 +++---
 modules/gui/qt4/ui/sprefs_interface.ui            |    4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/modules/gui/qt4/components/simple_preferences.cpp b/modules/gui/qt4/components/simple_preferences.cpp
index 14c6872..3ff0087 100644
--- a/modules/gui/qt4/components/simple_preferences.cpp
+++ b/modules/gui/qt4/components/simple_preferences.cpp
@@ -549,12 +549,12 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
                     ui.skins->setChecked( true );
             } else {
                 /* defaults to qt */
-                ui.qt4->setChecked( true );
+                ui.qt->setChecked( true );
             }
             free( psz_intf );
 
             optionWidgets.append( ui.skins );
-            optionWidgets.append( ui.qt4 );
+            optionWidgets.append( ui.qt );
 #if !defined( WIN32)
             ui.stylesCombo->addItem( qtr("System's default") );
             ui.stylesCombo->addItems( QStyleFactory::keys() );
@@ -572,7 +572,7 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
             optionWidgets.append( NULL );
 #endif
             radioGroup = new QButtonGroup(this);
-            radioGroup->addButton( ui.qt4, 0 );
+            radioGroup->addButton( ui.qt, 0 );
             radioGroup->addButton( ui.skins, 1 );
             CONNECT( radioGroup, buttonClicked( int ),
                      ui.styleStackedWidget, setCurrentIndex( int ) );
diff --git a/modules/gui/qt4/ui/sprefs_interface.ui b/modules/gui/qt4/ui/sprefs_interface.ui
index c0fcb91..a372240 100644
--- a/modules/gui/qt4/ui/sprefs_interface.ui
+++ b/modules/gui/qt4/ui/sprefs_interface.ui
@@ -348,7 +348,7 @@
        </spacer>
       </item>
       <item row="0" column="2">
-       <widget class="QRadioButton" name="qt4">
+       <widget class="QRadioButton" name="qt">
         <property name="toolTip">
          <string>This is VLC's default interface, with a native look and feel.</string>
         </property>
@@ -674,7 +674,7 @@
  </customwidgets>
  <tabstops>
   <tabstop>language</tabstop>
-  <tabstop>qt4</tabstop>
+  <tabstop>qt</tabstop>
   <tabstop>skins</tabstop>
   <tabstop>fsController</tabstop>
   <tabstop>minimalviewBox</tabstop>