From 230c335c2949cb8d6aef5d998f568d933e9df655 Mon Sep 17 00:00:00 2001
From: Erik Frojdh <erik.frojdh@gmail.com>
Date: Thu, 10 Jan 2019 15:53:09 +0100
Subject: [PATCH] using default initializer arguments for multiSlsDetector

---
 .../multiSlsDetector/multiSlsDetector.cpp     |  7 +---
 .../multiSlsDetector/multiSlsDetector.h       | 34 +++++++++----------
 2 files changed, 18 insertions(+), 23 deletions(-)

diff --git a/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp b/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
index 00939f474..e8320bd47 100644
--- a/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
+++ b/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
@@ -27,12 +27,7 @@
 #include <vector>
 
 multiSlsDetector::multiSlsDetector(int id, bool verify, bool update)
-    : detId(id), sharedMemory(nullptr), thisMultiDetector(nullptr),
-      client_downstream(false), totalProgress(0), progressIndex(0),
-      jointhread(0), acquiringDone(0), fdata(nullptr), thisData(nullptr),
-      acquisition_finished(nullptr), acqFinished_p(nullptr), measurement_finished(nullptr),
-      measFinished_p(nullptr), progress_call(nullptr), pProgressCallArg(nullptr), dataReady(nullptr),
-      pCallbackArg(nullptr) {
+    : detId(id){
     setupMultiDetector(verify, update);
 }
 
diff --git a/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.h b/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.h
index 2e8247b57..da155cab5 100644
--- a/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.h
+++ b/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.h
@@ -1702,22 +1702,22 @@ class multiSlsDetector : public virtual slsDetectorDefs,
      * Listen to key event to stop acquiring
      * when using acquire command
      */
-    int kbhit(void);
+    int kbhit();
 
     /** Multi detector Id */
     int detId;
 
     /** Shared Memory object */
-    SharedMemory *sharedMemory;
+    SharedMemory *sharedMemory {nullptr};
 
     /** Shared memory structure */
-    sharedMultiSlsDetector *thisMultiDetector;
+    sharedMultiSlsDetector *thisMultiDetector {nullptr};
 
     /** pointers to the slsDetector structures */
     std::vector<std::unique_ptr<slsDetector>> detectors;
 
     /** data streaming (down stream) enabled in client (zmq sckets created) */
-    bool client_downstream;
+    bool client_downstream {false};
 
     /** ZMQ Socket - Receiver to Client */
     std::vector<std::unique_ptr<ZmqSocket>> zmqSocket;
@@ -1731,10 +1731,10 @@ class multiSlsDetector : public virtual slsDetectorDefs,
     sem_t sem_endRTAcquisition;
 
     /** Total number of frames/images for next acquisition */
-    int totalProgress;
+    int totalProgress {0};
 
     /** Current progress or frames/images processed in current acquisition */
-    int progressIndex;
+    int progressIndex {0};
 
     /** mutex to synchronize main and data processing threads */
     mutable std::mutex mp;
@@ -1743,32 +1743,32 @@ class multiSlsDetector : public virtual slsDetectorDefs,
     mutable std::mutex mg;
 
     /** sets when the acquisition is finished */
-    bool jointhread;
+    bool jointhread {false};
 
     /** set when detector finishes acquiring */
-    int acquiringDone;
+    int acquiringDone {0};
 
     /** the data processing thread */
     // pthread_t dataProcessingThread;
     std::thread dataProcessingThread;
 
     /** gui data */
-    double *fdata;
+    double *fdata {nullptr};
 
     /** detector data packed for the gui */
-    detectorData *thisData;
+    detectorData *thisData {nullptr};
 
-    int (*acquisition_finished)(double, int, void *);
-    void *acqFinished_p;
+    int (*acquisition_finished)(double, int, void *) {nullptr};
+    void *acqFinished_p {nullptr};
 
-    int (*measurement_finished)(int, int, void *);
-    void *measFinished_p;
+    int (*measurement_finished)(int, int, void *) {nullptr};
+    void *measFinished_p {nullptr};
 
     int (*progress_call)(double, void *);
-    void *pProgressCallArg;
+    void *pProgressCallArg {nullptr};
 
-    int (*dataReady)(detectorData *, int, int, void *);
-    void *pCallbackArg;
+    int (*dataReady)(detectorData *, int, int, void *){nullptr};
+    void *pCallbackArg {nullptr};
 };
 
 #endif