From 99a636eb3f41e26efc8cd5156346a8b1ba6805cf Mon Sep 17 00:00:00 2001
From: Ahmad Samir <a.samirh78@gmail.com>
Date: Wed, 21 Feb 2024 14:32:49 +0200
Subject: [PATCH] Remove redundant qtimer.h includes

If QTimer isn't used in the file where it's included, remove the include.

Fix files that depended on transitive includes.

QMacPanGestureRecognizer: drive by change: classes inheriting from
QObject should have Q_OBJECT macro in the definition.

Change-Id: Ia8d71f4195a1ca643c9fcb14db41877413348d98
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
---
 src/corelib/animation/qabstractanimation_p.h                  | 1 -
 src/corelib/io/qfilesystemwatcher.cpp                         | 1 -
 src/corelib/io/qfilesystemwatcher_polling.cpp                 | 1 -
 src/corelib/io/qprocess.cpp                                   | 1 -
 src/dbus/qdbusabstractadaptor.cpp                             | 1 -
 src/dbus/qdbusintegrator.cpp                                  | 1 -
 src/gui/kernel/qinputmethod.cpp                               | 1 -
 src/network/access/qnetworkreplywasmimpl.cpp                  | 1 -
 src/platformsupport/fbconvenience/qfbscreen_p.h               | 1 -
 .../input/evdevkeyboard/qevdevkeyboardhandler_p.h             | 1 -
 src/plugins/platforms/xcb/qxcbdrag.cpp                        | 1 -
 src/widgets/dialogs/qwizard.cpp                               | 1 -
 src/widgets/graphicsview/qgraphicsitem.cpp                    | 1 -
 src/widgets/graphicsview/qgraphicsscene.cpp                   | 1 -
 src/widgets/kernel/qmacgesturerecognizer_p.h                  | 4 +++-
 src/widgets/kernel/qtooltip.cpp                               | 3 ++-
 src/widgets/kernel/qwhatsthis.cpp                             | 1 -
 src/widgets/util/qsystemtrayicon_x11.cpp                      | 1 -
 src/widgets/widgets/qmainwindowlayout.cpp                     | 1 -
 src/widgets/widgets/qplaintextedit.cpp                        | 1 -
 src/widgets/widgets/qrubberband.cpp                           | 1 -
 src/widgets/widgets/qsplitter.cpp                             | 1 -
 src/widgets/widgets/qtextedit.cpp                             | 1 -
 src/widgets/widgets/qtoolbar.cpp                              | 1 -
 src/widgets/widgets/qtoolbar_p.h                              | 1 -
 src/widgets/widgets/qwidgettextcontrol.cpp                    | 1 -
 .../animation/qpropertyanimation/tst_qpropertyanimation.cpp   | 1 +
 27 files changed, 6 insertions(+), 26 deletions(-)

diff --git a/src/corelib/animation/qabstractanimation_p.h b/src/corelib/animation/qabstractanimation_p.h
index cb9042777af..17a6372bb1a 100644
--- a/src/corelib/animation/qabstractanimation_p.h
+++ b/src/corelib/animation/qabstractanimation_p.h
@@ -17,7 +17,6 @@
 
 #include <QtCore/qbasictimer.h>
 #include <QtCore/qdatetime.h>
-#include <QtCore/qtimer.h>
 #include <QtCore/qelapsedtimer.h>
 #include <private/qobject_p.h>
 #include <private/qproperty_p.h>
diff --git a/src/corelib/io/qfilesystemwatcher.cpp b/src/corelib/io/qfilesystemwatcher.cpp
index 7138f8260bd..de938691b8a 100644
--- a/src/corelib/io/qfilesystemwatcher.cpp
+++ b/src/corelib/io/qfilesystemwatcher.cpp
@@ -9,7 +9,6 @@
 #include <qfileinfo.h>
 #include <qloggingcategory.h>
 #include <qset.h>
-#include <qtimer.h>
 
 #if (defined(Q_OS_LINUX) || defined(Q_OS_QNX)) && QT_CONFIG(inotify)
 #define USE_INOTIFY
diff --git a/src/corelib/io/qfilesystemwatcher_polling.cpp b/src/corelib/io/qfilesystemwatcher_polling.cpp
index d34c8c49e8e..a0c5d534011 100644
--- a/src/corelib/io/qfilesystemwatcher_polling.cpp
+++ b/src/corelib/io/qfilesystemwatcher_polling.cpp
@@ -5,7 +5,6 @@
 
 #include <QtCore/qlatin1stringview.h>
 #include <QtCore/qscopeguard.h>
-#include <QtCore/qtimer.h>
 
 #include <chrono>
 
diff --git a/src/corelib/io/qprocess.cpp b/src/corelib/io/qprocess.cpp
index 108ee0b7c3e..dffa7b4b6aa 100644
--- a/src/corelib/io/qprocess.cpp
+++ b/src/corelib/io/qprocess.cpp
@@ -14,7 +14,6 @@
 #include <qbytearray.h>
 #include <qdeadlinetimer.h>
 #include <qcoreapplication.h>
-#include <qtimer.h>
 
 #if __has_include(<paths.h>)
 #include <paths.h>
diff --git a/src/dbus/qdbusabstractadaptor.cpp b/src/dbus/qdbusabstractadaptor.cpp
index afe769fcd0c..806a1b5f1f2 100644
--- a/src/dbus/qdbusabstractadaptor.cpp
+++ b/src/dbus/qdbusabstractadaptor.cpp
@@ -8,7 +8,6 @@
 #include <QtCore/qcoreapplication.h>
 #include <QtCore/qmetaobject.h>
 #include <QtCore/qset.h>
-#include <QtCore/qtimer.h>
 #include <QtCore/qthread.h>
 
 #include "qdbusconnection.h"
diff --git a/src/dbus/qdbusintegrator.cpp b/src/dbus/qdbusintegrator.cpp
index 836562f496d..1b03b7f6f6b 100644
--- a/src/dbus/qdbusintegrator.cpp
+++ b/src/dbus/qdbusintegrator.cpp
@@ -11,7 +11,6 @@
 #include <qobject.h>
 #include <qsocketnotifier.h>
 #include <qstringlist.h>
-#include <qtimer.h>
 #include <qthread.h>
 #include <private/qlocking_p.h>
 #include <QtCore/qset.h>
diff --git a/src/gui/kernel/qinputmethod.cpp b/src/gui/kernel/qinputmethod.cpp
index e37e85e246d..175450f890b 100644
--- a/src/gui/kernel/qinputmethod.cpp
+++ b/src/gui/kernel/qinputmethod.cpp
@@ -4,7 +4,6 @@
 #include <qinputmethod.h>
 #include <private/qinputmethod_p.h>
 #include <qguiapplication.h>
-#include <qtimer.h>
 #include <qpa/qplatforminputcontext_p.h>
 
 #include <QDebug>
diff --git a/src/network/access/qnetworkreplywasmimpl.cpp b/src/network/access/qnetworkreplywasmimpl.cpp
index 7d2b6a701e5..ccf1542958e 100644
--- a/src/network/access/qnetworkreplywasmimpl.cpp
+++ b/src/network/access/qnetworkreplywasmimpl.cpp
@@ -4,7 +4,6 @@
 #include "qnetworkreplywasmimpl_p.h"
 #include "qnetworkrequest.h"
 
-#include <QtCore/qtimer.h>
 #include <QtCore/qdatetime.h>
 #include <QtCore/qcoreapplication.h>
 #include <QtCore/qfileinfo.h>
diff --git a/src/platformsupport/fbconvenience/qfbscreen_p.h b/src/platformsupport/fbconvenience/qfbscreen_p.h
index 82dd98fcf60..92645559569 100644
--- a/src/platformsupport/fbconvenience/qfbscreen_p.h
+++ b/src/platformsupport/fbconvenience/qfbscreen_p.h
@@ -16,7 +16,6 @@
 //
 
 #include <qpa/qplatformscreen.h>
-#include <QtCore/QTimer>
 #include <QtCore/QSize>
 #include "qfbcursor_p.h"
 
diff --git a/src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler_p.h b/src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler_p.h
index 1d991e2ba51..ec645e14407 100644
--- a/src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler_p.h
+++ b/src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler_p.h
@@ -16,7 +16,6 @@
 //
 
 #include <qobject.h>
-#include <QTimer>
 #include <QDataStream>
 #include <private/qglobal_p.h>
 
diff --git a/src/plugins/platforms/xcb/qxcbdrag.cpp b/src/plugins/platforms/xcb/qxcbdrag.cpp
index 7a44e4bb4ff..71335444e9c 100644
--- a/src/plugins/platforms/xcb/qxcbdrag.cpp
+++ b/src/plugins/platforms/xcb/qxcbdrag.cpp
@@ -17,7 +17,6 @@
 #include <qguiapplication.h>
 #include <qrect.h>
 #include <qpainter.h>
-#include <qtimer.h>
 
 #include <qpa/qwindowsysteminterface.h>
 
diff --git a/src/widgets/dialogs/qwizard.cpp b/src/widgets/dialogs/qwizard.cpp
index ec082b9a85a..f3fbdad4838 100644
--- a/src/widgets/dialogs/qwizard.cpp
+++ b/src/widgets/dialogs/qwizard.cpp
@@ -33,7 +33,6 @@
 #include <QtGui/private/qcoregraphics_p.h>
 #elif QT_CONFIG(style_windowsvista)
 #include "qwizard_win_p.h"
-#include "qtimer.h"
 #endif
 
 #include "private/qdialog_p.h"
diff --git a/src/widgets/graphicsview/qgraphicsitem.cpp b/src/widgets/graphicsview/qgraphicsitem.cpp
index 17ea830cab9..8c7b349012b 100644
--- a/src/widgets/graphicsview/qgraphicsitem.cpp
+++ b/src/widgets/graphicsview/qgraphicsitem.cpp
@@ -764,7 +764,6 @@
 #include <QtCore/qbitarray.h>
 #include <QtCore/qpoint.h>
 #include <QtCore/qstack.h>
-#include <QtCore/qtimer.h>
 #include <QtCore/qvariant.h>
 #include <QtCore/qvarlengtharray.h>
 #include <QtCore/qnumeric.h>
diff --git a/src/widgets/graphicsview/qgraphicsscene.cpp b/src/widgets/graphicsview/qgraphicsscene.cpp
index c022af6fc01..634c0797b93 100644
--- a/src/widgets/graphicsview/qgraphicsscene.cpp
+++ b/src/widgets/graphicsview/qgraphicsscene.cpp
@@ -186,7 +186,6 @@
 #include <QtCore/qrect.h>
 #include <QtCore/qset.h>
 #include <QtCore/qstack.h>
-#include <QtCore/qtimer.h>
 #include <QtCore/qvarlengtharray.h>
 #include <QtCore/QMetaMethod>
 #include <QtWidgets/qapplication.h>
diff --git a/src/widgets/kernel/qmacgesturerecognizer_p.h b/src/widgets/kernel/qmacgesturerecognizer_p.h
index 5c559c6cb99..9ce3ece051d 100644
--- a/src/widgets/kernel/qmacgesturerecognizer_p.h
+++ b/src/widgets/kernel/qmacgesturerecognizer_p.h
@@ -16,9 +16,10 @@
 //
 
 #include <QtWidgets/private/qtwidgetsglobal_p.h>
-#include "qtimer.h"
 #include "qpoint.h"
 #include "qgesturerecognizer.h"
+#include <QtCore/qbasictimer.h>
+#include <QtCore/qobject.h>
 #include <QtCore/qpointer.h>
 
 #ifndef QT_NO_GESTURES
@@ -47,6 +48,7 @@ public:
 
 class QMacPanGestureRecognizer : public QObject, public QGestureRecognizer
 {
+    Q_OBJECT
 public:
     QMacPanGestureRecognizer();
 
diff --git a/src/widgets/kernel/qtooltip.cpp b/src/widgets/kernel/qtooltip.cpp
index 35eaa8042ad..5485777eabb 100644
--- a/src/widgets/kernel/qtooltip.cpp
+++ b/src/widgets/kernel/qtooltip.cpp
@@ -9,7 +9,6 @@
 #include <qstyle.h>
 #include <qstyleoption.h>
 #include <qstylepainter.h>
-#include <qtimer.h>
 #if QT_CONFIG(effects)
 #include <private/qeffects_p.h>
 #endif
@@ -24,6 +23,8 @@
 #include <QtGui/private/qhighdpiscaling_p.h>
 #include <qtooltip.h>
 
+#include <QtCore/qbasictimer.h>
+
 QT_BEGIN_NAMESPACE
 
 using namespace Qt::StringLiterals;
diff --git a/src/widgets/kernel/qwhatsthis.cpp b/src/widgets/kernel/qwhatsthis.cpp
index c80f37267f0..4c988e4af3c 100644
--- a/src/widgets/kernel/qwhatsthis.cpp
+++ b/src/widgets/kernel/qwhatsthis.cpp
@@ -10,7 +10,6 @@
 #include "qpixmap.h"
 #include "qscreen.h"
 #include "qpainter.h"
-#include "qtimer.h"
 #if QT_CONFIG(action)
 #include "qaction.h"
 #endif // QT_CONFIG(action)
diff --git a/src/widgets/util/qsystemtrayicon_x11.cpp b/src/widgets/util/qsystemtrayicon_x11.cpp
index 2983dc6646d..f316a5953ce 100644
--- a/src/widgets/util/qsystemtrayicon_x11.cpp
+++ b/src/widgets/util/qsystemtrayicon_x11.cpp
@@ -14,7 +14,6 @@
 #if QT_CONFIG(menu)
 #include "qmenu.h"
 #endif
-#include "qtimer.h"
 #include "qsystemtrayicon_p.h"
 #include "qpaintengine.h"
 #include <qwindow.h>
diff --git a/src/widgets/widgets/qmainwindowlayout.cpp b/src/widgets/widgets/qmainwindowlayout.cpp
index 34c18c8f886..1a365dbb6e5 100644
--- a/src/widgets/widgets/qmainwindowlayout.cpp
+++ b/src/widgets/widgets/qmainwindowlayout.cpp
@@ -37,7 +37,6 @@
 #include <qvarlengtharray.h>
 #include <qstack.h>
 #include <qmap.h>
-#include <qtimer.h>
 #include <qpointer.h>
 
 #ifndef QT_NO_DEBUG_STREAM
diff --git a/src/widgets/widgets/qplaintextedit.cpp b/src/widgets/widgets/qplaintextedit.cpp
index 8362c6c629d..77279c87490 100644
--- a/src/widgets/widgets/qplaintextedit.cpp
+++ b/src/widgets/widgets/qplaintextedit.cpp
@@ -17,7 +17,6 @@
 #include <qmenu.h>
 #endif
 #include <qstyle.h>
-#include <qtimer.h>
 #include "private/qapplication_p.h"
 #include "private/qtextdocumentlayout_p.h"
 #include "private/qabstracttextdocumentlayout_p.h"
diff --git a/src/widgets/widgets/qrubberband.cpp b/src/widgets/widgets/qrubberband.cpp
index e00f739ca76..f0251b71cb9 100644
--- a/src/widgets/widgets/qrubberband.cpp
+++ b/src/widgets/widgets/qrubberband.cpp
@@ -5,7 +5,6 @@
 #include "qevent.h"
 #include "qstylepainter.h"
 #include "qrubberband.h"
-#include "qtimer.h"
 
 #include "qstyle.h"
 #include "qstyleoption.h"
diff --git a/src/widgets/widgets/qsplitter.cpp b/src/widgets/widgets/qsplitter.cpp
index d0519a56a24..45f0c3895de 100644
--- a/src/widgets/widgets/qsplitter.cpp
+++ b/src/widgets/widgets/qsplitter.cpp
@@ -19,7 +19,6 @@
 #include "qvarlengtharray.h"
 #include "private/qlayoutengine_p.h"
 #include "private/qsplitter_p.h"
-#include "qtimer.h"
 #include "qdebug.h"
 
 #include <ctype.h>
diff --git a/src/widgets/widgets/qtextedit.cpp b/src/widgets/widgets/qtextedit.cpp
index 90884dd438a..90f09fcb791 100644
--- a/src/widgets/widgets/qtextedit.cpp
+++ b/src/widgets/widgets/qtextedit.cpp
@@ -21,7 +21,6 @@
 #include <qmenu.h>
 #endif
 #include <qstyle.h>
-#include <qtimer.h>
 #if QT_CONFIG(accessibility)
 #include <qaccessible.h>
 #endif
diff --git a/src/widgets/widgets/qtoolbar.cpp b/src/widgets/widgets/qtoolbar.cpp
index 5e5ef8e8d53..0d386a4378a 100644
--- a/src/widgets/widgets/qtoolbar.cpp
+++ b/src/widgets/widgets/qtoolbar.cpp
@@ -25,7 +25,6 @@
 #include <qstyleoption.h>
 #include <qtoolbutton.h>
 #include <qwidgetaction.h>
-#include <qtimer.h>
 #include <private/qwidgetaction_p.h>
 #include <private/qmainwindowlayout_p.h>
 #include <private/qhighdpiscaling_p.h>
diff --git a/src/widgets/widgets/qtoolbar_p.h b/src/widgets/widgets/qtoolbar_p.h
index 2561cd8f64d..9ebce6fdfd3 100644
--- a/src/widgets/widgets/qtoolbar_p.h
+++ b/src/widgets/widgets/qtoolbar_p.h
@@ -26,7 +26,6 @@ QT_REQUIRE_CONFIG(toolbar);
 QT_BEGIN_NAMESPACE
 
 class QToolBarLayout;
-class QTimer;
 
 class QToolBarPrivate : public QWidgetPrivate
 {
diff --git a/src/widgets/widgets/qwidgettextcontrol.cpp b/src/widgets/widgets/qwidgettextcontrol.cpp
index 6dcaeee0c89..96f2ec22ff7 100644
--- a/src/widgets/widgets/qwidgettextcontrol.cpp
+++ b/src/widgets/widgets/qwidgettextcontrol.cpp
@@ -15,7 +15,6 @@
 #endif
 #include <qclipboard.h>
 #include <qstyle.h>
-#include <qtimer.h>
 #include "private/qapplication_p.h"
 #include "private/qtextdocumentlayout_p.h"
 #include "private/qabstracttextdocumentlayout_p.h"
diff --git a/tests/auto/corelib/animation/qpropertyanimation/tst_qpropertyanimation.cpp b/tests/auto/corelib/animation/qpropertyanimation/tst_qpropertyanimation.cpp
index 03755fa7abe..3ebec35f127 100644
--- a/tests/auto/corelib/animation/qpropertyanimation/tst_qpropertyanimation.cpp
+++ b/tests/auto/corelib/animation/qpropertyanimation/tst_qpropertyanimation.cpp
@@ -7,6 +7,7 @@
 #include <QAnimationGroup>
 #include <QSequentialAnimationGroup>
 #include <QtCore/qpropertyanimation.h>
+#include <QtCore/qtimer.h>
 #include <QtCore/qvariantanimation.h>
 #include <private/qabstractanimation_p.h>
 #include <QtGui/qpointingdevice.h>