From 7d4b480be360d3d25f059c6edbef7d2e7f74da8f Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Tue, 25 Jan 2022 21:20:56 +0100 Subject: QtDBus: 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: Id5892f146f9792a0c5c8df24c7750a4089b07c6e Reviewed-by: Thiago Macieira --- src/dbus/qdbusabstractadaptor.cpp | 3 +++ src/dbus/qdbusconnection.cpp | 4 ++++ src/dbus/qdbusconnectioninterface.cpp | 2 ++ src/dbus/qdbuserror.cpp | 2 ++ src/dbus/qdbuspendingcall.cpp | 2 ++ src/dbus/qdbusvirtualobject.cpp | 1 + 6 files changed, 14 insertions(+) (limited to 'src/dbus') diff --git a/src/dbus/qdbusabstractadaptor.cpp b/src/dbus/qdbusabstractadaptor.cpp index d048ae2e52..5cb7f7ac0a 100644 --- a/src/dbus/qdbusabstractadaptor.cpp +++ b/src/dbus/qdbusabstractadaptor.cpp @@ -335,4 +335,7 @@ void QDBusAdaptorConnector::relay(QObject *senderObj, int lastSignalIdx, void ** QT_END_NAMESPACE +#include "moc_qdbusabstractadaptor_p.cpp" +#include "moc_qdbusabstractadaptor.cpp" + #endif // QT_NO_DBUS diff --git a/src/dbus/qdbusconnection.cpp b/src/dbus/qdbusconnection.cpp index ed0539b27c..43bdec169b 100644 --- a/src/dbus/qdbusconnection.cpp +++ b/src/dbus/qdbusconnection.cpp @@ -1255,6 +1255,10 @@ QByteArray QDBusConnection::localMachineId() QT_END_NAMESPACE +#include "moc_qdbusconnection_p.cpp" +#include "moc_qdbusconnection.cpp" +#include "moc_qdbusconnectionmanager_p.cpp" + #ifdef Q_OS_WIN # include diff --git a/src/dbus/qdbusconnectioninterface.cpp b/src/dbus/qdbusconnectioninterface.cpp index 340c843120..94a67d6f7c 100644 --- a/src/dbus/qdbusconnectioninterface.cpp +++ b/src/dbus/qdbusconnectioninterface.cpp @@ -444,4 +444,6 @@ void QDBusConnectionInterface::disconnectNotify(const QMetaMethod &signal) QT_END_NAMESPACE +#include "moc_qdbusconnectioninterface.cpp" + #endif // QT_NO_DBUS diff --git a/src/dbus/qdbuserror.cpp b/src/dbus/qdbuserror.cpp index 9d1c696f31..e466f2027c 100644 --- a/src/dbus/qdbuserror.cpp +++ b/src/dbus/qdbuserror.cpp @@ -356,6 +356,8 @@ QDebug operator<<(QDebug dbg, const QDBusError &msg) QT_END_NAMESPACE +#include "moc_qdbuserror.cpp" + #endif // QT_NO_DBUS /* diff --git a/src/dbus/qdbuspendingcall.cpp b/src/dbus/qdbuspendingcall.cpp index eb9b21a911..bb1fd4ec60 100644 --- a/src/dbus/qdbuspendingcall.cpp +++ b/src/dbus/qdbuspendingcall.cpp @@ -546,6 +546,8 @@ void QDBusPendingCallWatcher::waitForFinished() } QT_END_NAMESPACE +#include "moc_qdbuspendingcall_p.cpp" + #endif // QT_NO_DBUS #include "moc_qdbuspendingcall.cpp" diff --git a/src/dbus/qdbusvirtualobject.cpp b/src/dbus/qdbusvirtualobject.cpp index 25dd49c34d..ef7fbe8ff2 100644 --- a/src/dbus/qdbusvirtualobject.cpp +++ b/src/dbus/qdbusvirtualobject.cpp @@ -60,6 +60,7 @@ QDBusVirtualObject::~QDBusVirtualObject() QT_END_NAMESPACE +#include "moc_qdbusvirtualobject.cpp" /*! \class QDBusVirtualObject -- cgit v1.2.3