From 88c974835c36fb38193ab5cab28540f830264d92 Mon Sep 17 00:00:00 2001 From: Vlad Zahorodnii Date: Sat, 18 Feb 2023 13:16:42 +0200 Subject: [PATCH] Drop duplicate clientMaximizedStateChanged signal --- .../dont_crash_aurorae_destroy_deco.cpp | 2 +- .../effects/maximize_animation_test.cpp | 2 +- autotests/integration/quick_tiling_test.cpp | 23 ++++++------------- src/effects.cpp | 2 +- src/placementtracker.cpp | 4 ++-- src/window.cpp | 4 ++-- src/window.h | 1 - src/x11window.cpp | 1 - src/xdgshellwindow.cpp | 1 - 9 files changed, 14 insertions(+), 26 deletions(-) diff --git a/autotests/integration/dont_crash_aurorae_destroy_deco.cpp b/autotests/integration/dont_crash_aurorae_destroy_deco.cpp index 07b861f801..e1bc948de0 100644 --- a/autotests/integration/dont_crash_aurorae_destroy_deco.cpp +++ b/autotests/integration/dont_crash_aurorae_destroy_deco.cpp @@ -114,7 +114,7 @@ void DontCrashAuroraeDestroyDecoTest::testBorderlessMaximizedWindows() QVERIFY(window->readyForPainting()); // simulate click on maximize button - QSignalSpy maximizedStateChangedSpy(window, static_cast(&Window::clientMaximizedStateChanged)); + QSignalSpy maximizedStateChangedSpy(window, &Window::clientMaximizedStateChanged); quint32 timestamp = 1; Test::pointerMotion(window->frameGeometry().topLeft() + scenePoint.toPoint(), timestamp++); Test::pointerButtonPressed(BTN_LEFT, timestamp++); diff --git a/autotests/integration/effects/maximize_animation_test.cpp b/autotests/integration/effects/maximize_animation_test.cpp index 15eb4dcfc8..617200cf6f 100644 --- a/autotests/integration/effects/maximize_animation_test.cpp +++ b/autotests/integration/effects/maximize_animation_test.cpp @@ -128,7 +128,7 @@ void MaximizeAnimationTest::testMaximizeRestore() // Maximize the window. QSignalSpy frameGeometryChangedSpy(window, &Window::frameGeometryChanged); - QSignalSpy maximizeChangedSpy(window, qOverload(&Window::clientMaximizedStateChanged)); + QSignalSpy maximizeChangedSpy(window, &Window::clientMaximizedStateChanged); workspace()->slotWindowMaximize(); QVERIFY(surfaceConfigureRequestedSpy.wait()); diff --git a/autotests/integration/quick_tiling_test.cpp b/autotests/integration/quick_tiling_test.cpp index 594a5e6d38..0ce7512820 100644 --- a/autotests/integration/quick_tiling_test.cpp +++ b/autotests/integration/quick_tiling_test.cpp @@ -240,8 +240,7 @@ void QuickTilingTest::testQuickMaximizing() QSignalSpy quickTileChangedSpy(window, &Window::quickTileModeChanged); QSignalSpy frameGeometryChangedSpy(window, &Window::frameGeometryChanged); - QSignalSpy maximizeChangedSpy1(window, qOverload(&Window::clientMaximizedStateChanged)); - QSignalSpy maximizeChangedSpy2(window, qOverload(&Window::clientMaximizedStateChanged)); + QSignalSpy maximizeChangedSpy(window, &Window::clientMaximizedStateChanged); window->setQuickTileMode(QuickTileFlag::Maximize, true); QCOMPARE(quickTileChangedSpy.count(), 1); @@ -267,13 +266,9 @@ void QuickTilingTest::testQuickMaximizing() QCOMPARE(window->geometryRestore(), QRect(0, 0, 100, 50)); // window is now set to maximised - QCOMPARE(maximizeChangedSpy1.count(), 1); - QCOMPARE(maximizeChangedSpy1.first().first().value(), window); - QCOMPARE(maximizeChangedSpy1.first().last().value(), MaximizeFull); - QCOMPARE(maximizeChangedSpy2.count(), 1); - QCOMPARE(maximizeChangedSpy2.first().first().value(), window); - QCOMPARE(maximizeChangedSpy2.first().at(1).toBool(), true); - QCOMPARE(maximizeChangedSpy2.first().at(2).toBool(), true); + QCOMPARE(maximizeChangedSpy.count(), 1); + QCOMPARE(maximizeChangedSpy.first().first().value(), window); + QCOMPARE(maximizeChangedSpy.first().last().value(), MaximizeFull); QCOMPARE(window->maximizeMode(), MaximizeFull); // go back to quick tile none @@ -297,13 +292,9 @@ void QuickTilingTest::testQuickMaximizing() QCOMPARE(frameGeometryChangedSpy.count(), 2); QCOMPARE(window->frameGeometry(), QRect(0, 0, 100, 50)); QCOMPARE(window->geometryRestore(), QRect(0, 0, 100, 50)); - QCOMPARE(maximizeChangedSpy1.count(), 2); - QCOMPARE(maximizeChangedSpy1.last().first().value(), window); - QCOMPARE(maximizeChangedSpy1.last().last().value(), MaximizeRestore); - QCOMPARE(maximizeChangedSpy2.count(), 2); - QCOMPARE(maximizeChangedSpy2.last().first().value(), window); - QCOMPARE(maximizeChangedSpy2.last().at(1).toBool(), false); - QCOMPARE(maximizeChangedSpy2.last().at(2).toBool(), false); + QCOMPARE(maximizeChangedSpy.count(), 2); + QCOMPARE(maximizeChangedSpy.last().first().value(), window); + QCOMPARE(maximizeChangedSpy.last().last().value(), MaximizeRestore); } void QuickTilingTest::testQuickTilingKeyboardMove_data() diff --git a/src/effects.cpp b/src/effects.cpp index 54a92193af..ff1ebdb04b 100644 --- a/src/effects.cpp +++ b/src/effects.cpp @@ -290,7 +290,7 @@ void EffectsHandlerImpl::unloadAllEffects() void EffectsHandlerImpl::setupWindowConnections(Window *window) { connect(window, &Window::windowClosed, this, &EffectsHandlerImpl::slotWindowClosed); - connect(window, static_cast(&Window::clientMaximizedStateChanged), + connect(window, &Window::clientMaximizedStateChanged, this, &EffectsHandlerImpl::slotClientMaximized); connect(window, static_cast(&Window::clientMaximizedStateAboutToChange), this, [this](KWin::Window *window, MaximizeMode m) { diff --git a/src/placementtracker.cpp b/src/placementtracker.cpp index 1926b49d86..4b9d0f3722 100644 --- a/src/placementtracker.cpp +++ b/src/placementtracker.cpp @@ -39,7 +39,7 @@ void PlacementTracker::add(Window *window) return; } connect(window, &Window::frameGeometryChanged, this, &PlacementTracker::saveGeometry); - connect(window, qOverload(&Window::clientMaximizedStateChanged), this, &PlacementTracker::saveMaximize); + connect(window, &Window::clientMaximizedStateChanged, this, &PlacementTracker::saveMaximize); connect(window, &Window::quickTileModeChanged, this, &PlacementTracker::saveQuickTile); connect(window, &Window::fullScreenChanged, this, &PlacementTracker::saveFullscreen); connect(window, &Window::clientFinishUserMovedResized, this, &PlacementTracker::saveInteractionCounter); @@ -52,7 +52,7 @@ void PlacementTracker::remove(Window *window) { if (m_savedWindows.contains(window)) { disconnect(window, &Window::frameGeometryChanged, this, &PlacementTracker::saveGeometry); - disconnect(window, qOverload(&Window::clientMaximizedStateChanged), this, &PlacementTracker::saveMaximize); + disconnect(window, &Window::clientMaximizedStateChanged, this, &PlacementTracker::saveMaximize); disconnect(window, &Window::quickTileModeChanged, this, &PlacementTracker::saveQuickTile); disconnect(window, &Window::fullScreenChanged, this, &PlacementTracker::saveFullscreen); disconnect(window, &Window::clientFinishUserMovedResized, this, &PlacementTracker::saveInteractionCounter); diff --git a/src/window.cpp b/src/window.cpp index e5490f6e57..4da76b1633 100644 --- a/src/window.cpp +++ b/src/window.cpp @@ -99,7 +99,7 @@ Window::Window() connect(this, &Window::clientFinishUserMovedResized, this, [this]() { m_keyboardGeometryRestore = QRectF(); }); - connect(this, qOverload(&Window::clientMaximizedStateChanged), this, [this]() { + connect(this, &Window::clientMaximizedStateChanged, this, [this]() { m_keyboardGeometryRestore = QRectF(); }); connect(this, &Window::fullScreenChanged, this, [this]() { @@ -2223,7 +2223,7 @@ void Window::setupWindowManagementInterface() connect(this, &Window::minimizedChanged, w, [w, this] { w->setMinimized(isMinimized()); }); - connect(this, static_cast(&Window::clientMaximizedStateChanged), w, [w](KWin::Window *c, MaximizeMode mode) { + connect(this, &Window::clientMaximizedStateChanged, w, [w](KWin::Window *c, MaximizeMode mode) { w->setMaximized(mode == KWin::MaximizeFull); }); connect(this, &Window::demandsAttentionChanged, w, [w, this] { diff --git a/src/window.h b/src/window.h index 1a401430b4..4668a82004 100644 --- a/src/window.h +++ b/src/window.h @@ -1522,7 +1522,6 @@ Q_SIGNALS: void captionChanged(); void clientMaximizedStateAboutToChange(KWin::Window *, MaximizeMode); void clientMaximizedStateChanged(KWin::Window *, MaximizeMode); - void clientMaximizedStateChanged(KWin::Window *c, bool h, bool v); void transientChanged(); void modalChanged(); void quickTileModeChanged(); diff --git a/src/x11window.cpp b/src/x11window.cpp index 43b7352478..7961313bc8 100644 --- a/src/x11window.cpp +++ b/src/x11window.cpp @@ -4538,7 +4538,6 @@ void X11Window::maximize(MaximizeMode mode) if (max_mode != old_mode) { Q_EMIT clientMaximizedStateChanged(this, max_mode); - Q_EMIT clientMaximizedStateChanged(this, max_mode & MaximizeHorizontal, max_mode & MaximizeVertical); } } diff --git a/src/xdgshellwindow.cpp b/src/xdgshellwindow.cpp index c205aafab8..dc24e3868f 100644 --- a/src/xdgshellwindow.cpp +++ b/src/xdgshellwindow.cpp @@ -1425,7 +1425,6 @@ void XdgToplevelWindow::updateMaximizeMode(MaximizeMode maximizeMode) m_maximizeMode = maximizeMode; updateWindowRules(Rules::MaximizeVert | Rules::MaximizeHoriz); Q_EMIT clientMaximizedStateChanged(this, maximizeMode); - Q_EMIT clientMaximizedStateChanged(this, maximizeMode & MaximizeHorizontal, maximizeMode & MaximizeVertical); } void XdgToplevelWindow::updateFullScreenMode(bool set)