From cf0d5d4554999bfe34e65ddea52726543246fc73 Mon Sep 17 00:00:00 2001
From: Pekka Vuorela <pekka.ta.vuorela@nokia.com>
Date: Mon, 16 Jan 2012 13:43:11 +0200
Subject: Move keyboardInput data back to QApplication

Deprecated interface, rest of Qt now adapted to
QInputPanel.

Change-Id: Iacbbcac90dd7c037a24b45df1ee868f04090b21b
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Reviewed-by: Joona Petrell <joona.t.petrell@nokia.com>
---
 src/gui/kernel/qguiapplication.cpp  | 22 ----------------------
 src/gui/kernel/qguiapplication.h    |  3 ---
 src/widgets/kernel/qapplication.cpp | 22 ++++++++++++++++++++++
 src/widgets/kernel/qapplication.h   |  3 +++
 4 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/src/gui/kernel/qguiapplication.cpp b/src/gui/kernel/qguiapplication.cpp
index f92e66b38e..c89e144c84 100644
--- a/src/gui/kernel/qguiapplication.cpp
+++ b/src/gui/kernel/qguiapplication.cpp
@@ -1520,28 +1520,6 @@ uint QGuiApplicationPrivate::currentKeyPlatform()
     return platform;
 }
 
-/*!
-    \since 4.2
-    \obsolete
-
-    Returns the current keyboard input locale. Replaced with QInputPanel::locale()
-*/
-QLocale QGuiApplication::keyboardInputLocale()
-{
-    return qApp ? qApp->inputPanel()->locale() : QLocale::c();
-}
-
-/*!
-    \since 4.2
-    \obsolete
-
-    Returns the current keyboard input direction. Replaced with QInputPanel::inputDirection()
-*/
-Qt::LayoutDirection QGuiApplication::keyboardInputDirection()
-{
-    return qApp ? qApp->inputPanel()->inputDirection() : Qt::LeftToRight;
-}
-
 /*!
     \since 4.5
     \fn void QGuiApplication::fontDatabaseChanged()
diff --git a/src/gui/kernel/qguiapplication.h b/src/gui/kernel/qguiapplication.h
index dd7b1f8806..a07e13332e 100644
--- a/src/gui/kernel/qguiapplication.h
+++ b/src/gui/kernel/qguiapplication.h
@@ -119,9 +119,6 @@ public:
     static inline bool isRightToLeft() { return layoutDirection() == Qt::RightToLeft; }
     static inline bool isLeftToRight() { return layoutDirection() == Qt::LeftToRight; }
 
-    QT_DEPRECATED static QLocale keyboardInputLocale();
-    QT_DEPRECATED static Qt::LayoutDirection keyboardInputDirection();
-
     QStyleHints *styleHints() const;
     QInputPanel *inputPanel() const;
 
diff --git a/src/widgets/kernel/qapplication.cpp b/src/widgets/kernel/qapplication.cpp
index fc295eb874..cbd744f7e7 100644
--- a/src/widgets/kernel/qapplication.cpp
+++ b/src/widgets/kernel/qapplication.cpp
@@ -4967,6 +4967,28 @@ QInputContext *QApplication::inputContext() const
 }
 #endif // QT_NO_IM
 
+/*!
+    \since 4.2
+    \obsolete
+
+    Returns the current keyboard input locale. Replaced with QInputPanel::locale()
+*/
+QLocale QApplication::keyboardInputLocale()
+{
+    return qApp ? qApp->inputPanel()->locale() : QLocale::c();
+}
+
+/*!
+    \since 4.2
+    \obsolete
+
+    Returns the current keyboard input direction. Replaced with QInputPanel::inputDirection()
+*/
+Qt::LayoutDirection QApplication::keyboardInputDirection()
+{
+    return qApp ? qApp->inputPanel()->inputDirection() : Qt::LeftToRight;
+}
+
 bool qt_sendSpontaneousEvent(QObject *receiver, QEvent *event)
 {
     return QGuiApplication::sendSpontaneousEvent(receiver, event);
diff --git a/src/widgets/kernel/qapplication.h b/src/widgets/kernel/qapplication.h
index 4347aa3521..c0182122a8 100644
--- a/src/widgets/kernel/qapplication.h
+++ b/src/widgets/kernel/qapplication.h
@@ -226,6 +226,9 @@ public:
     QInputContext *inputContext() const;
 #endif
 
+    QT_DEPRECATED static QLocale keyboardInputLocale();
+    QT_DEPRECATED static Qt::LayoutDirection keyboardInputDirection();
+
     static int exec();
     bool notify(QObject *, QEvent *);
 
-- 
cgit v1.2.3