diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-04-04 16:11:41 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2017-04-04 16:15:55 +0000 |
| commit | aeb3f9d168580efb8ab2df4003c53cbe8045ed80 (patch) | |
| tree | 7f98aec853b447f078083fe1fca2d49f2c66a04a /src/plugins/sqldrivers | |
| parent | 5eb74ad4f59cb3ce212c3673005b512fdecd7ec1 (diff) | |
| parent | 9419dfe8ee45d08f09c09d3cbece511d721546f0 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.9' into dev" into refs/staging/dev
Diffstat (limited to 'src/plugins/sqldrivers')
| -rw-r--r-- | src/plugins/sqldrivers/psql/qsql_psql.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/plugins/sqldrivers/psql/qsql_psql.cpp b/src/plugins/sqldrivers/psql/qsql_psql.cpp index f8cab07597..b60fa1058f 100644 --- a/src/plugins/sqldrivers/psql/qsql_psql.cpp +++ b/src/plugins/sqldrivers/psql/qsql_psql.cpp @@ -911,7 +911,7 @@ bool QPSQLDriver::open(const QString & db, connectString.append(QLatin1Char(' ')).append(opt); } - d->connection = PQconnectdb(connectString.toLocal8Bit().constData()); + d->connection = PQconnectdb(std::move(connectString).toLocal8Bit().constData()); if (PQstatus(d->connection) == CONNECTION_BAD) { setLastError(qMakeError(tr("Unable to connect"), QSqlError::ConnectionError, d)); setOpenError(true); @@ -1073,12 +1073,12 @@ QSqlIndex QPSQLDriver::primaryIndex(const QString& tablename) const if (isIdentifierEscaped(tbl, QSqlDriver::TableName)) tbl = stripDelimiters(tbl, QSqlDriver::TableName); else - tbl = tbl.toLower(); + tbl = std::move(tbl).toLower(); if (isIdentifierEscaped(schema, QSqlDriver::TableName)) schema = stripDelimiters(schema, QSqlDriver::TableName); else - schema = schema.toLower(); + schema = std::move(schema).toLower(); switch(d->pro) { case QPSQLDriver::Version6: @@ -1153,12 +1153,12 @@ QSqlRecord QPSQLDriver::record(const QString& tablename) const if (isIdentifierEscaped(tbl, QSqlDriver::TableName)) tbl = stripDelimiters(tbl, QSqlDriver::TableName); else - tbl = tbl.toLower(); + tbl = std::move(tbl).toLower(); if (isIdentifierEscaped(schema, QSqlDriver::TableName)) schema = stripDelimiters(schema, QSqlDriver::TableName); else - schema = schema.toLower(); + schema = std::move(schema).toLower(); QString stmt; switch(d->pro) { |