}
+Settings& Settings::getInstance()
+{
+ static Settings settings;
+ return settings;
+}
+
+
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)'=');
char* home = getenv("HOME");
- for (it = filePaths.begin(); it != filePaths.end(); it++)
+ for (it = filePaths.begin(); it != filePaths.end(); ++it)
{
std::string path = *it;
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<std::string,SerializablePtr> map;
+
if (obj && obj->get(map))
{
if (!precedence)