Changeset 561 for trunk/tools/qdoc3/codemarker.h

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.h (modified) (11 diffs)

trunk/tools/qdoc3/codemarker.h

@@ -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$
 **
@@ -62 +62 @@
     QString pluralMember;
     NodeList members;
+    NodeList reimpMembers;
     QList<QPair<ClassNode *, int> > inherited;
 
@@ -71 +72 @@
           singularMember(singularMember0),
           pluralMember(pluralMember0) { }
+    void appendMember(Node* node) { members.append(node); }
+    void appendReimpMember(Node* node) { reimpMembers.append(node); }
 };
 
@@ -80 +83 @@
     QString pluralMember;
     QMap<QString, Node *> memberMap;
+    QMap<QString, Node *> reimpMemberMap;
     QList<QPair<ClassNode *, int> > inherited;
 
@@ -90 +94 @@
           singularMember(singularMember0),
           pluralMember(pluralMember0) { }
+    bool isEmpty() const { 
+        return (memberMap.isEmpty() && inherited.isEmpty() && 
+                reimpMemberMap.isEmpty()); 
+    }
+
 };
 
@@ -115 +124 @@
                                      const Node *relative,
                                      SynopsisStyle style) = 0;
+#ifdef QDOC_QML
+    virtual QString markedUpQmlItem(const Node* , bool) { return QString(); }
+#endif
     virtual QString markedUpName(const Node *node) = 0;
     virtual QString markedUpFullName(const Node *node,
@@ -126 +138 @@
                                     SynopsisStyle style, 
                                     Status status) = 0;
+#ifdef QDOC_QML
+    virtual QList<Section> qmlSections(const QmlClassNode* qmlClassNode,
+                                       SynopsisStyle style);
+#endif
     virtual const Node *resolveTarget(const QString& target, 
                                       const Tree *tree,
@@ -145 +161 @@
     QString protect(const QString &string);
     QString typified(const QString &string);
-    QString taggedNode(const Node *node);
+    QString taggedNode(const Node* node);
+#ifdef QDOC_QML
+    QString taggedQmlNode(const Node* node);
+#endif
     QString linkTag(const Node *node, const QString& body);
     void insert(FastSection &fastSection, 
@@ -151 +170 @@
                 SynopsisStyle style, 
                 Status status);
+    bool insertReimpFunc(FastSection& fs, Node* node, Status status);
     void append(QList<Section>& sectionList, const FastSection& fastSection);