Clazy: fix src

Change-Id: I043882780fac7bed5d9dd75424ede46b54caa187
Reviewed-by: Dominik Holland <dominik.holland@qt.io>

44 files changed, 111 insertions, 92 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f00cf678..8b5fa6f2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -10,6 +10,11 @@ project(QtApplicationManager # special case
 )
 
 set(QT_NO_INTERNAL_COMPATIBILITY_FUNCTIONS TRUE)
+add_compile_definitions(
+    QT_STRICT_ITERATORS
+    QT_NO_CAST_TO_ASCII
+    QT_NO_CAST_FROM_ASCII
+)
 
 # populate the platform check variables
 find_package(Qt6 ${PROJECT_VERSION} CONFIG REQUIRED COMPONENTS BuildInternals)
diff --git a/src/common-lib/qtyaml.cpp b/src/common-lib/qtyaml.cpp
index 68e4a277..9e67cece 100644
--- a/src/common-lib/qtyaml.cpp
+++ b/src/common-lib/qtyaml.cpp
@@ -639,7 +639,7 @@ void YamlParser::parseFields(const std::vector<Field> &fields)
         }
     }
     QStringList fieldsMissing;
-    for (auto field : fields) {
+    for (const auto &field : fields) {
         if (field.required && !fieldsFound.contains(qL1S(field.name)))
             fieldsMissing.append(qL1S(field.name));
     }
diff --git a/src/common-lib/startuptimer.cpp b/src/common-lib/startuptimer.cpp
index 9e2d0029..3f179724 100644
--- a/src/common-lib/startuptimer.cpp
+++ b/src/common-lib/startuptimer.cpp
@@ -226,10 +226,9 @@ StartupTimer::StartupTimer()
 
     // Get system up time
     // Resource https://msdn.microsoft.com/en-us/library/windows/desktop/ms724411(v=vs.85).aspx
-    if (m_initialized) {
+    if (m_initialized)
         m_systemUpTime = GetTickCount64();
-        emit systemUpTimeChanged(m_systemUpTime);
-    }
+
 #elif defined(Q_OS_LINUX)
     // Linux is stupid: there's only one way to get your own process' start time with a high
     // resolution: using the async netlink protocol to get a 'taskstat', but this is highly complex
@@ -301,7 +300,6 @@ StartupTimer::StartupTimer()
             if (bytesRead > 0) {
                 buffer[bytesRead] = 0;
                 m_systemUpTime = quint64(strtod(buffer, nullptr) * 1000);
-                emit systemUpTimeChanged(m_systemUpTime);
             }
             QT_CLOSE(fd);
         }
@@ -338,7 +336,6 @@ StartupTimer::StartupTimer()
         int mibNames[2] = { CTL_KERN, KERN_BOOTTIME };
         if (sysctl(mibNames, sizeof(mibNames) / sizeof(mibNames[0]), &bootTime, &bootTimeLen, nullptr, 0) == 0 ) {
             m_systemUpTime = quint64(time(nullptr) - bootTime.tv_sec) * 1000; // we don't need more precision on macOS
-            emit systemUpTimeChanged(m_systemUpTime);
         }
     }
 
diff --git a/src/dbus-lib/dbuspolicy.cpp b/src/dbus-lib/dbuspolicy.cpp
index b07a8bf1..3f91407a 100644
--- a/src/dbus-lib/dbuspolicy.cpp
+++ b/src/dbus-lib/dbuspolicy.cpp
@@ -31,7 +31,6 @@
 
 #include <QDebug>
 #include <QFileInfo>
-#include <QPointer>
 #include <QDBusConnection>
 #include <QDBusConnectionInterface>
 #include <QDBusMessage>
@@ -53,7 +52,7 @@ struct DBusPolicyEntry
     QStringList m_capabilities;
 };
 
-static QMap<QPointer<QDBusAbstractAdaptor>, QMap<QByteArray, DBusPolicyEntry> > policies;
+static QHash<QDBusAbstractAdaptor *, QMap<QByteArray, DBusPolicyEntry> > policies;
 
 
 bool DBusPolicy::add(QDBusAbstractAdaptor *dbusAdaptor, const QVariantMap &yamlFragment)
@@ -93,7 +92,7 @@ bool DBusPolicy::add(QDBusAbstractAdaptor *dbusAdaptor, const QVariantMap &yamlF
         result.insert(func, dbp);
     }
 
-    policies.insert(QPointer<QDBusAbstractAdaptor>(dbusAdaptor), result);
+    policies.insert(dbusAdaptor, result);
     return true;
 }
 
@@ -116,7 +115,7 @@ bool DBusPolicy::check(QDBusAbstractAdaptor *dbusAdaptor, const QByteArray &func
     if (!dbusContext->calledFromDBus())
         return false;
 
-    auto ia = policies.constFind(QPointer<QDBusAbstractAdaptor>(dbusAdaptor));
+    auto ia = policies.constFind(dbusAdaptor);
     if (ia == policies.cend())
         return false;
 
diff --git a/src/dbus-lib/packagemanagerdbuscontextadaptor.cpp b/src/dbus-lib/packagemanagerdbuscontextadaptor.cpp
index f53acad8..1bc7c1f0 100644
--- a/src/dbus-lib/packagemanagerdbuscontextadaptor.cpp
+++ b/src/dbus-lib/packagemanagerdbuscontextadaptor.cpp
@@ -77,8 +77,8 @@ PackageManagerAdaptor::PackageManagerAdaptor(QObject *parent)
                          const QVariantMap &packageExtraSignedMetaData) {
         auto map = PackageManager::instance()->get(package);
         map.remove(qSL("package")); // cannot marshall QObject *
-        taskRequestingInstallationAcknowledge(taskId, map, packageExtraMetaData,
-                                              packageExtraSignedMetaData);
+        emit taskRequestingInstallationAcknowledge(taskId, map, packageExtraMetaData,
+                                                   packageExtraSignedMetaData);
     });
     connect(pm, &PackageManager::taskStarted,
             this, &PackageManagerAdaptor::taskStarted);
diff --git a/src/intent-client-lib/intentclient.cpp b/src/intent-client-lib/intentclient.cpp
index f10b44c0..1793d481 100644
--- a/src/intent-client-lib/intentclient.cpp
+++ b/src/intent-client-lib/intentclient.cpp
@@ -141,12 +141,9 @@ void IntentClient::registerHandler(IntentHandler *handler)
 
 void IntentClient::unregisterHandler(IntentHandler *handler)
 {
-    for (auto it = m_handlers.begin(); it != m_handlers.end(); ) {
-        if (it.value() == handler)
-            it = m_handlers.erase(it);
-        else
-            ++it;
-    }
+    m_handlers.erase(std::remove_if(m_handlers.begin(), m_handlers.end(),
+                                    [handler](const auto &h) { return h == handler; }),
+                     m_handlers.end());
 }
 
 /*! \qmlmethod IntentRequest IntentClient::sendIntentRequest(string intentId, var parameters)
@@ -224,7 +221,7 @@ void IntentClient::requestToSystemFinished(IntentClientRequest *icr, const QUuid
 void IntentClient::replyFromSystem(const QUuid &requestId, bool error, const QVariantMap &result)
 {
     IntentClientRequest *icr = nullptr;
-    auto it = std::find_if(m_waiting.begin(), m_waiting.end(),
+    auto it = std::find_if(m_waiting.cbegin(), m_waiting.cend(),
                            [requestId](IntentClientRequest *ir) -> bool {
             return (ir->requestId() == requestId);
     });
diff --git a/src/intent-client-lib/intentclientsysteminterface.h b/src/intent-client-lib/intentclientsysteminterface.h
index b7c7d086..e0c9ca89 100644
--- a/src/intent-client-lib/intentclientsysteminterface.h
+++ b/src/intent-client-lib/intentclientsysteminterface.h
@@ -58,8 +58,8 @@ public:
     virtual void replyFromApplication(QPointer<IntentClientRequest> icr) = 0;
 
 signals:
-    void requestToSystemFinished(QPointer<IntentClientRequest> icr, const QUuid &newRequestId,
-                                 bool error, const QString &errorMessage);
+    void requestToSystemFinished(QPointer<QT_PREPEND_NAMESPACE_AM(IntentClientRequest)> icr,
+                                 const QUuid &newRequestId, bool error, const QString &errorMessage);
     void replyFromSystem(const QUuid &requestId, bool error, const QVariantMap &result);
 
     void requestToApplication(const QUuid &requestId, const QString &intentId,
diff --git a/src/intent-client-lib/intenthandler.cpp b/src/intent-client-lib/intenthandler.cpp
index 5061f703..69fd44ec 100644
--- a/src/intent-client-lib/intenthandler.cpp
+++ b/src/intent-client-lib/intenthandler.cpp
@@ -124,7 +124,10 @@ void IntentHandler::setIntentIds(const QStringList &intentIds)
         qmlWarning(this) << "Cannot change the intentIds property of an IntentHandler after creation.";
         return;
     }
-    m_intentIds = intentIds;
+    if (m_intentIds != intentIds) {
+        m_intentIds = intentIds;
+        emit intentIdsChanged(intentIds);
+    }
 }
 
 void IntentHandler::componentComplete()
diff --git a/src/intent-client-lib/intenthandler.h b/src/intent-client-lib/intenthandler.h
index 47544ee5..c10b75a7 100644
--- a/src/intent-client-lib/intenthandler.h
+++ b/src/intent-client-lib/intenthandler.h
@@ -49,7 +49,7 @@ class IntentHandler : public QObject, public QQmlParserStatus
     Q_CLASSINFO("AM-QmlType", "QtApplicationManager.Application/IntentHandler 2.0")
 
     Q_INTERFACES(QQmlParserStatus)
-    Q_PROPERTY(QStringList intentIds READ intentIds WRITE setIntentIds)
+    Q_PROPERTY(QStringList intentIds READ intentIds WRITE setIntentIds NOTIFY intentIdsChanged)
 
 public:
     IntentHandler(QObject *parent = nullptr);
diff --git a/src/intent-server-lib/intentmodel.h b/src/intent-server-lib/intentmodel.h
index cbfb862d..8f40d0ae 100644
--- a/src/intent-server-lib/intentmodel.h
+++ b/src/intent-server-lib/intentmodel.h
@@ -63,7 +63,7 @@ public:
 
     Q_INVOKABLE int indexOfIntent(const QString &intentId, const QString &applicationId,
                                   const QVariantMap &parameters = {}) const;
-    Q_INVOKABLE int indexOfIntent(Intent *intent);
+    Q_INVOKABLE int indexOfIntent(QT_PREPEND_NAMESPACE_AM(Intent) *intent);
     Q_INVOKABLE int mapToSource(int ourIndex) const;
     Q_INVOKABLE int mapFromSource(int sourceIndex) const;
 
diff --git a/src/intent-server-lib/intentserver.cpp b/src/intent-server-lib/intentserver.cpp
index 60de93a6..a55862b3 100644
--- a/src/intent-server-lib/intentserver.cpp
+++ b/src/intent-server-lib/intentserver.cpp
@@ -529,13 +529,13 @@ void IntentServer::processRequestQueue()
 
             if (!isSignalConnected(QMetaMethod::fromSignal(&IntentServer::disambiguationRequest))) {
                 // If the System UI does not react to the signal, then just use the first match.
-                isr->setHandlingApplicationId(isr->potentialIntents().first()->packageId());
+                isr->setHandlingApplicationId(isr->potentialIntents().constFirst()->packageId());
             } else {
                 m_disambiguationQueue.enqueue(isr);
                 isr->setState(IntentServerRequest::State::WaitingForDisambiguation);
                 qCDebug(LogIntents) << "Waiting for disambiguation on intent" << isr->intentId();
                 if (m_disambiguationTimeout > 0) {
-                    QTimer::singleShot(m_disambiguationTimeout, [this, isr]() {
+                    QTimer::singleShot(m_disambiguationTimeout, this, [this, isr]() {
                         if (m_disambiguationQueue.removeOne(isr)) {
                             isr->setRequestFailed(qSL("Disambiguation timed out after %1 ms").arg(m_disambiguationTimeout));
                             enqueueRequest(isr);
@@ -559,7 +559,7 @@ void IntentServer::processRequestQueue()
             m_startingAppQueue.enqueue(isr);
             isr->setState(IntentServerRequest::State::WaitingForApplicationStart);
             if (m_startingAppTimeout > 0) {
-                QTimer::singleShot(m_startingAppTimeout, [this, isr]() {
+                QTimer::singleShot(m_startingAppTimeout, this, [this, isr]() {
                     if (m_startingAppQueue.removeOne(isr)) {
                         isr->setRequestFailed(qSL("Starting handler application timed out after %1 ms").arg(m_startingAppTimeout));
                         enqueueRequest(isr);
@@ -586,7 +586,7 @@ void IntentServer::processRequestQueue()
             m_sentToAppQueue.enqueue(isr);
             isr->setState(IntentServerRequest::State::WaitingForReplyFromApplication);
             if (m_sentToAppTimeout > 0) {
-                QTimer::singleShot(m_sentToAppTimeout, [this, isr]() {
+                QTimer::singleShot(m_sentToAppTimeout, this, [this, isr]() {
                     if (m_sentToAppQueue.removeOne(isr)) {
                         isr->setRequestFailed(qSL("Waiting for reply from handler application timed out after %1 ms").arg(m_sentToAppTimeout));
                         enqueueRequest(isr);
@@ -714,7 +714,7 @@ void IntentServer::applicationWasStarted(const QString &applicationId)
 {
     // check if any intent request is waiting for this app to start
     bool foundOne = false;
-    for (auto it = m_startingAppQueue.begin(); it != m_startingAppQueue.end(); ) {
+    for (auto it = m_startingAppQueue.cbegin(); it != m_startingAppQueue.cend(); ) {
         auto isr = *it;
         if (isr->handlingApplicationId() == applicationId) {
             qCDebug(LogIntents) << "Intent request" << isr->intentId()
diff --git a/src/intent-server-lib/intentserver.h b/src/intent-server-lib/intentserver.h
index 37bd1e2a..ddadc6dd 100644
--- a/src/intent-server-lib/intentserver.h
+++ b/src/intent-server-lib/intentserver.h
@@ -101,9 +101,10 @@ public:
                                                                const QVariantMap &parameters = QVariantMap{}) const;
     Q_INVOKABLE int indexOfIntent(const QString &intentId, const QString &applicationId,
                                   const QVariantMap &parameters = QVariantMap{}) const;
-    Q_INVOKABLE int indexOfIntent(Intent *intent);
+    Q_INVOKABLE int indexOfIntent(QT_PREPEND_NAMESPACE_AM(Intent) *intent);
 
-    Q_INVOKABLE void acknowledgeDisambiguationRequest(const QUuid &requestId, Intent *selectedIntent);
+    Q_INVOKABLE void acknowledgeDisambiguationRequest(const QUuid &requestId,
+                                                      QT_PREPEND_NAMESPACE_AM(Intent) *selectedIntent);
     Q_INVOKABLE void rejectDisambiguationRequest(const QUuid &requestId);
 
 signals:
diff --git a/src/main-lib/applicationinstaller.h b/src/main-lib/applicationinstaller.h
index c30270a2..29a0d6a0 100644
--- a/src/main-lib/applicationinstaller.h
+++ b/src/main-lib/applicationinstaller.h
@@ -60,8 +60,8 @@ class ApplicationInstaller : public QObject
     Q_PROPERTY(bool allowInstallationOfUnsignedPackages READ allowInstallationOfUnsignedPackages CONSTANT)
     Q_PROPERTY(bool developmentMode READ developmentMode CONSTANT)
 
-    Q_PROPERTY(bool applicationUserIdSeparation READ isApplicationUserIdSeparationEnabled)
-    Q_PROPERTY(uint commonApplicationGroupId READ commonApplicationGroupId)
+    Q_PROPERTY(bool applicationUserIdSeparation READ isApplicationUserIdSeparationEnabled CONSTANT)
+    Q_PROPERTY(uint commonApplicationGroupId READ commonApplicationGroupId CONSTANT)
 
 
 public:
diff --git a/src/main-lib/main.cpp b/src/main-lib/main.cpp
index 762088d9..4779ea6e 100644
--- a/src/main-lib/main.cpp
+++ b/src/main-lib/main.cpp
@@ -296,7 +296,7 @@ void Main::shutDown(int exitCode)
         m_windowManager->shutDown();
     }
 
-    QTimer::singleShot(5000, [exitCode] {
+    QTimer::singleShot(5000, this, [exitCode] {
         QStringList resources;
         if (!(down & ApplicationManagerDown))
             resources << qSL("runtimes");
diff --git a/src/main-lib/main.h b/src/main-lib/main.h
index b0b0b205..838962cb 100644
--- a/src/main-lib/main.h
+++ b/src/main-lib/main.h
@@ -74,7 +74,7 @@ class Configuration;
 class Main : public MainBase, protected SharedMain
 {
     Q_OBJECT
-    Q_PROPERTY(bool singleProcessMode READ isSingleProcessMode)
+    Q_PROPERTY(bool singleProcessMode READ isSingleProcessMode CONSTANT)
 
 public:
     Main(int &argc, char **argv);
diff --git a/src/manager-lib/abstractcontainer.h b/src/manager-lib/abstractcontainer.h
index 1fd4e6c0..c82e2730 100644
--- a/src/manager-lib/abstractcontainer.h
+++ b/src/manager-lib/abstractcontainer.h
@@ -91,7 +91,7 @@ class AbstractContainer : public QObject
     Q_OBJECT
     Q_CLASSINFO("AM-QmlType", "QtApplicationManager.SystemUI/Container 2.0 UNCREATABLE")
 
-    Q_PROPERTY(QString controlGroup READ controlGroup WRITE setControlGroup)
+    Q_PROPERTY(QString controlGroup READ controlGroup WRITE setControlGroup NOTIFY controlGroupChanged)
 
 public:
     virtual ~AbstractContainer();
@@ -120,7 +120,8 @@ signals:
     void ready();
     void memoryLowWarning();
     void memoryCriticalWarning();
-    void applicationChanged(Application *newApplication);
+    void applicationChanged(QT_PREPEND_NAMESPACE_AM(Application) *newApplication);
+    void controlGroupChanged(const QString &controlGroup);
 
 protected:
     explicit AbstractContainer(AbstractContainerManager *manager, Application *app);
diff --git a/src/manager-lib/abstractruntime.h b/src/manager-lib/abstractruntime.h
index e9f3b722..6ebe6573 100644
--- a/src/manager-lib/abstractruntime.h
+++ b/src/manager-lib/abstractruntime.h
@@ -102,7 +102,7 @@ class AbstractRuntime : public QObject
     Q_OBJECT
     Q_CLASSINFO("AM-QmlType", "QtApplicationManager.SystemUI/Runtime 2.0 UNCREATABLE")
 
-    Q_PROPERTY(AbstractContainer *container READ container)
+    Q_PROPERTY(AbstractContainer *container READ container CONSTANT)
 
 public:
     virtual ~AbstractRuntime();
@@ -141,7 +141,7 @@ signals:
     void finished(int exitCode, Am::ExitStatus status);
 
     // these signals are for in-process mode runtimes only
-    void inProcessSurfaceItemReady(QSharedPointer<InProcessSurfaceItem> window);
+    void inProcessSurfaceItemReady(QSharedPointer<QT_PREPEND_NAMESPACE_AM(InProcessSurfaceItem)> window);
 
 protected:
     explicit AbstractRuntime(AbstractContainer *container, Application *app, AbstractRuntimeManager *manager);
diff --git a/src/manager-lib/application.h b/src/manager-lib/application.h
index c05a3954..6e42cfb8 100644
--- a/src/manager-lib/application.h
+++ b/src/manager-lib/application.h
@@ -150,7 +150,7 @@ signals:
     void lastExitCodeChanged();
     void lastExitStatusChanged();
     void activated();
-    void stateChanged(State state);
+    void stateChanged(QT_PREPEND_NAMESPACE_AM(Application::State) state);
     void runStateChanged(QT_PREPEND_NAMESPACE_AM(Am::RunState) state);
     void blockedChanged(bool blocked);
 
diff --git a/src/manager-lib/applicationmanager.cpp b/src/manager-lib/applicationmanager.cpp
index 49ae29f7..7aff50ce 100644
--- a/src/manager-lib/applicationmanager.cpp
+++ b/src/manager-lib/applicationmanager.cpp
@@ -1072,7 +1072,7 @@ bool ApplicationManager::openUrl(const QString &urlStr)
 */
 void ApplicationManager::acknowledgeOpenUrlRequest(const QString &requestId, const QString &appId)
 {
-    for (auto it = d->openUrlRequests.begin(); it != d->openUrlRequests.end(); ++it) {
+    for (auto it = d->openUrlRequests.cbegin(); it != d->openUrlRequests.cend(); ++it) {
         if (it->requestId == requestId) {
             if (it->possibleAppIds.contains(appId)) {
                 try {
@@ -1101,7 +1101,7 @@ void ApplicationManager::acknowledgeOpenUrlRequest(const QString &requestId, con
 */
 void ApplicationManager::rejectOpenUrlRequest(const QString &requestId)
 {
-    for (auto it = d->openUrlRequests.begin(); it != d->openUrlRequests.end(); ++it) {
+    for (auto it = d->openUrlRequests.cbegin(); it != d->openUrlRequests.cend(); ++it) {
         if (it->requestId == requestId) {
             d->openUrlRequests.erase(it);
             break;
diff --git a/src/manager-lib/applicationmanager.h b/src/manager-lib/applicationmanager.h
index 7b028ab9..e67bf61c 100644
--- a/src/manager-lib/applicationmanager.h
+++ b/src/manager-lib/applicationmanager.h
@@ -120,10 +120,10 @@ public:
 
     int count() const;
     Q_INVOKABLE QVariantMap get(int index) const;
-    Q_INVOKABLE Application *application(int index) const;
-    Q_INVOKABLE Application *application(const QString &id) const;
+    Q_INVOKABLE QT_PREPEND_NAMESPACE_AM(Application) *application(int index) const;
+    Q_INVOKABLE QT_PREPEND_NAMESPACE_AM(Application) *application(const QString &id) const;
     Q_INVOKABLE int indexOfApplication(const QString &id) const;
-    Q_INVOKABLE int indexOfApplication(Application *application) const;
+    Q_INVOKABLE int indexOfApplication(QT_PREPEND_NAMESPACE_AM(Application) *application) const;
 
     Q_INVOKABLE void acknowledgeOpenUrlRequest(const QString &requestId, const QString &appId);
     Q_INVOKABLE void rejectOpenUrlRequest(const QString &requestId);
diff --git a/src/manager-lib/applicationmodel.h b/src/manager-lib/applicationmodel.h
index 3e2a7f4f..04bed28e 100644
--- a/src/manager-lib/applicationmodel.h
+++ b/src/manager-lib/applicationmodel.h
@@ -63,7 +63,7 @@ public:
     void setSortFunction(const QJSValue &callback);
 
     Q_INVOKABLE int indexOfApplication(const QString &id) const;
-    Q_INVOKABLE int indexOfApplication(Application *application) const;
+    Q_INVOKABLE int indexOfApplication(QT_PREPEND_NAMESPACE_AM(Application) *application) const;
     Q_INVOKABLE int mapToSource(int ourIndex) const;
     Q_INVOKABLE int mapFromSource(int sourceIndex) const;
 
diff --git a/src/manager-lib/nativeruntime.cpp b/src/manager-lib/nativeruntime.cpp
index 3b174e02..5de381fc 100644
--- a/src/manager-lib/nativeruntime.cpp
+++ b/src/manager-lib/nativeruntime.cpp
@@ -186,7 +186,7 @@ bool NativeRuntime::initialize()
             possibleLocations.append(qApp->property("_am_build_dir").toString() + qSL("/bin")); // set by main.cpp
             // if everything fails, try to locate it in $PATH
             const auto paths = qgetenv("PATH").split(QDir::listSeparator().toLatin1());
-            for (auto path : paths)
+            for (const auto &path : paths)
                 possibleLocations.append(QString::fromLocal8Bit(path));
         }
 
diff --git a/src/manager-lib/nativeruntime.h b/src/manager-lib/nativeruntime.h
index ca38b491..1b5fb342 100644
--- a/src/manager-lib/nativeruntime.h
+++ b/src/manager-lib/nativeruntime.h
@@ -86,9 +86,12 @@ signals:
     void aboutToStop(); // used for the ApplicationInterface
     void interfaceCreated(const QString &interfaceName);
 
-    void applicationConnectedToPeerDBus(const QDBusConnection &connection, Application *application);
-    void applicationReadyOnPeerDBus(const QDBusConnection &connection, Application *application);
-    void applicationDisconnectedFromPeerDBus(const QDBusConnection &connection, Application *application);
+    void applicationConnectedToPeerDBus(const QDBusConnection &connection,
+                                        QT_PREPEND_NAMESPACE_AM(Application) *application);
+    void applicationReadyOnPeerDBus(const QDBusConnection &connection,
+                                    QT_PREPEND_NAMESPACE_AM(Application) *application);
+    void applicationDisconnectedFromPeerDBus(const QDBusConnection &connection,
+                                             QT_PREPEND_NAMESPACE_AM(Application) *application);
 
 private slots:
     void onProcessStarted();
diff --git a/src/manager-lib/package.h b/src/manager-lib/package.h
index 54d5cd09..582cfe77 100644
--- a/src/manager-lib/package.h
+++ b/src/manager-lib/package.h
@@ -127,7 +127,7 @@ public:
 
 signals:
     void bulkChange();
-    void stateChanged(State state);
+    void stateChanged(QT_PREPEND_NAMESPACE_AM(Package::State) state);
     void blockedChanged(bool blocked);
     void applicationsChanged();
 
diff --git a/src/manager-lib/packagemanager.h b/src/manager-lib/packagemanager.h
index 08a045c3..8653cb0b 100644
--- a/src/manager-lib/packagemanager.h
+++ b/src/manager-lib/packagemanager.h
@@ -59,11 +59,15 @@ class PackageManagerInternalSignals : public QObject
 signals:
     // the slots connected to these signals are allowed to throw Exception objects, if the
     // connection is direct!
-    void registerApplication(ApplicationInfo *applicationInfo, Package *package);
-    void unregisterApplication(ApplicationInfo *applicationInfo, Package *package);
-
-    void registerIntent(IntentInfo *intentInfo, Package *package);
-    void unregisterIntent(IntentInfo *intentInfo, Package *package);
+    void registerApplication(QT_PREPEND_NAMESPACE_AM(ApplicationInfo) *applicationInfo,
+                             QT_PREPEND_NAMESPACE_AM(Package) *package);
+    void unregisterApplication(QT_PREPEND_NAMESPACE_AM(ApplicationInfo) *applicationInfo,
+                               QT_PREPEND_NAMESPACE_AM(Package) *package);
+
+    void registerIntent(QT_PREPEND_NAMESPACE_AM(IntentInfo) *intentInfo,
+                        QT_PREPEND_NAMESPACE_AM(Package) *package);
+    void unregisterIntent(QT_PREPEND_NAMESPACE_AM(IntentInfo) *intentInfo,
+                          QT_PREPEND_NAMESPACE_AM(Package) *package);
 };
 
 class PackageManager : public QAbstractListModel
@@ -81,8 +85,8 @@ class PackageManager : public QAbstractListModel
     Q_PROPERTY(QVariantMap installationLocation READ installationLocation CONSTANT)
     Q_PROPERTY(QVariantMap documentLocation READ documentLocation CONSTANT)
 
-    Q_PROPERTY(bool applicationUserIdSeparation READ isApplicationUserIdSeparationEnabled)
-    Q_PROPERTY(uint commonApplicationGroupId READ commonApplicationGroupId)
+    Q_PROPERTY(bool applicationUserIdSeparation READ isApplicationUserIdSeparationEnabled CONSTANT)
+    Q_PROPERTY(uint commonApplicationGroupId READ commonApplicationGroupId CONSTANT)
 
 public:
     Q_ENUMS(QT_PREPEND_NAMESPACE_AM(AsynchronousTask::TaskState))
@@ -115,8 +119,8 @@ public:
 
     int count() const;
     Q_INVOKABLE QVariantMap get(int index) const;
-    Q_INVOKABLE Package *package(int index) const;
-    Q_INVOKABLE Package *package(const QString &id) const;
+    Q_INVOKABLE QT_PREPEND_NAMESPACE_AM(Package) *package(int index) const;
+    Q_INVOKABLE QT_PREPEND_NAMESPACE_AM(Package) *package(const QString &id) const;
     Q_INVOKABLE int indexOfPackage(const QString &id) const;
 
     bool developmentMode() const;
@@ -180,7 +184,8 @@ signals:
                                        QT_PREPEND_NAMESPACE_AM(AsynchronousTask::TaskState) newState);
 
     // installation only
-    Q_SCRIPTABLE void taskRequestingInstallationAcknowledge(const QString &taskId, Package *package,
+    Q_SCRIPTABLE void taskRequestingInstallationAcknowledge(const QString &taskId,
+                                                            QT_PREPEND_NAMESPACE_AM(Package) *package,
                                                             const QVariantMap &packageExtraMetaData,
                                                             const QVariantMap &packageExtraSignedMetaData);
     Q_SCRIPTABLE void taskBlockingUntilInstallationAcknowledge(const QString &taskId);
diff --git a/src/manager-lib/processcontainer.cpp b/src/manager-lib/processcontainer.cpp
index c2455d40..e4d88897 100644
--- a/src/manager-lib/processcontainer.cpp
+++ b/src/manager-lib/processcontainer.cpp
@@ -222,6 +222,7 @@ bool ProcessContainer::setControlGroup(const QString &groupName)
             }
         }
         m_currentControlGroup = groupName;
+        emit controlGroupChanged(groupName);
         return true;
     }
     return false;
diff --git a/src/manager-lib/qmlinprocessapplicationmanagerwindow.cpp b/src/manager-lib/qmlinprocessapplicationmanagerwindow.cpp
index 605d6e1e..33232cad 100644
--- a/src/manager-lib/qmlinprocessapplicationmanagerwindow.cpp
+++ b/src/manager-lib/qmlinprocessapplicationmanagerwindow.cpp
@@ -146,6 +146,7 @@ void QmlInProcessApplicationManagerWindow::data_append(QQmlListProperty<QObject>
 
     QQmlListProperty<QObject> itemProperty = QQuickItemPrivate::get(that->contentItem())->data();
     itemProperty.append(&itemProperty, value);
+    emit that->dataChanged();
 }
 
 qsizetype QmlInProcessApplicationManagerWindow::data_count(QQmlListProperty<QObject> *property)
@@ -169,6 +170,7 @@ void QmlInProcessApplicationManagerWindow::data_clear(QQmlListProperty<QObject>
     auto *that = static_cast<QmlInProcessApplicationManagerWindow*>(property->object);
     QQmlListProperty<QObject> itemProperty = QQuickItemPrivate::get(that->contentItem())->data();
     itemProperty.clear(&itemProperty);
+    emit that->dataChanged();
 }
 
 void QmlInProcessApplicationManagerWindow::componentComplete()
diff --git a/src/manager-lib/qmlinprocessapplicationmanagerwindow.h b/src/manager-lib/qmlinprocessapplicationmanagerwindow.h
index 1390d517..8dd66a38 100644
--- a/src/manager-lib/qmlinprocessapplicationmanagerwindow.h
+++ b/src/manager-lib/qmlinprocessapplicationmanagerwindow.h
@@ -69,7 +69,7 @@ class QmlInProcessApplicationManagerWindow : public QObject, public QQmlParserSt
     //Q_PROPERTY(Qt::ScreenOrientation contentOrientation READ contentOrientation WRITE reportContentOrientationChange NOTIFY contentOrientationChanged)
     Q_PROPERTY(qreal opacity READ opacity WRITE setOpacity NOTIFY opacityChanged)
 
-    Q_PROPERTY(QQmlListProperty<QObject> data READ data)
+    Q_PROPERTY(QQmlListProperty<QObject> data READ data NOTIFY dataChanged)
 
     Q_CLASSINFO("DefaultProperty", "data")
 
@@ -150,6 +150,7 @@ public slots:
 signals:
     void windowPropertyChanged(const QString &name, const QVariant &value);
     void colorChanged();
+    void dataChanged();
 
     // signals for QWindow properties
     void titleChanged();
diff --git a/src/manager-lib/qmlinprocessruntime.h b/src/manager-lib/qmlinprocessruntime.h
index f89d86c8..bda54fd8 100644
--- a/src/manager-lib/qmlinprocessruntime.h
+++ b/src/manager-lib/qmlinprocessruntime.h
@@ -78,7 +78,7 @@ signals:
 
 private slots:
     void finish(int exitCode, Am::ExitStatus status);
-    void onSurfaceItemReleased(InProcessSurfaceItem*);
+    void onSurfaceItemReleased(QT_PREPEND_NAMESPACE_AM(InProcessSurfaceItem) *surface);
 
 private:
     static const char *s_runtimeKey;
diff --git a/src/monitor-lib/processreader.cpp b/src/monitor-lib/processreader.cpp
index f3a30378..9f4ba3d8 100644
--- a/src/monitor-lib/processreader.cpp
+++ b/src/monitor-lib/processreader.cpp
@@ -155,7 +155,6 @@ bool ProcessReader::readSmaps(const QByteArray &smapsFile, Memory &mem)
         return false;
 
     // sanity checks
-    pl = line;
     for (pl = line; pl < (line + 4) && ok; ++pl)
         ok = ((*pl >= '0' && *pl <= '9') || (*pl >= 'a' && *pl <= 'f'));
     while (strlen(line) == lineLen - 1 && line[lineLen - 2] != '\n') {
diff --git a/src/plugin-interfaces/containerinterface.h b/src/plugin-interfaces/containerinterface.h
index 01674044..7f96cb5d 100644
--- a/src/plugin-interfaces/containerinterface.h
+++ b/src/plugin-interfaces/containerinterface.h
@@ -96,9 +96,9 @@ public:
 Q_SIGNALS:
     void ready();
     void started();
-    void errorOccured(ProcessError processError);
-    void finished(int exitCode, ExitStatus exitStatus);
-    void stateChanged(RunState state);
+    void errorOccured(ContainerInterface::ProcessError processError);
+    void finished(int exitCode, ContainerInterface::ExitStatus exitStatus);
+    void stateChanged(ContainerInterface::RunState state);
 };
 
 class ContainerManagerInterface
diff --git a/src/shared-main-lib/monitormodel.cpp b/src/shared-main-lib/monitormodel.cpp
index 7aa7510f..d8e426ad 100644
--- a/src/shared-main-lib/monitormodel.cpp
+++ b/src/shared-main-lib/monitormodel.cpp
@@ -198,6 +198,7 @@ void MonitorModel::dataSources_clear(QQmlListProperty<QObject> *property)
 {
     auto *that = static_cast<MonitorModel*>(property->object);
     that->clearDataSources();
+    emit that->dataSourcesChanged();
 }
 
 void MonitorModel::clearDataSources()
diff --git a/src/shared-main-lib/monitormodel.h b/src/shared-main-lib/monitormodel.h
index 170f7aed..aa4f24d9 100644
--- a/src/shared-main-lib/monitormodel.h
+++ b/src/shared-main-lib/monitormodel.h
@@ -45,7 +45,7 @@ class MonitorModel : public QAbstractListModel
     Q_OBJECT
     Q_CLASSINFO("AM-QmlType", "QtApplicationManager/MonitorModel 2.0")
 
-    Q_PROPERTY(QQmlListProperty<QObject> dataSources READ dataSources)
+    Q_PROPERTY(QQmlListProperty<QObject> dataSources READ dataSources NOTIFY dataSourcesChanged)
     Q_CLASSINFO("DefaultProperty", "dataSources")
 
     Q_PROPERTY(int count READ count NOTIFY countChanged)
@@ -88,6 +88,7 @@ signals:
     void intervalChanged();
     void runningChanged();
     void maximumCountChanged();
+    void dataSourcesChanged();
 
 private slots:
     void readDataSourcesAndAddRow();
diff --git a/src/tools/controller/controller.cpp b/src/tools/controller/controller.cpp
index 70e338df..ed54efe4 100644
--- a/src/tools/controller/controller.cpp
+++ b/src/tools/controller/controller.cpp
@@ -608,7 +608,7 @@ void listApplications() Q_DECL_NOEXCEPT_EXPR(false)
         throw Exception(Error::IO, "failed to call applicationIds via DBus: %1").arg(reply.error().message());
 
     const auto applicationIds = reply.value();
-    for (auto applicationId : applicationIds)
+    for (const auto &applicationId : applicationIds)
         fprintf(stdout, "%s\n", qPrintable(applicationId));
     qApp->quit();
 }
@@ -638,7 +638,7 @@ void listPackages() Q_DECL_NOEXCEPT_EXPR(false)
         throw Exception(Error::IO, "failed to call packageIds via DBus: %1").arg(reply.error().message());
 
     const auto packageIds = reply.value();
-    for (auto packageId : packageIds)
+    for (const auto &packageId : packageIds)
         fprintf(stdout, "%s\n", qPrintable(packageId));
     qApp->quit();
 }
@@ -800,7 +800,7 @@ void listInstallationTasks() Q_DECL_NOEXCEPT_EXPR(false)
         throw Exception(Error::IO, "failed to call activeTaskIds via DBus: %1").arg(reply.error().message());
 
     const auto taskIds = reply.value();
-    for (auto taskId : taskIds)
+    for (const auto &taskId : taskIds)
         fprintf(stdout, "%s\n", qPrintable(taskId));
     qApp->quit();
 }
@@ -823,7 +823,7 @@ void cancelInstallationTask(bool all, const QString &taskId) Q_DECL_NOEXCEPT_EXP
             throw Exception(Error::IO, "failed to call activeTaskIds via DBus: %1").arg(reply.error().message());
 
         const auto taskIds = reply.value();
-        for (auto taskId : taskIds)
+        for (const auto &taskId : taskIds)
             cancelTaskIds << taskId;
     } else {
         cancelTaskIds << taskId;
@@ -862,7 +862,7 @@ void cancelInstallationTask(bool all, const QString &taskId) Q_DECL_NOEXCEPT_EXP
         }
     });
 
-    for (auto cancelTaskId : qAsConst(cancelTaskIds)) {
+    for (const auto &cancelTaskId : qAsConst(cancelTaskIds)) {
         fprintf(stdout, "Canceling installation task %s...\n", qPrintable(cancelTaskId));
 
         // cancel the task
diff --git a/src/tools/dumpqmltypes/dumpqmltypes.cpp b/src/tools/dumpqmltypes/dumpqmltypes.cpp
index cd07e342..46281070 100644
--- a/src/tools/dumpqmltypes/dumpqmltypes.cpp
+++ b/src/tools/dumpqmltypes/dumpqmltypes.cpp
@@ -285,7 +285,7 @@ int main(int argc, char **argv)
                 throw Exception("Qt's QML2 imports directory (%1) is missing.")
                     .arg(outDir.absolutePath());
         } else if (clp.positionalArguments().count() == 1) {
-            outDir.setPath(clp.positionalArguments().first());
+            outDir.setPath(clp.positionalArguments().constFirst());
             if (!outDir.mkpath(qSL(".")))
                 throw Exception("Cannot create destination directory %1.").arg(outDir.absolutePath());
         } else {
diff --git a/src/tools/launcher-qml/launcher-qml.cpp b/src/tools/launcher-qml/launcher-qml.cpp
index 8c89f32f..0352d2ff 100644
--- a/src/tools/launcher-qml/launcher-qml.cpp
+++ b/src/tools/launcher-qml/launcher-qml.cpp
@@ -597,7 +597,7 @@ void Controller::updateSlowAnimations(bool isSlow)
 {
     QUnifiedTimer::instance()->setSlowModeEnabled(isSlow);
 
-    for (auto it = m_allWindows.begin(); it != m_allWindows.end(); ) {
+    for (auto it = m_allWindows.cbegin(); it != m_allWindows.cend(); ) {
         QPointer<QQuickWindow> window = *it;
         if (!window) {
             m_allWindows.erase(it);
diff --git a/src/tools/packager/packager.cpp b/src/tools/packager/packager.cpp
index 62dca2e9..ec31c6a9 100644
--- a/src/tools/packager/packager.cpp
+++ b/src/tools/packager/packager.cpp
@@ -191,7 +191,7 @@ int main(int argc, char *argv[])
                                 .arg(isSigned ? "signed-" : "").arg(md.second.isEmpty() ? "": "-file")
                                 .arg(md.second.isEmpty() ? qSL("option") : md.second);
                     }
-                    for (auto doc : docs)
+                    for (const auto &doc : docs)
                         recursiveMergeVariantMap(result, doc.toMap());
                 }
                 return result;
diff --git a/src/tools/testrunner/amtest.h b/src/tools/testrunner/amtest.h
index 3c7217fd..0fe54e3b 100644
--- a/src/tools/testrunner/amtest.h
+++ b/src/tools/testrunner/amtest.h
@@ -51,8 +51,8 @@ public:
 
     int timeoutFactor() const;
 
-    Q_INVOKABLE void ignoreMessage(MsgType type, const char* msg);
-    Q_INVOKABLE void ignoreMessage(MsgType type, const QRegularExpression &expression);
+    Q_INVOKABLE void ignoreMessage(QT_PREPEND_NAMESPACE_AM(AmTest::MsgType) type, const char* msg);
+    Q_INVOKABLE void ignoreMessage(QT_PREPEND_NAMESPACE_AM(AmTest::MsgType) type, const QRegularExpression &expression);
     Q_INVOKABLE int observeObjectDestroyed(QObject *obj);
     Q_INVOKABLE void aboutToBlock();
 #if defined(Q_OS_LINUX)
diff --git a/src/tools/uploader/uploader.cpp b/src/tools/uploader/uploader.cpp
index 03f425ef..8a7f54a6 100644
--- a/src/tools/uploader/uploader.cpp
+++ b/src/tools/uploader/uploader.cpp
@@ -155,7 +155,7 @@ int main(int argc, char *argv[])
     QHttpPart packagePart;
     packagePart.setHeader(QNetworkRequest::ContentTypeHeader, qSL("application/octet-stream"));
     packagePart.setHeader(QNetworkRequest::ContentDispositionHeader, qSL("form-data; name=\"package\";filename=\"package.appkg\""));
-    QFile *packageFile = new QFile(clp.positionalArguments().first());
+    QFile *packageFile = new QFile(clp.positionalArguments().constFirst());
     if (!packageFile->open(QIODevice::ReadOnly))
         printErrorAndExit(packageFile->errorString(), 3);
     packagePart.setBodyDevice(packageFile);
diff --git a/src/window-lib/touchemulation_x11.cpp b/src/window-lib/touchemulation_x11.cpp
index d7e248d5..db72906f 100644
--- a/src/window-lib/touchemulation_x11.cpp
+++ b/src/window-lib/touchemulation_x11.cpp
@@ -184,7 +184,7 @@ bool TouchEmulationX11::nativeEventFilter(const QByteArray &eventType, void *mes
                             fixed1616ToReal(xiDeviceEvent->event_y));
                 break;
             case XI_Motion:
-                result = handleMotionNotify(
+                handleMotionNotify(
                             static_cast<WId>(xiDeviceEvent->event),
                             xiDeviceEvent->mods.base_mods,
                             fixed1616ToReal(xiDeviceEvent->event_x),
diff --git a/src/window-lib/windowitem.cpp b/src/window-lib/windowitem.cpp
index d7736b52..87209a7b 100644
--- a/src/window-lib/windowitem.cpp
+++ b/src/window-lib/windowitem.cpp
@@ -292,6 +292,7 @@ void WindowItem::contentItemData_append(QQmlListProperty<QObject> *property, QOb
 
     QQmlListProperty<QObject> itemProperty = QQuickItemPrivate::get(that->m_contentItem)->data();
     itemProperty.append(&itemProperty, value);
+    emit that->contentItemDataChanged();
 }
 
 qsizetype WindowItem::contentItemData_count(QQmlListProperty<QObject> *property)
@@ -315,6 +316,7 @@ void WindowItem::contentItemData_clear(QQmlListProperty<QObject> *property)
     auto *that = static_cast<WindowItem*>(property->object);
     QQmlListProperty<QObject> itemProperty = QQuickItemPrivate::get(that->m_contentItem)->data();
     itemProperty.clear(&itemProperty);
+    emit that->contentItemDataChanged();
 }
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/src/window-lib/windowitem.h b/src/window-lib/windowitem.h
index c18232ee..1e980f74 100644
--- a/src/window-lib/windowitem.h
+++ b/src/window-lib/windowitem.h
@@ -58,7 +58,7 @@ class WindowItem : public QQuickItem
                                           WRITE setObjectFollowsItemSize
                                           NOTIFY objectFollowsItemSizeChanged)
 
-    Q_PROPERTY(QQmlListProperty<QObject> contentItemData READ contentItemData)
+    Q_PROPERTY(QQmlListProperty<QObject> contentItemData READ contentItemData NOTIFY contentItemDataChanged)
     Q_CLASSINFO("DefaultProperty", "contentItemData")
 
 public:
@@ -87,6 +87,8 @@ signals:
     void windowChanged();
     void primaryChanged();
     void objectFollowsItemSizeChanged();
+    void contentItemDataChanged();
+
 private slots:
     void updateImplicitSize();
 private:
diff --git a/src/window-lib/windowmanager.cpp b/src/window-lib/windowmanager.cpp
index 8f055b74..76b501b8 100644
--- a/src/window-lib/windowmanager.cpp
+++ b/src/window-lib/windowmanager.cpp
@@ -978,10 +978,9 @@ bool WindowManager::makeScreenshot(const QString &filename, const QString &selec
 
         // filter out alias and apps not matching appId (if set)
         QVector<Application *> apps = ApplicationManager::instance()->applications();
-        auto it = std::remove_if(apps.begin(), apps.end(), [appId](Application *app) {
+        apps.erase(std::remove_if(apps.begin(), apps.end(), [appId](const Application *app) {
             return app->isAlias() || (!appId.isEmpty() && (appId != app->id()));
-        });
-        apps.erase(it, apps.end());
+        }), apps.end());
 
         auto grabbers = new QList<QSharedPointer<const QQuickItemGrabResult>>;
 
diff --git a/src/window-lib/windowmanager.h b/src/window-lib/windowmanager.h
index 9f3f8e1c..57a13966 100644
--- a/src/window-lib/windowmanager.h
+++ b/src/window-lib/windowmanager.h
@@ -90,9 +90,9 @@ public:
 
     Q_INVOKABLE int count() const;
     Q_INVOKABLE QVariantMap get(int index) const;
-    Q_INVOKABLE Window *window(int index) const;
+    Q_INVOKABLE QT_PREPEND_NAMESPACE_AM(Window) *window(int index) const;
     Q_INVOKABLE QList<QObject *> windowsOfApplication(const QString &id) const;
-    Q_INVOKABLE int indexOfWindow(Window *window) const;
+    Q_INVOKABLE int indexOfWindow(QT_PREPEND_NAMESPACE_AM(Window) *window) const;
     Q_INVOKABLE QObject *addExtension(QQmlComponent *component) const;
 
     bool eventFilter(QObject *watched, QEvent *event) override;
@@ -101,11 +101,11 @@ signals:
     void countChanged();
     void raiseApplicationWindow(const QString &applicationId, const QString &applicationAliasId);
 
-    void windowAdded(Window *window);
-    void windowAboutToBeRemoved(Window *window);
-    void windowContentStateChanged(Window *window);
+    void windowAdded(QT_PREPEND_NAMESPACE_AM(Window) *window);
+    void windowAboutToBeRemoved(QT_PREPEND_NAMESPACE_AM(Window) *window);
+    void windowContentStateChanged(QT_PREPEND_NAMESPACE_AM(Window) *window);
 
-    void windowPropertyChanged(Window *window, const QString &name, const QVariant &value);
+    void windowPropertyChanged(QT_PREPEND_NAMESPACE_AM(Window) *window, const QString &name, const QVariant &value);
 
     void compositorViewRegistered(QQuickWindow *view);
 
@@ -113,10 +113,10 @@ signals:
 
     void slowAnimationsChanged(bool);
 
-    void _inProcessSurfaceItemReleased(QSharedPointer<InProcessSurfaceItem>);
+    void _inProcessSurfaceItemReleased(QSharedPointer<QT_PREPEND_NAMESPACE_AM(InProcessSurfaceItem)>);
 
 private slots:
-    void inProcessSurfaceItemCreated(QSharedPointer<InProcessSurfaceItem> surfaceItem);
+    void inProcessSurfaceItemCreated(QSharedPointer<QT_PREPEND_NAMESPACE_AM(InProcessSurfaceItem)> surfaceItem);
     void setupWindow(QT_PREPEND_NAMESPACE_AM(Window) *window);
 
 public: