unity-mir

Merge lp:~gerboland/unity-mir/namespace-to-prevent-collision into lp:unity-mir

  1. namespace-to-prevent-collision
  2. Merge into trunk
Proposed by Gerry Boland
Status: Merged
Approved by: Gerry Boland
Approved revision: 188
Merged at revision: 185
Proposed branch: lp:~gerboland/unity-mir/namespace-to-prevent-collision
Merge into: lp:unity-mir
Prerequisite: lp:~andreas-pokorny/unity-mir/fix-1240400
Diff against target: 1061 lines (+229/-70)
40 files modified
src/modules/Unity/Application/application.cpp (+5/-0)
src/modules/Unity/Application/application.h (+8/-2)
src/modules/Unity/Application/application_manager.cpp (+5/-0)
src/modules/Unity/Application/application_manager.h (+18/-13)
src/modules/Unity/Application/applicationcontroller.h (+5/-0)
src/modules/Unity/Application/applicationscreenshotprovider.cpp (+5/-0)
src/modules/Unity/Application/applicationscreenshotprovider.h (+5/-0)
src/modules/Unity/Application/dbuswindowstack.cpp (+5/-0)
src/modules/Unity/Application/dbuswindowstack.h (+9/-4)
src/modules/Unity/Application/desktopfilereader.cpp (+5/-0)
src/modules/Unity/Application/desktopfilereader.h (+5/-0)
src/modules/Unity/Application/inputarea.cpp (+5/-0)
src/modules/Unity/Application/inputarea.h (+8/-2)
src/modules/Unity/Application/inputfilterarea.cpp (+5/-0)
src/modules/Unity/Application/inputfilterarea.h (+4/-0)
src/modules/Unity/Application/mirsurface.cpp (+4/-0)
src/modules/Unity/Application/mirsurface.h (+6/-1)
src/modules/Unity/Application/mirsurfacemanager.cpp (+5/-0)
src/modules/Unity/Application/mirsurfacemanager.h (+6/-1)
src/modules/Unity/Application/plugin.cpp (+15/-13)
src/modules/Unity/Application/proc_info.cpp (+4/-0)
src/modules/Unity/Application/proc_info.h (+5/-1)
src/modules/Unity/Application/processcontroller.cpp (+5/-0)
src/modules/Unity/Application/processcontroller.h (+5/-0)
src/modules/Unity/Application/shellinputarea.cpp (+5/-0)
src/modules/Unity/Application/shellinputarea.h (+4/-0)
src/modules/Unity/Application/taskcontroller.cpp (+4/-1)
src/modules/Unity/Application/taskcontroller.h (+5/-0)
src/modules/Unity/Application/ubuntukeyboardinfo.cpp (+5/-0)
src/modules/Unity/Application/ubuntukeyboardinfo.h (+5/-0)
src/modules/Unity/Application/upstart/applicationcontroller.cpp (+24/-16)
src/modules/Unity/Application/upstart/applicationcontroller.h (+7/-2)
tests/application_manager_test.cpp (+1/-0)
tests/auto/modules/Unity/Application/main.cpp (+2/-0)
tests/mock_application_controller.h (+1/-1)
tests/mock_desktop_file_reader.h (+7/-7)
tests/mock_oom_controller.h (+1/-1)
tests/mock_proc_info.h (+1/-1)
tests/mock_process_controller.h (+4/-4)
tests/taskcontroller_test.cpp (+1/-0)
To merge this branch: bzr merge lp:~gerboland/unity-mir/namespace-to-prevent-collision
Reviewer Review Type Date Requested Status
Alberto Aguirre (community) Approve
PS Jenkins bot (community) continuous-integration Approve
Alexandros Frantzis Pending
Review via email: mp+208645@code.launchpad.net

This proposal supersedes a proposal from 2014-02-26.

Commit message

Wrap classes of the QML plugin in a unitymir namespace, prevents symbol collision with Mir

Description of the change

Wrap classes of the QML plugin in a unitymir namespace, prevents symbol collision with Mir

• Are there any related MPs required for this MP to build/function as expected?
No
• Did you perform an exploratory manual test run of your code change and any related functionality?
Yes
• If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
Unnecessary

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote : Posted in a previous version of this proposal

PASSED: Continuous integration, rev:182
http://jenkins.qa.ubuntu.com/job/unity-mir-ci/266/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-amd64-ci/129
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-armhf-ci/130
        deb: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-armhf-ci/130/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-i386-ci/129

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-mir-ci/266/rebuild

review: Approve (continuous-integration)
Revision history for this message
Alexandros Frantzis (afrantzis) wrote : Posted in a previous version of this proposal

Great! Confirmed this MP fixes bug #1282248 in the emulator, too.

review: Approve
Revision history for this message
Alberto Aguirre (albaguirre) wrote : Posted in a previous version of this proposal

Looks like this needs a pre-requisite branch: lp:~albaguirre/unity-mir/add-cross-compile-scripts

Revision history for this message
Alberto Aguirre (albaguirre) wrote : Posted in a previous version of this proposal

Actually looks like the MP needs pre-req: lp:~andreas-pokorny/unity-mir/fix-1240400

But namespace changes look good.

review: Approve
Revision history for this message
Gerry Boland (gerboland) wrote : Posted in a previous version of this proposal

> Actually looks like the MP needs pre-req: lp:~andreas-pokorny/unity-
> mir/fix-1240400
Forgot to specify that, correcting now.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:182
http://jenkins.qa.ubuntu.com/job/unity-mir-ci/267/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-amd64-ci/130
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-armhf-ci/131
        deb: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-armhf-ci/131/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-i386-ci/130

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-mir-ci/267/rebuild

review: Approve (continuous-integration)
Revision history for this message
Alberto Aguirre (albaguirre) wrote :

Can you rebase this branch cleanly on lp:~andreas-pokorny/unity-mir/fix-1240400 since it was overwritten? I see some remnants of old branches in the diff below.

bzr branch lp:~andreas-pokorny/unity-mir/fix-1240400 namespace-to-prevent-collision-rebased
cd namespace-to-prevent-collision-rebased
bzr merge lp:~gerboland/unity-mir/namespace-to-prevent-collision -r 181..182
bzr commit -m "Wrap classes of the QML plugin in a unitymir namespace, prevents symbol collision with Mir"
bzr push lp:~gerboland/unity-mir/namespace-to-prevent-collision --overwrite

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:183
http://jenkins.qa.ubuntu.com/job/unity-mir-ci/269/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-amd64-ci/132/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-armhf-ci/133/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-i386-ci/132/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-mir-ci/269/rebuild

review: Needs Fixing (continuous-integration)
lp:~gerboland/unity-mir/namespace-to-prevent-collision updated
187. By Gerry Boland

Wrap classes of the QML plugin in a unitymir namespace, prevents symbol collision with Mir

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:187
http://jenkins.qa.ubuntu.com/job/unity-mir-ci/271/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-amd64-ci/134/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-armhf-ci/135/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-i386-ci/134/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-mir-ci/271/rebuild

review: Needs Fixing (continuous-integration)
lp:~gerboland/unity-mir/namespace-to-prevent-collision updated
188. By Gerry Boland

Merge fix from fix-1240400

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:188
http://jenkins.qa.ubuntu.com/job/unity-mir-ci/272/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-amd64-ci/135
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-armhf-ci/136
        deb: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-armhf-ci/136/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-i386-ci/135

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-mir-ci/272/rebuild

review: Approve (continuous-integration)
Revision history for this message
Alberto Aguirre (albaguirre) wrote :

 * Did you perform an exploratory manual test run of the code change and any related functionality?
Yes
 * Did CI run pass? If not, please explain why.
Yes

review: Approve
lp:~gerboland/unity-mir/namespace-to-prevent-collision updated
189. By Gerry Boland

missing namespace qualifier in Q_PROPERTY

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/modules/Unity/Application/application.cpp'
2--- src/modules/Unity/Application/application.cpp 2014-03-07 17:23:00 +0000
3+++ src/modules/Unity/Application/application.cpp 2014-03-07 17:23:00 +0000
4@@ -27,6 +27,9 @@
5 #include <mir/shell/session.h>
6 #include <mir/shell/snapshot.h>
7
8+namespace unitymir
9+{
10+
11 Application::Application(const QSharedPointer<TaskController>& taskController,
12 DesktopFileReader *desktopFileReader,
13 State state,
14@@ -259,3 +262,5 @@
15 DLOG("Application::respawn (this=%p)", this);
16 m_taskController->start(appId(), m_arguments);
17 }
18+
19+} // namespace unitymir
20
21=== modified file 'src/modules/Unity/Application/application.h'
22--- src/modules/Unity/Application/application.h 2014-02-19 12:52:08 +0000
23+++ src/modules/Unity/Application/application.h 2014-03-07 17:23:00 +0000
24@@ -29,9 +29,13 @@
25 #include <unity/shell/application/ApplicationInfoInterface.h>
26
27 class QImage;
28+namespace mir { namespace shell { class Session; }}
29+
30+namespace unitymir
31+{
32+
33 class DesktopFileReader;
34 class TaskController;
35-namespace mir { namespace shell { class Session; }}
36
37 class Application : public unity::shell::application::ApplicationInfoInterface {
38 Q_OBJECT
39@@ -106,6 +110,8 @@
40 friend class MirSurfaceManager;
41 };
42
43-Q_DECLARE_METATYPE(Application*)
44+} // namespace unity-mir
45+
46+Q_DECLARE_METATYPE(unitymir::Application*)
47
48 #endif // APPLICATION_H
49
50=== modified file 'src/modules/Unity/Application/application_manager.cpp'
51--- src/modules/Unity/Application/application_manager.cpp 2014-03-07 17:23:00 +0000
52+++ src/modules/Unity/Application/application_manager.cpp 2014-03-07 17:23:00 +0000
53@@ -52,6 +52,9 @@
54
55 using namespace unity::shell::application;
56
57+namespace unitymir
58+{
59+
60 namespace
61 {
62
63@@ -878,3 +881,5 @@
64 }
65 return false;
66 }
67+
68+} // namespace unitymir
69
70=== modified file 'src/modules/Unity/Application/application_manager.h'
71--- src/modules/Unity/Application/application_manager.h 2014-03-07 17:23:00 +0000
72+++ src/modules/Unity/Application/application_manager.h 2014-03-07 17:23:00 +0000
73@@ -34,12 +34,6 @@
74 // local
75 #include "application.h"
76
77-class ShellServerConfiguration;
78-class DBusWindowStack;
79-class MirSurfaceManager;
80-class TaskController;
81-class ProcInfo;
82-
83 namespace mir {
84 namespace geometry {
85 class Size;
86@@ -51,6 +45,15 @@
87 }
88 }
89
90+class ShellServerConfiguration;
91+
92+namespace unitymir
93+{
94+class DBusWindowStack;
95+class MirSurfaceManager;
96+class TaskController;
97+class ProcInfo;
98+
99 class ApplicationManager : public unity::shell::application::ApplicationManagerInterface
100 {
101 Q_OBJECT
102@@ -81,23 +84,23 @@
103
104 // ApplicationManagerInterface
105 QString focusedApplicationId() const override;
106- Q_INVOKABLE Application* get(int index) const override;
107- Q_INVOKABLE Application* findApplication(const QString &appId) const override;
108+ Q_INVOKABLE unitymir::Application* get(int index) const override;
109+ Q_INVOKABLE unitymir::Application* findApplication(const QString &appId) const override;
110 Q_INVOKABLE bool focusApplication(const QString &appId) override;
111 Q_INVOKABLE void unfocusCurrentApplication() override;
112- Q_INVOKABLE Application* startApplication(const QString &appId, const QStringList &arguments) override;
113+ Q_INVOKABLE unitymir::Application* startApplication(const QString &appId, const QStringList &arguments) override;
114 Q_INVOKABLE bool stopApplication(const QString &appId) override;
115
116 // QAbstractListModel
117 int rowCount(const QModelIndex & parent = QModelIndex()) const override;
118 QVariant data(const QModelIndex & index, int role = Qt::DisplayRole) const override;
119
120- Q_INVOKABLE Application *startApplication(const QString &appId, ExecFlags flags,
121- const QStringList &arguments = QStringList());
122+ Q_INVOKABLE unitymir::Application *startApplication(const QString &appId, ExecFlags flags,
123+ const QStringList &arguments = QStringList());
124 Q_INVOKABLE void move(int from, int to);
125
126 const QList<Application*> &list() const { return m_applications; }
127- Application* findApplicationWithPid(const qint64 pid);
128+ unitymir::Application* findApplicationWithPid(const qint64 pid);
129
130 // Internal helpers
131 void suspendApplication(Application *application);
132@@ -157,6 +160,8 @@
133 friend class MirSurfaceManager;
134 };
135
136-Q_DECLARE_METATYPE(ApplicationManager*)
137+} // namespace unitymir
138+
139+Q_DECLARE_METATYPE(unitymir::ApplicationManager*)
140
141 #endif // APPLICATIONMANAGER_H
142
143=== modified file 'src/modules/Unity/Application/applicationcontroller.h'
144--- src/modules/Unity/Application/applicationcontroller.h 2014-01-27 11:29:44 +0000
145+++ src/modules/Unity/Application/applicationcontroller.h 2014-03-07 17:23:00 +0000
146@@ -22,6 +22,9 @@
147 #include <QString>
148 #include <QStringList>
149
150+namespace unitymir
151+{
152+
153 class ApplicationController : public QObject
154 {
155 Q_OBJECT
156@@ -57,4 +60,6 @@
157 ApplicationController() = default;
158 };
159
160+} // namespace unitymir
161+
162 #endif // APPLICATION_CONTROLLER_H
163
164=== modified file 'src/modules/Unity/Application/applicationscreenshotprovider.cpp'
165--- src/modules/Unity/Application/applicationscreenshotprovider.cpp 2013-12-20 03:38:43 +0000
166+++ src/modules/Unity/Application/applicationscreenshotprovider.cpp 2014-03-07 17:23:00 +0000
167@@ -25,6 +25,9 @@
168 // mir
169 #include "mirserver/mir/shell/session.h"
170
171+namespace unitymir
172+{
173+
174 ApplicationScreenshotProvider::ApplicationScreenshotProvider(ApplicationManager *appManager)
175 : QQuickImageProvider(QQuickImageProvider::Image)
176 , m_appManager(appManager)
177@@ -92,3 +95,5 @@
178 mutex.unlock();
179 return image;
180 }
181+
182+} // namespace unitymir
183
184=== modified file 'src/modules/Unity/Application/applicationscreenshotprovider.h'
185--- src/modules/Unity/Application/applicationscreenshotprovider.h 2013-08-14 14:24:17 +0000
186+++ src/modules/Unity/Application/applicationscreenshotprovider.h 2014-03-07 17:23:00 +0000
187@@ -19,7 +19,10 @@
188
189 #include <QQuickImageProvider>
190
191+namespace unitymir
192+{
193 class ApplicationManager;
194+
195 class ApplicationScreenshotProvider : public QQuickImageProvider
196 {
197 public:
198@@ -33,4 +36,6 @@
199 int m_panelHeight;
200 };
201
202+} // namespace unitymir
203+
204 #endif // APPLICATIONSCREENSHOTPROVIDER_H
205
206=== modified file 'src/modules/Unity/Application/dbuswindowstack.cpp'
207--- src/modules/Unity/Application/dbuswindowstack.cpp 2013-10-09 09:02:23 +0000
208+++ src/modules/Unity/Application/dbuswindowstack.cpp 2014-03-07 17:23:00 +0000
209@@ -22,6 +22,9 @@
210 #include <QDBusConnection>
211 #include <QDBusMetaType>
212
213+namespace unitymir
214+{
215+
216 DBusWindowStack::DBusWindowStack(ApplicationManager *parent) : QObject(parent)
217 {
218 qRegisterMetaType<AppIdDesktopFile>();
219@@ -110,3 +113,5 @@
220
221 return a;
222 }
223+
224+} // namespace unitymir
225
226=== modified file 'src/modules/Unity/Application/dbuswindowstack.h'
227--- src/modules/Unity/Application/dbuswindowstack.h 2014-01-09 08:40:51 +0000
228+++ src/modules/Unity/Application/dbuswindowstack.h 2014-03-07 17:23:00 +0000
229@@ -20,6 +20,9 @@
230 #include <QObject>
231 #include <QDBusArgument>
232
233+namespace unitymir
234+{
235+
236 class ApplicationManager;
237
238 class AppIdDesktopFile
239@@ -52,8 +55,8 @@
240 explicit DBusWindowStack(ApplicationManager* parent);
241 ~DBusWindowStack();
242
243- Q_INVOKABLE Q_SCRIPTABLE AppIdDesktopFile GetAppIdFromPid(unsigned int pid);
244- Q_INVOKABLE Q_SCRIPTABLE QList<WindowInfo> GetWindowStack();
245+ Q_INVOKABLE Q_SCRIPTABLE unitymir::AppIdDesktopFile GetAppIdFromPid(unsigned int pid);
246+ Q_INVOKABLE Q_SCRIPTABLE QList<unitymir::WindowInfo> GetWindowStack();
247 Q_INVOKABLE Q_SCRIPTABLE QStringList GetWindowProperties(unsigned int window_id, const QString &app_id, const QStringList &names);
248
249 signals:
250@@ -62,7 +65,9 @@
251 void WindowDestroyed(unsigned int window_id, const QString &app_id);
252 };
253
254-Q_DECLARE_METATYPE(AppIdDesktopFile)
255-Q_DECLARE_METATYPE(WindowInfo)
256+} // namespace unitymir
257+
258+Q_DECLARE_METATYPE(unitymir::AppIdDesktopFile)
259+Q_DECLARE_METATYPE(unitymir::WindowInfo)
260
261 #endif // DBUSWINDOWSTACK_H
262
263=== modified file 'src/modules/Unity/Application/desktopfilereader.cpp'
264--- src/modules/Unity/Application/desktopfilereader.cpp 2014-01-13 11:13:40 +0000
265+++ src/modules/Unity/Application/desktopfilereader.cpp 2014-03-07 17:23:00 +0000
266@@ -25,6 +25,9 @@
267 #include <QDir>
268 #include <QStandardPaths>
269
270+namespace unitymir
271+{
272+
273 DesktopFileReader::Factory::Factory()
274 {
275 }
276@@ -187,3 +190,5 @@
277 return false;
278 }
279 }
280+
281+} // namespace unitymir
282
283=== modified file 'src/modules/Unity/Application/desktopfilereader.h'
284--- src/modules/Unity/Application/desktopfilereader.h 2014-01-13 11:13:40 +0000
285+++ src/modules/Unity/Application/desktopfilereader.h 2014-03-07 17:23:00 +0000
286@@ -21,6 +21,9 @@
287 #include <QVector>
288 #include <QFileInfo>
289
290+namespace unitymir
291+{
292+
293 class DesktopFileReader {
294 public:
295 class Factory
296@@ -72,4 +75,6 @@
297 bool loaded_;
298 };
299
300+} // namespace unitymir
301+
302 #endif // DESKTOPFILEREADER_H
303
304=== modified file 'src/modules/Unity/Application/inputarea.cpp'
305--- src/modules/Unity/Application/inputarea.cpp 2013-11-26 08:56:08 +0000
306+++ src/modules/Unity/Application/inputarea.cpp 2014-03-07 17:23:00 +0000
307@@ -31,6 +31,9 @@
308 #include "surfacefactory.h"
309 #include "logging.h"
310
311+namespace unitymir
312+{
313+
314 InputArea::InputArea(QQuickItem *parent)
315 : QQuickItem(parent)
316 , m_enabled(true)
317@@ -187,3 +190,5 @@
318 m_surface->installInputArea(this);
319 }
320 }
321+
322+} // namespace unitymir
323
324=== modified file 'src/modules/Unity/Application/inputarea.h'
325--- src/modules/Unity/Application/inputarea.h 2013-11-26 08:56:08 +0000
326+++ src/modules/Unity/Application/inputarea.h 2014-03-07 17:23:00 +0000
327@@ -25,13 +25,17 @@
328 // mir
329 #include <mircommon/mir/geometry/rectangle.h>
330
331+namespace mir { namespace shell { class Surface; }}
332+
333+namespace unitymir
334+{
335 class MirSurface;
336-namespace mir { namespace shell { class Surface; }}
337+
338 class InputArea : public QQuickItem
339 {
340 Q_OBJECT
341 Q_PROPERTY(bool enabled READ enabled WRITE setEnabled NOTIFY enabledChanged)
342- Q_PROPERTY(MirSurface* surface READ surface WRITE setSurface NOTIFY surfaceChanged)
343+ Q_PROPERTY(unitymir::MirSurface* surface READ surface WRITE setSurface NOTIFY surfaceChanged)
344
345 public:
346 explicit InputArea(QQuickItem *parent = 0);
347@@ -70,4 +74,6 @@
348 friend class MirSurface;
349 };
350
351+} // namespace unitymir
352+
353 #endif // INPUTAREA_H
354
355=== modified file 'src/modules/Unity/Application/inputfilterarea.cpp'
356--- src/modules/Unity/Application/inputfilterarea.cpp 2013-08-29 14:46:43 +0000
357+++ src/modules/Unity/Application/inputfilterarea.cpp 2014-03-07 17:23:00 +0000
358@@ -23,6 +23,9 @@
359 // Qt
360 #include <QDebug>
361
362+namespace unitymir
363+{
364+
365 InputFilterArea::InputFilterArea(QQuickItem *parent) : InputArea(parent)
366 {
367 auto surface = MirSurfaceManager::singleton()->shellSurface();
368@@ -56,3 +59,5 @@
369 {
370 setEnabled(enable);
371 }
372+
373+} // namespace unitymir
374
375=== modified file 'src/modules/Unity/Application/inputfilterarea.h'
376--- src/modules/Unity/Application/inputfilterarea.h 2013-08-29 14:46:43 +0000
377+++ src/modules/Unity/Application/inputfilterarea.h 2014-03-07 17:23:00 +0000
378@@ -19,6 +19,8 @@
379
380 #include "inputarea.h"
381
382+namespace unitymir
383+{
384 class MirSurface;
385
386 /*
387@@ -50,4 +52,6 @@
388 void setShellSurface(MirSurface *surface);
389 };
390
391+} // namespace unitymir
392+
393 #endif // INPUTFILTERAREA_H
394
395=== modified file 'src/modules/Unity/Application/mirsurface.cpp'
396--- src/modules/Unity/Application/mirsurface.cpp 2013-12-20 04:48:14 +0000
397+++ src/modules/Unity/Application/mirsurface.cpp 2014-03-07 17:23:00 +0000
398@@ -27,6 +27,9 @@
399
400 namespace mg = mir::geometry;
401
402+namespace unitymir
403+{
404+
405 MirSurface::MirSurface(std::shared_ptr<mir::shell::Surface> surface, Application* application, QQuickItem *parent)
406 : QQuickItem(parent)
407 , m_surface(surface)
408@@ -223,3 +226,4 @@
409 }
410 }
411
412+} // namespace unitymir
413
414=== modified file 'src/modules/Unity/Application/mirsurface.h'
415--- src/modules/Unity/Application/mirsurface.h 2013-09-06 05:34:01 +0000
416+++ src/modules/Unity/Application/mirsurface.h 2014-03-07 17:23:00 +0000
417@@ -26,6 +26,9 @@
418 #include <mir_toolkit/common.h>
419
420 namespace mir { namespace geometry { struct Rectangle; }}
421+
422+namespace unitymir
423+{
424 class MirSurfaceManager;
425 class InputArea;
426 class Application;
427@@ -127,6 +130,8 @@
428 friend class InputArea;
429 };
430
431-Q_DECLARE_METATYPE(MirSurface*)
432+} // namespace unitymir
433+
434+Q_DECLARE_METATYPE(unitymir::MirSurface*)
435
436 #endif // MIRSURFACE_H
437
438=== modified file 'src/modules/Unity/Application/mirsurfacemanager.cpp'
439--- src/modules/Unity/Application/mirsurfacemanager.cpp 2013-12-20 03:38:43 +0000
440+++ src/modules/Unity/Application/mirsurfacemanager.cpp 2014-03-07 17:23:00 +0000
441@@ -36,6 +36,9 @@
442
443 namespace msh = mir::shell;
444
445+namespace unitymir
446+{
447+
448 MirSurfaceManager *MirSurfaceManager::the_surface_manager = nullptr;
449
450 MirSurfaceManager* MirSurfaceManager::singleton()
451@@ -161,3 +164,5 @@
452 }
453 }
454 }
455+
456+} // namespace unitymir
457
458=== modified file 'src/modules/Unity/Application/mirsurfacemanager.h'
459--- src/modules/Unity/Application/mirsurfacemanager.h 2013-11-15 17:40:27 +0000
460+++ src/modules/Unity/Application/mirsurfacemanager.h 2014-03-07 17:23:00 +0000
461@@ -29,8 +29,11 @@
462 // local
463 #include "mirsurface.h"
464
465+namespace mir { namespace shell { class Surface; class Session; }}
466 class ShellServerConfiguration;
467-namespace mir { namespace shell { class Surface; class Session; }}
468+
469+namespace unitymir
470+{
471
472 class MirSurfaceManager : public QObject
473 {
474@@ -67,4 +70,6 @@
475 static MirSurfaceManager *the_surface_manager;
476 };
477
478+} // namespace unitymir
479+
480 #endif // MIR_SURFACE_MANAGER_H
481
482=== modified file 'src/modules/Unity/Application/plugin.cpp'
483--- src/modules/Unity/Application/plugin.cpp 2013-11-19 16:42:52 +0000
484+++ src/modules/Unity/Application/plugin.cpp 2014-03-07 17:23:00 +0000
485@@ -36,14 +36,14 @@
486 Q_UNUSED(scriptEngine);
487 DLOG("applicationManagerSingleton (engine=%p, scriptEngine=%p)", engine, scriptEngine);
488
489- return ApplicationManager::singleton();
490+ return unitymir::ApplicationManager::singleton();
491 }
492
493 static QObject* surfaceManagerSingleton(QQmlEngine* engine, QJSEngine* scriptEngine) {
494 Q_UNUSED(engine);
495 Q_UNUSED(scriptEngine);
496 DLOG("surfaceManagerSingleton (engine=%p, scriptEngine=%p)", engine, scriptEngine);
497- return MirSurfaceManager::singleton();
498+ return unitymir::MirSurfaceManager::singleton();
499 }
500
501 class UnityApplicationPlugin : public QQmlExtensionPlugin {
502@@ -55,32 +55,34 @@
503 DLOG("UnityApplicationPlugin::registerTypes (this=%p, uri='%s')", this, uri);
504 ASSERT(QLatin1String(uri) == QLatin1String("Unity.Application"));
505
506- qRegisterMetaType<ApplicationManager*>("ApplicationManager*"); //need for queueing signals
507+ qRegisterMetaType<unitymir::ApplicationManager*>("ApplicationManager*"); //need for queueing signals
508
509 qmlRegisterUncreatableType<unity::shell::application::ApplicationManagerInterface>(
510 uri, 0, 1, "ApplicationManagerInterface", "Abstract interface. Cannot be created in QML");
511- qmlRegisterSingletonType<ApplicationManager>(
512+ qmlRegisterSingletonType<unitymir::ApplicationManager>(
513 uri, 0, 1, "ApplicationManager", applicationManagerSingleton);
514 qmlRegisterUncreatableType<unity::shell::application::ApplicationInfoInterface>(
515 uri, 0, 1, "ApplicationInfoInterface", "Abstract interface. Cannot be created in QML");
516- qmlRegisterUncreatableType<Application>(
517+ qmlRegisterUncreatableType<unitymir::Application>(
518 uri, 0, 1, "ApplicationInfo", "ApplicationInfo can't be instantiated");
519- qmlRegisterSingletonType<MirSurfaceManager>(
520+ qmlRegisterSingletonType<unitymir::MirSurfaceManager>(
521 uri, 0, 1, "SurfaceManager", surfaceManagerSingleton);
522- qmlRegisterUncreatableType<MirSurface>(
523+ qmlRegisterUncreatableType<unitymir::MirSurface>(
524 uri, 0, 1, "MirSurface", "MirSurface can't be instantiated");
525- qmlRegisterType<InputArea>(uri, 0, 1, "InputArea");
526- qmlRegisterType<ShellInputArea>(uri, 0, 1, "ShellInputArea");
527- qmlRegisterType<InputFilterArea>(uri, 0, 1, "InputFilterArea");
528- qmlRegisterType<UbuntuKeyboardInfo>(uri, 0, 1, "UbuntuKeyboardInfo");
529+ qmlRegisterType<unitymir::InputArea>(uri, 0, 1, "InputArea");
530+ qmlRegisterType<unitymir::ShellInputArea>(uri, 0, 1, "ShellInputArea");
531+ qmlRegisterType<unitymir::InputFilterArea>(uri, 0, 1, "InputFilterArea");
532+ qmlRegisterType<unitymir::UbuntuKeyboardInfo>(uri, 0, 1, "UbuntuKeyboardInfo");
533 }
534
535 virtual void initializeEngine(QQmlEngine *engine, const char *uri)
536 {
537 QQmlExtensionPlugin::initializeEngine(engine, uri);
538
539- ApplicationManager* appManager = static_cast<ApplicationManager*>(applicationManagerSingleton(engine, NULL));
540- engine->addImageProvider(QLatin1String("screenshot"), new ApplicationScreenshotProvider(appManager));
541+ unitymir::ApplicationManager* appManager =
542+ static_cast<unitymir::ApplicationManager*>(applicationManagerSingleton(engine, NULL));
543+ engine->addImageProvider(QLatin1String("screenshot"),
544+ new unitymir::ApplicationScreenshotProvider(appManager));
545 }
546 };
547
548
549=== modified file 'src/modules/Unity/Application/proc_info.cpp'
550--- src/modules/Unity/Application/proc_info.cpp 2014-03-07 17:23:00 +0000
551+++ src/modules/Unity/Application/proc_info.cpp 2014-03-07 17:23:00 +0000
552@@ -19,6 +19,9 @@
553 #include <QFile>
554 #include <QRegularExpression>
555
556+namespace unitymir
557+{
558+
559 ProcInfo::~ProcInfo() {
560 }
561
562@@ -50,3 +53,4 @@
563 return boost::optional<QString>{regExpMatch.captured(1)};
564 }
565
566+} // namespace unitymir
567
568=== modified file 'src/modules/Unity/Application/proc_info.h'
569--- src/modules/Unity/Application/proc_info.h 2014-03-07 17:23:00 +0000
570+++ src/modules/Unity/Application/proc_info.h 2014-03-07 17:23:00 +0000
571@@ -28,6 +28,9 @@
572
573 class QString;
574
575+namespace unitymir
576+{
577+
578 class ProcInfo
579 {
580 public:
581@@ -44,5 +47,6 @@
582 virtual ~ProcInfo();
583 };
584
585+} // namespace unitymir
586+
587 #endif
588-
589
590=== modified file 'src/modules/Unity/Application/processcontroller.cpp'
591--- src/modules/Unity/Application/processcontroller.cpp 2014-01-29 09:14:01 +0000
592+++ src/modules/Unity/Application/processcontroller.cpp 2014-03-07 17:23:00 +0000
593@@ -31,6 +31,9 @@
594
595 namespace plpp = core::posix::linux::proc::process;
596
597+namespace unitymir
598+{
599+
600 ProcessController::OomController::OomController()
601 {
602 }
603@@ -126,3 +129,5 @@
604 {
605 return -1 != kill(-pid, SIGCONT);
606 }
607+
608+} // namespace unitymir
609
610=== modified file 'src/modules/Unity/Application/processcontroller.h'
611--- src/modules/Unity/Application/processcontroller.h 2014-01-29 09:14:01 +0000
612+++ src/modules/Unity/Application/processcontroller.h 2014-03-07 17:23:00 +0000
613@@ -22,6 +22,9 @@
614
615 #include <sys/types.h>
616
617+namespace unitymir
618+{
619+
620 class ProcessController
621 {
622 public:
623@@ -53,4 +56,6 @@
624 QSharedPointer<OomController> m_oomController;
625 };
626
627+} // namespace unitymir
628+
629 #endif // PROCESS_CONTROLLER_H
630
631=== modified file 'src/modules/Unity/Application/shellinputarea.cpp'
632--- src/modules/Unity/Application/shellinputarea.cpp 2013-08-29 14:46:43 +0000
633+++ src/modules/Unity/Application/shellinputarea.cpp 2014-03-07 17:23:00 +0000
634@@ -23,6 +23,9 @@
635 // Qt
636 #include <QDebug>
637
638+namespace unitymir
639+{
640+
641 ShellInputArea::ShellInputArea(QQuickItem *parent) : InputArea(parent)
642 {
643 auto surface = MirSurfaceManager::singleton()->shellSurface();
644@@ -43,3 +46,5 @@
645 {
646 doSetSurface(surface);
647 }
648+
649+} // namespace unitymir
650
651=== modified file 'src/modules/Unity/Application/shellinputarea.h'
652--- src/modules/Unity/Application/shellinputarea.h 2013-08-29 14:46:43 +0000
653+++ src/modules/Unity/Application/shellinputarea.h 2014-03-07 17:23:00 +0000
654@@ -19,6 +19,8 @@
655
656 #include "inputarea.h"
657
658+namespace unitymir
659+{
660 class MirSurface;
661
662 class ShellInputArea : public InputArea
663@@ -34,4 +36,6 @@
664 void setShellSurface(MirSurface *surface);
665 };
666
667+} // namespace unitymir
668+
669 #endif // SHELLINPUTAREA_H
670
671=== modified file 'src/modules/Unity/Application/taskcontroller.cpp'
672--- src/modules/Unity/Application/taskcontroller.cpp 2014-01-29 09:30:45 +0000
673+++ src/modules/Unity/Application/taskcontroller.cpp 2014-03-07 17:23:00 +0000
674@@ -41,7 +41,8 @@
675 #include <signal.h>
676 #include <unistd.h>
677
678-
679+namespace unitymir
680+{
681
682 TaskController::TaskController(
683 QObject* parent,
684@@ -183,3 +184,5 @@
685 // Is this really the signal we want to emit?
686 Q_EMIT requestResume(id);
687 }
688+
689+} // namespace unitymir
690
691=== modified file 'src/modules/Unity/Application/taskcontroller.h'
692--- src/modules/Unity/Application/taskcontroller.h 2014-01-27 11:47:14 +0000
693+++ src/modules/Unity/Application/taskcontroller.h 2014-03-07 17:23:00 +0000
694@@ -25,6 +25,9 @@
695 #include "applicationcontroller.h"
696 #include "processcontroller.h"
697
698+namespace unitymir
699+{
700+
701 class TaskController : public QObject
702 {
703 Q_OBJECT
704@@ -63,4 +66,6 @@
705 QSharedPointer<ProcessController> m_processController;
706 };
707
708+} // namespace unitymir
709+
710 #endif // TASKCONTROLLER_H
711
712=== modified file 'src/modules/Unity/Application/ubuntukeyboardinfo.cpp'
713--- src/modules/Unity/Application/ubuntukeyboardinfo.cpp 2013-10-14 18:39:55 +0000
714+++ src/modules/Unity/Application/ubuntukeyboardinfo.cpp 2014-03-07 17:23:00 +0000
715@@ -24,6 +24,9 @@
716 const char gServerName[] = "ubuntu-keyboard-info";
717 }
718
719+namespace unitymir
720+{
721+
722 UbuntuKeyboardInfo::UbuntuKeyboardInfo(QObject *parent)
723 : QObject(parent),
724 m_consecutiveAttempts(0),
725@@ -151,3 +154,5 @@
726 }
727
728 }
729+
730+} // namespace unitymir
731
732=== modified file 'src/modules/Unity/Application/ubuntukeyboardinfo.h'
733--- src/modules/Unity/Application/ubuntukeyboardinfo.h 2013-10-14 18:39:55 +0000
734+++ src/modules/Unity/Application/ubuntukeyboardinfo.h 2014-03-07 17:23:00 +0000
735@@ -20,6 +20,9 @@
736 #include <QLocalSocket>
737 #include <QTimer>
738
739+namespace unitymir
740+{
741+
742 // Temporary solution to get information about the onscreen keyboard
743 // This shouldn't be needed once the OSK is a properly sized surface
744 // instead of a fullscreen one.
745@@ -75,4 +78,6 @@
746 QString m_socketFilePath;
747 };
748
749+} // namespace unitymir
750+
751 #endif // UBUNTU_KEYBOARD_INFO_H
752
753=== modified file 'src/modules/Unity/Application/upstart/applicationcontroller.cpp'
754--- src/modules/Unity/Application/upstart/applicationcontroller.cpp 2014-01-30 06:59:33 +0000
755+++ src/modules/Unity/Application/upstart/applicationcontroller.cpp 2014-03-07 17:23:00 +0000
756@@ -25,7 +25,12 @@
757 #include "upstart-app-launch.h"
758 }
759
760-struct upstart::ApplicationController::Private
761+namespace unitymir
762+{
763+namespace upstart
764+{
765+
766+struct ApplicationController::Private
767 {
768 upstart_app_launch_app_observer_t preStartCallback = nullptr;
769 upstart_app_launch_app_observer_t startedCallback = nullptr;
770@@ -35,32 +40,32 @@
771 upstart_app_launch_app_failed_observer_t failureCallback = nullptr;
772 };
773
774-upstart::ApplicationController::ApplicationController()
775- : ::ApplicationController(),
776+ApplicationController::ApplicationController()
777+ : unitymir::ApplicationController(),
778 impl(new Private())
779 {
780 impl->preStartCallback = [](const gchar * appId, gpointer userData) {
781- auto thiz = static_cast<upstart::ApplicationController*>(userData);
782+ auto thiz = static_cast<ApplicationController*>(userData);
783 Q_EMIT(thiz->applicationAboutToBeStarted(appId));
784 };
785
786 impl->startedCallback = [](const gchar * appId, gpointer userData) {
787- auto thiz = static_cast<upstart::ApplicationController*>(userData);
788+ auto thiz = static_cast<ApplicationController*>(userData);
789 Q_EMIT(thiz->applicationStarted(appId));
790 };
791
792 impl->stopCallback = [](const gchar * appId, gpointer userData) {
793- auto thiz = static_cast<upstart::ApplicationController*>(userData);
794+ auto thiz = static_cast<ApplicationController*>(userData);
795 Q_EMIT(thiz->applicationStopped(appId));
796 };
797
798 impl->focusCallback = [](const gchar * appId, gpointer userData) {
799- auto thiz = static_cast<upstart::ApplicationController*>(userData);
800+ auto thiz = static_cast<ApplicationController*>(userData);
801 Q_EMIT(thiz->applicationFocusRequest(appId));
802 };
803
804 impl->resumeCallback = [](const gchar * appId, gpointer userData) {
805- auto thiz = static_cast<upstart::ApplicationController*>(userData);
806+ auto thiz = static_cast<ApplicationController*>(userData);
807 Q_EMIT(thiz->applicationResumeRequest(appId));
808 };
809
810@@ -72,7 +77,7 @@
811 case UPSTART_APP_LAUNCH_APP_FAILED_START_FAILURE: error = ApplicationController::Error::APPLICATION_FAILED_TO_START;
812 }
813
814- auto thiz = static_cast<upstart::ApplicationController*>(userData);
815+ auto thiz = static_cast<ApplicationController*>(userData);
816 Q_EMIT(thiz->applicationError(appId, error));
817 };
818
819@@ -84,7 +89,7 @@
820 upstart_app_launch_observer_add_app_failed(impl->failureCallback, this);
821 }
822
823-upstart::ApplicationController::~ApplicationController()
824+ApplicationController::~ApplicationController()
825 {
826 upstart_app_launch_observer_delete_app_starting(impl->preStartCallback, this);
827 upstart_app_launch_observer_delete_app_started(impl->startedCallback, this);
828@@ -94,7 +99,7 @@
829 upstart_app_launch_observer_delete_app_failed(impl->failureCallback, this);
830 }
831
832-pid_t upstart::ApplicationController::primaryPidForAppId(const QString& appId)
833+pid_t ApplicationController::primaryPidForAppId(const QString& appId)
834 {
835 GPid pid = upstart_app_launch_get_primary_pid(appId.toLatin1().constData());
836 DLOG_IF(!pid, "ApplicationController::stopApplication appId='%s' FAILED", qPrintable(appId));
837@@ -102,19 +107,19 @@
838 return pid;
839 }
840
841-bool upstart::ApplicationController::appIdHasProcessId(pid_t pid, const QString& appId)
842+bool ApplicationController::appIdHasProcessId(pid_t pid, const QString& appId)
843 {
844 return upstart_app_launch_pid_in_app_id(pid, appId.toLatin1().constData());
845 }
846
847-bool upstart::ApplicationController::stopApplicationWithAppId(const QString& appId)
848+bool ApplicationController::stopApplicationWithAppId(const QString& appId)
849 {
850 auto result = upstart_app_launch_stop_application(appId.toLatin1().constData());
851- DLOG_IF(!result, "upstart::ApplicationController::stopApplicationWithAppId appId='%s' FAILED", qPrintable(appId));
852+ DLOG_IF(!result, "ApplicationController::stopApplicationWithAppId appId='%s' FAILED", qPrintable(appId));
853 return result;
854 }
855
856-bool upstart::ApplicationController::startApplicationWithAppIdAndArgs(const QString& appId, const QStringList& arguments)
857+bool ApplicationController::startApplicationWithAppIdAndArgs(const QString& appId, const QStringList& arguments)
858 {
859 // Convert arguments QStringList into format suitable for upstart-app-launch
860 auto upstartArgs = g_new0(gchar *, arguments.length());
861@@ -129,6 +134,9 @@
862
863 g_free(upstartArgs);
864
865- DLOG_IF(!result, "upstart::Application::Controller::startApplicationWithAppIdAndArgs appId='%s' FAILED", qPrintable(appId));
866+ DLOG_IF(!result, "Application::Controller::startApplicationWithAppIdAndArgs appId='%s' FAILED", qPrintable(appId));
867 return result;
868 }
869+
870+} // namespace upstart
871+} // namespace unitymir
872
873=== modified file 'src/modules/Unity/Application/upstart/applicationcontroller.h'
874--- src/modules/Unity/Application/upstart/applicationcontroller.h 2014-01-27 11:29:44 +0000
875+++ src/modules/Unity/Application/upstart/applicationcontroller.h 2014-03-07 17:23:00 +0000
876@@ -20,9 +20,12 @@
877
878 #include "../applicationcontroller.h"
879
880+namespace unitymir
881+{
882 namespace upstart
883 {
884-class ApplicationController : public ::ApplicationController
885+
886+class ApplicationController : public unitymir::ApplicationController
887 {
888 public:
889 ApplicationController();
890@@ -38,6 +41,8 @@
891 struct Private;
892 QScopedPointer<Private> impl;
893 };
894-}
895+
896+} // namespace upstart
897+} // namespace unitymir
898
899 #endif // UPSTART_APPLICATION_CONTROLLER_H
900
901=== modified file 'tests/application_manager_test.cpp'
902--- tests/application_manager_test.cpp 2014-03-07 17:23:00 +0000
903+++ tests/application_manager_test.cpp 2014-03-07 17:23:00 +0000
904@@ -34,6 +34,7 @@
905 #include "mock_session.h"
906 #include "mock_focus_controller.h"
907
908+using namespace unitymir;
909
910 class ApplicationManagerTests : public ::testing::Test
911 {
912
913=== modified file 'tests/auto/modules/Unity/Application/main.cpp'
914--- tests/auto/modules/Unity/Application/main.cpp 2014-03-07 17:23:00 +0000
915+++ tests/auto/modules/Unity/Application/main.cpp 2014-03-07 17:23:00 +0000
916@@ -27,6 +27,8 @@
917
918 #include <signal.h>
919
920+using namespace unitymir;
921+
922 static QString pidCommandLine(qint64 pid)
923 {
924 QFile cmdline(QString("/proc/%1/cmdline").arg(pid));
925
926=== modified file 'tests/mock_application_controller.h'
927--- tests/mock_application_controller.h 2014-01-27 11:29:44 +0000
928+++ tests/mock_application_controller.h 2014-03-07 17:23:00 +0000
929@@ -26,7 +26,7 @@
930
931 namespace testing
932 {
933-struct MockApplicationController : public ApplicationController
934+struct MockApplicationController : public unitymir::ApplicationController
935 {
936 MOCK_METHOD1(primaryPidForAppId, pid_t(const QString& appId));
937 MOCK_METHOD2(appIdHasProcessId, bool(pid_t, const QString&));
938
939=== modified file 'tests/mock_desktop_file_reader.h'
940--- tests/mock_desktop_file_reader.h 2014-01-23 11:30:52 +0000
941+++ tests/mock_desktop_file_reader.h 2014-03-07 17:23:00 +0000
942@@ -24,10 +24,10 @@
943
944 namespace testing
945 {
946-struct MockDesktopFileReader : public DesktopFileReader
947+struct MockDesktopFileReader : public unitymir::DesktopFileReader
948 {
949 MockDesktopFileReader(const QString& appId)
950- : DesktopFileReader(appId)
951+ : unitymir::DesktopFileReader(appId)
952 {
953 using namespace ::testing;
954
955@@ -122,7 +122,7 @@
956 }
957 };
958
959-struct MockDesktopFileReaderFactory : public DesktopFileReader::Factory
960+struct MockDesktopFileReaderFactory : public unitymir::DesktopFileReader::Factory
961 {
962 MockDesktopFileReaderFactory()
963 {
964@@ -139,7 +139,7 @@
965 &MockDesktopFileReaderFactory::doCreateInstanceForDesktopFile));
966 }
967
968- virtual DesktopFileReader* doCreateInstanceForAppId(const QString& appId)
969+ virtual unitymir::DesktopFileReader* doCreateInstanceForAppId(const QString& appId)
970 {
971 using namespace ::testing;
972 auto instance = new NiceMock<MockDesktopFileReader>(appId);
973@@ -148,7 +148,7 @@
974 return instance;
975 }
976
977- virtual DesktopFileReader* doCreateInstanceForDesktopFile(const QFileInfo& fi)
978+ virtual unitymir::DesktopFileReader* doCreateInstanceForDesktopFile(const QFileInfo& fi)
979 {
980 using namespace ::testing;
981 auto instance = new NiceMock<MockDesktopFileReader>(fi);
982@@ -157,8 +157,8 @@
983 return instance;
984 }
985
986- MOCK_METHOD1(createInstanceForAppId, DesktopFileReader*(const QString&));
987- MOCK_METHOD1(createInstanceForDesktopFile, DesktopFileReader*(const QFileInfo&));
988+ MOCK_METHOD1(createInstanceForAppId, unitymir::DesktopFileReader*(const QString&));
989+ MOCK_METHOD1(createInstanceForDesktopFile, unitymir::DesktopFileReader*(const QFileInfo&));
990 };
991 }
992
993
994=== modified file 'tests/mock_oom_controller.h'
995--- tests/mock_oom_controller.h 2014-01-27 11:29:44 +0000
996+++ tests/mock_oom_controller.h 2014-03-07 17:23:00 +0000
997@@ -23,7 +23,7 @@
998
999 namespace testing
1000 {
1001-struct MockOomController : public ProcessController::OomController
1002+struct MockOomController : public unitymir::ProcessController::OomController
1003 {
1004 MOCK_METHOD1(ensureProcessLikelyToBeKilled, void(pid_t));
1005 MOCK_METHOD1(ensureProcessUnlikelyToBeKilled, void(pid_t));
1006
1007=== modified file 'tests/mock_proc_info.h'
1008--- tests/mock_proc_info.h 2014-03-07 17:23:00 +0000
1009+++ tests/mock_proc_info.h 2014-03-07 17:23:00 +0000
1010@@ -24,7 +24,7 @@
1011
1012 namespace testing
1013 {
1014-struct MockProcInfo : public ProcInfo
1015+struct MockProcInfo : public unitymir::ProcInfo
1016 {
1017 MOCK_METHOD1(command_line, QByteArray(quint64));
1018 std::unique_ptr<CommandLine> commandLine(quint64 pid)
1019
1020=== modified file 'tests/mock_process_controller.h'
1021--- tests/mock_process_controller.h 2014-01-27 11:29:44 +0000
1022+++ tests/mock_process_controller.h 2014-03-07 17:23:00 +0000
1023@@ -23,14 +23,14 @@
1024
1025 namespace testing
1026 {
1027-struct MockProcessController : public ProcessController
1028+struct MockProcessController : public unitymir::ProcessController
1029 {
1030- MockProcessController(const QSharedPointer<ProcessController::OomController>& oomController)
1031+ MockProcessController(const QSharedPointer<unitymir::ProcessController::OomController>& oomController)
1032 : m_oomController(oomController)
1033 {
1034 }
1035
1036- const QSharedPointer<OomController>& oomController() const
1037+ const QSharedPointer<unitymir::ProcessController::OomController>& oomController() const
1038 {
1039 return m_oomController;
1040 }
1041@@ -38,7 +38,7 @@
1042 MOCK_CONST_METHOD1(sigStopProcessGroupForPid, bool(pid_t));
1043 MOCK_CONST_METHOD1(sigContinueProcessGroupForPid, bool(pid_t));
1044
1045- QSharedPointer<ProcessController::OomController> m_oomController;
1046+ QSharedPointer<unitymir::ProcessController::OomController> m_oomController;
1047 };
1048 }
1049
1050
1051=== modified file 'tests/taskcontroller_test.cpp'
1052--- tests/taskcontroller_test.cpp 2014-01-27 08:01:40 +0000
1053+++ tests/taskcontroller_test.cpp 2014-03-07 17:23:00 +0000
1054@@ -28,6 +28,7 @@
1055
1056 namespace
1057 {
1058+using namespace unitymir;
1059
1060 struct TriggerableApplicationController : public ApplicationController
1061 {

Subscribers

People subscribed via source and target branches