Merge lp:~mc-return/unity/unity.merge-more-optimizing into lp:unity

[MC Return]

Minor optimizations:

Used 'if (entries_.empty())' instead of 'if (entries_.size() == 0) because it can be faster. xxxx.size() can take linear time while xxxx.empty() is guaranteed to take constant time.

Replaced 'windows.size() > 0' with '!windows.empty()' and '!m_ActionList.size()' with 'm_ActionList.empty()' (x2) in PluginAdapterCompiz.cpp to optimize performance.

Simplified void Indicator::Sync(Indicator::Entries const& new_entries) by removing the assignment of an empty list into an empty list and just using if (!entries_.empty()) instead of the else condition.

Removed redundant parentheses.

Introduced std::size_t num_windows = windows.size(); and changed the if statement in PluginAdapter::ScaleWindowGroup to check num_windows.

Removed declaration of the unused variable 'next_focused_uri'.

Various optimizations.

[MC Return (mc-return)]

Please especially check r2543. I am not entirely sure if this commit is correct.

[Tim Penhey (thumper)]

I know you just changed the logic in UnityCore/Indicator.cpp, but the code isn't needed, so delete the block where we are assigning an empty list into an empty list, and just use
  if (!entries_.empty())
instead of the else condition.

In PluginAdapter::ScaleWindowGroup we are already caring about the size, so get it once before the if statement.

  std::size_t num_windows = windows.size();
  if (num_windows > 1 || (force && num_windows))

review: Needs Fixing

[MC Return (mc-return)]

> I know you just changed the logic in UnityCore/Indicator.cpp, but the code
> isn't needed, so delete the block where we are assigning an empty list into an
> empty list, and just use
> if (!entries_.empty())
> instead of the else condition.

Fixed. Also removed redundant parentheses.

> In PluginAdapter::ScaleWindowGroup we are already caring about the size, so
> get it once before the if statement.
>
> std::size_t num_windows = windows.size();
> if (num_windows > 1 || (force && num_windows))

Done.

[MC Return (mc-return)]

review: Resubmit

[Tim Penhey (thumper)]

review: Approve

[Unity Merger (unity-merger)]

The Jenkins job https://jenkins.qa.ubuntu.com/job/automerge-unity/1060/console reported an error when processing this lp:~mc-return/unity/unity.merge-more-optimizing branch.
Not merging it.

[lp:~mc-return/unity/unity.merge-more-optimizing]

2548. By MC Return on 2012-08-17

Merged lp:unity

2549. By MC Return on 2012-08-17

Fixed compilation by reverting r2543

[Tim Penhey (thumper)]

review: Approve

=== modified file 'UnityCore/Indicator.cpp'
--- UnityCore/Indicator.cpp	2012-06-18 02:57:23 +0000
+++ UnityCore/Indicator.cpp	2012-08-17 06:20:24 +0000
@@ -64,18 +64,12 @@
 {
   Entries to_rm;
 
-  if (entries_.size() == 0)
-  {
-    to_rm = entries_;
-  }
-  else
+  if (!entries_.empty())
   {
     for (auto entry : entries_)
     {
       if (std::find(new_entries.begin(), new_entries.end(), entry) == new_entries.end())
-      {
         to_rm.push_back(entry);
-      }
     }
   }
 

=== modified file 'dash/ResultViewGrid.cpp'
--- dash/ResultViewGrid.cpp	2012-08-15 09:54:22 +0000
+++ dash/ResultViewGrid.cpp	2012-08-17 06:20:24 +0000
@@ -404,7 +404,6 @@
   if (focused_uri_.empty())
     focused_uri_ = results_.front().uri;
 
-  std::string next_focused_uri;
   ResultList::iterator it;
   int items_per_row = GetItemsPerRow();
   int total_rows = std::ceil(results_.size() / static_cast<float>(items_per_row)); // items per row is always at least 1

=== modified file 'unity-shared/PluginAdapterCompiz.cpp'
--- unity-shared/PluginAdapterCompiz.cpp	2012-08-10 22:55:17 +0000
+++ unity-shared/PluginAdapterCompiz.cpp	2012-08-17 06:20:24 +0000
@@ -242,7 +242,7 @@
 MultiActionList::InitiateAll(CompOption::Vector& extraArgs, int state)
 {
   CompOption::Vector argument;
-  if (!m_ActionList.size())
+  if (m_ActionList.empty())
     return;
 
   argument.resize(1);
@@ -269,7 +269,7 @@
 {
   CompOption::Vector argument;
   CompOption::Value  value;
-  if (!m_ActionList.size())
+  if (m_ActionList.empty())
     return;
 
   argument.resize(1);
@@ -821,7 +821,8 @@
 bool
 PluginAdapter::ScaleWindowGroup(std::vector<Window> windows, int state, bool force)
 {
-  if (windows.size() > 1 || (force && windows.size() > 0))
+  std::size_t num_windows = windows.size();
+  if (num_windows > 1 || (force && num_windows))
   {
     std::string match = MatchStringForXids(&windows);
     InitiateScale(match, state);