diff options
Diffstat (limited to 'src/corelib/kernel/qelapsedtimer.h')
| -rw-r--r-- | src/corelib/kernel/qelapsedtimer.h | 62 |
1 files changed, 15 insertions, 47 deletions
diff --git a/src/corelib/kernel/qelapsedtimer.h b/src/corelib/kernel/qelapsedtimer.h index a7523add19..7d8b889f61 100644 --- a/src/corelib/kernel/qelapsedtimer.h +++ b/src/corelib/kernel/qelapsedtimer.h @@ -1,49 +1,14 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the QtCore module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** 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 The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2016 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #ifndef QELAPSEDTIMER_H #define QELAPSEDTIMER_H #include <QtCore/qglobal.h> -QT_BEGIN_NAMESPACE +#include <chrono> +QT_BEGIN_NAMESPACE class Q_CORE_EXPORT QElapsedTimer { @@ -51,16 +16,17 @@ public: enum ClockType { SystemTime, MonotonicClock, - TickCounter, + TickCounter Q_DECL_ENUMERATOR_DEPRECATED_X( + "Not supported anymore. Use PerformanceCounter instead."), MachAbsoluteTime, PerformanceCounter }; - constexpr QElapsedTimer() - : t1(Q_INT64_C(0x8000000000000000)), - t2(Q_INT64_C(0x8000000000000000)) - { - } + // similar to std::chrono::*_clock + using Duration = std::chrono::nanoseconds; + using TimePoint = std::chrono::time_point<std::chrono::steady_clock, Duration>; + + constexpr QElapsedTimer() = default; static ClockType clockType() noexcept; static bool isMonotonic() noexcept; @@ -70,11 +36,13 @@ public: void invalidate() noexcept; bool isValid() const noexcept; + Duration durationElapsed() const noexcept; qint64 nsecsElapsed() const noexcept; qint64 elapsed() const noexcept; bool hasExpired(qint64 timeout) const noexcept; qint64 msecsSinceReference() const noexcept; + Duration durationTo(const QElapsedTimer &other) const noexcept; qint64 msecsTo(const QElapsedTimer &other) const noexcept; qint64 secsTo(const QElapsedTimer &other) const noexcept; @@ -86,8 +54,8 @@ public: friend bool Q_CORE_EXPORT operator<(const QElapsedTimer &lhs, const QElapsedTimer &rhs) noexcept; private: - qint64 t1; - qint64 t2; + qint64 t1 = Q_INT64_C(0x8000000000000000); + qint64 t2 = Q_INT64_C(0x8000000000000000); }; QT_END_NAMESPACE |