Unity

Merge lp:~mc-return/unity/unity.merge-fix-redundant-assignment-of-variables-to-themselves into lp:unity

  1. unity.merge-fix-redundant-assignment-of-variables-to-themselves
  2. Merge into trunk
Proposed by MC Return
Status: Merged
Approved by: Didier Roche-Tolomelli
Approved revision: no longer in the source branch.
Merged at revision: 3024
Proposed branch: lp:~mc-return/unity/unity.merge-fix-redundant-assignment-of-variables-to-themselves
Merge into: lp:unity
Diff against target: 24 lines (+1/-2)
2 files modified
hud/HudController.cpp (+1/-1)
hud/HudView.cpp (+0/-1)
To merge this branch: bzr merge lp:~mc-return/unity/unity.merge-fix-redundant-assignment-of-variables-to-themselves
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Pending
Unity Team Pending
Review via email: mp+142512@code.launchpad.net

Commit message

Removed redundant assignments of variables to themselves.

To post a comment you must log in.
Revision history for this message
Didier Roche-Tolomelli (didrocks) wrote :

seems to be the consequence of too much refactoring. Thanks MC Return! :)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'hud/HudController.cpp'
2--- hud/HudController.cpp 2013-01-07 17:57:43 +0000
3+++ hud/HudController.cpp 2013-01-09 13:23:21 +0000
4@@ -354,7 +354,7 @@
5 }
6 else
7 {
8- focused_app_icon_ = focused_app_icon_ = PKGDATADIR "/launcher_bfb.png";
9+ focused_app_icon_ = PKGDATADIR "/launcher_bfb.png";
10 }
11
12 LOG_DEBUG(logger) << "Taking application icon: " << focused_app_icon_;
13
14=== modified file 'hud/HudView.cpp'
15--- hud/HudView.cpp 2012-11-26 16:09:53 +0000
16+++ hud/HudView.cpp 2013-01-09 13:23:21 +0000
17@@ -226,7 +226,6 @@
18 }
19
20 selected_button_ = 0;
21- queries_ = queries_;
22 buttons_.clear();
23 button_views_->Clear();
24 int found_items = 0;