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>
This commit is contained in:
Ahmad Samir 2024-02-21 14:32:49 +02:00
parent b17703171c
commit 99a636eb3f
27 changed files with 6 additions and 26 deletions

View File

@ -17,7 +17,6 @@
#include <QtCore/qbasictimer.h> #include <QtCore/qbasictimer.h>
#include <QtCore/qdatetime.h> #include <QtCore/qdatetime.h>
#include <QtCore/qtimer.h>
#include <QtCore/qelapsedtimer.h> #include <QtCore/qelapsedtimer.h>
#include <private/qobject_p.h> #include <private/qobject_p.h>
#include <private/qproperty_p.h> #include <private/qproperty_p.h>

View File

@ -9,7 +9,6 @@
#include <qfileinfo.h> #include <qfileinfo.h>
#include <qloggingcategory.h> #include <qloggingcategory.h>
#include <qset.h> #include <qset.h>
#include <qtimer.h>
#if (defined(Q_OS_LINUX) || defined(Q_OS_QNX)) && QT_CONFIG(inotify) #if (defined(Q_OS_LINUX) || defined(Q_OS_QNX)) && QT_CONFIG(inotify)
#define USE_INOTIFY #define USE_INOTIFY

View File

@ -5,7 +5,6 @@
#include <QtCore/qlatin1stringview.h> #include <QtCore/qlatin1stringview.h>
#include <QtCore/qscopeguard.h> #include <QtCore/qscopeguard.h>
#include <QtCore/qtimer.h>
#include <chrono> #include <chrono>

View File

@ -14,7 +14,6 @@
#include <qbytearray.h> #include <qbytearray.h>
#include <qdeadlinetimer.h> #include <qdeadlinetimer.h>
#include <qcoreapplication.h> #include <qcoreapplication.h>
#include <qtimer.h>
#if __has_include(<paths.h>) #if __has_include(<paths.h>)
#include <paths.h> #include <paths.h>

View File

@ -8,7 +8,6 @@
#include <QtCore/qcoreapplication.h> #include <QtCore/qcoreapplication.h>
#include <QtCore/qmetaobject.h> #include <QtCore/qmetaobject.h>
#include <QtCore/qset.h> #include <QtCore/qset.h>
#include <QtCore/qtimer.h>
#include <QtCore/qthread.h> #include <QtCore/qthread.h>
#include "qdbusconnection.h" #include "qdbusconnection.h"

View File

@ -11,7 +11,6 @@
#include <qobject.h> #include <qobject.h>
#include <qsocketnotifier.h> #include <qsocketnotifier.h>
#include <qstringlist.h> #include <qstringlist.h>
#include <qtimer.h>
#include <qthread.h> #include <qthread.h>
#include <private/qlocking_p.h> #include <private/qlocking_p.h>
#include <QtCore/qset.h> #include <QtCore/qset.h>

View File

@ -4,7 +4,6 @@
#include <qinputmethod.h> #include <qinputmethod.h>
#include <private/qinputmethod_p.h> #include <private/qinputmethod_p.h>
#include <qguiapplication.h> #include <qguiapplication.h>
#include <qtimer.h>
#include <qpa/qplatforminputcontext_p.h> #include <qpa/qplatforminputcontext_p.h>
#include <QDebug> #include <QDebug>

View File

@ -4,7 +4,6 @@
#include "qnetworkreplywasmimpl_p.h" #include "qnetworkreplywasmimpl_p.h"
#include "qnetworkrequest.h" #include "qnetworkrequest.h"
#include <QtCore/qtimer.h>
#include <QtCore/qdatetime.h> #include <QtCore/qdatetime.h>
#include <QtCore/qcoreapplication.h> #include <QtCore/qcoreapplication.h>
#include <QtCore/qfileinfo.h> #include <QtCore/qfileinfo.h>

View File

@ -16,7 +16,6 @@
// //
#include <qpa/qplatformscreen.h> #include <qpa/qplatformscreen.h>
#include <QtCore/QTimer>
#include <QtCore/QSize> #include <QtCore/QSize>
#include "qfbcursor_p.h" #include "qfbcursor_p.h"

View File

@ -16,7 +16,6 @@
// //
#include <qobject.h> #include <qobject.h>
#include <QTimer>
#include <QDataStream> #include <QDataStream>
#include <private/qglobal_p.h> #include <private/qglobal_p.h>

View File

@ -17,7 +17,6 @@
#include <qguiapplication.h> #include <qguiapplication.h>
#include <qrect.h> #include <qrect.h>
#include <qpainter.h> #include <qpainter.h>
#include <qtimer.h>
#include <qpa/qwindowsysteminterface.h> #include <qpa/qwindowsysteminterface.h>

View File

@ -33,7 +33,6 @@
#include <QtGui/private/qcoregraphics_p.h> #include <QtGui/private/qcoregraphics_p.h>
#elif QT_CONFIG(style_windowsvista) #elif QT_CONFIG(style_windowsvista)
#include "qwizard_win_p.h" #include "qwizard_win_p.h"
#include "qtimer.h"
#endif #endif
#include "private/qdialog_p.h" #include "private/qdialog_p.h"

View File

@ -764,7 +764,6 @@
#include <QtCore/qbitarray.h> #include <QtCore/qbitarray.h>
#include <QtCore/qpoint.h> #include <QtCore/qpoint.h>
#include <QtCore/qstack.h> #include <QtCore/qstack.h>
#include <QtCore/qtimer.h>
#include <QtCore/qvariant.h> #include <QtCore/qvariant.h>
#include <QtCore/qvarlengtharray.h> #include <QtCore/qvarlengtharray.h>
#include <QtCore/qnumeric.h> #include <QtCore/qnumeric.h>

View File

@ -186,7 +186,6 @@
#include <QtCore/qrect.h> #include <QtCore/qrect.h>
#include <QtCore/qset.h> #include <QtCore/qset.h>
#include <QtCore/qstack.h> #include <QtCore/qstack.h>
#include <QtCore/qtimer.h>
#include <QtCore/qvarlengtharray.h> #include <QtCore/qvarlengtharray.h>
#include <QtCore/QMetaMethod> #include <QtCore/QMetaMethod>
#include <QtWidgets/qapplication.h> #include <QtWidgets/qapplication.h>

View File

@ -16,9 +16,10 @@
// //
#include <QtWidgets/private/qtwidgetsglobal_p.h> #include <QtWidgets/private/qtwidgetsglobal_p.h>
#include "qtimer.h"
#include "qpoint.h" #include "qpoint.h"
#include "qgesturerecognizer.h" #include "qgesturerecognizer.h"
#include <QtCore/qbasictimer.h>
#include <QtCore/qobject.h>
#include <QtCore/qpointer.h> #include <QtCore/qpointer.h>
#ifndef QT_NO_GESTURES #ifndef QT_NO_GESTURES
@ -47,6 +48,7 @@ public:
class QMacPanGestureRecognizer : public QObject, public QGestureRecognizer class QMacPanGestureRecognizer : public QObject, public QGestureRecognizer
{ {
Q_OBJECT
public: public:
QMacPanGestureRecognizer(); QMacPanGestureRecognizer();

View File

@ -9,7 +9,6 @@
#include <qstyle.h> #include <qstyle.h>
#include <qstyleoption.h> #include <qstyleoption.h>
#include <qstylepainter.h> #include <qstylepainter.h>
#include <qtimer.h>
#if QT_CONFIG(effects) #if QT_CONFIG(effects)
#include <private/qeffects_p.h> #include <private/qeffects_p.h>
#endif #endif
@ -24,6 +23,8 @@
#include <QtGui/private/qhighdpiscaling_p.h> #include <QtGui/private/qhighdpiscaling_p.h>
#include <qtooltip.h> #include <qtooltip.h>
#include <QtCore/qbasictimer.h>
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
using namespace Qt::StringLiterals; using namespace Qt::StringLiterals;

View File

@ -10,7 +10,6 @@
#include "qpixmap.h" #include "qpixmap.h"
#include "qscreen.h" #include "qscreen.h"
#include "qpainter.h" #include "qpainter.h"
#include "qtimer.h"
#if QT_CONFIG(action) #if QT_CONFIG(action)
#include "qaction.h" #include "qaction.h"
#endif // QT_CONFIG(action) #endif // QT_CONFIG(action)

View File

@ -14,7 +14,6 @@
#if QT_CONFIG(menu) #if QT_CONFIG(menu)
#include "qmenu.h" #include "qmenu.h"
#endif #endif
#include "qtimer.h"
#include "qsystemtrayicon_p.h" #include "qsystemtrayicon_p.h"
#include "qpaintengine.h" #include "qpaintengine.h"
#include <qwindow.h> #include <qwindow.h>

View File

@ -37,7 +37,6 @@
#include <qvarlengtharray.h> #include <qvarlengtharray.h>
#include <qstack.h> #include <qstack.h>
#include <qmap.h> #include <qmap.h>
#include <qtimer.h>
#include <qpointer.h> #include <qpointer.h>
#ifndef QT_NO_DEBUG_STREAM #ifndef QT_NO_DEBUG_STREAM

View File

@ -17,7 +17,6 @@
#include <qmenu.h> #include <qmenu.h>
#endif #endif
#include <qstyle.h> #include <qstyle.h>
#include <qtimer.h>
#include "private/qapplication_p.h" #include "private/qapplication_p.h"
#include "private/qtextdocumentlayout_p.h" #include "private/qtextdocumentlayout_p.h"
#include "private/qabstracttextdocumentlayout_p.h" #include "private/qabstracttextdocumentlayout_p.h"

View File

@ -5,7 +5,6 @@
#include "qevent.h" #include "qevent.h"
#include "qstylepainter.h" #include "qstylepainter.h"
#include "qrubberband.h" #include "qrubberband.h"
#include "qtimer.h"
#include "qstyle.h" #include "qstyle.h"
#include "qstyleoption.h" #include "qstyleoption.h"

View File

@ -19,7 +19,6 @@
#include "qvarlengtharray.h" #include "qvarlengtharray.h"
#include "private/qlayoutengine_p.h" #include "private/qlayoutengine_p.h"
#include "private/qsplitter_p.h" #include "private/qsplitter_p.h"
#include "qtimer.h"
#include "qdebug.h" #include "qdebug.h"
#include <ctype.h> #include <ctype.h>

View File

@ -21,7 +21,6 @@
#include <qmenu.h> #include <qmenu.h>
#endif #endif
#include <qstyle.h> #include <qstyle.h>
#include <qtimer.h>
#if QT_CONFIG(accessibility) #if QT_CONFIG(accessibility)
#include <qaccessible.h> #include <qaccessible.h>
#endif #endif

View File

@ -25,7 +25,6 @@
#include <qstyleoption.h> #include <qstyleoption.h>
#include <qtoolbutton.h> #include <qtoolbutton.h>
#include <qwidgetaction.h> #include <qwidgetaction.h>
#include <qtimer.h>
#include <private/qwidgetaction_p.h> #include <private/qwidgetaction_p.h>
#include <private/qmainwindowlayout_p.h> #include <private/qmainwindowlayout_p.h>
#include <private/qhighdpiscaling_p.h> #include <private/qhighdpiscaling_p.h>

View File

@ -26,7 +26,6 @@ QT_REQUIRE_CONFIG(toolbar);
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
class QToolBarLayout; class QToolBarLayout;
class QTimer;
class QToolBarPrivate : public QWidgetPrivate class QToolBarPrivate : public QWidgetPrivate
{ {

View File

@ -15,7 +15,6 @@
#endif #endif
#include <qclipboard.h> #include <qclipboard.h>
#include <qstyle.h> #include <qstyle.h>
#include <qtimer.h>
#include "private/qapplication_p.h" #include "private/qapplication_p.h"
#include "private/qtextdocumentlayout_p.h" #include "private/qtextdocumentlayout_p.h"
#include "private/qabstracttextdocumentlayout_p.h" #include "private/qabstracttextdocumentlayout_p.h"

View File

@ -7,6 +7,7 @@
#include <QAnimationGroup> #include <QAnimationGroup>
#include <QSequentialAnimationGroup> #include <QSequentialAnimationGroup>
#include <QtCore/qpropertyanimation.h> #include <QtCore/qpropertyanimation.h>
#include <QtCore/qtimer.h>
#include <QtCore/qvariantanimation.h> #include <QtCore/qvariantanimation.h>
#include <private/qabstractanimation_p.h> #include <private/qabstractanimation_p.h>
#include <QtGui/qpointingdevice.h> #include <QtGui/qpointingdevice.h>