avoid slashes in connection names (followup 30900e9; fixes #16624)

qgis · May 26, 2017 · 8c873b1 · 8c873b1
1 parent dc5ba8f
commit 8c873b1
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 1 deletion.
diff --git a/src/app/ogr/qgsnewogrconnection.cpp b/src/app/ogr/qgsnewogrconnection.cpp
@@ -15,6 +15,7 @@
  *                                                                         *
  ***************************************************************************/
 #include <QMessageBox>
+#include <QRegExpValidator>
 
 #include "qgsnewogrconnection.h"
 #include "qgscontexthelp.h"
@@ -62,6 +63,7 @@ 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 );
   }

diff --git a/src/providers/db2/qgsdb2newconnection.cpp b/src/providers/db2/qgsdb2newconnection.cpp
@@ -19,6 +19,7 @@
 #include <QMessageBox>
 #include <QSqlDatabase>
 #include <QSqlError>
+#include <QRegExpValidator>
 
 #include "qgssettings.h"
 #include "qgslogger.h"
@@ -72,6 +73,7 @@ QgsDb2NewConnection::QgsDb2NewConnection( QWidget *parent, const QString &connNa
     }
 
     txtName->setText( connName );
+    txtName->setValidator( new QRegExpValidator( QRegExp( "[^\\/]+" ), txtName ) );
   }
 }
 

diff --git a/src/providers/mssql/qgsmssqlnewconnection.cpp b/src/providers/mssql/qgsmssqlnewconnection.cpp
@@ -19,6 +19,7 @@
 #include <QMessageBox>
 #include <QSqlDatabase>
 #include <QSqlError>
+#include <QRegExpValidator>
 
 #include "qgsmssqlnewconnection.h"
 #include "qgsmssqlprovider.h"
@@ -62,6 +63,7 @@ QgsMssqlNewConnection::QgsMssqlNewConnection( QWidget *parent, const QString &co
     }
 
     txtName->setText( connName );
+    txtName->setValidator( new QRegExpValidator( QRegExp( "[^\\/]+" ), txtName ) );
   }
   on_cb_trustedConnection_clicked();
 }

diff --git a/src/providers/oracle/qgsoraclenewconnection.cpp b/src/providers/oracle/qgsoraclenewconnection.cpp
@@ -17,6 +17,7 @@
 
 #include <QMessageBox>
 #include <QInputDialog>
+#include <QRegExpValidator>
 
 #include "qgssettings.h"
 #include "qgsoraclenewconnection.h"
@@ -79,6 +80,7 @@ QgsOracleNewConnection::QgsOracleNewConnection( QWidget *parent, const QString &
     }
 
     txtName->setText( connName );
+    txtName->setValidator( new QRegExpValidator( QRegExp( "[^\\/]+" ), txtName ) );
   }
 }
 //! Autoconnected SLOTS *

diff --git a/src/providers/postgres/qgspgnewconnection.cpp b/src/providers/postgres/qgspgnewconnection.cpp
@@ -17,6 +17,7 @@
 
 #include <QMessageBox>
 #include <QInputDialog>
+#include <QRegExpValidator>
 
 #include "qgspgnewconnection.h"
 #include "qgsauthmanager.h"
@@ -100,8 +101,8 @@ QgsPgNewConnection::QgsPgNewConnection( QWidget *parent, const QString &connName
       tabAuthentication->setCurrentIndex( tabAuthentication->indexOf( mAuthConfigSelect ) );
     }
 
-
     txtName->setText( connName );
+    txtName->setValidator( new QRegExpValidator( QRegExp( "[^\\/]+" ), txtName ) );
   }
 }
 //! Autoconnected SLOTS *