diff options
Diffstat (limited to 'src/widgets/styles/qstyleanimation_p.h')
-rw-r--r-- | src/widgets/styles/qstyleanimation_p.h | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/src/widgets/styles/qstyleanimation_p.h b/src/widgets/styles/qstyleanimation_p.h index a9f9325826..b589607380 100644 --- a/src/widgets/styles/qstyleanimation_p.h +++ b/src/widgets/styles/qstyleanimation_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$ @@ -63,7 +63,7 @@ public: QObject *target() const; - int duration() const; + int duration() const Q_DECL_OVERRIDE; void setDuration(int duration); int delay() const; @@ -89,7 +89,7 @@ public Q_SLOTS: protected: virtual bool isUpdateNeeded() const; - virtual void updateCurrentTime(int time); + virtual void updateCurrentTime(int time) Q_DECL_OVERRIDE; private: int _delay; @@ -113,7 +113,7 @@ public: void setSpeed(int speed); protected: - bool isUpdateNeeded() const; + bool isUpdateNeeded() const Q_DECL_OVERRIDE; private: int _speed; @@ -136,7 +136,7 @@ public: qreal currentValue() const; protected: - bool isUpdateNeeded() const; + bool isUpdateNeeded() const Q_DECL_OVERRIDE; private: qreal _start; @@ -162,7 +162,7 @@ public: QImage currentImage() const; protected: - virtual void updateCurrentTime(int time); + virtual void updateCurrentTime(int time) Q_DECL_OVERRIDE; private: Type _type; @@ -186,7 +186,7 @@ public: void setActive(bool active); private slots: - void updateCurrentTime(int time); + void updateCurrentTime(int time) Q_DECL_OVERRIDE; private: Mode _mode; |