whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
bb10
Tatiana Borisova 2024-04-25 16:09:20 +02:00
parent 0a5641e72c
commit c9ea8ac74d
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/corelib/compat/removed_api.cpp
View File

@ -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