Mir

Merge lp:~vanvugt/mir/privatize-SurfaceData into lp:mir

  1. privatize-SurfaceData
  2. Merge into development-branch
Proposed by Daniel van Vugt
Status: Merged
Approved by: Alan Griffiths
Approved revision: no longer in the source branch.
Merged at revision: 1098
Proposed branch: lp:~vanvugt/mir/privatize-SurfaceData
Merge into: lp:mir
Diff against target: 38 lines (+3/-3)
3 files modified
src/server/surfaces/surface_allocator.cpp (+1/-1)
src/server/surfaces/surface_data.cpp (+1/-1)
tests/unit-tests/surfaces/test_surface_data.cpp (+1/-1)
To merge this branch: bzr merge lp:~vanvugt/mir/privatize-SurfaceData
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Alan Griffiths Approve
Review via email: mp+188787@code.launchpad.net

Commit message

Privatize surface_data.h; not required in any public APIs.

Description of the change

A small step on the long road to server API stability (LP: #1223393).

To post a comment you must log in.
Revision history for this message
Alan Griffiths (alan-griffiths) wrote :

LGTM (moving a file from include/server is, of course, an API break.)

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

PASSED: Continuous integration, rev:1098
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/69/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-saucy-i386-build/2197
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-saucy-amd64-build/2082
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-saucy-amd64-ci/69
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-saucy-amd64-ci/69/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins:8080/job/mir-team-mir-development-branch-ci/69/rebuild

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/server/surfaces/surface_allocator.cpp'
2--- src/server/surfaces/surface_allocator.cpp 2013-08-28 03:41:48 +0000
3+++ src/server/surfaces/surface_allocator.cpp 2013-10-02 09:43:03 +0000
4@@ -20,7 +20,7 @@
5 #include "mir/surfaces/buffer_stream_factory.h"
6 #include "mir/surfaces/buffer_stream.h"
7 #include "mir/input/input_channel_factory.h"
8-#include "mir/surfaces/surface_data.h"
9+#include "surface_data.h"
10 #include "mir/surfaces/surface.h"
11
12 namespace geom=mir::geometry;
13
14=== modified file 'src/server/surfaces/surface_data.cpp'
15--- src/server/surfaces/surface_data.cpp 2013-08-28 03:41:48 +0000
16+++ src/server/surfaces/surface_data.cpp 2013-10-02 09:43:03 +0000
17@@ -16,7 +16,7 @@
18 * Authored by: Kevin DuBois <kevin.dubois@canonical.com>
19 */
20
21-#include "mir/surfaces/surface_data.h"
22+#include "surface_data.h"
23 #include <glm/gtc/matrix_transform.hpp>
24
25 namespace geom=mir::geometry;
26
27=== renamed file 'include/server/mir/surfaces/surface_data.h' => 'src/server/surfaces/surface_data.h'
28=== modified file 'tests/unit-tests/surfaces/test_surface_data.cpp'
29--- tests/unit-tests/surfaces/test_surface_data.cpp 2013-08-28 03:41:48 +0000
30+++ tests/unit-tests/surfaces/test_surface_data.cpp 2013-10-02 09:43:03 +0000
31@@ -16,7 +16,7 @@
32 * Authored by: Kevin DuBois <kevin.dubois@canonical.com>
33 */
34
35-#include "mir/surfaces/surface_data.h"
36+#include "src/server/surfaces/surface_data.h"
37
38 #include "mir/geometry/rectangle.h"
39

Subscribers

People subscribed via source and target branches