Merge lp:~loic.molinari/ubuntu-ui-toolkit/ubuntu-ui-toolkit-unused-variables-removal into lp:ubuntu-ui-toolkit/staging

Proposed by Loïc Molinari
Status: Merged
Approved by: Zsombor Egri
Approved revision: 1384
Merged at revision: 1384
Proposed branch: lp:~loic.molinari/ubuntu-ui-toolkit/ubuntu-ui-toolkit-unused-variables-removal
Merge into: lp:ubuntu-ui-toolkit/staging
Diff against target: 23 lines (+0/-2)
2 files modified
modules/Ubuntu/Components/plugin/uclistitem.cpp (+0/-1)
modules/Ubuntu/Components/plugin/ucviewitemsattached.cpp (+0/-1)
To merge this branch: bzr merge lp:~loic.molinari/ubuntu-ui-toolkit/ubuntu-ui-toolkit-unused-variables-removal
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Zsombor Egri Approve
Review via email: mp+247043@code.launchpad.net

Commit message

Removed unused variables breaking debug builds.

Description of the change

Removed unused variables breaking debug builds.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Zsombor Egri (zsombi) wrote :

This is weird... The original setup does pass on my env, and even on CI did... Thanks of the fix!

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'modules/Ubuntu/Components/plugin/uclistitem.cpp'
--- modules/Ubuntu/Components/plugin/uclistitem.cpp 2015-01-16 14:52:17 +0000
+++ modules/Ubuntu/Components/plugin/uclistitem.cpp 2015-01-20 16:59:31 +0000
@@ -414,7 +414,6 @@
414{414{
415 setHighlighted(false);415 setHighlighted(false);
416 // initiate rebinding only if there were actions tugged416 // initiate rebinding only if there were actions tugged
417 Q_Q(UCListItem);
418 if (!UCActionPanel::isConnected(leadingPanel) &&417 if (!UCActionPanel::isConnected(leadingPanel) &&
419 !UCActionPanel::isConnected(trailingPanel)) {418 !UCActionPanel::isConnected(trailingPanel)) {
420 return;419 return;
421420
=== modified file 'modules/Ubuntu/Components/plugin/ucviewitemsattached.cpp'
--- modules/Ubuntu/Components/plugin/ucviewitemsattached.cpp 2015-01-06 06:11:00 +0000
+++ modules/Ubuntu/Components/plugin/ucviewitemsattached.cpp 2015-01-20 16:59:31 +0000
@@ -75,7 +75,6 @@
75void UCViewItemsAttachedPrivate::clearChangesList()75void UCViewItemsAttachedPrivate::clearChangesList()
76{76{
77 // clear property change objects77 // clear property change objects
78 Q_Q(UCViewItemsAttached);
79 Q_FOREACH(PropertyChange *change, changes) {78 Q_FOREACH(PropertyChange *change, changes) {
80 // deleting PropertyChange will restore the saved property79 // deleting PropertyChange will restore the saved property
81 // to its original binding/value80 // to its original binding/value

Subscribers

People subscribed via source and target branches