diff options
Diffstat (limited to 'src/tools/qdoc/codemarker.h')
-rw-r--r-- | src/tools/qdoc/codemarker.h | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/tools/qdoc/codemarker.h b/src/tools/qdoc/codemarker.h index 8f332de01a..7983aa532c 100644 --- a/src/tools/qdoc/codemarker.h +++ b/src/tools/qdoc/codemarker.h @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the tools applications of the Qt Toolkit. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** $QT_END_LICENSE$ @@ -48,11 +48,11 @@ QT_BEGIN_NAMESPACE class Config; typedef QMultiMap<QString, Node*> MemberMap; // the string is the member signature -typedef QPair<const QmlClassNode*, MemberMap> ClassMap; // the node is the QML type +typedef QPair<const QmlTypeNode*, MemberMap> ClassMap; // the node is the QML type typedef QList<ClassMap*> ClassMapList; typedef QPair<QStringList, NodeList> KeysAndNodes; -typedef QPair<const QmlClassNode*, KeysAndNodes> ClassKeysNodes; +typedef QPair<const QmlTypeNode*, KeysAndNodes> ClassKeysNodes; typedef QList<ClassKeysNodes*> ClassKeysNodesList; struct Section @@ -146,7 +146,7 @@ public: virtual QList<Section> sections(const InnerNode *inner, SynopsisStyle style, Status status) = 0; - virtual QList<Section> qmlSections(QmlClassNode* qmlClassNode, + virtual QList<Section> qmlSections(QmlTypeNode* qmlTypeNode, SynopsisStyle style, Status status = Okay); virtual QStringList macRefsForNode(Node* node); |