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

[Daniel van Vugt]

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

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

[Alan Griffiths (alan-griffiths)]

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

review: Approve

[PS Jenkins bot (ps-jenkins)]

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)

=== modified file 'src/server/surfaces/surface_allocator.cpp'
--- src/server/surfaces/surface_allocator.cpp	2013-08-28 03:41:48 +0000
+++ src/server/surfaces/surface_allocator.cpp	2013-10-02 09:43:03 +0000
@@ -20,7 +20,7 @@
 #include "mir/surfaces/buffer_stream_factory.h"
 #include "mir/surfaces/buffer_stream.h"
 #include "mir/input/input_channel_factory.h"
-#include "mir/surfaces/surface_data.h"
+#include "surface_data.h"
 #include "mir/surfaces/surface.h"
 
 namespace geom=mir::geometry;
 
=== modified file 'src/server/surfaces/surface_data.cpp'
--- src/server/surfaces/surface_data.cpp	2013-08-28 03:41:48 +0000
+++ src/server/surfaces/surface_data.cpp	2013-10-02 09:43:03 +0000
@@ -16,7 +16,7 @@
  * Authored by: Kevin DuBois <[e-mail]>
  */
 
-#include "mir/surfaces/surface_data.h"
+#include "surface_data.h"
 #include <glm/gtc/matrix_transform.hpp>
 
 namespace geom=mir::geometry;
 
=== renamed file 'include/server/mir/surfaces/surface_data.h' => 'src/server/surfaces/surface_data.h'
=== modified file 'tests/unit-tests/surfaces/test_surface_data.cpp'
--- tests/unit-tests/surfaces/test_surface_data.cpp	2013-08-28 03:41:48 +0000
+++ tests/unit-tests/surfaces/test_surface_data.cpp	2013-10-02 09:43:03 +0000
@@ -16,7 +16,7 @@
  * Authored by: Kevin DuBois <[e-mail]>
  */
 
-#include "mir/surfaces/surface_data.h"
+#include "src/server/surfaces/surface_data.h"
 
 #include "mir/geometry/rectangle.h"