From a440a8e8c5d4d12cecee4c940d36efecdba20860 Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Tue, 25 Jan 2022 21:20:56 +0100 Subject: QtGui: includemocs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- src/gui/accessible/linux/atspiadaptor.cpp | 2 ++ src/gui/accessible/linux/dbusconnection.cpp | 2 ++ src/gui/accessible/linux/qspiaccessiblebridge.cpp | 2 ++ src/gui/accessible/linux/qspiapplicationadaptor.cpp | 2 ++ src/gui/accessible/linux/qspidbuscache.cpp | 2 ++ src/gui/accessible/qaccessiblebridge.cpp | 2 ++ src/gui/accessible/qaccessiblecache.cpp | 2 ++ src/gui/accessible/qaccessibleplugin.cpp | 2 ++ src/gui/image/qiconengineplugin.cpp | 2 ++ src/gui/image/qimage.cpp | 2 ++ src/gui/image/qimageiohandler.cpp | 2 ++ src/gui/kernel/qactiongroup.cpp | 2 ++ src/gui/kernel/qclipboard.cpp | 2 ++ src/gui/kernel/qdnd.cpp | 2 ++ src/gui/kernel/qdrag.cpp | 2 ++ src/gui/kernel/qevent.cpp | 2 ++ src/gui/kernel/qeventpoint.cpp | 2 ++ src/gui/kernel/qgenericplugin.cpp | 2 ++ src/gui/kernel/qhighdpiscaling.cpp | 2 ++ src/gui/kernel/qinputdevice.cpp | 2 ++ src/gui/kernel/qinputdevicemanager.cpp | 2 ++ src/gui/kernel/qinternalmimedata.cpp | 2 ++ src/gui/kernel/qkeymapper.cpp | 2 ++ src/gui/kernel/qkeysequence.cpp | 2 ++ src/gui/kernel/qoffscreensurface.cpp | 2 ++ src/gui/kernel/qpaintdevicewindow.cpp | 2 ++ src/gui/kernel/qpalette.cpp | 2 ++ src/gui/kernel/qplatformdialoghelper.cpp | 2 ++ src/gui/kernel/qplatformgraphicsbuffer.cpp | 2 ++ src/gui/kernel/qplatforminputcontext.cpp | 2 ++ src/gui/kernel/qplatforminputcontextplugin.cpp | 2 ++ src/gui/kernel/qplatformintegrationplugin.cpp | 2 ++ src/gui/kernel/qplatformmenu.cpp | 2 ++ src/gui/kernel/qplatformnativeinterface.cpp | 2 ++ src/gui/kernel/qplatformsharedgraphicscache.cpp | 2 ++ src/gui/kernel/qplatformtheme.cpp | 2 ++ src/gui/kernel/qplatformthemeplugin.cpp | 2 ++ src/gui/kernel/qpointingdevice.cpp | 2 ++ src/gui/kernel/qrasterwindow.cpp | 2 ++ src/gui/kernel/qscreen.cpp | 2 ++ src/gui/kernel/qsessionmanager.cpp | 2 ++ src/gui/kernel/qshapedpixmapdndwindow.cpp | 2 ++ src/gui/kernel/qstylehints.cpp | 2 ++ src/gui/kernel/qsurface.cpp | 2 ++ src/gui/kernel/qsurfaceformat.cpp | 2 ++ src/gui/painting/qbrush.cpp | 2 ++ src/gui/painting/qcolorspace.cpp | 2 ++ src/gui/painting/qpainter.cpp | 2 ++ src/gui/painting/qpdfwriter.cpp | 2 ++ src/gui/painting/qplatformbackingstore.cpp | 2 ++ src/gui/platform/unix/dbusmenu/qdbusmenuadaptor.cpp | 2 ++ src/gui/platform/unix/dbusmenu/qdbusmenubar.cpp | 2 ++ src/gui/platform/unix/dbusmenu/qdbusmenuconnection.cpp | 2 ++ src/gui/platform/unix/dbusmenu/qdbusmenuregistrarproxy.cpp | 2 ++ src/gui/platform/unix/dbusmenu/qdbusplatformmenu.cpp | 2 ++ src/gui/platform/unix/dbustray/qdbustrayicon.cpp | 2 ++ src/gui/platform/unix/dbustray/qstatusnotifieritemadaptor.cpp | 2 ++ src/gui/platform/unix/dbustray/qxdgnotificationproxy.cpp | 2 ++ src/gui/platform/unix/qeventdispatcher_glib.cpp | 2 ++ src/gui/text/qfont.cpp | 2 ++ src/gui/text/qfontdatabase.cpp | 2 ++ src/gui/text/qinputcontrol.cpp | 2 ++ src/gui/text/qtextdocument.cpp | 2 ++ src/gui/text/qtextformat.cpp | 2 ++ src/gui/text/qtextimagehandler.cpp | 2 ++ src/gui/text/qtextlist.cpp | 2 ++ src/gui/text/qtextobject.cpp | 2 ++ src/gui/text/qtexttable.cpp | 2 ++ src/gui/util/qlayoutpolicy.cpp | 2 ++ src/gui/util/qvalidator.cpp | 2 ++ src/gui/vulkan/qvulkanwindow.cpp | 2 ++ 71 files changed, 142 insertions(+) diff --git a/src/gui/accessible/linux/atspiadaptor.cpp b/src/gui/accessible/linux/atspiadaptor.cpp index d245bbdaaf..95df91d5ac 100644 --- a/src/gui/accessible/linux/atspiadaptor.cpp +++ b/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 diff --git a/src/gui/accessible/linux/dbusconnection.cpp b/src/gui/accessible/linux/dbusconnection.cpp index 8b56b71aac..8dde7b5cdd 100644 --- a/src/gui/accessible/linux/dbusconnection.cpp +++ b/src/gui/accessible/linux/dbusconnection.cpp @@ -179,3 +179,5 @@ QDBusConnection DBusConnection::connection() const } QT_END_NAMESPACE + +#include "moc_dbusconnection_p.cpp" diff --git a/src/gui/accessible/linux/qspiaccessiblebridge.cpp b/src/gui/accessible/linux/qspiaccessiblebridge.cpp index eaf40b3d78..5166079256 100644 --- a/src/gui/accessible/linux/qspiaccessiblebridge.cpp +++ b/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 diff --git a/src/gui/accessible/linux/qspiapplicationadaptor.cpp b/src/gui/accessible/linux/qspiapplicationadaptor.cpp index af333795a4..e9be3d0cf5 100644 --- a/src/gui/accessible/linux/qspiapplicationadaptor.cpp +++ b/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 diff --git a/src/gui/accessible/linux/qspidbuscache.cpp b/src/gui/accessible/linux/qspidbuscache.cpp index 8b90cd28e6..1e95eba948 100644 --- a/src/gui/accessible/linux/qspidbuscache.cpp +++ b/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 diff --git a/src/gui/accessible/qaccessiblebridge.cpp b/src/gui/accessible/qaccessiblebridge.cpp index c6a417e063..7c8a415493 100644 --- a/src/gui/accessible/qaccessiblebridge.cpp +++ b/src/gui/accessible/qaccessiblebridge.cpp @@ -138,4 +138,6 @@ QAccessibleBridgePlugin::~QAccessibleBridgePlugin() QT_END_NAMESPACE +#include "moc_qaccessiblebridge.cpp" + #endif // QT_NO_ACCESSIBILITY diff --git a/src/gui/accessible/qaccessiblecache.cpp b/src/gui/accessible/qaccessiblecache.cpp index 84d0936386..2a1952c229 100644 --- a/src/gui/accessible/qaccessiblecache.cpp +++ b/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 diff --git a/src/gui/accessible/qaccessibleplugin.cpp b/src/gui/accessible/qaccessibleplugin.cpp index 460d2d179a..07490703db 100644 --- a/src/gui/accessible/qaccessibleplugin.cpp +++ b/src/gui/accessible/qaccessibleplugin.cpp @@ -90,4 +90,6 @@ QAccessiblePlugin::~QAccessiblePlugin() QT_END_NAMESPACE +#include "moc_qaccessibleplugin.cpp" + #endif // QT_NO_ACCESSIBILITY diff --git a/src/gui/image/qiconengineplugin.cpp b/src/gui/image/qiconengineplugin.cpp index ca80ee50a7..74e9fcab6c 100644 --- a/src/gui/image/qiconengineplugin.cpp +++ b/src/gui/image/qiconengineplugin.cpp @@ -97,3 +97,5 @@ QIconEnginePlugin::~QIconEnginePlugin() QT_END_NAMESPACE + +#include "moc_qiconengineplugin.cpp" diff --git a/src/gui/image/qimage.cpp b/src/gui/image/qimage.cpp index 7fd0dc424f..3a384660ba 100644 --- a/src/gui/image/qimage.cpp +++ b/src/gui/image/qimage.cpp @@ -5720,3 +5720,5 @@ QMap qt_getImageTextFromDescription(const QString &description } QT_END_NAMESPACE + +#include "moc_qimage.cpp" diff --git a/src/gui/image/qimageiohandler.cpp b/src/gui/image/qimageiohandler.cpp index 8c74de4256..8f589cc9c1 100644 --- a/src/gui/image/qimageiohandler.cpp +++ b/src/gui/image/qimageiohandler.cpp @@ -652,3 +652,5 @@ QImageIOPlugin::~QImageIOPlugin() #endif // QT_NO_IMAGEFORMATPLUGIN QT_END_NAMESPACE + +#include "moc_qimageiohandler.cpp" diff --git a/src/gui/kernel/qactiongroup.cpp b/src/gui/kernel/qactiongroup.cpp index 33f9b54ddc..2c7b3dcfd5 100644 --- a/src/gui/kernel/qactiongroup.cpp +++ b/src/gui/kernel/qactiongroup.cpp @@ -360,3 +360,5 @@ bool QActionGroup::isVisible() const } QT_END_NAMESPACE + +#include "moc_qactiongroup.cpp" diff --git a/src/gui/kernel/qclipboard.cpp b/src/gui/kernel/qclipboard.cpp index 40a24af828..82a129673f 100644 --- a/src/gui/kernel/qclipboard.cpp +++ b/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 diff --git a/src/gui/kernel/qdnd.cpp b/src/gui/kernel/qdnd.cpp index fe766c900e..ecf8b3f4ce 100644 --- a/src/gui/kernel/qdnd.cpp +++ b/src/gui/kernel/qdnd.cpp @@ -123,3 +123,5 @@ Qt::DropAction QDragManager::drag(QDrag *o) } QT_END_NAMESPACE + +#include "moc_qdnd_p.cpp" diff --git a/src/gui/kernel/qdrag.cpp b/src/gui/kernel/qdrag.cpp index 330be0ac8a..3ec6c6d7c2 100644 --- a/src/gui/kernel/qdrag.cpp +++ b/src/gui/kernel/qdrag.cpp @@ -392,3 +392,5 @@ void QDrag::cancel() */ QT_END_NAMESPACE + +#include "moc_qdrag.cpp" diff --git a/src/gui/kernel/qevent.cpp b/src/gui/kernel/qevent.cpp index cadad0166f..60d32c7a55 100644 --- a/src/gui/kernel/qevent.cpp +++ b/src/gui/kernel/qevent.cpp @@ -4724,3 +4724,5 @@ QMutableSinglePointEvent::~QMutableSinglePointEvent() = default; QT_END_NAMESPACE + +#include "moc_qevent.cpp" diff --git a/src/gui/kernel/qeventpoint.cpp b/src/gui/kernel/qeventpoint.cpp index 62f3ecd975..4317dfbcdb 100644 --- a/src/gui/kernel/qeventpoint.cpp +++ b/src/gui/kernel/qeventpoint.cpp @@ -649,3 +649,5 @@ void QMutableEventPoint::setTimestamp(QEventPoint &p, ulong t) */ QT_END_NAMESPACE + +#include "moc_qeventpoint.cpp" diff --git a/src/gui/kernel/qgenericplugin.cpp b/src/gui/kernel/qgenericplugin.cpp index a53b60b008..7ecdc72d97 100644 --- a/src/gui/kernel/qgenericplugin.cpp +++ b/src/gui/kernel/qgenericplugin.cpp @@ -94,3 +94,5 @@ QGenericPlugin::~QGenericPlugin() */ QT_END_NAMESPACE + +#include "moc_qgenericplugin.cpp" diff --git a/src/gui/kernel/qhighdpiscaling.cpp b/src/gui/kernel/qhighdpiscaling.cpp index e77834eab8..0145eec689 100644 --- a/src/gui/kernel/qhighdpiscaling.cpp +++ b/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" diff --git a/src/gui/kernel/qinputdevice.cpp b/src/gui/kernel/qinputdevice.cpp index d522def79c..d903e80ad7 100644 --- a/src/gui/kernel/qinputdevice.cpp +++ b/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" diff --git a/src/gui/kernel/qinputdevicemanager.cpp b/src/gui/kernel/qinputdevicemanager.cpp index fee90ddf01..bc8671004f 100644 --- a/src/gui/kernel/qinputdevicemanager.cpp +++ b/src/gui/kernel/qinputdevicemanager.cpp @@ -120,3 +120,5 @@ void QInputDeviceManager::setKeyboardModifiers(Qt::KeyboardModifiers mods) } QT_END_NAMESPACE + +#include "moc_qinputdevicemanager_p.cpp" diff --git a/src/gui/kernel/qinternalmimedata.cpp b/src/gui/kernel/qinternalmimedata.cpp index a9c580c840..3ef2374004 100644 --- a/src/gui/kernel/qinternalmimedata.cpp +++ b/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" diff --git a/src/gui/kernel/qkeymapper.cpp b/src/gui/kernel/qkeymapper.cpp index 054d850dbb..dccf2a2216 100644 --- a/src/gui/kernel/qkeymapper.cpp +++ b/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" diff --git a/src/gui/kernel/qkeysequence.cpp b/src/gui/kernel/qkeysequence.cpp index 55f0cbc499..ec7420e178 100644 --- a/src/gui/kernel/qkeysequence.cpp +++ b/src/gui/kernel/qkeysequence.cpp @@ -1682,3 +1682,5 @@ QDebug operator<<(QDebug dbg, const QKeySequence &p) */ QT_END_NAMESPACE + +#include "moc_qkeysequence.cpp" diff --git a/src/gui/kernel/qoffscreensurface.cpp b/src/gui/kernel/qoffscreensurface.cpp index 5f97e50e71..4945da10f5 100644 --- a/src/gui/kernel/qoffscreensurface.cpp +++ b/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" diff --git a/src/gui/kernel/qpaintdevicewindow.cpp b/src/gui/kernel/qpaintdevicewindow.cpp index e5ab691450..04687d756a 100644 --- a/src/gui/kernel/qpaintdevicewindow.cpp +++ b/src/gui/kernel/qpaintdevicewindow.cpp @@ -229,3 +229,5 @@ QPaintEngine *QPaintDeviceWindow::paintEngine() const } QT_END_NAMESPACE + +#include "moc_qpaintdevicewindow.cpp" diff --git a/src/gui/kernel/qpalette.cpp b/src/gui/kernel/qpalette.cpp index 5a0bad9159..d07a1c1498 100644 --- a/src/gui/kernel/qpalette.cpp +++ b/src/gui/kernel/qpalette.cpp @@ -1279,3 +1279,5 @@ QDebug operator<<(QDebug dbg, const QPalette &p) #endif QT_END_NAMESPACE + +#include "moc_qpalette.cpp" diff --git a/src/gui/kernel/qplatformdialoghelper.cpp b/src/gui/kernel/qplatformdialoghelper.cpp index 621514ec04..08f9ab35b9 100644 --- a/src/gui/kernel/qplatformdialoghelper.cpp +++ b/src/gui/kernel/qplatformdialoghelper.cpp @@ -1009,3 +1009,5 @@ void QPlatformMessageDialogHelper::setOptions(const QSharedPointer QTextDocument::allFormats() const */ QT_END_NAMESPACE + +#include "moc_qtextdocument.cpp" diff --git a/src/gui/text/qtextformat.cpp b/src/gui/text/qtextformat.cpp index ce0c12fea2..b77615582f 100644 --- a/src/gui/text/qtextformat.cpp +++ b/src/gui/text/qtextformat.cpp @@ -4055,3 +4055,5 @@ QDebug operator<<(QDebug dbg, const QTextFormat &f) #endif QT_END_NAMESPACE + +#include "moc_qtextformat.cpp" diff --git a/src/gui/text/qtextimagehandler.cpp b/src/gui/text/qtextimagehandler.cpp index e6e1d8b164..f183e3d61a 100644 --- a/src/gui/text/qtextimagehandler.cpp +++ b/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" diff --git a/src/gui/text/qtextlist.cpp b/src/gui/text/qtextlist.cpp index 3a48e92414..894b89ad01 100644 --- a/src/gui/text/qtextlist.cpp +++ b/src/gui/text/qtextlist.cpp @@ -308,3 +308,5 @@ void QTextList::add(const QTextBlock &block) } QT_END_NAMESPACE + +#include "moc_qtextlist.cpp" diff --git a/src/gui/text/qtextobject.cpp b/src/gui/text/qtextobject.cpp index 2a45d12745..6c5826ed01 100644 --- a/src/gui/text/qtextobject.cpp +++ b/src/gui/text/qtextobject.cpp @@ -1792,3 +1792,5 @@ QString QTextFragment::text() const } QT_END_NAMESPACE + +#include "moc_qtextobject.cpp" diff --git a/src/gui/text/qtexttable.cpp b/src/gui/text/qtexttable.cpp index 8c186420fb..4d2cb48aac 100644 --- a/src/gui/text/qtexttable.cpp +++ b/src/gui/text/qtexttable.cpp @@ -1337,3 +1337,5 @@ void QTextTable::setFormat(const QTextTableFormat &format) */ QT_END_NAMESPACE + +#include "moc_qtexttable.cpp" diff --git a/src/gui/util/qlayoutpolicy.cpp b/src/gui/util/qlayoutpolicy.cpp index 507df44a45..063a220f94 100644 --- a/src/gui/util/qlayoutpolicy.cpp +++ b/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" diff --git a/src/gui/util/qvalidator.cpp b/src/gui/util/qvalidator.cpp index f604f38d9b..e05cdebfbb 100644 --- a/src/gui/util/qvalidator.cpp +++ b/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 diff --git a/src/gui/vulkan/qvulkanwindow.cpp b/src/gui/vulkan/qvulkanwindow.cpp index 310827dd06..ebd9e1e369 100644 --- a/src/gui/vulkan/qvulkanwindow.cpp +++ b/src/gui/vulkan/qvulkanwindow.cpp @@ -2797,3 +2797,5 @@ QMatrix4x4 QVulkanWindow::clipCorrectionMatrix() } QT_END_NAMESPACE + +#include "moc_qvulkanwindow.cpp" -- cgit v1.2.3