Merge lp:~alan-griffiths/miral/compatibility-with-mir-trunk into lp:miral

[Alan Griffiths]

Conditionals to handle lp:mir API changes

[Alan Griffiths (alan-griffiths)]

The #pragmas removed are rejected by g++-6

[Gerry Boland (gerboland)]

 #pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Werror"
 #include <private/qsgdefaultimagenode_p.h>
#pragma GCC diagnostic pop

you can remove all the #pragma lines here, the push/pop pointless if you remove the instruction (ignores).

review: Needs Fixing

[lp:~alan-griffiths/miral/compatibility-with-mir-trunk]

261. By Alan Griffiths on 2016-08-08

Nit fix

262. By Alan Griffiths on 2016-08-08

merge lp:miral

[Alan Griffiths (alan-griffiths)]

> you can remove all the #pragma lines here, the push/pop pointless if you
> remove the instruction (ignores).

Done

[Andreas Pokorny (andreas-pokorny)]

ok

review: Approve

[Gerry Boland (gerboland)]

review: Approve

=== modified file 'miral-qt/src/modules/Unity/Application/mirsurfaceitem.cpp'
--- miral-qt/src/modules/Unity/Application/mirsurfaceitem.cpp	2016-07-26 12:45:17 +0000
+++ miral-qt/src/modules/Unity/Application/mirsurfaceitem.cpp	2016-08-08 11:13:36 +0000
@@ -33,10 +33,7 @@
 #include <QQmlEngine>
 #include <QQuickWindow>
 #include <QScreen>
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Werror"
 #include <private/qsgdefaultimagenode_p.h>
-#pragma GCC diagnostic pop
 #include <QTimer>
 #include <QSGTextureProvider>
 

=== modified file 'miral-qt/src/modules/Unity/Application/upstart/applicationinfo.h'
--- miral-qt/src/modules/Unity/Application/upstart/applicationinfo.h	2016-06-01 22:06:51 +0000
+++ miral-qt/src/modules/Unity/Application/upstart/applicationinfo.h	2016-08-08 11:13:36 +0000
@@ -19,10 +19,8 @@
 #define UPSTART_APPLICATION_INFO_H
 
 #include "../applicationinfo.h"
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Werror"
+
 #include <ubuntu-app-launch/application.h>
-#pragma GCC diagnostic pop
 
 namespace qtmir
 {

=== modified file 'miral-qt/src/platforms/mirserver/miropenglcontext.cpp'
--- miral-qt/src/platforms/mirserver/miropenglcontext.cpp	2016-06-21 13:38:53 +0000
+++ miral-qt/src/platforms/mirserver/miropenglcontext.cpp	2016-08-08 11:13:36 +0000
@@ -30,6 +30,12 @@
 // Mir
 #include <mir/graphics/display.h>
 #include <mir/graphics/gl_context.h>
+#include <mir/version.h>
+#if MIR_SERVER_VERSION >= MIR_VERSION_NUMBER(0, 25, 0)
+#include <mir/renderer/gl/context_source.h>
+#include <mir/renderer/gl/context.h>
+#endif
+
 
 // Qt supports one GL context per screen, but also shared contexts.
 // The Mir "Display" generates a shared GL context for all DisplayBuffers
@@ -45,7 +51,11 @@
 #endif
 {
     // create a temporary GL context to fetch the EGL display and config, so Qt can determine the surface format
+#if MIR_SERVER_VERSION < MIR_VERSION_NUMBER(0, 25, 0)
     std::unique_ptr<mir::graphics::GLContext> mirContext = display.create_gl_context();
+#else
+    auto const mirContext = dynamic_cast<mir::renderer::gl::ContextSource&>(display).create_gl_context();
+#endif
     mirContext->make_current();
 
     EGLDisplay eglDisplay = eglGetCurrentDisplay();

=== modified file 'miral-qt/src/platforms/mirserver/screen.cpp'
--- miral-qt/src/platforms/mirserver/screen.cpp	2016-07-21 09:30:45 +0000
+++ miral-qt/src/platforms/mirserver/screen.cpp	2016-08-08 11:13:36 +0000
@@ -214,8 +214,8 @@
     m_type = screen.type;
 
     // Physical screen size
-    m_physicalSize.setWidth(screen.physical_size_mm.width.as_float());
-    m_physicalSize.setHeight(screen.physical_size_mm.height.as_float());
+    m_physicalSize.setWidth(screen.physical_size_mm.width.as_int());
+    m_physicalSize.setHeight(screen.physical_size_mm.height.as_int());
 
     // Screen capabilities
     m_currentModeIndex = screen.current_mode_index;

=== modified file 'miral-qt/tests/framework/fake_surface.h'
--- miral-qt/tests/framework/fake_surface.h	2016-06-07 20:32:04 +0000
+++ miral-qt/tests/framework/fake_surface.h	2016-08-08 11:13:36 +0000
@@ -20,6 +20,7 @@
 #define MIR_SCENE_FAKESURFACE_H_
 
 #include <mir/scene/surface.h>
+#include <mir/version.h>
 #include "stub_input_channel.h"
 
 #include <memory>
@@ -100,6 +101,11 @@
     void set_cursor_stream(std::shared_ptr<frontend::BufferStream> const&, geometry::Displacement const&) {}
     void rename(std::string const&) {}
     std::shared_ptr<frontend::BufferStream> primary_buffer_stream() const override { return nullptr; }
+
+#if MIR_SERVER_VERSION >= MIR_VERSION_NUMBER(0, 25, 0)
+    void set_confine_pointer_state(MirPointerConfinementState) {}
+    MirPointerConfinementState confine_pointer_state() const { return {}; }
+#endif
 };
 
 } // namespace scene

=== modified file 'miral-qt/tests/framework/mock_display.h'
--- miral-qt/tests/framework/mock_display.h	2016-06-01 22:06:51 +0000
+++ miral-qt/tests/framework/mock_display.h	2016-08-08 11:13:36 +0000
@@ -61,6 +61,11 @@
 #if MIR_SERVER_VERSION >= MIR_VERSION_NUMBER(0, 20, 0)
     MOCK_METHOD2(create_virtual_output, std::unique_ptr<mir::graphics::VirtualOutput> (int width, int height));
 #endif
+
+#if MIR_SERVER_VERSION >= MIR_VERSION_NUMBER(0, 25, 0)
+    mir::graphics::NativeDisplay* native_display() { return nullptr; }
+#endif
+
 };
 
 #endif // MOCKDISPLAY_H

=== modified file 'miral-qt/tests/framework/mock_mir_session.h'
--- miral-qt/tests/framework/mock_mir_session.h	2016-06-01 22:06:51 +0000
+++ miral-qt/tests/framework/mock_mir_session.h	2016-08-08 11:13:36 +0000
@@ -20,6 +20,7 @@
 #include <mir/scene/session.h>
 #include <mir/graphics/display_configuration.h>
 #include <mir/scene/surface_creation_parameters.h>
+#include <mir/version.h>
 #include <gmock/gmock.h>
 
 #include <string>
@@ -72,6 +73,12 @@
 
 
 private:
+
+#if MIR_SERVER_VERSION >= MIR_VERSION_NUMBER(0, 25, 0)
+    graphics::BufferID create_buffer(graphics::BufferProperties const&) { return graphics::BufferID{0}; }
+    void destroy_buffer(graphics::BufferID) {}
+    std::shared_ptr<graphics::Buffer> get_buffer(graphics::BufferID) { return {}; }
+#endif
     std::string m_sessionName;
     pid_t m_sessionId;
 };

=== modified file 'miral-qt/tests/framework/mock_surface.h'
--- miral-qt/tests/framework/mock_surface.h	2016-06-01 22:06:51 +0000
+++ miral-qt/tests/framework/mock_surface.h	2016-08-08 11:13:36 +0000
@@ -18,6 +18,7 @@
 #define MOCK_MIR_SCENE_SURFACE_H
 
 #include <mir/scene/surface.h>
+#include <mir/version.h>
 #include <gmock/gmock.h>
 
 #include <string>
@@ -87,6 +88,11 @@
     MOCK_METHOD1(with_most_recent_buffer_do, void(std::function<void(graphics::Buffer&)> const& exec));
 
     MOCK_METHOD2(set_cursor_stream, void(std::shared_ptr<frontend::BufferStream> const&, geometry::Displacement const&));
+
+#if MIR_SERVER_VERSION >= MIR_VERSION_NUMBER(0, 25, 0)
+    void set_confine_pointer_state(MirPointerConfinementState) {}
+    MirPointerConfinementState confine_pointer_state() const { return {}; }
+#endif
 };
 
 } // namespace scene