commit 7bf1df9320f059514ec310f5067987ade49c0d5f
author misson20000 <xenotoad@xenotoad.net> Mon Jan 07 20:58:09 2019 -0800
committer misson20000 <xenotoad@xenotoad.net> Mon Jan 07 21:17:30 2019 -0800
tree 010a8d752a6be63995fa4b16cf0ef147d0dbbca0
parent f71cce3a0cdbc488cb35686952786dce69e48863

remove 'using std::string'

INIReader.h

diff --git a/INIReader.h b/INIReader.h
index fbb5bc2..1c36b3f 100644
--- a/INIReader.h
+++ b/INIReader.h
@@ -363,9 +363,7 @@
 #include <cctype>
 #include <cstdlib>
 
-using std::string;
-
-inline INIReader::INIReader(string filename)
+inline INIReader::INIReader(std::string filename)
 {
     _error = ini_parse(filename.c_str(), ValueHandler, this);
 }
@@ -375,20 +373,20 @@
     return _error;
 }
 
-inline const std::set<string>& INIReader::Sections() const
+inline const std::set<std::string>& INIReader::Sections() const
 {
     return _sections;
 }
 
-inline string INIReader::Get(string section, string name, string default_value) const
+inline std::string INIReader::Get(std::string section, std::string name, std::string default_value) const
 {
-    string key = MakeKey(section, name);
+    std::string key = MakeKey(section, name);
     return _values.count(key) ? _values.at(key) : default_value;
 }
 
-inline long INIReader::GetInteger(string section, string name, long default_value) const
+inline long INIReader::GetInteger(std::string section, std::string name, long default_value) const
 {
-    string valstr = Get(section, name, "");
+    std::string valstr = Get(section, name, "");
     const char* value = valstr.c_str();
     char* end;
     // This parses "1234" (decimal) and also "0x4D2" (hex)
@@ -396,18 +394,18 @@
     return end > value ? n : default_value;
 }
 
-inline double INIReader::GetReal(string section, string name, double default_value) const
+inline double INIReader::GetReal(std::string section, std::string name, double default_value) const
 {
-    string valstr = Get(section, name, "");
+    std::string valstr = Get(section, name, "");
     const char* value = valstr.c_str();
     char* end;
     double n = strtod(value, &end);
     return end > value ? n : default_value;
 }
 
-inline bool INIReader::GetBoolean(string section, string name, bool default_value) const
+inline bool INIReader::GetBoolean(std::string section, std::string name, bool default_value) const
 {
-    string valstr = Get(section, name, "");
+    std::string valstr = Get(section, name, "");
     // Convert to lower case to make string comparisons case-insensitive
     std::transform(valstr.begin(), valstr.end(), valstr.begin(), ::tolower);
     if (valstr == "true" || valstr == "yes" || valstr == "on" || valstr == "1")
@@ -418,9 +416,9 @@
         return default_value;
 }
 
-inline string INIReader::MakeKey(string section, string name)
+inline std::string INIReader::MakeKey(std::string section, std::string name)
 {
-    string key = section + "=" + name;
+    std::string key = section + "=" + name;
     // Convert to lower case to make section/name lookups case-insensitive
     std::transform(key.begin(), key.end(), key.begin(), ::tolower);
     return key;
@@ -430,7 +428,7 @@
                             const char* value)
 {
     INIReader* reader = (INIReader*)user;
-    string key = MakeKey(section, name);
+    std::string key = MakeKey(section, name);
     if (reader->_values[key].size() > 0)
         reader->_values[key] += "\n";
     reader->_values[key] += value;