Changeset 561 for trunk/tools/qdoc3/cppcodeparser.h
- Timestamp:
- Feb 11, 2010, 11:19:06 PM (15 years ago)
- Location:
- trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk
-
Property svn:mergeinfo
set to (toggle deleted branches)
/branches/vendor/nokia/qt/4.6.1 merged eligible /branches/vendor/nokia/qt/current merged eligible /branches/vendor/trolltech/qt/current 3-149
-
Property svn:mergeinfo
set to (toggle deleted branches)
-
trunk/tools/qdoc3/cppcodeparser.h
r2 r561 2 2 ** 3 3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). 4 ** Contact: Qt Software Information (qt-info@nokia.com) 4 ** All rights reserved. 5 ** Contact: Nokia Corporation (qt-info@nokia.com) 5 6 ** 6 7 ** 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. 22 23 ** 23 ** In addition, as a special exception, Nokia gives you certain 24 ** additional rights. These rights are described in the Nokia Qt LGPL 25 ** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this 26 ** package. 24 ** In addition, as a special exception, Nokia gives you certain additional 25 ** rights. These rights are described in the Nokia Qt LGPL Exception 26 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. 27 27 ** 28 28 ** GNU General Public License Usage … … 34 34 ** met: http://www.gnu.org/copyleft/gpl.html. 35 35 ** 36 ** If you are unsure which license is appropriate for your use, please37 ** contact the sales department at qt-sales@nokia.com.36 ** If you have questions regarding the use of this file, please contact 37 ** Nokia at qt-info@nokia.com. 38 38 ** $QT_END_LICENSE$ 39 39 ** … … 91 91 const QString& command, 92 92 const QString& arg); 93 #ifdef QDOC_QML 94 // might need to implement this in QsCodeParser as well. 95 virtual Node *processTopicCommandGroup(const Doc& doc, 96 const QString& command, 97 const QStringList& args); 98 bool splitQmlPropertyArg(const Doc& doc, 99 const QString& arg, 100 QString& type, 101 QString& element, 102 QString& name); 103 bool splitQmlMethodArg(const Doc& doc, 104 const QString& arg, 105 QString& type, 106 QString& element); 107 #endif 93 108 virtual QSet<QString> otherMetaCommands(); 94 109 virtual void processOtherMetaCommand(const Doc& doc, … … 113 128 QStringList *parentPathPtr = 0, 114 129 FunctionNode **funcPtr = 0, 115 const QString &templateStuff = QString()); 130 const QString &templateStuff = QString(), 131 Node::Type type = Node::Function, 132 bool attached = false); 116 133 bool matchBaseSpecifier(ClassNode *classe, bool isClass); 117 134 bool matchBaseList(ClassNode *classe, bool isClass); … … 129 146 QStringList *parentPathPtr, 130 147 FunctionNode **funcPtr, 131 InnerNode *root = 0); 148 InnerNode *root = 0, 149 Node::Type type = Node::Function, 150 bool attached = false); 151 FunctionNode* makeFunctionNode(const Doc& doc, 152 const QString& sig, 153 InnerNode* parent, 154 Node::Type type, 155 bool attached, 156 QString qdoctag); 132 157 void parseQiteratorDotH(const Location &location, const QString &filePath); 133 158 void instantiateIteratorMacro(const QString &container, … … 161 186 static QStringList exampleDirs; 162 187 QString exampleNameFilter; 188 QString exampleImageFilter; 163 189 }; 164 190
Note:
See TracChangeset
for help on using the changeset viewer.