Eradicate NULL macro. Replace with nullptr, 0, etc

Applications/DataExplorer/DataView/GeoTreeView.cpp

@@ -283,9 +283,13 @@ void GeoTreeView::loadFEMConditions()
 void GeoTreeView::saveFEMConditions()
 {
     TreeItem* item = static_cast<GeoTreeModel*>(model())->getItem(
-            this->selectionModel()->currentIndex());
-    QString fileName = QFileDialog::getSaveFileName(NULL,
-                        "Save FEM Conditions as", "", "OpenGeoSys FEM Condition file (*.cnd);; GeoSys Boundary Condition (*.bc);; GeoSys Initial Condition (*.ic);; GeoSys Source Condition (*.st)");
+        this->selectionModel()->currentIndex());
+    QString fileName =
+        QFileDialog::getSaveFileName(nullptr, "Save FEM Conditions as", "",
+                                     "OpenGeoSys FEM Condition file (*.cnd);; "
+                                     "GeoSys Boundary Condition (*.bc);; "
+                                     "GeoSys Initial Condition (*.ic);; "
+                                     "GeoSys Source Condition (*.st)");
     emit saveFEMConditionsRequested(item->data(0).toString(), fileName);
 }
 */

BaseLib/TemplateLogogFormatterSuppressedGCC-impl.h

@@ -80,7 +80,7 @@ TemplateLogogFormatterSuppressedGCC<T_SUPPPRESS_TOPIC_FLAG>
     }
 
     if ( target.GetNullTerminatesStrings() )
-        m_sMessageBuffer.append( (LOGOG_CHAR)NULL );
+        m_sMessageBuffer.append((LOGOG_CHAR)'\0');
 
     return m_sMessageBuffer;
 }

GeoLib/IO/Legacy/OGSIOVer4.cpp

@@ -163,7 +163,6 @@ std::string readPolyline(std::istream &in,
         in >> line;
         if (line.find("$ID") != std::string::npos) // subkeyword found CC
             in >> line; // read value
-            //            id = strtol(line_string.data(), NULL, 0);
         //....................................................................
         if (line.find("$NAME") != std::string::npos) // subkeyword found
         {
@@ -292,7 +291,6 @@ std::string readSurface(std::istream &in,
         in >> line;
         if (line.find("$ID") != std::string::npos) // subkeyword found CC
             in >> line; // read value
-            //            id = strtol(line_string.data(), NULL, 0);
         //....................................................................
         if (line.find("$NAME") != std::string::npos) // subkeyword found
         {

GeoLib/IO/XmlIO/Qt/XmlGmlInterface.cpp

@@ -106,7 +106,7 @@ int XmlGmlInterface::readFile(const QString &fileName)
         {
             readPoints(type_node, points.get(), pnt_names.get());
 
-            // if names-map is empty, set it to NULL because it is not needed
+            // if names-map is empty, set it to nullptr because it is not needed
             if (pnt_names->empty())
             {
                 pnt_names.reset(nullptr);
@@ -120,7 +120,7 @@ int XmlGmlInterface::readFile(const QString &fileName)
                 type_node, polylines.get(), *_geo_objs.getPointVec(gliName),
                 _geo_objs.getPointVecObj(gliName)->getIDMap(), ply_names.get());
 
-            // if names-map is empty, set it to NULL because it is not needed
+            // if names-map is empty, set it to nullptr because it is not needed
             if (ply_names->empty())
             {
                 ply_names.reset(nullptr);
@@ -132,7 +132,7 @@ int XmlGmlInterface::readFile(const QString &fileName)
                 type_node, surfaces.get(), *_geo_objs.getPointVec(gliName),
                 _geo_objs.getPointVecObj(gliName)->getIDMap(), sfc_names.get());
 
-            // if names-map is empty, set it to NULL because it is not needed
+            // if names-map is empty, set it to nullptr because it is not needed
             if (sfc_names->empty())
             {
                 sfc_names.reset(nullptr);