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.

2 files changed, 2 insertions, 2 deletions

diff --git a/src/gui/inputmethod/qinputcontext.h b/src/gui/inputmethod/qinputcontext.h
index 87112b5..e4e5f9d 100644
--- a/src/gui/inputmethod/qinputcontext.h
+++ b/src/gui/inputmethod/qinputcontext.h
@@ -83,7 +83,7 @@ class QInputContextPrivate;
 class Q_GUI_EXPORT QInputContext : public QObject
 {
     Q_OBJECT
-    Q_DECLARE_SCOPED_PRIVATE(QInputContext)
+    Q_DECLARE_PRIVATE(QInputContext)
 public:
     explicit QInputContext(QObject* parent = 0);
     virtual ~QInputContext();
diff --git a/src/gui/inputmethod/qmacinputcontext_p.h b/src/gui/inputmethod/qmacinputcontext_p.h
index 69ac3e8..4fcba9a 100644
--- a/src/gui/inputmethod/qmacinputcontext_p.h
+++ b/src/gui/inputmethod/qmacinputcontext_p.h
@@ -61,7 +61,7 @@ QT_BEGIN_NAMESPACE
 class Q_GUI_EXPORT QMacInputContext : public QInputContext
 {
     Q_OBJECT
-    //Q_DECLARE_SCOPED_PRIVATE(QMacInputContext)
+    //Q_DECLARE_PRIVATE(QMacInputContext)
     void createTextDocument();
 public:
     explicit QMacInputContext(QObject* parent = 0);