diff options
Diffstat (limited to 'src/widgets/util/qscroller.cpp')
| -rw-r--r-- | src/widgets/util/qscroller.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/widgets/util/qscroller.cpp b/src/widgets/util/qscroller.cpp index 8cd7b97e30..e3ac7348e7 100644 --- a/src/widgets/util/qscroller.cpp +++ b/src/widgets/util/qscroller.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 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$ @@ -190,7 +190,7 @@ public: : d(_d), ignoreUpdate(false), skip(0) { } - int duration() const + int duration() const Q_DECL_OVERRIDE { return -1; } @@ -206,7 +206,7 @@ public: } protected: - void updateCurrentTime(int /*currentTime*/) + void updateCurrentTime(int /*currentTime*/) Q_DECL_OVERRIDE { if (!ignoreUpdate) { if (++skip >= d->frameRateSkip()) { @@ -1002,12 +1002,12 @@ bool QScroller::handleInput(Input input, const QPointF &position, qint64 timesta return false; } -#if !defined(Q_WS_MAC) +#if !defined(Q_DEAD_CODE_FROM_QT4_MAC) // the Mac version is implemented in qscroller_mac.mm QPointF QScrollerPrivate::realDpi(int screen) { -# if defined(Q_WS_X11) && !defined(QT_NO_XRANDR) +# if defined(Q_DEAD_CODE_FROM_QT4_X11) && !defined(QT_NO_XRANDR) if (X11 && X11->use_xrandr && X11->ptrXRRSizes && X11->ptrXRRRootToScreen) { int nsizes = 0; // QDesktopWidget is based on Xinerama screens, which do not always @@ -1033,7 +1033,7 @@ QPointF QScrollerPrivate::realDpi(int screen) return QPointF(w->physicalDpiX(), w->physicalDpiY()); } -#endif // !Q_WS_MAC +#endif // !Q_DEAD_CODE_FROM_QT4_MAC /*! \internal |