diff options
Diffstat (limited to 'src/sql/kernel/qsqlresult.cpp')
-rw-r--r-- | src/sql/kernel/qsqlresult.cpp | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/src/sql/kernel/qsqlresult.cpp b/src/sql/kernel/qsqlresult.cpp index c35fca7217..a701f9f669 100644 --- a/src/sql/kernel/qsqlresult.cpp +++ b/src/sql/kernel/qsqlresult.cpp @@ -87,7 +87,7 @@ QString QSqlResultPrivate::positionalToNamedBinding(const QString &query) const result.reserve(n * 5 / 4); QChar closingQuote; int count = 0; - bool ignoreBraces = (sqldriver->d_func()->dbmsType == QSqlDriver::PostgreSQL); + bool ignoreBraces = (sqldriver->dbmsType() == QSqlDriver::PostgreSQL); for (int i = 0; i < n; ++i) { QChar ch = query.at(i); @@ -128,7 +128,7 @@ QString QSqlResultPrivate::namedToPositionalBinding(const QString &query) QChar closingQuote; int count = 0; int i = 0; - bool ignoreBraces = (sqldriver->d_func()->dbmsType == QSqlDriver::PostgreSQL); + bool ignoreBraces = (sqldriver->dbmsType() == QSqlDriver::PostgreSQL); while (i < n) { QChar ch = query.at(i); @@ -218,22 +218,18 @@ QString QSqlResultPrivate::namedToPositionalBinding(const QString &query) QSqlResult::QSqlResult(const QSqlDriver *db) { - d_ptr = new QSqlResultPrivate; + d_ptr = new QSqlResultPrivate(this, db); Q_D(QSqlResult); - d->q_ptr = this; - d->sqldriver = const_cast<QSqlDriver *>(db); if (d->sqldriver) setNumericalPrecisionPolicy(d->sqldriver->numericalPrecisionPolicy()); } /*! \internal */ -QSqlResult::QSqlResult(QSqlResultPrivate &dd, const QSqlDriver *db) +QSqlResult::QSqlResult(QSqlResultPrivate &dd) + : d_ptr(&dd) { - d_ptr = ⅆ Q_D(QSqlResult); - d->q_ptr = this; - d->sqldriver = const_cast<QSqlDriver *>(db); if (d->sqldriver) setNumericalPrecisionPolicy(d->sqldriver->numericalPrecisionPolicy()); } |