Merge remote-tracking branch 'origin/master' into exceptionHandling

include/Application.h

@@ -195,7 +195,6 @@ namespace ChimeraTK {
     }
 
     void registerDeviceModule(DeviceModule* deviceModule);
-
    protected:
     friend class Module;
     friend class VariableNetwork;
@@ -397,7 +396,6 @@ namespace ChimeraTK {
                                    "caused by "
                                    "incorrect ownership of variables/accessors or VariableGroups.");
     }
-
     std::list<DeviceModule*> deviceModuleList;
   };
 

include/DeviceModule.h

@@ -109,7 +109,6 @@ namespace ChimeraTK {
      * device. This function shall not be called by the user, all exception
      *  handling is done internally by ApplicationCore. */
     void reportException(std::string errMsg);
-
     void run() override;
 
     void terminate() override;
@@ -138,7 +137,6 @@ namespace ChimeraTK {
     // it is little more than a cache and thus does not change the logical state
     // of this module
     mutable std::map<std::string, DeviceModule> subModules;
-
     /** A  VariableGroup for exception status and message. It can be protected, as
      * it is automatically connected to the control system in
      * DeviceModule::defineConnections() */

src/ControlSystemModule.cc

@@ -19,9 +19,8 @@ namespace ChimeraTK {
 
   /*********************************************************************************************************************/
 
-  VariableNetworkNode ControlSystemModule::operator()(const std::string& variableName,
-      const std::type_info& valueType,
-      size_t nElements) const {
+  VariableNetworkNode ControlSystemModule::operator()(
+      const std::string& variableName, const std::type_info& valueType, size_t nElements) const {
     assert(variableName.find_first_of("/") == std::string::npos);
     if(variables.count(variableName) == 0) {
       variables[variableName] = {

src/DeviceModule.cc

@@ -173,7 +173,6 @@ namespace ChimeraTK {
     errorCondVar.wait(lk);
     lk.unlock();
   }
-
   /*********************************************************************************************************************/
 
   void DeviceModule::handleException() {