Skip to content

Commit

Permalink
fix 8c873b1 (fixes #16624)
Browse files Browse the repository at this point in the history
(cherry picked from commit 6326947)
  • Loading branch information
jef-n committed Jun 9, 2017
1 parent 5a3c763 commit 5f10a0b
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion src/app/ogr/qgsnewogrconnection.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
2 changes: 1 addition & 1 deletion src/providers/db2/qgsdb2newconnection.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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 **/
Expand Down
2 changes: 1 addition & 1 deletion src/providers/mssql/qgsmssqlnewconnection.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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 **/
Expand Down
2 changes: 1 addition & 1 deletion src/providers/oracle/qgsoraclenewconnection.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
2 changes: 1 addition & 1 deletion src/providers/postgres/qgspgnewconnection.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down

0 comments on commit 5f10a0b

Please sign in to comment.