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.

Manual conflict resolutions:
  - qbluetooth.h doesn't have the Q_NAMESPACE_NS(), yet
  - QNearFieldTargetPrivate wasn't a QObject, yet
    (why is it one now?!)

Fixes: QTBUG-103207
Change-Id: I1811aaef25fe4c1dbc66ebd2354cbf2308ede6dc
Reviewed-by: Ivan Solovev <ivan.solovev@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Juha Vuolle <juha.vuolle@insta.fi>
(cherry picked from commit 3f7cf949375458bc614c9961a44bfc712ed84872)

20 files changed, 42 insertions, 0 deletions

diff --git a/src/bluetooth/bluez/bluetoothmanagement.cpp b/src/bluetooth/bluez/bluetoothmanagement.cpp
index 8b99f1f2..f74d6611 100644
--- a/src/bluetooth/bluez/bluetoothmanagement.cpp
+++ b/src/bluetooth/bluez/bluetoothmanagement.cpp
@@ -313,3 +313,5 @@ bool BluetoothManagement::isMonitoringEnabled() const
 
 
 QT_END_NAMESPACE
+
+#include "moc_bluetoothmanagement_p.cpp"
diff --git a/src/bluetooth/bluez/bluez5_helper.cpp b/src/bluetooth/bluez/bluez5_helper.cpp
index 41ccdc4c..960dadfd 100644
--- a/src/bluetooth/bluez/bluez5_helper.cpp
+++ b/src/bluetooth/bluez/bluez5_helper.cpp
@@ -577,3 +577,5 @@ QString sanitizeNameForDBus(const QString &text)
 }
 
 QT_END_NAMESPACE
+
+#include "moc_bluez5_helper_p.cpp"
diff --git a/src/bluetooth/bluez/hcimanager.cpp b/src/bluetooth/bluez/hcimanager.cpp
index 82dc119f..df529b6e 100644
--- a/src/bluetooth/bluez/hcimanager.cpp
+++ b/src/bluetooth/bluez/hcimanager.cpp
@@ -599,3 +599,5 @@ void HciManager::handleLeMetaEvent(const quint8 *data)
 }
 
 QT_END_NAMESPACE
+
+#include "moc_hcimanager_p.cpp"
diff --git a/src/bluetooth/bluez/profile1context.cpp b/src/bluetooth/bluez/profile1context.cpp
index 772c9ee2..f0f3c291 100644
--- a/src/bluetooth/bluez/profile1context.cpp
+++ b/src/bluetooth/bluez/profile1context.cpp
@@ -70,3 +70,5 @@ void OrgBluezProfile1ContextInterface::Release()
 }
 
 QT_END_NAMESPACE
+
+#include "moc_profile1context_p.cpp"
diff --git a/src/bluetooth/bluez/remotedevicemanager.cpp b/src/bluetooth/bluez/remotedevicemanager.cpp
index a642be82..61230fbb 100644
--- a/src/bluetooth/bluez/remotedevicemanager.cpp
+++ b/src/bluetooth/bluez/remotedevicemanager.cpp
@@ -171,3 +171,5 @@ void RemoteDeviceManager::disconnectDevice(const QBluetoothAddress &remote)
 }
 
 QT_END_NAMESPACE
+
+#include "moc_remotedevicemanager_p.cpp"
diff --git a/src/bluetooth/qbluetoothdevicediscoveryagent_p.cpp b/src/bluetooth/qbluetoothdevicediscoveryagent_p.cpp
index 84629d77..9300c028 100644
--- a/src/bluetooth/qbluetoothdevicediscoveryagent_p.cpp
+++ b/src/bluetooth/qbluetoothdevicediscoveryagent_p.cpp
@@ -90,3 +90,5 @@ void QBluetoothDeviceDiscoveryAgentPrivate::stop()
 
 
 QT_END_NAMESPACE
+
+#include "moc_qbluetoothdevicediscoveryagent_p.cpp"
diff --git a/src/bluetooth/qbluetoothservicediscoveryagent_p.cpp b/src/bluetooth/qbluetoothservicediscoveryagent_p.cpp
index ec3a9b7f..86295728 100644
--- a/src/bluetooth/qbluetoothservicediscoveryagent_p.cpp
+++ b/src/bluetooth/qbluetoothservicediscoveryagent_p.cpp
@@ -73,3 +73,5 @@ void QBluetoothServiceDiscoveryAgentPrivate::stop()
 }
 
 QT_END_NAMESPACE
+
+#include "moc_qbluetoothservicediscoveryagent_p.cpp"
diff --git a/src/bluetooth/qbluetoothserviceinfo_p.cpp b/src/bluetooth/qbluetoothserviceinfo_p.cpp
index 4bacf537..bc3fade7 100644
--- a/src/bluetooth/qbluetoothserviceinfo_p.cpp
+++ b/src/bluetooth/qbluetoothserviceinfo_p.cpp
@@ -73,3 +73,5 @@ bool QBluetoothServiceInfoPrivate::unregisterService()
 }
 
 QT_END_NAMESPACE
+
+#include "moc_qbluetoothserviceinfo_p.cpp"
diff --git a/src/bluetooth/qbluetoothsocket_bluez.cpp b/src/bluetooth/qbluetoothsocket_bluez.cpp
index 2a0d77f2..f516629e 100644
--- a/src/bluetooth/qbluetoothsocket_bluez.cpp
+++ b/src/bluetooth/qbluetoothsocket_bluez.cpp
@@ -711,3 +711,5 @@ bool QBluetoothSocketPrivateBluez::canReadLine() const
 }
 
 QT_END_NAMESPACE
+
+#include "moc_qbluetoothsocket_bluez_p.cpp"
diff --git a/src/bluetooth/qbluetoothsocket_bluezdbus.cpp b/src/bluetooth/qbluetoothsocket_bluezdbus.cpp
index 1b644a6d..ca42f7fa 100644
--- a/src/bluetooth/qbluetoothsocket_bluezdbus.cpp
+++ b/src/bluetooth/qbluetoothsocket_bluezdbus.cpp
@@ -627,3 +627,5 @@ void QBluetoothSocketPrivateBluezDBus::clearSocket()
     profilePath.clear();
 }
 QT_END_NAMESPACE
+
+#include "moc_qbluetoothsocket_bluezdbus_p.cpp"
diff --git a/src/bluetooth/qbluetoothsocketbase.cpp b/src/bluetooth/qbluetoothsocketbase.cpp
index 65eb4f60..52459837 100644
--- a/src/bluetooth/qbluetoothsocketbase.cpp
+++ b/src/bluetooth/qbluetoothsocketbase.cpp
@@ -52,3 +52,5 @@ QBluetoothSocketBasePrivate::~QBluetoothSocketBasePrivate()
 }
 
 QT_END_NAMESPACE
+
+#include "moc_qbluetoothsocketbase_p.cpp"
diff --git a/src/bluetooth/qleadvertiser_bluez.cpp b/src/bluetooth/qleadvertiser_bluez.cpp
index 83641575..fa40a404 100644
--- a/src/bluetooth/qleadvertiser_bluez.cpp
+++ b/src/bluetooth/qleadvertiser_bluez.cpp
@@ -460,3 +460,5 @@ void QLeAdvertiserBluez::handleError()
 }
 
 QT_END_NAMESPACE
+
+#include "moc_qleadvertiser_bluez_p.cpp"
diff --git a/src/bluetooth/qlowenergycontroller.cpp b/src/bluetooth/qlowenergycontroller.cpp
index a0fbd1ca..2f04444c 100644
--- a/src/bluetooth/qlowenergycontroller.cpp
+++ b/src/bluetooth/qlowenergycontroller.cpp
@@ -928,3 +928,5 @@ QLowEnergyController::Role QLowEnergyController::role() const
 }
 
 QT_END_NAMESPACE
+
+#include "moc_qlowenergycontroller.cpp"
diff --git a/src/bluetooth/qlowenergycontroller_bluez.cpp b/src/bluetooth/qlowenergycontroller_bluez.cpp
index bc802f34..fcb497db 100644
--- a/src/bluetooth/qlowenergycontroller_bluez.cpp
+++ b/src/bluetooth/qlowenergycontroller_bluez.cpp
@@ -3543,3 +3543,5 @@ bool QLowEnergyControllerPrivateBluez::verifyMac(const QByteArray &message, cons
 }
 
 QT_END_NAMESPACE
+
+#include "moc_qlowenergycontroller_bluez_p.cpp"
diff --git a/src/bluetooth/qlowenergycontroller_bluezdbus.cpp b/src/bluetooth/qlowenergycontroller_bluezdbus.cpp
index 9849e3f8..5420cd8e 100644
--- a/src/bluetooth/qlowenergycontroller_bluezdbus.cpp
+++ b/src/bluetooth/qlowenergycontroller_bluezdbus.cpp
@@ -1305,3 +1305,5 @@ QLowEnergyService *QLowEnergyControllerPrivateBluezDBus::addServiceHelper(
 }
 
 QT_END_NAMESPACE
+
+#include "moc_qlowenergycontroller_bluezdbus_p.cpp"
diff --git a/src/bluetooth/qlowenergycontrollerbase.cpp b/src/bluetooth/qlowenergycontrollerbase.cpp
index 07c3b44b..04419993 100644
--- a/src/bluetooth/qlowenergycontrollerbase.cpp
+++ b/src/bluetooth/qlowenergycontrollerbase.cpp
@@ -329,3 +329,5 @@ QLowEnergyService *QLowEnergyControllerPrivate::addServiceHelper(
 }
 
 QT_END_NAMESPACE
+
+#include "moc_qlowenergycontrollerbase_p.cpp"
diff --git a/src/bluetooth/qlowenergyservice.cpp b/src/bluetooth/qlowenergyservice.cpp
index 66d4e4ee..d7c07816 100644
--- a/src/bluetooth/qlowenergyservice.cpp
+++ b/src/bluetooth/qlowenergyservice.cpp
@@ -836,3 +836,5 @@ void QLowEnergyService::writeDescriptor(const QLowEnergyDescriptor &descriptor,
 }
 
 QT_END_NAMESPACE
+
+#include "moc_qlowenergyservice.cpp"
diff --git a/src/bluetooth/qlowenergyserviceprivate.cpp b/src/bluetooth/qlowenergyserviceprivate.cpp
index 120606d0..beae6d16 100644
--- a/src/bluetooth/qlowenergyserviceprivate.cpp
+++ b/src/bluetooth/qlowenergyserviceprivate.cpp
@@ -83,3 +83,5 @@ void QLowEnergyServicePrivate::setState(QLowEnergyService::ServiceState newState
 }
 
 QT_END_NAMESPACE
+
+#include "moc_qlowenergyserviceprivate_p.cpp"
diff --git a/src/nfc/qnearfieldmanager.cpp b/src/nfc/qnearfieldmanager.cpp
index 92e32d46..e8bbd723 100644
--- a/src/nfc/qnearfieldmanager.cpp
+++ b/src/nfc/qnearfieldmanager.cpp
@@ -440,3 +440,7 @@ QNearFieldManager::TargetAccessModes QNearFieldManager::targetAccessModes() cons
 }
 
 QT_END_NAMESPACE
+
+#include "moc_qnearfieldmanager_p.cpp"
+
+#include "moc_qnearfieldmanager.cpp"
diff --git a/src/nfc/qnearfieldtarget.cpp b/src/nfc/qnearfieldtarget.cpp
index 932b8ef8..18e8fdde 100644
--- a/src/nfc/qnearfieldtarget.cpp
+++ b/src/nfc/qnearfieldtarget.cpp
@@ -551,3 +551,5 @@ void QNearFieldTarget::reportError(QNearFieldTarget::Error error,
 }
 
 QT_END_NAMESPACE
+
+#include "moc_qnearfieldtarget.cpp"