aboutsummaryrefslogtreecommitdiff
path: root/src/main.cpp
diff options
context:
space:
mode:
authorAqua-sama <aqua@iserlohn-fortress.net>2018-01-25 19:20:30 +0100
committerAqua-sama <aqua@iserlohn-fortress.net>2018-01-25 19:20:30 +0100
commitf4025c0ebcddffbb1b826cd666b94d9140a56663 (patch)
tree94d9990af2a41db4237154de1377151dd8997a74 /src/main.cpp
parentConfiguration class rework (diff)
downloadsmolbote-f4025c0ebcddffbb1b826cd666b94d9140a56663.tar.xz
Configuration class rework
- castToString is now a free function - setFromString split away from setValue - moved Configuration to src
Diffstat (limited to 'src/main.cpp')
-rw-r--r--src/main.cpp11
1 files changed, 9 insertions, 2 deletions
diff --git a/src/main.cpp b/src/main.cpp
index 66df526..cce2c61 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -99,10 +99,17 @@ int main(int argc, char **argv)
instance.setConfiguration(config);
- instance.createSession(parser.value(profileOption), parser.isSet(newWindowOption), parser.positionalArguments());
+ if(parser.isSet(profileOption))
+ instance.createSession(parser.value(profileOption), parser.isSet(newWindowOption), parser.positionalArguments());
+ else
+ instance.createSession(QString::fromStdString(config->value<std::string>("browser.profile").value()), parser.isSet(newWindowOption), parser.positionalArguments());
#ifdef QT_DEBUG
qDebug("Startup complete in %lldms", timer.elapsed());
#endif
- return instance.exec();
+
+ // Normally we'd use
+ //return instance.exec();
+ // but, Call to "exec" is ambiguous
+ return static_cast<QApplication *>(&instance)->exec();
}