diff --git a/gui/ComponentItem.cpp b/gui/ComponentItem.cpp
index 8cd0644a79175b5252cf6a24cb2562431f7027b3..13acf15e7a14fa3701ddbbeadd5c392fa94ec164 100644
--- a/gui/ComponentItem.cpp
+++ b/gui/ComponentItem.cpp
@@ -136,7 +136,7 @@ Fidelity::GUI::ComponentItem::ComponentItem(QPointer<IComponent> component)
Fidelity::GUI::ComponentItem::~ComponentItem()
{
// Delete children and attached links
- if(m_Label) {delete m_Label;}
+ if(m_Label) delete m_Label;
for(int i = 0; i<m_LinkItemList->size(); ++i) {
// Schedules link for deletion (wait for event loop!)
@@ -148,10 +148,10 @@ Fidelity::GUI::ComponentItem::~ComponentItem()
}
// Clean up members
- if(m_NodeItemList) {delete m_NodeItemList;}
- if(m_LinkItemList) {delete m_LinkItemList;}
- if(m_ParameterModel) {delete m_ParameterModel;}
- if(m_Component) {delete m_Component;}
+ if(m_NodeItemList) delete m_NodeItemList;
+ if(m_LinkItemList) delete m_LinkItemList;
+ if(m_ParameterModel) delete m_ParameterModel;
+ if(m_Component) delete m_Component;
}
// Public methods
diff --git a/gui/MainWindow.cpp b/gui/MainWindow.cpp
index 77f0ffdbb46f26cd65040948e03eb3e5ec27c9e5..95f2aa271c867dc6817ad21445368ed1c1e2c23e 100644
--- a/gui/MainWindow.cpp
+++ b/gui/MainWindow.cpp
@@ -51,12 +51,12 @@ Fidelity::GUI::MainWindow::MainWindow(QWidget* parent, Qt::WFlags fl) : QMainWin
Fidelity::GUI::MainWindow::~MainWindow()
{
// Deletes also m_ComponentCache
- if(m_ComponentFactory!=NULL) {delete m_ComponentFactory;}
+ if(m_ComponentFactory!=NULL) delete m_ComponentFactory;
delete m_ComponentItemTable;
delete m_ToolboxContents;
delete m_WorkbenchScene;
- if(m_ActiveEngine!=NULL) {delete m_ActiveEngine;}
+ if(m_ActiveEngine!=NULL) delete m_ActiveEngine;
delete m_ZoomLevelActionGroup;
delete m_EngineParamModel;
delete m_GlobalsParamModel;
@@ -523,7 +523,7 @@ void Fidelity::GUI::MainWindow::on_cmbEngine_currentIndexChanged(int index)
QString identifier = cmbEngine->itemData(index).toString();
// Clean up before instantiating new engine
- if(m_ActiveEngine!=NULL) {delete m_ActiveEngine;}
+ if(m_ActiveEngine!=NULL) delete m_ActiveEngine;
if(!identifier.isEmpty()) {
// Create engine instance based on chosen identifier
diff --git a/plugins/components/library/fabryperotcavity/fabryperotcavity.cpp b/plugins/components/library/fabryperotcavity/fabryperotcavity.cpp
index cc2812260456ffa24d741669e0844d9802ee4294..d8961434306d0cff3e888db241e7e25a6c0e53e2 100644
--- a/plugins/components/library/fabryperotcavity/fabryperotcavity.cpp
+++ b/plugins/components/library/fabryperotcavity/fabryperotcavity.cpp
@@ -41,9 +41,9 @@ Fidelity::Plugin::Component::FabryPerotCavity::~FabryPerotCavity()
delete m_BeamNode1;
delete m_BeamNode2;
- if(m_MirrorWest) {delete m_MirrorWest;}
- if(m_Space) {delete m_Space;}
- if(m_MirrorEast) {delete m_MirrorEast;}
+ if(m_MirrorWest) delete m_MirrorWest;
+ if(m_Space) delete m_Space;
+ if(m_MirrorEast) delete m_MirrorEast;
}
void Fidelity::Plugin::Component::FabryPerotCavity::initAttributes()
diff --git a/votable/VOBinary.cpp b/votable/VOBinary.cpp
index 6f6538ba66c6570cb9b17015e43e8c878139340d..e3f2f4e4d5534e9c69f2607f9e2b80742124cc8c 100644
--- a/votable/VOBinary.cpp
+++ b/votable/VOBinary.cpp
@@ -27,7 +27,7 @@ Fidelity::Common::VOBinary::VOBinary()
Fidelity::Common::VOBinary::~VOBinary()
{
- if(m_Stream){delete m_Stream;}
+ if(m_Stream) delete m_Stream;
}
void Fidelity::Common::VOBinary::initAttributes()
diff --git a/votable/VOData.cpp b/votable/VOData.cpp
index 019b09b37c4c7be49d0e3ff11570732af6b73e3e..9be1d52d1546c613883b03413cdedf65e0818a54 100644
--- a/votable/VOData.cpp
+++ b/votable/VOData.cpp
@@ -27,9 +27,9 @@ Fidelity::Common::VOData::VOData()
Fidelity::Common::VOData::~VOData()
{
- if(m_TableData) {delete m_TableData;}
- if(m_Fits) {delete m_Fits;}
- if(m_Binary) {delete m_Binary;}
+ if(m_TableData) delete m_TableData;
+ if(m_Fits) delete m_Fits;
+ if(m_Binary) delete m_Binary;
}
void Fidelity::Common::VOData::initAttributes()
diff --git a/votable/VOField.cpp b/votable/VOField.cpp
index 8ebe6b142eea867117afc91cfbc2762d3547a92e..8ac29aeae5dca8c28ce8a8f1ce2a1e4671203343 100644
--- a/votable/VOField.cpp
+++ b/votable/VOField.cpp
@@ -27,8 +27,8 @@ Fidelity::Common::VOField::VOField()
Fidelity::Common::VOField::~VOField()
{
- if(m_Values) {delete m_Values;}
- if(m_LinkList) {delete m_LinkList;}
+ if(m_Values) delete m_Values;
+ if(m_LinkList) delete m_LinkList;
}
void Fidelity::Common::VOField::initAttributes()
diff --git a/votable/VOFits.cpp b/votable/VOFits.cpp
index 97988d6c4761dd3c238678356c0c20d198a4ec71..3c16c0d585296f8ca695ea6bf5cb2b44a0af5c1c 100644
--- a/votable/VOFits.cpp
+++ b/votable/VOFits.cpp
@@ -27,7 +27,7 @@ Fidelity::Common::VOFits::VOFits()
Fidelity::Common::VOFits::~VOFits()
{
- if(m_Stream){delete m_Stream;}
+ if(m_Stream) delete m_Stream;
}
void Fidelity::Common::VOFits::initAttributes()
diff --git a/votable/VOParam.cpp b/votable/VOParam.cpp
index 87467c2b4fa0749eb1e27587eba40cd6b0343e6a..b0444d5591eeddfeca4d48fa98e4a66bccffbdcd 100644
--- a/votable/VOParam.cpp
+++ b/votable/VOParam.cpp
@@ -27,7 +27,7 @@ Fidelity::Common::VOParam::VOParam()
Fidelity::Common::VOParam::~VOParam()
{
- if(m_Values){delete m_Values;}
+ if(m_Values) delete m_Values;
delete m_LinkList;
}
diff --git a/votable/VOTR.cpp b/votable/VOTR.cpp
index 863308ab2fdfb4ca24f766b0cb81c3732cc88311..317eeb9332e527b5c8afd65994e764f2fad471bb 100644
--- a/votable/VOTR.cpp
+++ b/votable/VOTR.cpp
@@ -33,7 +33,7 @@ VOTR::~VOTR()
// iterate over list and delete all referenced entries
while (!m_TDList->isEmpty()) {
QPointer<VOTD> entry = m_TDList->takeFirst();
- if(entry) {delete entry;}
+ if(entry) delete entry;
}
delete m_TDList;
diff --git a/votable/VOTable.cpp b/votable/VOTable.cpp
index a751e3b550a3e455a957c91fd563cf3e9bdeff3d..42b4cea0fdd03be9c25295379aafb2c39f38c56d 100644
--- a/votable/VOTable.cpp
+++ b/votable/VOTable.cpp
@@ -31,7 +31,7 @@ Fidelity::Common::VOTable::~VOTable()
delete m_ParamList;
delete m_GroupList;
delete m_LinkList;
- if(m_Data){delete m_Data;}
+ if(m_Data) delete m_Data;
}
void Fidelity::Common::VOTable::initAttributes()
diff --git a/votable/VOTableData.cpp b/votable/VOTableData.cpp
index b00f67d3324029bb2e51d04015b4792f3c162c82..fd08ec59cb47eb265ca7a9aca146da74767c2e83 100644
--- a/votable/VOTableData.cpp
+++ b/votable/VOTableData.cpp
@@ -34,7 +34,7 @@ VOTableData::~VOTableData()
unsigned long size = m_TRList->size();
for (unsigned long i = 0; i < size; ++i) {
- if(m_TRList->at(i)) {delete m_TRList->at(i);}
+ if(m_TRList->at(i)) delete m_TRList->at(i);
}
delete m_TRList;
diff --git a/votable/VOValues.cpp b/votable/VOValues.cpp
index 4126711fa7bc6e887132aa72ebd1106ff05e70e5..7237c5762524fbe34f24ccebdf1d957f97507766 100644
--- a/votable/VOValues.cpp
+++ b/votable/VOValues.cpp
@@ -27,8 +27,8 @@ Fidelity::Common::VOValues::VOValues()
Fidelity::Common::VOValues::~VOValues()
{
- if(m_Min){delete m_Min;}
- if(m_Max){delete m_Max;}
+ if(m_Min) delete m_Min;
+ if(m_Max) delete m_Max;
delete m_OptionList;
}