Merge lp:~mc-return/unity/unity.merge-fix1131152-cppcheck-issues into lp:unity

[MC Return]

Fixed some issues reported by cppcheck:

* Hopefully fixed memory leak of atk_event.

* size_t index is always unsigned, so the check if it is >= 0
  is redundant and can be removed.
  The else branch will never be executed so it can be removed
  as well.

* Do not assign true to bool odd, because this value is never used.
  Instead declare and assign the value in one line.

* Also initialize the struct LayoutWindow member variable float alpha
  with 0.0f in the LayoutWindow::LayoutWindow(Window xid) constructor.

(LP: #1131152)

Problems reported by cppcheck:

[unity-shared/LayoutSystem.cpp:261]: (warning) Member variable 'LayoutWindow::alpha' is not initialized in the constructor.

[unity-shared/DashStyle.cpp:981] -> [unity-shared/DashStyle.cpp:983]: (performance) Variable 'odd' is reassigned a value before the old one has been used.

[shortcuts/ShortcutHintPrivate.cpp:38]: (style) Unsigned variable 'index' can't be negative so it is unnecessary to test it.

[plugins/unityshell/src/unity-util-accessible.cpp:289]: (error) Memory leak: atk_event

Note:
This MP does not contain any logic changes, so the function GetMetaKey(std::string const& scut) in shortcuts/ShortcutHintPrivate.cpp for example never returned "" before and this behaviour will not change when merging this.

[Andrea Azzarone (azzar1)]

review: Approve

=== modified file 'plugins/unityshell/src/unity-util-accessible.cpp'
--- plugins/unityshell/src/unity-util-accessible.cpp	2012-01-04 01:54:41 +0000
+++ plugins/unityshell/src/unity-util-accessible.cpp	2013-02-21 12:04:22 +0000
@@ -286,6 +286,7 @@
       /* we don't call atk_key_event_from_nux_event_key if the event
          is different to keydown or keyup */
       g_assert_not_reached();
+      g_free(atk_event);
       return NULL;
   }
 

=== modified file 'shortcuts/ShortcutHintPrivate.cpp'
--- shortcuts/ShortcutHintPrivate.cpp	2012-10-18 11:45:32 +0000
+++ shortcuts/ShortcutHintPrivate.cpp	2013-02-21 12:04:22 +0000
@@ -35,10 +35,8 @@
 std::string GetMetaKey(std::string const& scut)
 {
   size_t index = scut.find_last_of( ">");
-  if (index >= 0)
-    return std::string(scut.begin(), scut.begin() + index + 1);
-  else
-    return "";
+
+  return std::string(scut.begin(), scut.begin() + index + 1);
 }
 
 std::string FixShortcutFormat(std::string const& scut)

=== modified file 'unity-shared/DashStyle.cpp'
--- unity-shared/DashStyle.cpp	2013-01-30 09:16:58 +0000
+++ unity-shared/DashStyle.cpp	2013-02-21 12:04:22 +0000
@@ -978,9 +978,8 @@
                                          Segment    segment)
 {
   double radius  = cornerRadius / aspect;
-  bool odd = true;
 
-  odd = cairo_get_line_width (cr) == 2.0 ? false : true;
+  bool odd = cairo_get_line_width (cr) == 2.0 ? false : true;
 
   switch (segment)
   {

=== modified file 'unity-shared/LayoutSystem.cpp'
--- unity-shared/LayoutSystem.cpp	2012-11-13 19:16:59 +0000
+++ unity-shared/LayoutSystem.cpp	2013-02-21 12:04:22 +0000
@@ -264,6 +264,7 @@
  , decoration_height(0)
  , selected(false)
  , aspect_ratio(geo.width / static_cast<float>(geo.height))
+ , alpha(0.0f)
 {
   auto& wm = WindowManager::Default();