aboutsummaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorAqua-sama <aqua@iserlohn-fortress.net>2018-05-15 19:17:51 +0200
committerAqua-sama <aqua@iserlohn-fortress.net>2018-05-15 19:17:51 +0200
commite43cf73d33d731b5d817d98c3dcb3d66eba1f718 (patch)
tree20a2d826c95761d8317104c92e66be085a977a5e /config
parentProfile editor plugin (diff)
downloadsmolbote-e43cf73d33d731b5d817d98c3dcb3d66eba1f718.tar.xz
Move help and version functions to main (out of Configuration)
Make loading profiles a free function in Browser
Diffstat (limited to 'config')
-rw-r--r--config/main.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/config/main.cpp b/config/main.cpp
index 36f79f5..569249c 100644
--- a/config/main.cpp
+++ b/config/main.cpp
@@ -17,8 +17,8 @@ int main(int argc, char **argv)
app.setQuitOnLastWindowClosed(true);
Configuration config;
- config.parseCommandLine(argc, argv);
- config.parseConfigFile(config.value<std::string>("config").value());
+ config.parse(argc, argv);
+ config.parse(config.value<std::string>("config").value());
SettingsDialog dlg(&config);
dlg.configPath = QString::fromStdString(config.value<std::string>("config").value());