diff options
Diffstat (limited to 'src/widgets/graphicsview/qgraphicswidget_p.h')
-rw-r--r-- | src/widgets/graphicsview/qgraphicswidget_p.h | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/src/widgets/graphicsview/qgraphicswidget_p.h b/src/widgets/graphicsview/qgraphicswidget_p.h index 2cb6565f87..7054dfcc2b 100644 --- a/src/widgets/graphicsview/qgraphicswidget_p.h +++ b/src/widgets/graphicsview/qgraphicswidget_p.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 QtWidgets module 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$ @@ -103,13 +103,13 @@ public: QPalette palette; uint inheritedPaletteResolveMask; void setPalette_helper(const QPalette &palette); - void resolvePalette(uint inheritedMask); + void resolvePalette(uint inheritedMask) Q_DECL_OVERRIDE; void updatePalette(const QPalette &palette); QPalette naturalWidgetPalette() const; QFont font; uint inheritedFontResolveMask; void setFont_helper(const QFont &font); - void resolveFont(uint inheritedMask); + void resolveFont(uint inheritedMask) Q_DECL_OVERRIDE; void updateFont(const QFont &font); QFont naturalWidgetFont() const; @@ -124,13 +124,13 @@ public: bool hasDecoration() const; // Private Properties - qreal width() const; - void setWidth(qreal); - void resetWidth(); + qreal width() const Q_DECL_OVERRIDE; + void setWidth(qreal) Q_DECL_OVERRIDE; + void resetWidth() Q_DECL_OVERRIDE; - qreal height() const; - void setHeight(qreal); - void resetHeight(); + qreal height() const Q_DECL_OVERRIDE; + void setHeight(qreal) Q_DECL_OVERRIDE; + void resetHeight() Q_DECL_OVERRIDE; void setGeometryFromSetPos(); // State |