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

trunk/tools/qdoc3/codemarker.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$
 **
@@ -169 +169 @@
     if (sizeof(const Node *) == sizeof(uint)) {
         return reinterpret_cast<const Node *>(string.toUInt());
-    } else {
+    }
+    else {
         return reinterpret_cast<const Node *>(string.toULongLong());
     }
@@ -178 +179 @@
     if (sizeof(const Node *) == sizeof(ulong)) {
         return QString::number(reinterpret_cast<ulong>(node));
-    } else {
+    }
+    else {
         return QString::number(reinterpret_cast<qulonglong>(node));
     }
@@ -221 +223 @@
                 || ch == QLatin1Char(':')) {
             pendingWord += ch;
-        } else {
+        }
+        else {
             if (!pendingWord.isEmpty()) {
                 bool isProbablyType = (pendingWord != QLatin1String("const"));
@@ -252 +255 @@
 }
 
-QString CodeMarker::taggedNode(const Node *node)
+QString CodeMarker::taggedNode(const Nodenode)
 {
     QString tag;
@@ -277 +280 @@
     default:
         tag = QLatin1String("@unknown");
+
     }
     return QLatin1Char('<') + tag + QLatin1Char('>') + protect(node->name())
         + QLatin1String("</") + tag + QLatin1Char('>');
 }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 QString CodeMarker::linkTag(const Node *node, const QString& body)
@@ -309 +336 @@
         if (func->metaness() == FunctionNode::Ctor) {
             sortNo = QLatin1String("C");
-        } else if (func->metaness() == FunctionNode::Dtor) {
+        }
+        else if (func->metaness() == FunctionNode::Dtor) {
             sortNo = QLatin1String("D");
-        } else {
+        }
+        else {
             if (nodeName.startsWith(QLatin1String("operator"))
                     && nodeName.length() > 8
@@ -332 +361 @@
 }
 
-void CodeMarker::insert(FastSection &fastSection, Node *node, SynopsisStyle style, Status status)
-{
-    bool inheritedMember = (!node->relates() &&
-                            (node->parent() != (const InnerNode *)fastSection.innerNode));
+void CodeMarker::insert(FastSection &fastSection,
+                        Node *node,
+                        SynopsisStyle style,
+                        Status status)
+{
     bool irrelevant = false;
+
+
+
+
+
+
+
 
     if (node->access() == Node::Private) {
         irrelevant = true;
-    } else if (node->type() == Node::Function) {
+    }
+    else if (node->type() == Node::Function) {
         FunctionNode *func = (FunctionNode *) node;
         irrelevant = (inheritedMember
                       && (func->metaness() == FunctionNode::Ctor ||
                           func->metaness() == FunctionNode::Dtor));
-    } else if (node->type() == Node::Class || node->type() == Node::Enum
+    }
+    else if (node->type() == Node::Class || node->type() == Node::Enum
                     || node->type() == Node::Typedef) {
         irrelevant = (inheritedMember && style != SeparateList);
@@ -358 +397 @@
         if (status == Compat) {
             irrelevant = (node->status() != Node::Compat);
-        } else if (status == Obsolete) {
+        }
+        else if (status == Obsolete) {
             irrelevant = (node->status() != Node::Obsolete);
-        } else {
+        }
+        else {
             irrelevant = (node->status() == Node::Compat ||
                           node->status() == Node::Obsolete);
@@ -371 +412 @@
             if (!fastSection.memberMap.contains(key))
                 fastSection.memberMap.insert(key, node);
-        } else {
+        }
+        else {
             if (node->parent()->type() == Node::Class) {
                 if (fastSection.inherited.isEmpty()
@@ -384 +426 @@
 }
 
-void CodeMarker::append(QList<Section>& sectionList,
-                        const FastSection& fastSection)
-{
-    if (!fastSection.memberMap.isEmpty() ||
-         !fastSection.inherited.isEmpty()) {
-        Section section(fastSection.name,
-                        fastSection.singularMember,
-                        fastSection.pluralMember);
-        section.members = fastSection.memberMap.values();
-        section.inherited = fastSection.inherited;
+/*!
+  Returns true if \a node represents a reimplemented member function.
+  If it is, then it is inserted in the reimplemented member map in the
+  section \a fs. And, the test is only performed if \a status is \e OK.
+  Otherwise, false is returned.
+ */
+bool CodeMarker::insertReimpFunc(FastSection& fs, Node* node, Status status)
+{
+    if (node->access() == Node::Private)
+        return false;
+
+    const FunctionNode* fn = static_cast<const FunctionNode*>(node);
+    if ((fn->reimplementedFrom() != 0) && (status == Okay)) {
+        bool inherited = (!fn->relates() && (fn->parent() != (const InnerNode*)fs.innerNode));
+        if (!inherited) {
+            QString key = sortName(fn);
+            if (!fs.reimpMemberMap.contains(key)) {
+                fs.reimpMemberMap.insert(key,node);
+                return true;
+            }
+        }
+    }
+    return false;
+ }
+
+/*!
+  If \a fs is not empty, convert it to a Section and append
+  the new Section to \a sectionList.
+ */
+void CodeMarker::append(QList<Section>& sectionList, const FastSection& fs)
+{
+    if (!fs.isEmpty()) {
+        Section section(fs.name,fs.singularMember,fs.pluralMember);
+        section.members = fs.memberMap.values();
+        section.reimpMembers = fs.reimpMemberMap.values();
+        section.inherited = fs.inherited;
         sectionList.append(section);
     }
@@ -429 +497 @@
             if (!classe->templateStuff().isEmpty()) {
                  result += QLatin1String("tmplt/");
-            } else
+            }
+            else
 #endif
             {
@@ -466 +535 @@
                 isMacro = true;
 #if 0
-            } else if (!func->templateStuff().isEmpty()) {
+            }
+            else if (!func->templateStuff().isEmpty()) {
                 result += QLatin1String("ftmplt/");
 #endif
-            } else if (func->isStatic()) {
+            }
+            else if (func->isStatic()) {
                 result += QLatin1String("clm/");
-            } else if (!func->parent()->name().isEmpty()) {
+            }
+            else if (!func->parent()->name().isEmpty()) {
                 result += QLatin1String("instm/");
-            } else {
+            }
+            else {
                 result += QLatin1String("func/");
             }
@@ -487 +560 @@
                 const QList<Parameter> &params = func->parameters();
                 for (int i = 0; i < params.count(); ++i) {
-                    QString type = params.at(i).leftType() + params.at(i).rightType();
+                    QString type = params.at(i).leftType() +
+                        params.at(i).rightType();
                     type = QLatin1String(QMetaObject::normalizedSignature(type.toLatin1().constData()));
                     if (i != 0)
@@ -529 +603 @@
 
     if (node->name().isEmpty()) {
-        return QLatin1Char('/') + myName;
-    } else {
-        return plainFullName(node) + QLatin1Char('/') + myName;
-    }
-}
-
+        return QLatin1Char('/') + protect(myName);
+    }
+    else {
+        return plainFullName(node) + QLatin1Char('/') + protect(myName);
+    }
+}
+
+#ifdef QDOC_QML
+/*!
+  Get the list of documentation sections for the children of
+  the specified QmlClassNode.
+ */
+QList<Section> CodeMarker::qmlSections(const QmlClassNode* , SynopsisStyle )
+{
+    return QList<Section>();
+}
+#endif
 
 QT_END_NAMESPACE