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.

1 files changed, 15 insertions, 15 deletions

diff --git a/tools/shared/qtpropertybrowser/qteditorfactory.h b/tools/shared/qtpropertybrowser/qteditorfactory.h
index ec30f9d..bad2080 100644
--- a/tools/shared/qtpropertybrowser/qteditorfactory.h
+++ b/tools/shared/qtpropertybrowser/qteditorfactory.h
@@ -61,7 +61,7 @@ protected:
     void disconnectPropertyManager(QtIntPropertyManager *manager);
 private:
     QScopedPointer<QtSpinBoxFactoryPrivate> d_ptr;
-    Q_DECLARE_SCOPED_PRIVATE(QtSpinBoxFactory)
+    Q_DECLARE_PRIVATE(QtSpinBoxFactory)
     Q_DISABLE_COPY(QtSpinBoxFactory)
     Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, int))
     Q_PRIVATE_SLOT(d_func(), void slotRangeChanged(QtProperty *, int, int))
@@ -85,7 +85,7 @@ protected:
     void disconnectPropertyManager(QtIntPropertyManager *manager);
 private:
     QScopedPointer<QtSliderFactoryPrivate> d_ptr;
-    Q_DECLARE_SCOPED_PRIVATE(QtSliderFactory)
+    Q_DECLARE_PRIVATE(QtSliderFactory)
     Q_DISABLE_COPY(QtSliderFactory)
     Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, int))
     Q_PRIVATE_SLOT(d_func(), void slotRangeChanged(QtProperty *, int, int))
@@ -109,7 +109,7 @@ protected:
     void disconnectPropertyManager(QtIntPropertyManager *manager);
 private:
     QScopedPointer<QtScrollBarFactoryPrivate> d_ptr;
-    Q_DECLARE_SCOPED_PRIVATE(QtScrollBarFactory)
+    Q_DECLARE_PRIVATE(QtScrollBarFactory)
     Q_DISABLE_COPY(QtScrollBarFactory)
     Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, int))
     Q_PRIVATE_SLOT(d_func(), void slotRangeChanged(QtProperty *, int, int))
@@ -133,7 +133,7 @@ protected:
     void disconnectPropertyManager(QtBoolPropertyManager *manager);
 private:
     QScopedPointer<QtCheckBoxFactoryPrivate> d_ptr;
-    Q_DECLARE_SCOPED_PRIVATE(QtCheckBoxFactory)
+    Q_DECLARE_PRIVATE(QtCheckBoxFactory)
     Q_DISABLE_COPY(QtCheckBoxFactory)
     Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, bool))
     Q_PRIVATE_SLOT(d_func(), void slotSetValue(bool))
@@ -155,7 +155,7 @@ protected:
     void disconnectPropertyManager(QtDoublePropertyManager *manager);
 private:
     QScopedPointer<QtDoubleSpinBoxFactoryPrivate> d_ptr;
-    Q_DECLARE_SCOPED_PRIVATE(QtDoubleSpinBoxFactory)
+    Q_DECLARE_PRIVATE(QtDoubleSpinBoxFactory)
     Q_DISABLE_COPY(QtDoubleSpinBoxFactory)
     Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, double))
     Q_PRIVATE_SLOT(d_func(), void slotRangeChanged(QtProperty *, double, double))
@@ -180,7 +180,7 @@ protected:
     void disconnectPropertyManager(QtStringPropertyManager *manager);
 private:
     QScopedPointer<QtLineEditFactoryPrivate> d_ptr;
-    Q_DECLARE_SCOPED_PRIVATE(QtLineEditFactory)
+    Q_DECLARE_PRIVATE(QtLineEditFactory)
     Q_DISABLE_COPY(QtLineEditFactory)
     Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QString &))
     Q_PRIVATE_SLOT(d_func(), void slotRegExpChanged(QtProperty *, const QRegExp &))
@@ -203,7 +203,7 @@ protected:
     void disconnectPropertyManager(QtDatePropertyManager *manager);
 private:
     QScopedPointer<QtDateEditFactoryPrivate> d_ptr;
-    Q_DECLARE_SCOPED_PRIVATE(QtDateEditFactory)
+    Q_DECLARE_PRIVATE(QtDateEditFactory)
     Q_DISABLE_COPY(QtDateEditFactory)
     Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QDate &))
     Q_PRIVATE_SLOT(d_func(), void slotRangeChanged(QtProperty *,
@@ -227,7 +227,7 @@ protected:
     void disconnectPropertyManager(QtTimePropertyManager *manager);
 private:
     QScopedPointer<QtTimeEditFactoryPrivate> d_ptr;
-    Q_DECLARE_SCOPED_PRIVATE(QtTimeEditFactory)
+    Q_DECLARE_PRIVATE(QtTimeEditFactory)
     Q_DISABLE_COPY(QtTimeEditFactory)
     Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QTime &))
     Q_PRIVATE_SLOT(d_func(), void slotSetValue(const QTime &))
@@ -249,7 +249,7 @@ protected:
     void disconnectPropertyManager(QtDateTimePropertyManager *manager);
 private:
     QScopedPointer<QtDateTimeEditFactoryPrivate> d_ptr;
-    Q_DECLARE_SCOPED_PRIVATE(QtDateTimeEditFactory)
+    Q_DECLARE_PRIVATE(QtDateTimeEditFactory)
     Q_DISABLE_COPY(QtDateTimeEditFactory)
     Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QDateTime &))
     Q_PRIVATE_SLOT(d_func(), void slotSetValue(const QDateTime &))
@@ -271,7 +271,7 @@ protected:
     void disconnectPropertyManager(QtKeySequencePropertyManager *manager);
 private:
     QScopedPointer<QtKeySequenceEditorFactoryPrivate> d_ptr;
-    Q_DECLARE_SCOPED_PRIVATE(QtKeySequenceEditorFactory)
+    Q_DECLARE_PRIVATE(QtKeySequenceEditorFactory)
     Q_DISABLE_COPY(QtKeySequenceEditorFactory)
     Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QKeySequence &))
     Q_PRIVATE_SLOT(d_func(), void slotSetValue(const QKeySequence &))
@@ -293,7 +293,7 @@ protected:
     void disconnectPropertyManager(QtCharPropertyManager *manager);
 private:
     QScopedPointer<QtCharEditorFactoryPrivate> d_ptr;
-    Q_DECLARE_SCOPED_PRIVATE(QtCharEditorFactory)
+    Q_DECLARE_PRIVATE(QtCharEditorFactory)
     Q_DISABLE_COPY(QtCharEditorFactory)
     Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QChar &))
     Q_PRIVATE_SLOT(d_func(), void slotSetValue(const QChar &))
@@ -315,7 +315,7 @@ protected:
     void disconnectPropertyManager(QtEnumPropertyManager *manager);
 private:
     QScopedPointer<QtEnumEditorFactoryPrivate> d_ptr;
-    Q_DECLARE_SCOPED_PRIVATE(QtEnumEditorFactory)
+    Q_DECLARE_PRIVATE(QtEnumEditorFactory)
     Q_DISABLE_COPY(QtEnumEditorFactory)
     Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, int))
     Q_PRIVATE_SLOT(d_func(), void slotEnumNamesChanged(QtProperty *,
@@ -341,7 +341,7 @@ protected:
     void disconnectPropertyManager(QtCursorPropertyManager *manager);
 private:
     QScopedPointer<QtCursorEditorFactoryPrivate> d_ptr;
-    Q_DECLARE_SCOPED_PRIVATE(QtCursorEditorFactory)
+    Q_DECLARE_PRIVATE(QtCursorEditorFactory)
     Q_DISABLE_COPY(QtCursorEditorFactory)
     Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QCursor &))
     Q_PRIVATE_SLOT(d_func(), void slotEnumChanged(QtProperty *, int))
@@ -363,7 +363,7 @@ protected:
     void disconnectPropertyManager(QtColorPropertyManager *manager);
 private:
     QScopedPointer<QtColorEditorFactoryPrivate> d_ptr;
-    Q_DECLARE_SCOPED_PRIVATE(QtColorEditorFactory)
+    Q_DECLARE_PRIVATE(QtColorEditorFactory)
     Q_DISABLE_COPY(QtColorEditorFactory)
     Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QColor &))
     Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *))
@@ -385,7 +385,7 @@ protected:
     void disconnectPropertyManager(QtFontPropertyManager *manager);
 private:
     QScopedPointer<QtFontEditorFactoryPrivate> d_ptr;
-    Q_DECLARE_SCOPED_PRIVATE(QtFontEditorFactory)
+    Q_DECLARE_PRIVATE(QtFontEditorFactory)
     Q_DISABLE_COPY(QtFontEditorFactory)
     Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QFont &))
     Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *))