Merge CommandLine functionality into Configuration

1 files changed, 4 insertions, 4 deletions

diff --git a/config/main.cpp b/config/main.cpp
index 16ff6db..2ebad8d 100644
--- a/config/main.cpp
+++ b/config/main.cpp
@@ -15,12 +15,12 @@ int main(int argc, char **argv)
     app.setQuitOnLastWindowClosed(true);
 
     Configuration config;
-    config.read(Configuration::defaultUserConfigLocation());
+    config.parseConfigFile(config.value<std::string>("config").value());
 
     SettingsDialog dlg(&config);
-    dlg.configPath = Configuration::defaultUserConfigLocation();
-    dlg.setWindowTitle("poi-config: " + Configuration::defaultUserConfigLocation());
+    dlg.configPath = QString::fromStdString(config.value<std::string>("config").value());
+    dlg.setWindowTitle("poi-config: " + dlg.configPath);
     dlg.show();
 
     return app.exec();
-}
\ No newline at end of file
+}