fix 8c873b1 (fixes #16624)

qgis · Jun 9, 2017 · 6326947 · 6326947
1 parent 5ff6b14
commit 6326947
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/src/app/ogr/qgsnewogrconnection.cpp b/src/app/ogr/qgsnewogrconnection.cpp
@@ -63,10 +63,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
@@ -72,8 +72,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 ) );
 }
 
 QgsPgNewConnection::~QgsPgNewConnection()