diff options
| author | Tatiana Borisova <tatiana.borisova@qt.io> | 2024-04-25 16:09:20 +0200 |
|---|---|---|
| committer | Tatiana Borisova <tatiana.borisova@qt.io> | 2024-04-26 16:58:24 +0200 |
| commit | c9ea8ac74d94b128cb0fe3b69d60d16ea1b202af (patch) | |
| tree | c8b1c15ae016138fbe5d2e5bd4e59cf118ae77ea /src | |
| parent | 0a5641e72c2bfaac8e3600e77e57b1933ce19506 (diff) | |
Move int QObject::startTimer() to the alphabetically ordered place
Change-Id: Ibd1f0ef1c57e8aa31ea7b42b2874ba860d9c4373
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Ivan Solovev <ivan.solovev@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/compat/removed_api.cpp | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/src/corelib/compat/removed_api.cpp b/src/corelib/compat/removed_api.cpp index 4bca576ed48..9b7ad483842 100644 --- a/src/corelib/compat/removed_api.cpp +++ b/src/corelib/compat/removed_api.cpp @@ -1005,6 +1005,19 @@ bool QJsonValue::operator!=(const QJsonValue &other) const return !comparesEqual(*this, other); } +#include "qobject.h" + +int QObject::startTimer(std::chrono::milliseconds time, Qt::TimerType timerType) +{ + using namespace std::chrono; + using ratio = std::ratio_divide<std::milli, std::nano>; + if (nanoseconds::rep r; qMulOverflow<ratio::num>(time.count(), &r)) { + qWarning("QObject::startTimer(std::chrono::milliseconds time ...): " + "'time' arg will overflow when converted to nanoseconds."); + } + return startTimer(nanoseconds{time}, timerType); +} + #if QT_CONFIG(processenvironment) #include "qprocess.h" // inlined API @@ -1038,19 +1051,6 @@ bool QUrlQuery::operator==(const QUrlQuery &other) const return comparesEqual(*this, other); } -#include "qobject.h" - -int QObject::startTimer(std::chrono::milliseconds time, Qt::TimerType timerType) -{ - using namespace std::chrono; - using ratio = std::ratio_divide<std::milli, std::nano>; - if (nanoseconds::rep r; qMulOverflow<ratio::num>(time.count(), &r)) { - qWarning("QObject::startTimer(std::chrono::milliseconds time ...): " - "'time' arg will overflow when converted to nanoseconds."); - } - return startTimer(nanoseconds{time}, timerType); -} - #include "qstring.h" // inlined API #include "qxmlstream.h" // inlined API |