diff options
| author | Mark Brand <mabrand@mabrand.nl> | 2013-02-11 10:34:39 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-02-15 12:16:17 +0100 |
| commit | e2b9dab539b9cb55763c28bf343269d18fe8e385 (patch) | |
| tree | 144bd3569840c1f02b19df15f19eebecf56be1c4 /src/sql | |
| parent | 783ad64b90ce03b4d719b534553430f147dd5010 (diff) | |
move qFieldSerial() to static QSqlResultPrivate::fieldSerial()
Change-Id: Ic2db719437a11019262cf299929115ffa11d3d34
Reviewed-by: Israel Lins Albuquerque <israelins85@yahoo.com.br>
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
Reviewed-by: Mark Brand <mabrand@mabrand.nl>
Diffstat (limited to 'src/sql')
| -rw-r--r-- | src/sql/kernel/qsqlresult.cpp | 10 | ||||
| -rw-r--r-- | 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; |