summaryrefslogtreecommitdiffstats
path: root/src/plugins/platforminputcontexts
diff options
context:
space:
mode:
Diffstat (limited to 'src/plugins/platforminputcontexts')
-rw-r--r--src/plugins/platforminputcontexts/ibus/qibusplatforminputcontext.cpp18
-rw-r--r--src/plugins/platforminputcontexts/maliit/qmaliitplatforminputcontext.cpp40
2 files changed, 29 insertions, 29 deletions
diff --git a/src/plugins/platforminputcontexts/ibus/qibusplatforminputcontext.cpp b/src/plugins/platforminputcontexts/ibus/qibusplatforminputcontext.cpp
index 4a18ae62bd..5840415ded 100644
--- a/src/plugins/platforminputcontexts/ibus/qibusplatforminputcontext.cpp
+++ b/src/plugins/platforminputcontexts/ibus/qibusplatforminputcontext.cpp
@@ -88,7 +88,7 @@ QIBusPlatformInputContext::QIBusPlatformInputContext ()
connect(d->context, SIGNAL(CommitText(QDBusVariant)), SLOT(commitText(QDBusVariant)));
connect(d->context, SIGNAL(UpdatePreeditText(QDBusVariant,uint,bool)), this, SLOT(updatePreeditText(QDBusVariant,uint,bool)));
}
- QInputPanel *p = qApp->inputPanel();
+ QInputMethod *p = qApp->inputMethod();
connect(p, SIGNAL(inputItemChanged()), this, SLOT(inputItemChanged()));
connect(p, SIGNAL(cursorRectangleChanged()), this, SLOT(cursorRectChanged()));
}
@@ -103,12 +103,12 @@ bool QIBusPlatformInputContext::isValid() const
return d->valid;
}
-void QIBusPlatformInputContext::invokeAction(QInputPanel::Action a, int x)
+void QIBusPlatformInputContext::invokeAction(QInputMethod::Action a, int x)
{
if (!d->valid)
return;
- if (a == QInputPanel::Click)
+ if (a == QInputMethod::Click)
commit();
}
@@ -130,7 +130,7 @@ void QIBusPlatformInputContext::commit()
if (!d->valid)
return;
- QObject *input = qApp->inputPanel()->inputItem();
+ QObject *input = qApp->inputMethod()->inputItem();
if (!input) {
d->predit = QString();
return;
@@ -155,11 +155,11 @@ void QIBusPlatformInputContext::cursorRectChanged()
if (!d->valid)
return;
- QRect r = qApp->inputPanel()->cursorRectangle().toRect();
+ QRect r = qApp->inputMethod()->cursorRectangle().toRect();
if(!r.isValid())
return;
- QWindow *inputWindow = qApp->inputPanel()->inputWindow();
+ QWindow *inputWindow = qApp->inputMethod()->inputWindow();
if (!inputWindow)
return;
r.moveTopLeft(inputWindow->mapToGlobal(r.topLeft()));
@@ -173,7 +173,7 @@ void QIBusPlatformInputContext::inputItemChanged()
if (!d->valid)
return;
- QObject *input = qApp->inputPanel()->inputItem();
+ QObject *input = qApp->inputMethod()->inputItem();
if (debug)
qDebug() << "setFocusObject" << input;
if (input)
@@ -184,7 +184,7 @@ void QIBusPlatformInputContext::inputItemChanged()
void QIBusPlatformInputContext::commitText(const QDBusVariant &text)
{
- QObject *input = qApp->inputPanel()->inputItem();
+ QObject *input = qApp->inputMethod()->inputItem();
if (!input)
return;
@@ -206,7 +206,7 @@ void QIBusPlatformInputContext::commitText(const QDBusVariant &text)
void QIBusPlatformInputContext::updatePreeditText(const QDBusVariant &text, uint cursorPos, bool visible)
{
- QObject *input = qApp->inputPanel()->inputItem();
+ QObject *input = qApp->inputMethod()->inputItem();
if (!input)
return;
diff --git a/src/plugins/platforminputcontexts/maliit/qmaliitplatforminputcontext.cpp b/src/plugins/platforminputcontexts/maliit/qmaliitplatforminputcontext.cpp
index 724f50db8f..bd3b914f15 100644
--- a/src/plugins/platforminputcontexts/maliit/qmaliitplatforminputcontext.cpp
+++ b/src/plugins/platforminputcontexts/maliit/qmaliitplatforminputcontext.cpp
@@ -182,8 +182,8 @@ QMaliitPlatformInputContext::QMaliitPlatformInputContext()
{
if (debug)
qDebug() << "QMaliitPlatformInputContext::QMaliitPlatformInputContext()";
- QInputPanel *p = qApp->inputPanel();
- connect(p, SIGNAL(inputItemChanged()), this, SLOT(inputItemChanged()));
+ QInputMethod *im = qApp->inputMethod();
+ connect(im, SIGNAL(inputItemChanged()), this, SLOT(inputItemChanged()));
}
QMaliitPlatformInputContext::~QMaliitPlatformInputContext(void)
@@ -196,13 +196,13 @@ bool QMaliitPlatformInputContext::isValid() const
return d->valid;
}
-void QMaliitPlatformInputContext::invokeAction(QInputPanel::Action action, int x)
+void QMaliitPlatformInputContext::invokeAction(QInputMethod::Action action, int x)
{
- QObject *input = qApp->inputPanel()->inputItem();
+ QObject *input = qApp->inputMethod()->inputItem();
if (!input)
return;
- if (action == QInputPanel::Click) {
+ if (action == QInputMethod::Click) {
if (x < 0 || x >= d->preedit.length()) {
reset();
return;
@@ -220,7 +220,7 @@ void QMaliitPlatformInputContext::invokeAction(QInputPanel::Action action, int x
void QMaliitPlatformInputContext::reset()
{
- QObject *input = qApp->inputPanel()->inputItem();
+ QObject *input = qApp->inputMethod()->inputItem();
const bool hadPreedit = !d->preedit.isEmpty();
if (hadPreedit && input) {
@@ -238,8 +238,8 @@ void QMaliitPlatformInputContext::reset()
void QMaliitPlatformInputContext::update(Qt::InputMethodQueries queries)
{
- QInputPanel *panel = qApp->inputPanel();
- QObject *input = panel->inputItem();
+ QInputMethod *method = qApp->inputMethod();
+ QObject *input = method->inputItem();
if (!input)
return;
@@ -254,8 +254,8 @@ void QMaliitPlatformInputContext::update(Qt::InputMethodQueries queries)
d->imState["anchorPosition"] = query.value(Qt::ImAnchorPosition);
if (queries & Qt::ImCursorRectangle) {
QRect rect = query.value(Qt::ImCursorRectangle).toRect();
- rect = panel->inputItemTransform().mapRect(rect);
- QWindow *window = panel->inputWindow();
+ rect = method->inputItemTransform().mapRect(rect);
+ QWindow *window = method->inputWindow();
if (window)
d->imState["cursorRectangle"] = QRect(window->mapToGlobal(rect.topLeft()), rect.size());
}
@@ -289,7 +289,7 @@ void QMaliitPlatformInputContext::activationLostEvent()
void QMaliitPlatformInputContext::commitString(const QString &string, int replacementStart, int replacementLength, int cursorPos)
{
- QObject *input = qApp->inputPanel()->inputItem();
+ QObject *input = qApp->inputMethod()->inputItem();
if (!input)
return;
@@ -305,7 +305,7 @@ void QMaliitPlatformInputContext::commitString(const QString &string, int replac
void QMaliitPlatformInputContext::updatePreedit(const QDBusMessage &message)
{
- QObject *input = qApp->inputPanel()->inputItem();
+ QObject *input = qApp->inputMethod()->inputItem();
if (!input)
return;
@@ -421,7 +421,7 @@ void QMaliitPlatformInputContext::paste()
bool QMaliitPlatformInputContext::preeditRectangle(int &x, int &y, int &width, int &height)
{
// ###
- QRect r = qApp->inputPanel()->cursorRectangle().toRect();
+ QRect r = qApp->inputMethod()->cursorRectangle().toRect();
if (!r.isValid())
return false;
x = r.x();
@@ -435,7 +435,7 @@ bool QMaliitPlatformInputContext::selection(QString &selection)
{
selection.clear();
- QObject *input = qApp->inputPanel()->inputItem();
+ QObject *input = qApp->inputMethod()->inputItem();
if (!input)
return false;
@@ -471,7 +471,7 @@ void QMaliitPlatformInputContext::setRedirectKeys(bool)
void QMaliitPlatformInputContext::setSelection(int start, int length)
{
- QObject *input = qApp->inputPanel()->inputItem();
+ QObject *input = qApp->inputMethod()->inputItem();
if (!input)
return;
@@ -497,9 +497,9 @@ void QMaliitPlatformInputContext::inputItemChanged()
if (!d->valid)
return;
- QInputPanel *panel = qApp->inputPanel();
- QObject *input = panel->inputItem();
- QWindow *window = panel->inputWindow();
+ QInputMethod *method = qApp->inputMethod();
+ QObject *input = method->inputItem();
+ QWindow *window = method->inputWindow();
if (window != d->window.data()) {
if (d->window)
disconnect(d->window.data(), SIGNAL(contentOrientationChanged(Qt::ScreenOrientation)),
@@ -533,8 +533,8 @@ void QMaliitPlatformInputContext::showInputPanel()
if (debug)
qDebug() << "showInputPanel";
- QInputPanel *panel = qApp->inputPanel();
- if (!panel->inputItem() || !panel->inputWindow())
+ QInputMethod *method = qApp->inputMethod();
+ if (!method->inputItem() || !method->inputWindow())
d->visibility = InputPanelShowRequested;
else {
d->server->showInputMethod();