Removing redundant non null check before deleting a ptr in destructors #301

This commit is contained in:
matlabbe
2018-08-09 15:53:47 -04:00
parent 5e60a2596c
commit 714d95cc34
20 changed files with 38 additions and 155 deletions

View File

@@ -419,15 +419,9 @@ DatabaseViewer::DatabaseViewer(const QString & ini, QWidget * parent) :
DatabaseViewer::~DatabaseViewer()
{
delete ui_;
if(dbDriver_)
{
delete dbDriver_;
}
delete dbDriver_;
#ifdef RTABMAP_OCTOMAP
if(octomap_)
{
delete octomap_;
}
delete octomap_;
#endif
}

View File

@@ -94,10 +94,7 @@ DepthCalibrationDialog::DepthCalibrationDialog(QWidget *parent) :
DepthCalibrationDialog::~DepthCalibrationDialog()
{
delete _ui;
if(_model)
{
delete _model;
}
delete _model;
}
void DepthCalibrationDialog::saveSettings(QSettings & settings, const QString & group) const

View File

@@ -252,10 +252,7 @@ ExportCloudsDialog::ExportCloudsDialog(QWidget *parent) :
ExportCloudsDialog::~ExportCloudsDialog()
{
delete _ui;
if(_compensator)
{
delete _compensator;
}
delete _compensator;
}
void ExportCloudsDialog::updateMLSGrpVisibility()

View File

@@ -58,10 +58,7 @@ public:
}
virtual ~LineItem()
{
if(_placeHolder)
{
delete _placeHolder;
}
delete _placeHolder;
}
void setColor(const QColor & color);

View File

@@ -49,10 +49,7 @@ KeypointItem::KeypointItem(int id, const cv::KeyPoint & kpt, float depth, const
KeypointItem::~KeypointItem()
{
if(_placeHolder)
{
delete _placeHolder;
}
delete _placeHolder;
}
void KeypointItem::setColor(const QColor & color)