diff options
| author | Marc Mutz <marc.mutz@qt.io> | 2022-05-17 09:32:49 +0200 |
|---|---|---|
| committer | Marc Mutz <marc.mutz@qt.io> | 2022-05-18 17:54:15 +0200 |
| commit | f2fea2325de7554e226767d94eb01574a069a324 (patch) | |
| tree | 6d1efb3b100f60443036ef913584d93645164048 | |
| parent | de09aefcd69c77a0cfae4e28f974017318b767a9 (diff) | |
Remove manual declarations of qGlobalPostedEventsCount()
... in favor of including qabstracteventdispatcher_p.h, where needed.
Keeps the code DRY.
Change-Id: I5bee2e653cb29ffac2601ff03c952a4b3adbdb9c
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
4 files changed, 2 insertions, 11 deletions
diff --git a/src/corelib/kernel/qeventdispatcher_wasm.cpp b/src/corelib/kernel/qeventdispatcher_wasm.cpp index 6c8f878f90..d2b01905fe 100644 --- a/src/corelib/kernel/qeventdispatcher_wasm.cpp +++ b/src/corelib/kernel/qeventdispatcher_wasm.cpp @@ -3,6 +3,7 @@ #include "qeventdispatcher_wasm_p.h" +#include <QtCore/private/qabstracteventdispatcher_p.h> // for qGlobalPostedEventsCount() #include <QtCore/qcoreapplication.h> #include <QtCore/qthread.h> #include <QtCore/qsocketnotifier.h> @@ -14,7 +15,6 @@ QT_BEGIN_NAMESPACE // using namespace emscripten; -extern int qGlobalPostedEventsCount(); // from qapplication.cpp Q_LOGGING_CATEGORY(lcEventDispatcher, "qt.eventdispatcher"); Q_LOGGING_CATEGORY(lcEventDispatcherTimers, "qt.eventdispatcher.timers"); diff --git a/src/corelib/kernel/qeventdispatcher_win.cpp b/src/corelib/kernel/qeventdispatcher_win.cpp index 6f9f07240d..709e1494b9 100644 --- a/src/corelib/kernel/qeventdispatcher_win.cpp +++ b/src/corelib/kernel/qeventdispatcher_win.cpp @@ -18,8 +18,6 @@ QT_BEGIN_NAMESPACE -extern uint qGlobalPostedEventsCount(); - #ifndef TIME_KILL_SYNCHRONOUS # define TIME_KILL_SYNCHRONOUS 0x0100 #endif diff --git a/tests/auto/corelib/kernel/qcoreapplication/tst_qcoreapplication.cpp b/tests/auto/corelib/kernel/qcoreapplication/tst_qcoreapplication.cpp index 19767f945c..0e64de151a 100644 --- a/tests/auto/corelib/kernel/qcoreapplication/tst_qcoreapplication.cpp +++ b/tests/auto/corelib/kernel/qcoreapplication/tst_qcoreapplication.cpp @@ -7,6 +7,7 @@ #include <QtCore/QtCore> #include <QTest> +#include <private/qabstracteventdispatcher_p.h> // for qGlobalPostedEventsCount() #include <private/qcoreapplication_p.h> #include <private/qeventloop_p.h> #include <private/qthread_p.h> @@ -513,10 +514,6 @@ void tst_QCoreApplication::applicationPid() QVERIFY(QCoreApplication::applicationPid() > 0); } -QT_BEGIN_NAMESPACE -Q_CORE_EXPORT uint qGlobalPostedEventsCount(); -QT_END_NAMESPACE - class GlobalPostedEventsCountObject : public QObject { Q_OBJECT diff --git a/tests/auto/corelib/thread/qthread/tst_qthread.cpp b/tests/auto/corelib/thread/qthread/tst_qthread.cpp index 70ed8b523b..125c969ea2 100644 --- a/tests/auto/corelib/thread/qthread/tst_qthread.cpp +++ b/tests/auto/corelib/thread/qthread/tst_qthread.cpp @@ -1195,10 +1195,6 @@ void tst_QThread::isRunningInFinished() } } -QT_BEGIN_NAMESPACE -Q_CORE_EXPORT uint qGlobalPostedEventsCount(); -QT_END_NAMESPACE - class DummyEventDispatcher : public QAbstractEventDispatcher { public: DummyEventDispatcher() : QAbstractEventDispatcher() {} |