unity-mir

Merge lp:~albaguirre/unity-mir/compatibility-with-mir-0.1.9 into lp:unity-mir

  1. compatibility-with-mir-0.1.9
  2. Merge into trunk
Proposed by Alberto Aguirre
Status: Merged
Merged at revision: 218
Proposed branch: lp:~albaguirre/unity-mir/compatibility-with-mir-0.1.9
Merge into: lp:unity-mir
Diff against target: 940 lines (+141/-136)
21 files modified
debian/control (+1/-1)
src/modules/Unity/Application/application.cpp (+5/-5)
src/modules/Unity/Application/application.h (+4/-4)
src/modules/Unity/Application/application_manager.cpp (+11/-11)
src/modules/Unity/Application/application_manager.h (+10/-8)
src/modules/Unity/Application/applicationscreenshotprovider.cpp (+1/-1)
src/modules/Unity/Application/mirsurface.cpp (+2/-2)
src/modules/Unity/Application/mirsurface.h (+4/-4)
src/modules/Unity/Application/mirsurfacemanager.cpp (+5/-6)
src/modules/Unity/Application/mirsurfacemanager.h (+7/-7)
src/unity-mir/focussetter.cpp (+4/-3)
src/unity-mir/focussetter.h (+6/-3)
src/unity-mir/initialsurfaceplacementstrategy.cpp (+5/-5)
src/unity-mir/initialsurfaceplacementstrategy.h (+7/-7)
src/unity-mir/sessionlistener.cpp (+17/-17)
src/unity-mir/sessionlistener.h (+13/-13)
src/unity-mir/shellserverconfiguration.cpp (+7/-7)
src/unity-mir/shellserverconfiguration.h (+2/-2)
tests/application_manager_test.cpp (+22/-22)
tests/mock_focus_controller.h (+2/-2)
tests/mock_session.h (+6/-6)
To merge this branch: bzr merge lp:~albaguirre/unity-mir/compatibility-with-mir-0.1.9
Reviewer Review Type Date Requested Status
Gerry Boland (community) Approve
PS Jenkins bot (community) continuous-integration Needs Fixing
Review via email: mp+215890@code.launchpad.net

Commit message

need for mir019

Description of the change

need for mir019

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

FAILED: Continuous integration, rev:214
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~albaguirre/unity-mir/compatibility-with-mir-0.1.9/+merge/215890/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/unity-mir-ci/320/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-amd64-ci/183/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-armhf-ci/184/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-i386-ci/183/console

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

review: Needs Fixing (continuous-integration)
lp:~albaguirre/unity-mir/compatibility-with-mir-0.1.9 updated
215. By Alberto Aguirre

Bump required mirserver version

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

FAILED: Continuous integration, rev:215
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~albaguirre/unity-mir/compatibility-with-mir-0.1.9/+merge/215890/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/unity-mir-ci/321/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-amd64-ci/184/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-armhf-ci/185/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-i386-ci/184/console

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

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:215
http://jenkins.qa.ubuntu.com/job/unity-mir-ci/336/
Executed test runs:
    None: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-amd64-ci/199/console
    None: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-armhf-ci/200/console
    None: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-i386-ci/199/console

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Gerry Boland (gerboland) wrote :

Well it builds ok, just need to check on phone.

Revision history for this message
Gerry Boland (gerboland) wrote :

LGTM

Please add review checklist

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

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/control'
2--- debian/control 2014-04-08 07:50:59 +0000
3+++ debian/control 2014-04-15 23:44:39 +0000
4@@ -9,7 +9,7 @@
5 libboost-dev,
6 libboost-system-dev,
7 libplatform-api1-dev,
8- libmirserver-dev (>= 0.1.8),
9+ libmirserver-dev (>= 0.1.9),
10 libmirclient-dev (>= 0.1.8),
11 libprocess-cpp-dev,
12 libunity-api-dev (>= 7.80.6),
13
14=== modified file 'src/modules/Unity/Application/application.cpp'
15--- src/modules/Unity/Application/application.cpp 2014-03-12 13:14:07 +0000
16+++ src/modules/Unity/Application/application.cpp 2014-04-15 23:44:39 +0000
17@@ -24,8 +24,8 @@
18 #include "logging.h"
19
20 // mir
21-#include <mir/shell/session.h>
22-#include <mir/shell/snapshot.h>
23+#include <mir/scene/session.h>
24+#include <mir/scene/snapshot.h>
25
26 namespace unitymir
27 {
28@@ -129,7 +129,7 @@
29 return m_fullscreen;
30 }
31
32-std::shared_ptr<mir::shell::Session> Application::session() const
33+std::shared_ptr<mir::scene::Session> Application::session() const
34 {
35 return m_session;
36 }
37@@ -149,7 +149,7 @@
38 m_pid = pid;
39 }
40
41-void Application::setSession(const std::shared_ptr<mir::shell::Session>& session)
42+void Application::setSession(const std::shared_ptr<mir::scene::Session>& session)
43 {
44 DLOG("Application::setSession (this=%p, session=%p)", this, session.get());
45
46@@ -185,7 +185,7 @@
47 void Application::updateScreenshot()
48 {
49 session()->take_snapshot(
50- [&](mir::shell::Snapshot const& snapshot)
51+ [&](mir::scene::Snapshot const& snapshot)
52 {
53 DLOG("ApplicationScreenshotProvider - Mir snapshot ready with size %d x %d",
54 snapshot.size.height.as_int(), snapshot.size.width.as_int());
55
56=== modified file 'src/modules/Unity/Application/application.h'
57--- src/modules/Unity/Application/application.h 2014-03-12 13:14:07 +0000
58+++ src/modules/Unity/Application/application.h 2014-04-15 23:44:39 +0000
59@@ -29,7 +29,7 @@
60 #include <unity/shell/application/ApplicationInfoInterface.h>
61
62 class QImage;
63-namespace mir { namespace shell { class Session; }}
64+namespace mir { namespace scene { class Session; }}
65
66 namespace unitymir
67 {
68@@ -75,7 +75,7 @@
69 QString desktopFile() const;
70 QString exec() const;
71 bool fullscreen() const;
72- std::shared_ptr<mir::shell::Session> session() const;
73+ std::shared_ptr<::mir::scene::Session> session() const;
74 pid_t pid() const;
75
76 public Q_SLOTS:
77@@ -93,7 +93,7 @@
78 void setState(State state);
79 void setFocused(bool focus);
80 void setFullscreen(bool fullscreen);
81- void setSession(const std::shared_ptr<mir::shell::Session>& session);
82+ void setSession(const std::shared_ptr<::mir::scene::Session>& session);
83 void setSessionName(const QString& name);
84
85 QSharedPointer<TaskController> m_taskController;
86@@ -106,7 +106,7 @@
87 QImage m_screenshotImage;
88 bool m_fullscreen;
89 bool m_visible; // duplicating internal Mir data :(
90- std::shared_ptr<mir::shell::Session> m_session;
91+ std::shared_ptr<::mir::scene::Session> m_session;
92 QString m_sessionName;
93 QStringList m_arguments;
94 QTimer* m_suspendTimer;
95
96=== modified file 'src/modules/Unity/Application/application_manager.cpp'
97--- src/modules/Unity/Application/application_manager.cpp 2014-04-14 12:56:28 +0000
98+++ src/modules/Unity/Application/application_manager.cpp 2014-04-15 23:44:39 +0000
99@@ -34,9 +34,9 @@
100
101 // mir
102 #include <mir/scene/depth_id.h>
103-#include <mir/shell/session.h>
104+#include <mir/scene/session.h>
105 #include <mir/shell/focus_controller.h>
106-#include <mir/shell/surface.h>
107+#include <mir/scene/surface.h>
108 #include <mir/graphics/display.h>
109 #include <mir/graphics/display_buffer.h>
110 #include <mircommon/mir/geometry/rectangles.h>
111@@ -51,7 +51,7 @@
112 #define SIDE_STAGE_WIDTH_GU 40
113 #define TABLET_MODE_MINIMUM_WIDTH_GU 100
114
115-namespace msh = mir::shell;
116+namespace ms = mir::scene;
117
118 using namespace unity::shell::application;
119
120@@ -724,7 +724,7 @@
121 authorized = true;
122 }
123
124-void ApplicationManager::placeSession(msh::Session const* session, uint32_t &x, uint32_t &y)
125+void ApplicationManager::placeSession(ms::Session const* session, uint32_t &x, uint32_t &y)
126 {
127 Application* application = findApplicationWithSession(session);
128 DLOG("ApplicationManager::placeSession (this=%p, application=%p, session=%p, name=%s)", this, application, session, session?(session->name().c_str()):"null");
129@@ -751,7 +751,7 @@
130 DLOG("ApplicationManager::placeSession (x=%d, y=%d)", x, y);
131 }
132
133-void ApplicationManager::onSessionStarting(const std::shared_ptr<msh::Session>& session)
134+void ApplicationManager::onSessionStarting(const std::shared_ptr<ms::Session>& session)
135 {
136 DLOG("ApplicationManager::onSessionStarting (this=%p, application=%s)", this, session?session->name().c_str():"null");
137
138@@ -772,7 +772,7 @@
139 }
140 }
141
142-void ApplicationManager::onSessionStopping(const std::shared_ptr<msh::Session>& session)
143+void ApplicationManager::onSessionStopping(const std::shared_ptr<ms::Session>& session)
144 {
145 // in case application closed not by hand of shell, check again here:
146 Application* application = findApplicationWithSession(session);
147@@ -807,7 +807,7 @@
148 }
149 }
150
151-void ApplicationManager::onSessionFocused(const std::shared_ptr<msh::Session>& session)
152+void ApplicationManager::onSessionFocused(const std::shared_ptr<ms::Session>& session)
153 {
154 Application* application = findApplicationWithSession(session);
155 DLOG("ApplicationManager::onSessionFocused (this=%p, application=%p, appId=%s, session name=%s)", this, application, application?qPrintable(application->appId()):"null", session?session->name().c_str():"null");
156@@ -848,8 +848,8 @@
157 }
158 }
159
160-void ApplicationManager::onSessionCreatedSurface(const msh::Session * session,
161- const std::shared_ptr<msh::Surface> & surface)
162+void ApplicationManager::onSessionCreatedSurface(const ms::Session * session,
163+ const std::shared_ptr<ms::Surface> & surface)
164 {
165 DLOG("ApplicationManager::onSessionCreatedSurface (this=%p)", this);
166 Q_UNUSED(surface);
167@@ -890,12 +890,12 @@
168 m_dbusWindowStack->FocusedWindowChanged(0, application->appId(), application->stage());
169 }
170
171-Application* ApplicationManager::findApplicationWithSession(const std::shared_ptr<msh::Session> &session)
172+Application* ApplicationManager::findApplicationWithSession(const std::shared_ptr<ms::Session> &session)
173 {
174 return findApplicationWithSession(session.get());
175 }
176
177-Application* ApplicationManager::findApplicationWithSession(const msh::Session *session)
178+Application* ApplicationManager::findApplicationWithSession(const ms::Session *session)
179 {
180 for (Application *app : m_applications) {
181 if (app->session().get() == session) {
182
183=== modified file 'src/modules/Unity/Application/application_manager.h'
184--- src/modules/Unity/Application/application_manager.h 2014-03-12 13:47:18 +0000
185+++ src/modules/Unity/Application/application_manager.h 2014-04-15 23:44:39 +0000
186@@ -38,9 +38,11 @@
187 namespace geometry {
188 class Size;
189 }
190- namespace shell {
191+ namespace scene {
192 class Session;
193 class Surface;
194+ }
195+ namespace shell {
196 class FocusController;
197 }
198 }
199@@ -114,14 +116,14 @@
200
201 public Q_SLOTS:
202 void authorizeSession(const quint64 pid, bool &authorized);
203- void placeSession(mir::shell::Session const*, uint32_t &x, uint32_t &y);
204+ void placeSession(::mir::scene::Session const*, uint32_t &x, uint32_t &y);
205
206- void onSessionStarting(std::shared_ptr<mir::shell::Session> const& session);
207- void onSessionStopping(std::shared_ptr<mir::shell::Session> const& session);
208- void onSessionFocused(std::shared_ptr<mir::shell::Session> const& session);
209+ void onSessionStarting(std::shared_ptr<::mir::scene::Session> const& session);
210+ void onSessionStopping(std::shared_ptr<::mir::scene::Session> const& session);
211+ void onSessionFocused(std::shared_ptr<::mir::scene::Session> const& session);
212 void onSessionUnfocused();
213
214- void onSessionCreatedSurface(mir::shell::Session const*, std::shared_ptr<mir::shell::Surface> const&);
215+ void onSessionCreatedSurface(::mir::scene::Session const*, std::shared_ptr<::mir::scene::Surface> const&);
216
217 void onProcessStartReportReceived(const QString& appId, const bool failure);
218 void onProcessStopped(const QString& appId, const bool unexpected);
219@@ -138,8 +140,8 @@
220 void setFocused(Application *application);
221 void add(Application *application);
222 void remove(Application* application);
223- Application* findApplicationWithSession(const std::shared_ptr<mir::shell::Session> &session);
224- Application* findApplicationWithSession(const mir::shell::Session *session);
225+ Application* findApplicationWithSession(const std::shared_ptr<::mir::scene::Session> &session);
226+ Application* findApplicationWithSession(const ::mir::scene::Session *session);
227 Application* applicationForStage(Application::Stage stage);
228 QModelIndex findIndex(Application* application);
229 bool checkFocusOnRemovedApplication(Application* application);
230
231=== modified file 'src/modules/Unity/Application/applicationscreenshotprovider.cpp'
232--- src/modules/Unity/Application/applicationscreenshotprovider.cpp 2014-03-12 13:14:07 +0000
233+++ src/modules/Unity/Application/applicationscreenshotprovider.cpp 2014-04-15 23:44:39 +0000
234@@ -23,7 +23,7 @@
235 #include "logging.h"
236
237 // mir
238-#include "mirserver/mir/shell/session.h"
239+#include "mirserver/mir/scene/session.h"
240
241 namespace unitymir
242 {
243
244=== modified file 'src/modules/Unity/Application/mirsurface.cpp'
245--- src/modules/Unity/Application/mirsurface.cpp 2014-02-28 16:51:31 +0000
246+++ src/modules/Unity/Application/mirsurface.cpp 2014-04-15 23:44:39 +0000
247@@ -22,7 +22,7 @@
248 #include "logging.h"
249
250 // Mir
251-#include <mir/shell/surface.h>
252+#include <mir/scene/surface.h>
253 #include <mir/geometry/rectangle.h>
254
255 namespace mg = mir::geometry;
256@@ -30,7 +30,7 @@
257 namespace unitymir
258 {
259
260-MirSurface::MirSurface(std::shared_ptr<mir::shell::Surface> surface, Application* application, QQuickItem *parent)
261+MirSurface::MirSurface(std::shared_ptr<mir::scene::Surface> surface, Application* application, QQuickItem *parent)
262 : QQuickItem(parent)
263 , m_surface(surface)
264 , m_application(application)
265
266=== modified file 'src/modules/Unity/Application/mirsurface.h'
267--- src/modules/Unity/Application/mirsurface.h 2014-02-28 16:51:31 +0000
268+++ src/modules/Unity/Application/mirsurface.h 2014-04-15 23:44:39 +0000
269@@ -22,7 +22,7 @@
270 #include <QSet>
271
272 // mir
273-#include <mir/shell/surface.h>
274+#include <mir/scene/surface.h>
275 #include <mir_toolkit/common.h>
276
277 namespace mir { namespace geometry { struct Rectangle; }}
278@@ -50,7 +50,7 @@
279 Q_PROPERTY(QString name READ name NOTIFY nameChanged)
280
281 public:
282- explicit MirSurface(std::shared_ptr<mir::shell::Surface> surface, Application* application, QQuickItem *parent = 0);
283+ explicit MirSurface(std::shared_ptr<mir::scene::Surface> surface, Application* application, QQuickItem *parent = 0);
284 ~MirSurface();
285
286 enum Type {
287@@ -105,7 +105,7 @@
288 void visibleChanged();
289
290 protected:
291- std::shared_ptr<mir::shell::Surface> m_surface;
292+ std::shared_ptr<mir::scene::Surface> m_surface;
293
294 private:
295 // start of methods used by InputArea
296@@ -122,7 +122,7 @@
297
298 QSet<const InputArea*> m_inputAreas;
299
300- bool m_visible = true; //FIXME(greyback) state should be in Mir::Shell::Surface, not here
301+ bool m_visible = true; //FIXME(greyback) state should be in Mir::scene::Surface, not here
302
303 Application* m_application;
304
305
306=== modified file 'src/modules/Unity/Application/mirsurfacemanager.cpp'
307--- src/modules/Unity/Application/mirsurfacemanager.cpp 2014-04-10 16:58:34 +0000
308+++ src/modules/Unity/Application/mirsurfacemanager.cpp 2014-04-15 23:44:39 +0000
309@@ -31,10 +31,9 @@
310 #include "logging.h"
311
312 // mir
313-#include <mir/shell/session.h>
314+#include <mir/scene/session.h>
315 #include <mir/scene/surface.h>
316
317-namespace msh = mir::shell;
318 namespace ms = mir::scene;
319
320 namespace unitymir
321@@ -92,7 +91,7 @@
322 return m_shellSurface;
323 }
324
325-MirSurface *MirSurfaceManager::surfaceFor(std::shared_ptr<mir::shell::Surface> const& surface)
326+MirSurface *MirSurfaceManager::surfaceFor(std::shared_ptr<mir::scene::Surface> const& surface)
327 {
328 auto it = m_surfaces.find(surface.get());
329 if (it != m_surfaces.end()) {
330@@ -103,7 +102,7 @@
331 }
332 }
333
334-void MirSurfaceManager::sessionCreatedSurface(mir::shell::Session const* session, std::shared_ptr<mir::shell::Surface> const& surface)
335+void MirSurfaceManager::sessionCreatedSurface(mir::scene::Session const* session, std::shared_ptr<mir::scene::Surface> const& surface)
336 {
337 DLOG("MirSurfaceManager::sessionCreatedSurface (this=%p) with surface name '%s'", this, surface->name().c_str());
338 ApplicationManager* appMgr = static_cast<ApplicationManager*>(ApplicationManager::singleton());
339@@ -114,7 +113,7 @@
340 Q_EMIT surfaceCreated(qmlSurface);
341 }
342
343-void MirSurfaceManager::sessionDestroyingSurface(mir::shell::Session const*, std::shared_ptr<mir::shell::Surface> const& surface)
344+void MirSurfaceManager::sessionDestroyingSurface(mir::scene::Session const*, std::shared_ptr<mir::scene::Surface> const& surface)
345 {
346 DLOG("MirSurfaceManager::sessionDestroyingSurface (this=%p) with surface name '%s'", this, surface->name().c_str());
347
348@@ -129,7 +128,7 @@
349 DLOG("MirSurfaceManager::sessionDestroyingSurface: unable to find MirSurface corresponding to surface '%s'", surface->name().c_str());
350 }
351
352-void MirSurfaceManager::shellSurfaceCreated(const std::shared_ptr<msh::Surface> &surface)
353+void MirSurfaceManager::shellSurfaceCreated(const std::shared_ptr<ms::Surface> &surface)
354 {
355 DLOG("MirSurfaceManager::shellSurfaceCreated (this=%p)", this);
356 m_shellSurface = new MirSurface(surface, nullptr);
357
358=== modified file 'src/modules/Unity/Application/mirsurfacemanager.h'
359--- src/modules/Unity/Application/mirsurfacemanager.h 2014-03-27 14:22:08 +0000
360+++ src/modules/Unity/Application/mirsurfacemanager.h 2014-04-15 23:44:39 +0000
361@@ -29,8 +29,8 @@
362 // local
363 #include "mirsurface.h"
364
365-namespace mir { namespace scene { class Surface; }}
366-namespace mir { namespace shell { class Surface; class Session; }}
367+namespace mir { namespace scene { class Surface; class Session;}}
368+
369 class ShellServerConfiguration;
370
371 namespace unitymir
372@@ -48,7 +48,7 @@
373
374 MirSurface *shellSurface() const;
375
376- MirSurface *surfaceFor(std::shared_ptr<mir::shell::Surface> const& surface);
377+ MirSurface *surfaceFor(std::shared_ptr<mir::scene::Surface> const& surface);
378
379 Q_SIGNALS:
380 void surfaceCreated(MirSurface* surface);
381@@ -58,14 +58,14 @@
382 // void fullscreenSurfaceChanged();
383
384 public Q_SLOTS:
385- void sessionCreatedSurface(mir::shell::Session const* session, std::shared_ptr<mir::shell::Surface> const&);
386- void sessionDestroyingSurface(mir::shell::Session const*, std::shared_ptr<mir::shell::Surface> const&);
387- void shellSurfaceCreated(std::shared_ptr<mir::shell::Surface> const&);
388+ void sessionCreatedSurface(mir::scene::Session const* session, std::shared_ptr<mir::scene::Surface> const&);
389+ void sessionDestroyingSurface(mir::scene::Session const*, std::shared_ptr<mir::scene::Surface> const&);
390+ void shellSurfaceCreated(std::shared_ptr<mir::scene::Surface> const&);
391
392 void surfaceAttributeChanged(mir::scene::Surface const*, MirSurfaceAttrib, int);
393
394 private:
395- QHash<const mir::shell::Surface *, MirSurface *> m_surfaces;
396+ QHash<const mir::scene::Surface *, MirSurface *> m_surfaces;
397 MirSurface* m_shellSurface;
398 ShellServerConfiguration* m_mirServer;
399 static MirSurfaceManager *the_surface_manager;
400
401=== modified file 'src/unity-mir/focussetter.cpp'
402--- src/unity-mir/focussetter.cpp 2013-12-11 01:10:57 +0000
403+++ src/unity-mir/focussetter.cpp 2014-04-15 23:44:39 +0000
404@@ -14,12 +14,13 @@
405 * along with this program. If not, see <http://www.gnu.org/licenses/>.
406 */
407
408-#include <mir/shell/surface.h>
409+#include <mir/scene/surface.h>
410
411 #include "focussetter.h"
412 #include "logging.h"
413
414 namespace msh = mir::shell;
415+namespace ms = mir::scene;
416
417 FocusSetter::FocusSetter(std::shared_ptr<msh::FocusSetter> const& underlying_setter, std::shared_ptr<mir::shell::InputTargeter> const& keyboard_input_targeter, QObject *parent)
418 : QObject(parent),
419@@ -32,7 +33,7 @@
420 {
421 }
422
423-void FocusSetter::set_focus_to(std::shared_ptr<msh::Session> const& session)
424+void FocusSetter::set_focus_to(std::shared_ptr<ms::Session> const& session)
425 {
426 DLOG("FocusSetter::set_focus_to(session=%p):%d", session.get(), __LINE__);
427 // Ensure we always call the underlying setter to dispatch focus/unfocus notifications.
428@@ -46,7 +47,7 @@
429 }
430 }
431
432-void FocusSetter::set_default_keyboard_target(std::weak_ptr<msh::Surface> const& default_target)
433+void FocusSetter::set_default_keyboard_target(std::weak_ptr<ms::Surface> const& default_target)
434 {
435 auto t = default_target.lock();
436 assert(t);
437
438=== modified file 'src/unity-mir/focussetter.h'
439--- src/unity-mir/focussetter.h 2013-10-07 21:52:28 +0000
440+++ src/unity-mir/focussetter.h 2014-04-15 23:44:39 +0000
441@@ -28,6 +28,9 @@
442 namespace shell
443 {
444 class InputTargeter;
445+}
446+namespace scene
447+{
448 class Surface;
449 }
450 }
451@@ -41,16 +44,16 @@
452 QObject *parent = 0);
453 ~FocusSetter();
454
455- void set_focus_to(std::shared_ptr<mir::shell::Session> const& session) override;
456+ void set_focus_to(std::shared_ptr<mir::scene::Session> const& session) override;
457
458 // We support a surface to be given key input when focus is otherwise to be cleared.
459- void set_default_keyboard_target(std::weak_ptr<mir::shell::Surface> const& default_keyboard_target);
460+ void set_default_keyboard_target(std::weak_ptr<mir::scene::Surface> const& default_keyboard_target);
461
462 private:
463 std::shared_ptr<mir::shell::FocusSetter> const underlying_setter;
464 std::shared_ptr<mir::shell::InputTargeter> const keyboard_input_targeter;
465
466- std::weak_ptr<mir::shell::Surface> default_keyboard_target;
467+ std::weak_ptr<mir::scene::Surface> default_keyboard_target;
468 };
469
470 #endif // FOCUSSETTER_H
471
472=== modified file 'src/unity-mir/initialsurfaceplacementstrategy.cpp'
473--- src/unity-mir/initialsurfaceplacementstrategy.cpp 2014-04-14 09:09:46 +0000
474+++ src/unity-mir/initialsurfaceplacementstrategy.cpp 2014-04-15 23:44:39 +0000
475@@ -19,8 +19,8 @@
476 #include "logging.h"
477
478 // mir
479-#include "mir/shell/surface_creation_parameters.h"
480-#include "mir/geometry/rectangle.h"
481+#include <mir/scene/surface_creation_parameters.h>
482+#include <mir/geometry/rectangle.h>
483
484 namespace msh = mir::shell;
485 namespace msc = mir::scene;
486@@ -38,9 +38,9 @@
487 {
488 }
489
490-msh::SurfaceCreationParameters
491-InitialSurfacePlacementStrategy::place(const msh::Session &session,
492- const msh::SurfaceCreationParameters &requestParameters)
493+msc::SurfaceCreationParameters
494+InitialSurfacePlacementStrategy::place(const msc::Session &session,
495+ const msc::SurfaceCreationParameters &requestParameters)
496 {
497 DLOG("InitialSurfacePlacementStrategy::place (%p, %s, %d)", this, session.name().c_str(), session.process_id());
498 using namespace mir::geometry;
499
500=== modified file 'src/unity-mir/initialsurfaceplacementstrategy.h'
501--- src/unity-mir/initialsurfaceplacementstrategy.h 2014-04-14 09:09:46 +0000
502+++ src/unity-mir/initialsurfaceplacementstrategy.h 2014-04-15 23:44:39 +0000
503@@ -19,15 +19,15 @@
504
505 #include <memory>
506
507-#include "mirserver/mir/shell/placement_strategy.h"
508+#include "mirserver/mir/scene/placement_strategy.h"
509 #include "mirserver/mir/shell/display_layout.h"
510-#include "mir/shell/session.h"
511-#include "mir/scene/depth_id.h"
512+#include "mirserver/mir/scene/session.h"
513+#include "mirserver/mir/scene/depth_id.h"
514
515 #include <QObject>
516 #include <QMutex>
517
518-class InitialSurfacePlacementStrategy : public QObject, public mir::shell::PlacementStrategy
519+class InitialSurfacePlacementStrategy : public QObject, public mir::scene::PlacementStrategy
520 {
521 Q_OBJECT
522
523@@ -36,11 +36,11 @@
524 QObject *parent = 0);
525 ~InitialSurfacePlacementStrategy();
526
527- mir::shell::SurfaceCreationParameters place(const mir::shell::Session &session,
528- const mir::shell::SurfaceCreationParameters &requestParameters) override;
529+ mir::scene::SurfaceCreationParameters place(const mir::scene::Session &session,
530+ const mir::scene::SurfaceCreationParameters &requestParameters) override;
531
532 Q_SIGNALS:
533- void requestPlacementForSession(const mir::shell::Session *session, uint32_t &x, uint32_t &y);
534+ void requestPlacementForSession(const mir::scene::Session *session, uint32_t &x, uint32_t &y);
535
536 private:
537 const std::shared_ptr<mir::shell::DisplayLayout> m_displayLayout;
538
539=== modified file 'src/unity-mir/sessionlistener.cpp'
540--- src/unity-mir/sessionlistener.cpp 2014-04-10 16:58:34 +0000
541+++ src/unity-mir/sessionlistener.cpp 2014-04-15 23:44:39 +0000
542@@ -17,19 +17,19 @@
543 #include "sessionlistener.h"
544 #include "logging.h"
545
546-#include <mir/shell/session.h>
547-
548-namespace msh = mir::shell;
549-
550-Q_DECLARE_METATYPE(std::shared_ptr<msh::Session>)
551+#include <mir/scene/session.h>
552+
553+namespace ms = mir::scene;
554+
555+Q_DECLARE_METATYPE(std::shared_ptr<ms::Session>)
556
557 SessionListener::SessionListener(QObject *parent) :
558 QObject(parent)
559 {
560 DLOG("SessionListener::SessionListener (this=%p)", this);
561 // need to register type to send over threads with signal/slot
562- qRegisterMetaType<std::shared_ptr<msh::Session>>("std::shared_ptr<mir::shell::Session>");
563- qRegisterMetaType<std::shared_ptr<msh::Surface>>("std::shared_ptr<mir::shell::Surface>");
564+ qRegisterMetaType<std::shared_ptr<ms::Session>>("std::shared_ptr<mir::scene::Session>");
565+ qRegisterMetaType<std::shared_ptr<ms::Surface>>("std::shared_ptr<mir::scene::Surface>");
566 }
567
568 SessionListener::~SessionListener()
569@@ -37,24 +37,24 @@
570 DLOG("SessionListener::~SessionListener (this=%p)", this);
571 }
572
573-// Mir's default SurfaceManager calls these methods with instance of msh::Session
574-// it is not a plain msh::Session
575-void SessionListener::starting(std::shared_ptr<msh::Session> const& session)
576+// Mir's default SurfaceManager calls these methods with instance of ms::Session
577+// it is not a plain ms::Session
578+void SessionListener::starting(std::shared_ptr<ms::Session> const& session)
579 {
580 DLOG("SessionListener::starting (this=%p, session=%p)", this, (void*)session.get());
581- Q_EMIT sessionStarting(std::static_pointer_cast<msh::Session>(session));
582+ Q_EMIT sessionStarting(std::static_pointer_cast<ms::Session>(session));
583 }
584
585-void SessionListener::stopping(std::shared_ptr<msh::Session> const& session)
586+void SessionListener::stopping(std::shared_ptr<ms::Session> const& session)
587 {
588 DLOG("SessionListener::stopping (this=%p, session=%p)", this, (void*)session.get());
589- Q_EMIT sessionStopping(std::static_pointer_cast<msh::Session>(session));
590+ Q_EMIT sessionStopping(std::static_pointer_cast<ms::Session>(session));
591 }
592
593-void SessionListener::focused(std::shared_ptr<msh::Session> const& session)
594+void SessionListener::focused(std::shared_ptr<ms::Session> const& session)
595 {
596 DLOG("SessionListener::focused (this=%p, session=%p)", this, (void*)session.get());
597- Q_EMIT sessionFocused(std::static_pointer_cast<msh::Session>(session));
598+ Q_EMIT sessionFocused(std::static_pointer_cast<ms::Session>(session));
599 }
600
601 void SessionListener::unfocused()
602@@ -63,7 +63,7 @@
603 Q_EMIT sessionUnfocused();
604 }
605
606-void SessionListener::surface_created(msh::Session& session, std::shared_ptr<msh::Surface> const& surface)
607+void SessionListener::surface_created(ms::Session& session, std::shared_ptr<ms::Surface> const& surface)
608 {
609 DLOG("SessionListener::surface_created (this=%p, session=%p, surface=%p)", this, &session, (void*)surface.get());
610 static bool mainShellSurfaceFound = false;
611@@ -75,7 +75,7 @@
612 }
613 }
614
615-void SessionListener::destroying_surface(msh::Session& session, std::shared_ptr<mir::shell::Surface> const& surface)
616+void SessionListener::destroying_surface(ms::Session& session, std::shared_ptr<ms::Surface> const& surface)
617 {
618 DLOG("SessionListener::destroying_surface (this=%p, session=%p, surface=%p)", this, &session, (void*)surface.get());
619 Q_EMIT sessionDestroyingSurface(&session, surface);
620
621=== modified file 'src/unity-mir/sessionlistener.h'
622--- src/unity-mir/sessionlistener.h 2014-04-10 16:58:34 +0000
623+++ src/unity-mir/sessionlistener.h 2014-04-15 23:44:39 +0000
624@@ -19,33 +19,33 @@
625
626 #include <QObject>
627
628-#include "mir/shell/session_listener.h"
629+#include "mirserver/mir/scene/session_listener.h"
630
631-class SessionListener : public QObject, public mir::shell::SessionListener
632+class SessionListener : public QObject, public mir::scene::SessionListener
633 {
634 Q_OBJECT
635 public:
636 explicit SessionListener(QObject *parent = 0);
637 ~SessionListener();
638
639- void starting(std::shared_ptr<mir::shell::Session> const& session) override;
640- void stopping(std::shared_ptr<mir::shell::Session> const& session) override;
641- void focused(std::shared_ptr<mir::shell::Session> const& session) override;
642+ void starting(std::shared_ptr<mir::scene::Session> const& session) override;
643+ void stopping(std::shared_ptr<mir::scene::Session> const& session) override;
644+ void focused(std::shared_ptr<mir::scene::Session> const& session) override;
645 void unfocused() override;
646
647- void surface_created(mir::shell::Session&, std::shared_ptr<mir::shell::Surface> const&) override;
648- void destroying_surface(mir::shell::Session&, std::shared_ptr<mir::shell::Surface> const&) override;
649+ void surface_created(mir::scene::Session&, std::shared_ptr<mir::scene::Surface> const&) override;
650+ void destroying_surface(mir::scene::Session&, std::shared_ptr<mir::scene::Surface> const&) override;
651
652 Q_SIGNALS:
653- void sessionStarting(std::shared_ptr<mir::shell::Session> const& session);
654- void sessionStopping(std::shared_ptr<mir::shell::Session> const& session);
655- void sessionFocused(std::shared_ptr<mir::shell::Session> const& session);
656+ void sessionStarting(std::shared_ptr<mir::scene::Session> const& session);
657+ void sessionStopping(std::shared_ptr<mir::scene::Session> const& session);
658+ void sessionFocused(std::shared_ptr<mir::scene::Session> const& session);
659 void sessionUnfocused();
660
661- void sessionCreatedSurface(mir::shell::Session const*, std::shared_ptr<mir::shell::Surface> const&);
662- void sessionDestroyingSurface(mir::shell::Session const*, std::shared_ptr<mir::shell::Surface> const&);
663+ void sessionCreatedSurface(mir::scene::Session const*, std::shared_ptr<mir::scene::Surface> const&);
664+ void sessionDestroyingSurface(mir::scene::Session const*, std::shared_ptr<mir::scene::Surface> const&);
665
666- void shellSurfaceCreated(std::shared_ptr<mir::shell::Surface> const&);
667+ void shellSurfaceCreated(std::shared_ptr<mir::scene::Surface> const&);
668 };
669
670 #endif // SESSIONLISTENER_H
671
672=== modified file 'src/unity-mir/shellserverconfiguration.cpp'
673--- src/unity-mir/shellserverconfiguration.cpp 2014-04-10 16:58:34 +0000
674+++ src/unity-mir/shellserverconfiguration.cpp 2014-04-15 23:44:39 +0000
675@@ -54,8 +54,8 @@
676 });
677 }
678
679-std::shared_ptr<msh::PlacementStrategy>
680-ShellServerConfiguration::the_shell_placement_strategy()
681+std::shared_ptr<ms::PlacementStrategy>
682+ShellServerConfiguration::the_placement_strategy()
683 {
684 return shell_placement_strategy(
685 [this]
686@@ -64,10 +64,10 @@
687 });
688 }
689
690-std::shared_ptr<msh::SessionListener>
691-ShellServerConfiguration::the_shell_session_listener()
692+std::shared_ptr<ms::SessionListener>
693+ShellServerConfiguration::the_session_listener()
694 {
695- return shell_session_listener(
696+ return session_listener(
697 [this]
698 {
699 return std::make_shared<SessionListener>();
700@@ -143,7 +143,7 @@
701
702 InitialSurfacePlacementStrategy *ShellServerConfiguration::placementStrategy()
703 {
704- auto sharedPtr = the_shell_placement_strategy();
705+ auto sharedPtr = the_placement_strategy();
706 if (sharedPtr.unique()) return 0;
707
708 return static_cast<InitialSurfacePlacementStrategy*>(sharedPtr.get());
709@@ -159,7 +159,7 @@
710
711 SessionListener *ShellServerConfiguration::sessionListener()
712 {
713- auto sharedPtr = the_shell_session_listener();
714+ auto sharedPtr = the_session_listener();
715 if (sharedPtr.unique()) return 0;
716
717 return static_cast<SessionListener*>(sharedPtr.get());
718
719=== modified file 'src/unity-mir/shellserverconfiguration.h'
720--- src/unity-mir/shellserverconfiguration.h 2014-04-10 16:58:34 +0000
721+++ src/unity-mir/shellserverconfiguration.h 2014-04-15 23:44:39 +0000
722@@ -46,8 +46,8 @@
723
724 /* mir specific */
725 std::shared_ptr<mir::graphics::DisplayConfigurationPolicy> the_display_configuration_policy() override;
726- std::shared_ptr<mir::shell::PlacementStrategy> the_shell_placement_strategy() override;
727- std::shared_ptr<mir::shell::SessionListener> the_shell_session_listener() override;
728+ std::shared_ptr<mir::scene::PlacementStrategy> the_placement_strategy() override;
729+ std::shared_ptr<mir::scene::SessionListener> the_session_listener() override;
730 std::shared_ptr<mir::scene::SurfaceConfigurator> the_surface_configurator() override;
731 std::shared_ptr<mir::shell::FocusSetter> the_shell_focus_setter() override;
732 std::shared_ptr<mir::ServerStatusListener> the_server_status_listener() override;
733
734=== modified file 'tests/application_manager_test.cpp'
735--- tests/application_manager_test.cpp 2014-04-01 22:49:46 +0000
736+++ tests/application_manager_test.cpp 2014-04-15 23:44:39 +0000
737@@ -118,7 +118,7 @@
738 ApplicationManager::NoFlag,
739 QStringList());
740
741- std::shared_ptr<mir::shell::Session> mirSession = std::make_shared<MockSession>(appIdFormat.toStdString(), i);
742+ std::shared_ptr<mir::scene::Session> mirSession = std::make_shared<MockSession>(appIdFormat.toStdString(), i);
743 applicationManager.onSessionStarting( mirSession );
744
745 EXPECT_NE(nullptr, application);
746@@ -140,7 +140,7 @@
747 TEST_F(ApplicationManagerTests,bug_case_1240400_second_dialer_app_fails_to_authorize_and_gets_mixed_up_with_first_one)
748 {
749 using namespace ::testing;
750- std::shared_ptr<mir::shell::Surface> aSurface(nullptr);
751+ std::shared_ptr<mir::scene::Surface> aSurface(nullptr);
752 quint64 firstProcId = 5921;
753 quint64 secondProcId = 5922;
754 const char dialer_app_id[] = "dialer-app";
755@@ -156,7 +156,7 @@
756
757 bool authed = true;
758
759- std::shared_ptr<mir::shell::Session> mirSession = std::make_shared<MockSession>(dialer_app_id, firstProcId);
760+ std::shared_ptr<mir::scene::Session> mirSession = std::make_shared<MockSession>(dialer_app_id, firstProcId);
761 applicationManager.authorizeSession(firstProcId, authed);
762 EXPECT_EQ(true, authed);
763 applicationManager.onSessionStarting(mirSession);
764@@ -186,7 +186,7 @@
765
766 bool authed = true;
767
768- std::shared_ptr<mir::shell::Session> mirSession = std::make_shared<MockSession>(app_id, procId);
769+ std::shared_ptr<mir::scene::Session> mirSession = std::make_shared<MockSession>(app_id, procId);
770 applicationManager.authorizeSession(procId, authed);
771 applicationManager.onSessionStarting(mirSession);
772 Application * beforeFailure = applicationManager.findApplication(app_id);
773@@ -202,7 +202,7 @@
774 {
775 using namespace ::testing;
776 quint64 procId = 5921;
777- std::shared_ptr<mir::shell::Surface> aSurface(nullptr);
778+ std::shared_ptr<mir::scene::Surface> aSurface(nullptr);
779 const char app_id[] = "my-app";
780 QByteArray cmdLine( "/usr/bin/my-app --desktop_file_hint=my-app");
781
782@@ -212,7 +212,7 @@
783
784 bool authed = true;
785
786- std::shared_ptr<mir::shell::Session> mirSession = std::make_shared<MockSession>(app_id, procId);
787+ std::shared_ptr<mir::scene::Session> mirSession = std::make_shared<MockSession>(app_id, procId);
788 applicationManager.authorizeSession(procId, authed);
789 applicationManager.onSessionStarting(mirSession);
790 Application * beforeFailure = applicationManager.findApplication(app_id);
791@@ -231,7 +231,7 @@
792 quint64 first_procId = 5921;
793 quint64 second_procId = 5922;
794 quint64 third_procId = 5923;
795- std::shared_ptr<mir::shell::Surface> aSurface(nullptr);
796+ std::shared_ptr<mir::scene::Surface> aSurface(nullptr);
797 const char first_app_id[] = "app1";
798 QByteArray first_cmdLine( "/usr/bin/app1 --desktop_file_hint=app1");
799 const char second_app_id[] = "app2";
800@@ -255,9 +255,9 @@
801
802 bool authed = true;
803
804- std::shared_ptr<mir::shell::Session> first_session = std::make_shared<MockSession>("Oo", first_procId);
805- std::shared_ptr<mir::shell::Session> second_session = std::make_shared<MockSession>("oO", second_procId);
806- std::shared_ptr<mir::shell::Session> third_session = std::make_shared<MockSession>("OO", third_procId);
807+ std::shared_ptr<mir::scene::Session> first_session = std::make_shared<MockSession>("Oo", first_procId);
808+ std::shared_ptr<mir::scene::Session> second_session = std::make_shared<MockSession>("oO", second_procId);
809+ std::shared_ptr<mir::scene::Session> third_session = std::make_shared<MockSession>("OO", third_procId);
810 applicationManager.authorizeSession(first_procId, authed);
811 applicationManager.authorizeSession(second_procId, authed);
812 applicationManager.authorizeSession(third_procId, authed);
813@@ -287,8 +287,8 @@
814
815 bool authed = true;
816
817- std::shared_ptr<mir::shell::Session> first_session = std::make_shared<MockSession>("Oo", a_procId);
818- std::shared_ptr<mir::shell::Session> second_session = std::make_shared<MockSession>("oO", a_procId);
819+ std::shared_ptr<mir::scene::Session> first_session = std::make_shared<MockSession>("Oo", a_procId);
820+ std::shared_ptr<mir::scene::Session> second_session = std::make_shared<MockSession>("oO", a_procId);
821 applicationManager.authorizeSession(a_procId, authed);
822
823 applicationManager.onSessionStarting(first_session);
824@@ -326,7 +326,7 @@
825 quint64 a_procId = 5921;
826 const char an_app_id[] = "some_app";
827 QByteArray a_cmd( "/usr/bin/app1 --desktop_file_hint=some_app");
828- std::shared_ptr<mir::shell::Surface> aSurface(nullptr);
829+ std::shared_ptr<mir::scene::Surface> aSurface(nullptr);
830
831 ON_CALL(procInfo,command_line(_)).WillByDefault(Return(a_cmd));
832
833@@ -334,8 +334,8 @@
834
835 bool authed = true;
836
837- std::shared_ptr<mir::shell::Session> first_session = std::make_shared<MockSession>("Oo", a_procId);
838- std::shared_ptr<mir::shell::Session> second_session = std::make_shared<MockSession>("oO", a_procId);
839+ std::shared_ptr<mir::scene::Session> first_session = std::make_shared<MockSession>("Oo", a_procId);
840+ std::shared_ptr<mir::scene::Session> second_session = std::make_shared<MockSession>("oO", a_procId);
841 applicationManager.authorizeSession(a_procId, authed);
842
843 applicationManager.onSessionStarting(first_session);
844@@ -355,7 +355,7 @@
845 quint64 a_procId = 5921;
846 const char an_app_id[] = "some_app";
847 QByteArray a_cmd( "/usr/bin/app1 --desktop_file_hint=some_app");
848- std::shared_ptr<mir::shell::Surface> aSurface(nullptr);
849+ std::shared_ptr<mir::scene::Surface> aSurface(nullptr);
850
851 ON_CALL(procInfo,command_line(_)).WillByDefault(Return(a_cmd));
852
853@@ -363,8 +363,8 @@
854
855 bool authed = true;
856
857- std::shared_ptr<mir::shell::Session> first_session = std::make_shared<MockSession>("Oo", a_procId);
858- std::shared_ptr<mir::shell::Session> second_session = std::make_shared<MockSession>("oO", a_procId);
859+ std::shared_ptr<mir::scene::Session> first_session = std::make_shared<MockSession>("Oo", a_procId);
860+ std::shared_ptr<mir::scene::Session> second_session = std::make_shared<MockSession>("oO", a_procId);
861 applicationManager.authorizeSession(a_procId, authed);
862
863 applicationManager.onSessionStarting(first_session);
864@@ -391,7 +391,7 @@
865 quint64 first_procId = 5921;
866 quint64 second_procId = 5922;
867 quint64 third_procId = 5923;
868- std::shared_ptr<mir::shell::Surface> aSurface(nullptr);
869+ std::shared_ptr<mir::scene::Surface> aSurface(nullptr);
870 QByteArray first_cmdLine( "/usr/bin/app1 --desktop_file_hint=app1");
871 QByteArray second_cmdLine( "/usr/bin/app2--desktop_file_hint=app2");
872 QByteArray third_cmdLine( "/usr/bin/app3 --desktop_file_hint=app3");
873@@ -412,9 +412,9 @@
874
875 bool authed = true;
876
877- std::shared_ptr<mir::shell::Session> first_session = std::make_shared<MockSession>("Oo", first_procId);
878- std::shared_ptr<mir::shell::Session> second_session = std::make_shared<MockSession>("oO", second_procId);
879- std::shared_ptr<mir::shell::Session> third_session = std::make_shared<MockSession>("OO", third_procId);
880+ std::shared_ptr<mir::scene::Session> first_session = std::make_shared<MockSession>("Oo", first_procId);
881+ std::shared_ptr<mir::scene::Session> second_session = std::make_shared<MockSession>("oO", second_procId);
882+ std::shared_ptr<mir::scene::Session> third_session = std::make_shared<MockSession>("OO", third_procId);
883 applicationManager.authorizeSession(first_procId, authed);
884 applicationManager.authorizeSession(second_procId, authed);
885 applicationManager.authorizeSession(third_procId, authed);
886
887=== modified file 'tests/mock_focus_controller.h'
888--- tests/mock_focus_controller.h 2014-02-26 15:46:30 +0000
889+++ tests/mock_focus_controller.h 2014-04-15 23:44:39 +0000
890@@ -29,8 +29,8 @@
891 {
892 public:
893 MOCK_METHOD0(focus_next, void());
894- MOCK_CONST_METHOD0(focussed_application, std::weak_ptr<mir::shell::Session>());
895- MOCK_METHOD1(set_focus_to, void(std::shared_ptr<mir::shell::Session>const&));
896+ MOCK_CONST_METHOD0(focussed_application, std::weak_ptr<mir::scene::Session>());
897+ MOCK_METHOD1(set_focus_to, void(std::shared_ptr<mir::scene::Session>const&));
898 };
899 }
900
901
902=== modified file 'tests/mock_session.h'
903--- tests/mock_session.h 2014-02-17 15:40:13 +0000
904+++ tests/mock_session.h 2014-04-15 23:44:39 +0000
905@@ -18,16 +18,16 @@
906 #ifndef MOCK_MIR_SHELL_SESSION_H
907 #define MOCK_MIR_SHELL_SESSION_H
908
909-#include <mir/shell/session.h>
910+#include <mir/scene/session.h>
911 #include <mir/graphics/display_configuration.h>
912-#include <mir/shell/surface_creation_parameters.h>
913+#include <mir/scene/surface_creation_parameters.h>
914 #include <gmock/gmock.h>
915
916 #include <string>
917
918 namespace testing
919 {
920-struct MockSession : public mir::shell::Session
921+struct MockSession : public mir::scene::Session
922 {
923 MockSession() {}
924 MockSession(std::string const& sessionName, pid_t processId)
925@@ -48,12 +48,12 @@
926
927 MOCK_METHOD0(force_requests_to_complete, void());
928
929- MOCK_CONST_METHOD0(default_surface, std::shared_ptr<mir::shell::Surface>());
930+ MOCK_CONST_METHOD0(default_surface, std::shared_ptr<mir::scene::Surface>());
931 MOCK_CONST_METHOD1(get_surface, std::shared_ptr<mir::frontend::Surface>(SurfaceId));
932
933- MOCK_METHOD1(take_snapshot, void(mir::shell::SnapshotCallback const&));
934+ MOCK_METHOD1(take_snapshot, void(mir::scene::SnapshotCallback const&));
935 MOCK_METHOD1(set_lifecycle_state, void(MirLifecycleState));
936- MOCK_METHOD1(create_surface, SurfaceId(mir::shell::SurfaceCreationParameters const&));
937+ MOCK_METHOD1(create_surface, SurfaceId(mir::scene::SurfaceCreationParameters const&));
938 MOCK_METHOD1(destroy_surface, void (SurfaceId));
939
940 MOCK_METHOD0(hide, void());

Subscribers

People subscribed via source and target branches