Commit c7f71800 authored by Emmanuel Promayon's avatar Emmanuel Promayon

UPDATED using "= default" for empty implementation

parent 22ae6f47
......@@ -52,14 +52,12 @@ ConnectedComponents::ConnectedComponents(ActionExtension* extension) : Action(ex
}
// --------------- destructor -------------------
ConnectedComponents::~ConnectedComponents() {
}
// --------------- getNbConnectedComponents -------------------
int ConnectedComponents::getNbConnectedComponents() const {
return nbConnectedComponents;
}
// --------------- setNbConnectedComponents -------------------
void ConnectedComponents::setNbConnectedComponents(const int nbConnectedComponents) {
this->nbConnectedComponents = nbConnectedComponents;
}
......
......@@ -52,7 +52,7 @@ public:
ConnectedComponents(camitk::ActionExtension*);
/// Default Destructor
virtual ~ConnectedComponents();
virtual ~ConnectedComponents() = default;
public slots:
/** this method is automatically called when the action is triggered.
......
......@@ -50,10 +50,6 @@ GradientMagnitude::GradientMagnitude(ActionExtension* extension) : Action(extens
this->addTag("Contours");
}
// --------------- destructor -------------------
GradientMagnitude::~GradientMagnitude() {
}
// --------------- apply -------------------
Action::ApplyStatus GradientMagnitude::apply() {
foreach (Component * comp, getTargets()) {
......
......@@ -48,7 +48,7 @@ public:
GradientMagnitude(camitk::ActionExtension*);
/// Default Destructor
virtual ~GradientMagnitude();
virtual ~GradientMagnitude() = default;
public slots:
/** this method is automatically called when the action is triggered.
......
......@@ -54,10 +54,6 @@ LaplacianSharpening::LaplacianSharpening(ActionExtension* extension) : Action(ex
}
// --------------- destructor -------------------
LaplacianSharpening::~LaplacianSharpening() {
}
// --------------- apply -------------------
Action::ApplyStatus LaplacianSharpening::apply() {
foreach (Component * comp, getTargets()) {
......
......@@ -48,7 +48,7 @@ public:
LaplacianSharpening(camitk::ActionExtension*);
/// Default Destructor
virtual ~LaplacianSharpening();
virtual ~LaplacianSharpening() = default;
public slots:
/** this method is automatically called when the action is triggered.
......
......@@ -58,10 +58,6 @@ SobelEdgeDetection::SobelEdgeDetection(ActionExtension* extension) : Action(exte
addParameter(keepOrgVoxelTypeProperty);
}
// --------------- destructor -------------------
SobelEdgeDetection::~SobelEdgeDetection() {
}
// --------------- apply -------------------
Action::ApplyStatus SobelEdgeDetection::apply() {
foreach (Component* comp, getTargets()) {
......
......@@ -50,7 +50,7 @@ public:
SobelEdgeDetection(camitk::ActionExtension*);
/// Default Destructor
virtual ~SobelEdgeDetection();
virtual ~SobelEdgeDetection() = default;
public slots:
/** this method is automatically called when the action is triggered.
......
......@@ -45,7 +45,7 @@ public:
ITKSegmentationExtension() : ActionExtension() {};
/// the destructor
virtual ~ITKSegmentationExtension() {};
virtual ~ITKSegmentationExtension() = default;
/// Method that return the action extension name
virtual QString getName() {
......
......@@ -40,11 +40,6 @@ RegionGrowingWidget::RegionGrowingWidget(Action* action)
ui.seedPointGroupBox->layout()->addWidget(pickingW);
QObject::connect(ui.applyButton, SIGNAL(clicked()), myAction, SLOT(apply()));
}
RegionGrowingWidget::~RegionGrowingWidget() {
}
bool RegionGrowingWidget::isSmoothingChecked() {
......
......@@ -49,7 +49,7 @@ public:
RegionGrowingWidget(camitk::Action* action);
/// destructor
~RegionGrowingWidget() override;
~RegionGrowingWidget() override = default;
/// Update the widget with the correct PickedPixelMap (ImageComponent + Qlist of the selected points)
void updateComponent(camitk::ImageComponent* image);
......
......@@ -56,7 +56,7 @@ class DicomComponentExtension : public camitk::ComponentExtension {
public:
/// Constructor
DicomComponentExtension() : ComponentExtension() {}
DicomComponentExtension() : ComponentExtension() = default;
/// Method returning the component extension name
virtual QString getName() const {
......@@ -89,7 +89,7 @@ public:
protected:
/// Destructor
virtual ~DicomComponentExtension() {}
virtual ~DicomComponentExtension() = default;
private:
/// Last opened component. When opening the directory, create 1 component per files
......
......@@ -65,9 +65,6 @@ DicomDialog::DicomDialog(QList<DicomDialogEntry*> elements): QDialog() {
exec();
}
//--------------- Destructor ---------------------------------
DicomDialog::~DicomDialog() {}
//--------------- getSelectedDicomDialogEntries ---------------------------------
QList<DicomDialogEntry*> DicomDialog::getSelectedDicomDialogEntries() {
......
......@@ -34,11 +34,6 @@ DicomDialogEntry::DicomDialogEntry() {
patientName = "NOT FOUND";
}
// --------------- Destructor -------------------
DicomDialogEntry::~DicomDialogEntry() {
}
// --------------- Getters -------------------
bool DicomDialogEntry::isSelected() {
return selected;
......
......@@ -45,7 +45,7 @@ public:
DicomDialogEntry();
/// Default Destructor
virtual ~DicomDialogEntry();
virtual ~DicomDialogEntry() = default;
///@name Getters
///@{
......
......@@ -54,10 +54,10 @@ Q_DECLARE_TR_FUNCTIONS(DicomParser)
public:
DicomParser() {};
DicomParser() = default;
/// Default Destructor
virtual ~DicomParser() {};
virtual ~DicomParser() = default;
/**
* @brief Parse the input directory for DICOM series.
......
......@@ -34,11 +34,6 @@ DicomSerie::DicomSerie() {
patientName = "NOT FOUND";
}
// --------------- Destructor -------------------
DicomSerie::~DicomSerie() {
}
// --------------- Getters -------------------
QDate DicomSerie::getAcquisitionDate() const {
return acquisitionDate;
......
......@@ -53,7 +53,7 @@ public:
DicomSerie();
/// Default Destructor
virtual ~DicomSerie();
virtual ~DicomSerie() = default;
///@name Getters
///@{
......
......@@ -44,7 +44,7 @@ public:
ItkImageComponent(const QString&) throw (camitk::AbortException);
/// needed for deleting
virtual ~ItkImageComponent() {};
virtual ~ItkImageComponent() = default;
virtual void createComponent(const QString&);
......
......@@ -43,7 +43,7 @@ class ItkImageComponentExtension : public camitk::ImageComponentExtension {
public:
/// the constructor (do nothing really)
ItkImageComponentExtension() : ImageComponentExtension() {}
ItkImageComponentExtension() : ImageComponentExtension() = default;
/// get the plugin name
virtual QString getName() const;
......@@ -65,7 +65,7 @@ public:
protected:
/// the destructor
virtual ~ItkImageComponentExtension() {};
virtual ~ItkImageComponentExtension() = default;
template <class ImageType> static bool saveImage(camitk::ImageComponent*);
......
......@@ -50,7 +50,7 @@ public:
GenerateModel(camitk::ActionExtension*);
/// the destructor
virtual ~GenerateModel() {};
virtual ~GenerateModel() = default;
/// default widget
virtual QWidget* getWidget() {
......
......@@ -44,10 +44,10 @@ class MMLActionExtension : public camitk::ActionExtension {
public:
/// the constructor
MMLActionExtension() : ActionExtension() {}
MMLActionExtension() : ActionExtension() = default;
/// the destructor
virtual ~MMLActionExtension() {}
virtual ~MMLActionExtension() = default;
/// Method must be reimplemented when an ActionExtension is done,
/// the own actions of an extension are load there.
......
......@@ -45,10 +45,6 @@ SimulationDialog::SimulationDialog(ActionExtension* extension) : Action(extensio
setFamily("Modeling");
}
// --------------- destructor -------------------
SimulationDialog::~SimulationDialog() {
}
// --------------- getWidget -------------------
QWidget* SimulationDialog::getWidget() {
MMLComponent* input = dynamic_cast<MMLComponent*> (getTargets().last());
......
......@@ -23,7 +23,7 @@ public:
SimulationDialog(camitk::ActionExtension*);
/// Default Destructor
virtual ~SimulationDialog();
virtual ~SimulationDialog() = default;
public slots:
/** this method is automatically called when the action is triggered.
......
......@@ -45,7 +45,7 @@ public:
CreateSC(camitk::ActionExtension*);
/// the destructor
virtual ~CreateSC() {};
virtual ~CreateSC() = default;
/// use the default widget (but update the values)
virtual QWidget* getWidget();
......
......@@ -46,7 +46,7 @@ class MMLCOMPONENT_API MMLComponentExtension : public camitk::ComponentExtension
public:
/// the constructor (do nothing really)
MMLComponentExtension() : ComponentExtension() {}
MMLComponentExtension() : ComponentExtension() = default;
/// get the plugin name
virtual QString getName() const;
......@@ -65,7 +65,7 @@ public:
protected:
/// the destructor
virtual ~MMLComponentExtension() {};
virtual ~MMLComponentExtension() = default;
};
#endif
......@@ -34,6 +34,3 @@ MMLMonitorDisplay::MMLMonitorDisplay(Monitor* monitor, MMLComponent* manager): Q
this->manager = manager;
}
MMLMonitorDisplay::~MMLMonitorDisplay() {
}
......@@ -50,7 +50,7 @@ public:
/// constructor
MMLMonitorDisplay(Monitor* monitor, MMLComponent* manager);
/// destructor
~MMLMonitorDisplay() override;
~MMLMonitorDisplay() override = default;
/// update display
virtual void update() = 0;
......
......@@ -27,8 +27,6 @@
MMLMonitorDisplayFactory* MMLMonitorDisplayFactory::instance = nullptr;
MMLMonitorDisplayFactory::MMLMonitorDisplayFactory() {}
// -------------------- hasClass --------------------
bool MMLMonitorDisplayFactory::isRegistered(std::string id) {
return mapObjectCreator.find(id) != mapObjectCreator.end();
......
......@@ -108,7 +108,7 @@ public:
private:
MMLMonitorDisplayFactory();
MMLMonitorDisplayFactory() = default;
using CreateMonitorDisplayFunctionPointer = MMLMonitorDisplay* (*)(Monitor* monitor, MMLComponent* manager);
......
......@@ -40,10 +40,6 @@ Arrows::Arrows(Monitor* monitor, MMLComponent* manager): MMLMonitorDisplay(monit
}
Arrows::~Arrows() {
}
// ---------------------- update ----------------------------
void Arrows::update() {
......
......@@ -36,7 +36,7 @@ public:
/// constructor
Arrows(Monitor* monitor, MMLComponent* manager);
/// destructor
~Arrows() override;
~Arrows() override = default;
/// update display
void update() override;
......@@ -45,4 +45,4 @@ public:
};
#endif
\ No newline at end of file
#endif
......@@ -39,10 +39,6 @@ Colors::Colors(Monitor* monitor, MMLComponent* manager): MMLMonitorDisplay(monit
}
Colors::~Colors() {
}
// ---------------------- update ----------------------------
void Colors::update() {
......
......@@ -34,7 +34,7 @@ class MMLCOMPONENT_API Colors : public MMLMonitorDisplay {
public:
/// constructor
Colors(Monitor* monitor, MMLComponent* manager);
Colors(Monitor* monitor, MMLComponent* manager) = default;
/// destructor
~Colors() override;
......@@ -44,4 +44,4 @@ public:
void hide() override;
};
#endif
\ No newline at end of file
#endif
......@@ -46,7 +46,7 @@ class PMLComponentExtension : public camitk::MeshComponentExtension {
public:
/// the constructor (does nothing really)
PMLComponentExtension() : MeshComponentExtension() {}
PMLComponentExtension() : MeshComponentExtension() = default;
/// get the plugin name
virtual QString getName() const;
......@@ -65,7 +65,7 @@ public:
protected:
/// the destructor
virtual ~PMLComponentExtension() {};
virtual ~PMLComponentExtension() = default;
};
#endif
......@@ -72,7 +72,7 @@ class Loads {
public:
/// default constructor
Loads() {};
Loads() = default;
/// build a list of load from an LML file
Loads(std::string);
......
......@@ -26,9 +26,7 @@
#include "TargetList.h"
#include <sstream>
// --------------- constructor ---------------
TargetList::TargetList() {}
// --------------- other constructors ---------------
TargetList::TargetList(const std::string l) {
add(l);
}
......
......@@ -46,7 +46,7 @@ class TargetList {
public:
/// default constructor, the target list is empty
TargetList();
TargetList() = default;
/** create a target list using initial list of targets.
* The list of targets can be either a indexed list (eg. "5-7,10,12-15")
......
......@@ -45,7 +45,7 @@ class Unit;
**/
class Unit {
public:
virtual ~Unit() {};
virtual ~Unit() = default;
std::string getUnitName() {
return unitString;
};
......
......@@ -48,7 +48,7 @@ public:
ValueEvent(): value(0.0), date(0.0) {};
/// destructor
~ValueEvent() {};
~ValueEvent() = default;
/// return true if the event is active at time t
bool isActive(const double t) const;
......
......@@ -28,9 +28,6 @@
// -------------------- cosntructor --------------------
AndMultipleCriterion::AndMultipleCriterion(mml::MultipleCriteria* m, MonitoringManager* monitoringManager, MultipleCriterion* parent): MultipleCriterion(m, monitoringManager, parent) {}
// -------------------- destructor --------------------
AndMultipleCriterion::~AndMultipleCriterion() {}
// -------------------- checkCriteria --------------------
bool AndMultipleCriterion::checkCriterion() {
bool result = true;
......
......@@ -49,7 +49,7 @@ public:
*/
AndMultipleCriterion(mml::MultipleCriteria* m, MonitoringManager* monitoringManager, MultipleCriterion* parent = nullptr);
/// destructor
~AndMultipleCriterion() override;
~AndMultipleCriterion() override = default;
/// return true if every single Criterion is reached
bool checkCriterion() override;
......
......@@ -58,9 +58,6 @@ AtomIterator::AtomIterator(PhysicalModel* pml, std::string targetList) {
index = 0;
}
// -------------------- destructor --------------------
AtomIterator::~AtomIterator() {}
// -------------------- begin --------------------
void AtomIterator::begin() {
index = 0;
......
......@@ -44,7 +44,7 @@ public:
/// constructor
AtomIterator(PhysicalModel* pml, std::string targetList);
/// destructor
~AtomIterator();
~AtomIterator() = default;
/// place iterator on first atom
void begin();
......
......@@ -100,8 +100,6 @@ Chrono::Chrono(double init) {
running = false;
}
Chrono::~Chrono() {}
// start/stop Chrono
void Chrono::start() {
stopValue = startValue = getTimeInMilliseconds();
......
......@@ -44,7 +44,7 @@ public:
/// new chrono that starts directly at the given time
Chrono(double);
~Chrono();
~Chrono() = default;
/// start at zero
void start();
......
......@@ -31,7 +31,3 @@ InteractiveSimulator::InteractiveSimulator(MonitoringManager* monitoringManager)
// -------------------- constructor --------------------
InteractiveSimulator::InteractiveSimulator(MonitoringManager* monitoringManager, const char* file): Simulator(monitoringManager, file) {}
// -------------------- destructor --------------------
InteractiveSimulator::~InteractiveSimulator() {}
......@@ -42,7 +42,7 @@ public:
/// constructor
InteractiveSimulator(MonitoringManager* monitoringManager, const char* file);