UPDATED modernize first step

imaging/actions/itksegmentation/RegionGrowingWidget.h

@@ -49,7 +49,7 @@ public:
     RegionGrowingWidget(camitk::Action* action);
 
     /// destructor
-    ~RegionGrowingWidget();
+    ~RegionGrowingWidget() override override;
 
     /// Update the widget with the correct PickedPixelMap (ImageComponent + Qlist of the selected points)
     void updateComponent(camitk::ImageComponent* image);

imaging/components/dicom/DicomDialog.h

@@ -50,7 +50,7 @@ public:
     /**Default Constructor*/
     DicomDialog(QList<DicomDialogEntry*>);
     /**Destructor*/
-    ~DicomDialog();
+    ~DicomDialog() override override;
 
     /// Get the list of DicomDialogEntry selected for opening
     QList<DicomDialogEntry*> getSelectedDicomDialogEntries();

modeling/actions/pml/CamiTKPropertyList.h

@@ -38,7 +38,7 @@ class CamiTKPropertyList : public QObject {
 public:
 
     // destructor
-    virtual ~CamiTKPropertyList();
+    ~CamiTKPropertyList() override override;
 
     /** Get a Property given its name
      *  @param name the property name

modeling/actions/pml/PMLExplorerWidget.h

@@ -71,7 +71,7 @@ public:
     PMLExplorerWidget ( PMLComponent* comp );
 
     /// Destructor
-    virtual ~PMLExplorerWidget(); //{ if (this->ui) delete ui; }
+    ~PMLExplorerWidget() override override; //{ if (this->ui) delete ui; }
 
     /// Update the widget content as the input selected component changed.
     void updateTarget ( PMLComponent* comp );

modeling/components/mmlcomponent/MMLDisplay.h

@@ -49,7 +49,7 @@ class MMLCOMPONENT_API MMLDisplay : QObject {
 
 public:
     MMLDisplay(MMLComponent* mmlManager);
-    ~MMLDisplay();
+    ~MMLDisplay() override override override override;
 
 public slots:
     /// slot called when display have to be updated

modeling/components/mmlcomponent/MMLMonitorDisplay.h

@@ -50,7 +50,7 @@ public:
     /// constructor
     MMLMonitorDisplay(Monitor* monitor, MMLComponent* manager);
     /// destructor
-    ~MMLMonitorDisplay();
+    ~MMLMonitorDisplay() override override override override override override;
 
     /// update display
     virtual void update() = 0;

modeling/components/mmlcomponent/MMLMonitorDisplays/Arrows.h

@@ -36,12 +36,12 @@ public:
     /// constructor
     Arrows(Monitor* monitor, MMLComponent* manager);
     /// destructor
-    ~Arrows();
+    ~Arrows() override;
 
     /// update display
-    void update();
+    void update() override;
     /// hide display
-    void hide();
+    void hide() override;
 
 };
 

modeling/components/mmlcomponent/MMLMonitorDisplays/Colors.h

@@ -36,12 +36,12 @@ public:
     /// constructor
     Colors(Monitor* monitor, MMLComponent* manager);
     /// destructor
-    ~Colors();
+    ~Colors() override;
 
     /// update display
-    void update();
+    void update() override;
     /// hide display
-    void hide();
+    void hide() override;
 };
 
 #endif
\ No newline at end of file

modeling/components/mmlcomponent/MMLMonitorDisplays/Statistics.h

@@ -39,12 +39,12 @@ public:
     /// constructor
     Statistics(Monitor* monitor, MMLComponent* manager);
     /// destructor
-    ~Statistics();
+    ~Statistics() override;
 
     /// update display
-    void update();
+    void update() override;
     /// hide display
-    void hide();
+    void hide() override;
 
 private:
 

modeling/components/mmlcomponent/MMLMonitorDisplays/Tabular.h

@@ -40,12 +40,12 @@ public:
     /// constructor
     Tabular(Monitor* monitor, MMLComponent* manager);
     /// destructor
-    ~Tabular();
+    ~Tabular() override;
 
     /// update display
-    void update();
+    void update() override;
     /// hide display
-    void hide();
+    void hide() override;
 
 public  slots:
 
@@ -60,7 +60,7 @@ private:
     /// old row size in the monitors table
     int oldRowSize;
     /// event filter which manage opening of the tabular popup menu when rigth click is pressed
-    bool eventFilter(QObject* obj, QEvent* event);
+    bool eventFilter(QObject* obj, QEvent* event) override;
 };
 
 #endif
\ No newline at end of file

modeling/libraries/lml/Force.h

@@ -43,7 +43,7 @@ public:
     /** Redefinition of ansysPrint to print in ansys format
      * \warning not everything is implemented (yet!)
      */
-    virtual void ansysPrint(std::ostream&) const;
+    void ansysPrint(std::ostream&) const override override;
 
 };
 

modeling/libraries/lml/Translation.h

@@ -43,7 +43,7 @@ public:
     /** Redefinition of ansysPrint to print in ansys format
      * \warning not everything is implemented (yet!)
      */
-    virtual void ansysPrint(std::ostream&) const;
+    void ansysPrint(std::ostream&) const override override override;
 
 };
 

modeling/libraries/mml/monitoring/AndMultipleCriterion.h

@@ -49,13 +49,13 @@ public:
      */
     AndMultipleCriterion(mml::MultipleCriteria* m, MonitoringManager* monitoringManager, MultipleCriterion* parent = NULL);
     /// destructor
-    ~AndMultipleCriterion();
+    ~AndMultipleCriterion() override override override override;
 
     /// return true if every single Criterion is reached
-    bool checkCriterion();
+    bool checkCriterion() override override override override;
 
     /// get stopping criterion name
-    std::string getName();
+    std::string getName() override override override override;
 };
 
 #endif // STOPPINGCRITERION_STOPPINGCRITERIA_MULTIPLECRITERIA_ANDMULTIPLECRITERIA_H

modeling/libraries/mml/monitoring/Criterion.h

@@ -52,19 +52,19 @@ public:
     */
     Criterion(mml::Criteria* c, MonitoringManager* monitoringManager, MultipleCriterion* parent = NULL);
     /// destructor
-    virtual ~Criterion();
+    ~Criterion() override override override override override override override override override override;
 
     /// return true if the criterion is reach
-    bool checkCriterion();
+    bool checkCriterion() override override override override override override override override override override;
 
     /// get number of childre; return -1 for non multiple criteria
-    int getNumberOfChildren();
+    int getNumberOfChildren() override override override override override override override override override override;
 
     /// get the child repered by index, return null if no child
-    StoppingCriterion* getChild(const unsigned int i);
+    StoppingCriterion* getChild(const unsigned int i) override override override override override override override override override override;
 
     /// get stopping criterion name
-    virtual std::string getName() = 0;
+    std::string getName() override override override override override override override override override override = 0;
 
     /// get Method Name
     std::string getMethodString();

modeling/libraries/mml/monitoring/Force.h

@@ -47,14 +47,14 @@ public:
     */
     ForceCriterion(mml::Force* c, MonitoringManager* monitoringManager, MultipleCriterion* parent = NULL);
     /// destructor
-    ~ForceCriterion();
+    ~ForceCriterion() override override override override;
 
     /// get stopping criterion name
-    std::string getName();
+    std::string getName() override override override override;
 
 private:
     /// calculate stopping criteria data and store it into values vector
-    void calculate();
+    void calculate() override override override override;
 };
 
 #endif // STOPPINGCRITERION_STOPPINGCRITERIA_CRITERIA_FORCE_H

modeling/libraries/mml/monitoring/InteractiveMonitoringManager.h

@@ -58,16 +58,16 @@ public:
     InteractiveMonitoringManager(const char* mml);
 
     /// destructor
-    virtual ~InteractiveMonitoringManager();
+    ~InteractiveMonitoringManager() override override;
 
     /// Initialize manager
-    bool init();
+    bool init() override override;
     /// End manager
-    void end();
+    void end() override override;
     /// make a simulation move (one step)
-    void doMove();
+    void doMove() override override;
     /// check if the stopping criterion is reached
-    bool checkStop();
+    bool checkStop() override override;
 
     /// get Stopping Criterion
     StoppingCriterion* getStoppingCriterion();

modeling/libraries/mml/monitoring/InteractiveSimulator.h

@@ -42,14 +42,14 @@ public:
     /// constructor
     InteractiveSimulator(MonitoringManager* monitoringManager, const char* file);
     /// destructor
-    virtual ~InteractiveSimulator();
+    ~InteractiveSimulator() override override override;
 
     /// initialize the simulator
-    virtual void init() = 0;
+    void init() override override override = 0;
     /// end simultor
-    virtual void end() = 0;
+    void end() override override override = 0;
     /// get current position for one atom
-    virtual void getPosition(int index, double position[3]) = 0;
+    void getPosition(int index, double position[3]) override override override = 0;
 
     /**
      * ask the simulator do to one step of the simulation
@@ -58,7 +58,7 @@ public:
     virtual void doMove(double dt) = 0;
 
     /// Create a pml file from an imput file
-    virtual void createPml(const char* inputFile, const char* pmlFile) = 0;
+    void createPml(const char* inputFile, const char* pmlFile) override override override = 0;
 };
 
 #endif // SIMULATOR_INTERACTIVESIMULATOR_H

modeling/libraries/mml/monitoring/KineticEnergy.h

@@ -46,14 +46,14 @@ public:
     */
     kineticEnergy(mml::KineticEnergy* c, MonitoringManager* monitoringManager, MultipleCriterion* parent = NULL);
     /// destructor
-    ~kineticEnergy();
+    ~kineticEnergy() override override override override;
 
     /// get stopping criterion name
-    std::string getName();
+    std::string getName() override override override override;
 
 private:
     /// calculate stopping criteria data and store it into values vector
-    void calculate();
+    void calculate() override override override override;
 };
 
 #endif // STOPPINGCRITERION_STOPPINGCRITERIA_CRITERIA_KINETICENGERGY_H

modeling/libraries/mml/monitoring/MinThreshold.h

@@ -45,13 +45,13 @@ public:
      */
     MinThreshold(mml::MinThreshold* m);
     /// destructor
-    ~MinThreshold();
+    ~MinThreshold() override override override;
 
     /// return true if tested >= value
-    bool individualTest(double tested);
+    bool individualTest(double tested) override override override;
 
     /// get Method name
-    std::string toString();
+    std::string toString() override;
 
 private:
     /// value of the threshold

modeling/libraries/mml/monitoring/MonitorComputingTime.h

@@ -44,13 +44,13 @@ public:
      */
     MonitorComputingTime(mml::Monitor* m, MonitoringManager* monitoringManager);
     /// destructor
-    ~MonitorComputingTime();
+    ~MonitorComputingTime() override override override override;
 
     /// calculate current followed data and store them in values vector
-    void calculate();
+    void calculate() override override override override;
 
     /// return a string relative to monitor type
-    std::string getTypeName();
+    std::string getTypeName() override override override override;
 };
 
 #endif // MONITOR_MONITORS_MONITORCOMPUTINGTIME_H

modeling/libraries/mml/monitoring/MonitorDisplacement.h

@@ -44,13 +44,13 @@ public:
      */
     MonitorDisplacement(mml::Monitor* m, MonitoringManager* monitoringManager);
     /// destructor
-    ~MonitorDisplacement();
+    ~MonitorDisplacement() override override override override;
 
     /// calculate current followed data and store them in values vector
-    void calculate();
+    void calculate() override override override override;
 
     /// return a string relative to monitor type
-    std::string getTypeName();
+    std::string getTypeName() override override override override;
 };
 
 #endif // MONITOR_MONITORS_MONITORDISPLACEMENT_H

modeling/libraries/mml/monitoring/MonitorDistanceX.h

@@ -45,13 +45,13 @@ public:
      */
     MonitorDistanceX(mml::Monitor* m, MonitoringManager* monitoringManager);
     /// destructor
-    ~MonitorDistanceX();
+    ~MonitorDistanceX() override override override override;
 
     /// calculate current followed data and store them in values vector
-    void calculate();
+    void calculate() override override override override;
 
     /// return a string relative to monitor type
-    std::string getTypeName();
+    std::string getTypeName() override override override override;
 };
 
 #endif // MONITOR_MONITORS_MONITORDISTANCEX_H

modeling/libraries/mml/monitoring/MonitorDistanceY.h

@@ -44,13 +44,13 @@ public:
      */
     MonitorDistanceY(mml::Monitor* m, MonitoringManager* monitoringManager);
     /// destructor
-    ~MonitorDistanceY();
+    ~MonitorDistanceY() override override override override;
 
     /// calculate current followed data and store them in values vector
-    void calculate();
+    void calculate() override override override override;
 
     /// return a string relative to monitor type
-    std::string getTypeName();
+    std::string getTypeName() override override override override;
 };
 
 #endif // MONITOR_MONITORS_MONITORDISTANCEY_H

modeling/libraries/mml/monitoring/MonitorDistanceZ.h

@@ -44,13 +44,13 @@ public:
      */
     MonitorDistanceZ(mml::Monitor* m, MonitoringManager* monitoringManager);
     /// destructor
-    ~MonitorDistanceZ();
+    ~MonitorDistanceZ() override override override override;
 
     /// calculate current followed data and store them in values vector
-    void calculate();
+    void calculate() override override override override;
 
     /// return a string relative to monitor type
-    std::string getTypeName();
+    std::string getTypeName() override override override override;
 };
 
 #endif // MONITOR_MONITORS_MONITORDISTANCEZ_H

modeling/libraries/mml/monitoring/MonitorForce.h

@@ -44,13 +44,13 @@ public:
      */
     MonitorForce(mml::Monitor* m, MonitoringManager* monitoringManager);
     /// destructor
-    ~MonitorForce();
+    ~MonitorForce() override override override override;
 
     /// calculate current followed data and store them in values vector
-    void calculate();
+    void calculate() override override override override;
 
     /// return a string relative to monitor type
-    std::string getTypeName();
+    std::string getTypeName() override override override override;
 };
 
 #endif // MONITOR_MONITORS_FORCE_H

modeling/libraries/mml/monitoring/MonitorGeometricDeviation.h

@@ -44,13 +44,13 @@ public:
      */
     MonitorGeometricDeviation(mml::Monitor* m, MonitoringManager* monitoringManager);
     /// destructor
-    ~MonitorGeometricDeviation();
+    ~MonitorGeometricDeviation() override override override override;
 
     /// calculate current followed data and store them in values vector
-    void calculate();
+    void calculate() override override override override;
 
     /// return a string relative to monitor type
-    std::string getTypeName();
+    std::string getTypeName() override override override override;
 };
 
 #endif // MONITOR_MONITORS_MONITORGEOMETRICDEVIATION_H

modeling/libraries/mml/monitoring/MonitorNormDisplacement.h

@@ -43,13 +43,13 @@ public:
      */
     MonitorNormDisplacement(mml::Monitor* m, MonitoringManager* monitoringManager);
     /// destructor
-    ~MonitorNormDisplacement();
+    ~MonitorNormDisplacement() override override override override;
 
     /// calculate current followed data and store them in values vector
-    void calculate();
+    void calculate() override override override override;
 
     /// return a string relative to monitor type
-    std::string getTypeName();
+    std::string getTypeName() override override override override;
 };
 
 #endif // MONITOR_MONITORS_MONITORNORMDISPLACEMENT_H

modeling/libraries/mml/monitoring/MonitorPointFinalSetDistance.h

@@ -46,13 +46,13 @@ public:
      */
     MonitorPointFinalSetDistance(mml::Monitor* m, MonitoringManager* monitoringManager);
     /// destructor
-    ~MonitorPointFinalSetDistance();
+    ~MonitorPointFinalSetDistance() override override override override;
 
     /// calculate current followed data and store them in values vector
-    void calculate();
+    void calculate() override override override override;
 
     /// return a string relative to monitor type
-    std::string getTypeName();
+    std::string getTypeName() override override override override;
 };
 
 #endif // MONITOR_MONITORS_MONITORPOINTFINALSETDISTANCE_H

modeling/libraries/mml/monitoring/MonitorPointSetDistance.h

@@ -44,13 +44,13 @@ public:
      */
     MonitorPointSetDistance(mml::Monitor* m, MonitoringManager* monitoringManager);
     /// destructor
-    ~MonitorPointSetDistance();
+    ~MonitorPointSetDistance() override override override override;
 
     /// calculate current followed data and store them in values vector
-    void calculate();
+    void calculate() override override override override;
 
     /// return a string relative to monitor type
-    std::string getTypeName();
+    std::string getTypeName() override override override override;
 };
 
 #endif // MONITOR_MONITORS_MONITORPOINTSETDISTANCE_H

modeling/libraries/mml/monitoring/MonitorPointToTriangleMeshDistanceFinal.h

@@ -45,13 +45,13 @@ public:
      */
     MonitorPointToTriangleMeshDistanceFinal(mml::Monitor* m, MonitoringManager* monitoringManager);
     /// destructor
-    ~MonitorPointToTriangleMeshDistanceFinal();
+    ~MonitorPointToTriangleMeshDistanceFinal() override override override override;
 
     /// calculate current followed data and store them in values vector
-    void calculate();
+    void calculate() override override override override;
 
     /// return a string relative to monitor type
-    std::string getTypeName();
+    std::string getTypeName() override override override override;
 
 };
 

modeling/libraries/mml/monitoring/MonitorPosition.h

@@ -44,13 +44,13 @@ public:
      */
     MonitorPosition(mml::Monitor* m, MonitoringManager* monitoringManager);
     /// destructor
-    ~MonitorPosition();
+    ~MonitorPosition() override override override override;
 
     /// calculate current followed data and store them in values vector
-    void calculate();
+    void calculate() override override override override;
 
     /// return a string relative to monitor type
-    std::string getTypeName();
+    std::string getTypeName() override override override override;
 };
 
 #endif // MONITOR_MONITORS_MONITORPOSITION_H

modeling/libraries/mml/monitoring/MonitorRen.h

@@ -44,13 +44,13 @@ public:
      */
     MonitorRen(mml::Monitor* m, MonitoringManager* monitoringManager);
     /// destructor
-    virtual ~MonitorRen();
+    ~MonitorRen() override override override override;
 
     /// calculate current followed data and store them in values vector
-    void calculate();
+    void calculate() override override override override;
 
     /// return a string relative to monitor type
-    std::string getTypeName();
+    std::string getTypeName() override override override override;
 };
 
 #endif // MONITOR_MONITORS_MONITORREN_H

modeling/libraries/mml/monitoring/MonitorSurface.h

@@ -44,13 +44,13 @@ public:
      */
     MonitorSurface(mml::Monitor* m, MonitoringManager* monitoringManager);
     /// destructor
-    ~MonitorSurface();
+    ~MonitorSurface() override override override override;
 
     /// calculate current followed data and store them in values vector
-    void calculate();
+    void calculate() override override override override;
 
     /// return a string relative to monitor type
-    std::string getTypeName();
+    std::string getTypeName() override override override override;
 };
 
 #endif // MONITOR_MONITORS_MONITORSURFACE_H

modeling/libraries/mml/monitoring/MonitorVolume.h

@@ -44,15 +44,15 @@ public:
      */
     MonitorVolume(mml::Monitor* m, MonitoringManager* monitoringManager);
     /// destructor
-    ~MonitorVolume();
+    ~MonitorVolume() override override override override;
 
     /// calculate current followed data and store them in values vector
-    void calculate();
+    void calculate() override override override override;
 
     /// return a string relative to monitor type
-    std::string getTypeName();
+    std::string getTypeName() override override override override;
 
-    virtual void write();
+    void write() override override override override;
 };
 
 #endif // MONITOR_MONITORS_MONITORVOLUME_H

modeling/libraries/mml/monitoring/MultipleCriterion.h

@@ -50,19 +50,19 @@ public:
      */
     MultipleCriterion(mml::MultipleCriteria* m, MonitoringManager* monitoringManager, MultipleCriterion* parent = NULL);
     /// destructor
-    virtual ~MultipleCriterion();
+    ~MultipleCriterion() override override override override override override override;
 
     /// return true if the MultipleCriterion is reach
-    virtual bool checkCriterion() = 0;
+    bool checkCriterion() override override override override override override override = 0;
 
     /// get number of childre; return -1 for non multiple criteria
-    int getNumberOfChildren();
+    int getNumberOfChildren() override override override override override override override;
 
     /// get the child repered by index, return null if no child
-    StoppingCriterion* getChild(const unsigned int i);
+    StoppingCriterion* getChild(const unsigned int i) override override override override override override override;
 
     /// get stopping criterion name
-    virtual std::string getName() = 0;
+    std::string getName() override override override override override override override = 0;
 
     /// add child
     void addChild(StoppingCriterion* sc);

modeling/libraries/mml/monitoring/NonInteractiveMonitoringManager.h

@@ -54,20 +54,20 @@ public:
     NonInteractiveMonitoringManager(const char* mml);
 
     /// destructor
-    ~NonInteractiveMonitoringManager();