From e43cf73d33d731b5d817d98c3dcb3d66eba1f718 Mon Sep 17 00:00:00 2001
From: Aqua-sama <aqua@iserlohn-fortress.net>
Date: Tue, 15 May 2018 19:17:51 +0200
Subject: Move help and version functions to main (out of Configuration) Make
 loading profiles a free function in Browser

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

(limited to 'config')

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());
-- 
cgit v1.2.1