diff options
author | Aqua-sama <aqua@iserlohn-fortress.net> | 2018-04-22 16:10:18 +0200 |
---|---|---|
committer | Aqua-sama <aqua@iserlohn-fortress.net> | 2018-04-22 16:10:18 +0200 |
commit | e1f240f490324f8c6f4d8132630ad85756f6d191 (patch) | |
tree | d0b9cb561d34a361297a72823a897cbb235cbae9 /config | |
parent | Add tile and cascade actions to Window menu (diff) | |
download | smolbote-e1f240f490324f8c6f4d8132630ad85756f6d191.tar.xz |
Merge CommandLine functionality into Configuration
Diffstat (limited to 'config')
-rw-r--r-- | config/main.cpp | 8 |
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 +} |