Remove handlesInputPanelVisibility() deprecation mechanism

Task-number: QTBUG-21964
Change-Id: I508ba690c90369d31ca33390d3001064857fb62e
Reviewed-by: Pekka Vuorela <[email protected]>
Reviewed-by: Lars Knoll <[email protected]>

9 files changed, 13 insertions, 60 deletions

diff --git a/src/gui/kernel/qinputpanel.cpp b/src/gui/kernel/qinputpanel.cpp
index 510e2d10388..d6d58bf1c50 100644
--- a/src/gui/kernel/qinputpanel.cpp
+++ b/src/gui/kernel/qinputpanel.cpp
@@ -180,12 +180,8 @@ void QInputPanel::show()
 {
     Q_D(QInputPanel);
     QPlatformInputContext *ic = d->platformInputContext();
-    if (ic && ic->handlesInputPanelVisibility())
+    if (ic)
         ic->showInputPanel();
-    else if (!d->visible) {
-        d->visible = true;
-        emit visibleChanged();
-    }
 }
 
 /*!
@@ -199,12 +195,8 @@ void QInputPanel::hide()
 {
     Q_D(QInputPanel);
     QPlatformInputContext *ic = d->platformInputContext();
-    if (ic && ic->handlesInputPanelVisibility())
+    if (ic)
         ic->hideInputPanel();
-    else if (d->visible) {
-        d->visible = false;
-        emit visibleChanged();
-    }
 }
 
 /*!
@@ -220,10 +212,8 @@ bool QInputPanel::visible() const
 {
     Q_D(const QInputPanel);
     QPlatformInputContext *ic = d->platformInputContext();
-    if (ic && ic->handlesInputPanelVisibility())
+    if (ic)
         return ic->isInputPanelVisible();
-    else
-        return d->visible;
     return false;
 }
 
diff --git a/src/gui/kernel/qinputpanel_p.h b/src/gui/kernel/qinputpanel_p.h
index cf999cdd5fe..6fcf2d72437 100644
--- a/src/gui/kernel/qinputpanel_p.h
+++ b/src/gui/kernel/qinputpanel_p.h
@@ -56,8 +56,7 @@ QT_BEGIN_NAMESPACE
 class QInputPanelPrivate : public QObjectPrivate
 {
 public:
-    inline QInputPanelPrivate()
-        : visible(false), testContext(0)
+    inline QInputPanelPrivate() : testContext(0)
     {}
     QPlatformInputContext *platformInputContext() const
     {
@@ -70,7 +69,6 @@ public:
 
     QTransform inputItemTransform;
     QWeakPointer<QObject> inputItem;
-    bool visible;
     QPlatformInputContext *testContext;
 };
 
diff --git a/src/gui/kernel/qplatforminputcontext_qpa.cpp b/src/gui/kernel/qplatforminputcontext_qpa.cpp
index 21f12197422..bc0bcf8f4f3 100644
--- a/src/gui/kernel/qplatforminputcontext_qpa.cpp
+++ b/src/gui/kernel/qplatforminputcontext_qpa.cpp
@@ -207,10 +207,4 @@ void QPlatformInputContext::emitInputPanelVisibleChanged()
     emit qApp->inputPanel()->visibleChanged();
 }
 
-//  temporary function added to retain compatibility to old functionality, will be deprecated
-bool QPlatformInputContext::handlesInputPanelVisibility() const
-{
-    return false;
-}
-
 QT_END_NAMESPACE
diff --git a/src/gui/kernel/qplatforminputcontext_qpa.h b/src/gui/kernel/qplatforminputcontext_qpa.h
index ab5b6726beb..76aa1227201 100644
--- a/src/gui/kernel/qplatforminputcontext_qpa.h
+++ b/src/gui/kernel/qplatforminputcontext_qpa.h
@@ -77,9 +77,6 @@ public:
     virtual void hideInputPanel();
     virtual bool isInputPanelVisible() const;
     void emitInputPanelVisibleChanged();
-
-    // temporary function added to retain compatibility to old functionality, will be deprecated
-    virtual bool handlesInputPanelVisibility() const;
 };
 
 QT_END_NAMESPACE
diff --git a/src/plugins/platforminputcontexts/ibus/qibusplatforminputcontext.cpp b/src/plugins/platforminputcontexts/ibus/qibusplatforminputcontext.cpp
index 2c2188b85e6..6ab142ce257 100644
--- a/src/plugins/platforminputcontexts/ibus/qibusplatforminputcontext.cpp
+++ b/src/plugins/platforminputcontexts/ibus/qibusplatforminputcontext.cpp
@@ -180,12 +180,6 @@ void QIBusPlatformInputContext::inputItemChanged()
         d->context->FocusOut();
 }
 
-// temporary function added to retain compatibility to old functionality, will be deprecated
-bool QIBusPlatformInputContext::handlesInputPanelVisibility() const
-{
-    return true;
-}
-
 void QIBusPlatformInputContext::commitText(const QDBusVariant &text)
 {
     QObject *input = qApp->inputPanel()->inputItem();
diff --git a/src/plugins/platforminputcontexts/ibus/qibusplatforminputcontext.h b/src/plugins/platforminputcontexts/ibus/qibusplatforminputcontext.h
index 3dd2aefe06d..5f0b4d46911 100644
--- a/src/plugins/platforminputcontexts/ibus/qibusplatforminputcontext.h
+++ b/src/plugins/platforminputcontexts/ibus/qibusplatforminputcontext.h
@@ -64,8 +64,6 @@ public:
 
     Q_INVOKABLE bool x11FilterEvent(uint keyval, uint keycode, uint state, bool press);
 
-    virtual bool handlesInputPanelVisibility() const;
-
 public Q_SLOTS:
     void commitText(const QDBusVariant &text);
     void updatePreeditText(const QDBusVariant &text, uint cursor_pos, bool visible);
diff --git a/src/plugins/platforminputcontexts/meego/qmeegoplatforminputcontext.cpp b/src/plugins/platforminputcontexts/meego/qmeegoplatforminputcontext.cpp
index 50472eada0d..c66ea4a1782 100644
--- a/src/plugins/platforminputcontexts/meego/qmeegoplatforminputcontext.cpp
+++ b/src/plugins/platforminputcontexts/meego/qmeegoplatforminputcontext.cpp
@@ -475,12 +475,6 @@ void QMeeGoPlatformInputContext::inputItemChanged()
         showInputPanel();
 }
 
-// temporary function added to retain compatibility to old functionality, will be deprecated
-bool QMeeGoPlatformInputContext::handlesInputPanelVisibility() const
-{
-    return true;
-}
-
 void QMeeGoPlatformInputContext::showInputPanel()
 {
     if (debug)
diff --git a/src/plugins/platforminputcontexts/meego/qmeegoplatforminputcontext.h b/src/plugins/platforminputcontexts/meego/qmeegoplatforminputcontext.h
index 5e1ee783312..04eb28eab2d 100644
--- a/src/plugins/platforminputcontexts/meego/qmeegoplatforminputcontext.h
+++ b/src/plugins/platforminputcontexts/meego/qmeegoplatforminputcontext.h
@@ -64,8 +64,6 @@ public:
     void update(Qt::InputMethodQueries);
     virtual QRectF keyboardRect() const;
 
-    virtual bool handlesInputPanelVisibility() const;
-
     virtual void showInputPanel();
     virtual void hideInputPanel();
     virtual bool isInputPanelVisible() const;
diff --git a/tests/auto/gui/kernel/qinputpanel/tst_qinputpanel.cpp b/tests/auto/gui/kernel/qinputpanel/tst_qinputpanel.cpp
index e7f5e84942a..26bde8aa193 100644
--- a/tests/auto/gui/kernel/qinputpanel/tst_qinputpanel.cpp
+++ b/tests/auto/gui/kernel/qinputpanel/tst_qinputpanel.cpp
@@ -51,7 +51,6 @@ public:
     PlatformInputContext() :
         m_animating(false),
         m_visible(false),
-        m_handlesInputPanelVisibility(false),
         m_updateCallCount(0),
         m_resetCallCount(0),
         m_commitCallCount(0),
@@ -92,14 +91,9 @@ public:
     {
         return m_visible;
     }
-    virtual bool handlesInputPanelVisibility() const
-    {
-        return m_handlesInputPanelVisibility;
-    }
 
     bool m_animating;
     bool m_visible;
-    bool m_handlesInputPanelVisibility;
     int m_updateCallCount;
     int m_resetCallCount;
     int m_commitCallCount;
@@ -163,22 +157,18 @@ void tst_qinputpanel::initTestCase()
 
 void tst_qinputpanel::visible()
 {
-    QCOMPARE(m_platformInputContext.m_handlesInputPanelVisibility, false);
-    for (int index = 0; index < 2; index++) {
-        m_platformInputContext.m_handlesInputPanelVisibility = index;
-        QCOMPARE(qApp->inputPanel()->visible(), false);
-        qApp->inputPanel()->show();
-        QCOMPARE(qApp->inputPanel()->visible(), true);
+    QCOMPARE(qApp->inputPanel()->visible(), false);
+    qApp->inputPanel()->show();
+    QCOMPARE(qApp->inputPanel()->visible(), true);
 
-        qApp->inputPanel()->hide();
-        QCOMPARE(qApp->inputPanel()->visible(), false);
+    qApp->inputPanel()->hide();
+    QCOMPARE(qApp->inputPanel()->visible(), false);
 
-        qApp->inputPanel()->setVisible(true);
-        QCOMPARE(qApp->inputPanel()->visible(), true);
+    qApp->inputPanel()->setVisible(true);
+    QCOMPARE(qApp->inputPanel()->visible(), true);
 
-        qApp->inputPanel()->setVisible(false);
-        QCOMPARE(qApp->inputPanel()->visible(), false);
-    }
+    qApp->inputPanel()->setVisible(false);
+    QCOMPARE(qApp->inputPanel()->visible(), false);
 }
 
 void tst_qinputpanel::animating()