diff options
author | Paul Wicking <paul.wicking@qt.io> | 2019-08-06 12:40:58 +0200 |
---|---|---|
committer | Paul Wicking <paul.wicking@qt.io> | 2019-08-14 17:39:33 +0200 |
commit | 411e75b05eb391bd39d642838bf9bc7914f13f77 (patch) | |
tree | 218599c2439e687387d61cfa66d33e0eaa802767 /src/qdoc/main.cpp | |
parent | e6d4579277ae8f526026b1df5d52fee4c744141f (diff) | |
download | qttools-411e75b05eb391bd39d642838bf9bc7914f13f77.tar.gz |
QDoc: Set default Config options in Config's constructor
Move the setting of configuration defaults from
QDocCommandLineParser::process() to Config::Config().
In the process, eliminate QDocGlobals::defaults() and
its test.
Task-number: QTBUG-71176
Change-Id: I97adbfd93b0c31130aab6cfcb10dfe7ffa458b9d
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Diffstat (limited to 'src/qdoc/main.cpp')
-rw-r--r-- | src/qdoc/main.cpp | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/src/qdoc/main.cpp b/src/qdoc/main.cpp index e134ff152..fc555f0bd 100644 --- a/src/qdoc/main.cpp +++ b/src/qdoc/main.cpp @@ -205,19 +205,6 @@ static void loadIndexFiles(Config &config, const QSet<QString> &formats) */ static void processQdocconfFile(const QString &fileName, Config &config) { - /* - Below, we initialize the configuration with some default values. - - I don't think the call to translate() does anything here. For one - thing, the translators haven't been installed at this point. And - I doubt any translator would translate QDoc anyway. But I left it - here because it does no harm. - */ - - QHash<QString,QString>::iterator iter; - for (iter = qdocGlobals.defaults().begin(); iter != qdocGlobals.defaults().end(); ++iter) - config.setStringList(iter.key(), QStringList() << iter.value()); - config.setStringList(CONFIG_SYNTAXHIGHLIGHTING, QStringList(qdocGlobals.highlighting() ? "true" : "false")); config.setStringList(CONFIG_SHOWINTERNAL, QStringList(qdocGlobals.showInternal() ? "true" : "false")); config.setStringList(CONFIG_SINGLEEXEC, QStringList(qdocGlobals.singleExec() ? "true" : "false")); |