From e2b9dab539b9cb55763c28bf343269d18fe8e385 Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Mon, 11 Feb 2013 10:34:39 +0100 Subject: move qFieldSerial() to static QSqlResultPrivate::fieldSerial() Change-Id: Ic2db719437a11019262cf299929115ffa11d3d34 Reviewed-by: Israel Lins Albuquerque Reviewed-by: Konstantin Ritt Reviewed-by: Mark Brand --- src/sql/kernel/qsqlresult.cpp | 10 ++++------ src/sql/kernel/qsqlresult_p.h | 1 + 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/sql/kernel/qsqlresult.cpp b/src/sql/kernel/qsqlresult.cpp index b3e7ad5b38..b73c80f192 100644 --- a/src/sql/kernel/qsqlresult.cpp +++ b/src/sql/kernel/qsqlresult.cpp @@ -55,15 +55,13 @@ QT_BEGIN_NAMESPACE -static QString qFieldSerial(int); - QString QSqlResultPrivate::holderAt(int index) const { - return holders.size() > index ? holders.at(index).holderName : qFieldSerial(index); + return holders.size() > index ? holders.at(index).holderName : fieldSerial(index); } // return a unique id for bound names -static QString qFieldSerial(int i) +QString QSqlResultPrivate::fieldSerial(int i) { ushort arr[] = { ':', 'f', 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; ushort *ptr = &arr[1]; @@ -95,7 +93,7 @@ QString QSqlResultPrivate::positionalToNamedBinding() for (int i = 0; i < n; ++i) { QChar ch = sql.at(i); if (ch == QLatin1Char('?') && !inQuote) { - result += qFieldSerial(count++); + result += fieldSerial(count++); } else { if (ch == QLatin1Char('\'')) inQuote = !inQuote; @@ -617,7 +615,7 @@ bool QSqlResult::exec() void QSqlResult::bindValue(int index, const QVariant& val, QSql::ParamType paramType) { d->binds = PositionalBinding; - d->indexes[qFieldSerial(index)].append(index); + d->indexes[QSqlResultPrivate::fieldSerial(index)].append(index); if (d->values.count() <= index) d->values.resize(index + 1); d->values[index] = val; diff --git a/src/sql/kernel/qsqlresult_p.h b/src/sql/kernel/qsqlresult_p.h index 65f9be7a05..95148853df 100644 --- a/src/sql/kernel/qsqlresult_p.h +++ b/src/sql/kernel/qsqlresult_p.h @@ -106,6 +106,7 @@ public: clearIndex();; } + static QString fieldSerial(int); QString positionalToNamedBinding(); QString namedToPositionalBinding(); QString holderAt(int index) const; -- cgit v1.2.3