diff options
Diffstat (limited to 'src/widgets/accessible/complexwidgets.cpp')
-rw-r--r-- | src/widgets/accessible/complexwidgets.cpp | 46 |
1 files changed, 23 insertions, 23 deletions
diff --git a/src/widgets/accessible/complexwidgets.cpp b/src/widgets/accessible/complexwidgets.cpp index 30f9ccb1f4..60a1329d5e 100644 --- a/src/widgets/accessible/complexwidgets.cpp +++ b/src/widgets/accessible/complexwidgets.cpp @@ -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 plugins 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$ @@ -77,16 +77,16 @@ public: : m_parent(parent), m_index(index) {} - void *interface_cast(QAccessible::InterfaceType t) { + void *interface_cast(QAccessible::InterfaceType t) Q_DECL_OVERRIDE { if (t == QAccessible::ActionInterface) { return static_cast<QAccessibleActionInterface*>(this); } return 0; } - QObject *object() const { return 0; } - QAccessible::Role role() const { return QAccessible::PageTab; } - QAccessible::State state() const { + QObject *object() const Q_DECL_OVERRIDE { return 0; } + QAccessible::Role role() const Q_DECL_OVERRIDE { return QAccessible::PageTab; } + QAccessible::State state() const Q_DECL_OVERRIDE { if (!isValid()) { QAccessible::State s; s.invalid = true; @@ -94,7 +94,7 @@ public: } return parent()->state(); } - QRect rect() const { + QRect rect() const Q_DECL_OVERRIDE { if (!isValid()) return QRect(); @@ -104,13 +104,13 @@ public: return rec; } - bool isValid() const { return m_parent.data() && m_parent->count() > m_index; } + bool isValid() const Q_DECL_OVERRIDE { return m_parent.data() && m_parent->count() > m_index; } - QAccessibleInterface *childAt(int, int) const { return 0; } - int childCount() const { return 0; } - int indexOfChild(const QAccessibleInterface *) const { return -1; } + QAccessibleInterface *childAt(int, int) const Q_DECL_OVERRIDE { return 0; } + int childCount() const Q_DECL_OVERRIDE { return 0; } + int indexOfChild(const QAccessibleInterface *) const Q_DECL_OVERRIDE { return -1; } - QString text(QAccessible::Text t) const + QString text(QAccessible::Text t) const Q_DECL_OVERRIDE { if (!isValid()) return QString(); @@ -129,26 +129,26 @@ public: return QString(); } - void setText(QAccessible::Text, const QString &) {} + void setText(QAccessible::Text, const QString &) Q_DECL_OVERRIDE {} - QAccessibleInterface *parent() const { + QAccessibleInterface *parent() const Q_DECL_OVERRIDE { return QAccessible::queryAccessibleInterface(m_parent.data()); } - QAccessibleInterface *child(int) const { return 0; } + QAccessibleInterface *child(int) const Q_DECL_OVERRIDE { return 0; } // action interface - QStringList actionNames() const + QStringList actionNames() const Q_DECL_OVERRIDE { return QStringList(pressAction()); } - void doAction(const QString &actionName) + void doAction(const QString &actionName) Q_DECL_OVERRIDE { if (isValid() && actionName == pressAction()) m_parent->setCurrentIndex(m_index); } - QStringList keyBindingsForAction(const QString &) const + QStringList keyBindingsForAction(const QString &) const Q_DECL_OVERRIDE { return QStringList(); } |