diff options
Diffstat (limited to 'src/tools/qdoc/qmlcodemarker.h')
-rw-r--r-- | src/tools/qdoc/qmlcodemarker.h | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/src/tools/qdoc/qmlcodemarker.h b/src/tools/qdoc/qmlcodemarker.h index c6e4aa7e19..805229e366 100644 --- a/src/tools/qdoc/qmlcodemarker.h +++ b/src/tools/qdoc/qmlcodemarker.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$ @@ -51,19 +51,19 @@ public: QmlCodeMarker(); ~QmlCodeMarker(); - virtual bool recognizeCode(const QString &code); - virtual bool recognizeExtension(const QString &ext); - virtual bool recognizeLanguage(const QString &language); - virtual Atom::Type atomType() const; + virtual bool recognizeCode(const QString &code) Q_DECL_OVERRIDE; + virtual bool recognizeExtension(const QString &ext) Q_DECL_OVERRIDE; + virtual bool recognizeLanguage(const QString &language) Q_DECL_OVERRIDE; + virtual Atom::Type atomType() const Q_DECL_OVERRIDE; virtual QString markedUpCode(const QString &code, const Node *relative, - const Location &location); + const Location &location) Q_DECL_OVERRIDE; - virtual QString markedUpName(const Node *node); - virtual QString markedUpFullName(const Node *node, const Node *relative); - virtual QString markedUpIncludes(const QStringList &includes); - virtual QString functionBeginRegExp(const QString &funcName); - virtual QString functionEndRegExp(const QString &funcName); + virtual QString markedUpName(const Node *node) Q_DECL_OVERRIDE; + virtual QString markedUpFullName(const Node *node, const Node *relative) Q_DECL_OVERRIDE; + virtual QString markedUpIncludes(const QStringList &includes) Q_DECL_OVERRIDE; + virtual QString functionBeginRegExp(const QString &funcName) Q_DECL_OVERRIDE; + virtual QString functionEndRegExp(const QString &funcName) Q_DECL_OVERRIDE; /* Copied from src/declarative/qml/qdeclarativescriptparser.cpp */ QList<QQmlJS::AST::SourceLocation> extractPragmas(QString &script); |