qtubuntu

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

  1. remove_unused_signal
  2. Merge into trunk
Proposed by Albert Astals Cid
Status: Merged
Approved by: Lukáš Tinkl
Approved revision: 385
Merged at revision: 387
Proposed branch: lp:~aacid/qtubuntu/remove_unused_signal
Merge into: lp:qtubuntu
Diff against target: 127 lines (+0/-15)
2 files modified
src/ubuntuappmenu/gmenumodelplatformmenu.cpp (+0/-13)
src/ubuntuappmenu/gmenumodelplatformmenu.h (+0/-2)
To merge this branch: bzr merge lp:~aacid/qtubuntu/remove_unused_signal
Reviewer Review Type Date Requested Status
Lukáš Tinkl (community) Approve
Unity8 CI Bot continuous-integration Approve
Review via email: mp+321041@code.launchpad.net

Commit message

Remove signal noone uses

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

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

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

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

LGTM, makes sense, CI passing too

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'src/ubuntuappmenu/gmenumodelplatformmenu.cpp'
--- src/ubuntuappmenu/gmenumodelplatformmenu.cpp 2017-03-13 14:16:52 +0000
+++ src/ubuntuappmenu/gmenumodelplatformmenu.cpp 2017-03-27 08:22:32 +0000
@@ -241,7 +241,6 @@
241 MENU_DEBUG_MSG << "(text=" << text << ")";241 MENU_DEBUG_MSG << "(text=" << text << ")";
242 if (m_text != text) {242 if (m_text != text) {
243 m_text = text;243 m_text = text;
244 Q_EMIT propertyChanged();
245 }244 }
246}245}
247246
@@ -251,7 +250,6 @@
251250
252 if (!icon.isNull() || (!m_icon.isNull() && icon.isNull())) {251 if (!icon.isNull() || (!m_icon.isNull() && icon.isNull())) {
253 m_icon = icon;252 m_icon = icon;
254 Q_EMIT propertyChanged();
255 }253 }
256}254}
257255
@@ -262,7 +260,6 @@
262 if (m_enabled != enabled) {260 if (m_enabled != enabled) {
263 m_enabled = enabled;261 m_enabled = enabled;
264 Q_EMIT enabledChanged(enabled);262 Q_EMIT enabledChanged(enabled);
265 Q_EMIT propertyChanged();
266 }263 }
267}264}
268265
@@ -272,7 +269,6 @@
272269
273 if (m_visible != isVisible) {270 if (m_visible != isVisible) {
274 m_visible = isVisible;271 m_visible = isVisible;
275 Q_EMIT propertyChanged();
276 }272 }
277}273}
278274
@@ -404,7 +400,6 @@
404 ITEM_DEBUG_MSG << "(text=" << text << ")";400 ITEM_DEBUG_MSG << "(text=" << text << ")";
405 if (m_text != text) {401 if (m_text != text) {
406 m_text = text;402 m_text = text;
407 Q_EMIT propertyChanged();
408 }403 }
409}404}
410405
@@ -414,7 +409,6 @@
414409
415 if (!icon.isNull() || (!m_icon.isNull() && icon.isNull())) {410 if (!icon.isNull() || (!m_icon.isNull() && icon.isNull())) {
416 m_icon = icon;411 m_icon = icon;
417 Q_EMIT propertyChanged();
418 }412 }
419}413}
420414
@@ -423,7 +417,6 @@
423 ITEM_DEBUG_MSG << "(visible=" << isVisible << ")";417 ITEM_DEBUG_MSG << "(visible=" << isVisible << ")";
424 if (m_visible != isVisible) {418 if (m_visible != isVisible) {
425 m_visible = isVisible;419 m_visible = isVisible;
426 Q_EMIT propertyChanged();
427 }420 }
428}421}
429422
@@ -432,7 +425,6 @@
432 ITEM_DEBUG_MSG << "(separator=" << isSeparator << ")";425 ITEM_DEBUG_MSG << "(separator=" << isSeparator << ")";
433 if (m_separator != isSeparator) {426 if (m_separator != isSeparator) {
434 m_separator = isSeparator;427 m_separator = isSeparator;
435 Q_EMIT propertyChanged();
436 }428 }
437}429}
438430
@@ -453,7 +445,6 @@
453 ITEM_DEBUG_MSG << "(checkable=" << checkable << ")";445 ITEM_DEBUG_MSG << "(checkable=" << checkable << ")";
454 if (m_checkable != checkable) {446 if (m_checkable != checkable) {
455 m_checkable = checkable;447 m_checkable = checkable;
456 Q_EMIT propertyChanged();
457 }448 }
458}449}
459450
@@ -463,7 +454,6 @@
463 if (m_checked != isChecked) {454 if (m_checked != isChecked) {
464 m_checked = isChecked;455 m_checked = isChecked;
465 Q_EMIT checkedChanged(isChecked);456 Q_EMIT checkedChanged(isChecked);
466 Q_EMIT propertyChanged();
467 }457 }
468}458}
469459
@@ -472,7 +462,6 @@
472 ITEM_DEBUG_MSG << "(shortcut=" << shortcut << ")";462 ITEM_DEBUG_MSG << "(shortcut=" << shortcut << ")";
473 if (m_shortcut != shortcut) {463 if (m_shortcut != shortcut) {
474 m_shortcut = shortcut;464 m_shortcut = shortcut;
475 Q_EMIT propertyChanged();
476 }465 }
477}466}
478467
@@ -482,7 +471,6 @@
482 if (m_enabled != enabled) {471 if (m_enabled != enabled) {
483 m_enabled = enabled;472 m_enabled = enabled;
484 Q_EMIT enabledChanged(enabled);473 Q_EMIT enabledChanged(enabled);
485 Q_EMIT propertyChanged();
486 }474 }
487}475}
488476
@@ -497,7 +485,6 @@
497 ITEM_DEBUG_MSG << "(menu=" << menu << ")";485 ITEM_DEBUG_MSG << "(menu=" << menu << ")";
498 if (m_menu != menu) {486 if (m_menu != menu) {
499 m_menu = menu;487 m_menu = menu;
500 Q_EMIT propertyChanged();
501488
502 if (menu) {489 if (menu) {
503 connect(menu, &QObject::destroyed,490 connect(menu, &QObject::destroyed,
504491
=== modified file 'src/ubuntuappmenu/gmenumodelplatformmenu.h'
--- src/ubuntuappmenu/gmenumodelplatformmenu.h 2017-03-20 17:30:48 +0000
+++ src/ubuntuappmenu/gmenumodelplatformmenu.h 2017-03-27 08:22:32 +0000
@@ -112,7 +112,6 @@
112 void menuItemRemoved(QPlatformMenuItem *menuItem);112 void menuItemRemoved(QPlatformMenuItem *menuItem);
113 void structureChanged();113 void structureChanged();
114 void enabledChanged(bool);114 void enabledChanged(bool);
115 void propertyChanged();
116115
117private:116private:
118 MENU_PROPERTY(UbuntuPlatformMenu, visible, bool, true)117 MENU_PROPERTY(UbuntuPlatformMenu, visible, bool, true)
@@ -160,7 +159,6 @@
160Q_SIGNALS:159Q_SIGNALS:
161 void checkedChanged(bool);160 void checkedChanged(bool);
162 void enabledChanged(bool);161 void enabledChanged(bool);
163 void propertyChanged();
164162
165private:163private:
166 MENU_PROPERTY(UbuntuPlatformMenuItem, separator, bool, false)164 MENU_PROPERTY(UbuntuPlatformMenuItem, separator, bool, false)

Subscribers

People subscribed via source and target branches