Clazy: fixes

Change-Id: I2f9f0245e1d0ac0c6ee618a0c90f31aaa1465e93
Pick-to: 6.7
Reviewed-by: Dominik Holland <dominik.holland@qt.io>

7 files changed, 31 insertions, 28 deletions

diff --git a/src/window-lib/inprocesswindow.cpp b/src/window-lib/inprocesswindow.cpp
index 842916a3..06b6129a 100644
--- a/src/window-lib/inprocesswindow.cpp
+++ b/src/window-lib/inprocesswindow.cpp
@@ -62,7 +62,7 @@ void InProcessWindow::setContentState(ContentState newState)
 
 QSize InProcessWindow::size() const
 {
-    return QSize(m_surfaceItem->width(), m_surfaceItem->height());
+    return m_surfaceItem->size().toSize();
 }
 
 void InProcessWindow::resize(const QSize &size)
diff --git a/src/window-lib/inprocesswindow.h b/src/window-lib/inprocesswindow.h
index c8d9a5d3..f63914e0 100644
--- a/src/window-lib/inprocesswindow.h
+++ b/src/window-lib/inprocesswindow.h
@@ -19,7 +19,7 @@ class InProcessWindow : public Window
 
 public:
     InProcessWindow(Application *app, const QSharedPointer<InProcessSurfaceItem> &surfaceItem);
-    virtual ~InProcessWindow();
+    ~InProcessWindow() override;
 
     bool isInProcess() const override { return true; }
 
diff --git a/src/window-lib/waylandcompositor.cpp b/src/window-lib/waylandcompositor.cpp
index 0dc06dc6..e68ef951 100644
--- a/src/window-lib/waylandcompositor.cpp
+++ b/src/window-lib/waylandcompositor.cpp
@@ -227,7 +227,7 @@ void WaylandCompositor::createWlSurface(QWaylandSurface *surface, const QWayland
 
     connect(windowSurface, &QWaylandSurface::hasContentChanged, this, [this, windowSurface]() {
         if (windowSurface->hasContent())
-            emit this->surfaceMapped(static_cast<WindowSurface*>(windowSurface));
+            emit surfaceMapped(windowSurface);
     });
 }
 
diff --git a/src/window-lib/waylandqtamserverextension.cpp b/src/window-lib/waylandqtamserverextension.cpp
index 591c0833..a6c17204 100644
--- a/src/window-lib/waylandqtamserverextension.cpp
+++ b/src/window-lib/waylandqtamserverextension.cpp
@@ -59,7 +59,7 @@ bool WaylandQtAMServerExtension::setWindowPropertyHelper(QWaylandSurface *surfac
 
 void WaylandQtAMServerExtension::qtam_extension_set_window_property(QtWaylandServer::qtam_extension::Resource *resource, wl_resource *surface_resource, const QString &name, wl_array *value)
 {
-    Q_UNUSED(resource);
+    Q_UNUSED(resource)
     QWaylandSurface *surface = QWaylandSurface::fromResource(surface_resource);
     const QByteArray byteValue(static_cast<const char *>(value->data), static_cast<int>(value->size));
     QDataStream ds(byteValue);
diff --git a/src/window-lib/window.h b/src/window-lib/window.h
index 3d9daa57..27c50c36 100644
--- a/src/window-lib/window.h
+++ b/src/window-lib/window.h
@@ -41,7 +41,7 @@ public:
     Q_ENUM(ContentState)
 
     Window(Application *app);
-    virtual ~Window();
+    ~Window() override;
 
     virtual bool isInProcess() const = 0;
     virtual Application *application() const;
diff --git a/src/window-lib/windowitem.h b/src/window-lib/windowitem.h
index 0f994597..aca03db1 100644
--- a/src/window-lib/windowitem.h
+++ b/src/window-lib/windowitem.h
@@ -42,7 +42,7 @@ class WindowItem : public QQuickFocusScope
 
 public:
     WindowItem(QQuickItem *parent = nullptr);
-    ~WindowItem();
+    ~WindowItem() override;
 
     Window *window() const;
     void setWindow(Window *window);
@@ -69,7 +69,7 @@ protected:
     void geometryChange(const QRectF &newGeometry, const QRectF &oldGeometry) override;
 
 signals:
-    void windowChanged();
+    void windowChanged(); // clazy:exclude=overloaded-signal
     void primaryChanged();
     void objectFollowsItemSizeChanged();
     void contentItemDataChanged();
@@ -79,7 +79,8 @@ private slots:
 private:
     void createImpl(bool inProcess);
 
-    struct Impl {
+    struct Impl
+    {
         Impl(WindowItem *windowItem) : q(windowItem) {}
         virtual ~Impl() {}
         virtual void setup(Window *window) = 0;
@@ -94,9 +95,12 @@ private:
         virtual void setFocusOnClick(bool focusOnClick) = 0;
         virtual QQuickItem *backingItem() = 0;
         WindowItem *q;
+
+        Q_DISABLE_COPY_MOVE(Impl)
     };
 
-    struct InProcessImpl : public Impl {
+    struct InProcessImpl : public Impl
+    {
         InProcessImpl(WindowItem *windowItem) : Impl(windowItem) {}
         void setup(Window *window) override;
         void tearDown() override;
@@ -115,9 +119,10 @@ private:
     };
 
 #if QT_CONFIG(am_multi_process)
-    struct WaylandImpl : public Impl {
+    struct WaylandImpl : public Impl
+    {
         WaylandImpl(WindowItem *windowItem) : Impl(windowItem) {}
-        ~WaylandImpl();
+        ~WaylandImpl() override;
         void setup(Window *window) override;
         void tearDown() override;
         void updateSize(const QSizeF &newSize) override;
diff --git a/src/window-lib/windowmanager.cpp b/src/window-lib/windowmanager.cpp
index 28bd3def..3aa85070 100644
--- a/src/window-lib/windowmanager.cpp
+++ b/src/window-lib/windowmanager.cpp
@@ -408,7 +408,7 @@ bool WindowManager::addWaylandSocket(QLocalServer *waylandSocket)
     }
 
     waylandSocket->setParent(this);
-    d->extraWaylandSockets << waylandSocket->socketDescriptor();
+    d->extraWaylandSockets << int(waylandSocket->socketDescriptor());
     return true;
 #else
     Q_UNUSED(waylandSocket)
@@ -420,7 +420,7 @@ int WindowManager::rowCount(const QModelIndex &parent) const
 {
     if (parent.isValid())
         return 0;
-    return d->windowsInModel.count();
+    return int(d->windowsInModel.count());
 }
 
 QVariant WindowManager::data(const QModelIndex &index, int role) const
@@ -536,7 +536,7 @@ QList<Window *> WindowManager::windowsOfApplication(const QString &id) const
  */
 int WindowManager::indexOfWindow(Window *window) const
 {
-    return d->windowsInModel.indexOf(window);
+    return int(d->windowsInModel.indexOf(window));
 }
 
 /*!
@@ -607,7 +607,7 @@ void WindowManager::setupInProcessRuntime(AbstractRuntime *runtime)
 */
 void WindowManager::releaseWindow(Window *window)
 {
-    int index = d->allWindows.indexOf(window);
+    auto index = d->allWindows.indexOf(window);
     if (index == -1)
         return;
 
@@ -626,7 +626,7 @@ void WindowManager::releaseWindow(Window *window)
  */
 void WindowManager::addWindow(Window *window)
 {
-    beginInsertRows(QModelIndex(), d->windowsInModel.count(), d->windowsInModel.count());
+    beginInsertRows(QModelIndex(), count(), count());
     d->windowsInModel << window;
     endInsertRows();
     emit countChanged();
@@ -638,13 +638,13 @@ void WindowManager::addWindow(Window *window)
  */
 void WindowManager::removeWindow(Window *window)
 {
-    int index = d->windowsInModel.indexOf(window);
+    qsizetype index = d->windowsInModel.indexOf(window);
     if (index == -1)
         return;
 
     emit windowAboutToBeRemoved(window);
 
-    beginRemoveRows(QModelIndex(), index, index);
+    beginRemoveRows(QModelIndex(), int(index), int(index));
     d->windowsInModel.removeAt(index);
     endRemoveRows();
     emit countChanged();
@@ -975,9 +975,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();
-        apps.erase(std::remove_if(apps.begin(), apps.end(), [appId](const Application *app) {
+        apps.removeIf([appId](const Application *app) {
             return app->isAlias() || (!appId.isEmpty() && (appId != app->id()));
-        }), apps.end());
+        });
 
         auto grabbers = new QList<QSharedPointer<const QQuickItemGrabResult>>;
 
@@ -1075,15 +1075,13 @@ QString WindowManagerPrivate::applicationId(Application *app, WindowSurface *win
 bool WindowManager::eventFilter(QObject *watched, QEvent *event)
 {
     if (event->type() == QEvent::PlatformSurface) {
-        auto *window = qobject_cast<QQuickWindow *>(watched);
-        if (!window)
-            return false;
-
-        auto surfaceEventType = static_cast<QPlatformSurfaceEvent *>(event)->surfaceEventType();
-        if (surfaceEventType == QPlatformSurfaceEvent::SurfaceCreated)
-            registerCompositorView(window);
+        if (auto *window = qobject_cast<QQuickWindow *>(watched)) {
+            auto surfaceEventType = static_cast<QPlatformSurfaceEvent *>(event)->surfaceEventType();
+            if (surfaceEventType == QPlatformSurfaceEvent::SurfaceCreated)
+                registerCompositorView(window);
+        }
     }
-    return false;
+    return QAbstractListModel::eventFilter(watched, event);
 }
 
 QT_END_NAMESPACE_AM