diff options
| author | Mark Brand <mabrand@mabrand.nl> | 2013-02-27 03:50:10 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-03-06 00:11:06 +0100 |
| commit | fd6821aa19bfa450c59b5928770bf3c1040d4afc (patch) | |
| tree | 75a211e6a55b3a7020df19bddde23625b7226bc1 /src/sql/kernel | |
| parent | 8434b7ad4ab6032525693114444140e55d9e7013 (diff) | |
QSqlResultPrivate: private q -> protected q_ptr
This QObject-style convention will allow the usual private class
macros to be used.
Change-Id: Ib1cee0b3aca949b75511868ad4914e5b8530929b
Reviewed-by: Andy Shaw <andy.shaw@digia.com>
Diffstat (limited to 'src/sql/kernel')
| -rw-r--r-- | src/sql/kernel/qsqlresult.cpp | 2 | ||||
| -rw-r--r-- | src/sql/kernel/qsqlresult_p.h | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/sql/kernel/qsqlresult.cpp b/src/sql/kernel/qsqlresult.cpp index fc850bf24e..9d33f38188 100644 --- a/src/sql/kernel/qsqlresult.cpp +++ b/src/sql/kernel/qsqlresult.cpp @@ -219,7 +219,7 @@ QString QSqlResultPrivate::namedToPositionalBinding(const QString &query) QSqlResult::QSqlResult(const QSqlDriver *db) { d = new QSqlResultPrivate; - d->q = this; + d->q_ptr = this; d->sqldriver = const_cast<QSqlDriver *>(db); if (d->sqldriver) setNumericalPrecisionPolicy(d->sqldriver->numericalPrecisionPolicy()); diff --git a/src/sql/kernel/qsqlresult_p.h b/src/sql/kernel/qsqlresult_p.h index c3a8dce739..46ee6ce195 100644 --- a/src/sql/kernel/qsqlresult_p.h +++ b/src/sql/kernel/qsqlresult_p.h @@ -70,9 +70,10 @@ struct QHolder { class Q_SQL_EXPORT QSqlResultPrivate { + public: QSqlResultPrivate() - : q(0), + : q_ptr(0), idx(QSql::BeforeFirstRow), active(false), isSel(false), @@ -117,7 +118,7 @@ public: QString namedToPositionalBinding(const QString &query); QString holderAt(int index) const; - QSqlResult *q; + QSqlResult *q_ptr; QPointer<QSqlDriver> sqldriver; int idx; QString sql; |