Rename Q_DECLARE_SCOPED_PRIVATE back to Q_DECLARE_PRIVATE

Rationale: We're using template magic now to get the private
pointer in qglobal.h, so no need to have two macros. Also
keeps backward compatibility with outside (KDE) code.

6 files changed, 6 insertions, 6 deletions

diff --git a/src/gui/util/qcompleter.h b/src/gui/util/qcompleter.h
index ac8c0c6..a419154 100644
--- a/src/gui/util/qcompleter.h
+++ b/src/gui/util/qcompleter.h
@@ -154,7 +154,7 @@ Q_SIGNALS:
 
 private:
     Q_DISABLE_COPY(QCompleter)
-    Q_DECLARE_SCOPED_PRIVATE(QCompleter)
+    Q_DECLARE_PRIVATE(QCompleter)
 
     Q_PRIVATE_SLOT(d_func(), void _q_complete(QModelIndex))
     Q_PRIVATE_SLOT(d_func(), void _q_completionSelected(const QItemSelection&))
diff --git a/src/gui/util/qcompleter_p.h b/src/gui/util/qcompleter_p.h
index 745afff..3911b0d 100644
--- a/src/gui/util/qcompleter_p.h
+++ b/src/gui/util/qcompleter_p.h
@@ -239,7 +239,7 @@ public:
     QScopedPointer<QCompletionEngine> engine;
     bool showAll;
 
-    Q_DECLARE_SCOPED_PRIVATE(QCompletionModel)
+    Q_DECLARE_PRIVATE(QCompletionModel)
 
 signals:
     void rowsAdded();
diff --git a/src/gui/util/qsystemtrayicon.h b/src/gui/util/qsystemtrayicon.h
index ac90487..0f1e2d2 100644
--- a/src/gui/util/qsystemtrayicon.h
+++ b/src/gui/util/qsystemtrayicon.h
@@ -117,7 +117,7 @@ protected:
 
 private:
     Q_DISABLE_COPY(QSystemTrayIcon)
-    Q_DECLARE_SCOPED_PRIVATE(QSystemTrayIcon)
+    Q_DECLARE_PRIVATE(QSystemTrayIcon)
 
     friend class QSystemTrayIconSys;
     friend class QBalloonTip;
diff --git a/src/gui/util/qundogroup.h b/src/gui/util/qundogroup.h
index 24d4e12..ddab6e0 100644
--- a/src/gui/util/qundogroup.h
+++ b/src/gui/util/qundogroup.h
@@ -60,7 +60,7 @@ QT_MODULE(Gui)
 class Q_GUI_EXPORT QUndoGroup : public QObject
 {
     Q_OBJECT
-    Q_DECLARE_SCOPED_PRIVATE(QUndoGroup)
+    Q_DECLARE_PRIVATE(QUndoGroup)
 
 public:
     explicit QUndoGroup(QObject *parent = 0);
diff --git a/src/gui/util/qundostack.h b/src/gui/util/qundostack.h
index 8ad4b198..8efad0e 100644
--- a/src/gui/util/qundostack.h
+++ b/src/gui/util/qundostack.h
@@ -90,7 +90,7 @@ private:
 class Q_GUI_EXPORT QUndoStack : public QObject
 {
     Q_OBJECT
-    Q_DECLARE_SCOPED_PRIVATE(QUndoStack)
+    Q_DECLARE_PRIVATE(QUndoStack)
     Q_PROPERTY(bool active READ isActive WRITE setActive)
     Q_PROPERTY(int undoLimit READ undoLimit WRITE setUndoLimit)
 
diff --git a/src/gui/util/qundoview.h b/src/gui/util/qundoview.h
index 293c0c2..fa0c163 100644
--- a/src/gui/util/qundoview.h
+++ b/src/gui/util/qundoview.h
@@ -61,7 +61,7 @@ QT_MODULE(Gui)
 class Q_GUI_EXPORT QUndoView : public QListView
 {
     Q_OBJECT
-    Q_DECLARE_SCOPED_PRIVATE(QUndoView)
+    Q_DECLARE_PRIVATE(QUndoView)
     Q_PROPERTY(QString emptyLabel READ emptyLabel WRITE setEmptyLabel)
     Q_PROPERTY(QIcon cleanIcon READ cleanIcon WRITE setCleanIcon)