From f5848d940581c2cdebb21476676c011017edc4c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Gr=C3=A4=C3=9Flin?= Date: Fri, 23 Oct 2015 13:36:53 +0200 Subject: [PATCH] Move implementation of updateMoveResize to AbstractClient No longer virtual. --- abstract_client.cpp | 2 +- abstract_client.h | 2 +- client.h | 2 -- geometry.cpp | 5 ----- 4 files changed, 2 insertions(+), 9 deletions(-) diff --git a/abstract_client.cpp b/abstract_client.cpp index df24d87e68..8a4a6934a3 100644 --- a/abstract_client.cpp +++ b/abstract_client.cpp @@ -612,7 +612,7 @@ QSize AbstractClient::minSize() const void AbstractClient::updateMoveResize(const QPointF ¤tGlobalCursor) { - Q_UNUSED(currentGlobalCursor) + handleMoveResize(pos(), currentGlobalCursor.toPoint()); } bool AbstractClient::hasStrut() const diff --git a/abstract_client.h b/abstract_client.h index ab38a388e8..bfd5add9cf 100644 --- a/abstract_client.h +++ b/abstract_client.h @@ -363,7 +363,7 @@ public: virtual void shrinkHorizontal(); virtual void growVertical(); virtual void shrinkVertical(); - virtual void updateMoveResize(const QPointF ¤tGlobalCursor); + void updateMoveResize(const QPointF ¤tGlobalCursor); /** * These values represent positions inside an area diff --git a/client.h b/client.h index b1d2df2781..0f85446bfa 100644 --- a/client.h +++ b/client.h @@ -413,8 +413,6 @@ public: **/ void showOnScreenEdge(); - void updateMoveResize(const QPointF ¤tGlobalCursor) override; - public Q_SLOTS: void closeWindow() override; void updateCaption(); diff --git a/geometry.cpp b/geometry.cpp index 4811686821..9103e27658 100644 --- a/geometry.cpp +++ b/geometry.cpp @@ -2818,11 +2818,6 @@ void AbstractClient::stopDelayedMoveResize() m_moveResize.delayedTimer = nullptr; } -void Client::updateMoveResize(const QPointF ¤tGlobalCursor) -{ - handleMoveResize(pos(), currentGlobalCursor.toPoint()); -} - void AbstractClient::handleMoveResize(const QPoint &local, const QPoint &global) { const QRect oldGeo = geometry();