git.iko.soy/unity8
on xenial help sign in
cleanup review comments
d041706Michael Zanetti
plugins/UInput/UInput.qmltypesnew file+44
compare with xenial
unifiedsplit
@@ -0,0 +1,44 @@
1+import QtQuick.tooling 1.1
2+
3+// This file describes the plugin-supplied types contained in the library.
4+// It is used for QML tooling purposes only.
5+//
6+// This file was auto-generated by:
7+// 'qmlplugindump -notrelocatable UInput 0.1 plugins'
8+
9+Module {
10+ Component {
11+ name: "UInput"
12+ prototype: "QObject"
13+ exports: ["UInput/UInput 0.1"]
14+ exportMetaObjectRevisions: [0]
15+ Enum {
16+ name: "Button"
17+ values: {
18+ "ButtonLeft": 0,
19+ "ButtonRight": 1,
20+ "ButtonMiddle": 2
21+ }
22+ }
23+ Method { name: "createMouse" }
24+ Method { name: "removeMouse" }
25+ Method {
26+ name: "moveMouse"
27+ Parameter { name: "dx"; type: "int" }
28+ Parameter { name: "dy"; type: "int" }
29+ }
30+ Method {
31+ name: "pressMouse"
32+ Parameter { name: "button"; type: "Button" }
33+ }
34+ Method {
35+ name: "releaseMouse"
36+ Parameter { name: "button"; type: "Button" }
37+ }
38+ Method {
39+ name: "scrollMouse"
40+ Parameter { name: "dh"; type: "int" }
41+ Parameter { name: "dv"; type: "int" }
42+ }
43+ }
44+}
plugins/UInput/uinput.cpp+3−3
@@ -26,13 +26,13 @@
26UInput::UInput(QObject *parent) :
26UInput::UInput(QObject *parent) :
27 QObject(parent)
27 QObject(parent)
28{
28{
29− m_devName = QStringLiteral("unity8-simulated-mouse");
29+ m_devName = QByteArrayLiteral("unity8-simulated-mouse");
30− m_uinput.setFileName("/dev/uinput");
30+ m_uinput.setFileName(QStringLiteral("/dev/uinput"));
31
31
32 memset(&m_uinput_mouse_dev, 0, sizeof(m_uinput_mouse_dev));
32 memset(&m_uinput_mouse_dev, 0, sizeof(m_uinput_mouse_dev));
33 m_uinput_mouse_dev.id.bustype = BUS_USB;
33 m_uinput_mouse_dev.id.bustype = BUS_USB;
34 m_uinput_mouse_dev.id.version = 1;
34 m_uinput_mouse_dev.id.version = 1;
35− strncpy(m_uinput_mouse_dev.name, m_devName.toLocal8Bit().data(), m_devName.length());
35+ strncpy(m_uinput_mouse_dev.name, m_devName.constData(), m_devName.length());
36}
36}
37
37
38UInput::~UInput()
38UInput::~UInput()
plugins/UInput/uinput.h+1−1
@@ -53,7 +53,7 @@ private:
53private:
53private:
54 QFile m_uinput;
54 QFile m_uinput;
55 uinput_user_dev m_uinput_mouse_dev;
55 uinput_user_dev m_uinput_mouse_dev;
56− QString m_devName;
56+ QByteArray m_devName;
57
57
58 bool m_mouseCreated = false;
58 bool m_mouseCreated = false;
59};
59};
tests/mocks/UInput/qmldir−1
@@ -1,3 +1,2 @@
1module UInput
1module UInput
2plugin FakeUInput-qml
2plugin FakeUInput-qml
3−typeinfo UInput.qmltypes