- coding style

diff --git a/server/Client.cc b/server/Client.cc
index 9275931176551b7edf3b9c53fbdc0af8ec855c0a..28942a4354ffc4d0560c16aabea98ec02da684ea 100644 (file)
--- a/server/Client.cc
+++ b/server/Client.cc
@@ -39,7 +39,7 @@ boost::shared_mutex big_mutex;
 
 
 Client::Client(const string& name, const Clients& clients)
-    : name(name), zombie(false), clients(clients)
+    : name(name), clients(clients)
 {
 }
 

diff --git a/server/Client.h b/server/Client.h
index 60871d5dd532f7a9abd0cf621f5900b95423c3c7..6ed6e41c9495ea5bd6dff7dcedfa76f86f3a7f15 100644 (file)
--- a/server/Client.h
+++ b/server/Client.h
@@ -160,7 +160,7 @@ public:
     boost::thread thread;
     queue<Task> tasks;
 
-    bool zombie;
+    bool zombie = false;
 
     void add_task(DBus::Connection& conn, DBus::Message& msg);
 
@@ -176,6 +176,7 @@ private:
 class Clients
 {
 public:
+
     Clients(Backgrounds& backgrounds);
 
     typedef list<Client>::iterator iterator;

diff --git a/server/MetaSnapper.cc b/server/MetaSnapper.cc
index 2dcc8624bc47fb4ecf3947693974705059de0599..f87e5ed31294ded0737c95d50f73091c980442a5 100644 (file)
--- a/server/MetaSnapper.cc
+++ b/server/MetaSnapper.cc
@@ -36,7 +36,7 @@ MetaSnappers meta_snappers;
 
 
 RefCounter::RefCounter()
-    : counter(0), last_used(steady_clock::now())
+    : last_used(steady_clock::now())
 {
 }
 
@@ -95,7 +95,7 @@ RefCounter::unused_for() const
 
 
 MetaSnapper::MetaSnapper(ConfigInfo& config_info)
-    : config_info(config_info), snapper(NULL)
+    : config_info(config_info)
 {
     set_permissions();
 }

diff --git a/server/MetaSnapper.h b/server/MetaSnapper.h
index da3090ceb8c754ae2424931fa03fb912077ac8f6..69033b32aa9db42329b3a3bccb2ec8883b8a9345 100644 (file)
--- a/server/MetaSnapper.h
+++ b/server/MetaSnapper.h
@@ -53,7 +53,7 @@ private:
 
     mutable boost::mutex mutex;
 
-    int counter;
+    int counter = 0;
 
     steady_clock::time_point last_used;
 
@@ -109,7 +109,7 @@ private:
 
     ConfigInfo config_info;
 
-    Snapper* snapper;
+    Snapper* snapper = nullptr;
 
 };
 

diff --git a/snapper/XmlFile.cc b/snapper/XmlFile.cc
index 09823ae179f8d2cdd2bd0af9873e7dea935255e3..bc77822a7ed20ef072c155127adc73464055332d 100644 (file)
--- a/snapper/XmlFile.cc
+++ b/snapper/XmlFile.cc
@@ -60,6 +60,7 @@ namespace snapper
     XmlFile::~XmlFile()
     {
        xmlFreeDoc(doc);
+       doc = nullptr;
     }
 
 

diff --git a/snapper/XmlFile.h b/snapper/XmlFile.h
index 974d3349e008bc56d2d3b1ad2382788c62bcd715..9f9db1792b1e1d36f4c4e757a0e7c22d4bbe3b54 100644 (file)
--- a/snapper/XmlFile.h
+++ b/snapper/XmlFile.h
@@ -60,7 +60,7 @@ namespace snapper
 
     private:
 
-       xmlDoc* doc;
+       xmlDoc* doc = nullptr;
 
     };