Merge lp:~mc-return/unity/unity.merge-fix-member-variables-not-initialized-in-their-constructors into lp:unity

Proposed by MC Return
Status: Merged
Approved by: Brandon Schaefer
Approved revision: no longer in the source branch.
Merged at revision: 2902
Proposed branch: lp:~mc-return/unity/unity.merge-fix-member-variables-not-initialized-in-their-constructors
Merge into: lp:unity
Diff against target: 49 lines (+12/-6)
3 files modified
plugins/unityshell/src/StartupNotifyService.cpp (+2/-0)
plugins/unityshell/src/UnityShowdesktopHandler.cpp (+7/-6)
unity-shared/IconRenderer.cpp (+3/-0)
To merge this branch: bzr merge lp:~mc-return/unity/unity.merge-fix-member-variables-not-initialized-in-their-constructors
Reviewer Review Type Date Requested Status
Brandon Schaefer (community) Approve
Thomi Richards (community) Approve
PS Jenkins bot continuous-integration Pending
Review via email: mp+133520@code.launchpad.net

Commit message

Initialized class member variables in their respective constructors.
Used false for bools, 0 for ints and object pointers like SnDisplay* or SnMonitorContext*.

To post a comment you must log in.
Revision history for this message
Thomi Richards (thomir-deactivatedaccount) :
review: Approve
Revision history for this message
Brandon Schaefer (brandontschaefer) wrote :

Looks good to me. +1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'plugins/unityshell/src/StartupNotifyService.cpp'
--- plugins/unityshell/src/StartupNotifyService.cpp 2011-07-21 14:59:25 +0000
+++ plugins/unityshell/src/StartupNotifyService.cpp 2012-11-15 20:06:21 +0000
@@ -32,6 +32,8 @@
32}32}
3333
34StartupNotifyService::StartupNotifyService()34StartupNotifyService::StartupNotifyService()
35 : _sn_display(0)
36 , _sn_monitor(0)
35{37{
36}38}
3739
3840
=== modified file 'plugins/unityshell/src/UnityShowdesktopHandler.cpp'
--- plugins/unityshell/src/UnityShowdesktopHandler.cpp 2012-11-06 18:19:09 +0000
+++ plugins/unityshell/src/UnityShowdesktopHandler.cpp 2012-11-15 20:06:21 +0000
@@ -79,12 +79,13 @@
79 return inhibiting_xid;79 return inhibiting_xid;
80}80}
8181
82ShowdesktopHandler::ShowdesktopHandler (ShowdesktopHandlerWindowInterface *wi, compiz::WindowInputRemoverLockAcquireInterface *lock_acquire_interface) :82ShowdesktopHandler::ShowdesktopHandler (ShowdesktopHandlerWindowInterface *wi, compiz::WindowInputRemoverLockAcquireInterface *lock_acquire_interface)
83 showdesktop_handler_window_interface_ (wi),83 : showdesktop_handler_window_interface_(wi)
84 lock_acquire_interface_ (lock_acquire_interface),84 , lock_acquire_interface_(lock_acquire_interface)
85 remover_(),85 , remover_()
86 state_ (StateVisible),86 , state_(StateVisible)
87 progress_ (0.0f)87 , progress_(0.0f)
88 , was_hidden_(false)
88{89{
89}90}
9091
9192
=== modified file 'unity-shared/IconRenderer.cpp'
--- unity-shared/IconRenderer.cpp 2012-11-06 18:19:09 +0000
+++ unity-shared/IconRenderer.cpp 2012-11-15 20:06:21 +0000
@@ -220,6 +220,9 @@
220}220}
221221
222IconRenderer::IconRenderer()222IconRenderer::IconRenderer()
223 : icon_size(0)
224 , image_size(0)
225 , spacing(0)
223{226{
224 pip_style = OUTSIDE_TILE;227 pip_style = OUTSIDE_TILE;
225228