Merge lp:~alan-griffiths/qtmir/tidy-code into lp:qtmir

Proposed by Alan Griffiths
Status: Approved
Approved by: Gerry Boland
Approved revision: 638
Proposed branch: lp:~alan-griffiths/qtmir/tidy-code
Merge into: lp:qtmir
Diff against target: 61 lines (+1/-7)
4 files modified
src/modules/Unity/Application/mirsurface.cpp (+0/-4)
src/platforms/mirserver/windowmanagementpolicy.cpp (+1/-1)
tests/framework/fake_displayconfigurationoutput.h (+0/-1)
tests/framework/fake_surface.h (+0/-1)
To merge this branch: bzr merge lp:~alan-griffiths/qtmir/tidy-code
Reviewer Review Type Date Requested Status
Gerry Boland (community) Approve
Unity8 CI Bot (community) continuous-integration Approve
Review via email: mp+321545@code.launchpad.net

Commit message

Remove legacy of support for older Mir versions.

Description of the change

Remove legacy of support for older Mir versions.

We don't intend to build with Mir versions prior to 0.26

(With the exception of src/platforms/mirserver/miral/persist_display_config.cpp - which may need to support Mir 0.24 if moved to MirAL.)

To post a comment you must log in.
Revision history for this message
Unity8 CI Bot (unity8-ci-bot) wrote :

PASSED: Continuous integration, rev:638
https://unity8-jenkins.ubuntu.com/job/lp-qtmir-ci/650/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/4800
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/4828
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4640
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4640/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4640
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4640/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4640
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4640/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4640
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4640/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4640
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4640/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4640
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4640/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-qtmir-ci/650/rebuild

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

ok

review: Approve

Unmerged revisions

638. By Alan Griffiths

s/surface/window/

637. By Alan Griffiths

Delete unnecessary includes

636. By Alan Griffiths

Drop compatibility with Mir 0.25

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/modules/Unity/Application/mirsurface.cpp'
2--- src/modules/Unity/Application/mirsurface.cpp 2017-03-28 17:13:24 +0000
3+++ src/modules/Unity/Application/mirsurface.cpp 2017-03-31 11:16:23 +0000
4@@ -106,9 +106,7 @@
5 void renamed(char const * name) override;
6 void cursor_image_removed() override;
7
8-#if MIR_SERVER_VERSION >= MIR_VERSION_NUMBER(0, 25, 0)
9 void placed_relative(mir::geometry::Rectangle const& placement) override;
10-#endif
11
12 #if MIR_SERVER_VERSION >= MIR_VERSION_NUMBER(0, 27, 0)
13 void input_consumed(MirEvent const* event) override;
14@@ -1217,11 +1215,9 @@
15 Q_EMIT cursorChanged(QCursor());
16 }
17
18-#if MIR_SERVER_VERSION >= MIR_VERSION_NUMBER(0, 25, 0)
19 void MirSurface::SurfaceObserverImpl::placed_relative(mir::geometry::Rectangle const& /*placement*/)
20 {
21 }
22-#endif
23
24 void MirSurface::SurfaceObserverImpl::attrib_changed(MirWindowAttrib attribute, int value)
25 {
26
27=== modified file 'src/platforms/mirserver/windowmanagementpolicy.cpp'
28--- src/platforms/mirserver/windowmanagementpolicy.cpp 2017-03-24 11:29:56 +0000
29+++ src/platforms/mirserver/windowmanagementpolicy.cpp 2017-03-31 11:16:23 +0000
30@@ -65,7 +65,7 @@
31
32 QSize initialSize = InitialSurfaceSizes::get(miral::pid_of(appInfo.application()));
33
34- if (initialSize.isValid() && surfaceType == mir_surface_type_normal) {
35+ if (initialSize.isValid() && surfaceType == mir_window_type_normal) {
36 parameters.size() = toMirSize(initialSize);
37 }
38 }
39
40=== modified file 'tests/framework/fake_displayconfigurationoutput.h'
41--- tests/framework/fake_displayconfigurationoutput.h 2017-02-02 13:13:39 +0000
42+++ tests/framework/fake_displayconfigurationoutput.h 2017-03-31 11:16:23 +0000
43@@ -18,7 +18,6 @@
44 #define FAKE_DISPLAYCONFIGURATIONOUTPUT_H
45
46 #include <mir/graphics/display_configuration.h>
47-#include <mir/version.h>
48
49 #include <vector>
50
51
52=== modified file 'tests/framework/fake_surface.h'
53--- tests/framework/fake_surface.h 2017-03-24 17:00:08 +0000
54+++ tests/framework/fake_surface.h 2017-03-31 11:16:23 +0000
55@@ -20,7 +20,6 @@
56 #define MIR_SCENE_FAKESURFACE_H_
57
58 #include <mir/scene/surface.h>
59-#include <mir/version.h>
60 #include <memory>
61 #include <gmock/gmock.h>
62

Subscribers

People subscribed via source and target branches