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.

3 files changed, 3 insertions, 3 deletions

diff --git a/tests/auto/qfiledialog/tst_qfiledialog.cpp b/tests/auto/qfiledialog/tst_qfiledialog.cpp
index e4f1ddd..86bf237 100644
--- a/tests/auto/qfiledialog/tst_qfiledialog.cpp
+++ b/tests/auto/qfiledialog/tst_qfiledialog.cpp
@@ -1358,7 +1358,7 @@ void tst_QFiledialog::heapCorruption()
 struct FriendlyQFileDialog : public QFileDialog
 {
     friend class tst_QFileDialog;
-    Q_DECLARE_SCOPED_PRIVATE(QFileDialog)
+    Q_DECLARE_PRIVATE(QFileDialog)
 };
 
 
diff --git a/tests/auto/qfilesystemmodel/tst_qfilesystemmodel.cpp b/tests/auto/qfilesystemmodel/tst_qfilesystemmodel.cpp
index 5337de6..72841bb 100644
--- a/tests/auto/qfilesystemmodel/tst_qfilesystemmodel.cpp
+++ b/tests/auto/qfilesystemmodel/tst_qfilesystemmodel.cpp
@@ -772,7 +772,7 @@ void tst_QFileSystemModel::setData()
 class MyFriendFileSystemModel : public QFileSystemModel
 {
     friend class tst_QFileSystemModel;
-    Q_DECLARE_SCOPED_PRIVATE(QFileSystemModel)
+    Q_DECLARE_PRIVATE(QFileSystemModel)
 };
 
 void tst_QFileSystemModel::sort_data()
diff --git a/tests/auto/qstandarditemmodel/tst_qstandarditemmodel.cpp b/tests/auto/qstandarditemmodel/tst_qstandarditemmodel.cpp
index f08b89a..794c5e6 100644
--- a/tests/auto/qstandarditemmodel/tst_qstandarditemmodel.cpp
+++ b/tests/auto/qstandarditemmodel/tst_qstandarditemmodel.cpp
@@ -1468,7 +1468,7 @@ static QModelIndex indexFromText(QStandardItemModel *model, const QString &text)
 struct FriendlyTreeView : public QTreeView
 {
     friend class tst_QStandardItemModel;
-	Q_DECLARE_SCOPED_PRIVATE(QTreeView)
+	Q_DECLARE_PRIVATE(QTreeView)
 };
 #endif