aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/commandline.cpp3
-rw-r--r--src/commandline.h1
-rw-r--r--src/main.cpp10
3 files changed, 1 insertions, 13 deletions
diff --git a/src/commandline.cpp b/src/commandline.cpp
index e7eec5d..2a0de69 100644
--- a/src/commandline.cpp
+++ b/src/commandline.cpp
@@ -50,7 +50,6 @@ CommandLine::CommandLine()
, versionOption(addVersionOption())
, buildOption("build", "Show build information.")
, configOption({ "c", "config" }, "Set configuration file.", "path", defaultUserConfigLocation())
- , defaultConfigOption("default-config", "Set the default configuration file.", "path", "")
, profileOption({ "p", "profile" }, "Use this profile.", "profile", "")
, socketOption("socket", "Local server socket", "name", socketPath())
, newWindowOption("in-new-window", "Open URL in new window")
@@ -59,7 +58,6 @@ CommandLine::CommandLine()
addOption(buildOption);
addOption(configOption);
- addOption(defaultConfigOption);
addOption(profileOption);
addOption(socketOption);
addOption(newWindowOption);
@@ -110,7 +108,6 @@ void CommandLine::printHelp(int exitCode)
printOption(versionOption);
printOption(buildOption);
printOption(configOption);
- printOption(defaultConfigOption);
printOption(profileOption);
printOption(socketOption);
printOption(newWindowOption);
diff --git a/src/commandline.h b/src/commandline.h
index d7416b7..f27041e 100644
--- a/src/commandline.h
+++ b/src/commandline.h
@@ -26,7 +26,6 @@ public:
const QCommandLineOption buildOption;
const QCommandLineOption configOption;
- const QCommandLineOption defaultConfigOption;
const QCommandLineOption profileOption;
const QCommandLineOption socketOption;
const QCommandLineOption newWindowOption;
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)),