diff options
| author | Martin Smith <martin.smith@nokia.com> | 2010-12-08 11:14:05 (GMT) |
|---|---|---|
| committer | Martin Smith <martin.smith@nokia.com> | 2010-12-08 11:14:05 (GMT) |
| commit | f0a36c0f4b1f3790e86b0ce15abc79a863703f1c (patch) | |
| tree | 7ec23297e75140f6154786f38cb878fa65aba32b /tools/qdoc3/cppcodeparser.cpp | |
| parent | 32292a7bdd3764aad917f7df1ea4a791f0b1528f (diff) | |
| parent | 327c95f6ce1c2f2ae2e4da8ca89d5ef0b2595af3 (diff) | |
| download | Qt-f0a36c0f4b1f3790e86b0ce15abc79a863703f1c.zip Qt-f0a36c0f4b1f3790e86b0ce15abc79a863703f1c.tar.gz Qt-f0a36c0f4b1f3790e86b0ce15abc79a863703f1c.tar.bz2 | |
Merge branch 'mimir' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into mimir
Diffstat (limited to 'tools/qdoc3/cppcodeparser.cpp')
| -rw-r--r-- | tools/qdoc3/cppcodeparser.cpp | 19 |
1 files changed, 4 insertions, 15 deletions
diff --git a/tools/qdoc3/cppcodeparser.cpp b/tools/qdoc3/cppcodeparser.cpp index a120e45..fce2553 100644 --- a/tools/qdoc3/cppcodeparser.cpp +++ b/tools/qdoc3/cppcodeparser.cpp @@ -47,7 +47,6 @@ #include <stdio.h> #include <errno.h> -#include <qdebug.h> #include "codechunk.h" #include "config.h" @@ -258,18 +257,18 @@ QString CppCodeParser::language() /*! Returns a list of extensions for header files. */ -QString CppCodeParser::headerFileNameFilter() +QStringList CppCodeParser::headerFileNameFilter() { - return "*.ch *.h *.h++ *.hh *.hpp *.hxx"; + return QStringList() << "*.ch" << "*.h" << "*.h++" << "*.hh" << "*.hpp" << "*.hxx"; } /*! Returns a list of extensions for source files, i.e. not header files. */ -QString CppCodeParser::sourceFileNameFilter() +QStringList CppCodeParser::sourceFileNameFilter() { - return "*.c++ *.cc *.cpp *.cxx"; + return QStringList() << "*.c++" << "*.cc" << "*.cpp" << "*.cxx" << "*.mm"; } /*! @@ -966,16 +965,6 @@ void CppCodeParser::processOtherMetaCommand(const Doc& doc, .arg(COMMAND_REIMP).arg(node->name())); } -#if 0 - // Reimplemented functions now reported in separate sections. - /* - Note: Setting the access to Private hides the documentation, - but setting the status to Internal makes the node available - in the XML output when the WebXMLGenerator is used. - */ - func->setAccess(Node::Private); - func->setStatus(Node::Internal); -#endif func->setReimp(true); } else { |