Squashed commit of the topic/exceptions branch.

Contains some smaller fixes and renaming of macros. Looks big,
but isn't scary at all ;)

4 files changed, 4 insertions, 4 deletions

diff --git a/src/sql/kernel/qsqldriver.h b/src/sql/kernel/qsqldriver.h
index 3052be62e5..b411d659b5 100644
--- a/src/sql/kernel/qsqldriver.h
+++ b/src/sql/kernel/qsqldriver.h
@@ -69,7 +69,7 @@ class Q_SQL_EXPORT QSqlDriver : public QObject
 {
     friend class QSqlDatabase;
     Q_OBJECT
-    Q_DECLARE_PRIVATE(QSqlDriver)
+    Q_DECLARE_SCOPED_PRIVATE(QSqlDriver)
 
 public:
     enum DriverFeature { Transactions, QuerySize, BLOB, Unicode, PreparedQueries,
diff --git a/src/sql/models/qsqlquerymodel.h b/src/sql/models/qsqlquerymodel.h
index c81fa2c74f..bf9963420d 100644
--- a/src/sql/models/qsqlquerymodel.h
+++ b/src/sql/models/qsqlquerymodel.h
@@ -59,7 +59,7 @@ class QSqlQuery;
 class Q_SQL_EXPORT QSqlQueryModel: public QAbstractTableModel
 {
     Q_OBJECT
-    Q_DECLARE_PRIVATE(QSqlQueryModel)
+    Q_DECLARE_SCOPED_PRIVATE(QSqlQueryModel)
 
 public:
     explicit QSqlQueryModel(QObject *parent = 0);
diff --git a/src/sql/models/qsqlrelationaltablemodel.h b/src/sql/models/qsqlrelationaltablemodel.h
index f476a483fd..fa060b89c0 100644
--- a/src/sql/models/qsqlrelationaltablemodel.h
+++ b/src/sql/models/qsqlrelationaltablemodel.h
@@ -102,7 +102,7 @@ protected:
     QString orderByClause() const;
 
 private:
-    Q_DECLARE_PRIVATE(QSqlRelationalTableModel)
+    Q_DECLARE_SCOPED_PRIVATE(QSqlRelationalTableModel)
 };
 
 QT_END_NAMESPACE
diff --git a/src/sql/models/qsqltablemodel.h b/src/sql/models/qsqltablemodel.h
index a6f4469682..3e539beef1 100644
--- a/src/sql/models/qsqltablemodel.h
+++ b/src/sql/models/qsqltablemodel.h
@@ -59,7 +59,7 @@ class QSqlIndex;
 class Q_SQL_EXPORT QSqlTableModel: public QSqlQueryModel
 {
     Q_OBJECT
-    Q_DECLARE_PRIVATE(QSqlTableModel)
+    Q_DECLARE_SCOPED_PRIVATE(QSqlTableModel)
 
 public:
     enum EditStrategy {OnFieldChange, OnRowChange, OnManualSubmit};