AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

make static function a class member

Browse Source 
Change-Id: I8c18c746185f6b7530ed985f4d482a1c9073fb10
Reviewed-by: Andy Shaw <andy.shaw@digia.com>
This commit is contained in:
Mark Brand 2013-02-10 22:20:24 +01:00 committed by The Qt Project
parent 63b180d390
commit 4da840f230
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/sql/drivers/psql/qsql_psql.cpp
View File

@ -185,6 +185,7 @@ class QPSQLResultPrivate
public:
QPSQLResultPrivate(QPSQLResult *qq): q(qq), privDriver(0), result(0), currentSize(-1), preparedQueriesEnabled(false) {}
static QString fieldSerial(int i) { return QLatin1Char('$') + QString::number(i + 1); }
void deallocatePreparedStmt();
QPSQLResult *q;
const QPSQLDriverPrivate *privDriver;
@ -276,15 +277,15 @@ static QVariant::Type qDecodePSQLType(int t)
return type;
}
static void qDeallocatePreparedStmt(QPSQLResultPrivate *d)
void QPSQLResultPrivate::deallocatePreparedStmt()
{
const QString stmt = QLatin1String("DEALLOCATE ") + d->preparedStmtId;
PGresult *result = d->privDriver->exec(stmt);
const QString stmt = QLatin1String("DEALLOCATE ") + preparedStmtId;
PGresult *result = privDriver->exec(stmt);
if (PQresultStatus(result) != PGRES_COMMAND_OK)
qWarning("Unable to free statement: %s", PQerrorMessage(d->privDriver->connection));
qWarning("Unable to free statement: %s", PQerrorMessage(privDriver->connection));
PQclear(result);
d->preparedStmtId.clear();
preparedStmtId.clear();
}
QPSQLResult::QPSQLResult(const QPSQLDriver* db, const QPSQLDriverPrivate* p)
@ -300,7 +301,7 @@ QPSQLResult::~QPSQLResult()
cleanup();
if (d->preparedQueriesEnabled && !d->preparedStmtId.isNull())
qDeallocatePreparedStmt(d);
d->deallocatePreparedStmt();
delete d;
}
@ -557,7 +558,7 @@ bool QPSQLResult::prepare(const QString &query)
cleanup();
if (!d->preparedStmtId.isEmpty())
qDeallocatePreparedStmt(d);
d->deallocatePreparedStmt();
const QString stmtId = qMakePreparedStmtId();
const QString stmt = QString::fromLatin1("PREPARE %1 AS ").arg(stmtId).append(QSqlResultPrivate::positionalToNamedBinding(query, QPSQLResultPrivate::fieldSerial));