fix 8c873b1 (fixes #16624)

jef-n · jef-n · commit 5f10a0baf3ea · 2017-06-09T08:01:41.000+02:00
(cherry picked from commit 6326947)
diff --git a/src/app/ogr/qgsnewogrconnection.cpp b/src/app/ogr/qgsnewogrconnection.cpp
@@ -67,10 +67,10 @@ QgsNewOgrConnection::QgsNewOgrConnection( QWidget *parent, const QString& connTy
     }
     cmbDatabaseTypes->setCurrentIndex( cmbDatabaseTypes->findText( connType ) );
     txtName->setText( connName );
-    txtName->setValidator( new QRegExpValidator( QRegExp( "[^\\/]+" ), txtName ) );
     txtName->setEnabled( false );
     cmbDatabaseTypes->setEnabled( false );
   }
+  txtName->setValidator( new QRegExpValidator( QRegExp( "[^\\/]+" ), txtName ) );
 }
 
 QgsNewOgrConnection::~QgsNewOgrConnection()
diff --git a/src/providers/db2/qgsdb2newconnection.cpp b/src/providers/db2/qgsdb2newconnection.cpp
@@ -73,8 +73,8 @@ QgsDb2NewConnection::QgsDb2NewConnection( QWidget *parent, const QString& connNa
     }
 
     txtName->setText( connName );
-    txtName->setValidator( new QRegExpValidator( QRegExp( "[^\\/]+" ), txtName ) );
   }
+  txtName->setValidator( new QRegExpValidator( QRegExp( "[^\\/]+" ), txtName ) );
 }
 
 /** Autoconnected SLOTS **/
diff --git a/src/providers/mssql/qgsmssqlnewconnection.cpp b/src/providers/mssql/qgsmssqlnewconnection.cpp
@@ -63,8 +63,8 @@ QgsMssqlNewConnection::QgsMssqlNewConnection( QWidget *parent, const QString& co
     }
 
     txtName->setText( connName );
-    txtName->setValidator( new QRegExpValidator( QRegExp( "[^\\/]+" ), txtName ) );
   }
+  txtName->setValidator( new QRegExpValidator( QRegExp( "[^\\/]+" ), txtName ) );
   on_cb_trustedConnection_clicked();
 }
 /** Autoconnected SLOTS **/
diff --git a/src/providers/oracle/qgsoraclenewconnection.cpp b/src/providers/oracle/qgsoraclenewconnection.cpp
@@ -80,8 +80,8 @@ QgsOracleNewConnection::QgsOracleNewConnection( QWidget *parent, const QString&
     }
 
     txtName->setText( connName );
-    txtName->setValidator( new QRegExpValidator( QRegExp( "[^\\/]+" ), txtName ) );
   }
+  txtName->setValidator( new QRegExpValidator( QRegExp( "[^\\/]+" ), txtName ) );
 }
 /** Autoconnected SLOTS **/
 void QgsOracleNewConnection::accept()
diff --git a/src/providers/postgres/qgspgnewconnection.cpp b/src/providers/postgres/qgspgnewconnection.cpp
@@ -102,8 +102,8 @@ QgsPgNewConnection::QgsPgNewConnection( QWidget *parent, const QString& connName
     }
 
     txtName->setText( connName );
-    txtName->setValidator( new QRegExpValidator( QRegExp( "[^\\/]+" ), txtName ) );
   }
+  txtName->setValidator( new QRegExpValidator( QRegExp( "[^\\/]*" ), txtName ) );
 }
 /** Autoconnected SLOTS **/
 void QgsPgNewConnection::accept()

Original file line number	Diff line number	Diff line change
`@@ -67,10 +67,10 @@ QgsNewOgrConnection::QgsNewOgrConnection( QWidget *parent, const QString& connTy`
`67`	`67`	`}`
`68`	`68`	`cmbDatabaseTypes->setCurrentIndex( cmbDatabaseTypes->findText( connType ) );`
`69`	`69`	`txtName->setText( connName );`
`70`		`- txtName->setValidator( new QRegExpValidator( QRegExp( "[^\\/]+" ), txtName ) );`
`71`	`70`	`txtName->setEnabled( false );`
`72`	`71`	`cmbDatabaseTypes->setEnabled( false );`
`73`	`72`	`}`
	`73`	`+ txtName->setValidator( new QRegExpValidator( QRegExp( "[^\\/]+" ), txtName ) );`
`74`	`74`	`}`
`75`	`75`
`76`	`76`	`QgsNewOgrConnection::~QgsNewOgrConnection()`
Original file line number	Diff line number	Diff line change
`@@ -73,8 +73,8 @@ QgsDb2NewConnection::QgsDb2NewConnection( QWidget *parent, const QString& connNa`
`73`	`73`	`}`
`74`	`74`
`75`	`75`	`txtName->setText( connName );`
`76`		`- txtName->setValidator( new QRegExpValidator( QRegExp( "[^\\/]+" ), txtName ) );`
`77`	`76`	`}`
	`77`	`+ txtName->setValidator( new QRegExpValidator( QRegExp( "[^\\/]+" ), txtName ) );`
`78`	`78`	`}`
`79`	`79`
`80`	`80`	`/ Autoconnected SLOTS /`
Original file line number	Diff line number	Diff line change
`@@ -63,8 +63,8 @@ QgsMssqlNewConnection::QgsMssqlNewConnection( QWidget *parent, const QString& co`
`63`	`63`	`}`
`64`	`64`
`65`	`65`	`txtName->setText( connName );`
`66`		`- txtName->setValidator( new QRegExpValidator( QRegExp( "[^\\/]+" ), txtName ) );`
`67`	`66`	`}`
	`67`	`+ txtName->setValidator( new QRegExpValidator( QRegExp( "[^\\/]+" ), txtName ) );`
`68`	`68`	`on_cb_trustedConnection_clicked();`
`69`	`69`	`}`
`70`	`70`	`/ Autoconnected SLOTS /`
Original file line number	Diff line number	Diff line change
`@@ -80,8 +80,8 @@ QgsOracleNewConnection::QgsOracleNewConnection( QWidget *parent, const QString&`
`80`	`80`	`}`
`81`	`81`
`82`	`82`	`txtName->setText( connName );`
`83`		`- txtName->setValidator( new QRegExpValidator( QRegExp( "[^\\/]+" ), txtName ) );`
`84`	`83`	`}`
	`84`	`+ txtName->setValidator( new QRegExpValidator( QRegExp( "[^\\/]+" ), txtName ) );`
`85`	`85`	`}`
`86`	`86`	`/ Autoconnected SLOTS /`
`87`	`87`	`void QgsOracleNewConnection::accept()`
Original file line number	Diff line number	Diff line change
`@@ -102,8 +102,8 @@ QgsPgNewConnection::QgsPgNewConnection( QWidget *parent, const QString& connName`
`102`	`102`	`}`
`103`	`103`
`104`	`104`	`txtName->setText( connName );`
`105`		`- txtName->setValidator( new QRegExpValidator( QRegExp( "[^\\/]+" ), txtName ) );`
`106`	`105`	`}`
	`106`	`+ txtName->setValidator( new QRegExpValidator( QRegExp( "[^\\/]*" ), txtName ) );`
`107`	`107`	`}`
`108`	`108`	`/ Autoconnected SLOTS /`
`109`	`109`	`void QgsPgNewConnection::accept()`