From dcec1420ea9d7e90bbd7f37be15d8e61eaf35d23 Mon Sep 17 00:00:00 2001 From: Alexander Volkov Date: Fri, 6 Jan 2017 22:02:50 +0300 Subject: Use QString::asprintf(), QStringBuilder, and the multi-arg overload of QString::arg() ... instead of sequential .arg(const QString &) callings. It saves memory allocations and prevents unexpected results if replacing strings contain place markers. Found with clazy's qstring-arg check. Change-Id: I3912275a6e11c6fb7559ff5623f2e8cde9b7f07a Reviewed-by: Anton Kudryavtsev Reviewed-by: Thiago Macieira --- src/plugins/sqldrivers/psql/qsql_psql.cpp | 2 +- src/plugins/sqldrivers/tds/qsql_tds.cpp | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) (limited to 'src/plugins') diff --git a/src/plugins/sqldrivers/psql/qsql_psql.cpp b/src/plugins/sqldrivers/psql/qsql_psql.cpp index 968b71a27d..e0f9222902 100644 --- a/src/plugins/sqldrivers/psql/qsql_psql.cpp +++ b/src/plugins/sqldrivers/psql/qsql_psql.cpp @@ -670,7 +670,7 @@ bool QPSQLResult::exec() if (params.isEmpty()) stmt = QString::fromLatin1("EXECUTE %1").arg(d->preparedStmtId); else - stmt = QString::fromLatin1("EXECUTE %1 (%2)").arg(d->preparedStmtId).arg(params); + stmt = QString::fromLatin1("EXECUTE %1 (%2)").arg(d->preparedStmtId, params); d->result = d->drv_d_func()->exec(stmt); diff --git a/src/plugins/sqldrivers/tds/qsql_tds.cpp b/src/plugins/sqldrivers/tds/qsql_tds.cpp index 940fd05c74..6ebd09a572 100644 --- a/src/plugins/sqldrivers/tds/qsql_tds.cpp +++ b/src/plugins/sqldrivers/tds/qsql_tds.cpp @@ -259,10 +259,9 @@ static int CS_PUBLIC qTdsErrHandler(DBPROCESS* dbproc, return INT_CANCEL; } - - QString errMsg = QString::fromLatin1("%1 %2\n").arg(QLatin1String(dberrstr)).arg( - QLatin1String(oserrstr)); - errMsg += p->getErrorMsgs(); + const QString errMsg = QLatin1String(dberrstr) + QLatin1Char(' ') + + QLatin1String(oserrstr) + QLatin1Char('\n') + + p->getErrorMsgs(); p->lastError = qMakeError(errMsg, QSqlError::UnknownError, dberr); p->clearErrorMsgs(); -- cgit v1.2.3