Changeset 561 for trunk/tools/qdoc3/cppcodemarker.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/cppcodemarker.cpp (modified) (15 diffs)

trunk/tools/qdoc3/cppcodemarker.cpp

@@ -2 +2 @@
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information ([email protected])
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
 **
 ** 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 
+** @nokia.com.
 ** $QT_END_LICENSE$
 **
@@ -44 +44 @@
 */
 
+
 #include "atom.h"
 #include "cppcodemarker.h"
@@ -194 +195 @@
         break;
     case Node::Function:
+
+
         func = (const FunctionNode *) node;
         if (style != SeparateList && !func->returnType().isEmpty())
@@ -284 +287 @@
             else {
                 for (int i = 0; i < documentedItems.size(); ++i) {
-                    if (i < MaxEnumValues - 2 || i == documentedItems.size() - 1) {
+                    if (i < MaxEnumValues1) {
                         if (i != 0)
                             synopsis += ", ";
@@ -345 +348 @@
 }
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 QString CppCodeMarker::markedUpName(const Node *node)
 {
@@ -412 +456 @@
 }
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 QList<Section> CppCodeMarker::sections(const InnerNode *inner,
                                        SynopsisStyle style,
@@ -422 +481 @@
 
         if (style == Summary) {
-            FastSection privateFunctions(classe, "Private Functions", "private function",
+            FastSection privateFunctions(classe,
+                                         "Private Functions",
+                                         "private function",
                                          "private functions");
             FastSection privateSlots(classe, "Private Slots", "private slot", "private slots");
             FastSection privateTypes(classe, "Private Types", "private type", "private types");
-            FastSection protectedFunctions(classe, "Protected Functions", "protected function",
+            FastSection protectedFunctions(classe,
+                                           "Protected Functions",
+                                           "protected function",
                                            "protected functions");
-            FastSection protectedSlots(classe, "Protected Slots", "protected slot", "protected slots");
-            FastSection protectedTypes(classe, "Protected Types", "protected type", "protected types");
-            FastSection protectedVariables(classe, "Protected Variables", "protected type", "protected variables");
-            FastSection publicFunctions(classe, "Public Functions", "public function",
-                                        "public functions");
+            FastSection protectedSlots(classe,
+                                       "Protected Slots",
+                                       "protected slot",
+                                       "protected slots");
+            FastSection protectedTypes(classe,
+                                       "Protected Types",
+                                       "protected type",
+                                       "protected types");
+            FastSection protectedVariables(classe,
+                                           "Protected Variables",
+                                           "protected type",
+                                           "protected variables");
+            FastSection publicFunctions(classe,
+                                        "Public Functions",
+                                        "public function",
+                                        "public functions");
             FastSection publicSignals(classe, "Signals", "signal", "signals");
             FastSection publicSlots(classe, "Public Slots", "public slot", "public slots");
             FastSection publicTypes(classe, "Public Types", "public type", "public types");
-            FastSection publicVariables(classe, "Public Variables", "public type", "public variables");
+            FastSection publicVariables(classe,
+                                        "Public Variables",
+                                        "public type",
+                                        "public variables");
             FastSection properties(classe, "Properties", "property", "properties");
-            FastSection relatedNonMembers(classe, "Related Non-Members", "related non-member",
+            FastSection relatedNonMembers(classe,
+                                          "Related Non-Members",
+                                          "related non-member",
                                           "related non-members");
-            FastSection staticPrivateMembers(classe, "Static Private Members", "static private member",
+            FastSection staticPrivateMembers(classe,
+                                             "Static Private Members",
+                                             "static private member",
                                              "static private members");
-            FastSection staticProtectedMembers(classe, "Static Protected Members",
-                                               "static protected member", "static protected members");
-            FastSection staticPublicMembers(classe, "Static Public Members", "static public member",
+            FastSection staticProtectedMembers(classe,
+                                               "Static Protected Members",
+                                               "static protected member",
+                                               "static protected members");
+            FastSection staticPublicMembers(classe,
+                                            "Static Public Members",
+                                            "static public member",
                                             "static public members");
             FastSection macros(inner, "Macros", "macro", "macros");
@@ -496 +581 @@
                             if ((*c)->type() != Node::Variable
                                     || !(*c)->doc().isEmpty())
-                                insert(staticPublicMembers, *c, style, status);
+                                insert(staticPublicMembers,status);
                         }
                         else if ((*c)->type() == Node::Property) {
@@ -506 +591 @@
                         }
                         else if ((*c)->type() == Node::Function) {
-                            insert(publicFunctions, *c, style, status);
+                            if (!insertReimpFunc(publicFunctions,*c,status))
+                                insert(publicFunctions, *c, style, status);
                         }
                         else {
@@ -519 +605 @@
                             if ((*c)->type() != Node::Variable
                                     || !(*c)->doc().isEmpty())
-                                insert(staticProtectedMembers, *c, style, status);
+                                insert(staticProtectedMembers,status);
                         }
                         else if ((*c)->type() == Node::Variable) {
                             if (!(*c)->doc().isEmpty())
-                                insert(protectedVariables, *c, style, status);
+                                insert(protectedVariables,status);
                         }
                         else if ((*c)->type() == Node::Function) {
-                            insert(protectedFunctions, *c, style, status);
+                            if (!insertReimpFunc(protectedFunctions,*c,status))
+                                insert(protectedFunctions, *c, style, status);
                         }
                         else {
@@ -539 +626 @@
                             if ((*c)->type() != Node::Variable
                                     || !(*c)->doc().isEmpty())
-                                insert(staticPrivateMembers, *c, style, status);
+                                insert(staticPrivateMembers,status);
                         }
                         else if ((*c)->type() == Node::Function) {
-                            insert(privateFunctions, *c, style, status);
+                            if (!insertReimpFunc(privateFunctions,*c,status))
+                                insert(privateFunctions, *c, style, status);
                         }
                         else {
-                            insert(privateTypes, *c, style, status);
+                            insert(privateTypes,status);
                         }
                     }
@@ -662 +750 @@
                                    "namespace",
                                    "namespaces");
-            FastSection classes(inner, "Classes", "class", "classes");
+            FastSection classes(inner,
+                                "Classes",
+                                "class",
+                                "classes");
             FastSection types(inner,
-                              style == Summary ? "Types" : "Type Documentation",
+                              style == Summary ?
+                              "Types" : "Type Documentation",
                               "type",
                               "types");
             FastSection functions(inner,
-                                  style == Summary ? "Functions" : "Function Documentation",
+                                  style == Summary ?
+                                  "Functions" : "Function Documentation",
                                   "function",
                                   "functions");
             FastSection macros(inner,
-                               style == Summary ? "Macros" : "Macro Documentation",
+                               style == Summary ?
+                               "Macros" : "Macro Documentation",
                                "macro",
                                "macros");
@@ -1007 +1101 @@
 }
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 QT_END_NAMESPACE