QtGui: includemocs

Including moc files directly into their classes' TU tends to improve
codegen and enables extended compiler warnings, e.g. about unused
private functions or fields.

Pick-to: 6.3 6.2 5.15
Task-number: QTBUG-102886
Change-Id: I1945741794c25679a9d94c0d68c8642e2c823502
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>

src/gui/accessible/linux/atspiadaptor.cpp

@@ -2471,4 +2471,6 @@ bool AtSpiAdaptor::tableInterface(QAccessibleInterface *interface, const QString
 }
 
 QT_END_NAMESPACE
+
+#include "moc_atspiadaptor_p.cpp"
 #endif //QT_NO_ACCESSIBILITY

src/gui/accessible/linux/dbusconnection.cpp

@@ -179,3 +179,5 @@ QDBusConnection DBusConnection::connection() const
 }
 
 QT_END_NAMESPACE
+
+#include "moc_dbusconnection_p.cpp"

src/gui/accessible/linux/qspiaccessiblebridge.cpp

@@ -302,4 +302,6 @@ RoleNames QSpiAccessibleBridge::namesForRole(QAccessible::Role role)
 }
 
 QT_END_NAMESPACE
+
+#include "moc_qspiaccessiblebridge_p.cpp"
 #endif //QT_NO_ACCESSIBILITY

src/gui/accessible/linux/qspiapplicationadaptor.cpp

@@ -236,4 +236,6 @@ void QSpiApplicationAdaptor::notifyKeyboardListenerError(const QDBusError& error
 
 QT_END_NAMESPACE
 
+#include "moc_qspiapplicationadaptor_p.cpp"
+
 #endif //QT_NO_ACCESSIBILITY

src/gui/accessible/linux/qspidbuscache.cpp

@@ -90,4 +90,6 @@ QSpiAccessibleCacheArray QSpiDBusCache::GetItems()
 }
 
 QT_END_NAMESPACE
+
+#include "moc_qspidbuscache_p.cpp"
 #endif //QT_NO_ACCESSIBILITY

src/gui/accessible/qaccessiblebridge.cpp

@@ -138,4 +138,6 @@ QAccessibleBridgePlugin::~QAccessibleBridgePlugin()
 
 QT_END_NAMESPACE
 
+#include "moc_qaccessiblebridge.cpp"
+
 #endif // QT_NO_ACCESSIBILITY

src/gui/accessible/qaccessiblecache.cpp

@@ -215,4 +215,6 @@ void QAccessibleCache::deleteInterface(QAccessible::Id id, QObject *obj)
 
 QT_END_NAMESPACE
 
+#include "moc_qaccessiblecache_p.cpp"
+
 #endif

src/gui/accessible/qaccessibleplugin.cpp

@@ -90,4 +90,6 @@ QAccessiblePlugin::~QAccessiblePlugin()
 
 QT_END_NAMESPACE
 
+#include "moc_qaccessibleplugin.cpp"
+
 #endif // QT_NO_ACCESSIBILITY

src/gui/image/qiconengineplugin.cpp

@@ -97,3 +97,5 @@ QIconEnginePlugin::~QIconEnginePlugin()
 
 
 QT_END_NAMESPACE
+
+#include "moc_qiconengineplugin.cpp"

src/gui/image/qimage.cpp

@@ -5720,3 +5720,5 @@ QMap<QString, QString> qt_getImageTextFromDescription(const QString &description
 }
 
 QT_END_NAMESPACE
+
+#include "moc_qimage.cpp"

src/gui/image/qimageiohandler.cpp

@@ -652,3 +652,5 @@ QImageIOPlugin::~QImageIOPlugin()
 #endif // QT_NO_IMAGEFORMATPLUGIN
 
 QT_END_NAMESPACE
+
+#include "moc_qimageiohandler.cpp"

src/gui/kernel/qactiongroup.cpp

@@ -360,3 +360,5 @@ bool QActionGroup::isVisible() const
 }
 
 QT_END_NAMESPACE
+
+#include "moc_qactiongroup.cpp"

src/gui/kernel/qclipboard.cpp

@@ -591,4 +591,6 @@ void QClipboard::emitChanged(Mode mode)
 
 QT_END_NAMESPACE
 
+#include "moc_qclipboard.cpp"
+
 #endif // QT_NO_CLIPBOARD

src/gui/kernel/qdnd.cpp

@@ -123,3 +123,5 @@ Qt::DropAction QDragManager::drag(QDrag *o)
 }
 
 QT_END_NAMESPACE
+
+#include "moc_qdnd_p.cpp"

src/gui/kernel/qdrag.cpp

@@ -392,3 +392,5 @@ void QDrag::cancel()
 */
 
 QT_END_NAMESPACE
+
+#include "moc_qdrag.cpp"

src/gui/kernel/qevent.cpp

@@ -4724,3 +4724,5 @@ QMutableSinglePointEvent::~QMutableSinglePointEvent()
     = default;
 
 QT_END_NAMESPACE
+
+#include "moc_qevent.cpp"

src/gui/kernel/qeventpoint.cpp

@@ -649,3 +649,5 @@ void QMutableEventPoint::setTimestamp(QEventPoint &p, ulong t)
 */
 
 QT_END_NAMESPACE
+
+#include "moc_qeventpoint.cpp"

src/gui/kernel/qgenericplugin.cpp

@@ -94,3 +94,5 @@ QGenericPlugin::~QGenericPlugin()
 */
 
 QT_END_NAMESPACE
+
+#include "moc_qgenericplugin.cpp"

src/gui/kernel/qhighdpiscaling.cpp

@@ -785,3 +785,5 @@ QHighDpiScaling::ScaleAndOrigin QHighDpiScaling::scaleAndOrigin(const QWindow *,
 }
 #endif //QT_NO_HIGHDPISCALING
 QT_END_NAMESPACE
+
+#include "moc_qhighdpiscaling_p.cpp"

src/gui/kernel/qinputdevice.cpp

@@ -415,3 +415,5 @@ QDebug operator<<(QDebug debug, const QInputDevice *device)
 #endif // !QT_NO_DEBUG_STREAM
 
 QT_END_NAMESPACE
+
+#include "moc_qinputdevice.cpp"

src/gui/kernel/qinputdevicemanager.cpp

@@ -120,3 +120,5 @@ void QInputDeviceManager::setKeyboardModifiers(Qt::KeyboardModifiers mods)
 }
 
 QT_END_NAMESPACE
+
+#include "moc_qinputdevicemanager_p.cpp"

src/gui/kernel/qinternalmimedata.cpp

@@ -235,3 +235,5 @@ QByteArray QInternalMimeData::renderDataHelper(const QString &mimeType, const QM
 }
 
 QT_END_NAMESPACE
+
+#include "moc_qinternalmimedata_p.cpp"

src/gui/kernel/qkeymapper.cpp

@@ -148,3 +148,5 @@ void *QKeyMapper::resolveInterface(const char *name, int revision) const
 }
 
 QT_END_NAMESPACE
+
+#include "moc_qkeymapper_p.cpp"

src/gui/kernel/qkeysequence.cpp

@@ -1682,3 +1682,5 @@ QDebug operator<<(QDebug dbg, const QKeySequence &p)
 */
 
 QT_END_NAMESPACE
+
+#include "moc_qkeysequence.cpp"

src/gui/kernel/qoffscreensurface.cpp

@@ -388,3 +388,5 @@ void *QOffscreenSurface::resolveInterface(const char *name, int revision) const
 }
 
 QT_END_NAMESPACE
+
+#include "moc_qoffscreensurface.cpp"

src/gui/kernel/qpaintdevicewindow.cpp

@@ -229,3 +229,5 @@ QPaintEngine *QPaintDeviceWindow::paintEngine() const
 }
 
 QT_END_NAMESPACE
+
+#include "moc_qpaintdevicewindow.cpp"

src/gui/kernel/qpalette.cpp

@@ -1279,3 +1279,5 @@ QDebug operator<<(QDebug dbg, const QPalette &p)
 #endif
 
 QT_END_NAMESPACE
+
+#include "moc_qpalette.cpp"

src/gui/kernel/qplatformdialoghelper.cpp

@@ -1009,3 +1009,5 @@ void QPlatformMessageDialogHelper::setOptions(const QSharedPointer<QMessageDialo
 }
 
 QT_END_NAMESPACE
+
+#include "moc_qplatformdialoghelper.cpp"

src/gui/kernel/qplatformgraphicsbuffer.cpp

@@ -270,3 +270,5 @@ QPlatformGraphicsBuffer::Origin QPlatformGraphicsBuffer::origin() const
 */
 
 QT_END_NAMESPACE
+
+#include "moc_qplatformgraphicsbuffer.cpp"

src/gui/kernel/qplatforminputcontext.cpp

@@ -377,3 +377,5 @@ QRectF QPlatformInputContext::keyboardRectangle()
 }
 
 QT_END_NAMESPACE
+
+#include "moc_qplatforminputcontext.cpp"

src/gui/kernel/qplatforminputcontextplugin.cpp

@@ -51,3 +51,5 @@ QPlatformInputContextPlugin::~QPlatformInputContextPlugin()
 }
 
 QT_END_NAMESPACE
+
+#include "moc_qplatforminputcontextplugin_p.cpp"

src/gui/kernel/qplatformintegrationplugin.cpp

@@ -65,3 +65,5 @@ QPlatformIntegration *QPlatformIntegrationPlugin::create(const QString &key, con
 }
 
 QT_END_NAMESPACE
+
+#include "moc_qplatformintegrationplugin.cpp"

src/gui/kernel/qplatformmenu.cpp

@@ -92,3 +92,5 @@ QPlatformMenu *QPlatformMenuBar::createMenu() const
 }
 
 QT_END_NAMESPACE
+
+#include "moc_qplatformmenu.cpp"

src/gui/kernel/qplatformnativeinterface.cpp

@@ -177,3 +177,5 @@ void QPlatformNativeInterface::setWindowProperty(QPlatformWindow *window, const
 }
 
 QT_END_NAMESPACE
+
+#include "moc_qplatformnativeinterface.cpp"

src/gui/kernel/qplatformsharedgraphicscache.cpp

@@ -292,3 +292,5 @@ QT_BEGIN_NAMESPACE
 */
 
 QT_END_NAMESPACE
+
+#include "moc_qplatformsharedgraphicscache.cpp"

src/gui/kernel/qplatformtheme.cpp

@@ -806,3 +806,5 @@ unsigned QPlatformThemePrivate::currentKeyPlatforms()
 }
 
 QT_END_NAMESPACE
+
+#include "moc_qplatformtheme.cpp"

src/gui/kernel/qplatformthemeplugin.cpp

@@ -60,3 +60,5 @@ QPlatformThemePlugin::~QPlatformThemePlugin()
 }
 
 QT_END_NAMESPACE
+
+#include "moc_qplatformthemeplugin.cpp"

src/gui/kernel/qpointingdevice.cpp

@@ -810,3 +810,5 @@ size_t qHash(QPointingDeviceUniqueId key, size_t seed) noexcept
 }
 
 QT_END_NAMESPACE
+
+#include "moc_qpointingdevice.cpp"

src/gui/kernel/qrasterwindow.cpp

@@ -139,3 +139,5 @@ QPaintDevice *QRasterWindow::redirected(QPoint *) const
 }
 
 QT_END_NAMESPACE
+
+#include "moc_qrasterwindow.cpp"

src/gui/kernel/qscreen.cpp

@@ -852,3 +852,5 @@ Q_GUI_EXPORT QDebug operator<<(QDebug debug, const QScreen *screen)
 #endif // !QT_NO_DEBUG_STREAM
 
 QT_END_NAMESPACE
+
+#include "moc_qscreen.cpp"

src/gui/kernel/qsessionmanager.cpp

@@ -420,4 +420,6 @@ void QSessionManager::requestPhase2()
 
 QT_END_NAMESPACE
 
+#include "moc_qsessionmanager.cpp"
+
 #endif // QT_NO_SESSIONMANAGER

src/gui/kernel/qshapedpixmapdndwindow.cpp

@@ -110,3 +110,5 @@ void QShapedPixmapWindow::updateGeometry(const QPoint &pos)
 }
 
 QT_END_NAMESPACE
+
+#include "moc_qshapedpixmapdndwindow_p.cpp"

src/gui/kernel/qstylehints.cpp

@@ -621,3 +621,5 @@ int QStyleHints::mouseQuickSelectionThreshold() const
 }
 
 QT_END_NAMESPACE
+
+#include "moc_qstylehints.cpp"

src/gui/kernel/qsurface.cpp

@@ -163,3 +163,5 @@ QSurface::SurfaceClass QSurface::surfaceClass() const
 
 QT_END_NAMESPACE
 
+#include "moc_qsurface.cpp"
+

src/gui/kernel/qsurfaceformat.cpp

@@ -900,3 +900,5 @@ QDebug operator<<(QDebug dbg, const QSurfaceFormat &f)
 #endif
 
 QT_END_NAMESPACE
+
+#include "moc_qsurfaceformat.cpp"

src/gui/painting/qbrush.cpp

@@ -2547,3 +2547,5 @@ void QConicalGradient::setAngle(qreal angle)
 */
 
 QT_END_NAMESPACE
+
+#include "moc_qbrush.cpp"

src/gui/painting/qcolorspace.cpp

@@ -1114,3 +1114,5 @@ QDebug operator<<(QDebug dbg, const QColorSpace &colorSpace)
 #endif
 
 QT_END_NAMESPACE
+
+#include "moc_qcolorspace.cpp"

src/gui/painting/qpainter.cpp

@@ -8170,3 +8170,5 @@ void qt_draw_helper(QPainterPrivate *p, const QPainterPath &path, QPainterPrivat
 }
 
 QT_END_NAMESPACE
+
+#include "moc_qpainter.cpp"

src/gui/painting/qpdfwriter.cpp

@@ -333,4 +333,6 @@ bool QPdfWriter::newPage()
 
 QT_END_NAMESPACE
 
+#include "moc_qpdfwriter.cpp"
+
 #endif // QT_NO_PDF

src/gui/painting/qplatformbackingstore.cpp

@@ -398,3 +398,5 @@ void QPlatformBackingStore::graphicsDeviceReportedLost()
 }
 
 QT_END_NAMESPACE
+
+#include "moc_qplatformbackingstore.cpp"

src/gui/platform/unix/dbusmenu/qdbusmenuadaptor.cpp

@@ -165,3 +165,5 @@ QDBusVariant QDBusMenuAdaptor::GetProperty(int id, const QString &name)
 }
 
 QT_END_NAMESPACE
+
+#include "moc_qdbusmenuadaptor_p.cpp"

src/gui/platform/unix/dbusmenu/qdbusmenubar.cpp

@@ -179,3 +179,5 @@ void QDBusMenuBar::unregisterMenuBar()
 }
 
 QT_END_NAMESPACE
+
+#include "moc_qdbusmenubar_p.cpp"

src/gui/platform/unix/dbusmenu/qdbusmenuconnection.cpp

@@ -146,3 +146,5 @@ void QDBusMenuConnection::unregisterTrayIcon(QDBusTrayIcon *item)
 #endif // QT_NO_SYSTEMTRAYICON
 
 QT_END_NAMESPACE
+
+#include "moc_qdbusmenuconnection_p.cpp"

src/gui/platform/unix/dbusmenu/qdbusmenuregistrarproxy.cpp

@@ -62,3 +62,5 @@ QDBusMenuRegistrarInterface::~QDBusMenuRegistrarInterface()
 }
 
 QT_END_NAMESPACE
+
+#include "moc_qdbusmenuregistrarproxy_p.cpp"

src/gui/platform/unix/dbusmenu/qdbusplatformmenu.cpp

@@ -306,3 +306,5 @@ QPlatformMenu *QDBusPlatformMenu::createSubMenu() const
 }
 
 QT_END_NAMESPACE
+
+#include "moc_qdbusplatformmenu_p.cpp"

src/gui/platform/unix/dbustray/qdbustrayicon.cpp

@@ -372,4 +372,6 @@ bool QDBusTrayIcon::isSystemTrayAvailable() const
 }
 
 QT_END_NAMESPACE
+
+#include "moc_qdbustrayicon_p.cpp"
 #endif //QT_NO_SYSTEMTRAYICON

src/gui/platform/unix/dbustray/qstatusnotifieritemadaptor.cpp

@@ -186,4 +186,6 @@ void QStatusNotifierItemAdaptor::SecondaryActivate(int x, int y)
 
 QT_END_NAMESPACE
 
+#include "moc_qstatusnotifieritemadaptor_p.cpp"
+
 #endif // QT_NO_SYSTEMTRAYICON

src/gui/platform/unix/dbustray/qxdgnotificationproxy.cpp

@@ -51,3 +51,5 @@ QXdgNotificationInterface::~QXdgNotificationInterface()
 }
 
 QT_END_NAMESPACE
+
+#include "moc_qxdgnotificationproxy_p.cpp"

src/gui/platform/unix/qeventdispatcher_glib.cpp

@@ -124,3 +124,5 @@ bool QPAEventDispatcherGlib::processEvents(QEventLoop::ProcessEventsFlags flags)
 }
 
 QT_END_NAMESPACE
+
+#include "moc_qeventdispatcher_glib_p.cpp"

src/gui/text/qfont.cpp

@@ -3350,3 +3350,5 @@ QDebug operator<<(QDebug stream, const QFont &font)
 #endif
 
 QT_END_NAMESPACE
+
+#include "moc_qfont.cpp"

src/gui/text/qfontdatabase.cpp

@@ -2635,3 +2635,5 @@ Q_GUI_EXPORT QStringList qt_sort_families_by_writing_system(QChar::Script script
 
 QT_END_NAMESPACE
 
+#include "moc_qfontdatabase.cpp"
+

src/gui/text/qinputcontrol.cpp

@@ -140,3 +140,5 @@ bool QInputControl::isCommonTextEditShortcut(const QKeyEvent *ke)
 }
 
 QT_END_NAMESPACE
+
+#include "moc_qinputcontrol_p.cpp"

src/gui/text/qtextdocument.cpp

@@ -3554,3 +3554,5 @@ QList<QTextFormat> QTextDocument::allFormats() const
 */
 
 QT_END_NAMESPACE
+
+#include "moc_qtextdocument.cpp"

src/gui/text/qtextformat.cpp

@@ -4055,3 +4055,5 @@ QDebug operator<<(QDebug dbg, const QTextFormat &f)
 #endif
 
 QT_END_NAMESPACE
+
+#include "moc_qtextformat.cpp"

src/gui/text/qtextimagehandler.cpp

@@ -229,3 +229,5 @@ void QTextImageHandler::drawObject(QPainter *p, const QRectF &rect, QTextDocumen
 }
 
 QT_END_NAMESPACE
+
+#include "moc_qtextimagehandler_p.cpp"

src/gui/text/qtextlist.cpp

@@ -308,3 +308,5 @@ void QTextList::add(const QTextBlock &block)
 }
 
 QT_END_NAMESPACE
+
+#include "moc_qtextlist.cpp"

src/gui/text/qtextobject.cpp

@@ -1792,3 +1792,5 @@ QString QTextFragment::text() const
 }
 
 QT_END_NAMESPACE
+
+#include "moc_qtextobject.cpp"

src/gui/text/qtexttable.cpp

@@ -1337,3 +1337,5 @@ void QTextTable::setFormat(const QTextTableFormat &format)
 */
 
 QT_END_NAMESPACE
+
+#include "moc_qtexttable.cpp"

src/gui/util/qlayoutpolicy.cpp

@@ -133,3 +133,5 @@ QDebug operator<<(QDebug dbg, const QLayoutPolicy &p)
 #endif
 
 QT_END_NAMESPACE
+
+#include "moc_qlayoutpolicy_p.cpp"

src/gui/util/qvalidator.cpp

@@ -1067,4 +1067,6 @@ void QRegularExpressionValidatorPrivate::setRegularExpression(const QRegularExpr
 
 QT_END_NAMESPACE
 
+#include "moc_qvalidator.cpp"
+
 #endif // QT_NO_VALIDATOR

src/gui/vulkan/qvulkanwindow.cpp

@@ -2797,3 +2797,5 @@ QMatrix4x4 QVulkanWindow::clipCorrectionMatrix()
 }
 
 QT_END_NAMESPACE
+
+#include "moc_qvulkanwindow.cpp"