From e1f240f490324f8c6f4d8132630ad85756f6d191 Mon Sep 17 00:00:00 2001
From: Aqua-sama <aqua@iserlohn-fortress.net>
Date: Sun, 22 Apr 2018 16:10:18 +0200
Subject: Merge CommandLine functionality into Configuration

---
 config/main.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'config')

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
+}
-- 
cgit v1.2.1