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.

9 files changed, 12 insertions, 12 deletions

diff --git a/src/gui/text/qabstractfontengine_qws.h b/src/gui/text/qabstractfontengine_qws.h
index 8403f87..e6be611 100644
--- a/src/gui/text/qabstractfontengine_qws.h
+++ b/src/gui/text/qabstractfontengine_qws.h
@@ -118,7 +118,7 @@ public:
     virtual QList<QFontEngineInfo> availableFontEngines() const = 0;
 
 private:
-    Q_DECLARE_SCOPED_PRIVATE(QFontEnginePlugin)
+    Q_DECLARE_PRIVATE(QFontEnginePlugin)
     Q_DISABLE_COPY(QFontEnginePlugin)
 };
 
@@ -207,7 +207,7 @@ public:
     */
 
 private:
-    Q_DECLARE_SCOPED_PRIVATE(QAbstractFontEngine)
+    Q_DECLARE_PRIVATE(QAbstractFontEngine)
     Q_DISABLE_COPY(QAbstractFontEngine)
 };
 
diff --git a/src/gui/text/qabstracttextdocumentlayout.h b/src/gui/text/qabstracttextdocumentlayout.h
index 3681eec..070c301 100644
--- a/src/gui/text/qabstracttextdocumentlayout.h
+++ b/src/gui/text/qabstracttextdocumentlayout.h
@@ -62,7 +62,7 @@ class QTextFrame;
 class Q_GUI_EXPORT QAbstractTextDocumentLayout : public QObject
 {
     Q_OBJECT
-    Q_DECLARE_SCOPED_PRIVATE(QAbstractTextDocumentLayout)
+    Q_DECLARE_PRIVATE(QAbstractTextDocumentLayout)
 
 public:
     explicit QAbstractTextDocumentLayout(QTextDocument *doc);
diff --git a/src/gui/text/qsyntaxhighlighter.h b/src/gui/text/qsyntaxhighlighter.h
index bfbb533..ee249b8 100644
--- a/src/gui/text/qsyntaxhighlighter.h
+++ b/src/gui/text/qsyntaxhighlighter.h
@@ -66,7 +66,7 @@ class QTextEdit;
 class Q_GUI_EXPORT QSyntaxHighlighter : public QObject
 {
     Q_OBJECT
-    Q_DECLARE_SCOPED_PRIVATE(QSyntaxHighlighter)
+    Q_DECLARE_PRIVATE(QSyntaxHighlighter)
 public:
     QSyntaxHighlighter(QObject *parent);
     QSyntaxHighlighter(QTextDocument *parent);
diff --git a/src/gui/text/qtextcontrol_p.h b/src/gui/text/qtextcontrol_p.h
index 59693ac..eb0d749 100644
--- a/src/gui/text/qtextcontrol_p.h
+++ b/src/gui/text/qtextcontrol_p.h
@@ -86,7 +86,7 @@ class QTimerEvent;
 class Q_GUI_EXPORT QTextControl : public QObject
 {
     Q_OBJECT
-    Q_DECLARE_SCOPED_PRIVATE(QTextControl)
+    Q_DECLARE_PRIVATE(QTextControl)
 #ifndef QT_NO_TEXTHTMLPARSER
     Q_PROPERTY(QString html READ toHtml WRITE setHtml NOTIFY textChanged USER true)
 #endif
diff --git a/src/gui/text/qtextdocument.h b/src/gui/text/qtextdocument.h
index cfbb558..40b6621 100644
--- a/src/gui/text/qtextdocument.h
+++ b/src/gui/text/qtextdocument.h
@@ -286,7 +286,7 @@ public:
     QTextDocumentPrivate *docHandle() const;
 private:
     Q_DISABLE_COPY(QTextDocument)
-    Q_DECLARE_SCOPED_PRIVATE(QTextDocument)
+    Q_DECLARE_PRIVATE(QTextDocument)
     friend class QTextObjectPrivate;
 };
 
diff --git a/src/gui/text/qtextdocumentlayout_p.h b/src/gui/text/qtextdocumentlayout_p.h
index 4dc18d0..41507b0 100644
--- a/src/gui/text/qtextdocumentlayout_p.h
+++ b/src/gui/text/qtextdocumentlayout_p.h
@@ -65,7 +65,7 @@ class QTextDocumentLayoutPrivate;
 
 class Q_AUTOTEST_EXPORT QTextDocumentLayout : public QAbstractTextDocumentLayout
 {
-    Q_DECLARE_SCOPED_PRIVATE(QTextDocumentLayout)
+    Q_DECLARE_PRIVATE(QTextDocumentLayout)
     Q_OBJECT
     Q_PROPERTY(int cursorWidth READ cursorWidth WRITE setCursorWidth)
     Q_PROPERTY(qreal idealWidth READ idealWidth)
diff --git a/src/gui/text/qtextlist.h b/src/gui/text/qtextlist.h
index 3d07be8..04f1838 100644
--- a/src/gui/text/qtextlist.h
+++ b/src/gui/text/qtextlist.h
@@ -81,7 +81,7 @@ public:
 
 private:
     Q_DISABLE_COPY(QTextList)
-    Q_DECLARE_SCOPED_PRIVATE(QTextList)
+    Q_DECLARE_PRIVATE(QTextList)
 };
 
 inline void QTextList::setFormat(const QTextListFormat &aformat)
diff --git a/src/gui/text/qtextobject.h b/src/gui/text/qtextobject.h
index f22f77c..4f239b2 100644
--- a/src/gui/text/qtextobject.h
+++ b/src/gui/text/qtextobject.h
@@ -84,7 +84,7 @@ protected:
     QTextObject(QTextObjectPrivate &p, QTextDocument *doc);
 
 private:
-    Q_DECLARE_SCOPED_PRIVATE(QTextObject)
+    Q_DECLARE_PRIVATE(QTextObject)
     Q_DISABLE_COPY(QTextObject)
     friend class QTextDocumentPrivate;
 };
@@ -107,7 +107,7 @@ protected:
 protected:
     QTextBlockGroup(QTextBlockGroupPrivate &p, QTextDocument *doc);
 private:
-    Q_DECLARE_SCOPED_PRIVATE(QTextBlockGroup)
+    Q_DECLARE_PRIVATE(QTextBlockGroup)
     Q_DISABLE_COPY(QTextBlockGroup)
     friend class QTextDocumentPrivate;
 };
@@ -182,7 +182,7 @@ protected:
     QTextFrame(QTextFramePrivate &p, QTextDocument *doc);
 private:
     friend class QTextDocumentPrivate;
-    Q_DECLARE_SCOPED_PRIVATE(QTextFrame)
+    Q_DECLARE_PRIVATE(QTextFrame)
     Q_DISABLE_COPY(QTextFrame)
 };
 Q_DECLARE_TYPEINFO(QTextFrame::iterator, Q_MOVABLE_TYPE);
diff --git a/src/gui/text/qtexttable.h b/src/gui/text/qtexttable.h
index 2deb3fa..612c71c 100644
--- a/src/gui/text/qtexttable.h
+++ b/src/gui/text/qtexttable.h
@@ -134,7 +134,7 @@ public:
 
 private:
     Q_DISABLE_COPY(QTextTable)
-    Q_DECLARE_SCOPED_PRIVATE(QTextTable)
+    Q_DECLARE_PRIVATE(QTextTable)
     friend class QTextTableCell;
 };