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.

16 files changed, 17 insertions, 17 deletions

diff --git a/src/gui/dialogs/qabstractpagesetupdialog.h b/src/gui/dialogs/qabstractpagesetupdialog.h
index ba6b452..7a3bb48 100644
--- a/src/gui/dialogs/qabstractpagesetupdialog.h
+++ b/src/gui/dialogs/qabstractpagesetupdialog.h
@@ -58,7 +58,7 @@ class QPrinter;
 // ### Qt 5: Remove this class
 class Q_GUI_EXPORT QAbstractPageSetupDialog : public QDialog
 {
-    Q_DECLARE_SCOPED_PRIVATE(QAbstractPageSetupDialog)
+    Q_DECLARE_PRIVATE(QAbstractPageSetupDialog)
     Q_OBJECT
 
 public:
diff --git a/src/gui/dialogs/qabstractprintdialog.h b/src/gui/dialogs/qabstractprintdialog.h
index 0a94034..272d1b1 100644
--- a/src/gui/dialogs/qabstractprintdialog.h
+++ b/src/gui/dialogs/qabstractprintdialog.h
@@ -58,7 +58,7 @@ class QPrinter;
 // ### Qt 5: remove this class
 class Q_GUI_EXPORT QAbstractPrintDialog : public QDialog
 {
-    Q_DECLARE_SCOPED_PRIVATE(QAbstractPrintDialog)
+    Q_DECLARE_PRIVATE(QAbstractPrintDialog)
     Q_OBJECT
 
 public:
diff --git a/src/gui/dialogs/qcolordialog.h b/src/gui/dialogs/qcolordialog.h
index d0aeec7..2c107bd 100644
--- a/src/gui/dialogs/qcolordialog.h
+++ b/src/gui/dialogs/qcolordialog.h
@@ -57,7 +57,7 @@ class QColorDialogPrivate;
 class Q_GUI_EXPORT QColorDialog : public QDialog
 {
     Q_OBJECT
-    Q_DECLARE_SCOPED_PRIVATE(QColorDialog)
+    Q_DECLARE_PRIVATE(QColorDialog)
     Q_ENUMS(ColorDialogOption)
     Q_PROPERTY(QColor currentColor READ currentColor WRITE setCurrentColor
                NOTIFY currentColorChanged)
diff --git a/src/gui/dialogs/qdialog.h b/src/gui/dialogs/qdialog.h
index 0b5b326..8479994 100644
--- a/src/gui/dialogs/qdialog.h
+++ b/src/gui/dialogs/qdialog.h
@@ -121,7 +121,7 @@ protected:
     void adjustPosition(QWidget*);
 
 private:
-    Q_DECLARE_SCOPED_PRIVATE(QDialog)
+    Q_DECLARE_PRIVATE(QDialog)
     Q_DISABLE_COPY(QDialog)
 
 #ifdef Q_WS_WINCE_WM
diff --git a/src/gui/dialogs/qerrormessage.h b/src/gui/dialogs/qerrormessage.h
index 1d79f78..9721f46 100644
--- a/src/gui/dialogs/qerrormessage.h
+++ b/src/gui/dialogs/qerrormessage.h
@@ -57,7 +57,7 @@ class QErrorMessagePrivate;
 class Q_GUI_EXPORT QErrorMessage: public QDialog
 {
     Q_OBJECT
-    Q_DECLARE_SCOPED_PRIVATE(QErrorMessage)
+    Q_DECLARE_PRIVATE(QErrorMessage)
 public:
     explicit QErrorMessage(QWidget* parent = 0);
     ~QErrorMessage();
diff --git a/src/gui/dialogs/qfiledialog.h b/src/gui/dialogs/qfiledialog.h
index 987e436..70ee720 100644
--- a/src/gui/dialogs/qfiledialog.h
+++ b/src/gui/dialogs/qfiledialog.h
@@ -283,7 +283,7 @@ protected:
     void changeEvent(QEvent *e);
 
 private:
-    Q_DECLARE_SCOPED_PRIVATE(QFileDialog)
+    Q_DECLARE_PRIVATE(QFileDialog)
     Q_DISABLE_COPY(QFileDialog)
 
     Q_PRIVATE_SLOT(d_func(), void _q_pathChanged(const QString &))
diff --git a/src/gui/dialogs/qfilesystemmodel.h b/src/gui/dialogs/qfilesystemmodel.h
index 5ab49ff..769463c 100644
--- a/src/gui/dialogs/qfilesystemmodel.h
+++ b/src/gui/dialogs/qfilesystemmodel.h
@@ -151,7 +151,7 @@ protected:
     bool event(QEvent *event);
 
 private:
-    Q_DECLARE_SCOPED_PRIVATE(QFileSystemModel)
+    Q_DECLARE_PRIVATE(QFileSystemModel)
     Q_DISABLE_COPY(QFileSystemModel)
 
     Q_PRIVATE_SLOT(d_func(), void _q_directoryChanged(const QString &directory, const QStringList &list))
diff --git a/src/gui/dialogs/qfontdialog.h b/src/gui/dialogs/qfontdialog.h
index 4c80194..6e0f1a0 100644
--- a/src/gui/dialogs/qfontdialog.h
+++ b/src/gui/dialogs/qfontdialog.h
@@ -59,7 +59,7 @@ class QFontDialogPrivate;
 class Q_GUI_EXPORT QFontDialog : public QDialog
 {
     Q_OBJECT
-    Q_DECLARE_SCOPED_PRIVATE(QFontDialog)
+    Q_DECLARE_PRIVATE(QFontDialog)
     Q_ENUMS(FontDialogOption)
     Q_PROPERTY(QFont currentFont READ currentFont WRITE setCurrentFont NOTIFY currentFontChanged)
     Q_PROPERTY(FontDialogOptions options READ options WRITE setOptions)
diff --git a/src/gui/dialogs/qinputdialog.h b/src/gui/dialogs/qinputdialog.h
index edeaadd..401b328 100644
--- a/src/gui/dialogs/qinputdialog.h
+++ b/src/gui/dialogs/qinputdialog.h
@@ -59,7 +59,7 @@ class QInputDialogPrivate;
 class Q_GUI_EXPORT QInputDialog : public QDialog
 {
     Q_OBJECT
-    Q_DECLARE_SCOPED_PRIVATE(QInputDialog)
+    Q_DECLARE_PRIVATE(QInputDialog)
 //  Q_ENUMS(InputMode InputDialogOption)
     QDOC_PROPERTY(InputMode inputMode READ inputMode WRITE setInputMode)
     QDOC_PROPERTY(QString labelText READ labelText WRITE setLabelText)
diff --git a/src/gui/dialogs/qmessagebox.h b/src/gui/dialogs/qmessagebox.h
index d24d466..048455e 100644
--- a/src/gui/dialogs/qmessagebox.h
+++ b/src/gui/dialogs/qmessagebox.h
@@ -336,7 +336,7 @@ private:
     Q_PRIVATE_SLOT(d_func(), void _q_buttonClicked(QAbstractButton *))
 
     Q_DISABLE_COPY(QMessageBox)
-    Q_DECLARE_SCOPED_PRIVATE(QMessageBox)
+    Q_DECLARE_PRIVATE(QMessageBox)
 };
 
 Q_DECLARE_OPERATORS_FOR_FLAGS(QMessageBox::StandardButtons)
diff --git a/src/gui/dialogs/qpagesetupdialog.h b/src/gui/dialogs/qpagesetupdialog.h
index 1757c32..43e316d 100644
--- a/src/gui/dialogs/qpagesetupdialog.h
+++ b/src/gui/dialogs/qpagesetupdialog.h
@@ -57,7 +57,7 @@ class QPageSetupDialogPrivate;
 class Q_GUI_EXPORT QPageSetupDialog : public QAbstractPageSetupDialog
 {
     Q_OBJECT
-    Q_DECLARE_SCOPED_PRIVATE(QPageSetupDialog)
+    Q_DECLARE_PRIVATE(QPageSetupDialog)
     Q_ENUMS(PageSetupDialogOption)
     Q_PROPERTY(PageSetupDialogOptions options READ options WRITE setOptions)
 
diff --git a/src/gui/dialogs/qprintdialog.h b/src/gui/dialogs/qprintdialog.h
index 5af70b3..e5a90cc 100644
--- a/src/gui/dialogs/qprintdialog.h
+++ b/src/gui/dialogs/qprintdialog.h
@@ -81,7 +81,7 @@ private:
 class Q_GUI_EXPORT QPrintDialog : public QAbstractPrintDialog
 {
     Q_OBJECT
-    Q_DECLARE_SCOPED_PRIVATE(QPrintDialog)
+    Q_DECLARE_PRIVATE(QPrintDialog)
     Q_ENUMS(PrintDialogOption)
     Q_PROPERTY(PrintDialogOptions options READ options WRITE setOptions)
 
diff --git a/src/gui/dialogs/qprintpreviewdialog.h b/src/gui/dialogs/qprintpreviewdialog.h
index 5836e5a..85ed517 100644
--- a/src/gui/dialogs/qprintpreviewdialog.h
+++ b/src/gui/dialogs/qprintpreviewdialog.h
@@ -58,7 +58,7 @@ class QPrintPreviewDialogPrivate;
 class Q_GUI_EXPORT QPrintPreviewDialog : public QDialog
 {
     Q_OBJECT
-    Q_DECLARE_SCOPED_PRIVATE(QPrintPreviewDialog)
+    Q_DECLARE_PRIVATE(QPrintPreviewDialog)
 
 public:
     explicit QPrintPreviewDialog(QWidget *parent = 0, Qt::WindowFlags flags = 0);
diff --git a/src/gui/dialogs/qprogressdialog.h b/src/gui/dialogs/qprogressdialog.h
index 41a825a..1118c45 100644
--- a/src/gui/dialogs/qprogressdialog.h
+++ b/src/gui/dialogs/qprogressdialog.h
@@ -61,7 +61,7 @@ class QProgressDialogPrivate;
 class Q_GUI_EXPORT QProgressDialog : public QDialog
 {
     Q_OBJECT
-    Q_DECLARE_SCOPED_PRIVATE(QProgressDialog)
+    Q_DECLARE_PRIVATE(QProgressDialog)
     Q_PROPERTY(bool wasCanceled READ wasCanceled)
     Q_PROPERTY(int minimum READ minimum WRITE setMinimum)
     Q_PROPERTY(int maximum READ maximum WRITE setMaximum)
diff --git a/src/gui/dialogs/qwizard.h b/src/gui/dialogs/qwizard.h
index a8976c4..d1f9cf7 100644
--- a/src/gui/dialogs/qwizard.h
+++ b/src/gui/dialogs/qwizard.h
@@ -194,7 +194,7 @@ protected:
 
 private:
     Q_DISABLE_COPY(QWizard)
-    Q_DECLARE_SCOPED_PRIVATE(QWizard)
+    Q_DECLARE_PRIVATE(QWizard)
     Q_PRIVATE_SLOT(d_func(), void _q_emitCustomButtonClicked())
     Q_PRIVATE_SLOT(d_func(), void _q_updateButtonStates())
     Q_PRIVATE_SLOT(d_func(), void _q_handleFieldObjectDestroyed(QObject *))
@@ -246,7 +246,7 @@ protected:
 
 private:
     Q_DISABLE_COPY(QWizardPage)
-    Q_DECLARE_SCOPED_PRIVATE(QWizardPage)
+    Q_DECLARE_PRIVATE(QWizardPage)
     Q_PRIVATE_SLOT(d_func(), void _q_maybeEmitCompleteChanged())
     Q_PRIVATE_SLOT(d_func(), void _q_updateCachedCompleteState())
 
diff --git a/src/gui/dialogs/qwizard_win.cpp b/src/gui/dialogs/qwizard_win.cpp
index 41b581f..1def47f 100644
--- a/src/gui/dialogs/qwizard_win.cpp
+++ b/src/gui/dialogs/qwizard_win.cpp
@@ -429,7 +429,7 @@ void QVistaHelper::setWindowPosHack()
 class QHackWidget : public QWidget
 {
 public:
-    Q_DECLARE_SCOPED_PRIVATE(QWidget)
+    Q_DECLARE_PRIVATE(QWidget)
     QTLWExtra* topData() { return d_func()->topData(); }
 };