From 71726ccf676ef0921ef557c7162d2d87563066fb Mon Sep 17 00:00:00 2001 From: Pekka Vuorela Date: Tue, 24 Jan 2012 17:44:38 +0200 Subject: Renamed QInputPanel as QInputMethod QInputMethod better describes what the class is about, input methods in general, be they panels or just composing input from key events. Compatability headers added for old name. Not bulletproof but should be enough to get transition done. Change-Id: Iefde6e7ccb1ec4a3b226cef3469089e751c60fc1 Reviewed-by: Joona Petrell --- src/gui/kernel/qguiapplication.cpp | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) (limited to 'src/gui/kernel/qguiapplication.cpp') diff --git a/src/gui/kernel/qguiapplication.cpp b/src/gui/kernel/qguiapplication.cpp index a97647f504..4096628d93 100644 --- a/src/gui/kernel/qguiapplication.cpp +++ b/src/gui/kernel/qguiapplication.cpp @@ -183,7 +183,7 @@ QGuiApplication::~QGuiApplication() QGuiApplicationPrivate::QGuiApplicationPrivate(int &argc, char **argv, int flags) : QCoreApplicationPrivate(argc, argv, flags), styleHints(0), - inputPanel(0) + inputMethod(0) { self = this; application_type = QCoreApplication::GuiClient; @@ -522,7 +522,7 @@ QGuiApplicationPrivate::~QGuiApplicationPrivate() cleanupThreadData(); delete styleHints; - delete inputPanel; + delete inputMethod; delete platform_integration; platform_integration = 0; @@ -1572,12 +1572,17 @@ QStyleHints *QGuiApplication::styleHints() const \sa QInputPanel */ -QInputPanel *QGuiApplication::inputPanel() const +QInputMethod *QGuiApplication::inputMethod() const { Q_D(const QGuiApplication); - if (!d->inputPanel) - const_cast(d)->inputPanel = new QInputPanel(); - return d->inputPanel; + if (!d->inputMethod) + const_cast(d)->inputMethod = new QInputMethod(); + return d->inputMethod; +} + +QInputPanel *QGuiApplication::inputPanel() const +{ + return inputMethod(); } -- cgit v1.2.3