Merge lp:~aacid/qtubuntu/initialize_tag into lp:qtubuntu

Proposed by Albert Astals Cid
Status: Merged
Approved by: Lukáš Tinkl
Approved revision: 372
Merged at revision: 377
Proposed branch: lp:~aacid/qtubuntu/initialize_tag
Merge into: lp:qtubuntu
Diff against target: 21 lines (+3/-1)
1 file modified
src/ubuntuappmenu/gmenumodelplatformmenu.cpp (+3/-1)
To merge this branch: bzr merge lp:~aacid/qtubuntu/initialize_tag
Reviewer Review Type Date Requested Status
Lukáš Tinkl (community) Approve
Unity8 CI Bot continuous-integration Approve
Review via email: mp+318735@code.launchpad.net

Commit message

Initialize m_tag

It's most probably not needed but it's proper to do.

On what to initialize half of the QPA do 0 and half do this, i went for this

Description of the change

In https://codereview.qt-project.org/#/c/187283/ i'm proposing to remove tag from the pure virtuals the platform has to implement since it means nothing, but meanwhile let's initialize the field.

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

PASSED: Continuous integration, rev:372
https://unity8-jenkins.ubuntu.com/job/lp-qtubuntu-ci/193/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/4276
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/4304
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4138
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4138/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4138
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4138/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4138
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4138/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4138
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4138/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4138
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4138/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4138
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4138/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)
Revision history for this message
Lukáš Tinkl (lukas-kde) wrote :

Yup, makes sense (I see the change got ~accepted upstream as well, good).

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/ubuntuappmenu/gmenumodelplatformmenu.cpp'
2--- src/ubuntuappmenu/gmenumodelplatformmenu.cpp 2017-02-13 16:10:06 +0000
3+++ src/ubuntuappmenu/gmenumodelplatformmenu.cpp 2017-03-02 09:56:39 +0000
4@@ -166,7 +166,8 @@
5 //////////////////////////////////////////////////////////////
6
7 UbuntuPlatformMenu::UbuntuPlatformMenu()
8- : m_parentWindow(nullptr)
9+ : m_tag(reinterpret_cast<quintptr>(this))
10+ , m_parentWindow(nullptr)
11 , m_exporter(nullptr)
12 , m_registrar(nullptr)
13 {
14@@ -380,6 +381,7 @@
15
16 UbuntuPlatformMenuItem::UbuntuPlatformMenuItem()
17 : m_menu(nullptr)
18+ , m_tag(reinterpret_cast<quintptr>(this))
19 {
20 ITEM_DEBUG_MSG << "()";
21 }

Subscribers

People subscribed via source and target branches