aboutsummaryrefslogtreecommitdiff
path: root/src/main.cpp
diff options
context:
space:
mode:
authorAqua-sama <aqua@iserlohn-fortress.net>2018-03-20 16:49:08 +0100
committerAqua-sama <aqua@iserlohn-fortress.net>2018-03-20 16:49:08 +0100
commit03ff56c3be7f5eda19309a60dccb281c76d0187f (patch)
treed5918d7621aa147e8c3c3aaa1358ab7b9737aef7 /src/main.cpp
parentAdd pause/resume/cancel buttons to download (diff)
downloadsmolbote-03ff56c3be7f5eda19309a60dccb281c76d0187f.tar.xz
Update manpage
Diffstat (limited to 'src/main.cpp')
-rw-r--r--src/main.cpp10
1 files changed, 1 insertions, 9 deletions
diff --git a/src/main.cpp b/src/main.cpp
index dfaad50..102ac8e 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -34,7 +34,6 @@ int main(int argc, char **argv)
#ifdef QT_DEBUG
qDebug("config=%s", qUtf8Printable(parser.value(parser.configOption)));
- qDebug("default-config=%s", qUtf8Printable(parser.value(parser.defaultConfigOption)));
qDebug("profile=%s", qUtf8Printable(parser.value(parser.profileOption)));
qDebug("socket=%s", qUtf8Printable(parser.value(parser.socketOption)));
@@ -42,14 +41,7 @@ int main(int argc, char **argv)
std::shared_ptr<Configuration> config = std::make_shared<Configuration>();
- // first load the default configuration
- if(!parser.value(parser.defaultConfigOption).isEmpty()) {
- qDebug("Reading default configuration [%s]: %s",
- qUtf8Printable(parser.value(parser.defaultConfigOption)),
- config->read(parser.value(parser.defaultConfigOption)) ? "ok" : "failed");
- }
-
- // then load in the user configuration, which will overwrite it
+ // load user configuration
if(!parser.value(parser.configOption).isEmpty()) {
qDebug("Reading configuration [%s]: %s",
qUtf8Printable(parser.value(parser.configOption)),