← Back to branch summary

~timo-jyrinki/ubuntu/trusty/maliit-framework/fix_qt52

« back to all changes in this revision

Viewing changes to connection/dbusserverconnection.cpp

  • Committer: Package Import Robot
  • Author(s): Ricardo Salveti de Araujo, Sergio Schvezov, Ricardo Salveti de Araujo
  • Date: 2013-07-23 19:47:04 UTC
  • mfrom: (1.1.2) (1.2.1 experimental)
  • Revision ID: package-import@ubuntu.com-20130723194704-1lsy1kmlda069cea
Tags: 0.99.0+git20130615+97e8335-0ubuntu1
[ Sergio Schvezov ]
* New build from HEAD 97e8335.
* Packaging import from lp:phablet-extras/maliit-framework.

[ Ricardo Salveti de Araujo ]
* debian/control: adding vcs and fixing dependencies
* General package cleanup

Show diffs side-by-side

added added

removed removed

Lines of Context:
connection/dbusserverconnection.cpp
14
14
 
15
15
#include "dbusserverconnection.h"
16
16
 
 
17
#include <maliit/namespace.h>
17
18
#include <maliit/settingdata.h>
18
19
 
19
20
#include "minputmethodcontext1interface_adaptor.h"
41
42
  , mActive(true)
42
43
  , pendingResetCalls()
43
44
{
44
 
    new Inputcontext1Adaptor(this);
45
 
 
46
45
    qDBusRegisterMetaType<MImPluginSettingsEntry>();
47
46
    qDBusRegisterMetaType<MImPluginSettingsInfo>();
48
47
    qDBusRegisterMetaType<QList<MImPluginSettingsInfo> >();
49
 
 
50
 
    connect(mAddress.data(), SIGNAL(addressRecieved(QString)),
 
48
    qDBusRegisterMetaType<Maliit::PreeditTextFormat>();
 
49
    qDBusRegisterMetaType<QList<Maliit::PreeditTextFormat> >();
 
50
 
 
51
    new Inputcontext1Adaptor(this);
 
52
 
 
53
    connect(mAddress.data(), SIGNAL(addressReceived(QString)),
51
54
            this, SLOT(openDBusConnection(QString)));
52
55
    connect(mAddress.data(), SIGNAL(addressFetchError(QString)),
53
56
            this, SLOT(connectToDBusFailed(QString)));
90
93
 
91
94
    connection.registerObject(QString::fromLatin1(InputContextAdaptorPath), this);
92
95
 
 
96
#if 0
93
97
    connect(mProxy, SIGNAL(invokeAction(QString,QKeySequence)), this, SIGNAL(invokeAction(QString,QKeySequence)));
94
 
 
 
98
#endif
95
99
    Q_EMIT connected();
96
100
}
97
101
 
151
155
    if (!mProxy)
152
156
        return;
153
157
 
154
 
    mProxy->mouseClickedOnPreedit(pos.x(), pos.y(), preeditRect.x(), preeditRect.y(), preeditRect.width(), preeditRect.height());
 
158
    mProxy->mouseClickedOnPreedit(pos.x(), pos.y(), preeditRect.x(), preeditRect.y(),
 
159
                                  preeditRect.width(), preeditRect.height());
155
160
}
156
161
 
157
162
void DBusServerConnection::setPreedit(const QString &text, int cursorPos)
162
167
    mProxy->setPreedit(text, cursorPos);
163
168
}
164
169
 
165
 
void DBusServerConnection::updateWidgetInformation(const QMap<QString, QVariant> &stateInformation,
166
 
                                                   bool focusChanged)
 
170
void DBusServerConnection::updateWidgetInformation(const QMap<QString, QVariant> &stateInformation, bool focusChanged)
167
171
{
168
172
    if (!mProxy)
169
173
        return;
259
263
    pluginSettingsReceived(info);
260
264
}
261
265
 
262
 
void DBusServerConnection::keyEvent(int type, int key, int modifiers, const QString &text, bool autoRepeat, int count, uchar requestType)
 
266
void DBusServerConnection::keyEvent(int type, int key, int modifiers, const QString &text, bool autoRepeat,
 
267
                                    int count, uchar requestType)
263
268
{
264
269
    keyEvent(type, key, modifiers, text, autoRepeat, count, static_cast<Maliit::EventRequestType>(requestType));
265
270
}
266
271
 
267
 
void DBusServerConnection::notifyExtendedAttributeChanged(int id, const QString &target, const QString &targetItem, const QString &attribute, const QDBusVariant &value)
 
272
void DBusServerConnection::notifyExtendedAttributeChanged(int id, const QString &target, const QString &targetItem,
 
273
                                                          const QString &attribute, const QDBusVariant &value)
268
274
{
269
275
    extendedAttributeChanged(id, target, targetItem, attribute, value.variant());
270
276
}