summaryrefslogtreecommitdiff
diff options
authorMC Return <mc.return@gmx.net>2012-11-15 22:59:50 +0000
committerTarmac <>2012-11-15 22:59:50 +0000
commit885aa06cea3cec93068ab3dc9bcc2a8961ab5977 (patch)
tree356632c5bceeb634fbf9d8a02a65b0934472e3ea
parent0cd345a9694263c52159cad8e1ff6b29595ea2e3 (diff)
parent7d1a487ed40baf77abc25706f76fcaaa10c82387 (diff)
Initialized class member variables in their respective constructors.
Used false for bools, 0 for ints and object pointers like SnDisplay* or SnMonitorContext*. Approved by Brandon Schaefer, Thomi Richards. (bzr r2902)
-rw-r--r--plugins/unityshell/src/StartupNotifyService.cpp2
-rw-r--r--plugins/unityshell/src/UnityShowdesktopHandler.cpp13
-rw-r--r--unity-shared/IconRenderer.cpp3
3 files changed, 12 insertions, 6 deletions
diff --git a/plugins/unityshell/src/StartupNotifyService.cpp b/plugins/unityshell/src/StartupNotifyService.cpp
index 5c5daa7b2..b35be6e7f 100644
--- a/plugins/unityshell/src/StartupNotifyService.cpp
+++ b/plugins/unityshell/src/StartupNotifyService.cpp
@@ -32,6 +32,8 @@ StartupNotifyService::Default()
}
StartupNotifyService::StartupNotifyService()
+ : _sn_display(0)
+ , _sn_monitor(0)
{
}
diff --git a/plugins/unityshell/src/UnityShowdesktopHandler.cpp b/plugins/unityshell/src/UnityShowdesktopHandler.cpp
index 593f9c7fd..1f5bc2038 100644
--- a/plugins/unityshell/src/UnityShowdesktopHandler.cpp
+++ b/plugins/unityshell/src/UnityShowdesktopHandler.cpp
@@ -79,12 +79,13 @@ ShowdesktopHandler::InhibitingXid()
return inhibiting_xid;
}
-ShowdesktopHandler::ShowdesktopHandler (ShowdesktopHandlerWindowInterface *wi, compiz::WindowInputRemoverLockAcquireInterface *lock_acquire_interface) :
- showdesktop_handler_window_interface_ (wi),
- lock_acquire_interface_ (lock_acquire_interface),
- remover_(),
- state_ (StateVisible),
- progress_ (0.0f)
+ShowdesktopHandler::ShowdesktopHandler (ShowdesktopHandlerWindowInterface *wi, compiz::WindowInputRemoverLockAcquireInterface *lock_acquire_interface)
+ : showdesktop_handler_window_interface_(wi)
+ , lock_acquire_interface_(lock_acquire_interface)
+ , remover_()
+ , state_(StateVisible)
+ , progress_(0.0f)
+ , was_hidden_(false)
{
}
diff --git a/unity-shared/IconRenderer.cpp b/unity-shared/IconRenderer.cpp
index 2a74fc2df..9161d5c8a 100644
--- a/unity-shared/IconRenderer.cpp
+++ b/unity-shared/IconRenderer.cpp
@@ -220,6 +220,9 @@ void destroy_textures();
}
IconRenderer::IconRenderer()
+ : icon_size(0)
+ , image_size(0)
+ , spacing(0)
{
pip_style = OUTSIDE_TILE;