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.

10 files changed, 11 insertions, 11 deletions

diff --git a/src/script/qscriptable.h b/src/script/qscriptable.h
index 11ecb6b..76a0496 100644
--- a/src/script/qscriptable.h
+++ b/src/script/qscriptable.h
@@ -78,7 +78,7 @@ private:
     QScopedPointer<QScriptablePrivate> d_ptr;
 
     Q_DISABLE_COPY(QScriptable)
-    Q_DECLARE_SCOPED_PRIVATE(QScriptable)
+    Q_DECLARE_PRIVATE(QScriptable)
 };
 
 #endif // QT_NO_QOBJECT
diff --git a/src/script/qscriptclass.h b/src/script/qscriptclass.h
index e821cf7..7070470 100644
--- a/src/script/qscriptclass.h
+++ b/src/script/qscriptclass.h
@@ -107,7 +107,7 @@ protected:
     QScopedPointer<QScriptClassPrivate> d_ptr;
 
 private:
-    Q_DECLARE_SCOPED_PRIVATE(QScriptClass)
+    Q_DECLARE_PRIVATE(QScriptClass)
     Q_DISABLE_COPY(QScriptClass)
 };
 
diff --git a/src/script/qscriptclasspropertyiterator.h b/src/script/qscriptclasspropertyiterator.h
index ce6d3d4..1570410 100644
--- a/src/script/qscriptclasspropertyiterator.h
+++ b/src/script/qscriptclasspropertyiterator.h
@@ -84,7 +84,7 @@ protected:
     QScopedPointer<QScriptClassPropertyIteratorPrivate> d_ptr;
 
 private:
-    Q_DECLARE_SCOPED_PRIVATE(QScriptClassPropertyIterator)
+    Q_DECLARE_PRIVATE(QScriptClassPropertyIterator)
     Q_DISABLE_COPY(QScriptClassPropertyIterator)
 };
 
diff --git a/src/script/qscriptcontext.h b/src/script/qscriptcontext.h
index 84d4192..5a86cba 100644
--- a/src/script/qscriptcontext.h
+++ b/src/script/qscriptcontext.h
@@ -114,7 +114,7 @@ private:
 
     QScopedPointer<QScriptContextPrivate> d_ptr;
 
-    Q_DECLARE_SCOPED_PRIVATE(QScriptContext)
+    Q_DECLARE_PRIVATE(QScriptContext)
     Q_DISABLE_COPY(QScriptContext)
 };
 
diff --git a/src/script/qscriptcontextinfo.h b/src/script/qscriptcontextinfo.h
index 95e88e2..3540060 100644
--- a/src/script/qscriptcontextinfo.h
+++ b/src/script/qscriptcontextinfo.h
@@ -107,7 +107,7 @@ public:
 private:
     QScopedSharedPointer<QScriptContextInfoPrivate> d_ptr;
 
-    Q_DECLARE_SCOPED_PRIVATE(QScriptContextInfo)
+    Q_DECLARE_PRIVATE(QScriptContextInfo)
 };
 
 typedef QList<QScriptContextInfo> QScriptContextInfoList;
diff --git a/src/script/qscriptengine.h b/src/script/qscriptengine.h
index 4f39c57..794c965 100644
--- a/src/script/qscriptengine.h
+++ b/src/script/qscriptengine.h
@@ -117,7 +117,7 @@ private:
     QScriptSyntaxCheckResult(QScriptSyntaxCheckResultPrivate *d);
     QScopedSharedPointer<QScriptSyntaxCheckResultPrivate> d_ptr;
 
-    Q_DECLARE_SCOPED_PRIVATE(QScriptSyntaxCheckResult)
+    Q_DECLARE_PRIVATE(QScriptSyntaxCheckResult)
     friend class QScriptEnginePrivate;
 };
 
@@ -291,7 +291,7 @@ protected:
 #endif
 
 private:
-    Q_DECLARE_SCOPED_PRIVATE(QScriptEngine)
+    Q_DECLARE_PRIVATE(QScriptEngine)
     Q_DISABLE_COPY(QScriptEngine)
 #ifndef QT_NO_QOBJECT
     Q_PRIVATE_SLOT(d_func(), void _q_objectDestroyed(QObject *))
diff --git a/src/script/qscriptengineagent.h b/src/script/qscriptengineagent.h
index 10209df..e71560c 100644
--- a/src/script/qscriptengineagent.h
+++ b/src/script/qscriptengineagent.h
@@ -100,7 +100,7 @@ protected:
     QScopedPointer<QScriptEngineAgentPrivate> d_ptr;
 
 private:
-    Q_DECLARE_SCOPED_PRIVATE(QScriptEngineAgent)
+    Q_DECLARE_PRIVATE(QScriptEngineAgent)
     Q_DISABLE_COPY(QScriptEngineAgent)
 };
 
diff --git a/src/script/qscriptstring.h b/src/script/qscriptstring.h
index 17cb687..16c834d 100644
--- a/src/script/qscriptstring.h
+++ b/src/script/qscriptstring.h
@@ -78,7 +78,7 @@ public:
 private:
     QCustomScopedPointer<QScriptStringPrivate, QScriptStringPrivatePointerDeleter> d_ptr;
 
-    Q_DECLARE_SCOPED_PRIVATE(QScriptString)
+    Q_DECLARE_PRIVATE(QScriptString)
 };
 
 QT_END_NAMESPACE
diff --git a/src/script/qscriptvalue.h b/src/script/qscriptvalue.h
index 5b10f9e..d504ad8 100644
--- a/src/script/qscriptvalue.h
+++ b/src/script/qscriptvalue.h
@@ -225,7 +225,7 @@ private:
 private:
     QCustomScopedPointer<QScriptValuePrivate, QScriptValuePrivatePointerDeleter> d_ptr;
 
-    Q_DECLARE_SCOPED_PRIVATE(QScriptValue)
+    Q_DECLARE_PRIVATE(QScriptValue)
 };
 
 Q_DECLARE_OPERATORS_FOR_FLAGS(QScriptValue::ResolveFlags)
diff --git a/src/script/qscriptvalueiterator.h b/src/script/qscriptvalueiterator.h
index a25d12c..c8684ea 100644
--- a/src/script/qscriptvalueiterator.h
+++ b/src/script/qscriptvalueiterator.h
@@ -88,7 +88,7 @@ public:
 private:
     QScopedPointer<QScriptValueIteratorPrivate> d_ptr;
 
-    Q_DECLARE_SCOPED_PRIVATE(QScriptValueIterator)
+    Q_DECLARE_PRIVATE(QScriptValueIterator)
     Q_DISABLE_COPY(QScriptValueIterator)
 };