Changeset 846 for trunk/tools/qdoc3/qscodemarker.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/qscodemarker.cpp (modified) (5 diffs)

trunk/tools/qdoc3/qscodemarker.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)
@@ -280 +280 @@
 
     if ( style == Summary ) {
-        FastSection enums(classe, "Enums", "enum", "enums");
-        FastSection functions(classe, "Functions", "function", "functions");
-        FastSection readOnlyProperties(classe, "Read-Only Properties", "property", "properties");
-        FastSection signalz(classe, "Signals", "signal", "signals");
-        FastSection writableProperties(classe, "Writable Properties", "property", "properties");
+        FastSection enums(classe, "Enums", "", "enum", "enums");
+        FastSection functions(classe, "Functions", "", "function", "functions");
+        FastSection readOnlyProperties(classe, "", "Read-Only Properties", "property", "properties");
+        FastSection signalz(classe, "Signals", "", "signal", "signals");
+        FastSection writableProperties(classe, "", "Writable Properties", "property", "properties");
 
         QStack<const ClassNode *> stack;
@@ -329 +329 @@
         append( sections, signalz );
     } else if ( style == Detailed ) {
-        FastSection enums( classe, "Enum Documentation" );
-        FastSection functionsAndSignals( classe, "Function and Signal Documentation" );
-        FastSection properties( classe, "Property Documentation" );
+        FastSection enums( classe, "Enum Documentation", "", "member", "members");
+        FastSection functionsAndSignals( classe, "Function and Signal Documentation", "", "member", "members");
+        FastSection properties( classe, "Property Documentation", "", "member", "members");
 
         NodeList::ConstIterator c = classe->childNodes().begin();
@@ -350 +350 @@
         append( sections, functionsAndSignals );
     } else { // ( style == SeparateList )
-        FastSection all( classe );
+        FastSection all(classe, "", "", "member", "members");
 
         QStack<const ClassNode *> stack;
@@ -376 +376 @@
 }
 
-const Node *QsCodeMarker::resolveTarget( const QString& /* target */,
-                                         const Tree * /* tree */,
-                                         const Node * /* relative */ )
-{
-    return 0;
-}
-
 QT_END_NAMESPACE