Apply modernize-use-default-member-init

FairRootGroup · May 28, 2021 · acf63d3 · acf63d3
1 parent e1b2295
commit acf63d3
Show file tree

Hide file tree

Showing 33 changed files with 121 additions and 258 deletions.
diff --git a/examples/1-1/sampler.cxx b/examples/1-1/sampler.cxx
@@ -16,15 +16,12 @@ namespace bpo = boost::program_options;
 class Sampler : public FairMQDevice
 {
   public:
-    Sampler()
-        : fMaxIterations(0)
-        , fNumIterations(0)
-    {}
+    Sampler() {}
 
   protected:
     std::string fText;
-    uint64_t fMaxIterations;
-    uint64_t fNumIterations;
+    uint64_t fMaxIterations = 0;
+    uint64_t fNumIterations = 0;
 
     void InitTask() override
     {

diff --git a/examples/1-1/sink.cxx b/examples/1-1/sink.cxx
@@ -17,8 +17,6 @@ class Sink : public FairMQDevice
 {
   public:
     Sink()
-        : fMaxIterations(0)
-        , fNumIterations(0)
     {
         // register a handler for data arriving on "data" channel
         OnData("data", &Sink::HandleData);
@@ -46,8 +44,8 @@ class Sink : public FairMQDevice
     }
 
   private:
-    uint64_t fMaxIterations;
-    uint64_t fNumIterations;
+    uint64_t fMaxIterations = 0;
+    uint64_t fNumIterations = 0;
 };
 
 void addCustomOptions(bpo::options_description& options)

diff --git a/examples/1-n-1/sampler.cxx b/examples/1-n-1/sampler.cxx
@@ -18,15 +18,12 @@ namespace bpo = boost::program_options;
 class Sampler : public FairMQDevice
 {
   public:
-    Sampler()
-        : fMaxIterations(0)
-        , fNumIterations(0)
-    {}
+    Sampler() {}
 
   protected:
     std::string fText;
-    uint64_t fMaxIterations;
-    uint64_t fNumIterations;
+    uint64_t fMaxIterations = 0;
+    uint64_t fNumIterations = 0;
 
     void InitTask() override
     {

diff --git a/examples/1-n-1/sink.cxx b/examples/1-n-1/sink.cxx
@@ -17,8 +17,6 @@ class Sink : public FairMQDevice
 {
   public:
     Sink()
-        : fMaxIterations(0)
-        , fNumIterations(0)
     {
         // register a handler for data arriving on "data2" channel
         OnData("data2", &Sink::HandleData);
@@ -45,8 +43,8 @@ class Sink : public FairMQDevice
     }
 
   private:
-    uint64_t fMaxIterations;
-    uint64_t fNumIterations;
+    uint64_t fMaxIterations = 0;
+    uint64_t fNumIterations = 0;
 };
 
 void addCustomOptions(bpo::options_description& options)

diff --git a/examples/copypush/sampler.cxx b/examples/copypush/sampler.cxx
@@ -18,12 +18,7 @@ namespace bpo = boost::program_options;
 class Sampler : public FairMQDevice
 {
   public:
-    Sampler()
-        : fNumDataChannels(0)
-        , fCounter(0)
-        , fMaxIterations(0)
-        , fNumIterations(0)
-    {}
+    Sampler() {}
 
   protected:
     void InitTask() override
@@ -56,10 +51,10 @@ class Sampler : public FairMQDevice
     }
 
 
-    int fNumDataChannels;
-    uint64_t fCounter;
-    uint64_t fMaxIterations;
-    uint64_t fNumIterations;
+    int fNumDataChannels = 0;
+    uint64_t fCounter = 0;
+    uint64_t fMaxIterations = 0;
+    uint64_t fNumIterations = 0;
 };
 
 void addCustomOptions(bpo::options_description& options)

diff --git a/examples/copypush/sink.cxx b/examples/copypush/sink.cxx
@@ -17,8 +17,6 @@ class Sink : public FairMQDevice
 {
   public:
     Sink()
-        : fMaxIterations(0)
-        , fNumIterations(0)
     {
         OnData("data", &Sink::HandleData);
     }
@@ -44,8 +42,8 @@ class Sink : public FairMQDevice
     }
 
   private:
-    uint64_t fMaxIterations;
-    uint64_t fNumIterations;
+    uint64_t fMaxIterations = 0;
+    uint64_t fNumIterations = 0;
 };
 
 void addCustomOptions(bpo::options_description& options)

diff --git a/examples/dds/sampler.cxx b/examples/dds/sampler.cxx
@@ -17,8 +17,6 @@ class Sampler : public FairMQDevice
 {
   public:
     Sampler()
-        : fIterations(0)
-        , fCounter(0)
     {}
 
     void InitTask() override
@@ -53,8 +51,8 @@ class Sampler : public FairMQDevice
     }
 
   private:
-    uint64_t fIterations;
-    uint64_t fCounter;
+    uint64_t fIterations = 0;
+    uint64_t fCounter = 0;
 };
 
 void addCustomOptions(bpo::options_description& options)

diff --git a/examples/dds/sink.cxx b/examples/dds/sink.cxx
@@ -17,8 +17,6 @@ class Sink : public FairMQDevice
 {
   public:
     Sink()
-        : fIterations(0)
-        , fCounter(0)
     {
         OnData("data2", &Sink::HandleData);
     }
@@ -45,8 +43,8 @@ class Sink : public FairMQDevice
     }
 
   private:
-    uint64_t fIterations;
-    uint64_t fCounter;
+    uint64_t fIterations = 0;
+    uint64_t fCounter = 0;
 };
 void addCustomOptions(bpo::options_description& options)
 {

diff --git a/examples/multipart/sampler.cxx b/examples/multipart/sampler.cxx
@@ -20,10 +20,7 @@ namespace bpo = boost::program_options;
 class Sampler : public FairMQDevice
 {
   public:
-    Sampler()
-        : fMaxIterations(5)
-        , fNumIterations(0)
-    {}
+    Sampler() {}
 
   protected:
     void InitTask() override
@@ -81,8 +78,8 @@ class Sampler : public FairMQDevice
     }
 
   private:
-    uint64_t fMaxIterations;
-    uint64_t fNumIterations;
+    uint64_t fMaxIterations = 5;
+    uint64_t fNumIterations = 0;
 };
 
 void addCustomOptions(bpo::options_description& options)

diff --git a/examples/multiple-channels/sampler.cxx b/examples/multiple-channels/sampler.cxx
@@ -19,10 +19,7 @@ namespace bpo = boost::program_options;
 class Sampler : public FairMQDevice
 {
   public:
-    Sampler()
-        : fMaxIterations(0)
-        , fNumIterations(0)
-    {}
+    Sampler() {}
 
     void InitTask() override
     {
@@ -64,8 +61,8 @@ class Sampler : public FairMQDevice
 
   protected:
     std::string fText;
-    uint64_t fMaxIterations;
-    uint64_t fNumIterations;
+    uint64_t fMaxIterations = 0;
+    uint64_t fNumIterations = 0;
 };
 
 void addCustomOptions(bpo::options_description& options)

diff --git a/examples/multiple-channels/sink.cxx b/examples/multiple-channels/sink.cxx
@@ -18,10 +18,6 @@ class Sink : public FairMQDevice
 {
   public:
     Sink()
-        : fReceivedData(false)
-        , fReceivedBroadcast(false)
-        , fMaxIterations(0)
-        , fNumIterations(0)
     {
         OnData("broadcast", &Sink::HandleBroadcast);
         OnData("data", &Sink::HandleData);
@@ -61,10 +57,10 @@ class Sink : public FairMQDevice
     }
 
   private:
-    bool fReceivedData;
-    bool fReceivedBroadcast;
-    uint64_t fMaxIterations;
-    uint64_t fNumIterations;
+    bool fReceivedData = false;
+    bool fReceivedBroadcast = false;
+    uint64_t fMaxIterations = 0;
+    uint64_t fNumIterations = 0;
 };
 
 void addCustomOptions(bpo::options_description& options)

diff --git a/examples/multiple-transports/sampler1.cxx b/examples/multiple-transports/sampler1.cxx
@@ -16,11 +16,7 @@ namespace bpo = boost::program_options;
 class Sampler1 : public FairMQDevice
 {
   public:
-    Sampler1()
-        : fAckListener()
-        , fMaxIterations(0)
-        , fNumIterations(0)
-    {}
+    Sampler1() {}
 
   protected:
     void InitTask() override
@@ -73,8 +69,8 @@ class Sampler1 : public FairMQDevice
     }
 
     std::thread fAckListener;
-    uint64_t fMaxIterations;
-    uint64_t fNumIterations;
+    uint64_t fMaxIterations = 0;
+    uint64_t fNumIterations = 0;
 };
 
 void addCustomOptions(bpo::options_description& options)

diff --git a/examples/multiple-transports/sampler2.cxx b/examples/multiple-transports/sampler2.cxx
@@ -16,10 +16,7 @@ namespace bpo = boost::program_options;
 class Sampler2 : public FairMQDevice
 {
   public:
-    Sampler2()
-        : fMaxIterations(0)
-        , fNumIterations(0)
-    {}
+    Sampler2() {}
 
   protected:
     void InitTask() override
@@ -47,8 +44,8 @@ class Sampler2 : public FairMQDevice
 
 
   private:
-    uint64_t fMaxIterations;
-    uint64_t fNumIterations;
+    uint64_t fMaxIterations = 0;
+    uint64_t fNumIterations = 0;
 };
 
 void addCustomOptions(bpo::options_description& options)

diff --git a/examples/multiple-transports/sink.cxx b/examples/multiple-transports/sink.cxx
@@ -15,9 +15,6 @@ class Sink : public FairMQDevice
 {
   public:
     Sink()
-        : fMaxIterations(0)
-        , fNumIterations1(0)
-        , fNumIterations2(0)
     {
         // register a handler for data arriving on "data" channel
         OnData("data1", &Sink::HandleData1);
@@ -65,9 +62,9 @@ class Sink : public FairMQDevice
     }
 
   private:
-    uint64_t fMaxIterations;
-    uint64_t fNumIterations1;
-    uint64_t fNumIterations2;
+    uint64_t fMaxIterations = 0;
+    uint64_t fNumIterations1 = 0;
+    uint64_t fNumIterations2 = 0;
 };
 
 void addCustomOptions(bpo::options_description& options)

diff --git a/examples/n-m/receiver.cxx b/examples/n-m/receiver.cxx
@@ -33,12 +33,6 @@ class Receiver : public FairMQDevice
 {
   public:
     Receiver()
-        : fBuffer()
-        , fDiscardedSet()
-        , fNumSenders(0)
-        , fBufferTimeoutInMs(5000)
-        , fMaxTimeframes(0)
-        , fTimeframeCounter(0)
     {
         OnData("data", &Receiver::HandleData);
     }
@@ -102,10 +96,10 @@ class Receiver : public FairMQDevice
     unordered_map<uint16_t, TFBuffer> fBuffer;
     unordered_set<uint16_t> fDiscardedSet;
 
-    int fNumSenders;
-    int fBufferTimeoutInMs;
-    int fMaxTimeframes;
-    int fTimeframeCounter;
+    int fNumSenders = 0;
+    int fBufferTimeoutInMs = 5000;
+    int fMaxTimeframes = 0;
+    int fTimeframeCounter = 0;
 };
 
 void addCustomOptions(bpo::options_description& options)

diff --git a/examples/n-m/sender.cxx b/examples/n-m/sender.cxx
@@ -20,15 +20,8 @@ namespace bpo = boost::program_options;
 class Sender : public FairMQDevice
 {
   public:
-    Sender()
-        : fNumReceivers(0)
-        , fIndex(0)
-        , fSubtimeframeSize(10000)
-    {}
+    Sender() {}
 
-    ~Sender() = default;
-
-  protected:
     void InitTask() override
     {
         fIndex = GetConfig()->GetProperty<int>("sender-index");
@@ -64,9 +57,9 @@ class Sender : public FairMQDevice
     }
 
   private:
-    int fNumReceivers;
-    unsigned int fIndex;
-    int fSubtimeframeSize;
+    int fNumReceivers = 0;
+    unsigned int fIndex = 0;
+    int fSubtimeframeSize = 10000;
 };
 
 void addCustomOptions(bpo::options_description& options)

diff --git a/examples/n-m/synchronizer.cxx b/examples/n-m/synchronizer.cxx
@@ -18,12 +18,8 @@ namespace bpo = boost::program_options;
 class Synchronizer : public FairMQDevice
 {
   public:
-    Synchronizer()
-        : fTimeframeId(0)
-    {}
-    ~Synchronizer() = default;
+    Synchronizer() {}
 
-  protected:
     bool ConditionalRun() override
     {
         FairMQMessagePtr msg(NewSimpleMessage(fTimeframeId));
@@ -39,7 +35,7 @@ class Synchronizer : public FairMQDevice
         return true;
     }
 
-    uint16_t fTimeframeId;
+    uint16_t fTimeframeId = 0;
 };
 
 void addCustomOptions(bpo::options_description& /* options */) {}