From e06999bd625c8e787d429a1296739a68e48a4e6f Mon Sep 17 00:00:00 2001 From: Pekka Vuorela Date: Tue, 4 Sep 2012 00:32:29 +0300 Subject: Remove deprecated inputItem and inputWindow from QInputMethod Interfaces introduced and deprecated during Qt5 development. Change-Id: I804a02df8c4a03ed6558f4a86375f97d09513d5c Reviewed-by: Qt Doc Bot Reviewed-by: Lars Knoll --- src/gui/kernel/qinputmethod.h | 14 -------------- 1 file changed, 14 deletions(-) (limited to 'src/gui/kernel/qinputmethod.h') diff --git a/src/gui/kernel/qinputmethod.h b/src/gui/kernel/qinputmethod.h index 4b21e4ac15..dc3e43a45f 100644 --- a/src/gui/kernel/qinputmethod.h +++ b/src/gui/kernel/qinputmethod.h @@ -59,7 +59,6 @@ class Q_GUI_EXPORT QInputMethod : public QObject { Q_OBJECT Q_DECLARE_PRIVATE(QInputMethod) - Q_PROPERTY(QObject *inputItem READ inputItem WRITE setInputItem NOTIFY inputItemChanged) Q_PROPERTY(QRectF cursorRectangle READ cursorRectangle NOTIFY cursorRectangleChanged) Q_PROPERTY(QRectF keyboardRectangle READ keyboardRectangle NOTIFY keyboardRectangleChanged) Q_PROPERTY(bool visible READ isVisible NOTIFY visibleChanged) @@ -69,14 +68,6 @@ class Q_GUI_EXPORT QInputMethod : public QObject Q_ENUMS(Action) public: -#ifdef QT_DEPRECATED - QT_DEPRECATED QObject *inputItem() const; - QT_DEPRECATED void setInputItem(QObject *inputItemChanged); - - // the window containing the editor - QT_DEPRECATED QWindow *inputWindow() const; -#endif - QTransform inputItemTransform() const; void setInputItemTransform(const QTransform &transform); @@ -114,7 +105,6 @@ public Q_SLOTS: void invokeAction(Action a, int cursorPosition); Q_SIGNALS: - void inputItemChanged(); void cursorRectangleChanged(); void keyboardRectangleChanged(); void visibleChanged(); @@ -128,10 +118,6 @@ private: friend class QPlatformInputContext; QInputMethod(); ~QInputMethod(); - - Q_PRIVATE_SLOT(d_func(), void _q_connectFocusObject()) - Q_PRIVATE_SLOT(d_func(), void _q_checkFocusObject(QObject* object)) - }; QT_END_NAMESPACE -- cgit v1.2.3