From 4d238a5684d2e678c309d0ae8ed7f76a5f2bd682 Mon Sep 17 00:00:00 2001 From: Tasuku Suzuki Date: Tue, 22 May 2012 07:57:55 +0900 Subject: [PATCH] move inputMethodQuery() to public in subclasses of QWidget QWidget::inputMethodQuery() is public. Change-Id: I6d290e911854937f32fa6984329b56571feb6872 Reviewed-by: Joona Petrell --- src/widgets/widgets/qcombobox.h | 2 +- src/widgets/widgets/qplaintextedit.h | 2 +- src/widgets/widgets/qtextedit.h | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/widgets/widgets/qcombobox.h b/src/widgets/widgets/qcombobox.h index 854ced5..04736df 100644 --- a/src/widgets/widgets/qcombobox.h +++ b/src/widgets/widgets/qcombobox.h @@ -204,6 +204,7 @@ public: virtual void hidePopup(); bool event(QEvent *event); + QVariant inputMethodQuery(Qt::InputMethodQuery) const; public Q_SLOTS: void clear(); @@ -237,7 +238,6 @@ protected: #endif void contextMenuEvent(QContextMenuEvent *e); void inputMethodEvent(QInputMethodEvent *); - QVariant inputMethodQuery(Qt::InputMethodQuery) const; void initStyleOption(QStyleOptionComboBox *option) const; diff --git a/src/widgets/widgets/qplaintextedit.h b/src/widgets/widgets/qplaintextedit.h index 3d53aeb..b7395d3 100644 --- a/src/widgets/widgets/qplaintextedit.h +++ b/src/widgets/widgets/qplaintextedit.h @@ -179,6 +179,7 @@ public: void print(QPagedPaintDevice *printer) const; int blockCount() const; + QVariant inputMethodQuery(Qt::InputMethodQuery property) const; public Q_SLOTS: @@ -249,7 +250,6 @@ protected: virtual void insertFromMimeData(const QMimeData *source); virtual void inputMethodEvent(QInputMethodEvent *); - QVariant inputMethodQuery(Qt::InputMethodQuery property) const; QPlainTextEdit(QPlainTextEditPrivate &dd, QWidget *parent); diff --git a/src/widgets/widgets/qtextedit.h b/src/widgets/widgets/qtextedit.h index bc2cd49..d98531b 100644 --- a/src/widgets/widgets/qtextedit.h +++ b/src/widgets/widgets/qtextedit.h @@ -206,6 +206,8 @@ public: void print(QPagedPaintDevice *printer) const; + QVariant inputMethodQuery(Qt::InputMethodQuery property) const; + public Q_SLOTS: void setFontPointSize(qreal s); void setFontFamily(const QString &fontFamily); @@ -290,7 +292,6 @@ protected: virtual void insertFromMimeData(const QMimeData *source); virtual void inputMethodEvent(QInputMethodEvent *); - QVariant inputMethodQuery(Qt::InputMethodQuery property) const; QTextEdit(QTextEditPrivate &dd, QWidget *parent); -- 2.7.4