X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2FMoof%2FSettings.cc;h=fe98f964d079b40e4c580141ef436fb784af0eff;hp=d13302d729234f2f7c6aa5710646dae82cf8a53b;hb=493ddb59a8620b49dfa0ff62ce93395ebfd02e86;hpb=c2321281bf12a7efaedde930422c7ddbc92080d4 diff --git a/src/Moof/Settings.cc b/src/Moof/Settings.cc index d13302d..fe98f96 100644 --- a/src/Moof/Settings.cc +++ b/src/Moof/Settings.cc @@ -46,7 +46,7 @@ Settings::Settings(int argc, char* argv[]) void Settings::parseArgs(int argc, char* argv[]) { - for (int i = 1; i < argc; i++) + for (int i = 1; i < argc; ++i) { char* where = strchr(argv[i], (int)'='); @@ -91,7 +91,7 @@ void Settings::loadFromFiles(const std::vector& filePaths, char* home = getenv("HOME"); - for (it = filePaths.begin(); it != filePaths.end(); it++) + for (it = filePaths.begin(); it != filePaths.end(); ++it) { std::string path = *it; @@ -100,13 +100,13 @@ void Settings::loadFromFiles(const std::vector& filePaths, boost::replace_first(path, "$HOME", home); } - Deserializer deserializer(*it, true); - - std::cout << "Looking for a config file at " << path << std::endl; try { + Deserializer deserializer(*it, true); + SerializablePtr obj = deserializer.deserialize(); std::map map; + if (obj && obj->get(map)) { if (!precedence)