more precise fixes (followup be81716)

jef-n · jef-n · commit a2a10e97135f · 2015-12-06T22:26:18.000+01:00
diff --git a/src/app/qgsfieldsproperties.cpp b/src/app/qgsfieldsproperties.cpp
@@ -465,11 +465,11 @@ void QgsFieldsProperties::on_mMoveUpItem_clicked()
 void QgsFieldsProperties::on_mInitCodeSourceComboBox_currentIndexChanged( int codeSource )
 {
   // Show or hide ui elements as needed
-  mInitFunctionContainer->setVisible( codeSource != QgsEditFormConfig::PythonInitCodeSource::CodeSourceNone );
-  mPythonInitCodeGroupBox->setVisible( codeSource == QgsEditFormConfig::PythonInitCodeSource::CodeSourceDialog );
-  mInitFilePathLineEdit->setVisible( codeSource == QgsEditFormConfig::PythonInitCodeSource::CodeSourceFile );
-  mInitFilePathLabel->setVisible( codeSource == QgsEditFormConfig::PythonInitCodeSource::CodeSourceFile );
-  pbtnSelectInitFilePath->setVisible( codeSource == QgsEditFormConfig::PythonInitCodeSource::CodeSourceFile );
+  mInitFunctionContainer->setVisible( codeSource != QgsEditFormConfig::CodeSourceNone );
+  mPythonInitCodeGroupBox->setVisible( codeSource == QgsEditFormConfig::CodeSourceDialog );
+  mInitFilePathLineEdit->setVisible( codeSource == QgsEditFormConfig::CodeSourceFile );
+  mInitFilePathLabel->setVisible( codeSource == QgsEditFormConfig::CodeSourceFile );
+  pbtnSelectInitFilePath->setVisible( codeSource == QgsEditFormConfig::CodeSourceFile );
 }
 
 void QgsFieldsProperties::attributeTypeDialog()
diff --git a/src/app/qgsvectorlayerproperties.cpp b/src/app/qgsvectorlayerproperties.cpp
@@ -730,10 +730,10 @@ void QgsVectorLayerProperties::loadDefaultStyle_clicked()
 
     switch ( askToUser.exec() )
     {
-      case( 0 ):
+      case 0:
         return;
         break;
-      case( 2 ):
+      case 2:
         msg = layer->loadNamedStyle( layer->styleURI(), defaultLoadedFlag );
         if ( !defaultLoadedFlag )
         {
@@ -787,10 +787,10 @@ void QgsVectorLayerProperties::saveDefaultStyle_clicked()
 
     switch ( askToUser.exec() )
     {
-      case( 0 ):
+      case 0:
         return;
         break;
-      case( 2 ):
+      case 2:
         layer->saveStyleToDatabase( "", "", true, "", errorMsg );
         if ( errorMsg.isNull() )
         {
diff --git a/src/core/qgsvectorlayer.cpp b/src/core/qgsvectorlayer.cpp
@@ -1801,7 +1801,7 @@ bool QgsVectorLayer::readSymbology( const QDomNode& node, QString& errorMessage
   int dotPos = initFunction.lastIndexOf( '.' );
   if ( dotPos >= 0 ) // It's a module
   {
-    mEditFormConfig->setInitCodeSource( QgsEditFormConfig::PythonInitCodeSource::CodeSourceDialog );
+    mEditFormConfig->setInitCodeSource( QgsEditFormConfig::CodeSourceDialog );
     mEditFormConfig->setInitFunction( initFunction.mid( dotPos + 1 ) );
     mEditFormConfig->setInitCode( QString( "from %1 import %2\n" ).arg( initFunction.left( dotPos ), initFunction.mid( dotPos + 1 ) ) );
   }
diff --git a/src/gui/qgsattributeform.cpp b/src/gui/qgsattributeform.cpp
@@ -580,7 +580,7 @@ void QgsAttributeForm::initPython()
   // Init Python, if init function is not empty and the combo indicates
   // the source for the function code
   if ( !mLayer->editFormConfig()->initFunction().isEmpty()
-       && mLayer->editFormConfig()->initCodeSource() != QgsEditFormConfig::PythonInitCodeSource::CodeSourceNone )
+       && mLayer->editFormConfig()->initCodeSource() != QgsEditFormConfig::CodeSourceNone )
   {
 
     QString initFunction = mLayer->editFormConfig()->initFunction();
@@ -589,7 +589,7 @@ void QgsAttributeForm::initPython()
 
     switch ( mLayer->editFormConfig()->initCodeSource() )
     {
-      case QgsEditFormConfig::PythonInitCodeSource::CodeSourceFile:
+      case QgsEditFormConfig::CodeSourceFile:
         if ( ! initFilePath.isEmpty() )
         {
           QFile inputFile( initFilePath );
@@ -612,16 +612,16 @@ void QgsAttributeForm::initPython()
         }
         break;
 
-      case( QgsEditFormConfig::PythonInitCodeSource::CodeSourceDialog ):
+      case QgsEditFormConfig::CodeSourceDialog:
         initCode = mLayer->editFormConfig()->initCode();
         if ( initCode.isEmpty() )
         {
           QgsLogger::warning( QString( "The python code provided in the dialog is empty!" ) );
         }
         break;
 
-      case( QgsEditFormConfig::PythonInitCodeSource::CodeSourceEnvironment ):
-      case( QgsEditFormConfig::PythonInitCodeSource::CodeSourceNone ):
+      case QgsEditFormConfig::CodeSourceEnvironment:
+      case QgsEditFormConfig::CodeSourceNone:
       default:
         // Nothing to do: the function code should be already in the environment
         break;

Original file line number	Diff line number	Diff line change
`@@ -730,10 +730,10 @@ void QgsVectorLayerProperties::loadDefaultStyle_clicked()`
`730`	`730`
`731`	`731`	`switch ( askToUser.exec() )`
`732`	`732`	`{`
`733`		`- case( 0 ):`
	`733`	`+ case 0:`
`734`	`734`	`return;`
`735`	`735`	`break;`
`736`		`- case( 2 ):`
	`736`	`+ case 2:`
`737`	`737`	`msg = layer->loadNamedStyle( layer->styleURI(), defaultLoadedFlag );`
`738`	`738`	`if ( !defaultLoadedFlag )`
`739`	`739`	`{`
`@@ -787,10 +787,10 @@ void QgsVectorLayerProperties::saveDefaultStyle_clicked()`
`787`	`787`
`788`	`788`	`switch ( askToUser.exec() )`
`789`	`789`	`{`
`790`		`- case( 0 ):`
	`790`	`+ case 0:`
`791`	`791`	`return;`
`792`	`792`	`break;`
`793`		`- case( 2 ):`
	`793`	`+ case 2:`
`794`	`794`	`layer->saveStyleToDatabase( "", "", true, "", errorMsg );`
`795`	`795`	`if ( errorMsg.isNull() )`
`796`	`796`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1801,7 +1801,7 @@ bool QgsVectorLayer::readSymbology( const QDomNode& node, QString& errorMessage`
`1801`	`1801`	`int dotPos = initFunction.lastIndexOf( '.' );`
`1802`	`1802`	`if ( dotPos >= 0 ) // It's a module`
`1803`	`1803`	`{`
`1804`		`- mEditFormConfig->setInitCodeSource( QgsEditFormConfig::PythonInitCodeSource::CodeSourceDialog );`
	`1804`	`+ mEditFormConfig->setInitCodeSource( QgsEditFormConfig::CodeSourceDialog );`
`1805`	`1805`	`mEditFormConfig->setInitFunction( initFunction.mid( dotPos + 1 ) );`
`1806`	`1806`	`mEditFormConfig->setInitCode( QString( "from %1 import %2\n" ).arg( initFunction.left( dotPos ), initFunction.mid( dotPos + 1 ) ) );`
`1807`	`1807`	`}`
Original file line number	Diff line number	Diff line change
`@@ -580,7 +580,7 @@ void QgsAttributeForm::initPython()`
`580`	`580`	`// Init Python, if init function is not empty and the combo indicates`
`581`	`581`	`// the source for the function code`
`582`	`582`	`if ( !mLayer->editFormConfig()->initFunction().isEmpty()`
`583`		`- && mLayer->editFormConfig()->initCodeSource() != QgsEditFormConfig::PythonInitCodeSource::CodeSourceNone )`
	`583`	`+ && mLayer->editFormConfig()->initCodeSource() != QgsEditFormConfig::CodeSourceNone )`
`584`	`584`	`{`
`585`	`585`
`586`	`586`	`QString initFunction = mLayer->editFormConfig()->initFunction();`
`@@ -589,7 +589,7 @@ void QgsAttributeForm::initPython()`
`589`	`589`
`590`	`590`	`switch ( mLayer->editFormConfig()->initCodeSource() )`
`591`	`591`	`{`
`592`		`- case QgsEditFormConfig::PythonInitCodeSource::CodeSourceFile:`
	`592`	`+ case QgsEditFormConfig::CodeSourceFile:`
`593`	`593`	`if ( ! initFilePath.isEmpty() )`
`594`	`594`	`{`
`595`	`595`	`QFile inputFile( initFilePath );`
`@@ -612,16 +612,16 @@ void QgsAttributeForm::initPython()`
`612`	`612`	`}`
`613`	`613`	`break;`
`614`	`614`
`615`		`- case( QgsEditFormConfig::PythonInitCodeSource::CodeSourceDialog ):`
	`615`	`+ case QgsEditFormConfig::CodeSourceDialog:`
`616`	`616`	`initCode = mLayer->editFormConfig()->initCode();`
`617`	`617`	`if ( initCode.isEmpty() )`
`618`	`618`	`{`
`619`	`619`	`QgsLogger::warning( QString( "The python code provided in the dialog is empty!" ) );`
`620`	`620`	`}`
`621`	`621`	`break;`
`622`	`622`
`623`		`- case( QgsEditFormConfig::PythonInitCodeSource::CodeSourceEnvironment ):`
`624`		`- case( QgsEditFormConfig::PythonInitCodeSource::CodeSourceNone ):`
	`623`	`+ case QgsEditFormConfig::CodeSourceEnvironment:`
	`624`	`+ case QgsEditFormConfig::CodeSourceNone:`
`625`	`625`	`default:`
`626`	`626`	`// Nothing to do: the function code should be already in the environment`
`627`	`627`	`break;`