cleanup: Remove more unnecessary nullptr checks before delete

Follow-up to #934

direct/src/dcparser/dcClass.cxx

@@ -85,9 +85,7 @@ DCClass(DCFile *dc_file, const string &name, bool is_struct, bool bogus_class) :
  */
 DCClass::
 ~DCClass() {
-  if (_constructor != nullptr) {
+  delete _constructor;
-    delete _constructor;
-  }
 
   Fields::iterator fi;
   for (fi = _fields.begin(); fi != _fields.end(); ++fi) {

direct/src/dcparser/dcPackerCatalog.cxx

@@ -44,9 +44,7 @@ DCPackerCatalog(const DCPackerCatalog &copy) :
  */
 DCPackerCatalog::
 ~DCPackerCatalog() {
-  if (_live_catalog != nullptr) {
+  delete _live_catalog;
-    delete _live_catalog;
-  }
 
   SwitchCatalogs::iterator si;
   for (si = _switch_catalogs.begin(); si != _switch_catalogs.end(); ++si) {

direct/src/dcparser/dcPackerInterface.cxx

@@ -60,9 +60,7 @@ DCPackerInterface(const DCPackerInterface &copy) :
  */
 DCPackerInterface::
 ~DCPackerInterface() {
-  if (_catalog != nullptr) {
+  delete _catalog;
-    delete _catalog;
-  }
 }
 
 /**

direct/src/dcparser/dcSwitch.cxx

@@ -42,21 +42,15 @@ DCSwitch::
   nassertv(_key_parameter != nullptr);
   delete _key_parameter;
 
-  Cases::iterator ci;
+  for (SwitchCase *dcase : _cases) {
-  for (ci = _cases.begin(); ci != _cases.end(); ++ci) {
-    SwitchCase *dcase = (*ci);
     delete dcase;
   }
 
-  CaseFields::iterator fi;
+  for (SwitchFields *fields : _case_fields) {
-  for (fi = _case_fields.begin(); fi != _case_fields.end(); ++fi) {
-    SwitchFields *fields = (*fi);
     delete fields;
   }
 
-  Fields::iterator ni;
+  for (DCField *field : _nested_fields) {
-  for (ni = _nested_fields.begin(); ni != _nested_fields.end(); ++ni) {
-    DCField *field = (*ni);
     delete field;
   }
 }

dtool/src/cppparser/cppManifest.cxx

@@ -127,9 +127,7 @@ CPPManifest(const string &macro, const string &definition) :
  */
 CPPManifest::
 ~CPPManifest() {
-  if (_expr != nullptr) {
+  delete _expr;
-    delete _expr;
-  }
 }
 
 /**

panda/src/downloader/bioStreamPtr.cxx

@@ -20,10 +20,8 @@
  */
 BioStreamPtr::
 ~BioStreamPtr() {
-  if (_stream != nullptr) {
+  delete _stream;
-    delete _stream;
+  _stream = nullptr;
-    _stream = nullptr;
-  }
 }
 
 #endif  // HAVE_OPENSSL

panda/src/egg/eggTransform.I

@@ -93,18 +93,10 @@ operator = (const EggTransform::Component &copy) {
  */
 INLINE EggTransform::Component::
 ~Component() {
-  if (_vec2 != nullptr) {
+  delete _vec2;
-    delete _vec2;
+  delete _vec3;
-  }
+  delete _mat3;
-  if (_vec3 != nullptr) {
+  delete _mat4;
-    delete _vec3;
-  }
-  if (_mat3 != nullptr) {
-    delete _mat3;
-  }
-  if (_mat4 != nullptr) {
-    delete _mat4;
-  }
 }
 
 /**

panda/src/express/multifile.cxx

@@ -337,7 +337,7 @@ close() {
       if (!_read->unref()) {
         delete _read;
       }
-    } else if (_write != nullptr) {
+    } else {
       delete _write;
     }
   }

panda/src/gobj/geomVertexColumn.cxx

@@ -228,10 +228,7 @@ setup() {
   }
   _total_bytes = _element_stride * _num_elements;
 
-  if (_packer != nullptr) {
+  delete _packer;
-    delete _packer;
-  }
-
   _packer = make_packer();
   _packer->_column = this;
 }

panda/src/grutil/meshDrawer.I

@@ -35,10 +35,10 @@ MeshDrawer() {
 INLINE MeshDrawer::
 ~MeshDrawer() {
   _root.remove_node();
-  if (_vertex != nullptr) delete _vertex;
+  delete _vertex;
-  if (_normal != nullptr) delete _normal;
+  delete _normal;
-  if (_uv != nullptr)     delete _uv;
+  delete _uv;
-  if (_color != nullptr)  delete _color;
+  delete _color;
 }
 
 /**

panda/src/grutil/meshDrawer.cxx

@@ -104,10 +104,10 @@ void MeshDrawer::begin(NodePath camera, NodePath render) {
   _b4 = - _right + _up;
 
   // recreate our rewriters
-  if (_vertex != nullptr) delete _vertex;
+  delete _vertex;
-  if (_normal != nullptr) delete _normal;
+  delete _normal;
-  if (_uv != nullptr)     delete _uv;
+  delete _uv;
-  if (_color != nullptr)  delete _color;
+  delete _color;
 
   if (_vdata == nullptr) {
     generator(_budget);

panda/src/grutil/meshDrawer2D.I

@@ -37,9 +37,9 @@ MeshDrawer2D() {
 INLINE MeshDrawer2D::
 ~MeshDrawer2D() {
   _root.remove_node();
-  if (_vertex != nullptr) delete _vertex;
+  delete _vertex;
-  if (_uv != nullptr)     delete _uv;
+  delete _uv;
-  if (_color != nullptr)  delete _color;
+  delete _color;
 }
 
 /**

panda/src/pgraph/transformState.cxx

@@ -81,10 +81,8 @@ TransformState::
   set_destructing();
 
   // Free the inverse matrix computation, if it has been stored.
-  if (_inv_mat != nullptr) {
+  delete _inv_mat;
-    delete _inv_mat;
+  _inv_mat = nullptr;
-    _inv_mat = nullptr;
-  }
 
   LightReMutexHolder holder(*_states_lock);
 

pandatool/src/daeegg/daeToEggConverter.cxx

@@ -78,9 +78,7 @@ DAEToEggConverter(const DAEToEggConverter &copy) :
  */
 DAEToEggConverter::
 ~DAEToEggConverter() {
-  if (_error_handler != nullptr) {
+  delete _error_handler;
-    delete _error_handler;
-  }
 }
 
 /**

pandatool/src/eggcharbase/eggCharacterFilter.cxx

@@ -31,9 +31,7 @@ EggCharacterFilter() : EggMultiFilter(false) {
  */
 EggCharacterFilter::
 ~EggCharacterFilter() {
-  if (_collection != nullptr) {
+  delete _collection;
-    delete _collection;
-  }
 }
 
 /**

pandatool/src/eggcharbase/eggComponentData.cxx

@@ -36,12 +36,8 @@ EggComponentData(EggCharacterCollection *collection,
  */
 EggComponentData::
 ~EggComponentData() {
-  BackPointers::iterator bpi;
+  for (EggBackPointer *back : _back_pointers) {
-  for (bpi = _back_pointers.begin(); bpi != _back_pointers.end(); ++bpi) {
+    delete back;
-    EggBackPointer *back = (*bpi);
-    if (back != nullptr) {
-      delete back;
-    }
   }
 }
 

pandatool/src/flt/fltRecordReader.cxx

@@ -42,10 +42,8 @@ FltRecordReader(std::istream &in) :
  */
 FltRecordReader::
 ~FltRecordReader() {
-  if (_iterator != nullptr) {
+  delete _iterator;
-    delete _iterator;
+  _iterator = nullptr;
-    _iterator = nullptr;
-  }
 }
 
 /**

pandatool/src/lwoegg/cLwoSurface.cxx

@@ -146,9 +146,7 @@ CLwoSurface(LwoToEggConverter *converter, const LwoSurface *surface) :
  */
 CLwoSurface::
 ~CLwoSurface() {
-  if (_block != nullptr) {
+  delete _block;
-    delete _block;
-  }
 }
 
 /**

pandatool/src/lwoegg/cLwoSurfaceBlock.cxx

@@ -144,7 +144,5 @@ CLwoSurfaceBlock(LwoToEggConverter *converter, const LwoSurfaceBlock *block) :
  */
 CLwoSurfaceBlock::
 ~CLwoSurfaceBlock() {
-  if (_tmap != nullptr) {
+  delete _tmap;
-    delete _tmap;
-  }
 }

pandatool/src/maya/mayaShaderColorDef.cxx

@@ -131,9 +131,7 @@ MayaShaderColorDef(MayaShaderColorDef &copy) {
  */
 MayaShaderColorDef::
 ~MayaShaderColorDef() {
-  if (_color_object != nullptr) {
+  delete _color_object;
-    delete _color_object;
-  }
 }
 
 /**

pandatool/src/mayaegg/mayaNodeDesc.cxx

@@ -72,9 +72,7 @@ MayaNodeDesc(MayaNodeTree *tree, MayaNodeDesc *parent, const string &name) :
  */
 MayaNodeDesc::
 ~MayaNodeDesc() {
-  if (_dag_path != nullptr) {
+  delete _dag_path;
-    delete _dag_path;
-  }
 }
 
 /**

pandatool/src/pstatserver/pStatThreadData.cxx

@@ -269,9 +269,7 @@ record_new_frame(int frame_number, PStatFrameData *frame_data) {
          (_frames.front() == nullptr ||
           _frames.front()->is_empty() ||
           _frames.front()->get_start() < oldest_allowable_time)) {
-    if (_frames.front() != nullptr) {
+    delete _frames.front();
-      delete _frames.front();
-    }
     _frames.pop_front();
     _first_frame_number++;
   }