QSingleShotTimer: de-inline [2/4]: clean up header
Remove the inline keyword. As a drive-by, mark the ctors explicit and the dtor override, and sort the SMFs idiomatically (dtor _after_ ctors). Amends e0573e73645c0f57e46332a94160e28eb6c8ebac. Change-Id: I2496360e1f72a4ab54a7c090ca966e1c4828a314 Reviewed-by: Ahmad Samir <a.samirh78@gmail.com> (cherry picked from commit b05022e8473d5517f0a8b0c8c4d5dff6e31c5a97) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
parent
e3da82d3b6
commit
b174be2247
@ -31,18 +31,17 @@ class QSingleShotTimer : public QObject
|
|||||||
|
|
||||||
Qt::TimerId timerId = Qt::TimerId::Invalid;
|
Qt::TimerId timerId = Qt::TimerId::Invalid;
|
||||||
|
|
||||||
#define inline
|
|
||||||
public:
|
public:
|
||||||
// use the same duration type
|
// use the same duration type
|
||||||
using Duration = QAbstractEventDispatcher::Duration;
|
using Duration = QAbstractEventDispatcher::Duration;
|
||||||
|
|
||||||
inline ~QSingleShotTimer();
|
explicit QSingleShotTimer(Duration interval, Qt::TimerType timerType,
|
||||||
inline QSingleShotTimer(Duration interval, Qt::TimerType timerType,
|
|
||||||
const QObject *r, const char *member);
|
const QObject *r, const char *member);
|
||||||
inline QSingleShotTimer(Duration interval, Qt::TimerType timerType,
|
explicit QSingleShotTimer(Duration interval, Qt::TimerType timerType,
|
||||||
const QObject *r, QtPrivate::QSlotObjectBase *slotObj);
|
const QObject *r, QtPrivate::QSlotObjectBase *slotObj);
|
||||||
|
~QSingleShotTimer() override;
|
||||||
|
|
||||||
inline void startTimerForReceiver(Duration interval, Qt::TimerType timerType,
|
void startTimerForReceiver(Duration interval, Qt::TimerType timerType,
|
||||||
const QObject *receiver);
|
const QObject *receiver);
|
||||||
|
|
||||||
static Duration fromMsecs(std::chrono::milliseconds ms)
|
static Duration fromMsecs(std::chrono::milliseconds ms)
|
||||||
@ -63,8 +62,7 @@ Q_SIGNALS:
|
|||||||
void timeout();
|
void timeout();
|
||||||
|
|
||||||
private:
|
private:
|
||||||
inline void timerEvent(QTimerEvent *) override;
|
void timerEvent(QTimerEvent *) override;
|
||||||
#undef inline
|
|
||||||
};
|
};
|
||||||
|
|
||||||
QT_END_NAMESPACE
|
QT_END_NAMESPACE
|
||||||
|
Loading…
x
Reference in New Issue
Block a user