From 198ab08647ea9cf444d5e8178522b854ea2de1dc Mon Sep 17 00:00:00 2001
From: Stephen Anthony <sa666666@gmail.com>
Date: Tue, 24 Dec 2019 17:58:46 -0330
Subject: [PATCH] Replace 'atoi' with the C++11 equivalent: 'stoi'.

---
 src/emucore/Console.cxx         | 6 +++---
 src/emucore/EventHandler.cxx    | 6 +++---
 src/emucore/ProfilingRunner.cxx | 2 +-
 src/emucore/Props.cxx           | 2 +-
 src/emucore/TIASurface.cxx      | 2 +-
 src/gui/GameInfoDialog.cxx      | 6 +++---
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/emucore/Console.cxx b/src/emucore/Console.cxx
index c3f6d59f2..2caa18d51 100644
--- a/src/emucore/Console.cxx
+++ b/src/emucore/Console.cxx
@@ -113,7 +113,7 @@ Console::Console(OSystem& osystem, unique_ptr<Cartridge>& cart,
   myCart->setStartBankFromPropsFunc([this]() {
     const string& startbank = myProperties.get(PropType::Cart_StartBank);
     return (startbank == EmptyString || BSPF::equalsIgnoreCase(startbank, "AUTO"))
-        ? -1 : atoi(startbank.c_str());
+        ? -1 : stoi(startbank);
   });
 
   // We can only initialize after all the devices/components have been created
@@ -531,7 +531,7 @@ void Console::togglePhosphor()
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 void Console::changePhosphor(int direction)
 {
-  int blend = atoi(myProperties.get(PropType::Display_PPBlend).c_str());
+  int blend = stoi(myProperties.get(PropType::Display_PPBlend));
 
   if(direction == +1)       // increase blend
   {
@@ -692,7 +692,7 @@ void Console::updateVcenter(Int32 vcenter)
 void Console::setTIAProperties()
 {
   Int32 vcenter = BSPF::clamp(
-    static_cast<Int32>(atoi(myProperties.get(PropType::Display_VCenter).c_str())), TIAConstants::minVcenter, TIAConstants::maxVcenter
+    static_cast<Int32>(stoi(myProperties.get(PropType::Display_VCenter))), TIAConstants::minVcenter, TIAConstants::maxVcenter
   );
 
   if(myDisplayFormat == "NTSC" || myDisplayFormat == "PAL60" ||
diff --git a/src/emucore/EventHandler.cxx b/src/emucore/EventHandler.cxx
index 143ab8b3e..760e005c7 100644
--- a/src/emucore/EventHandler.cxx
+++ b/src/emucore/EventHandler.cxx
@@ -1095,7 +1095,7 @@ void EventHandler::setComboMap()
     // If it isn't, then we treat the entire list as invalid
     string key;
     buf >> key;
-    if(atoi(key.c_str()) == COMBO_SIZE)
+    if(stoi(key) == COMBO_SIZE)
     {
       // Fill the combomap table with events for as long as they exist
       int combocount = 0;
@@ -1108,7 +1108,7 @@ void EventHandler::setComboMap()
         int eventcount = 0;
         while(buf2 >> key && eventcount < EVENTS_PER_COMBO)
         {
-          myComboTable[combocount][eventcount] = Event::Type(atoi(key.c_str()));
+          myComboTable[combocount][eventcount] = Event::Type(stoi(key));
           ++eventcount;
         }
         ++combocount;
@@ -1392,7 +1392,7 @@ void EventHandler::setComboListForEvent(Event::Type event, const StringList& eve
     int combo = event - Event::Combo1;
     for(uInt32 i = 0; i < 8; ++i)
     {
-      uInt32 idx = atoi(events[i].c_str());
+      uInt32 idx = stoi(events[i]);
       if(idx < ourEmulActionList.size())
         myComboTable[combo][i] = EventHandler::ourEmulActionList[idx].event;
       else
diff --git a/src/emucore/ProfilingRunner.cxx b/src/emucore/ProfilingRunner.cxx
index f082c1269..9935872a6 100644
--- a/src/emucore/ProfilingRunner.cxx
+++ b/src/emucore/ProfilingRunner.cxx
@@ -69,7 +69,7 @@ ProfilingRunner::ProfilingRunner(int argc, char* argv[])
 
     if (splitPoint == string::npos) run.runtime = RUNTIME_DEFAULT;
     else  {
-      int runtime = atoi(arg.substr(splitPoint+1, string::npos).c_str());
+      int runtime = stoi(arg.substr(splitPoint+1, string::npos));
       run.runtime = runtime > 0 ? runtime : RUNTIME_DEFAULT;
     }
   }
diff --git a/src/emucore/Props.cxx b/src/emucore/Props.cxx
index fdf6d4385..4fabfcafd 100644
--- a/src/emucore/Props.cxx
+++ b/src/emucore/Props.cxx
@@ -63,7 +63,7 @@ void Properties::set(PropType key, const string& value)
 
       case PropType::Display_PPBlend:
       {
-        int blend = atoi(myProperties[pos].c_str());
+        int blend = stoi(myProperties[pos]);
         if(blend < 0 || blend > 100)
           myProperties[pos] = ourDefaultProperties[pos];
         break;
diff --git a/src/emucore/TIASurface.cxx b/src/emucore/TIASurface.cxx
index 815abe5f2..bb7a7c0b1 100644
--- a/src/emucore/TIASurface.cxx
+++ b/src/emucore/TIASurface.cxx
@@ -98,7 +98,7 @@ void TIASurface::initialize(const Console& console,
   }
   else
   {
-    p_blend = atoi(console.properties().get(PropType::Display_PPBlend).c_str());
+    p_blend = stoi(console.properties().get(PropType::Display_PPBlend));
     enable = console.properties().get(PropType::Display_Phosphor) == "YES";
   }
   enablePhosphor(enable, p_blend);
diff --git a/src/gui/GameInfoDialog.cxx b/src/gui/GameInfoDialog.cxx
index ec41669ac..4acadc345 100644
--- a/src/gui/GameInfoDialog.cxx
+++ b/src/gui/GameInfoDialog.cxx
@@ -455,10 +455,10 @@ void GameInfoDialog::loadEmulationProperties(const Properties& props)
   myPPBlend->setEnabled(!alwaysPhosphor && usePhosphor);
 
   const string& blend = props.get(PropType::Display_PPBlend);
-  myPPBlend->setValue(atoi(blend.c_str()));
+  myPPBlend->setValue(stoi(blend));
 
   // set vertical center
-  Int32 vcenter = atoi(props.get(PropType::Display_VCenter).c_str());
+  Int32 vcenter = stoi(props.get(PropType::Display_VCenter));
   myVCenter->setValueLabel(vcenter);
   myVCenter->setValue(vcenter);
   myVCenter->setValueUnit(vcenter ? "px" : "");
@@ -507,7 +507,7 @@ void GameInfoDialog::loadControllerProperties(const Properties& props)
   myMouseY->setEnabled(!autoAxis);
   if(m_axis >> m_range)
   {
-    myMouseRange->setValue(atoi(m_range.c_str()));
+    myMouseRange->setValue(stoi(m_range));
   }
   else
   {