Modernize C++ codebase: fix deprecated patterns and improve safety

ARSTD/ARSTD/Command/CommandProcessorContext.h

@@ -31,7 +31,7 @@ namespace ARSTD
       //adds a command to the end
       bool addCommand(std::shared_ptr<Command> pCommand);
 
-      //returns the command the is currently executing. returns NULL if no command is currently executing.
+      //returns the command the is currently executing. returns nullptr if no command is currently executing.
       std::shared_ptr<Command> getCurrentExecutingCommand() const;
 
       //empties the whole context

ARSTD/ARSTD/Structures/Element.cpp

@@ -13,7 +13,7 @@ namespace ARSTD
 
   Element::Element(const std::string& strName)
   : m_strName(strName),
-    m_pParent(NULL)
+    m_pParent(nullptr)
   {
   }
 
@@ -68,7 +68,7 @@ namespace ARSTD
 
   void Element::resetParent()
   {
-    m_pParent = NULL;
+    m_pParent = nullptr;
   }
 
 

CodeSubWars/Source/CSWActiveSonar.cpp

@@ -269,7 +269,7 @@ namespace CodeSubWars
     m_bTargetDetected(false),
     m_vecTargetPosition(0, 0, 0),
     m_LastScans(50),
-    m_pVisualizer(NULL),
+    m_pVisualizer(nullptr),
     m_pScanRay(CSWScanRay::create(strName + ".ScanRay", Matrix44D(Vector3D(0, 0, 60)), MAX_DISTANCE - 60))
   {
     attach(m_pScanRay);

CodeSubWars/Source/CSWActiveSonarVisualizer.cpp

@@ -156,7 +156,7 @@ namespace CodeSubWars
 
 
   CSWActiveSonarVisualizer::CSWActiveSonarVisualizer(QWidget* pParent, CSWActiveSonar::PtrType pActiveSonar)
-  : QWidget(pParent, NULL)
+  : QWidget(pParent, nullptr)
   {
     QHBoxLayout* pLayout = new QHBoxLayout(this); 
     pLayout->setMargin(1);

CodeSubWars/Source/CSWCollideable.cpp

@@ -139,7 +139,7 @@ namespace CodeSubWars
     DT_RemoveObject(CSWWorld::getInstance()->getScene(), m_hDTObject);
     DT_DestroyObject(m_hDTObject);
     DT_DeleteShape(m_hDTShape);
-    m_hDTShape = NULL;
+    m_hDTShape = nullptr;
 
     m_bInitialized = false;
     return true;
@@ -150,7 +150,7 @@ namespace CodeSubWars
   : m_pCollisionMesh(pCollisionMesh),
     m_BoundingBox(pCollisionMesh->getAxisAlignedBoundingBox()),
     m_bInitialized(false),
-    m_hDTShape(NULL),
+    m_hDTShape(nullptr),
     m_bHit(false),
     m_matObjectTCollisionShape(Matrix44D::IDENTITY)
   {

CodeSubWars/Source/CSWEngine.cpp

@@ -114,7 +114,7 @@ namespace CodeSubWars
     m_fMaxForce(size.getVolume()*1e+6),
     m_fIntensity(0),
     m_bAllowDirectionChanges(bAllowDirectionChanges),
-    m_pVisualizer(NULL)
+    m_pVisualizer(nullptr)
   {
   }
 

CodeSubWars/Source/CSWEquipment.cpp

@@ -105,7 +105,7 @@ namespace CodeSubWars
 
   QWidget* CSWEquipment::getInformationWidget(QWidget* pParent)
   {
-    return NULL;
+    return nullptr;
   }
 
 

CodeSubWars/Source/CSWLog.cpp

@@ -32,7 +32,7 @@ namespace CodeSubWars
 
   void CSWLog::resetLogOutput()
   {
-    m_pTextEdit = NULL;
+    m_pTextEdit = nullptr;
   }
 
 
@@ -50,7 +50,7 @@ namespace CodeSubWars
 
 
   CSWLog::CSWLog()
-  : m_pTextEdit(NULL)
+  : m_pTextEdit(nullptr)
   {
     QDir().mkdir("log");
     m_LogFile.open("log/events.log", std::ios::out | std::ios::app);

CodeSubWars/Source/CSWMap.cpp

@@ -243,7 +243,7 @@ namespace CodeSubWars
 
   CSWMap::CSWMap(const std::string& strName)
   : CSWEquipment(strName, Matrix44D(), 0, 0),
-    m_pVisualizer(NULL)
+    m_pVisualizer(nullptr)
   {
   }
 

CodeSubWars/Source/CSWMapVisualizer.cpp

@@ -193,7 +193,7 @@ namespace CodeSubWars
 
 
   CSWMapVisualizer::CSWMapVisualizer(QWidget* pParent, CSWMap::PtrType pMap)
-  : QWidget(pParent, NULL)
+  : QWidget(pParent, nullptr)
   {
     QHBoxLayout* pLayout = new QHBoxLayout(this); 
     pLayout->setMargin(1);

CodeSubWars/Source/CSWMessageCollisionObjects.cpp

@@ -82,7 +82,7 @@ namespace CodeSubWars
 
     DT_AddDefaultResponse(CSWWorld::getInstance()->getResponseTable(), 
                           &(CSWMessageInitializeCollisionObjects::collide),
-                          DT_DEPTH_RESPONSE, NULL);
+                          DT_DEPTH_RESPONSE, nullptr);
   }
 
 

CodeSubWars/Source/CSWPassiveSonar.cpp

@@ -204,7 +204,7 @@ namespace CodeSubWars
   : CSWSonar(strName, matBaseTObject),
     m_pSoundReceiver(CSWSoundReceiver::create()),
     m_LastScanValues(50),
-    m_pVisualizer(NULL),
+    m_pVisualizer(nullptr),
     m_fAdjustingEndTime(0),
     m_bFoundMaximum(false),
     m_bFindingMaximum(false)

CodeSubWars/Source/CSWPassiveSonarVisualizer.cpp

@@ -151,7 +151,7 @@ namespace CodeSubWars
 
 
   CSWPassiveSonarVisualizer::CSWPassiveSonarVisualizer(QWidget* pParent, CSWPassiveSonar::PtrType pPassiveSonar)
-  : QWidget(pParent, NULL)
+  : QWidget(pParent, nullptr)
   {
     QHBoxLayout* pLayout = new QHBoxLayout(this); 
     pLayout->setMargin(1);

CodeSubWars/Source/CSWPythonable.cpp

@@ -56,7 +56,7 @@ namespace CodeSubWars
 
 
   CSWPythonable::CSWPythonable()
-  : m_pThreadState(NULL)
+  : m_pThreadState(nullptr)
   {
   }
 

CodeSubWars/Source/CSWSilentApplication.cpp

@@ -41,11 +41,15 @@ namespace CodeSubWars
         }
         case WORLD_TYPE:
         {
-          int t = atoi(result.second.c_str());
-          if (t >= 1 && t <= 5)
-            m_WorldType = static_cast<CSWWorld::WorldType>(t);
-          else
-            m_bParametersValid = false;        
+          try {
+            int t = std::stoi(result.second);
+            if (t >= 1 && t <= 5)
+              m_WorldType = static_cast<CSWWorld::WorldType>(t);
+            else
+              m_bParametersValid = false;
+          } catch (...) {
+            m_bParametersValid = false;
+          }
           break;
         }
         case BATTLE_TYPE:
@@ -60,20 +64,28 @@ namespace CodeSubWars
         }
         case TEAMSIZE_TYPE:
         {
-          int t = atoi(result.second.c_str());
-          if (t == 3 || t == 5 || t == 10)
-            m_nTeamSize = t;
-          else
-            m_bParametersValid = false;        
+          try {
+            int t = std::stoi(result.second);
+            if (t == 3 || t == 5 || t == 10)
+              m_nTeamSize = t;
+            else
+              m_bParametersValid = false;
+          } catch (...) {
+            m_bParametersValid = false;
+          }
           break;
         }
         case TIMESTEP_TYPE:
         {
-          double t = atof(result.second.c_str());
-          if (t >= 0.01 && t <= 0.1)
-            m_fTimeStep = t;
-          else
-            m_bParametersValid = false;        
+          try {
+            double t = std::stod(result.second);
+            if (t >= 0.01 && t <= 0.1)
+              m_fTimeStep = t;
+            else
+              m_bParametersValid = false;
+          } catch (...) {
+            m_bParametersValid = false;
+          }
           break;
         }
       }
@@ -134,7 +146,12 @@ namespace CodeSubWars
 
     CSWLog::getInstance()->log("running ... (press ESC to stop)");
     std::cout << "\n";
+#ifdef _WIN32
     while (!_kbhit() && CSWWorld::getInstance()->isBattleRunning())
+#else
+    // On non-Windows systems, just run until battle ends
+    while (CSWWorld::getInstance()->isBattleRunning())
+#endif
     {
       //recalculate the world
       CSWWorld::getInstance()->recalculate();

CodeSubWars/Source/CSWSubmarine.cpp

@@ -356,7 +356,7 @@ namespace CodeSubWars
 
   CSWSubmarine::CSWSubmarine(const std::string& strName, const Matrix44D& matBaseTObject, double fLength)
   : CSWDamDynSolCol(strName, matBaseTObject,
-                    Mesh::readSTL(std::istrstream(reinterpret_cast<const char*>(SUBMARINE_MESH), sizeof(SUBMARINE_MESH)))->transformed(Matrix44D(Vector4D(fLength, 0, 0, 0),
+                    Mesh::readSTL(std::istringstream(std::string(reinterpret_cast<const char*>(SUBMARINE_MESH), sizeof(SUBMARINE_MESH))))->transformed(Matrix44D(Vector4D(fLength, 0, 0, 0),
                                                                                                                                                  Vector4D(0, fLength, 0, 0),
                                                                                                                                                  Vector4D(0, 0, fLength, 0),
                                                                                                                                                  Vector4D(0, 0, 0, 1))),

CodeSubWars/Source/CSWUtilities.cpp

@@ -255,9 +255,9 @@ namespace CodeSubWars
       return CSWUtilities::SubmarineFileContainer();
 
     // scan given directory
-    for (int i = 0; i < list.size(); ++i) 
+    for (const auto& fileInfo : list) 
     {
-      QFileInfo fi = list.at(i);
+      QFileInfo fi = fileInfo;
 
       if (fi.isFile() && fi.suffix() == "py")
       {

CodeSubWars/Source/CSWWeapon.cpp

@@ -183,7 +183,7 @@ namespace CodeSubWars
     Vector3D vecStart = aabb.getMin() + Vector3D(aabb.getWidth()*0.5, aabb.getHeight()*0.5, fRadius);
     Vector3D vecEnd = aabb.getMax() - Vector3D(aabb.getWidth()*0.5, aabb.getHeight()*0.5, fRadius);
 
-    DT_ShapeHandle hDTShape = NULL;
+    DT_ShapeHandle hDTShape = nullptr;
     Mesh::PtrType pCollisionMesh;
     if (vecStart.getDistance(vecEnd) < EPSILON)
     {

CodeSubWars/Source/CSWWeaponBattery.cpp

@@ -268,7 +268,7 @@ namespace CodeSubWars
     m_fLeastWeaponLaunchDelay(1.0),
     m_fLastRechargeTime(0),
     m_Cnt(0),
-    m_pVisualizer(NULL)
+    m_pVisualizer(nullptr)
   {
   }
 

CodeSubWars/Source/CSWWorld.cpp

@@ -516,7 +516,7 @@ namespace CodeSubWars
     m_bBattleInitialized(false),
     m_mtxRecalc(QMutex::Recursive),
     m_mtxDraw(QMutex::Recursive),
-    m_pyMainState(NULL),
+    m_pyMainState(nullptr),
     m_CalculateTimes(200),
     m_TransformCalculateTimes(200),
     m_RecalcTimes(200),

CodeSubWars/Source/CodeSubwarsMainWindow.cpp

@@ -48,7 +48,7 @@ namespace CodeSubWars
   CodeSubwarsMainWindow::~CodeSubwarsMainWindow()
   {
     CSWWorld::getInstance()->finalizeWorld();
-    CSWLog::getInstance()->setLogOutput(NULL);
+    CSWLog::getInstance()->setLogOutput(nullptr);
   }
 
 
@@ -245,19 +245,19 @@ namespace CodeSubWars
 
   void CodeSubwarsMainWindow::help()
   {
-    ShellExecuteA(NULL, NULL, (LPCSTR)(qApp->applicationDirPath() + "/doc/html/index.html").toStdString().c_str(), NULL, NULL, SW_SHOWNORMAL);
+    ShellExecuteA(nullptr, nullptr, (LPCSTR)(qApp->applicationDirPath() + "/doc/html/index.html").toStdString().c_str(), nullptr, nullptr, SW_SHOWNORMAL);
   }
 
 
   void CodeSubwarsMainWindow::manual()
   {
-    ShellExecuteA(NULL, NULL, (LPCSTR)(qApp->applicationDirPath() + "/doc/Manual.pdf").toStdString().c_str(), NULL, NULL, SW_SHOWNORMAL);
+    ShellExecuteA(nullptr, nullptr, (LPCSTR)(qApp->applicationDirPath() + "/doc/Manual.pdf").toStdString().c_str(), nullptr, nullptr, SW_SHOWNORMAL);
   }
 
 
   void CodeSubwarsMainWindow::website()
   {
-    ShellExecuteA(NULL, NULL, (LPCSTR)Constants::WEBSITE.toStdString().c_str(), NULL, NULL, SW_SHOWNORMAL);
+    ShellExecuteA(nullptr, nullptr, (LPCSTR)Constants::WEBSITE.toStdString().c_str(), nullptr, nullptr, SW_SHOWNORMAL);
   }
 
 
@@ -324,13 +324,13 @@ namespace CodeSubWars
       QSplitter* pHorizontalSplitter = new QSplitter(Qt::Horizontal);
       pVerticalSplitter->addWidget(pHorizontalSplitter);
 
-        m_pMainSceneView = new SceneView(NULL, true);
+        m_pMainSceneView = new SceneView(nullptr, true);
         pHorizontalSplitter->addWidget(m_pMainSceneView);
 
         QSplitter* pDetailVerticalSplitter = new QSplitter(Qt::Vertical);
         pHorizontalSplitter->addWidget(pDetailVerticalSplitter);
 
-          m_pDetailUpperSceneView = new SceneView(NULL, false);
+          m_pDetailUpperSceneView = new SceneView(nullptr, false);
           pDetailVerticalSplitter->addWidget(m_pDetailUpperSceneView);
           m_pDetailLowerInformationView = new InformationView;
           pDetailVerticalSplitter->addWidget(m_pDetailLowerInformationView);
@@ -382,7 +382,7 @@ namespace CodeSubWars
       m_pTimeSlider->setTickPosition(QSlider::TicksBelow);
       pHBoxLayout->addWidget(m_pTimeSlider);
 
-    m_pSystemView = new SystemView(NULL);
+    m_pSystemView = new SystemView(nullptr);
     statusBar()->addPermanentWidget(m_pSystemView);
 
     connect(m_pTimeSlider, SIGNAL(valueChanged(int)), this, SLOT(setTimeRatio(int)));

CodeSubWars/Source/IO/CSWBRImporter.cpp

@@ -101,10 +101,9 @@ namespace CodeSubWars
         is.read(reinterpret_cast<char*>(&nNameSize), 2);
         if (is.eof() || is.fail())
           return true;
-        char* buff = new char[nNameSize];
-        is.read(buff, nNameSize);
-        objData.strName = std::string(buff, nNameSize);
-        delete [] buff;
+        std::vector<char> buff(nNameSize);
+        is.read(buff.data(), nNameSize);
+        objData.strName = std::string(buff.data(), nNameSize);
         if (is.eof() || is.fail())
           return true;
 

CodeSubWars/Source/InformationView.cpp

@@ -537,7 +537,7 @@ namespace CodeSubWars
     {
       QList<QWidget*> widgets;
 
-      infoField.pEquipmentInformationWidget = pObj->getInformationWidget(NULL);
+      infoField.pEquipmentInformationWidget = pObj->getInformationWidget(nullptr);
       if (!infoField.pEquipmentInformationWidget)
         infoField.pEquipmentInformationWidget = new QLabel("n.a.");
       widgets.push_back(infoField.pEquipmentInformationWidget);

CodeSubWars/Source/InformationView.h

@@ -19,7 +19,7 @@ namespace CodeSubWars
       Q_OBJECT
 
     public:
-      InformationView(QWidget* pParent = NULL);
+      InformationView(QWidget* pParent = nullptr);
 
       virtual ~InformationView();
 

CodeSubWars/Source/NewBattleDialog.h

@@ -14,7 +14,7 @@ namespace CodeSubWars
       Q_OBJECT
 
     public:
-      NewBattleDialog(QString strPath, QWidget* pParent = NULL);
+      NewBattleDialog(QString strPath, QWidget* pParent = nullptr);
       virtual ~NewBattleDialog();
 
       CSWUtilities::SubmarineFileContainer getSubmarines() const;

CodeSubWars/Source/PrecompiledHeader.h

@@ -6,7 +6,9 @@
 #pragma warning (disable: 4267)
 
 // c++ and c standard lib
+#ifdef _WIN32
 #include <conio.h>
+#endif
 #include <algorithm>
 #include <functional>
 #include <list>
@@ -16,7 +18,6 @@
 #include <cassert>
 #include <cmath>
 #include <sstream>
-#include <strstream>
 #include <numeric>
 #include <iomanip>
 #include <iostream>

CodeSubWars/Source/ReplayDialog.cpp

@@ -102,7 +102,7 @@ namespace CodeSubWars
     }
     else
     {
-      QMessageBox::information(NULL, "Error", "CSW battle record file could not read successfully.");
+      QMessageBox::information(nullptr, "Error", "CSW battle record file could not read successfully.");
       m_fMinTime = 0;
       m_fMaxTime = 0;
     }