Skip to content

Commit 8c873b1

Browse files
committedMay 26, 2017
avoid slashes in connection names (followup 30900e9; fixes #16624)
1 parent dc5ba8f commit 8c873b1

File tree

5 files changed

+10
-1
lines changed

5 files changed

+10
-1
lines changed
 

‎src/app/ogr/qgsnewogrconnection.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
* *
1616
***************************************************************************/
1717
#include <QMessageBox>
18+
#include <QRegExpValidator>
1819

1920
#include "qgsnewogrconnection.h"
2021
#include "qgscontexthelp.h"
@@ -62,6 +63,7 @@ QgsNewOgrConnection::QgsNewOgrConnection( QWidget *parent, const QString &connTy
6263
}
6364
cmbDatabaseTypes->setCurrentIndex( cmbDatabaseTypes->findText( connType ) );
6465
txtName->setText( connName );
66+
txtName->setValidator( new QRegExpValidator( QRegExp( "[^\\/]+" ), txtName ) );
6567
txtName->setEnabled( false );
6668
cmbDatabaseTypes->setEnabled( false );
6769
}

‎src/providers/db2/qgsdb2newconnection.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
#include <QMessageBox>
2020
#include <QSqlDatabase>
2121
#include <QSqlError>
22+
#include <QRegExpValidator>
2223

2324
#include "qgssettings.h"
2425
#include "qgslogger.h"
@@ -72,6 +73,7 @@ QgsDb2NewConnection::QgsDb2NewConnection( QWidget *parent, const QString &connNa
7273
}
7374

7475
txtName->setText( connName );
76+
txtName->setValidator( new QRegExpValidator( QRegExp( "[^\\/]+" ), txtName ) );
7577
}
7678
}
7779

‎src/providers/mssql/qgsmssqlnewconnection.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
#include <QMessageBox>
2020
#include <QSqlDatabase>
2121
#include <QSqlError>
22+
#include <QRegExpValidator>
2223

2324
#include "qgsmssqlnewconnection.h"
2425
#include "qgsmssqlprovider.h"
@@ -62,6 +63,7 @@ QgsMssqlNewConnection::QgsMssqlNewConnection( QWidget *parent, const QString &co
6263
}
6364

6465
txtName->setText( connName );
66+
txtName->setValidator( new QRegExpValidator( QRegExp( "[^\\/]+" ), txtName ) );
6567
}
6668
on_cb_trustedConnection_clicked();
6769
}

‎src/providers/oracle/qgsoraclenewconnection.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717

1818
#include <QMessageBox>
1919
#include <QInputDialog>
20+
#include <QRegExpValidator>
2021

2122
#include "qgssettings.h"
2223
#include "qgsoraclenewconnection.h"
@@ -79,6 +80,7 @@ QgsOracleNewConnection::QgsOracleNewConnection( QWidget *parent, const QString &
7980
}
8081

8182
txtName->setText( connName );
83+
txtName->setValidator( new QRegExpValidator( QRegExp( "[^\\/]+" ), txtName ) );
8284
}
8385
}
8486
//! Autoconnected SLOTS *

‎src/providers/postgres/qgspgnewconnection.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717

1818
#include <QMessageBox>
1919
#include <QInputDialog>
20+
#include <QRegExpValidator>
2021

2122
#include "qgspgnewconnection.h"
2223
#include "qgsauthmanager.h"
@@ -100,8 +101,8 @@ QgsPgNewConnection::QgsPgNewConnection( QWidget *parent, const QString &connName
100101
tabAuthentication->setCurrentIndex( tabAuthentication->indexOf( mAuthConfigSelect ) );
101102
}
102103

103-
104104
txtName->setText( connName );
105+
txtName->setValidator( new QRegExpValidator( QRegExp( "[^\\/]+" ), txtName ) );
105106
}
106107
}
107108
//! Autoconnected SLOTS *

0 commit comments

Comments
 (0)
Please sign in to comment.