1
=== modified file 'CMakeLists.txt'
2
--- CMakeLists.txt	2016-06-06 19:34:36 +0000
3
+++ CMakeLists.txt	2016-06-06 19:34:36 +0000
4
@@ -85,21 +85,19 @@
5
85
pkg_check_modules(QTDBUSMOCK libqtdbusmock-1 REQUIRED)
85
pkg_check_modules(QTDBUSMOCK libqtdbusmock-1 REQUIRED)
6
86
pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=18)
86
pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=18)
7
87
87
9
88
include_directories(${APPLICATION_API_INCLUDE_DIRS})
88
include_directories(SYSTEM ${APPLICATION_API_INCLUDE_DIRS})
10
89
89
11
90
add_definitions(-DMIR_REQUIRE_DEPRECATED_EVENT_OPT_IN=1)
90
add_definitions(-DMIR_REQUIRE_DEPRECATED_EVENT_OPT_IN=1)
12
91
91
13
92
# Use the fast string builder
92
# Use the fast string builder
14
93
add_definitions(-DQT_USE_QSTRINGBUILDER)
93
add_definitions(-DQT_USE_QSTRINGBUILDER)
15
94
94
16
95
include_directories( ${APPLICATION_API_INCLUDE_DIRS} )
17
96
18
97
# We expect this to be set via debian/rules for GLES builds
95
# We expect this to be set via debian/rules for GLES builds
19
98
if ("${USE_OPENGLES}" STREQUAL 1)
96
if ("${USE_OPENGLES}" STREQUAL 1)
20
99
    message(STATUS "Qt5 determined to be compiled with GLES support")
97
    message(STATUS "Qt5 determined to be compiled with GLES support")
21
100
    pkg_check_modules(GLESv2 glesv2)
98
    pkg_check_modules(GLESv2 glesv2)
22
101
    add_definitions(-DQT_USING_GLES)
99
    add_definitions(-DQT_USING_GLES)
24
102
    include_directories (${GLESv2_INCLUDE_DIRS})
100
    include_directories (SYSTEM ${GLESv2_INCLUDE_DIRS})
25
103
    set (GL_LIBRARIES "${GLESv2_LIBRARIES}")
101
    set (GL_LIBRARIES "${GLESv2_LIBRARIES}")
26
104
# Because qt/gl and qt/gles are not parallel installable we have a difficulty
102
# Because qt/gl and qt/gles are not parallel installable we have a difficulty
27
105
# building qtmir-desktop on armhf. We would like to link against opengl and bind the
103
# building qtmir-desktop on armhf. We would like to link against opengl and bind the
28
@@ -110,13 +108,13 @@
29
110
    message(STATUS "Linking against OpenGL ES but binding OpenGL API")
108
    message(STATUS "Linking against OpenGL ES but binding OpenGL API")
30
111
    pkg_check_modules(GLESv2 glesv2)
109
    pkg_check_modules(GLESv2 glesv2)
31
112
    add_definitions(-DQT_USING_GL)
110
    add_definitions(-DQT_USING_GL)
33
113
    include_directories (${GLESv2_INCLUDE_DIRS})
111
    include_directories (SYSTEM ${GLESv2_INCLUDE_DIRS})
34
114
    set (GL_LIBRARIES "${GLESv2_LIBRARIES}")
112
    set (GL_LIBRARIES "${GLESv2_LIBRARIES}")
35
115
else()
113
else()
36
116
    message(STATUS "Qt5 determined to be compiled with OpenGL support")
114
    message(STATUS "Qt5 determined to be compiled with OpenGL support")
37
117
    pkg_check_modules(GL gl)
115
    pkg_check_modules(GL gl)
38
118
    add_definitions(-DQT_USING_OPENGL)
116
    add_definitions(-DQT_USING_OPENGL)
40
119
    include_directories (${GL_INCLUDE_DIRS})
117
    include_directories (SYSTEM ${GL_INCLUDE_DIRS})
41
120
endif()
118
endif()
42
121
119
43
122
# Standard install paths
120
# Standard install paths
44
123
121
45
=== modified file 'demos/qml-demo-client/CMakeLists.txt'
46
--- demos/qml-demo-client/CMakeLists.txt	2015-09-01 16:16:47 +0000
47
+++ demos/qml-demo-client/CMakeLists.txt	2016-06-06 19:34:36 +0000
48
@@ -2,19 +2,16 @@
49
2
configure_file(${DEMO_CLIENT}.desktop.in ${CMAKE_CURRENT_BINARY_DIR}/${DEMO_CLIENT}.desktop @ONLY)
2
configure_file(${DEMO_CLIENT}.desktop.in ${CMAKE_CURRENT_BINARY_DIR}/${DEMO_CLIENT}.desktop @ONLY)
50
3
3
51
4
include_directories(
4
include_directories(
52
5
    SYSTEM
53
5
    ${Qt5Gui_PRIVATE_INCLUDE_DIRS}
6
    ${Qt5Gui_PRIVATE_INCLUDE_DIRS}
54
7
    ${Qt5Qml_PRIVATE_INCLUDE_DIRS}
55
8
    ${Qt5Quick_PRIVATE_INCLUDE_DIRS}
56
6
)
9
)
57
7
10
58
8
add_executable(${DEMO_CLIENT}
11
add_executable(${DEMO_CLIENT}
59
9
    main.cpp
12
    main.cpp
60
10
)
13
)
61
11
14
62
12
include_directories(
63
13
    ${Qt5Gui_PRIVATE_INCLUDE_DIRS}
64
14
    ${Qt5Qml_PRIVATE_INCLUDE_DIRS}
65
15
    ${Qt5Quick_PRIVATE_INCLUDE_DIRS}
66
16
)
67
17
68
18
target_link_libraries(
15
target_link_libraries(
69
19
    ${DEMO_CLIENT}
16
    ${DEMO_CLIENT}
70
20
    Qt5::Core
17
    Qt5::Core
71
21
18
72
=== modified file 'demos/qml-demo-shell/CMakeLists.txt'
73
--- demos/qml-demo-shell/CMakeLists.txt	2015-09-01 16:16:47 +0000
74
+++ demos/qml-demo-shell/CMakeLists.txt	2016-06-06 19:34:36 +0000
75
@@ -1,19 +1,16 @@
76
1
set(DEMO_SHELL qtmir-demo-shell)
1
set(DEMO_SHELL qtmir-demo-shell)
77
2
2
78
3
include_directories(
3
include_directories(
79
4
    SYSTEM
80
4
    ${Qt5Gui_PRIVATE_INCLUDE_DIRS}
5
    ${Qt5Gui_PRIVATE_INCLUDE_DIRS}
81
6
    ${Qt5Qml_PRIVATE_INCLUDE_DIRS}
82
7
    ${Qt5Quick_PRIVATE_INCLUDE_DIRS}
83
5
)
8
)
84
6
9
85
7
add_executable(${DEMO_SHELL}
10
add_executable(${DEMO_SHELL}
86
8
    main.cpp
11
    main.cpp
87
9
)
12
)
88
10
13
89
11
include_directories(
90
12
    ${Qt5Gui_PRIVATE_INCLUDE_DIRS}
91
13
    ${Qt5Qml_PRIVATE_INCLUDE_DIRS}
92
14
    ${Qt5Quick_PRIVATE_INCLUDE_DIRS}
93
15
)
94
16
95
17
target_link_libraries(
14
target_link_libraries(
96
18
    ${DEMO_SHELL}
15
    ${DEMO_SHELL}
97
19
    Qt5::Core
16
    Qt5::Core
98
20
17
99
=== modified file 'src/common/debughelpers.cpp'
100
--- src/common/debughelpers.cpp	2016-06-06 19:34:36 +0000
101
+++ src/common/debughelpers.cpp	2016-06-06 19:34:36 +0000
102
@@ -63,7 +63,7 @@
103
63
63
104
64
        const QTouchEvent::TouchPoint& touchPoint = ev->touchPoints().at(i);
64
        const QTouchEvent::TouchPoint& touchPoint = ev->touchPoints().at(i);
105
65
        message.append(
65
        message.append(
107
66
            QString("(id:%1, state:%2, scenePos:(%3,%4), pos:(%5,%6)) ")
66
            QStringLiteral("(id:%1, state:%2, scenePos:(%3,%4), pos:(%5,%6)) ")
108
67
                .arg(touchPoint.id())
67
                .arg(touchPoint.id())
109
68
                .arg(touchPointStateToString(touchPoint.state()))
68
                .arg(touchPointStateToString(touchPoint.state()))
110
69
                .arg(touchPoint.scenePos().x())
69
                .arg(touchPoint.scenePos().x())
111
@@ -82,30 +82,30 @@
112
82
82
113
83
    switch (attrib) {
83
    switch (attrib) {
114
84
    case mir_surface_attrib_type:
84
    case mir_surface_attrib_type:
116
85
        str = QString("type=%1").arg(mirSurfaceTypeToStr(value));
85
        str = QStringLiteral("type=%1").arg(mirSurfaceTypeToStr(value));
117
86
        break;
86
        break;
118
87
87
119
88
    case mir_surface_attrib_state:
88
    case mir_surface_attrib_state:
121
89
        str = QString("state=%1").arg(mirSurfaceStateToStr(value));
89
        str = QStringLiteral("state=%1").arg(mirSurfaceStateToStr(value));
122
90
        break;
90
        break;
123
91
91
124
92
    case mir_surface_attrib_swapinterval:
92
    case mir_surface_attrib_swapinterval:
126
93
        str = QString("swapinterval=%1").arg(value);
93
        str = QStringLiteral("swapinterval=%1").arg(value);
127
94
        break;
94
        break;
128
95
95
129
96
    case mir_surface_attrib_focus:
96
    case mir_surface_attrib_focus:
131
97
        str = QString("focus=%1").arg(mirSurfaceFocusStateToStr(value));
97
        str = QStringLiteral("focus=%1").arg(mirSurfaceFocusStateToStr(value));
132
98
        break;
98
        break;
133
99
99
134
100
    case mir_surface_attrib_dpi:
100
    case mir_surface_attrib_dpi:
136
101
        str = QString("dpi=%1").arg(value);
101
        str = QStringLiteral("dpi=%1").arg(value);
137
102
        break;
102
        break;
138
103
103
139
104
    case mir_surface_attrib_visibility:
104
    case mir_surface_attrib_visibility:
141
105
        str = QString("visibility=%1").arg(mirSurfaceVisibilityToStr(value));
105
        str = QStringLiteral("visibility=%1").arg(mirSurfaceVisibilityToStr(value));
142
106
        break;
106
        break;
143
107
    default:
107
    default:
145
108
        str = QString("type'%1'=%2").arg((int)attrib).arg(value);
108
        str = QStringLiteral("type'%1'=%2").arg((int)attrib).arg(value);
146
109
    }
109
    }
147
110
110
148
111
    return str;
111
    return str;
149
@@ -211,7 +211,7 @@
150
211
211
151
212
QString mirPointerEventToString(MirPointerEvent const* event)
212
QString mirPointerEventToString(MirPointerEvent const* event)
152
213
{
213
{
154
214
    QString string = QString("MirPointerEvent(x=%1,y=%2,relative_x=%3,relative_y=%4)")
214
    QString string = QStringLiteral("MirPointerEvent(x=%1,y=%2,relative_x=%3,relative_y=%4)")
155
215
        .arg(mir_pointer_event_axis_value(event, mir_pointer_axis_x))
215
        .arg(mir_pointer_event_axis_value(event, mir_pointer_axis_x))
156
216
        .arg(mir_pointer_event_axis_value(event, mir_pointer_axis_y))
216
        .arg(mir_pointer_event_axis_value(event, mir_pointer_axis_y))
157
217
        .arg(mir_pointer_event_axis_value(event, mir_pointer_axis_relative_x))
217
        .arg(mir_pointer_event_axis_value(event, mir_pointer_axis_relative_x))
158
@@ -224,7 +224,7 @@
159
224
{
224
{
160
225
    const int pointerCount = mir_touch_event_point_count(event);
225
    const int pointerCount = mir_touch_event_point_count(event);
161
226
226
163
227
    QString string("MirTouchEvent(");
227
    QString string(QStringLiteral("MirTouchEvent("));
164
228
228
165
229
    for (int i = 0; i < pointerCount; ++i) {
229
    for (int i = 0; i < pointerCount; ++i) {
166
230
230
167
@@ -234,7 +234,7 @@
168
234
234
169
235
        MirTouchAction touchAction = mir_touch_event_action(event, i);
235
        MirTouchAction touchAction = mir_touch_event_action(event, i);
170
236
236
172
237
        QString touchStr = QString("(id=%1,action=%2,x=%3,y=%4)")
237
        QString touchStr = QStringLiteral("(id=%1,action=%2,x=%3,y=%4)")
173
238
            .arg(mir_touch_event_id(event, i))
238
            .arg(mir_touch_event_id(event, i))
174
239
            .arg(mirTouchActionToString(touchAction))
239
            .arg(mirTouchActionToString(touchAction))
175
240
            .arg(mir_touch_event_axis_value(event, i, mir_touch_axis_x))
240
            .arg(mir_touch_event_axis_value(event, i, mir_touch_axis_x))
176
@@ -291,7 +291,7 @@
177
291
291
178
292
    xkb_keysym_t keyCode = mir_keyboard_event_key_code(event);
292
    xkb_keysym_t keyCode = mir_keyboard_event_key_code(event);
179
293
293
181
294
    return QString("MirKeyboardEvent(action=%1,key_code=0x%2)")
294
    return QStringLiteral("MirKeyboardEvent(action=%1,key_code=0x%2)")
182
295
        .arg(mirKeyboardActionToString(keyboardAction))
295
        .arg(mirKeyboardActionToString(keyboardAction))
183
296
        .arg(keyCode, 4, 16, QLatin1Char('0'));
296
        .arg(keyCode, 4, 16, QLatin1Char('0'));
184
297
}
297
}
185
298
298
186
=== modified file 'src/modules/Unity/Application/CMakeLists.txt'
187
--- src/modules/Unity/Application/CMakeLists.txt	2016-04-26 08:56:36 +0000
188
+++ src/modules/Unity/Application/CMakeLists.txt	2016-06-06 19:34:36 +0000
189
@@ -1,4 +1,10 @@
190
1
include_directories(
1
include_directories(
191
2
    ${CMAKE_SOURCE_DIR}/src/platforms/mirserver
192
3
    ${CMAKE_SOURCE_DIR}/src/common
193
4
)
194
5
195
6
include_directories(
196
7
  SYSTEM
197
2
    ${GLIB_INCLUDE_DIRS}
8
    ${GLIB_INCLUDE_DIRS}
198
3
    ${GIO_INCLUDE_DIRS}
9
    ${GIO_INCLUDE_DIRS}
199
4
    ${GIO_UNIX_INCLUDE_DIRS}
10
    ${GIO_UNIX_INCLUDE_DIRS}
200
@@ -7,8 +13,6 @@
201
7
    ${PROCESS_CPP_INCLUDE_DIRS}
13
    ${PROCESS_CPP_INCLUDE_DIRS}
202
8
    ${UBUNTU_PLATFORM_API_INCLUDE_DIRS}
14
    ${UBUNTU_PLATFORM_API_INCLUDE_DIRS}
203
9
    ${UBUNTU_APP_LAUNCH_INCLUDE_DIRS}
15
    ${UBUNTU_APP_LAUNCH_INCLUDE_DIRS}
204
10
    ${CMAKE_SOURCE_DIR}/src/platforms/mirserver
205
11
    ${CMAKE_SOURCE_DIR}/src/common
206
12
    ${GSETTINGS_QT_INCLUDE_DIRS}
16
    ${GSETTINGS_QT_INCLUDE_DIRS}
207
13
17
208
14
    ${LTTNG_INCLUDE_DIRS}
18
    ${LTTNG_INCLUDE_DIRS}
209
15
19
210
=== modified file 'src/modules/Unity/Application/application.cpp'
211
--- src/modules/Unity/Application/application.cpp	2016-06-06 19:34:36 +0000
212
+++ src/modules/Unity/Application/application.cpp	2016-06-06 19:34:36 +0000
213
@@ -174,8 +174,8 @@
214
174
            color.setAlpha(255);
174
            color.setAlpha(255);
215
175
        } else {
175
        } else {
216
176
            color.setRgba(qRgba(0, 0, 0, 0));
176
            color.setRgba(qRgba(0, 0, 0, 0));
219
177
            qCWarning(QTMIR_APPLICATIONS) << QString("Invalid %1: \"%2\"")
177
            qCWarning(QTMIR_APPLICATIONS) << QStringLiteral("Invalid %1: \"%2\"")
220
178
                .arg(colorName).arg(colorString);
178
                .arg(colorName, colorString);
221
179
        }
179
        }
222
180
    }
180
    }
223
181
181
224
@@ -466,7 +466,7 @@
225
466
    m_pid = pid;
466
    m_pid = pid;
226
467
}
467
}
227
468
468
229
469
void Application::setArguments(const QStringList arguments)
469
void Application::setArguments(const QStringList &arguments)
230
470
{
470
{
231
471
    m_arguments = arguments;
471
    m_arguments = arguments;
232
472
}
472
}
233
@@ -738,7 +738,7 @@
234
738
738
235
739
void Application::acquireWakelock() const
739
void Application::acquireWakelock() const
236
740
{
740
{
238
741
    if (appId() == "unity8-dash")
741
    if (appId() == QLatin1String("unity8-dash"))
239
742
        return;
742
        return;
240
743
743
241
744
    m_sharedWakelock->acquire(this);
744
    m_sharedWakelock->acquire(this);
242
@@ -746,7 +746,7 @@
243
746
746
244
747
void Application::releaseWakelock() const
747
void Application::releaseWakelock() const
245
748
{
748
{
247
749
    if (appId() == "unity8-dash")
749
    if (appId() == QLatin1String("unity8-dash"))
248
750
        return;
750
        return;
249
751
751
250
752
    m_sharedWakelock->release(this);
752
    m_sharedWakelock->release(this);
251
753
753
252
=== modified file 'src/modules/Unity/Application/application.h'
253
--- src/modules/Unity/Application/application.h	2016-06-06 19:34:36 +0000
254
+++ src/modules/Unity/Application/application.h	2016-06-06 19:34:36 +0000
255
@@ -160,7 +160,7 @@
256
160
    void acquireWakelock() const;
160
    void acquireWakelock() const;
257
161
    void releaseWakelock() const;
161
    void releaseWakelock() const;
258
162
    void setPid(pid_t pid);
162
    void setPid(pid_t pid);
260
163
    void setArguments(const QStringList arguments);
163
    void setArguments(const QStringList &arguments);
261
164
    void setInternalState(InternalState state);
164
    void setInternalState(InternalState state);
262
165
    void wipeQMLCache();
165
    void wipeQMLCache();
263
166
    void suspend();
166
    void suspend();
264
167
167
265
=== modified file 'src/modules/Unity/Application/application_manager.cpp'
266
--- src/modules/Unity/Application/application_manager.cpp	2016-05-06 08:41:15 +0000
267
+++ src/modules/Unity/Application/application_manager.cpp	2016-06-06 19:34:36 +0000
268
@@ -64,12 +64,12 @@
269
64
64
270
65
// FIXME: To be removed once shell has fully adopted short appIds!!
65
// FIXME: To be removed once shell has fully adopted short appIds!!
271
66
QString toShortAppIdIfPossible(const QString &appId) {
66
QString toShortAppIdIfPossible(const QString &appId) {
273
67
    QRegExp longAppIdMask("[a-z0-9][a-z0-9+.-]+_[a-zA-Z0-9+.-]+_[0-9][a-zA-Z0-9.+:~-]*");
67
    QRegExp longAppIdMask(QStringLiteral("[a-z0-9][a-z0-9+.-]+_[a-zA-Z0-9+.-]+_[0-9][a-zA-Z0-9.+:~-]*"));
274
68
    if (longAppIdMask.exactMatch(appId)) {
68
    if (longAppIdMask.exactMatch(appId)) {
275
69
        qWarning() << "WARNING: long App ID encountered:" << appId;
69
        qWarning() << "WARNING: long App ID encountered:" << appId;
276
70
        // input string a long AppId, chop the version string off the end
70
        // input string a long AppId, chop the version string off the end
279
71
        QStringList parts = appId.split("_");
71
        QStringList parts = appId.split(QStringLiteral("_"));
280
72
        return QString("%1_%2").arg(parts.first()).arg(parts.at(1));
72
        return QStringLiteral("%1_%2").arg(parts.first(), parts.at(1));
281
73
    }
73
    }
282
74
    return appId;
74
    return appId;
283
75
}
75
}
284
@@ -183,7 +183,7 @@
285
183
    , m_settings(settings)
183
    , m_settings(settings)
286
184
{
184
{
287
185
    qCDebug(QTMIR_APPLICATIONS) << "ApplicationManager::ApplicationManager (this=%p)" << this;
185
    qCDebug(QTMIR_APPLICATIONS) << "ApplicationManager::ApplicationManager (this=%p)" << this;
289
186
    setObjectName("qtmir::ApplicationManager");
186
    setObjectName(QStringLiteral("qtmir::ApplicationManager"));
290
187
187
291
188
    /*
188
    /*
292
189
        All begin[...]Rows() and end[...]Rows() functions cause signal emissions which can
189
        All begin[...]Rows() and end[...]Rows() functions cause signal emissions which can
293
@@ -532,7 +532,7 @@
294
532
532
295
533
    qCDebug(QTMIR_APPLICATIONS) << "ApplicationManager::authorizeSession - pid=" << pid;
533
    qCDebug(QTMIR_APPLICATIONS) << "ApplicationManager::authorizeSession - pid=" << pid;
296
534
534
298
535
    for (Application *app : m_applications) {
535
    Q_FOREACH (Application *app, m_applications) {
299
536
        if (app->state() == Application::Starting) {
536
        if (app->state() == Application::Starting) {
300
537
            tracepoint(qtmir, appIdHasProcessId_start);
537
            tracepoint(qtmir, appIdHasProcessId_start);
301
538
            if (m_taskController->appIdHasProcessId(app->appId(), pid)) {
538
            if (m_taskController->appIdHasProcessId(app->appId(), pid)) {
302
@@ -572,7 +572,7 @@
303
572
    }
572
    }
304
573
573
305
574
    // Guess appId from the desktop file hint
574
    // Guess appId from the desktop file hint
307
575
    const QString appId = toShortAppIdIfPossible(desktopFileName.split('/').last().remove(QRegExp(".desktop$")));
575
    const QString appId = toShortAppIdIfPossible(desktopFileName.split('/').last().remove(QRegExp(QStringLiteral(".desktop$"))));
308
576
576
309
577
    qCDebug(QTMIR_APPLICATIONS) << "Process supplied desktop_file_hint, loading:" << appId;
577
    qCDebug(QTMIR_APPLICATIONS) << "Process supplied desktop_file_hint, loading:" << appId;
310
578
578
311
@@ -598,7 +598,7 @@
312
598
    Application::Stage stage = Application::MainStage;
598
    Application::Stage stage = Application::MainStage;
313
599
    QString stageParam = info->getParameter("--stage_hint=");
599
    QString stageParam = info->getParameter("--stage_hint=");
314
600
600
316
601
    if (stageParam == "side_stage") {
601
    if (stageParam == QLatin1String("side_stage")) {
317
602
        stage = Application::SideStage;
602
        stage = Application::SideStage;
318
603
    }
603
    }
319
604
604
320
@@ -654,7 +654,7 @@
321
654
    return findApplicationWithPid(session->process_id());
654
    return findApplicationWithPid(session->process_id());
322
655
}
655
}
323
656
656
325
657
Application* ApplicationManager::findApplicationWithPid(const pid_t pid)
657
Application* ApplicationManager::findApplicationWithPid(const pid_t pid) const
326
658
{
658
{
327
659
    if (pid <= 0)
659
    if (pid <= 0)
328
660
        return nullptr;
660
        return nullptr;
329
@@ -878,7 +878,7 @@
330
878
878
331
879
Application *ApplicationManager::findApplication(qtmir::MirSurfaceInterface* surface)
879
Application *ApplicationManager::findApplication(qtmir::MirSurfaceInterface* surface)
332
880
{
880
{
334
881
    for (Application *app : m_applications) {
881
    Q_FOREACH (Application *app, m_applications) {
335
882
        if (app->session() == surface->session()) {
882
        if (app->session() == surface->session()) {
336
883
            return app;
883
            return app;
337
884
        }
884
        }
338
885
885
339
=== modified file 'src/modules/Unity/Application/application_manager.h'
340
--- src/modules/Unity/Application/application_manager.h	2016-05-05 15:02:01 +0000
341
+++ src/modules/Unity/Application/application_manager.h	2016-06-06 19:34:36 +0000
342
@@ -96,7 +96,7 @@
343
96
    bool isEmpty() const { return rowCount() == 0; }
96
    bool isEmpty() const { return rowCount() == 0; }
344
97
97
345
98
    const QList<Application*> &list() const { return m_applications; }
98
    const QList<Application*> &list() const { return m_applications; }
347
99
    qtmir::Application* findApplicationWithPid(const pid_t pid);
99
    qtmir::Application* findApplicationWithPid(const pid_t pid) const;
348
100
100
349
101
public Q_SLOTS:
101
public Q_SLOTS:
350
102
    void authorizeSession(const pid_t pid, bool &authorized);
102
    void authorizeSession(const pid_t pid, bool &authorized);
351
103
103
352
=== modified file 'src/modules/Unity/Application/dbuswindowstack.cpp'
353
--- src/modules/Unity/Application/dbuswindowstack.cpp	2016-01-20 21:36:39 +0000
354
+++ src/modules/Unity/Application/dbuswindowstack.cpp	2016-06-06 19:34:36 +0000
355
@@ -33,9 +33,9 @@
356
33
    qDBusRegisterMetaType<WindowInfo>();
33
    qDBusRegisterMetaType<WindowInfo>();
357
34
    qDBusRegisterMetaType< QList<WindowInfo> >();
34
    qDBusRegisterMetaType< QList<WindowInfo> >();
358
35
35
360
36
    QDBusConnection::sessionBus().registerService("com.canonical.Unity.WindowStack");
36
    QDBusConnection::sessionBus().registerService(QStringLiteral("com.canonical.Unity.WindowStack"));
361
37
    // TODO ExportScriptableSlots shouldn't be needed but without it i don't get the methods :-/
37
    // TODO ExportScriptableSlots shouldn't be needed but without it i don't get the methods :-/
363
38
    QDBusConnection::sessionBus().registerObject("/com/canonical/Unity/WindowStack", this, QDBusConnection::ExportAllSignals | QDBusConnection::ExportScriptableSlots |QDBusConnection::ExportScriptableInvokables );
38
    QDBusConnection::sessionBus().registerObject(QStringLiteral("/com/canonical/Unity/WindowStack"), this, QDBusConnection::ExportAllSignals | QDBusConnection::ExportScriptableSlots |QDBusConnection::ExportScriptableInvokables );
364
39
}
39
}
365
40
40
366
41
DBusWindowStack::~DBusWindowStack()
41
DBusWindowStack::~DBusWindowStack()
367
@@ -49,7 +49,7 @@
368
49
    const Application *app = appMgr->findApplicationWithPid(pid);
49
    const Application *app = appMgr->findApplicationWithPid(pid);
369
50
    if (app) {
50
    if (app) {
370
51
        res.app_id = app->appId();
51
        res.app_id = app->appId();
372
52
        res.desktop_file = "";
52
        res.desktop_file = QString();
373
53
    }
53
    }
374
54
    return res;
54
    return res;
375
55
}
55
}
376
@@ -59,6 +59,7 @@
377
59
    QList<WindowInfo> res;
59
    QList<WindowInfo> res;
378
60
    ApplicationManager *appMgr = static_cast<ApplicationManager*>(parent());
60
    ApplicationManager *appMgr = static_cast<ApplicationManager*>(parent());
379
61
    const QList<Application*> &applications = appMgr->list();
61
    const QList<Application*> &applications = appMgr->list();
380
62
    res.reserve(applications.count());
381
62
    Q_FOREACH(Application* app, applications) {
63
    Q_FOREACH(Application* app, applications) {
382
63
        WindowInfo wi;
64
        WindowInfo wi;
383
64
        wi.window_id = 0;
65
        wi.window_id = 0;
384
65
66
385
=== modified file 'src/modules/Unity/Application/mirbuffersgtexture.cpp'
386
--- src/modules/Unity/Application/mirbuffersgtexture.cpp	2015-12-10 13:08:43 +0000
387
+++ src/modules/Unity/Application/mirbuffersgtexture.cpp	2016-06-06 19:34:36 +0000
388
@@ -51,7 +51,7 @@
389
51
    m_height = 0;
51
    m_height = 0;
390
52
}
52
}
391
53
53
393
54
void MirBufferSGTexture::setBuffer(std::shared_ptr<mir::graphics::Buffer> buffer)
54
void MirBufferSGTexture::setBuffer(const std::shared_ptr<mir::graphics::Buffer>& buffer)
394
55
{
55
{
395
56
    m_mirBuffer = buffer;
56
    m_mirBuffer = buffer;
396
57
    mg::Size size = buffer->size();
57
    mg::Size size = buffer->size();
397
58
58
398
=== modified file 'src/modules/Unity/Application/mirbuffersgtexture.h'
399
--- src/modules/Unity/Application/mirbuffersgtexture.h	2015-09-28 09:57:18 +0000
400
+++ src/modules/Unity/Application/mirbuffersgtexture.h	2016-06-06 19:34:36 +0000
401
@@ -32,7 +32,7 @@
402
32
    MirBufferSGTexture();
32
    MirBufferSGTexture();
403
33
    virtual ~MirBufferSGTexture();
33
    virtual ~MirBufferSGTexture();
404
34
34
406
35
    void setBuffer(std::shared_ptr<mir::graphics::Buffer> buffer);
35
    void setBuffer(const std::shared_ptr<mir::graphics::Buffer>& buffer);
407
36
    void freeBuffer();
36
    void freeBuffer();
408
37
    bool hasBuffer() const;
37
    bool hasBuffer() const;
409
38
38
410
39
39
411
=== modified file 'src/modules/Unity/Application/mirsurface.cpp'
412
--- src/modules/Unity/Application/mirsurface.cpp	2016-05-25 13:54:52 +0000
413
+++ src/modules/Unity/Application/mirsurface.cpp	2016-06-06 19:34:36 +0000
414
@@ -835,7 +835,7 @@
415
835
835
416
836
void MirSurface::applyKeymap()
836
void MirSurface::applyKeymap()
417
837
{
837
{
419
838
    QStringList stringList = m_keymap.split("+", QString::SkipEmptyParts);
838
    QStringList stringList = m_keymap.split('+', QString::SkipEmptyParts);
420
839
839
421
840
    QString layout = stringList[0];
840
    QString layout = stringList[0];
422
841
    QString variant;
841
    QString variant;
423
842
842
424
=== modified file 'src/modules/Unity/Application/mirsurfaceitem.cpp'
425
--- src/modules/Unity/Application/mirsurfaceitem.cpp	2016-05-24 20:13:10 +0000
426
+++ src/modules/Unity/Application/mirsurfaceitem.cpp	2016-06-06 19:34:36 +0000
427
@@ -61,7 +61,7 @@
428
61
{
61
{
429
62
    Q_OBJECT
62
    Q_OBJECT
430
63
public:
63
public:
432
64
    MirTextureProvider(QSharedPointer<QSGTexture> texture) : t(texture) {}
64
    MirTextureProvider(const QSharedPointer<QSGTexture>& texture) : t(texture) {}
433
65
    QSGTexture *texture() const {
65
    QSGTexture *texture() const {
434
66
        if (t)
66
        if (t)
435
67
            t->setFiltering(smooth ? QSGTexture::Linear : QSGTexture::Nearest);
67
            t->setFiltering(smooth ? QSGTexture::Linear : QSGTexture::Nearest);
436
@@ -74,7 +74,7 @@
437
74
        t.reset();
74
        t.reset();
438
75
    }
75
    }
439
76
76
441
77
    void setTexture(QSharedPointer<QSGTexture> newTexture) {
77
    void setTexture(const QSharedPointer<QSGTexture>& newTexture) {
442
78
        t = newTexture;
78
        t = newTexture;
443
79
    }
79
    }
444
80
80
445
@@ -242,7 +242,7 @@
446
242
    }
242
    }
447
243
243
448
244
    if (m_surface->numBuffersReadyForCompositor() > 0) {
244
    if (m_surface->numBuffersReadyForCompositor() > 0) {
450
245
        QTimer::singleShot(0, this, SLOT(update()));
245
        QTimer::singleShot(0, this, &MirSurfaceItem::update);
451
246
    }
246
    }
452
247
247
453
248
    m_textureProvider->smooth = smooth();
248
    m_textureProvider->smooth = smooth();
454
@@ -388,7 +388,7 @@
455
388
    if (m_surface) {
388
    if (m_surface) {
456
389
        return m_surface->appId();
389
        return m_surface->appId();
457
390
    } else {
390
    } else {
459
391
        return QString("-");
391
        return QStringLiteral("-");
460
392
    }
392
    }
461
393
}
393
}
462
394
394
463
@@ -433,7 +433,7 @@
464
433
            Qt::TouchPointStates touchPointStates)
433
            Qt::TouchPointStates touchPointStates)
465
434
{
434
{
466
435
    if (eventType == QEvent::TouchBegin && m_lastTouchEvent && m_lastTouchEvent->type != QEvent::TouchEnd) {
435
    if (eventType == QEvent::TouchBegin && m_lastTouchEvent && m_lastTouchEvent->type != QEvent::TouchEnd) {
468
436
        qCWarning(QTMIR_SURFACES) << qPrintable(QString("MirSurfaceItem(%1) - Got a QEvent::TouchBegin while "
436
        qCWarning(QTMIR_SURFACES) << qPrintable(QStringLiteral("MirSurfaceItem(%1) - Got a QEvent::TouchBegin while "
469
437
            "there's still an active/unfinished touch sequence.").arg(appId()));
437
            "there's still an active/unfinished touch sequence.").arg(appId()));
470
438
        // Qt forgot to end the last touch sequence. Let's do it ourselves.
438
        // Qt forgot to end the last touch sequence. Let's do it ourselves.
471
439
        endCurrentTouchSequence(timestamp);
439
        endCurrentTouchSequence(timestamp);
472
@@ -749,7 +749,7 @@
473
749
    }
749
    }
474
750
}
750
}
475
751
751
477
752
void MirSurfaceItem::onActualSurfaceSizeChanged(const QSize &size)
752
void MirSurfaceItem::onActualSurfaceSizeChanged(QSize size)
478
753
{
753
{
479
754
    setImplicitSize(size.width(), size.height());
754
    setImplicitSize(size.width(), size.height());
480
755
}
755
}
481
756
756
482
=== modified file 'src/modules/Unity/Application/mirsurfaceitem.h'
483
--- src/modules/Unity/Application/mirsurfaceitem.h	2016-05-24 20:13:10 +0000
484
+++ src/modules/Unity/Application/mirsurfaceitem.h	2016-06-06 19:34:36 +0000
485
@@ -119,7 +119,7 @@
486
119
    void updateMirSurfaceActiveFocus();
119
    void updateMirSurfaceActiveFocus();
487
120
    void updateMirSurfaceVisibility();
120
    void updateMirSurfaceVisibility();
488
121
121
490
122
    void onActualSurfaceSizeChanged(const QSize &size);
122
    void onActualSurfaceSizeChanged(QSize size);
491
123
    void onCompositorSwappedBuffers();
123
    void onCompositorSwappedBuffers();
492
124
124
493
125
    void onWindowChanged(QQuickWindow *window);
125
    void onWindowChanged(QQuickWindow *window);
494
126
126
495
=== modified file 'src/modules/Unity/Application/mirsurfacemanager.cpp'
496
--- src/modules/Unity/Application/mirsurfacemanager.cpp	2016-05-06 08:41:15 +0000
497
+++ src/modules/Unity/Application/mirsurfacemanager.cpp	2016-06-06 19:34:36 +0000
498
@@ -85,7 +85,7 @@
499
85
    , m_sessionManager(sessionManager)
85
    , m_sessionManager(sessionManager)
500
86
{
86
{
501
87
    qCDebug(QTMIR_SURFACES) << "MirSurfaceManager::MirSurfaceManager - this=" << this;
87
    qCDebug(QTMIR_SURFACES) << "MirSurfaceManager::MirSurfaceManager - this=" << this;
503
88
    setObjectName("qtmir::SurfaceManager");
88
    setObjectName(QStringLiteral("qtmir::SurfaceManager"));
504
89
}
89
}
505
90
90
506
91
MirSurfaceManager::~MirSurfaceManager()
91
MirSurfaceManager::~MirSurfaceManager()
507
@@ -98,7 +98,7 @@
508
98
void MirSurfaceManager::onSessionCreatedSurface(const mir::scene::Session *mirSession,
98
void MirSurfaceManager::onSessionCreatedSurface(const mir::scene::Session *mirSession,
509
99
                                                const std::shared_ptr<mir::scene::Surface> &surface,
99
                                                const std::shared_ptr<mir::scene::Surface> &surface,
510
100
                                                const std::shared_ptr<SurfaceObserver> &observer,
100
                                                const std::shared_ptr<SurfaceObserver> &observer,
512
101
                                                qtmir::CreationHints creationHints)
101
                                                const qtmir::CreationHints &creationHints)
513
102
{
102
{
514
103
    qCDebug(QTMIR_SURFACES) << "MirSurfaceManager::onSessionCreatedSurface - mirSession=" << mirSession
103
    qCDebug(QTMIR_SURFACES) << "MirSurfaceManager::onSessionCreatedSurface - mirSession=" << mirSession
515
104
                            << "surface=" << surface.get() << "surface.name=" << surface->name().c_str()
104
                            << "surface=" << surface.get() << "surface.name=" << surface->name().c_str()
516
105
105
517
=== modified file 'src/modules/Unity/Application/mirsurfacemanager.h'
518
--- src/modules/Unity/Application/mirsurfacemanager.h	2016-05-06 08:28:44 +0000
519
+++ src/modules/Unity/Application/mirsurfacemanager.h	2016-06-06 19:34:36 +0000
520
@@ -75,7 +75,7 @@
521
75
    void onSessionCreatedSurface(const mir::scene::Session *,
75
    void onSessionCreatedSurface(const mir::scene::Session *,
522
76
                                 const std::shared_ptr<mir::scene::Surface> &,
76
                                 const std::shared_ptr<mir::scene::Surface> &,
523
77
                                 std::shared_ptr<SurfaceObserver> const&,
77
                                 std::shared_ptr<SurfaceObserver> const&,
525
78
                                 qtmir::CreationHints);
78
                                 const qtmir::CreationHints &);
526
79
    void onSessionDestroyingSurface(const mir::scene::Session *, const std::shared_ptr<mir::scene::Surface> &);
79
    void onSessionDestroyingSurface(const mir::scene::Session *, const std::shared_ptr<mir::scene::Surface> &);
527
80
80
528
81
protected:
81
protected:
529
82
82
530
=== modified file 'src/modules/Unity/Application/proc_info.cpp'
531
--- src/modules/Unity/Application/proc_info.cpp	2015-10-08 11:20:30 +0000
532
+++ src/modules/Unity/Application/proc_info.cpp	2016-06-06 19:34:36 +0000
533
@@ -27,7 +27,7 @@
534
27
}
27
}
535
28
28
536
29
std::unique_ptr<ProcInfo::CommandLine> ProcInfo::commandLine(pid_t pid) {
29
std::unique_ptr<ProcInfo::CommandLine> ProcInfo::commandLine(pid_t pid) {
538
30
    QFile cmdline(QString("/proc/%1/cmdline").arg(pid));
30
    QFile cmdline(QStringLiteral("/proc/%1/cmdline").arg(pid));
539
31
    if (!cmdline.open(QIODevice::ReadOnly | QIODevice::Text)) {
31
    if (!cmdline.open(QIODevice::ReadOnly | QIODevice::Text)) {
540
32
        return nullptr;
32
        return nullptr;
541
33
    }
33
    }
542
34
34
543
=== modified file 'src/modules/Unity/Application/session.cpp'
544
--- src/modules/Unity/Application/session.cpp	2016-06-06 19:34:36 +0000
545
+++ src/modules/Unity/Application/session.cpp	2016-06-06 19:34:36 +0000
546
@@ -89,7 +89,7 @@
547
89
    DEBUG_MSG << "()";
89
    DEBUG_MSG << "()";
548
90
    stopPromptSessions();
90
    stopPromptSessions();
549
91
91
551
92
    QList<SessionInterface*> children(m_children->list());
92
    const QList<SessionInterface*> children(m_children->list());
552
93
    for (SessionInterface* child : children) {
93
    for (SessionInterface* child : children) {
553
94
        delete child;
94
        delete child;
554
95
    }
95
    }
555
@@ -438,9 +438,9 @@
556
438
    deleteIfZombieAndEmpty();
438
    deleteIfZombieAndEmpty();
557
439
}
439
}
558
440
440
560
441
void Session::foreachChildSession(std::function<void(SessionInterface* session)> f) const
441
void Session::foreachChildSession(const std::function<void(SessionInterface* session)>& f) const
561
442
{
442
{
563
443
    QList<SessionInterface*> children(m_children->list());
443
    const QList<SessionInterface*> children(m_children->list());
564
444
    for (SessionInterface* child : children) {
444
    for (SessionInterface* child : children) {
565
445
        f(child);
445
        f(child);
566
446
    }
446
    }
567
@@ -467,13 +467,13 @@
568
467
467
569
468
void Session::stopPromptSessions()
468
void Session::stopPromptSessions()
570
469
{
469
{
572
470
    QList<SessionInterface*> children(m_children->list());
470
    const QList<SessionInterface*> children(m_children->list());
573
471
    for (SessionInterface* child : children) {
471
    for (SessionInterface* child : children) {
574
472
        static_cast<Session*>(child)->stopPromptSessions();
472
        static_cast<Session*>(child)->stopPromptSessions();
575
473
    }
473
    }
576
474
474
579
475
    QList<std::shared_ptr<ms::PromptSession>> copy(m_promptSessions);
475
    QVector<std::shared_ptr<ms::PromptSession>> copy(m_promptSessions);
580
476
    QListIterator<std::shared_ptr<ms::PromptSession>> it(copy);
476
    QVectorIterator<std::shared_ptr<ms::PromptSession>> it(copy);
581
477
    for ( it.toBack(); it.hasPrevious(); ) {
477
    for ( it.toBack(); it.hasPrevious(); ) {
582
478
        std::shared_ptr<ms::PromptSession> promptSession = it.previous();
478
        std::shared_ptr<ms::PromptSession> promptSession = it.previous();
583
479
        DEBUG_MSG << " - promptSession=" << promptSession.get();
479
        DEBUG_MSG << " - promptSession=" << promptSession.get();
584
@@ -489,9 +489,9 @@
585
489
    return nullptr;
489
    return nullptr;
586
490
}
490
}
587
491
491
589
492
void Session::foreachPromptSession(std::function<void(const std::shared_ptr<ms::PromptSession>&)> f) const
492
void Session::foreachPromptSession(const std::function<void(const std::shared_ptr<ms::PromptSession>&)>& f) const
590
493
{
493
{
592
494
    for (std::shared_ptr<ms::PromptSession> promptSession : m_promptSessions) {
494
    Q_FOREACH (std::shared_ptr<ms::PromptSession> promptSession, m_promptSessions) {
593
495
        f(promptSession);
495
        f(promptSession);
594
496
    }
496
    }
595
497
}
497
}
596
498
498
597
=== modified file 'src/modules/Unity/Application/session.h'
598
--- src/modules/Unity/Application/session.h	2016-05-17 19:18:44 +0000
599
+++ src/modules/Unity/Application/session.h	2016-06-06 19:34:36 +0000
600
@@ -70,12 +70,12 @@
601
70
    void addChildSession(SessionInterface* session) override;
70
    void addChildSession(SessionInterface* session) override;
602
71
    void insertChildSession(uint index, SessionInterface* session) override;
71
    void insertChildSession(uint index, SessionInterface* session) override;
603
72
    void removeChildSession(SessionInterface* session) override;
72
    void removeChildSession(SessionInterface* session) override;
605
73
    void foreachChildSession(std::function<void(SessionInterface* session)> f) const override;
73
    void foreachChildSession(const std::function<void(SessionInterface* session)> &f) const override;
606
74
74
607
75
    std::shared_ptr<mir::scene::Session> session() const override;
75
    std::shared_ptr<mir::scene::Session> session() const override;
608
76
76
609
77
    std::shared_ptr<mir::scene::PromptSession> activePromptSession() const override;
77
    std::shared_ptr<mir::scene::PromptSession> activePromptSession() const override;
611
78
    void foreachPromptSession(std::function<void(const std::shared_ptr<mir::scene::PromptSession>&)> f) const override;
78
    void foreachPromptSession(const std::function<void(const std::shared_ptr<mir::scene::PromptSession>&)> &f) const override;
612
79
79
613
80
    SessionModel* childSessions() const override;
80
    SessionModel* childSessions() const override;
614
81
81
615
@@ -115,7 +115,7 @@
616
115
    State m_state;
115
    State m_state;
617
116
    bool m_live;
116
    bool m_live;
618
117
    AbstractTimer* m_suspendTimer{nullptr};
117
    AbstractTimer* m_suspendTimer{nullptr};
620
118
    QList<std::shared_ptr<mir::scene::PromptSession>> m_promptSessions;
118
    QVector<std::shared_ptr<mir::scene::PromptSession>> m_promptSessions;
621
119
    std::shared_ptr<mir::scene::PromptSessionManager> const m_promptSessionManager;
119
    std::shared_ptr<mir::scene::PromptSessionManager> const m_promptSessionManager;
622
120
    QList<MirSurfaceInterface*> m_closingSurfaces;
120
    QList<MirSurfaceInterface*> m_closingSurfaces;
623
121
    bool m_hadSurface{false};
121
    bool m_hadSurface{false};
624
122
122
625
=== modified file 'src/modules/Unity/Application/session_interface.h'
626
--- src/modules/Unity/Application/session_interface.h	2016-05-17 19:18:44 +0000
627
+++ src/modules/Unity/Application/session_interface.h	2016-06-06 19:34:36 +0000
628
@@ -97,10 +97,10 @@
629
97
    virtual void addChildSession(SessionInterface* session) = 0;
97
    virtual void addChildSession(SessionInterface* session) = 0;
630
98
    virtual void insertChildSession(uint index, SessionInterface* session) = 0;
98
    virtual void insertChildSession(uint index, SessionInterface* session) = 0;
631
99
    virtual void removeChildSession(SessionInterface* session) = 0;
99
    virtual void removeChildSession(SessionInterface* session) = 0;
633
100
    virtual void foreachChildSession(std::function<void(SessionInterface* session)> f) const = 0;
100
    virtual void foreachChildSession(const std::function<void(SessionInterface* session)>& f) const = 0;
634
101
101
635
102
    virtual std::shared_ptr<mir::scene::PromptSession> activePromptSession() const = 0;
102
    virtual std::shared_ptr<mir::scene::PromptSession> activePromptSession() const = 0;
637
103
    virtual void foreachPromptSession(std::function<void(const std::shared_ptr<mir::scene::PromptSession>&)> f) const = 0;
103
    virtual void foreachPromptSession(const std::function<void(const std::shared_ptr<mir::scene::PromptSession>&)>& f) const = 0;
638
104
104
639
105
    virtual void setFullscreen(bool fullscreen) = 0;
105
    virtual void setFullscreen(bool fullscreen) = 0;
640
106
    virtual void setLive(const bool) = 0;
106
    virtual void setLive(const bool) = 0;
641
107
107
642
=== modified file 'src/modules/Unity/Application/sessionmanager.cpp'
643
--- src/modules/Unity/Application/sessionmanager.cpp	2016-05-06 08:41:15 +0000
644
+++ src/modules/Unity/Application/sessionmanager.cpp	2016-06-06 19:34:36 +0000
645
@@ -92,7 +92,7 @@
646
92
    , m_applicationManager(applicationManager)
92
    , m_applicationManager(applicationManager)
647
93
{
93
{
648
94
    qCDebug(QTMIR_SESSIONS) << "SessionManager::SessionManager - this=" << this;
94
    qCDebug(QTMIR_SESSIONS) << "SessionManager::SessionManager - this=" << this;
650
95
    setObjectName("qtmir::SessionManager");
95
    setObjectName(QStringLiteral("qtmir::SessionManager"));
651
96
}
96
}
652
97
97
653
98
SessionManager::~SessionManager()
98
SessionManager::~SessionManager()
654
99
99
655
=== modified file 'src/modules/Unity/Application/sharedwakelock.cpp'
656
--- src/modules/Unity/Application/sharedwakelock.cpp	2015-03-05 23:40:52 +0000
657
+++ src/modules/Unity/Application/sharedwakelock.cpp	2016-06-06 19:34:36 +0000
658
@@ -37,7 +37,7 @@
659
37
    Q_OBJECT
37
    Q_OBJECT
660
38
public:
38
public:
661
39
    Wakelock(const QDBusConnection &connection) noexcept
39
    Wakelock(const QDBusConnection &connection) noexcept
663
40
        : AbstractDBusServiceMonitor("com.canonical.powerd", "/com/canonical/powerd", "com.canonical.powerd", connection)
40
        : AbstractDBusServiceMonitor(QStringLiteral("com.canonical.powerd"), QStringLiteral("/com/canonical/powerd"), QStringLiteral("com.canonical.powerd"), connection)
664
41
        , m_wakelockEnabled(false)
41
        , m_wakelockEnabled(false)
665
42
    {
42
    {
666
43
        // (re-)acquire wake lock when powerd (re-)appears on the bus
43
        // (re-)acquire wake lock when powerd (re-)appears on the bus
667
@@ -90,7 +90,7 @@
668
90
        }
90
        }
669
91
91
670
92
        if (!m_cookie.isEmpty()) {
92
        if (!m_cookie.isEmpty()) {
672
93
            dbusInterface()->asyncCall("clearSysState", QString(m_cookie));
93
            dbusInterface()->asyncCall(QStringLiteral("clearSysState"), QString(m_cookie));
673
94
            qCDebug(QTMIR_SESSIONS) << "Wakelock released" << m_cookie;
94
            qCDebug(QTMIR_SESSIONS) << "Wakelock released" << m_cookie;
674
95
            m_cookie.clear();
95
            m_cookie.clear();
675
96
        }
96
        }
676
@@ -132,7 +132,7 @@
677
132
132
678
133
        if (!m_wakelockEnabled || !m_cookie.isEmpty()) {
133
        if (!m_wakelockEnabled || !m_cookie.isEmpty()) {
679
134
            // notified wakelock was created, but we either don't want it, or already have one - release it immediately
134
            // notified wakelock was created, but we either don't want it, or already have one - release it immediately
681
135
            dbusInterface()->asyncCall("clearSysState", QString(cookie));
135
            dbusInterface()->asyncCall(QStringLiteral("clearSysState"), QString(cookie));
682
136
            return;
136
            return;
683
137
        }
137
        }
684
138
138
685
@@ -155,7 +155,7 @@
686
155
            return;
155
            return;
687
156
        }
156
        }
688
157
157
690
158
        QDBusPendingCall pcall = dbusInterface()->asyncCall("requestSysState", "active", POWERD_SYS_STATE_ACTIVE);
158
        QDBusPendingCall pcall = dbusInterface()->asyncCall(QStringLiteral("requestSysState"), "active", POWERD_SYS_STATE_ACTIVE);
691
159
159
692
160
        QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(pcall, this);
160
        QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(pcall, this);
693
161
        QObject::connect(watcher, &QDBusPendingCallWatcher::finished,
161
        QObject::connect(watcher, &QDBusPendingCallWatcher::finished,
694
162
162
695
=== modified file 'src/modules/Unity/Application/ubuntukeyboardinfo.cpp'
696
--- src/modules/Unity/Application/ubuntukeyboardinfo.cpp	2016-06-06 19:34:36 +0000
697
+++ src/modules/Unity/Application/ubuntukeyboardinfo.cpp	2016-06-06 19:34:36 +0000
698
@@ -166,7 +166,7 @@
699
166
    if (xdgRuntimeDir) {
166
    if (xdgRuntimeDir) {
700
167
        m_socketFilePath = QDir(xdgRuntimeDir).filePath(gServerName);
167
        m_socketFilePath = QDir(xdgRuntimeDir).filePath(gServerName);
701
168
    } else {
168
    } else {
703
169
        m_socketFilePath = QDir("/tmp").filePath(gServerName);
169
        m_socketFilePath = QDir(QStringLiteral("/tmp")).filePath(gServerName);
704
170
    }
170
    }
705
171
}
171
}
706
172
172
707
173
173
708
=== modified file 'src/modules/Unity/Application/upstart/taskcontroller.cpp'
709
--- src/modules/Unity/Application/upstart/taskcontroller.cpp	2016-06-06 19:34:36 +0000
710
+++ src/modules/Unity/Application/upstart/taskcontroller.cpp	2016-06-06 19:34:36 +0000
711
@@ -59,7 +59,7 @@
712
59
    gchar *package, *application;
59
    gchar *package, *application;
713
60
    if (ubuntu_app_launch_app_id_parse(appId.toLatin1().constData(), &package, &application, nullptr)) {
60
    if (ubuntu_app_launch_app_id_parse(appId.toLatin1().constData(), &package, &application, nullptr)) {
714
61
        // is long appId, so assemble its short appId
61
        // is long appId, so assemble its short appId
716
62
        QString shortAppId = QString("%1_%2").arg(package).arg(application);
62
        QString shortAppId = QStringLiteral("%1_%2").arg(package, application);
717
63
        g_free(package);
63
        g_free(package);
718
64
        g_free(application);
64
        g_free(application);
719
65
        return shortAppId;
65
        return shortAppId;
720
66
66
721
=== modified file 'src/modules/Unity/Screens/CMakeLists.txt'
722
--- src/modules/Unity/Screens/CMakeLists.txt	2016-01-28 22:33:35 +0000
723
+++ src/modules/Unity/Screens/CMakeLists.txt	2016-06-06 19:34:36 +0000
724
@@ -1,5 +1,9 @@
725
1
include_directories(
1
include_directories(
726
2
    ${CMAKE_SOURCE_DIR}/src/platforms/mirserver
2
    ${CMAKE_SOURCE_DIR}/src/platforms/mirserver
727
3
)
728
4
729
5
include_directories(
730
6
    SYSTEM
731
3
    ${Qt5Gui_PRIVATE_INCLUDE_DIRS}
7
    ${Qt5Gui_PRIVATE_INCLUDE_DIRS}
732
4
    ${Qt5Quick_INCLUDE_DIRS}
8
    ${Qt5Quick_INCLUDE_DIRS}
733
5
    ${MIRSERVER_INCLUDE_DIRS}
9
    ${MIRSERVER_INCLUDE_DIRS}
734
6
10
735
=== modified file 'src/modules/Unity/Screens/qquickscreenwindow.cpp'
736
--- src/modules/Unity/Screens/qquickscreenwindow.cpp	2016-04-22 18:01:05 +0000
737
+++ src/modules/Unity/Screens/qquickscreenwindow.cpp	2016-06-06 19:34:36 +0000
738
@@ -50,7 +50,7 @@
739
50
    , m_scale(-1.0) // start with invalid initial state, fetch correct value on first invokation
50
    , m_scale(-1.0) // start with invalid initial state, fetch correct value on first invokation
740
51
    , m_formFactor(Screens::FormFactorUnknown)
51
    , m_formFactor(Screens::FormFactorUnknown)
741
52
{
52
{
743
53
    if (qGuiApp->platformName() == "mirserver") {
53
    if (qGuiApp->platformName() == QLatin1String("mirserver")) {
744
54
        connect(qGuiApp->platformNativeInterface(), &QPlatformNativeInterface::windowPropertyChanged,
54
        connect(qGuiApp->platformNativeInterface(), &QPlatformNativeInterface::windowPropertyChanged,
745
55
                this, &QQuickScreenWindow::nativePropertyChanged);
55
                this, &QQuickScreenWindow::nativePropertyChanged);
746
56
        //m_scale = getScaleNativeProperty(); DO NOT CALL HERE - see note above
56
        //m_scale = getScaleNativeProperty(); DO NOT CALL HERE - see note above
747
57
57
748
=== modified file 'src/platforms/mirserver/CMakeLists.txt'
749
--- src/platforms/mirserver/CMakeLists.txt	2016-06-06 19:34:36 +0000
750
+++ src/platforms/mirserver/CMakeLists.txt	2016-06-06 19:34:36 +0000
751
@@ -26,6 +26,10 @@
752
26
include_directories(
26
include_directories(
753
27
    ${CMAKE_SOURCE_DIR}/src/common
27
    ${CMAKE_SOURCE_DIR}/src/common
754
28
28
755
29
)
756
30
757
31
include_directories(
758
32
  SYSTEM
759
29
    ${MIRCOMMON_INCLUDE_DIRS}
33
    ${MIRCOMMON_INCLUDE_DIRS}
760
30
    ${MIRSERVER_INCLUDE_DIRS}
34
    ${MIRSERVER_INCLUDE_DIRS}
761
31
    ${MIRRENDERERGLDEV_INCLUDE_DIRS}
35
    ${MIRRENDERERGLDEV_INCLUDE_DIRS}
762
32
36
763
=== modified file 'src/platforms/mirserver/clipboard.cpp'
764
--- src/platforms/mirserver/clipboard.cpp	2016-05-03 19:45:51 +0000
765
+++ src/platforms/mirserver/clipboard.cpp	2016-06-06 19:34:36 +0000
766
@@ -65,12 +65,13 @@
767
65
        int offset = headerSize;
65
        int offset = headerSize;
768
66
        header[0] = formatCount;
66
        header[0] = formatCount;
769
67
        for (int i = 0; i < formatCount; i++) {
67
        for (int i = 0; i < formatCount; i++) {
770
68
            const QByteArray data = mimeData->data(formats[i]);
771
68
            const int formatOffset = offset;
69
            const int formatOffset = offset;
772
69
            const int formatSize = formats[i].size();
70
            const int formatSize = formats[i].size();
773
70
            const int dataOffset = offset + formatSize;
71
            const int dataOffset = offset + formatSize;
775
71
            const int dataSize = mimeData->data(formats[i]).size();
72
            const int dataSize = data.size();
776
72
            memcpy(&buffer[formatOffset], formats[i].toLatin1().data(), formatSize);
73
            memcpy(&buffer[formatOffset], formats[i].toLatin1().data(), formatSize);
778
73
            memcpy(&buffer[dataOffset], mimeData->data(formats[i]).data(), dataSize);
74
            memcpy(&buffer[dataOffset], data.data(), dataSize);
779
74
            header[i*4+1] = formatOffset;
75
            header[i*4+1] = formatOffset;
780
75
            header[i*4+2] = formatSize;
76
            header[i*4+2] = formatSize;
781
76
            header[i*4+3] = dataOffset;
77
            header[i*4+3] = dataOffset;
782
77
78
783
=== modified file 'src/platforms/mirserver/creationhints.cpp'
784
--- src/platforms/mirserver/creationhints.cpp	2016-03-18 12:15:54 +0000
785
+++ src/platforms/mirserver/creationhints.cpp	2016-06-06 19:34:36 +0000
786
@@ -56,7 +56,7 @@
787
56
56
788
57
QString CreationHints::toString() const
57
QString CreationHints::toString() const
789
58
{
58
{
791
59
    return QString("CreationHints(minW=%1,minH=%2,maxW=%3,maxH=%4,wIncr=%5,hInc=%6,shellChrome=%7)")
59
    return QStringLiteral("CreationHints(minW=%1,minH=%2,maxW=%3,maxH=%4,wIncr=%5,hInc=%6,shellChrome=%7)")
792
60
        .arg(minWidth)
60
        .arg(minWidth)
793
61
        .arg(minHeight)
61
        .arg(minHeight)
794
62
        .arg(maxWidth)
62
        .arg(maxWidth)
795
63
63
796
=== modified file 'src/platforms/mirserver/creationhints.h'
797
--- src/platforms/mirserver/creationhints.h	2016-03-10 11:55:28 +0000
798
+++ src/platforms/mirserver/creationhints.h	2016-06-06 19:34:36 +0000
799
@@ -24,7 +24,7 @@
800
24
24
801
25
namespace mir {
25
namespace mir {
802
26
    namespace scene {
26
    namespace scene {
804
27
        class SurfaceCreationParameters;
27
        struct SurfaceCreationParameters;
805
28
    }
28
    }
806
29
}
29
}
807
30
30
808
31
31
809
=== modified file 'src/platforms/mirserver/cursor.cpp'
810
--- src/platforms/mirserver/cursor.cpp	2015-11-25 15:38:50 +0000
811
+++ src/platforms/mirserver/cursor.cpp	2016-06-06 19:34:36 +0000
812
@@ -27,28 +27,28 @@
813
27
27
814
28
Cursor::Cursor()
28
Cursor::Cursor()
815
29
{
29
{
838
30
    m_shapeToCursorName[Qt::ArrowCursor] = "left_ptr";
30
    m_shapeToCursorName[Qt::ArrowCursor] = QStringLiteral("left_ptr");
839
31
    m_shapeToCursorName[Qt::UpArrowCursor] = "up_arrow";
31
    m_shapeToCursorName[Qt::UpArrowCursor] = QStringLiteral("up_arrow");
840
32
    m_shapeToCursorName[Qt::CrossCursor] = "cross";
32
    m_shapeToCursorName[Qt::CrossCursor] = QStringLiteral("cross");
841
33
    m_shapeToCursorName[Qt::WaitCursor] = "watch";
33
    m_shapeToCursorName[Qt::WaitCursor] = QStringLiteral("watch");
842
34
    m_shapeToCursorName[Qt::IBeamCursor] = "xterm";
34
    m_shapeToCursorName[Qt::IBeamCursor] = QStringLiteral("xterm");
843
35
    m_shapeToCursorName[Qt::SizeVerCursor] = "size_ver";
35
    m_shapeToCursorName[Qt::SizeVerCursor] = QStringLiteral("size_ver");
844
36
    m_shapeToCursorName[Qt::SizeHorCursor] = "size_hor";
36
    m_shapeToCursorName[Qt::SizeHorCursor] = QStringLiteral("size_hor");
845
37
    m_shapeToCursorName[Qt::SizeBDiagCursor] = "size_bdiag";
37
    m_shapeToCursorName[Qt::SizeBDiagCursor] = QStringLiteral("size_bdiag");
846
38
    m_shapeToCursorName[Qt::SizeFDiagCursor] = "size_fdiag";
38
    m_shapeToCursorName[Qt::SizeFDiagCursor] = QStringLiteral("size_fdiag");
847
39
    m_shapeToCursorName[Qt::SizeAllCursor] = "size_all";
39
    m_shapeToCursorName[Qt::SizeAllCursor] = QStringLiteral("size_all");
848
40
    m_shapeToCursorName[Qt::BlankCursor] = "blank";
40
    m_shapeToCursorName[Qt::BlankCursor] = QStringLiteral("blank");
849
41
    m_shapeToCursorName[Qt::SplitVCursor] = "split_v";
41
    m_shapeToCursorName[Qt::SplitVCursor] = QStringLiteral("split_v");
850
42
    m_shapeToCursorName[Qt::SplitHCursor] = "split_h";
42
    m_shapeToCursorName[Qt::SplitHCursor] = QStringLiteral("split_h");
851
43
    m_shapeToCursorName[Qt::PointingHandCursor] = "hand";
43
    m_shapeToCursorName[Qt::PointingHandCursor] = QStringLiteral("hand");
852
44
    m_shapeToCursorName[Qt::ForbiddenCursor] = "forbidden";
44
    m_shapeToCursorName[Qt::ForbiddenCursor] = QStringLiteral("forbidden");
853
45
    m_shapeToCursorName[Qt::WhatsThisCursor] = "whats_this";
45
    m_shapeToCursorName[Qt::WhatsThisCursor] = QStringLiteral("whats_this");
854
46
    m_shapeToCursorName[Qt::BusyCursor] = "left_ptr_watch";
46
    m_shapeToCursorName[Qt::BusyCursor] = QStringLiteral("left_ptr_watch");
855
47
    m_shapeToCursorName[Qt::OpenHandCursor] = "openhand";
47
    m_shapeToCursorName[Qt::OpenHandCursor] = QStringLiteral("openhand");
856
48
    m_shapeToCursorName[Qt::ClosedHandCursor] = "closedhand";
48
    m_shapeToCursorName[Qt::ClosedHandCursor] = QStringLiteral("closedhand");
857
49
    m_shapeToCursorName[Qt::DragCopyCursor] = "dnd-copy";
49
    m_shapeToCursorName[Qt::DragCopyCursor] = QStringLiteral("dnd-copy");
858
50
    m_shapeToCursorName[Qt::DragMoveCursor] = "dnd-move";
50
    m_shapeToCursorName[Qt::DragMoveCursor] = QStringLiteral("dnd-move");
859
51
    m_shapeToCursorName[Qt::DragLinkCursor] = "dnd-link";
51
    m_shapeToCursorName[Qt::DragLinkCursor] = QStringLiteral("dnd-link");
860
52
52
861
53
    connect(Mir::instance(), &Mir::cursorNameChanged, this, &Cursor::setMirCursorName);
53
    connect(Mir::instance(), &Mir::cursorNameChanged, this, &Cursor::setMirCursorName);
862
54
}
54
}
863
@@ -61,10 +61,10 @@
864
61
61
865
62
    if (windowCursor) {
62
    if (windowCursor) {
866
63
        if (windowCursor->pixmap().isNull()) {
63
        if (windowCursor->pixmap().isNull()) {
868
64
            m_qtCursorName = m_shapeToCursorName.value(windowCursor->shape(), QLatin1String("left_ptr"));
64
            m_qtCursorName = m_shapeToCursorName.value(windowCursor->shape(), QStringLiteral("left_ptr"));
869
65
            m_mousePointer->setCustomCursor(QCursor());
65
            m_mousePointer->setCustomCursor(QCursor());
870
66
        } else {
66
        } else {
872
67
            m_qtCursorName = QLatin1String("custom");
67
            m_qtCursorName = QStringLiteral("custom");
873
68
            m_mousePointer->setCustomCursor(*windowCursor);
68
            m_mousePointer->setCustomCursor(*windowCursor);
874
69
        }
69
        }
875
70
    } else {
70
    } else {
876
@@ -170,7 +170,7 @@
877
170
170
878
171
    if (m_mirCursorName.isEmpty()) {
171
    if (m_mirCursorName.isEmpty()) {
879
172
        if (m_qtCursorName.isEmpty()) {
172
        if (m_qtCursorName.isEmpty()) {
881
173
            m_mousePointer->setCursorName("left_ptr");
173
            m_mousePointer->setCursorName(QStringLiteral("left_ptr"));
882
174
        } else {
174
        } else {
883
175
            m_mousePointer->setCursorName(m_qtCursorName);
175
            m_mousePointer->setCursorName(m_qtCursorName);
884
176
        }
176
        }
885
177
177
886
=== modified file 'src/platforms/mirserver/cursor.h'
887
--- src/platforms/mirserver/cursor.h	2015-11-19 14:17:54 +0000
888
+++ src/platforms/mirserver/cursor.h	2016-06-06 19:34:36 +0000
889
@@ -28,6 +28,7 @@
890
28
28
891
29
class Cursor : public MirPlatformCursor
29
class Cursor : public MirPlatformCursor
892
30
{
30
{
893
31
    Q_OBJECT
894
31
public:
32
public:
895
32
    Cursor();
33
    Cursor();
896
33
34
897
34
35
898
=== modified file 'src/platforms/mirserver/mircursorimages.cpp'
899
--- src/platforms/mirserver/mircursorimages.cpp	2015-11-10 11:07:23 +0000
900
+++ src/platforms/mirserver/mircursorimages.cpp	2016-06-06 19:34:36 +0000
901
@@ -20,7 +20,7 @@
902
20
using namespace qtmir;
20
using namespace qtmir;
903
21
21
904
22
std::shared_ptr<mir::graphics::CursorImage> MirCursorImages::image(const std::string &cursor_name,
22
std::shared_ptr<mir::graphics::CursorImage> MirCursorImages::image(const std::string &cursor_name,
906
23
        const mir::geometry::Size&)
23
        const mir::geometry::Size &)
907
24
{
24
{
908
25
    // We are not responsible for loading cursors. This is left for shell to do as it's drawing its own QML cursor.
25
    // We are not responsible for loading cursors. This is left for shell to do as it's drawing its own QML cursor.
909
26
    // So here we work around Mir API by storing just the cursor name in the CursorImage.
26
    // So here we work around Mir API by storing just the cursor name in the CursorImage.
910
27
27
911
=== modified file 'src/platforms/mirserver/nativeinterface.cpp'
912
--- src/platforms/mirserver/nativeinterface.cpp	2016-05-05 14:17:14 +0000
913
+++ src/platforms/mirserver/nativeinterface.cpp	2016-06-06 19:34:36 +0000
914
@@ -56,8 +56,8 @@
915
56
    auto w = static_cast<ScreenWindow*>(window);
56
    auto w = static_cast<ScreenWindow*>(window);
916
57
    auto s = static_cast<Screen*>(w->screen());
57
    auto s = static_cast<Screen*>(w->screen());
917
58
    if (s) {
58
    if (s) {
920
59
        propertyMap.insert("scale", s->scale());
59
        propertyMap.insert(QStringLiteral("scale"), s->scale());
921
60
        propertyMap.insert("formFactor", s->formFactor());
60
        propertyMap.insert(QStringLiteral("formFactor"), s->formFactor());
922
61
    }
61
    }
923
62
    return propertyMap;
62
    return propertyMap;
924
63
}
63
}
925
64
64
926
=== modified file 'src/platforms/mirserver/nativeinterface.h'
927
--- src/platforms/mirserver/nativeinterface.h	2016-05-05 14:17:14 +0000
928
+++ src/platforms/mirserver/nativeinterface.h	2016-06-06 19:34:36 +0000
929
@@ -27,10 +27,11 @@
930
27
27
931
28
class NativeInterface : public QPlatformNativeInterface
28
class NativeInterface : public QPlatformNativeInterface
932
29
{
29
{
933
30
    Q_OBJECT
934
30
public:
31
public:
935
31
    NativeInterface(QMirServer *);
32
    NativeInterface(QMirServer *);
936
32
33
938
33
    virtual void *nativeResourceForIntegration(const QByteArray &resource);
34
    void *nativeResourceForIntegration(const QByteArray &resource) override;
939
34
35
940
35
    QVariantMap windowProperties(QPlatformWindow *window) const override;
36
    QVariantMap windowProperties(QPlatformWindow *window) const override;
941
36
    QVariant windowProperty(QPlatformWindow *window, const QString &name) const override;
37
    QVariant windowProperty(QPlatformWindow *window, const QString &name) const override;
942
37
38
943
=== modified file 'src/platforms/mirserver/plugin.cpp'
944
--- src/platforms/mirserver/plugin.cpp	2015-10-19 21:17:18 +0000
945
+++ src/platforms/mirserver/plugin.cpp	2016-06-06 19:34:36 +0000
946
@@ -20,7 +20,7 @@
947
20
QPlatformIntegration *MirServerIntegrationPlugin::create(const QString &system, const QStringList &/*paramList*/,
20
QPlatformIntegration *MirServerIntegrationPlugin::create(const QString &system, const QStringList &/*paramList*/,
948
21
                                                         int &argc, char **argv)
21
                                                         int &argc, char **argv)
949
22
{
22
{
951
23
    if (system.toLower() == "mirserver")
23
    if (system.toLower() == QLatin1String("mirserver"))
952
24
        return new MirServerIntegration(argc, argv);
24
        return new MirServerIntegration(argc, argv);
953
25
    return 0;
25
    return 0;
954
26
}
26
}
955
27
27
956
=== modified file 'src/platforms/mirserver/qteventfeeder.cpp'
957
--- src/platforms/mirserver/qteventfeeder.cpp	2016-05-06 08:41:15 +0000
958
+++ src/platforms/mirserver/qteventfeeder.cpp	2016-06-06 19:34:36 +0000
959
@@ -852,7 +852,7 @@
960
852
            result.append(",");
852
            result.append(",");
961
853
        }
853
        }
962
854
        const struct QWindowSystemInterface::TouchPoint &point = points.at(i);
854
        const struct QWindowSystemInterface::TouchPoint &point = points.at(i);
964
855
        result.append(QString("(id=%1,state=%2,normalPosition=(%3,%4))")
855
        result.append(QStringLiteral("(id=%1,state=%2,normalPosition=(%3,%4))")
965
856
            .arg(point.id)
856
            .arg(point.id)
966
857
            .arg(touchPointStateToString(point.state))
857
            .arg(touchPointStateToString(point.state))
967
858
            .arg(point.normalPosition.x())
858
            .arg(point.normalPosition.x())
968
859
859
969
=== modified file 'src/platforms/mirserver/screen.cpp'
970
--- src/platforms/mirserver/screen.cpp	2016-05-06 08:41:15 +0000
971
+++ src/platforms/mirserver/screen.cpp	2016-06-06 19:34:36 +0000
972
@@ -169,15 +169,15 @@
973
169
169
974
170
    if (!skipDBusRegistration) {
170
    if (!skipDBusRegistration) {
975
171
        // FIXME This is a unity8 specific dbus call and shouldn't be in qtmir
171
        // FIXME This is a unity8 specific dbus call and shouldn't be in qtmir
979
172
        m_unityScreen = new QDBusInterface("com.canonical.Unity.Screen",
172
        m_unityScreen = new QDBusInterface(QStringLiteral("com.canonical.Unity.Screen"),
980
173
                                         "/com/canonical/Unity/Screen",
173
                                         QStringLiteral("/com/canonical/Unity/Screen"),
981
174
                                         "com.canonical.Unity.Screen",
174
                                         QStringLiteral("com.canonical.Unity.Screen"),
982
175
                                         QDBusConnection::systemBus(), this);
175
                                         QDBusConnection::systemBus(), this);
983
176
176
988
177
        m_unityScreen->connection().connect("com.canonical.Unity.Screen",
177
        m_unityScreen->connection().connect(QStringLiteral("com.canonical.Unity.Screen"),
989
178
                                          "/com/canonical/Unity/Screen",
178
                                          QStringLiteral("/com/canonical/Unity/Screen"),
990
179
                                          "com.canonical.Unity.Screen",
179
                                          QStringLiteral("com.canonical.Unity.Screen"),
991
180
                                          "DisplayPowerStateChange",
180
                                          QStringLiteral("DisplayPowerStateChange"),
992
181
                                          this,
181
                                          this,
993
182
                                          SLOT(onDisplayPowerStateChanged(int, int)));
182
                                          SLOT(onDisplayPowerStateChanged(int, int)));
994
183
    }
183
    }
995
184
184
996
=== modified file 'src/platforms/mirserver/screenscontroller.cpp'
997
--- src/platforms/mirserver/screenscontroller.cpp	2016-01-29 16:49:06 +0000
998
+++ src/platforms/mirserver/screenscontroller.cpp	2016-06-06 19:34:36 +0000
999
@@ -54,13 +54,13 @@
1000
54
    return list;
54
    return list;
1001
55
}
55
}
1002
56
56
1004
57
bool ScreensController::setConfiguration(CustomScreenConfigurationList newConfig)
57
bool ScreensController::setConfiguration(const CustomScreenConfigurationList &newConfig)
1005
58
{
58
{
1006
59
    using namespace mir::geometry;
59
    using namespace mir::geometry;
1007
60
60
1008
61
    auto displayConfiguration = m_display->configuration();
61
    auto displayConfiguration = m_display->configuration();
1009
62
62
1011
63
    Q_FOREACH (auto config, newConfig) {
63
    Q_FOREACH (const auto &config, newConfig) {
1012
64
        displayConfiguration->for_each_output(
64
        displayConfiguration->for_each_output(
1013
65
            [&config](mg::UserDisplayConfigurationOutput &outputConfig)
65
            [&config](mg::UserDisplayConfigurationOutput &outputConfig)
1014
66
            {
66
            {
1015
67
67
1016
=== modified file 'src/platforms/mirserver/screenscontroller.h'
1017
--- src/platforms/mirserver/screenscontroller.h	2016-01-29 16:49:06 +0000
1018
+++ src/platforms/mirserver/screenscontroller.h	2016-06-06 19:34:36 +0000
1019
@@ -43,7 +43,7 @@
1020
43
                               QObject *parent = 0);
43
                               QObject *parent = 0);
1021
44
44
1022
45
    CustomScreenConfigurationList configuration();
45
    CustomScreenConfigurationList configuration();
1024
46
    bool setConfiguration(CustomScreenConfigurationList newConfig);
46
    bool setConfiguration(const CustomScreenConfigurationList &newConfig);
1025
47
47
1026
48
private:
48
private:
1027
49
    const QSharedPointer<ScreensModel> m_screensModel;
49
    const QSharedPointer<ScreensModel> m_screensModel;
1028
50
50
1029
=== modified file 'src/platforms/mirserver/screensmodel.cpp'
1030
--- src/platforms/mirserver/screensmodel.cpp	2016-05-06 08:41:15 +0000
1031
+++ src/platforms/mirserver/screensmodel.cpp	2016-06-06 19:34:36 +0000
1032
@@ -144,7 +144,7 @@
1033
144
    );
144
    );
1034
145
145
1035
146
    // Announce new Screens to Qt
146
    // Announce new Screens to Qt
1037
147
    for (auto screen : newScreenList) {
147
    Q_FOREACH (auto screen, newScreenList) {
1038
148
        Q_EMIT screenAdded(screen);
148
        Q_EMIT screenAdded(screen);
1039
149
    }
149
    }
1040
150
150
1041
@@ -157,7 +157,7 @@
1042
157
    }
157
    }
1043
158
158
1044
159
    // Delete any old & unused Screens
159
    // Delete any old & unused Screens
1046
160
    for (auto screen: oldScreenList) {
160
    Q_FOREACH (auto screen, oldScreenList) {
1047
161
        qCDebug(QTMIR_SCREENS) << "Removed Screen with id" << screen->m_outputId.as_value()
161
        qCDebug(QTMIR_SCREENS) << "Removed Screen with id" << screen->m_outputId.as_value()
1048
162
                               << "and geometry" << screen->geometry();
162
                               << "and geometry" << screen->geometry();
1049
163
        auto window = static_cast<ScreenWindow *>(screen->window());
163
        auto window = static_cast<ScreenWindow *>(screen->window());
1050
@@ -180,7 +180,7 @@
1051
180
                         buffer.view_area().size.width.as_int(),
180
                         buffer.view_area().size.width.as_int(),
1052
181
                         buffer.view_area().size.height.as_int());
181
                         buffer.view_area().size.height.as_int());
1053
182
182
1055
183
            for (auto screen : m_screenList) {
183
            Q_FOREACH (auto screen, m_screenList) {
1056
184
                if (dbGeom == screen->geometry()) {
184
                if (dbGeom == screen->geometry()) {
1057
185
                    screen->setMirDisplayBuffer(&buffer, &group);
185
                    screen->setMirDisplayBuffer(&buffer, &group);
1058
186
                    break;
186
                    break;
1059
@@ -190,7 +190,7 @@
1060
190
    });
190
    });
1061
191
191
1062
192
    qCDebug(QTMIR_SCREENS) << "=======================================";
192
    qCDebug(QTMIR_SCREENS) << "=======================================";
1064
193
    for (auto screen: m_screenList) {
193
    Q_FOREACH (auto screen, m_screenList) {
1065
194
        qCDebug(QTMIR_SCREENS) << screen << "- id:" << screen->m_outputId.as_value()
194
        qCDebug(QTMIR_SCREENS) << screen << "- id:" << screen->m_outputId.as_value()
1066
195
                               << "geometry:" << screen->geometry()
195
                               << "geometry:" << screen->geometry()
1067
196
                               << "window:" << screen->window()
196
                               << "window:" << screen->window()
1068
@@ -217,7 +217,7 @@
1069
217
217
1070
218
void ScreensModel::allWindowsSetExposed(bool exposed)
218
void ScreensModel::allWindowsSetExposed(bool exposed)
1071
219
{
219
{
1073
220
    for (const auto screen : m_screenList) {
220
    Q_FOREACH (const auto screen, m_screenList) {
1074
221
        const auto window = static_cast<ScreenWindow *>(screen->window());
221
        const auto window = static_cast<ScreenWindow *>(screen->window());
1075
222
        if (window && window->window()) {
222
        if (window && window->window()) {
1076
223
            window->setExposed(exposed);
223
            window->setExposed(exposed);
1077
@@ -240,7 +240,7 @@
1078
240
    return nullptr;
240
    return nullptr;
1079
241
}
241
}
1080
242
242
1082
243
QWindow* ScreensModel::getWindowForPoint(const QPoint &point) //FIXME - not thread safe & not efficient
243
QWindow* ScreensModel::getWindowForPoint(QPoint point) //FIXME - not thread safe & not efficient
1083
244
{
244
{
1084
245
    // This is a part optimization, and a part work-around for AP generated input events occasionally
245
    // This is a part optimization, and a part work-around for AP generated input events occasionally
1085
246
    // appearing outside the screen borders: https://bugs.launchpad.net/qtmir/+bug/1508415
246
    // appearing outside the screen borders: https://bugs.launchpad.net/qtmir/+bug/1508415
1086
@@ -248,7 +248,7 @@
1087
248
        return m_screenList.first()->window()->window();
248
        return m_screenList.first()->window()->window();
1088
249
    }
249
    }
1089
250
250
1091
251
    for (Screen *screen : m_screenList) {
251
    Q_FOREACH (Screen *screen, m_screenList) {
1092
252
        if (screen->window() && screen->geometry().contains(point)) {
252
        if (screen->window() && screen->geometry().contains(point)) {
1093
253
            return screen->window()->window();
253
            return screen->window()->window();
1094
254
        }
254
        }
1095
255
255
1096
=== modified file 'src/platforms/mirserver/screensmodel.h'
1097
--- src/platforms/mirserver/screensmodel.h	2016-04-29 15:41:00 +0000
1098
+++ src/platforms/mirserver/screensmodel.h	2016-06-06 19:34:36 +0000
1099
@@ -62,7 +62,7 @@
1100
62
    QList<Screen*> screens() const { return m_screenList; }
62
    QList<Screen*> screens() const { return m_screenList; }
1101
63
    bool compositing() const { return m_compositing; }
63
    bool compositing() const { return m_compositing; }
1102
64
64
1104
65
    QWindow* getWindowForPoint(const QPoint &point);
65
    QWindow* getWindowForPoint(QPoint point);
1105
66
66
1106
67
Q_SIGNALS:
67
Q_SIGNALS:
1107
68
    void screenAdded(Screen *screen);
68
    void screenAdded(Screen *screen);
1108
69
69
1109
=== modified file 'src/platforms/mirserver/sessionlistener.cpp'
1110
--- src/platforms/mirserver/sessionlistener.cpp	2016-03-10 11:55:28 +0000
1111
+++ src/platforms/mirserver/sessionlistener.cpp	2016-06-06 19:34:36 +0000
1112
@@ -90,7 +90,7 @@
1113
90
    Q_EMIT sessionDestroyingSurface(&session, surface);
90
    Q_EMIT sessionDestroyingSurface(&session, surface);
1114
91
}
91
}
1115
92
92
1117
93
void SessionListener::surfaceAboutToBeCreated(mir::scene::Session& session, qtmir::CreationHints creationHints)
93
void SessionListener::surfaceAboutToBeCreated(mir::scene::Session& session, const qtmir::CreationHints &creationHints)
1118
94
{
94
{
1119
95
    m_creationHintsForNewSurface[&session] = creationHints;
95
    m_creationHintsForNewSurface[&session] = creationHints;
1120
96
}
96
}
1121
97
97
1122
=== modified file 'src/platforms/mirserver/sessionlistener.h'
1123
--- src/platforms/mirserver/sessionlistener.h	2016-03-10 11:55:28 +0000
1124
+++ src/platforms/mirserver/sessionlistener.h	2016-06-06 19:34:36 +0000
1125
@@ -42,7 +42,7 @@
1126
42
    void surface_created(mir::scene::Session&, std::shared_ptr<mir::scene::Surface> const&) override;
42
    void surface_created(mir::scene::Session&, std::shared_ptr<mir::scene::Surface> const&) override;
1127
43
    void destroying_surface(mir::scene::Session&, std::shared_ptr<mir::scene::Surface> const&) override;
43
    void destroying_surface(mir::scene::Session&, std::shared_ptr<mir::scene::Surface> const&) override;
1128
44
44
1130
45
    void surfaceAboutToBeCreated(mir::scene::Session&, qtmir::CreationHints creationHints);
45
    void surfaceAboutToBeCreated(mir::scene::Session&, const qtmir::CreationHints &creationHints);
1131
46
46
1132
47
Q_SIGNALS:
47
Q_SIGNALS:
1133
48
    void sessionStarting(std::shared_ptr<mir::scene::Session> const& session);
48
    void sessionStarting(std::shared_ptr<mir::scene::Session> const& session);
1134
49
49
1135
=== modified file 'src/platforms/mirserver/surfaceobserver.cpp'
1136
--- src/platforms/mirserver/surfaceobserver.cpp	2016-05-05 14:18:30 +0000
1137
+++ src/platforms/mirserver/surfaceobserver.cpp	2016-06-06 19:34:36 +0000
1138
@@ -28,7 +28,7 @@
1139
28
#include <mir/geometry/size.h>
28
#include <mir/geometry/size.h>
1140
29
#include <mir/shell/surface_specification.h>
29
#include <mir/shell/surface_specification.h>
1141
30
30
1143
31
QMap<const mir::scene::Surface*, SurfaceObserver*> SurfaceObserver::m_surfaceToObserverMap;
31
QHash<const mir::scene::Surface*, SurfaceObserver*> SurfaceObserver::m_surfaceToObserverMap;
1144
32
QMutex SurfaceObserver::mutex;
32
QMutex SurfaceObserver::mutex;
1145
33
33
1146
34
SurfaceObserver::SurfaceObserver()
34
SurfaceObserver::SurfaceObserver()
1147
@@ -83,7 +83,7 @@
1148
83
SurfaceObserver::~SurfaceObserver()
83
SurfaceObserver::~SurfaceObserver()
1149
84
{
84
{
1150
85
    QMutexLocker locker(&mutex);
85
    QMutexLocker locker(&mutex);
1152
86
    QMutableMapIterator<const mir::scene::Surface*, SurfaceObserver*> i(m_surfaceToObserverMap);
86
    QMutableHashIterator<const mir::scene::Surface*, SurfaceObserver*> i(m_surfaceToObserverMap);
1153
87
    while (i.hasNext()) {
87
    while (i.hasNext()) {
1154
88
        i.next();
88
        i.next();
1155
89
        if (i.value() == this) {
89
        if (i.value() == this) {
1156
90
90
1157
=== modified file 'src/platforms/mirserver/surfaceobserver.h'
1158
--- src/platforms/mirserver/surfaceobserver.h	2016-05-05 14:17:14 +0000
1159
+++ src/platforms/mirserver/surfaceobserver.h	2016-06-06 19:34:36 +0000
1160
@@ -30,7 +30,7 @@
1161
30
        class Surface;
30
        class Surface;
1162
31
    }
31
    }
1163
32
    namespace shell {
32
    namespace shell {
1165
33
        class SurfaceSpecification;
33
        struct SurfaceSpecification;
1166
34
    }
34
    }
1167
35
}
35
}
1168
36
36
1169
@@ -90,7 +90,7 @@
1170
90
    QObject *m_listener;
90
    QObject *m_listener;
1171
91
    bool m_framesPosted;
91
    bool m_framesPosted;
1172
92
    QMap<QByteArray, Qt::CursorShape> m_cursorNameToShape;
92
    QMap<QByteArray, Qt::CursorShape> m_cursorNameToShape;
1174
93
    static QMap<const mir::scene::Surface*, SurfaceObserver*> m_surfaceToObserverMap;
93
    static QHash<const mir::scene::Surface*, SurfaceObserver*> m_surfaceToObserverMap;
1175
94
};
94
};
1176
95
95
1177
96
#endif
96
#endif
1178
97
97
1179
=== modified file 'tests/framework/CMakeLists.txt'
1180
--- tests/framework/CMakeLists.txt	2016-05-24 20:13:10 +0000
1181
+++ tests/framework/CMakeLists.txt	2016-06-06 19:34:36 +0000
1182
@@ -1,7 +1,11 @@
1183
1
include_directories(
1
include_directories(
1184
2
    ${APPLICATION_API_INCLUDE_DIRS}
1185
3
    ${CMAKE_SOURCE_DIR}/src/platforms/mirserver
2
    ${CMAKE_SOURCE_DIR}/src/platforms/mirserver
1186
4
    ${CMAKE_SOURCE_DIR}/src/modules
3
    ${CMAKE_SOURCE_DIR}/src/modules
1187
4
)
1188
5
1189
6
include_directories(
1190
7
    SYSTEM
1191
8
    ${APPLICATION_API_INCLUDE_DIRS}
1192
5
    ${MIRSERVER_INCLUDE_DIRS}
9
    ${MIRSERVER_INCLUDE_DIRS}
1193
6
    ${MIRRENDERERGLDEV_INCLUDE_DIRS}
10
    ${MIRRENDERERGLDEV_INCLUDE_DIRS}
1194
7
11
1195
8
12
1196
=== modified file 'tests/framework/fake_session.cpp'
1197
--- tests/framework/fake_session.cpp	2016-05-24 20:13:10 +0000
1198
+++ tests/framework/fake_session.cpp	2016-06-06 19:34:36 +0000
1199
@@ -92,14 +92,14 @@
1200
92
92
1201
93
void FakeSession::removeChildSession(SessionInterface *) {}
93
void FakeSession::removeChildSession(SessionInterface *) {}
1202
94
94
1204
95
void FakeSession::foreachChildSession(std::function<void (SessionInterface *)>) const {}
95
void FakeSession::foreachChildSession(const std::function<void (SessionInterface *)> &) const {}
1205
96
96
1206
97
std::shared_ptr<mir::scene::PromptSession> FakeSession::activePromptSession() const
97
std::shared_ptr<mir::scene::PromptSession> FakeSession::activePromptSession() const
1207
98
{
98
{
1208
99
    return std::shared_ptr<mir::scene::PromptSession>();
99
    return std::shared_ptr<mir::scene::PromptSession>();
1209
100
}
100
}
1210
101
101
1212
102
void FakeSession::foreachPromptSession(std::function<void (const std::shared_ptr<mir::scene::PromptSession> &)>) const {}
102
void FakeSession::foreachPromptSession(const std::function<void (const std::shared_ptr<mir::scene::PromptSession> &)> &) const {}
1213
103
103
1214
104
void FakeSession::setFullscreen(bool) {}
104
void FakeSession::setFullscreen(bool) {}
1215
105
105
1216
106
106
1217
=== modified file 'tests/framework/fake_session.h'
1218
--- tests/framework/fake_session.h	2016-05-24 20:13:10 +0000
1219
+++ tests/framework/fake_session.h	2016-06-06 19:34:36 +0000
1220
@@ -63,10 +63,10 @@
1221
63
    void addChildSession(SessionInterface*) override;
63
    void addChildSession(SessionInterface*) override;
1222
64
    void insertChildSession(uint, SessionInterface*) override;
64
    void insertChildSession(uint, SessionInterface*) override;
1223
65
    void removeChildSession(SessionInterface*) override;
65
    void removeChildSession(SessionInterface*) override;
1225
66
    void foreachChildSession(std::function<void(SessionInterface* session)>) const override;
66
    void foreachChildSession(const std::function<void(SessionInterface* session)> &) const override;
1226
67
67
1227
68
    std::shared_ptr<mir::scene::PromptSession> activePromptSession() const override;
68
    std::shared_ptr<mir::scene::PromptSession> activePromptSession() const override;
1229
69
    void foreachPromptSession(std::function<void(const std::shared_ptr<mir::scene::PromptSession>&)>) const override;
69
    void foreachPromptSession(const std::function<void(const std::shared_ptr<mir::scene::PromptSession>&)> &) const override;
1230
70
70
1231
71
    void setFullscreen(bool) override;
71
    void setFullscreen(bool) override;
1232
72
    void setLive(const bool) override;
72
    void setLive(const bool) override;
1233
73
73
1234
=== modified file 'tests/framework/mock_session.h'
1235
--- tests/framework/mock_session.h	2016-03-28 18:02:26 +0000
1236
+++ tests/framework/mock_session.h	2016-06-06 19:34:36 +0000
1237
@@ -57,10 +57,10 @@
1238
57
    MOCK_METHOD1(addChildSession, void(SessionInterface* session));
57
    MOCK_METHOD1(addChildSession, void(SessionInterface* session));
1239
58
    MOCK_METHOD2(insertChildSession, void(uint index, SessionInterface* session));
58
    MOCK_METHOD2(insertChildSession, void(uint index, SessionInterface* session));
1240
59
    MOCK_METHOD1(removeChildSession, void(SessionInterface* session));
59
    MOCK_METHOD1(removeChildSession, void(SessionInterface* session));
1242
60
    MOCK_CONST_METHOD1(foreachChildSession, void(std::function<void(SessionInterface* session)> f));
60
    MOCK_CONST_METHOD1(foreachChildSession, void(const std::function<void(SessionInterface* session)> &f));
1243
61
61
1244
62
    MOCK_CONST_METHOD0(activePromptSession, std::shared_ptr<mir::scene::PromptSession>());
62
    MOCK_CONST_METHOD0(activePromptSession, std::shared_ptr<mir::scene::PromptSession>());
1246
63
    MOCK_CONST_METHOD1(foreachPromptSession, void(std::function<void(const std::shared_ptr<mir::scene::PromptSession>&)> f));
63
    MOCK_CONST_METHOD1(foreachPromptSession, void(const std::function<void(const std::shared_ptr<mir::scene::PromptSession>&)> &f));
1247
64
64
1248
65
    void setState(State state);
65
    void setState(State state);
1249
66
66
1250
67
67
1251
=== modified file 'tests/mirserver/Clipboard/CMakeLists.txt'
1252
--- tests/mirserver/Clipboard/CMakeLists.txt	2014-12-03 08:56:35 +0000
1253
+++ tests/mirserver/Clipboard/CMakeLists.txt	2016-06-06 19:34:36 +0000
1254
@@ -6,6 +6,10 @@
1255
6
6
1256
7
include_directories(
7
include_directories(
1257
8
  ${CMAKE_SOURCE_DIR}/src/platforms/mirserver
8
  ${CMAKE_SOURCE_DIR}/src/platforms/mirserver
1258
9
)
1259
10
1260
11
include_directories(
1261
12
  SYSTEM
1262
9
  ${Qt5Gui_PRIVATE_INCLUDE_DIRS}
13
  ${Qt5Gui_PRIVATE_INCLUDE_DIRS}
1263
10
  ${MIRSERVER_INCLUDE_DIRS}
14
  ${MIRSERVER_INCLUDE_DIRS}
1264
11
)
15
)
1265
12
16
1266
=== modified file 'tests/mirserver/QtEventFeeder/CMakeLists.txt'
1267
--- tests/mirserver/QtEventFeeder/CMakeLists.txt	2014-12-03 08:56:35 +0000
1268
+++ tests/mirserver/QtEventFeeder/CMakeLists.txt	2016-06-06 19:34:36 +0000
1269
@@ -7,6 +7,10 @@
1270
7
include_directories(
7
include_directories(
1271
8
  ${CMAKE_SOURCE_DIR}/src/platforms/mirserver
8
  ${CMAKE_SOURCE_DIR}/src/platforms/mirserver
1272
9
  ${CMAKE_SOURCE_DIR}/src/common
9
  ${CMAKE_SOURCE_DIR}/src/common
1273
10
)
1274
11
1275
12
include_directories(
1276
13
  SYSTEM
1277
10
  ${Qt5Gui_PRIVATE_INCLUDE_DIRS}
14
  ${Qt5Gui_PRIVATE_INCLUDE_DIRS}
1278
11
  ${MIRSERVER_INCLUDE_DIRS}
15
  ${MIRSERVER_INCLUDE_DIRS}
1279
12
)
16
)
1280
13
17
1281
=== modified file 'tests/mirserver/Screen/CMakeLists.txt'
1282
--- tests/mirserver/Screen/CMakeLists.txt	2015-11-11 10:43:36 +0000
1283
+++ tests/mirserver/Screen/CMakeLists.txt	2016-06-06 19:34:36 +0000
1284
@@ -8,6 +8,10 @@
1285
8
  ${CMAKE_SOURCE_DIR}/tests/framework
8
  ${CMAKE_SOURCE_DIR}/tests/framework
1286
9
  ${CMAKE_SOURCE_DIR}/src/platforms/mirserver
9
  ${CMAKE_SOURCE_DIR}/src/platforms/mirserver
1287
10
  ${CMAKE_SOURCE_DIR}/src/common
10
  ${CMAKE_SOURCE_DIR}/src/common
1288
11
)
1289
12
1290
13
include_directories(
1291
14
  SYSTEM
1292
11
  ${Qt5Gui_PRIVATE_INCLUDE_DIRS}
15
  ${Qt5Gui_PRIVATE_INCLUDE_DIRS}
1293
12
  ${MIRSERVER_INCLUDE_DIRS}
16
  ${MIRSERVER_INCLUDE_DIRS}
1294
13
)
17
)
1295
14
18
1296
=== modified file 'tests/mirserver/ScreensModel/CMakeLists.txt'
1297
--- tests/mirserver/ScreensModel/CMakeLists.txt	2016-02-16 11:48:35 +0000
1298
+++ tests/mirserver/ScreensModel/CMakeLists.txt	2016-06-06 19:34:36 +0000
1299
@@ -11,6 +11,10 @@
1300
11
  ${CMAKE_SOURCE_DIR}/tests/framework
11
  ${CMAKE_SOURCE_DIR}/tests/framework
1301
12
  ${CMAKE_SOURCE_DIR}/src/platforms/mirserver
12
  ${CMAKE_SOURCE_DIR}/src/platforms/mirserver
1302
13
  ${CMAKE_SOURCE_DIR}/src/common
13
  ${CMAKE_SOURCE_DIR}/src/common
1303
14
)
1304
15
1305
16
include_directories(
1306
17
  SYSTEM
1307
14
  ${Qt5Gui_PRIVATE_INCLUDE_DIRS}
18
  ${Qt5Gui_PRIVATE_INCLUDE_DIRS}
1308
15
  ${MIRSERVER_INCLUDE_DIRS}
19
  ${MIRSERVER_INCLUDE_DIRS}
1309
16
  ${MIRRENDERERGLDEV_INCLUDE_DIRS}
20
  ${MIRRENDERERGLDEV_INCLUDE_DIRS}
1310
17
21
1311
=== modified file 'tests/mirserver/WindowManager/CMakeLists.txt'
1312
--- tests/mirserver/WindowManager/CMakeLists.txt	2016-03-10 11:55:28 +0000
1313
+++ tests/mirserver/WindowManager/CMakeLists.txt	2016-06-06 19:34:36 +0000
1314
@@ -1,5 +1,9 @@
1315
1
include_directories(
1
include_directories(
1316
2
  ${CMAKE_SOURCE_DIR}/src/platforms/mirserver
2
  ${CMAKE_SOURCE_DIR}/src/platforms/mirserver
1317
3
)
1318
4
1319
5
include_directories(
1320
6
  SYSTEM
1321
3
  ${MIRSERVER_INCLUDE_DIRS}
7
  ${MIRSERVER_INCLUDE_DIRS}
1322
4
)
8
)
1323
5
9
1324
6
10
1325
=== modified file 'tests/modules/Application/CMakeLists.txt'
1326
--- tests/modules/Application/CMakeLists.txt	2015-12-15 10:03:32 +0000
1327
+++ tests/modules/Application/CMakeLists.txt	2016-06-06 19:34:36 +0000
1328
@@ -7,8 +7,11 @@
1329
7
  ${CMAKE_SOURCE_DIR}/src/platforms/mirserver
7
  ${CMAKE_SOURCE_DIR}/src/platforms/mirserver
1330
8
  ${CMAKE_SOURCE_DIR}/src/modules
8
  ${CMAKE_SOURCE_DIR}/src/modules
1331
9
  ${CMAKE_SOURCE_DIR}/tests/framework
9
  ${CMAKE_SOURCE_DIR}/tests/framework
1332
10
)
1333
11
1334
12
include_directories(
1335
13
  SYSTEM
1336
10
  ${MIRSERVER_INCLUDE_DIRS}
14
  ${MIRSERVER_INCLUDE_DIRS}
1337
11
1338
12
  ${Qt5Core_INCLUDE_DIRS}
15
  ${Qt5Core_INCLUDE_DIRS}
1339
13
  ${Qt5GUI_INCLUDE_DIRS}
16
  ${Qt5GUI_INCLUDE_DIRS}
1340
14
  ${Qt5Quick_INCLUDE_DIRS}
17
  ${Qt5Quick_INCLUDE_DIRS}
1341
15
18
1342
=== modified file 'tests/modules/ApplicationManager/CMakeLists.txt'
1343
--- tests/modules/ApplicationManager/CMakeLists.txt	2015-09-30 15:45:17 +0000
1344
+++ tests/modules/ApplicationManager/CMakeLists.txt	2016-06-06 19:34:36 +0000
1345
@@ -5,10 +5,14 @@
1346
5
)
5
)
1347
6
6
1348
7
include_directories(
7
include_directories(
1349
8
  ${APPLICATION_API_INCLUDE_DIRS}
1350
9
  ${CMAKE_SOURCE_DIR}/src/platforms/mirserver
8
  ${CMAKE_SOURCE_DIR}/src/platforms/mirserver
1351
10
  ${CMAKE_SOURCE_DIR}/src/modules
9
  ${CMAKE_SOURCE_DIR}/src/modules
1352
11
  ${CMAKE_SOURCE_DIR}/tests/framework
10
  ${CMAKE_SOURCE_DIR}/tests/framework
1353
11
)
1354
12
1355
13
include_directories(
1356
14
  SYSTEM
1357
15
  ${APPLICATION_API_INCLUDE_DIRS}
1358
12
  ${MIRSERVER_INCLUDE_DIRS}
16
  ${MIRSERVER_INCLUDE_DIRS}
1359
13
)
17
)
1360
14
18
1361
15
19
1362
=== modified file 'tests/modules/SessionManager/CMakeLists.txt'
1363
--- tests/modules/SessionManager/CMakeLists.txt	2015-09-30 15:45:17 +0000
1364
+++ tests/modules/SessionManager/CMakeLists.txt	2016-06-06 19:34:36 +0000
1365
@@ -6,10 +6,14 @@
1366
6
)
6
)
1367
7
7
1368
8
include_directories(
8
include_directories(
1369
9
  ${APPLICATION_API_INCLUDE_DIRS}
1370
10
  ${CMAKE_SOURCE_DIR}/src/platforms/mirserver
9
  ${CMAKE_SOURCE_DIR}/src/platforms/mirserver
1371
11
  ${CMAKE_SOURCE_DIR}/src/modules
10
  ${CMAKE_SOURCE_DIR}/src/modules
1372
12
  ${CMAKE_SOURCE_DIR}/tests/framework
11
  ${CMAKE_SOURCE_DIR}/tests/framework
1373
12
)
1374
13
1375
14
include_directories(
1376
15
  SYSTEM
1377
16
  ${APPLICATION_API_INCLUDE_DIRS}
1378
13
  ${MIRSERVER_INCLUDE_DIRS}
17
  ${MIRSERVER_INCLUDE_DIRS}
1379
14
)
18
)
1380
15
19
1381
16
20
1382
=== modified file 'tests/modules/SharedWakelock/CMakeLists.txt'
1383
--- tests/modules/SharedWakelock/CMakeLists.txt	2015-09-30 15:45:17 +0000
1384
+++ tests/modules/SharedWakelock/CMakeLists.txt	2016-06-06 19:34:36 +0000
1385
@@ -5,6 +5,10 @@
1386
5
5
1387
6
include_directories(
6
include_directories(
1388
7
  ${CMAKE_SOURCE_DIR}/src/modules
7
  ${CMAKE_SOURCE_DIR}/src/modules
1389
8
)
1390
9
1391
10
include_directories(
1392
11
  SYSTEM
1393
8
  ${QTDBUSTEST_INCLUDE_DIRS}
12
  ${QTDBUSTEST_INCLUDE_DIRS}
1394
9
  ${QTDBUSMOCK_INCLUDE_DIRS}
13
  ${QTDBUSMOCK_INCLUDE_DIRS}
1395
10
)
14
)
1396
11
15
1397
=== modified file 'tests/modules/SurfaceManager/CMakeLists.txt'
1398
--- tests/modules/SurfaceManager/CMakeLists.txt	2016-05-24 20:13:10 +0000
1399
+++ tests/modules/SurfaceManager/CMakeLists.txt	2016-06-06 19:34:36 +0000
1400
@@ -9,6 +9,10 @@
1401
9
  ${CMAKE_SOURCE_DIR}/src/modules
9
  ${CMAKE_SOURCE_DIR}/src/modules
1402
10
  ${CMAKE_SOURCE_DIR}/src/platforms/mirserver
10
  ${CMAKE_SOURCE_DIR}/src/platforms/mirserver
1403
11
  ${CMAKE_SOURCE_DIR}/tests/framework
11
  ${CMAKE_SOURCE_DIR}/tests/framework
1404
12
)
1405
13
1406
14
include_directories(
1407
15
  SYSTEM
1408
12
  ${MIRSERVER_INCLUDE_DIRS}
16
  ${MIRSERVER_INCLUDE_DIRS}
1409
13
  ${Qt5Quick_PRIVATE_INCLUDE_DIRS}
17
  ${Qt5Quick_PRIVATE_INCLUDE_DIRS}
1410
14
)
18
)
Status:	Superseded
Proposed branch:	lp:~aacid/qtmir/clazy_run
Merge into:	lp:qtmir
Prerequisite:	lp:~ci-train-bot/qtmir/qtmir-ubuntu-yakkety-landing-025
Diff against target:	1410 lines (+206/-155) 61 files modified CMakeLists.txt (+4/-6) demos/qml-demo-client/CMakeLists.txt (+3/-6) demos/qml-demo-shell/CMakeLists.txt (+3/-6) src/common/debughelpers.cpp (+12/-12) src/modules/Unity/Application/CMakeLists.txt (+6/-2) src/modules/Unity/Application/application.cpp (+5/-5) src/modules/Unity/Application/application.h (+1/-1) src/modules/Unity/Application/application_manager.cpp (+9/-9) src/modules/Unity/Application/application_manager.h (+1/-1) src/modules/Unity/Application/dbuswindowstack.cpp (+4/-3) src/modules/Unity/Application/mirbuffersgtexture.cpp (+1/-1) src/modules/Unity/Application/mirbuffersgtexture.h (+1/-1) src/modules/Unity/Application/mirsurface.cpp (+1/-1) src/modules/Unity/Application/mirsurfaceitem.cpp (+6/-6) src/modules/Unity/Application/mirsurfaceitem.h (+1/-1) src/modules/Unity/Application/mirsurfacemanager.cpp (+2/-2) src/modules/Unity/Application/mirsurfacemanager.h (+1/-1) src/modules/Unity/Application/proc_info.cpp (+1/-1) src/modules/Unity/Application/session.cpp (+8/-8) src/modules/Unity/Application/session.h (+3/-3) src/modules/Unity/Application/session_interface.h (+2/-2) src/modules/Unity/Application/sessionmanager.cpp (+1/-1) src/modules/Unity/Application/sharedwakelock.cpp (+4/-4) src/modules/Unity/Application/ubuntukeyboardinfo.cpp (+1/-1) src/modules/Unity/Application/upstart/taskcontroller.cpp (+1/-1) src/modules/Unity/Screens/CMakeLists.txt (+4/-0) src/modules/Unity/Screens/qquickscreenwindow.cpp (+1/-1) src/platforms/mirserver/CMakeLists.txt (+4/-0) src/platforms/mirserver/clipboard.cpp (+3/-2) src/platforms/mirserver/creationhints.cpp (+1/-1) src/platforms/mirserver/creationhints.h (+1/-1) src/platforms/mirserver/cursor.cpp (+25/-25) src/platforms/mirserver/cursor.h (+1/-0) src/platforms/mirserver/mircursorimages.cpp (+1/-1) src/platforms/mirserver/nativeinterface.cpp (+2/-2) src/platforms/mirserver/nativeinterface.h (+2/-1) src/platforms/mirserver/plugin.cpp (+1/-1) src/platforms/mirserver/qteventfeeder.cpp (+1/-1) src/platforms/mirserver/screen.cpp (+7/-7) src/platforms/mirserver/screenscontroller.cpp (+2/-2) src/platforms/mirserver/screenscontroller.h (+1/-1) src/platforms/mirserver/screensmodel.cpp (+7/-7) src/platforms/mirserver/screensmodel.h (+1/-1) src/platforms/mirserver/sessionlistener.cpp (+1/-1) src/platforms/mirserver/sessionlistener.h (+1/-1) src/platforms/mirserver/surfaceobserver.cpp (+2/-2) src/platforms/mirserver/surfaceobserver.h (+2/-2) tests/framework/CMakeLists.txt (+5/-1) tests/framework/fake_session.cpp (+2/-2) tests/framework/fake_session.h (+2/-2) tests/framework/mock_session.h (+2/-2) tests/mirserver/Clipboard/CMakeLists.txt (+4/-0) tests/mirserver/QtEventFeeder/CMakeLists.txt (+4/-0) tests/mirserver/Screen/CMakeLists.txt (+4/-0) tests/mirserver/ScreensModel/CMakeLists.txt (+4/-0) tests/mirserver/WindowManager/CMakeLists.txt (+4/-0) tests/modules/Application/CMakeLists.txt (+4/-1) tests/modules/ApplicationManager/CMakeLists.txt (+5/-1) tests/modules/SessionManager/CMakeLists.txt (+5/-1) tests/modules/SharedWakelock/CMakeLists.txt (+4/-0) tests/modules/SurfaceManager/CMakeLists.txt (+4/-0)
To merge this branch:	bzr merge lp:~aacid/qtmir/clazy_run
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Unity8 CI Bot (community)	continuous-integration	2016-06-06	Needs Fixing on 2016-06-07
PS Jenkins bot	continuous-integration	2016-06-06	Pending
Mir development team		2016-06-06	Pending
Review via email: mp+296596@code.launchpad.net