fix renaming of db/http connections (fixes #10632)

jef-n · jef-n · commit 5bf316fec6ab · 2015-06-11T23:03:05.000+02:00
diff --git a/src/gui/qgsnewhttpconnection.cpp b/src/gui/qgsnewhttpconnection.cpp
@@ -158,7 +158,7 @@ void QgsNewHttpConnection::accept()
   QString credentialsKey = "/Qgis/" + mCredentialsBaseKey + "/" + txtName->text();
 
   // warn if entry was renamed to an existing connection
-  if (( mOriginalConnName.isNull() || mOriginalConnName != txtName->text() ) &&
+  if (( mOriginalConnName.isNull() || mOriginalConnName.compare( txtName->text(), Qt::CaseInsensitive ) != 0 ) &&
       settings.contains( key + "/url" ) &&
       QMessageBox::question( this,
                              tr( "Save connection" ),
@@ -182,6 +182,7 @@ void QgsNewHttpConnection::accept()
   {
     settings.remove( mBaseKey + mOriginalConnName );
     settings.remove( "/Qgis/" + mCredentialsBaseKey + "/" + mOriginalConnName );
+    settings.sync();
   }
 
   QUrl url( txtUrl->text().trimmed() );
diff --git a/src/providers/mssql/qgsmssqlnewconnection.cpp b/src/providers/mssql/qgsmssqlnewconnection.cpp
@@ -58,18 +58,6 @@ QgsMssqlNewConnection::QgsMssqlNewConnection( QWidget *parent, const QString& co
       chkStorePassword->setChecked( true );
     }
 
-    // Old save setting
-    if ( settings.contains( key + "/save" ) )
-    {
-      txtUsername->setText( settings.value( key + "/username" ).toString() );
-      chkStoreUsername->setChecked( !txtUsername->text().isEmpty() );
-
-      if ( settings.value( key + "/save" ).toString() == "true" )
-        txtPassword->setText( settings.value( key + "/password" ).toString() );
-
-      chkStorePassword->setChecked( true );
-    }
-
     txtName->setText( connName );
   }
   on_cb_trustedConnection_clicked();
@@ -91,7 +79,7 @@ void QgsMssqlNewConnection::accept()
   }
 
   // warn if entry was renamed to an existing connection
-  if (( mOriginalConnName.isNull() || mOriginalConnName != txtName->text() ) &&
+  if (( mOriginalConnName.isNull() || mOriginalConnName.compare( txtName->text(), Qt::CaseInsensitive ) != 0 ) &&
       ( settings.contains( baseKey + txtName->text() + "/service" ) ||
         settings.contains( baseKey + txtName->text() + "/host" ) ) &&
       QMessageBox::question( this,
@@ -105,8 +93,8 @@ void QgsMssqlNewConnection::accept()
   // on rename delete the original entry first
   if ( !mOriginalConnName.isNull() && mOriginalConnName != txtName->text() )
   {
-
     settings.remove( baseKey + mOriginalConnName );
+    settings.sync();
   }
 
   baseKey += txtName->text();
diff --git a/src/providers/oracle/qgsoraclenewconnection.cpp b/src/providers/oracle/qgsoraclenewconnection.cpp
@@ -95,7 +95,7 @@ void QgsOracleNewConnection::accept()
   }
 
   // warn if entry was renamed to an existing connection
-  if (( mOriginalConnName.isNull() || mOriginalConnName != txtName->text() ) &&
+  if (( mOriginalConnName.isNull() || mOriginalConnName.compare( txtName->text(), Qt::CaseInsensitive ) != 0 ) &&
       ( settings.contains( baseKey + txtName->text() + "/service" ) ||
         settings.contains( baseKey + txtName->text() + "/host" ) ) &&
       QMessageBox::question( this,
@@ -109,8 +109,8 @@ void QgsOracleNewConnection::accept()
   // on rename delete the original entry first
   if ( !mOriginalConnName.isNull() && mOriginalConnName != txtName->text() )
   {
-
     settings.remove( baseKey + mOriginalConnName );
+    settings.sync();
   }
 
   baseKey += txtName->text();
@@ -128,9 +128,6 @@ void QgsOracleNewConnection::accept()
   settings.setValue( baseKey + "/savePassword", chkStorePassword->isChecked() ? "true" : "false" );
   settings.setValue( baseKey + "/dboptions", txtOptions->text() );
 
-  // remove old save setting
-  settings.remove( baseKey + "/save" );
-
   QDialog::accept();
 }
 
diff --git a/src/providers/postgres/qgspgnewconnection.cpp b/src/providers/postgres/qgspgnewconnection.cpp
@@ -105,7 +105,7 @@ void QgsPgNewConnection::accept()
   }
 
   // warn if entry was renamed to an existing connection
-  if (( mOriginalConnName.isNull() || mOriginalConnName != txtName->text() ) &&
+  if (( mOriginalConnName.isNull() || mOriginalConnName.compare( txtName->text(), Qt::CaseInsensitive ) != 0 ) &&
       ( settings.contains( baseKey + txtName->text() + "/service" ) ||
         settings.contains( baseKey + txtName->text() + "/host" ) ) &&
       QMessageBox::question( this,
@@ -119,8 +119,8 @@ void QgsPgNewConnection::accept()
   // on rename delete the original entry first
   if ( !mOriginalConnName.isNull() && mOriginalConnName != txtName->text() )
   {
-
     settings.remove( baseKey + mOriginalConnName );
+    settings.sync();
   }
 
   baseKey += txtName->text();

Original file line number	Diff line number	Diff line change
`@@ -158,7 +158,7 @@ void QgsNewHttpConnection::accept()`
`158`	`158`	`QString credentialsKey = "/Qgis/" + mCredentialsBaseKey + "/" + txtName->text();`
`159`	`159`
`160`	`160`	`// warn if entry was renamed to an existing connection`
`161`		`- if (( mOriginalConnName.isNull() \|\| mOriginalConnName != txtName->text() ) &&`
	`161`	`+ if (( mOriginalConnName.isNull() \|\| mOriginalConnName.compare( txtName->text(), Qt::CaseInsensitive ) != 0 ) &&`
`162`	`162`	`settings.contains( key + "/url" ) &&`
`163`	`163`	`QMessageBox::question( this,`
`164`	`164`	`tr( "Save connection" ),`
`@@ -182,6 +182,7 @@ void QgsNewHttpConnection::accept()`
`182`	`182`	`{`
`183`	`183`	`settings.remove( mBaseKey + mOriginalConnName );`
`184`	`184`	`settings.remove( "/Qgis/" + mCredentialsBaseKey + "/" + mOriginalConnName );`
	`185`	`+ settings.sync();`
`185`	`186`	`}`
`186`	`187`
`187`	`188`	`QUrl url( txtUrl->text().trimmed() );`
Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,7 @@ void QgsOracleNewConnection::accept()`
`95`	`95`	`}`
`96`	`96`
`97`	`97`	`// warn if entry was renamed to an existing connection`
`98`		`- if (( mOriginalConnName.isNull() \|\| mOriginalConnName != txtName->text() ) &&`
	`98`	`+ if (( mOriginalConnName.isNull() \|\| mOriginalConnName.compare( txtName->text(), Qt::CaseInsensitive ) != 0 ) &&`
`99`	`99`	`( settings.contains( baseKey + txtName->text() + "/service" ) \|\|`
`100`	`100`	`settings.contains( baseKey + txtName->text() + "/host" ) ) &&`
`101`	`101`	`QMessageBox::question( this,`
`@@ -109,8 +109,8 @@ void QgsOracleNewConnection::accept()`
`109`	`109`	`// on rename delete the original entry first`
`110`	`110`	`if ( !mOriginalConnName.isNull() && mOriginalConnName != txtName->text() )`
`111`	`111`	`{`
`112`		`-`
`113`	`112`	`settings.remove( baseKey + mOriginalConnName );`
	`113`	`+ settings.sync();`
`114`	`114`	`}`
`115`	`115`
`116`	`116`	`baseKey += txtName->text();`
`@@ -128,9 +128,6 @@ void QgsOracleNewConnection::accept()`
`128`	`128`	`settings.setValue( baseKey + "/savePassword", chkStorePassword->isChecked() ? "true" : "false" );`
`129`	`129`	`settings.setValue( baseKey + "/dboptions", txtOptions->text() );`
`130`	`130`
`131`		`- // remove old save setting`
`132`		`- settings.remove( baseKey + "/save" );`
`133`		`-`
`134`	`131`	`QDialog::accept();`
`135`	`132`	`}`
`136`	`133`
Original file line number	Diff line number	Diff line change
`@@ -105,7 +105,7 @@ void QgsPgNewConnection::accept()`
`105`	`105`	`}`
`106`	`106`
`107`	`107`	`// warn if entry was renamed to an existing connection`
`108`		`- if (( mOriginalConnName.isNull() \|\| mOriginalConnName != txtName->text() ) &&`
	`108`	`+ if (( mOriginalConnName.isNull() \|\| mOriginalConnName.compare( txtName->text(), Qt::CaseInsensitive ) != 0 ) &&`
`109`	`109`	`( settings.contains( baseKey + txtName->text() + "/service" ) \|\|`
`110`	`110`	`settings.contains( baseKey + txtName->text() + "/host" ) ) &&`
`111`	`111`	`QMessageBox::question( this,`
`@@ -119,8 +119,8 @@ void QgsPgNewConnection::accept()`
`119`	`119`	`// on rename delete the original entry first`
`120`	`120`	`if ( !mOriginalConnName.isNull() && mOriginalConnName != txtName->text() )`
`121`	`121`	`{`
`122`		`-`
`123`	`122`	`settings.remove( baseKey + mOriginalConnName );`
	`123`	`+ settings.sync();`
`124`	`124`	`}`
`125`	`125`
`126`	`126`	`baseKey += txtName->text();`