Finish refactoring that caused build error

dakcarto · dakcarto · commit ccbd3e2e9d3d · 2013-01-12T20:07:05.000-07:00
diff --git a/src/app/qgsoptions.cpp b/src/app/qgsoptions.cpp
@@ -462,7 +462,7 @@ QgsOptions::QgsOptions( QWidget *parent, Qt::WFlags fl ) :
   }
   blockSignals( false );
 
-  mInfoBarTimeoutSpnBx->setValue( settings.value( "/qgis/messageTimeout", 5 ).toInt() );
+  mMessageTimeoutSpnBx->setValue( settings.value( "/qgis/messageTimeout", 5 ).toInt() );
 
   QString name = QApplication::style()->objectName();
   cmbStyle->setCurrentIndex( cmbStyle->findText( name, Qt::MatchFixedString ) );
@@ -1080,8 +1080,8 @@ void QgsOptions::saveOptions()
   settings.setValue( "/fontFamily", fontFamily );
   QgisApp::instance()->setAppStyleSheet();
 
-  settings.setValue( "/qgis/messageTimeout", mInfoBarTimeoutSpnBx->value() );
-  QgisApp::instance()->setMessageTimeout( mInfoBarTimeoutSpnBx->value() );
+  settings.setValue( "/qgis/messageTimeout", mMessageTimeoutSpnBx->value() );
+  QgisApp::instance()->setMessageTimeout( mMessageTimeoutSpnBx->value() );
 
   // rasters settings
   settings.setValue( "/Raster/defaultRedBand", spnRed->value() );
diff --git a/src/ui/qgsoptionsbase.ui b/src/ui/qgsoptionsbase.ui
@@ -468,7 +468,7 @@
                   <item>
                    <layout class="QHBoxLayout" name="horizontalLayout_28">
                     <item>
-                     <widget class="QLabel" name="mInfoBarTimeoutLabel">
+                     <widget class="QLabel" name="mMessageTimeoutLabel">
                       <property name="sizePolicy">
                        <sizepolicy hsizetype="Maximum" vsizetype="Preferred">
                         <horstretch>0</horstretch>
@@ -494,7 +494,7 @@
                      </spacer>
                     </item>
                     <item>
-                     <widget class="QSpinBox" name="mInfoBarTimeoutSpnBx">
+                     <widget class="QSpinBox" name="mMessageTimeoutSpnBx">
                       <property name="suffix">
                        <string> s</string>
                       </property>
