Changeset 846 for trunk/tools/qdoc3/cppcodemarker.cpp

Timestamp:

May 5, 2011, 5:36:53 AM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.7.2 sources from branches/vendor/nokia/qt.

Location:

trunk

Files:

• . (modified) (1 prop)
• tools/qdoc3/cppcodemarker.cpp (modified) (16 diffs)

trunk/tools/qdoc3/cppcodemarker.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
@@ -146 +146 @@
     else {
         QString fullName;
-        for (;;) {
+        while (node) {
             fullName.prepend(plainName(node));
             if (node->parent() == relative || node->parent()->name().isEmpty())
@@ -483 +483 @@
             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 privateSlots(classe, "Private Slots", "", "private slot", "private slots");
+            FastSection privateTypes(classe, "Private Types", "", "private type", "private types");
             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 publicSignals(classe, "Signals", "signal", "signals");
-            FastSection publicSlots(classe, "Public Slots", "public slot", "public slots");
-            FastSection publicTypes(classe, "Public Types", "public type", "public types");
+            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 variable",
                                         "public variables");
-            FastSection properties(classe, "Properties", "property", "properties");
+            FastSection properties(classe, "Properties", "", "property", "properties");
             FastSection relatedNonMembers(classe,
                                           "Related Non-Members",
+                                          "",
                                           "related non-member",
                                           "related non-members");
             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",
                                             "static public members");
-            FastSection macros(inner, "Macros", "macro", "macros");
+            FastSection macros(inner, "Macros", "", "macro", "macros");
 
             NodeList::ConstIterator r = classe->relatedNodes().begin();
@@ -667 +678 @@
         }
         else if (style == Detailed) {
-            FastSection memberFunctions(classe,"Member Function Documentation");
-            FastSection memberTypes(classe,"Member Type Documentation");
-            FastSection memberVariables(classe,"Member Variable Documentation");
-            FastSection properties(classe,"Property Documentation");
-            FastSection relatedNonMembers(classe,"Related Non-Members");
-            FastSection macros(classe,"Macro Documentation");
+            FastSection memberFunctions(classe,"Member Function Documentation","func","member","members");
+            FastSection memberTypes(classe,"Member Type Documentation","types","member","members");
+            FastSection memberVariables(classe,"Member Variable Documentation","vars","member","members");
+            FastSection properties(classe,"Property Documentation","prop","member","members");
+            FastSection relatedNonMembers(classe,"Related Non-Members","relnonmem","member","members");
+            FastSection macros(classe,"Macro Documentation","macros","member","members");
 
             NodeList::ConstIterator r = classe->relatedNodes().begin();
@@ -718 +729 @@
         }
         else {
-            FastSection all(classe);
+            FastSection all(classe,"","","member","members");
 
             QStack<const ClassNode *> stack;
@@ -748 +759 @@
             FastSection namespaces(inner,
                                    "Namespaces",
+                                   style == Detailed ? "nmspace" : "",
                                    "namespace",
                                    "namespaces");
             FastSection classes(inner,
                                 "Classes",
+                                style == Detailed ? "classes" : "",
                                 "class",
                                 "classes");
             FastSection types(inner,
-                              style == Summary ?
-                              "Types" : "Type Documentation",
+                              style == Summary ? "Types" : "Type Documentation",
+                              style == Detailed ? "types" : "",
                               "type",
                               "types");
@@ -762 +775 @@
                                   style == Summary ?
                                   "Functions" : "Function Documentation",
+                                  style == Detailed ? "func" : "",
                                   "function",
                                   "functions");
@@ -767 +781 @@
                                style == Summary ?
                                "Macros" : "Macro Documentation",
+                               style == Detailed ? "macros" : "",
                                "macro",
                                "macros");
@@ -811 +826 @@
 }
 
-const Node *CppCodeMarker::resolveTarget(const QString &target,
-                                         const Tree *tree,
-                                         const Node *relative)
+const Node *CppCodeMarker::resolveTarget(const QString& target,
+                                         const Tree* tree,
+                                         const Node* relative,
+                                         const Node* self)
 {
     if (target.endsWith("()")) {
@@ -855 +871 @@
         QStringList path = target.split("::");
         const Node *node;
+        int flags = Tree::SearchBaseClasses |
+            Tree::SearchEnumValues |
+            Tree::NonFunction;
         if ((node = tree->findNode(path,
                                    relative,
-                                   Tree::SearchBaseClasses |
-                                   Tree::SearchEnumValues |
-                                   Tree::NonFunction)))
+                                   flags,
+                                   self)))
             return node;
     }
@@ -882 +900 @@
     static QRegExp multiLineComment("/(?:( )?\\*(?:[^*]+|\\*(?! /))*\\*\\1/)");
     multiLineComment.setMinimal(true);
-    static QRegExp singleLineComment("//(?!!)[^!\n]*");
+    static QRegExp singleLineComment("[^:]//(?!!)[^!\\n]*");
     static QRegExp preprocessor("(?:^|\n)(#[ \t]*(?:include|if|elif|endif|error|pragma|define"
                                 "|warning)(?:(?:\\\\\n|\\n#)[^\n]*)*)");
@@ -1068 +1086 @@
         }
         else if (mlpos == -1) {
-            pos = slpos;
-            len = singleLineComment.matchedLength();
+            pos = slpos + 1;
+            len = singleLineComment.matchedLength() - 1;
         }
         else {
             if (slpos < mlpos) {
-                pos = slpos;
-                len = singleLineComment.matchedLength();
+                pos = slpos + 1;
+                len = singleLineComment.matchedLength() - 1;
             }
             else {
@@ -1110 +1128 @@
  */
 QList<Section> CppCodeMarker::qmlSections(const QmlClassNode* qmlClassNode,
-                                          SynopsisStyle style)
+                                          SynopsisStyle style,
+                                          const Tree* tree)
 {
     QList<Section> sections;
@@ -1117 +1136 @@
             FastSection qmlproperties(qmlClassNode,
                                       "Properties",
+                                      "",
                                       "property",
                                       "properties");
             FastSection qmlattachedproperties(qmlClassNode,
                                               "Attached Properties",
+                                              "",
                                               "property",
                                               "properties");
             FastSection qmlsignals(qmlClassNode,
-                                "Signals",
-                                "signal",
-                                "signals");
+                                   "Signals",
+                                   "",
+                                   "signal",
+                                   "signals");
             FastSection qmlattachedsignals(qmlClassNode,
-                                           "QML Attached Signals",
+                                           "Attached Signals",
+                                           "",
                                            "signal",
                                            "signals");
             FastSection qmlmethods(qmlClassNode,
                                    "Methods",
+                                   "",
                                    "method",
                                    "methods");
             FastSection qmlattachedmethods(qmlClassNode,
-                                           "QML Attached Methods",
+                                           "Attached Methods",
+                                           "",
                                            "method",
                                            "methods");
@@ -1180 +1205 @@
         }
         else if (style == Detailed) {
-            FastSection qmlproperties(qmlClassNode, "Property Documentation");
-            FastSection qmlattachedproperties(qmlClassNode,"Attached Property Documentation");
-            FastSection qmlsignals(qmlClassNode,"Signal Documentation");
-            FastSection qmlattachedsignals(qmlClassNode,"Attached Signal Documentation");
-            FastSection qmlmethods(qmlClassNode,"Method Documentation");
-            FastSection qmlattachedmethods(qmlClassNode,"Attached Method Documentation");
+            FastSection qmlproperties(qmlClassNode, "Property Documentation","qmlprop","member","members");
+            FastSection qmlattachedproperties(qmlClassNode,"Attached Property Documentation","qmlattprop",
+                                              "member","members");
+            FastSection qmlsignals(qmlClassNode,"Signal Documentation","qmlsig","member","members");
+            FastSection qmlattachedsignals(qmlClassNode,"Attached Signal Documentation","qmlattsig",
+                                           "member","members");
+            FastSection qmlmethods(qmlClassNode,"Method Documentation","qmlmeth","member","members");
+            FastSection qmlattachedmethods(qmlClassNode,"Attached Method Documentation","qmlattmeth",
+                                           "member","members");
             NodeList::ConstIterator c = qmlClassNode->childNodes().begin();
             while (c != qmlClassNode->childNodes().end()) {
@@ -1218 +1246 @@
             append(sections,qmlattachedmethods);
         }
+        else {
+            FastSection all(qmlClassNode,"","","member","members");
+
+            QStack<const QmlClassNode*> stack;
+            stack.push(qmlClassNode);
+
+            while (!stack.isEmpty()) {
+                const QmlClassNode* ancestorClass = stack.pop();
+
+                NodeList::ConstIterator c = ancestorClass->childNodes().begin();
+                while (c != ancestorClass->childNodes().end()) {
+                    //              if ((*c)->access() != Node::Private)
+                    if ((*c)->subType() == Node::QmlPropertyGroup) {
+                        const QmlPropGroupNode* qpgn = static_cast<const QmlPropGroupNode*>(*c);
+                        NodeList::ConstIterator p = qpgn->childNodes().begin();
+                        while (p != qpgn->childNodes().end()) {
+                            if ((*p)->type() == Node::QmlProperty) {
+                                insert(all,*p,style,Okay);
+                            }
+                            ++p;
+                        }
+                    }
+                    else
+                        insert(all,*c,style,Okay);
+                    ++c;
+                }
+
+                if (!ancestorClass->links().empty()) {
+                    if (ancestorClass->links().contains(Node::InheritsLink)) {
+                        QPair<QString,QString> linkPair;
+                        linkPair = ancestorClass->links()[Node::InheritsLink];
+                        QStringList strList(linkPair.first);
+                        const Node* n = tree->findNode(strList,Node::Fake);
+                        if (n && n->subType() == Node::QmlClass) {
+                            const QmlClassNode* qcn = static_cast<const QmlClassNode*>(n);
+                            stack.prepend(qcn);
+                        }
+                    }
+                }
+            }
+            append(sections, all);
+        }
     }