Merge lp:~mc-return/unity/unity.merge-optimize-performance-and-style into lp:unity

[MC Return]

Optimized performance and style following suggestions reported by cppcheck:

1. Reduced the scope of various variables.

2. Used prefix ++ operators for non-primitive types, because those can be more efficient than post-increment. Post-increment usually keeps a copy of the previous value, adds extra code and is slower.

Optimized performance and style following suggestions reported by cppcheck:

1. Reduced the scope of various variables.

2. Used prefix ++ operators for non-primitive types, because those can be more efficient than post-increment. Post-increment usually keeps a copy of the previous value, adds extra code and is slower.

[Marco Trevisan (Treviño) (3v1n0)]

Nice, thanks!

review: Approve

[Unity Merger (unity-merger)]

No commit message specified.

[MC Return (mc-return)]

> No commit message specified.

Fixed.

review: Resubmit

[Brandon Schaefer (brandontschaefer)]

Looks good, Thank you!

review: Approve

[Unity Merger (unity-merger)]

The Jenkins job https://jenkins.qa.ubuntu.com/job/automerge-unity/980/console reported an error when processing this lp:~mc-return/unity/unity.merge-optimize-performance-and-style branch.
Not merging it.

[Andrea Azzarone (azzar1)]

I prefer to use pre-increment operator for primitive types too.

[Unity Merger (unity-merger)]

The Jenkins job https://jenkins.qa.ubuntu.com/job/automerge-unity/981/console reported an error when processing this lp:~mc-return/unity/unity.merge-optimize-performance-and-style branch.
Not merging it.

[Unity Merger (unity-merger)]

The Jenkins job https://jenkins.qa.ubuntu.com/job/automerge-unity/982/console reported an error when processing this lp:~mc-return/unity/unity.merge-optimize-performance-and-style branch.
Not merging it.

=== modified file 'UnityCore/HomeLens.cpp'
--- UnityCore/HomeLens.cpp	2012-03-30 10:29:51 +0000
+++ UnityCore/HomeLens.cpp	2012-07-30 17:43:18 +0000
@@ -105,7 +105,7 @@
     /* Any existing categories with offsets >= target_cat_offset must be
      * pushed up. Update both maps by id and display name */
     std::map<std::string,unsigned int>::iterator end = reg_by_id_.end();
-    for (i = reg_by_id_.begin(); i != end; i++)
+    for (i = reg_by_id_.begin(); i != end; ++i)
     {
       if (i->second >= target_cat_offset)
       {
@@ -114,7 +114,7 @@
       }
     }
 
-    for (i = reg_by_display_name_.begin(), end = reg_by_display_name_.end(); i != end; i++)
+    for (i = reg_by_display_name_.begin(), end = reg_by_display_name_.end(); i != end; ++i)
     {
       if (i->second >= target_cat_offset)
       {
@@ -637,7 +637,7 @@
    * the category offset in the corresponding rows in the target model
    */
   for (i = source_to_target_tags_.begin(), end = source_to_target_tags_.end();
-       i != end; i++)
+       i != end; ++i)
   {
     source = i->first;
     target_tag = i->second;

=== modified file 'dash/ResultView.cpp'
--- dash/ResultView.cpp	2012-07-04 02:37:23 +0000
+++ dash/ResultView.cpp	2012-07-30 17:43:18 +0000
@@ -97,7 +97,7 @@
   ResultList::iterator it;
   std::string uri = result.uri;
 
-  for (it = results_.begin(); it != results_.end(); it++)
+  for (it = results_.begin(); it != results_.end(); ++it)
   {
     if (result.uri == (*it).uri)
     {

=== modified file 'dash/ResultViewGrid.cpp'
--- dash/ResultViewGrid.cpp	2012-07-04 02:37:23 +0000
+++ dash/ResultViewGrid.cpp	2012-07-30 17:43:18 +0000
@@ -354,7 +354,7 @@
   total_rows = (expanded) ? total_rows : 1; // restrict to one row if not expanded
 
   // find the currently focused item
-  for (it = results_.begin(); it != results_.end(); it++)
+  for (it = results_.begin(); it != results_.end(); ++it)
   {
     std::string result_uri = (*it).uri;
     if (result_uri == focused_uri_)

=== modified file 'launcher/Launcher.cpp'
--- launcher/Launcher.cpp	2012-07-27 11:49:35 +0000
+++ launcher/Launcher.cpp	2012-07-30 17:43:18 +0000
@@ -473,7 +473,7 @@
 
   // animations happening on specific icons
   LauncherModel::iterator it;
-  for (it = _model->begin(); it != _model->end(); it++)
+  for (it = _model->begin(); it != _model->end(); ++it)
     if (IconNeedsAnimation(*it, current))
       return true;
 
@@ -997,7 +997,7 @@
   // compute required height of launcher AND folding threshold
   float sum = 0.0f + center.y;
   float folding_threshold = launcher_height - _icon_size / 2.5f;
-  for (it = _model->begin(); it != _model->end(); it++)
+  for (it = _model->begin(); it != _model->end(); ++it)
   {
     float height = (_icon_size + _space_between_icons) * IconVisibleProgress(*it, current);
     sum += height;
@@ -1106,7 +1106,7 @@
   // wont start jumping around).  As a general rule ANY if () statements that modify center.y should be seen
   // as bugs.
   int index = 1;
-  for (it = _model->main_begin(); it != _model->main_end(); it++)
+  for (it = _model->main_begin(); it != _model->main_end(); ++it)
   {
     RenderArg arg;
     AbstractLauncherIcon::Ptr icon = *it;
@@ -1120,7 +1120,7 @@
 
   // compute maximum height of shelf
   float shelf_sum = 0.0f;
-  for (it = _model->shelf_begin(); it != _model->shelf_end(); it++)
+  for (it = _model->shelf_begin(); it != _model->shelf_end(); ++it)
   {
     float height = (_icon_size + _space_between_icons) * IconVisibleProgress(*it, current);
     shelf_sum += height;
@@ -1134,7 +1134,7 @@
   folding_threshold += shelf_delta;
   center.y += shelf_delta;
 
-  for (it = _model->shelf_begin(); it != _model->shelf_end(); it++)
+  for (it = _model->shelf_begin(); it != _model->shelf_end(); ++it)
   {
     RenderArg arg;
     AbstractLauncherIcon::Ptr icon = *it;
@@ -1908,7 +1908,7 @@
   EventLogic();
 
   /* draw launcher */
-  for (rev_it = args.rbegin(); rev_it != args.rend(); rev_it++)
+  for (rev_it = args.rbegin(); rev_it != args.rend(); ++rev_it)
   {
     if ((*rev_it).stick_thingy)
       gPainter.Paint2DQuadColor(GfxContext,
@@ -2114,7 +2114,7 @@
           AbstractLauncherIcon::Ptr iconBeforeHover;
           LauncherModel::iterator it;
           LauncherModel::iterator prevIt = _model->end();
-          for (it = _model->begin(); it != _model->end(); it++)
+          for (it = _model->begin(); it != _model->end(); ++it)
           {
             if (!(*it)->GetQuirk(AbstractLauncherIcon::QUIRK_VISIBLE) || !(*it)->IsVisibleOnMonitor(monitor))
               continue;
@@ -2460,7 +2460,7 @@
   nux::Point2 mouse_position(x, y);
   int inside = 0;
 
-  for (it = _model->begin(); it != _model->end(); it++)
+  for (it = _model->begin(); it != _model->end(); ++it)
   {
     if (!(*it)->GetQuirk(AbstractLauncherIcon::QUIRK_VISIBLE) || !(*it)->IsVisibleOnMonitor(monitor))
       continue;

=== modified file 'launcher/LauncherController.cpp'
--- launcher/LauncherController.cpp	2012-07-25 23:18:17 +0000
+++ launcher/LauncherController.cpp	2012-07-30 17:43:18 +0000
@@ -940,7 +940,7 @@
   LauncherModel::iterator it;
 
   // Shortcut to start launcher icons. Only relies on Keycode, ignore modifier
-  for (it = pimpl->model_->begin(); it != pimpl->model_->end(); it++)
+  for (it = pimpl->model_->begin(); it != pimpl->model_->end(); ++it)
   {
     if ((XKeysymToKeycode(display, (*it)->GetShortcut()) == key_code) ||
         ((gchar)((*it)->GetShortcut()) == key_string[0]))

=== modified file 'launcher/LauncherModel.cpp'
--- launcher/LauncherModel.cpp	2012-07-09 11:21:08 +0000
+++ launcher/LauncherModel.cpp	2012-07-30 17:43:18 +0000
@@ -79,14 +79,14 @@
   iterator it, it2;
 
   int i = 0;
-  for (it = main_begin(); it != main_end(); it++)
+  for (it = main_begin(); it != main_end(); ++it)
   {
     _inner.push_back(*it);
     (*it)->SetSortPriority(i);
     ++i;
   }
 
-  for (it = shelf_begin(); it != shelf_end(); it++)
+  for (it = shelf_begin(); it != shelf_end(); ++it)
   {
     _inner.push_back(*it);
     (*it)->SetSortPriority(i);
@@ -409,7 +409,7 @@
   int i;
 
   // start currently selected icon
-  for (it = _inner.begin(), i = 0; it != _inner.end(); it++, i++)
+  for (it = _inner.begin(), i = 0; it != _inner.end(); ++it, i++)
   {
     if (i == index)
       return it;

=== modified file 'panel/PanelIndicatorEntryView.cpp'
--- panel/PanelIndicatorEntryView.cpp	2012-05-07 22:28:17 +0000
+++ panel/PanelIndicatorEntryView.cpp	2012-07-30 17:43:18 +0000
@@ -429,7 +429,6 @@
   unsigned int width = 0;
   unsigned int icon_width = 0;
   unsigned int height = panel::Style::Instance().panel_height;
-  unsigned int text_width = 0;
 
   // First lets figure out our size
   if (pixbuf && IsIconVisible())
@@ -484,7 +483,7 @@
     pango_layout_context_changed(layout);
 
     pango_layout_get_extents(layout, nullptr, &log_rect);
-    text_width = log_rect.width / PANGO_SCALE;
+    unsigned int text_width = log_rect.width / PANGO_SCALE;
 
     if (icon_width)
       width += spacing_;

=== modified file 'panel/PanelMenuView.cpp'
--- panel/PanelMenuView.cpp	2012-07-09 11:21:08 +0000
+++ panel/PanelMenuView.cpp	2012-07-30 17:43:18 +0000
@@ -700,7 +700,6 @@
   using namespace panel;
   cairo_t* cr;
   cairo_pattern_t* linpat;
-  const int fading_pixels = 35;
   int x = MAIN_LEFT_PADDING + TITLE_PADDING + geo.x;
   int y = geo.y;
 
@@ -762,6 +761,7 @@
   if (text_width > text_space)
   {
     int out_pixels = text_width - text_space;
+    const int fading_pixels = 35;
     int fading_width = out_pixels < fading_pixels ? out_pixels : fading_pixels;
 
     cairo_push_group(cr);

=== modified file 'plugins/unity-mt-grab-handles/src/unity-mt-grab-handles.cpp'
--- plugins/unity-mt-grab-handles/src/unity-mt-grab-handles.cpp	2012-04-06 10:23:49 +0000
+++ plugins/unity-mt-grab-handles/src/unity-mt-grab-handles.cpp	2012-07-30 17:43:18 +0000
@@ -292,7 +292,7 @@
           CompWindowVector::const_iterator cit = clientListStacking.begin();
           CompWindowVector::const_iterator oit = mLastClientListStacking.begin();
 
-          for (; cit != clientListStacking.end(); cit++, oit++)
+          for (; cit != clientListStacking.end(); ++cit, oit++)
           {
             /* All clients from this point onwards in cit are invalidated
              * so splice the list to the end of the new client list

=== modified file 'plugins/unitydialog/src/unitydialog.cpp'
--- plugins/unitydialog/src/unitydialog.cpp	2012-06-18 02:57:23 +0000
+++ plugins/unitydialog/src/unitydialog.cpp	2012-07-30 17:43:18 +0000
@@ -367,7 +367,7 @@
       continue;
     }
 
-    it++;
+    ++it;
   }
 }
 
@@ -1383,7 +1383,6 @@
     CompWindow::Geometry transientGeometry;
     CompRegion transientPos, outputRegion, outsideArea, outsideRegion;
     pos = getChildCenteredPositionForRect(mParent->serverBorderRect());
-    int    hdirection, vdirection;
 
     transientGeometry = CompWindow::Geometry(pos.x(),
                                              pos.y(),
@@ -1406,8 +1405,8 @@
       int width;
       int height;
 
-      hdirection = outsideArea.boundingRect().x() < 0 ? 1 : -1;
-      vdirection = outsideArea.boundingRect().y() < 0 ? 1 : -1;
+      int hdirection = outsideArea.boundingRect().x() < 0 ? 1 : -1;
+      int vdirection = outsideArea.boundingRect().y() < 0 ? 1 : -1;
 
       width  = outsideArea.boundingRect().width() >=
                window->serverBorderRect().width() ? 0 :

=== modified file 'plugins/unityshell/src/nux-layout-accessible.cpp'
--- plugins/unityshell/src/nux-layout-accessible.cpp	2011-08-01 17:08:48 +0000
+++ plugins/unityshell/src/nux-layout-accessible.cpp	2012-07-30 17:43:18 +0000
@@ -203,7 +203,7 @@
 
   element_list = layout->GetChildren();
 
-  for (it = element_list.begin(); it != element_list.end(); it++, result++)
+  for (it = element_list.begin(); it != element_list.end(); ++it, result++)
   {
     current_area = *it;
     if (current_area == area)

=== modified file 'plugins/unityshell/src/unity-launcher-accessible.cpp'
--- plugins/unityshell/src/unity-launcher-accessible.cpp	2012-06-18 02:57:23 +0000
+++ plugins/unityshell/src/unity-launcher-accessible.cpp	2012-07-30 17:43:18 +0000
@@ -441,7 +441,7 @@
   if (launcher_model == NULL)
     return;
 
-  for (it = launcher_model->begin(); it != launcher_model->end(); it++)
+  for (it = launcher_model->begin(); it != launcher_model->end(); ++it)
   {
     child =  dynamic_cast<nux::Object*>((*it).GetPointer());
     child_accessible = unity_a11y_get_accessible(child);

=== modified file 'plugins/unityshell/src/unity-switcher-accessible.cpp'
--- plugins/unityshell/src/unity-switcher-accessible.cpp	2012-03-14 06:24:18 +0000
+++ plugins/unityshell/src/unity-switcher-accessible.cpp	2012-07-30 17:43:18 +0000
@@ -404,7 +404,7 @@
   if (switcher_model == NULL)
     return;
 
-  for (it = switcher_model->begin(); it != switcher_model->end(); it++)
+  for (it = switcher_model->begin(); it != switcher_model->end(); ++it)
   {
     child = *it;
     child_accessible = unity_launcher_icon_accessible_new(child.GetPointer());

=== modified file 'plugins/unityshell/src/unityshell.cpp'
--- plugins/unityshell/src/unityshell.cpp	2012-07-19 00:21:25 +0000
+++ plugins/unityshell/src/unityshell.cpp	2012-07-30 17:43:18 +0000
@@ -1211,7 +1211,7 @@
   CompWindowList const& wins = screen->windows();
   for ( CompWindowList::const_reverse_iterator r = wins.rbegin()
       ; r != wins.rend()
-      ; r++
+      ; ++r
       )
   {
     CompWindow* w = *r;
@@ -1309,10 +1309,9 @@
                                            ::GLFramebufferObject *fbo,
                                            unsigned int        mask)
 {
-  bool useFbo = false;
-
   if (doShellRepaint)
   {
+    bool useFbo = false;
     oldFbo = fbo->bind ();
     useFbo = fbo->checkStatus () && fbo->tex ();
     if (!useFbo) {
@@ -2166,10 +2165,9 @@
 {
   // Look to see if there is a keycode.  If there is, then this isn't a
   // modifier only keybinding.
-  int key_code = 0;
   if (options[6].type() != CompOption::TypeUnset)
   {
-    key_code = options[6].value().i();
+    int key_code = options[6].value().i();
     LOG_DEBUG(logger) << "HUD initiate key code: " << key_code;
     // show it now, no timings or terminate needed.
     return ShowHud();

=== modified file 'unity-shared/BGHash.cpp'
--- unity-shared/BGHash.cpp	2012-06-18 02:57:23 +0000
+++ unity-shared/BGHash.cpp	2012-07-30 17:43:18 +0000
@@ -155,7 +155,6 @@
   colors[10] = nux::Color (0x1b134c);
   colors[11] = nux::Color (0x2c0d46);
 
-  float closest_diff = 200.0f;
   nux::Color chosen_color;
   nux::color::HueSaturationValue base_hsv (base_color);
 
@@ -168,6 +167,7 @@
   }
   else
   {
+    float closest_diff = 200.0f;
     LOG_DEBUG (logger) << "got a colour image";
     // full colour image
     for (int i = 0; i < 11; i++)

=== modified file 'unity-shared/DashStyle.cpp'
--- unity-shared/DashStyle.cpp	2012-07-22 23:09:02 +0000
+++ unity-shared/DashStyle.cpp	2012-07-30 17:43:18 +0000
@@ -1648,7 +1648,6 @@
   double height = h - (2.0 * garnish) - 1.0;
 
   bool odd = true;
-  double radius = 7.0;
 
   // draw the grid background
   {
@@ -1656,6 +1655,7 @@
     cairo_move_to(cr, _align(x + width, odd), y);
     if (curve_bottom)
     {
+      double radius = 7.0;
       LOG_DEBUG(logger) << "curve: " << _align(x + width, odd) << " - " << _align(y + height - radius, odd);
       // line to bottom-right corner
       cairo_line_to(cr, _align(x + width, odd), _align(y + height - radius, odd));

=== modified file 'unity-shared/IconRenderer.cpp'
--- unity-shared/IconRenderer.cpp	2012-07-22 23:12:28 +0000
+++ unity-shared/IconRenderer.cpp	2012-07-30 17:43:18 +0000
@@ -250,7 +250,7 @@
 
   std::list<RenderArg>::iterator it;
   int i;
-  for (it = args.begin(), i = 0; it != args.end(); it++, i++)
+  for (it = args.begin(), i = 0; it != args.end(); ++it, i++)
   {
 
     IconTextureSource* launcher_icon = it->icon;
@@ -757,7 +757,6 @@
   CHECKGL(glBindBufferARB(GL_ARRAY_BUFFER_ARB, 0));
   CHECKGL(glBindBufferARB(GL_ELEMENT_ARRAY_BUFFER_ARB, 0));
 
-  int TextureObjectLocation;
   int VertexLocation;
   int TextureCoord0Location;
   int FragmentColor = 0;
@@ -768,7 +767,7 @@
   {
     local::shader_program_uv_persp_correction->Begin();
 
-    TextureObjectLocation   = local::shader_program_uv_persp_correction->GetUniformLocationARB("TextureObject0");
+    int TextureObjectLocation   = local::shader_program_uv_persp_correction->GetUniformLocationARB("TextureObject0");
     VertexLocation          = local::shader_program_uv_persp_correction->GetAttributeLocation("iVertex");
     TextureCoord0Location   = local::shader_program_uv_persp_correction->GetAttributeLocation("iTexCoord0");
     FragmentColor           = local::shader_program_uv_persp_correction->GetUniformLocationARB("color0");

=== modified file 'unity-shared/PluginAdapterCompiz.cpp'
--- unity-shared/PluginAdapterCompiz.cpp	2012-07-04 02:37:23 +0000
+++ unity-shared/PluginAdapterCompiz.cpp	2012-07-30 17:43:18 +0000
@@ -1010,7 +1010,7 @@
   }
   else
   {
-    for (it = window_list.begin(); it != window_list.end(); it++)
+    for (it = window_list.begin(); it != window_list.end(); ++it)
     {
       if (CheckWindowIntersection(region, *it))
       {