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

jef-n · jef-n · commit dcd99ad597b8 · 2017-05-29T22:35:44.000+02:00
(cherry picked from commit 8c873b1)
diff --git a/src/app/ogr/qgsnewogrconnection.cpp b/src/app/ogr/qgsnewogrconnection.cpp
@@ -16,6 +16,7 @@
  ***************************************************************************/
 #include <QSettings>
 #include <QMessageBox>
+#include <QRegExpValidator>
 
 #include "qgsnewogrconnection.h"
 #include "qgscontexthelp.h"
@@ -66,6 +67,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,12 +19,9 @@
 #include <QSettings>
 #include <QInputDialog>
 #include <QMessageBox>
-#include <QLabel>
-#include <qgslogger.h>
-#include <qlistwidget.h>
-
-#include <QtSql/QSqlDatabase>
-#include <QtSql/QSqlError>
+#include <QSqlDatabase>
+#include <QSqlError>
+#include <QRegExpValidator>
 
 #include "qgsdb2newconnection.h"
 #include "qgsdb2dataitems.h"
@@ -76,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
@@ -18,9 +18,9 @@
 #include <QSettings>
 #include <QInputDialog>
 #include <QMessageBox>
-
-#include <QtSql/QSqlDatabase>
-#include <QtSql/QSqlError>
+#include <QSqlDatabase>
+#include <QSqlError>
+#include <QRegExpValidator>
 
 #include "qgsmssqlnewconnection.h"
 #include "qgsmssqlprovider.h"
@@ -63,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
@@ -18,6 +18,7 @@
 #include <QSettings>
 #include <QMessageBox>
 #include <QInputDialog>
+#include <QRegExpValidator>
 
 #include "qgsoraclenewconnection.h"
 #include "qgscontexthelp.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
@@ -18,6 +18,7 @@
 #include <QSettings>
 #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 **/

Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,7 @@`
`16`	`16`	`***************************************************************************/`
`17`	`17`	`#include <QSettings>`
`18`	`18`	`#include <QMessageBox>`
	`19`	`+#include <QRegExpValidator>`
`19`	`20`
`20`	`21`	`#include "qgsnewogrconnection.h"`
`21`	`22`	`#include "qgscontexthelp.h"`
`@@ -66,6 +67,7 @@ QgsNewOgrConnection::QgsNewOgrConnection( QWidget *parent, const QString& connTy`
`66`	`67`	`}`
`67`	`68`	`cmbDatabaseTypes->setCurrentIndex( cmbDatabaseTypes->findText( connType ) );`
`68`	`69`	`txtName->setText( connName );`
	`70`	`+ txtName->setValidator( new QRegExpValidator( QRegExp( "[^\\/]+" ), txtName ) );`
`69`	`71`	`txtName->setEnabled( false );`
`70`	`72`	`cmbDatabaseTypes->setEnabled( false );`
`71`	`73`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,9 +18,9 @@`
`18`	`18`	`#include <QSettings>`
`19`	`19`	`#include <QInputDialog>`
`20`	`20`	`#include <QMessageBox>`
`21`		`-`
`22`		`-#include <QtSql/QSqlDatabase>`
`23`		`-#include <QtSql/QSqlError>`
	`21`	`+#include <QSqlDatabase>`
	`22`	`+#include <QSqlError>`
	`23`	`+#include <QRegExpValidator>`
`24`	`24`
`25`	`25`	`#include "qgsmssqlnewconnection.h"`
`26`	`26`	`#include "qgsmssqlprovider.h"`
`@@ -63,6 +63,7 @@ QgsMssqlNewConnection::QgsMssqlNewConnection( QWidget *parent, const QString& co`
`63`	`63`	`}`
`64`	`64`
`65`	`65`	`txtName->setText( connName );`
	`66`	`+ txtName->setValidator( new QRegExpValidator( QRegExp( "[^\\/]+" ), txtName ) );`
`66`	`67`	`}`
`67`	`68`	`on_cb_trustedConnection_clicked();`
`68`	`69`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,7 @@`
`18`	`18`	`#include <QSettings>`
`19`	`19`	`#include <QMessageBox>`
`20`	`20`	`#include <QInputDialog>`
	`21`	`+#include <QRegExpValidator>`
`21`	`22`
`22`	`23`	`#include "qgsoraclenewconnection.h"`
`23`	`24`	`#include "qgscontexthelp.h"`
`@@ -79,6 +80,7 @@ QgsOracleNewConnection::QgsOracleNewConnection( QWidget *parent, const QString&`
`79`	`80`	`}`
`80`	`81`
`81`	`82`	`txtName->setText( connName );`
	`83`	`+ txtName->setValidator( new QRegExpValidator( QRegExp( "[^\\/]+" ), txtName ) );`
`82`	`84`	`}`
`83`	`85`	`}`
`84`	`86`	`/ Autoconnected SLOTS /`