From fd6821aa19bfa450c59b5928770bf3c1040d4afc Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Wed, 27 Feb 2013 03:50:10 +0100 Subject: 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 --- src/sql/kernel/qsqlresult.cpp | 2 +- src/sql/kernel/qsqlresult_p.h | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'src/sql/kernel') 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(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 sqldriver; int idx; QString sql; -- cgit v1.2.3