summaryrefslogtreecommitdiff
path: root/src/qdoc/cppcodeparser.cpp
diff options
context:
space:
mode:
authorTopi Reinio <topi.reinio@qt.io>2020-01-03 23:10:47 +0100
committerTopi Reinio <topi.reinio@qt.io>2020-01-13 10:30:34 +0100
commitccdbf30b6ac9180ead6fc22c858b6fac112d493c (patch)
tree684348bac8eae2acffe5c78545a608bbee9c62a9 /src/qdoc/cppcodeparser.cpp
parentade15563a6c7613b58201e6e05e3f67fde3f6056 (diff)
downloadqttools-ccdbf30b6ac9180ead6fc22c858b6fac112d493c.tar.gz
qdoc: Make Config a singleton
There is no need to pass a pointer to Config throughout the API; the only instance of it is created in main() so we can turn it into a singleton. Having access to Config without API changes makes implementation of configurable features easier. Change-Id: Ida47e067865082dfe036a7a97f7f1ffc736db346 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
Diffstat (limited to 'src/qdoc/cppcodeparser.cpp')
-rw-r--r--src/qdoc/cppcodeparser.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/qdoc/cppcodeparser.cpp b/src/qdoc/cppcodeparser.cpp
index 6a5087583..87fade3cc 100644
--- a/src/qdoc/cppcodeparser.cpp
+++ b/src/qdoc/cppcodeparser.cpp
@@ -90,9 +90,9 @@ CppCodeParser::CppCodeParser()
for identifying important nodes. And it initializes
some filters for identifying and excluding certain kinds of files.
*/
-void CppCodeParser::initializeParser(const Config &config)
+void CppCodeParser::initializeParser()
{
- CodeParser::initializeParser(config);
+ CodeParser::initializeParser();
/*
All these can appear in a C++ namespace. Don't add
@@ -118,6 +118,7 @@ void CppCodeParser::initializeParser(const Config &config)
nodeTypeTestFuncMap_.insert(COMMAND_PROPERTY, &Node::isProperty);
nodeTypeTestFuncMap_.insert(COMMAND_VARIABLE, &Node::isVariable);
+ Config &config = Config::instance();
exampleFiles = config.getCanonicalPathList(CONFIG_EXAMPLES);
exampleDirs = config.getCanonicalPathList(CONFIG_EXAMPLEDIRS);
QStringList exampleFilePatterns =