Rename meego to maliit platforminputcontext

Also build the plugin on linux systems with D-Bus. There is nothing
MeeGo or Maemo specific about this plugin or Maliit.

Task-number: QTBUG-22994
Change-Id: Idcccfb01f79166a54c5809741389b29ccac05a15
Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>

src/plugins/platforminputcontexts/maliit/contextadaptor.cpp

@@ -48,7 +48,7 @@
 #include <QtCore/QStringList>
 #include <QtCore/QVariant>
 
-#include "qmeegoplatforminputcontext.h"
+#include "qmaliitplatforminputcontext.h"
 
 /*
  * Implementation of adaptor class Inputcontext1Adaptor
@@ -111,13 +111,13 @@ void Inputcontext1Adaptor::paste()
 bool Inputcontext1Adaptor::preeditRectangle(int &out1, int &out2, int &out3, int &out4)
 {
     // handle method call com.meego.inputmethod.inputcontext1.preeditRectangle
-    return static_cast<QMeeGoPlatformInputContext *>(parent())->preeditRectangle(out1, out2, out3, out4);
+    return static_cast<QMaliitPlatformInputContext *>(parent())->preeditRectangle(out1, out2, out3, out4);
 }
 
 bool Inputcontext1Adaptor::selection(QString &out1)
 {
     // handle method call com.meego.inputmethod.inputcontext1.selection
-    return static_cast<QMeeGoPlatformInputContext *>(parent())->selection(out1);
+    return static_cast<QMaliitPlatformInputContext *>(parent())->selection(out1);
 }
 
 void Inputcontext1Adaptor::setDetectableAutoRepeat(bool in0)

src/plugins/platforminputcontexts/maliit/contextadaptor.h

@@ -43,13 +43,13 @@
 #define CONTEXT_H_1318935171
 
 #include <QtCore/QObject>
+#include <QtCore/QByteArray>
+#include <QtCore/QList>
+#include <QtCore/QMap>
+#include <QtCore/QString>
+#include <QtCore/QStringList>
+#include <QtCore/QVariant>
 #include <QtDBus/QtDBus>
-class QByteArray;
-template<class T> class QList;
-template<class Key, class Value> class QMap;
-class QString;
-class QStringList;
-class QVariant;
 
 /*
  * Adaptor class for interface com.meego.inputmethod.inputcontext1

src/plugins/platforminputcontexts/maliit/main.cpp

@@ -41,31 +41,31 @@
 
 #include <private/qplatforminputcontextplugin_qpa_p.h>
 #include <QtCore/QStringList>
-#include "qmeegoplatforminputcontext.h"
+#include "qmaliitplatforminputcontext.h"
 
 QT_BEGIN_NAMESPACE
 
-class QMeeGoPlatformInputContextPlugin : public QPlatformInputContextPlugin
+class QMaliitPlatformInputContextPlugin : public QPlatformInputContextPlugin
 {
 public:
     QStringList keys() const;
     QPlatformInputContext *create(const QString&, const QStringList&);
 };
 
-QStringList QMeeGoPlatformInputContextPlugin::keys() const
+QStringList QMaliitPlatformInputContextPlugin::keys() const
 {
-    return QStringList(QStringLiteral("meego"));
+    return QStringList(QStringLiteral("maliit"));
 }
 
-QPlatformInputContext *QMeeGoPlatformInputContextPlugin::create(const QString& system, const QStringList& paramList)
+QPlatformInputContext *QMaliitPlatformInputContextPlugin::create(const QString& system, const QStringList& paramList)
 {
     Q_UNUSED(paramList);
 
-    if (system.compare(system, QStringLiteral("meego"), Qt::CaseInsensitive) == 0)
-        return new QMeeGoPlatformInputContext;
+    if (system.compare(system, QStringLiteral("maliit"), Qt::CaseInsensitive) == 0)
+        return new QMaliitPlatformInputContext;
     return 0;
 }
 
-Q_EXPORT_PLUGIN2(meegoplatforminputcontextplugin, QMeeGoPlatformInputContextPlugin)
+Q_EXPORT_PLUGIN2(maliitplatforminputcontextplugin, QMaliitPlatformInputContextPlugin)
 
 QT_END_NAMESPACE

src/plugins/platforminputcontexts/maliit/maliit.pro

@@ -1,16 +1,16 @@
-TARGET = meegoplatforminputcontextplugin
+TARGET = maliitplatforminputcontextplugin
 load(qt_plugin)
 
 QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/platforminputcontexts
 
 QT += dbus platformsupport-private
-SOURCES += $$PWD/qmeegoplatforminputcontext.cpp \
+SOURCES += $$PWD/qmaliitplatforminputcontext.cpp \
            $$PWD/serverproxy.cpp \
            $$PWD/serveraddressproxy.cpp \
            $$PWD/contextadaptor.cpp \
            $$PWD/main.cpp
 
-HEADERS += $$PWD/qmeegoplatforminputcontext.h \
+HEADERS += $$PWD/qmaliitplatforminputcontext.h \
            $$PWD/serverproxy.h \
            $$PWD/serveraddressproxy.h \
            $$PWD/contextadaptor.h

src/plugins/platforminputcontexts/maliit/qmaliitplatforminputcontext.cpp

@@ -38,7 +38,7 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#include "qmeegoplatforminputcontext.h"
+#include "qmaliitplatforminputcontext.h"
 
 #include <QtDebug>
 #include <QTextCharFormat>
@@ -140,11 +140,11 @@ static QString maliitServerAddress()
     return address;
 }
 
-class QMeeGoPlatformInputContextPrivate
+class QMaliitPlatformInputContextPrivate
 {
 public:
-    QMeeGoPlatformInputContextPrivate(QMeeGoPlatformInputContext *qq);
-    ~QMeeGoPlatformInputContextPrivate()
+    QMaliitPlatformInputContextPrivate(QMaliitPlatformInputContext *qq);
+    ~QMaliitPlatformInputContextPrivate()
     {
         delete adaptor;
         delete server;
@@ -166,30 +166,30 @@ public:
     QRect keyboardRect;
     QString preedit;
     QWeakPointer<QWindow> window;
-    QMeeGoPlatformInputContext *q;
+    QMaliitPlatformInputContext *q;
 };
 
 
-QMeeGoPlatformInputContext::QMeeGoPlatformInputContext()
-    : d(new QMeeGoPlatformInputContextPrivate(this))
+QMaliitPlatformInputContext::QMaliitPlatformInputContext()
+    : d(new QMaliitPlatformInputContextPrivate(this))
 {
     if (debug)
-        qDebug() << "QMeeGoPlatformInputContext::QMeeGoPlatformInputContext()";
+        qDebug() << "QMaliitPlatformInputContext::QMaliitPlatformInputContext()";
     QInputPanel *p = qApp->inputPanel();
     connect(p, SIGNAL(inputItemChanged()), this, SLOT(inputItemChanged()));
 }
 
-QMeeGoPlatformInputContext::~QMeeGoPlatformInputContext(void)
+QMaliitPlatformInputContext::~QMaliitPlatformInputContext(void)
 {
     delete d;
 }
 
-bool QMeeGoPlatformInputContext::isValid() const
+bool QMaliitPlatformInputContext::isValid() const
 {
     return d->valid;
 }
 
-void QMeeGoPlatformInputContext::invokeAction(QInputPanel::Action action, int x)
+void QMaliitPlatformInputContext::invokeAction(QInputPanel::Action action, int x)
 {
     QObject *input = qApp->inputPanel()->inputItem();
     if (!input)
@@ -211,7 +211,7 @@ void QMeeGoPlatformInputContext::invokeAction(QInputPanel::Action action, int x)
     }
 }
 
-void QMeeGoPlatformInputContext::reset()
+void QMaliitPlatformInputContext::reset()
 {
     QObject *input = qApp->inputPanel()->inputItem();
 
@@ -229,7 +229,7 @@ void QMeeGoPlatformInputContext::reset()
         reply.waitForFinished();
 }
 
-void QMeeGoPlatformInputContext::update(Qt::InputMethodQueries queries)
+void QMaliitPlatformInputContext::update(Qt::InputMethodQueries queries)
 {
     QInputPanel *panel = qApp->inputPanel();
     QObject *input = panel->inputItem();
@@ -269,18 +269,18 @@ void QMeeGoPlatformInputContext::update(Qt::InputMethodQueries queries)
     d->sendStateUpdate(/*focusChanged*/true);
 }
 
-QRectF QMeeGoPlatformInputContext::keyboardRect() const
+QRectF QMaliitPlatformInputContext::keyboardRect() const
 {
     return d->keyboardRect;
 }
 
-void QMeeGoPlatformInputContext::activationLostEvent()
+void QMaliitPlatformInputContext::activationLostEvent()
 {
     d->active = false;
     d->visibility = InputPanelHidden;
 }
 
-void QMeeGoPlatformInputContext::commitString(const QString &string, int replacementStart, int replacementLength, int cursorPos)
+void QMaliitPlatformInputContext::commitString(const QString &string, int replacementStart, int replacementLength, int cursorPos)
 {
     QObject *input = qApp->inputPanel()->inputItem();
     if (!input)
@@ -296,7 +296,7 @@ void QMeeGoPlatformInputContext::commitString(const QString &string, int replace
     QCoreApplication::sendEvent(input, &event);
 }
 
-void QMeeGoPlatformInputContext::updatePreedit(const QDBusMessage &message)
+void QMaliitPlatformInputContext::updatePreedit(const QDBusMessage &message)
 {
     QObject *input = qApp->inputPanel()->inputItem();
     if (!input)
@@ -304,7 +304,7 @@ void QMeeGoPlatformInputContext::updatePreedit(const QDBusMessage &message)
 
     QList<QVariant> arguments = message.arguments();
     if (arguments.count() != 5) {
-        qWarning() << "QMeeGoPlatformInputContext::updatePreedit: Received message from input method server with wrong parameters.";
+        qWarning() << "QMaliitPlatformInputContext::updatePreedit: Received message from input method server with wrong parameters.";
         return;
     }
 
@@ -371,29 +371,29 @@ void QMeeGoPlatformInputContext::updatePreedit(const QDBusMessage &message)
     QCoreApplication::sendEvent(input, &event);
 }
 
-void QMeeGoPlatformInputContext::copy()
+void QMaliitPlatformInputContext::copy()
 {
     // Not supported at the moment.
 }
 
-void QMeeGoPlatformInputContext::imInitiatedHide()
+void QMaliitPlatformInputContext::imInitiatedHide()
 {
     d->visibility = InputPanelHidden;
     emitInputPanelVisibleChanged();
     // ### clear focus
 }
 
-void QMeeGoPlatformInputContext::keyEvent(int, int, int, const QString &, bool, int, uchar)
+void QMaliitPlatformInputContext::keyEvent(int, int, int, const QString &, bool, int, uchar)
 {
     // Not supported at the moment.
 }
 
-void QMeeGoPlatformInputContext::paste()
+void QMaliitPlatformInputContext::paste()
 {
     // Not supported at the moment.
 }
 
-bool QMeeGoPlatformInputContext::preeditRectangle(int &x, int &y, int &width, int &height)
+bool QMaliitPlatformInputContext::preeditRectangle(int &x, int &y, int &width, int &height)
 {
     // ###
     QRect r = qApp->inputPanel()->cursorRectangle().toRect();
@@ -406,7 +406,7 @@ bool QMeeGoPlatformInputContext::preeditRectangle(int &x, int &y, int &width, in
     return true;
 }
 
-bool QMeeGoPlatformInputContext::selection(QString &selection)
+bool QMaliitPlatformInputContext::selection(QString &selection)
 {
     selection.clear();
 
@@ -424,27 +424,27 @@ bool QMeeGoPlatformInputContext::selection(QString &selection)
     return true;
 }
 
-void QMeeGoPlatformInputContext::setDetectableAutoRepeat(bool)
+void QMaliitPlatformInputContext::setDetectableAutoRepeat(bool)
 {
     // Not supported.
 }
 
-void QMeeGoPlatformInputContext::setGlobalCorrectionEnabled(bool enable)
+void QMaliitPlatformInputContext::setGlobalCorrectionEnabled(bool enable)
 {
     d->correctionEnabled = enable;
 }
 
-void QMeeGoPlatformInputContext::setLanguage(const QString &)
+void QMaliitPlatformInputContext::setLanguage(const QString &)
 {
     // Unused at the moment.
 }
 
-void QMeeGoPlatformInputContext::setRedirectKeys(bool)
+void QMaliitPlatformInputContext::setRedirectKeys(bool)
 {
     // Not supported.
 }
 
-void QMeeGoPlatformInputContext::setSelection(int start, int length)
+void QMaliitPlatformInputContext::setSelection(int start, int length)
 {
     QObject *input = qApp->inputPanel()->inputItem();
     if (!input)
@@ -456,18 +456,18 @@ void QMeeGoPlatformInputContext::setSelection(int start, int length)
     QGuiApplication::sendEvent(input, &event);
 }
 
-void QMeeGoPlatformInputContext::updateInputMethodArea(int x, int y, int width, int height)
+void QMaliitPlatformInputContext::updateInputMethodArea(int x, int y, int width, int height)
 {
     d->keyboardRect = QRect(x, y, width, height);
     emitKeyboardRectChanged();
 }
 
-void QMeeGoPlatformInputContext::updateServerWindowOrientation(Qt::ScreenOrientation orientation)
+void QMaliitPlatformInputContext::updateServerWindowOrientation(Qt::ScreenOrientation orientation)
 {
     d->server->appOrientationChanged(orientationAngle(orientation));
 }
 
-void QMeeGoPlatformInputContext::inputItemChanged()
+void QMaliitPlatformInputContext::inputItemChanged()
 {
     if (!d->valid)
         return;
@@ -503,7 +503,7 @@ void QMeeGoPlatformInputContext::inputItemChanged()
         showInputPanel();
 }
 
-void QMeeGoPlatformInputContext::showInputPanel()
+void QMaliitPlatformInputContext::showInputPanel()
 {
     if (debug)
         qDebug() << "showInputPanel";
@@ -518,20 +518,20 @@ void QMeeGoPlatformInputContext::showInputPanel()
     }
 }
 
-void QMeeGoPlatformInputContext::hideInputPanel()
+void QMaliitPlatformInputContext::hideInputPanel()
 {
     d->server->hideInputMethod();
     d->visibility = InputPanelHidden;
     emitInputPanelVisibleChanged();
 }
 
-bool QMeeGoPlatformInputContext::isInputPanelVisible() const
+bool QMaliitPlatformInputContext::isInputPanelVisible() const
 {
     return d->visibility == InputPanelShown;
 }
 
-QMeeGoPlatformInputContextPrivate::QMeeGoPlatformInputContextPrivate(QMeeGoPlatformInputContext* qq)
-    : connection(QDBusConnection::connectToPeer(maliitServerAddress(), QLatin1String("MeeGoIMProxy")))
+QMaliitPlatformInputContextPrivate::QMaliitPlatformInputContextPrivate(QMaliitPlatformInputContext* qq)
+    : connection(QDBusConnection::connectToPeer(maliitServerAddress(), QLatin1String("MaliitIMProxy")))
     , server(0)
     , adaptor(0)
     , visibility(InputPanelHidden)
@@ -541,7 +541,7 @@ QMeeGoPlatformInputContextPrivate::QMeeGoPlatformInputContextPrivate(QMeeGoPlatf
     , q(qq)
 {
     if (!connection.isConnected()) {
-        qDebug("QMeeGoPlatformInputContext: not connected.");
+        qDebug("QMaliitPlatformInputContext: not connected.");
         return;
     }
 
@@ -566,7 +566,7 @@ QMeeGoPlatformInputContextPrivate::QMeeGoPlatformInputContextPrivate(QMeeGoPlatf
     valid = true;
 }
 
-void QMeeGoPlatformInputContextPrivate::sendStateUpdate(bool focusChanged)
+void QMaliitPlatformInputContextPrivate::sendStateUpdate(bool focusChanged)
 {
     server->updateWidgetInformation(imState, focusChanged);
 }

src/plugins/platforminputcontexts/maliit/qmaliitplatforminputcontext.h

@@ -38,24 +38,24 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#ifndef QMEEGOPLATFORMINPUTCONTEXT_H
-#define QMEEGOPLATFORMINPUTCONTEXT_H
+#ifndef QMALIITPLATFORMINPUTCONTEXT_H
+#define QMALIITPLATFORMINPUTCONTEXT_H
 
 #include <QPlatformInputContext>
 #include <QDBusArgument>
 
 QT_BEGIN_NAMESPACE
 
-class QMeeGoPlatformInputContextPrivate;
+class QMaliitPlatformInputContextPrivate;
 class QDBusVariant;
 class QDBusMessage;
 
-class QMeeGoPlatformInputContext : public QPlatformInputContext
+class QMaliitPlatformInputContext : public QPlatformInputContext
 {
     Q_OBJECT
 public:
-    QMeeGoPlatformInputContext();
-    ~QMeeGoPlatformInputContext();
+    QMaliitPlatformInputContext();
+    ~QMaliitPlatformInputContext();
 
     bool isValid() const;
 
@@ -89,7 +89,7 @@ public Q_SLOTS:
     void updateServerWindowOrientation(Qt::ScreenOrientation orientation);
 
 private:
-    QMeeGoPlatformInputContextPrivate *d;
+    QMaliitPlatformInputContextPrivate *d;
 };
 
 QT_END_NAMESPACE

src/plugins/platforminputcontexts/platforminputcontexts.pro

@@ -1,5 +1,4 @@
 TEMPLATE = subdirs
 contains(QT_CONFIG, dbus) {
-!macx:!win32:SUBDIRS += ibus
+!macx:!win32:SUBDIRS += ibus maliit
 }
-linux-g++-maemo: SUBDIRS += meego