minor refactoring and state progress

[chaz/yoink] / src / Moof / Settings.cc

diff --git a/src/Moof/Settings.cc b/src/Moof/Settings.cc
index 5a321b01be9e53da843e43887d6def5029336a83..5a4f99127f099ef847f1822f8b875614f0d3674b 100644 (file)
--- a/src/Moof/Settings.cc
+++ b/src/Moof/Settings.cc
@@ -46,7 +46,7 @@ void Settings::parseArgs(int argc, char* argv[])
 {
        for (int i = 1; i < argc; ++i)
        {
-               script_.doString(argv[i]);
+               mScript.doString(argv[i]);
        }
 }
 
@@ -74,12 +74,12 @@ void Settings::loadFromFiles(const std::vector<std::string>& filePaths)
                        boost::replace_all(path, "$HOME", home);
                }
 
-               if (script_.doFile(path) != Script::SUCCESS)
+               if (mScript.doFile(path) != Script::SUCCESS)
                {
                        std::string str;
-                       script_[-1].get(str);
+                       mScript[-1].get(str);
                        logScript("%s", str.c_str());
-                       script_.clear();
+                       mScript.clear();
                }
        }
 }