Changeset 561 for trunk/tools/qdoc3/codeparser.cpp

Timestamp:

Feb 11, 2010, 11:19:06 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.6.1 sources.

Location:

trunk

Files:

• . (modified) (1 prop)
• tools/qdoc3/codeparser.cpp (modified) (8 diffs)

trunk/tools/qdoc3/codeparser.cpp

@@ -2 +2 @@
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the tools applications of the Qt Toolkit.
@@ -21 +22 @@
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
@@ -34 +34 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
@@ -48 +48 @@
 #include "node.h"
 #include "tree.h"
+#include "config.h"
 
 QT_BEGIN_NAMESPACE
@@ -68 +69 @@
 
 QList<CodeParser *> CodeParser::parsers;
+bool CodeParser::showInternal = false;
 
 /*!
@@ -88 +90 @@
 
 /*!
-  Initializing a code parser is trivial.
- */
-void CodeParser::initializeParser(const Config & /* config */)
-{
-    // nothing.
+  Initialize the code parser base class.
+ */
+void CodeParser::initializeParser(const Config& config)
+{
+    showInternal = config.getBool(QLatin1String(CONFIG_SHOWINTERNAL));
 }
 
@@ -218 +220 @@
     }
     else if (command == COMMAND_INTERNAL) {
-        node->setAccess(Node::Private);
-        node->setStatus(Node::Internal);
+        if (!showInternal) {
+            node->setAccess(Node::Private);
+            node->setStatus(Node::Internal);
+        }
     }
     else if (command == COMMAND_REENTRANT) {
@@ -242 +246 @@
             FakeNode *fake = static_cast<FakeNode *>(node);
             fake->setTitle(arg);
-#ifdef QDOC2DOX            
-            /* qdoc -> doxygen.
-               I think this must be done here, because there can be multiple
-               "\externalpage" and "\title" metacommands in a single qdoc
-               comment, which means, among other things, that the "\title"
-               commands are not inserted into the metacommand map used by
-               the Doc class. I'm sure there4 is a better way to do this in
-               the DoxWriter class using the information in the FakeNode,
-               but I don't have time to figure it out right now.
-             */
-            if (DoxWriter::isDoxPass(1))
-                DoxWriter::insertTitle(fake,arg);
-#endif            
         }
         else