From afec50df6ff462f95406fe103e802a7eb974c76a Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Tue, 26 Jul 2022 19:49:04 -0700 Subject: Fix several more improperly placed #include moc Like commit qtbase/638893bea083b619b73b33a7dd5589fb2c4c4242. Script to find them: git grep -l '#include.*moc' \*.cpp \*.mm | \ xargs awk '/QT_BEGIN_NAMESPACE/ { i=1 } /QT_END_NAMESPACE/ { i=0 } /#include.*moc/ && i { print ARGV[ARGIND], $0 }' Change-Id: I6f936da6f6e84d649f70fffd17058fd05cfc5c6d Reviewed-by: Fabian Kosmale (cherry picked from commit a8ebadac593572601adff912ca12047c5a980371) Reviewed-by: Qt Cherry-pick Bot --- src/plugins/platforms/cocoa/qcocoabackingstore.mm | 4 ++-- src/plugins/platforms/cocoa/qcocoaclipboard.mm | 4 ++-- src/plugins/platforms/cocoa/qcocoascreen.mm | 4 ++-- src/plugins/platforms/cocoa/qcocoawindow.mm | 4 ++-- src/plugins/platforms/ios/qioscontext.mm | 4 ++-- src/plugins/platforms/ios/qiosintegration.mm | 4 ++-- src/plugins/platforms/ios/qiosscreen.mm | 4 ++-- src/plugins/platforms/ios/qioswindow.mm | 4 ++-- src/plugins/platforms/qnx/qqnxscreeneventhandler.cpp | 4 ++-- src/printsupport/kernel/qplatformprintplugin.cpp | 8 ++++---- src/printsupport/platform/macos/qcocoaprintersupport.mm | 4 ++-- src/printsupport/platform/windows/qwindowsprintersupport.cpp | 4 ++-- 12 files changed, 26 insertions(+), 26 deletions(-) diff --git a/src/plugins/platforms/cocoa/qcocoabackingstore.mm b/src/plugins/platforms/cocoa/qcocoabackingstore.mm index 5d8bd2b7bb..a3a25062c5 100644 --- a/src/plugins/platforms/cocoa/qcocoabackingstore.mm +++ b/src/plugins/platforms/cocoa/qcocoabackingstore.mm @@ -559,6 +559,6 @@ QImage *QCALayerBackingStore::GraphicsBuffer::asImage() return &m_image; } -#include "moc_qcocoabackingstore.cpp" - QT_END_NAMESPACE + +#include "moc_qcocoabackingstore.cpp" diff --git a/src/plugins/platforms/cocoa/qcocoaclipboard.mm b/src/plugins/platforms/cocoa/qcocoaclipboard.mm index 8b91e9d5d1..7363b011bf 100644 --- a/src/plugins/platforms/cocoa/qcocoaclipboard.mm +++ b/src/plugins/platforms/cocoa/qcocoaclipboard.mm @@ -68,8 +68,8 @@ void QCocoaClipboard::handleApplicationStateChanged(Qt::ApplicationState state) emitChanged(QClipboard::FindBuffer); } -#include "moc_qcocoaclipboard.cpp" - QT_END_NAMESPACE +#include "moc_qcocoaclipboard.cpp" + #endif // QT_NO_CLIPBOARD diff --git a/src/plugins/platforms/cocoa/qcocoascreen.mm b/src/plugins/platforms/cocoa/qcocoascreen.mm index 08cc22cdf3..ce8890d502 100644 --- a/src/plugins/platforms/cocoa/qcocoascreen.mm +++ b/src/plugins/platforms/cocoa/qcocoascreen.mm @@ -793,10 +793,10 @@ QDebug operator<<(QDebug debug, const QCocoaScreen *screen) } #endif // !QT_NO_DEBUG_STREAM -#include "qcocoascreen.moc" - QT_END_NAMESPACE +#include "qcocoascreen.moc" + @implementation NSScreen (QtExtras) - (CGDirectDisplayID)qt_displayId diff --git a/src/plugins/platforms/cocoa/qcocoawindow.mm b/src/plugins/platforms/cocoa/qcocoawindow.mm index f20aad6bb9..ef94b49736 100644 --- a/src/plugins/platforms/cocoa/qcocoawindow.mm +++ b/src/plugins/platforms/cocoa/qcocoawindow.mm @@ -1953,6 +1953,6 @@ QDebug operator<<(QDebug debug, const QCocoaWindow *window) } #endif // !QT_NO_DEBUG_STREAM -#include "moc_qcocoawindow.cpp" - QT_END_NAMESPACE + +#include "moc_qcocoawindow.cpp" diff --git a/src/plugins/platforms/ios/qioscontext.mm b/src/plugins/platforms/ios/qioscontext.mm index 9defb01bfa..1649089841 100644 --- a/src/plugins/platforms/ios/qioscontext.mm +++ b/src/plugins/platforms/ios/qioscontext.mm @@ -332,6 +332,6 @@ bool QIOSContext::isSharing() const return m_sharedContext; } -#include "moc_qioscontext.cpp" - QT_END_NAMESPACE + +#include "moc_qioscontext.cpp" diff --git a/src/plugins/platforms/ios/qiosintegration.mm b/src/plugins/platforms/ios/qiosintegration.mm index 7d04a84d86..84caccc267 100644 --- a/src/plugins/platforms/ios/qiosintegration.mm +++ b/src/plugins/platforms/ios/qiosintegration.mm @@ -287,6 +287,6 @@ void *QIOSIntegration::nativeResourceForWindow(const QByteArray &resource, QWind // --------------------------------------------------------- -#include "moc_qiosintegration.cpp" - QT_END_NAMESPACE + +#include "moc_qiosintegration.cpp" diff --git a/src/plugins/platforms/ios/qiosscreen.mm b/src/plugins/platforms/ios/qiosscreen.mm index 7ae28e1783..b8c4016d44 100644 --- a/src/plugins/platforms/ios/qiosscreen.mm +++ b/src/plugins/platforms/ios/qiosscreen.mm @@ -530,6 +530,6 @@ UIWindow *QIOSScreen::uiWindow() const return m_uiWindow; } -#include "moc_qiosscreen.cpp" - QT_END_NAMESPACE + +#include "moc_qiosscreen.cpp" diff --git a/src/plugins/platforms/ios/qioswindow.mm b/src/plugins/platforms/ios/qioswindow.mm index 240a2d9915..e88f5ab3d0 100644 --- a/src/plugins/platforms/ios/qioswindow.mm +++ b/src/plugins/platforms/ios/qioswindow.mm @@ -371,6 +371,6 @@ QDebug operator<<(QDebug debug, const QIOSWindow *window) } #endif // !QT_NO_DEBUG_STREAM -#include "moc_qioswindow.cpp" - QT_END_NAMESPACE + +#include "moc_qioswindow.cpp" diff --git a/src/plugins/platforms/qnx/qqnxscreeneventhandler.cpp b/src/plugins/platforms/qnx/qqnxscreeneventhandler.cpp index 2a2422f5cc..525b22242c 100644 --- a/src/plugins/platforms/qnx/qqnxscreeneventhandler.cpp +++ b/src/plugins/platforms/qnx/qqnxscreeneventhandler.cpp @@ -746,6 +746,6 @@ void QQnxScreenEventHandler::timerEvent(QTimerEvent *event) } } -#include "moc_qqnxscreeneventhandler.cpp" - QT_END_NAMESPACE + +#include "moc_qqnxscreeneventhandler.cpp" diff --git a/src/printsupport/kernel/qplatformprintplugin.cpp b/src/printsupport/kernel/qplatformprintplugin.cpp index 79aaa5bb3c..c48e5f65bf 100644 --- a/src/printsupport/kernel/qplatformprintplugin.cpp +++ b/src/printsupport/kernel/qplatformprintplugin.cpp @@ -10,16 +10,16 @@ #ifndef QT_NO_PRINTER -QT_BEGIN_NAMESPACE - -using namespace Qt::StringLiterals; - #if defined(Q_OS_MACOS) Q_IMPORT_PLUGIN(QCocoaPrinterSupportPlugin) #elif defined(Q_OS_WIN) Q_IMPORT_PLUGIN(QWindowsPrinterSupportPlugin) #endif +QT_BEGIN_NAMESPACE + +using namespace Qt::StringLiterals; + Q_GLOBAL_STATIC_WITH_ARGS(QFactoryLoader, loader, (QPlatformPrinterSupportFactoryInterface_iid, "/printsupport"_L1, Qt::CaseInsensitive)) diff --git a/src/printsupport/platform/macos/qcocoaprintersupport.mm b/src/printsupport/platform/macos/qcocoaprintersupport.mm index 3570255529..ed03e87f29 100644 --- a/src/printsupport/platform/macos/qcocoaprintersupport.mm +++ b/src/printsupport/platform/macos/qcocoaprintersupport.mm @@ -94,8 +94,8 @@ QPlatformPrinterSupport *QCocoaPrinterSupportPlugin::create(const QString &key) return new QCocoaPrinterSupport(); } -#include "qcocoaprintersupport.moc" - QT_END_NAMESPACE +#include "qcocoaprintersupport.moc" + #endif //QT_NO_PRINTER diff --git a/src/printsupport/platform/windows/qwindowsprintersupport.cpp b/src/printsupport/platform/windows/qwindowsprintersupport.cpp index db55573a0b..7cbd4dc491 100644 --- a/src/printsupport/platform/windows/qwindowsprintersupport.cpp +++ b/src/printsupport/platform/windows/qwindowsprintersupport.cpp @@ -69,8 +69,8 @@ QPlatformPrinterSupport *QWindowsPrinterSupportPlugin::create(const QString &key return nullptr; } -#include "qwindowsprintersupport.moc" - QT_END_NAMESPACE +#include "qwindowsprintersupport.moc" + #endif // QT_NO_PRINTER -- cgit v1.2.3