diff options
Diffstat (limited to 'src/main.cpp')
| -rw-r--r-- | src/main.cpp | 10 |
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)), |