1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QSingleShotTimer: de-inline [4/4]: clean up includes

Browse Source 
Include what you need, don't rely on transitive
includes. Forward-declare what you need in-name-only.

Also port the one unchanged include in the header
(qabstracteventdispatcher.h) to idiomatic form. It's an unrelated
change, but it looked so lost among the QtCore/ headers, I felt pity.

Amends e0573e73645c0f57e46332a94160e28eb6c8ebac.

Change-Id: I4f25df7465f08378bc4e003bde12c28f4d231f14
Reviewed-by: Ahmad Samir <a.samirh78@gmail.com>
(cherry picked from commit 49d5b0a5a10634841122bbbc5e986ce307e7017a)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Marc Mutz 2024-06-28 10:18:20 +02:00 committed by Qt Cherry-pick Bot
parent 661ab8398e
commit dabfdb5f2d
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/corelib/kernel/qsingleshottimer.cpp
View File

@ -4,13 +4,10 @@
#include <QtCore/private/qsingleshottimer_p.h> #include <QtCore/private/qsingleshottimer_p.h>
#include "qabstracteventdispatcher.h"
#include "qcoreapplication.h" #include "qcoreapplication.h"
#include "qmetaobject_p.h" #include "qmetaobject_p.h"
#include "private/qnumeric_p.h" #include "private/qnumeric_p.h"
#include <chrono>
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
QSingleShotTimer::QSingleShotTimer(Duration interval, Qt::TimerType timerType, QSingleShotTimer::QSingleShotTimer(Duration interval, Qt::TimerType timerType,

10
src/corelib/kernel/qsingleshottimer_p.h
View File

@ -16,12 +16,16 @@
// We mean it. // We mean it.
// //
#include "qabstracteventdispatcher.h" #include <QtCore/qobject.h>
#include "qcoreapplication.h" #include <QtCore/qabstracteventdispatcher.h>
#include "qmetaobject_p.h" #include <QtCore/qnamespace.h>
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
namespace QtPrivate {
class QSlotObjectBase;
}
class QSingleShotTimer : public QObject class QSingleShotTimer : public QObject
{ {
Q_OBJECT Q_OBJECT