From 0c8f471c967f05171aac92376378891e7f82856e Mon Sep 17 00:00:00 2001 From: Joona Petrell Date: Mon, 21 Nov 2011 16:17:50 +0200 Subject: Remove handlesInputPanelVisibility() deprecation mechanism Task-number: QTBUG-21964 Change-Id: I508ba690c90369d31ca33390d3001064857fb62e Reviewed-by: Pekka Vuorela Reviewed-by: Lars Knoll --- .../platforminputcontexts/ibus/qibusplatforminputcontext.cpp | 6 ------ src/plugins/platforminputcontexts/ibus/qibusplatforminputcontext.h | 2 -- .../platforminputcontexts/meego/qmeegoplatforminputcontext.cpp | 6 ------ .../platforminputcontexts/meego/qmeegoplatforminputcontext.h | 2 -- 4 files changed, 16 deletions(-) (limited to 'src/plugins/platforminputcontexts') diff --git a/src/plugins/platforminputcontexts/ibus/qibusplatforminputcontext.cpp b/src/plugins/platforminputcontexts/ibus/qibusplatforminputcontext.cpp index 2c2188b85e..6ab142ce25 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 3dd2aefe06..5f0b4d4691 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 50472eada0..c66ea4a178 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 5e1ee78331..04eb28eab2 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; -- cgit v1.2.3