Commit a21aa839 authored by Vlad Zahorodnii's avatar Vlad Zahorodnii
Browse files

Rename X11Client to X11Window

The word "client" means different things in wayland and kwin. Use a
better word to refer to windows.
parent f0f829bc
......@@ -153,7 +153,7 @@ if (XCB_ICCCM_FOUND)
integrationTest(NAME testX11DesktopWindow SRCS desktop_window_x11_test.cpp LIBS XCB::ICCCM)
integrationTest(NAME testXwaylandInput SRCS xwayland_input_test.cpp LIBS XCB::ICCCM)
integrationTest(NAME testWindowRules SRCS window_rules_test.cpp LIBS XCB::ICCCM)
integrationTest(NAME testX11Client SRCS x11_client_test.cpp LIBS XCB::ICCCM)
integrationTest(NAME testX11Window SRCS x11_window_test.cpp LIBS XCB::ICCCM)
integrationTest(NAME testQuickTiling SRCS quick_tiling_test.cpp LIBS XCB::ICCCM)
integrationTest(NAME testGlobalShortcuts SRCS globalshortcuts_test.cpp LIBS XCB::ICCCM)
integrationTest(NAME testSceneQPainter SRCS scene_qpainter_test.cpp LIBS XCB::ICCCM)
......
......@@ -16,7 +16,7 @@
#include "utils/xcbutils.h"
#include "wayland_server.h"
#include "workspace.h"
#include "x11client.h"
#include "x11window.h"
#include <kwineffects.h>
#include <QDBusConnection>
......@@ -122,7 +122,7 @@ void ActivitiesTest::testSetOnActivitiesValidates()
QSignalSpy windowCreatedSpy(workspace(), &Workspace::clientAdded);
QVERIFY(windowCreatedSpy.isValid());
QVERIFY(windowCreatedSpy.wait());
X11Client *client = windowCreatedSpy.first().first().value<X11Client *>();
X11Window *client = windowCreatedSpy.first().first().value<X11Window *>();
QVERIFY(client);
QCOMPARE(client->window(), w);
QVERIFY(client->isDecorated());
......@@ -141,7 +141,7 @@ void ActivitiesTest::testSetOnActivitiesValidates()
xcb_flush(c.data());
c.reset();
QSignalSpy windowClosedSpy(client, &X11Client::windowClosed);
QSignalSpy windowClosedSpy(client, &X11Window::windowClosed);
QVERIFY(windowClosedSpy.isValid());
QVERIFY(windowClosedSpy.wait());
}
......
......@@ -18,7 +18,7 @@
#include "wayland_server.h"
#include "window.h"
#include "workspace.h"
#include "x11client.h"
#include "x11window.h"
#include <KWayland/Client/surface.h>
......@@ -257,7 +257,7 @@ void TestDbusInterface::testGetWindowInfoX11Client()
QSignalSpy windowCreatedSpy(workspace(), &Workspace::clientAdded);
QVERIFY(windowCreatedSpy.isValid());
QVERIFY(windowCreatedSpy.wait());
X11Client *client = windowCreatedSpy.first().first().value<X11Client *>();
X11Window *client = windowCreatedSpy.first().first().value<X11Window *>();
QVERIFY(client);
QCOMPARE(client->window(), w);
QCOMPARE(client->clientSize(), windowGeometry.size());
......@@ -376,7 +376,7 @@ void TestDbusInterface::testGetWindowInfoX11Client()
xcb_unmap_window(c.data(), w);
xcb_flush(c.data());
QSignalSpy windowClosedSpy(client, &X11Client::windowClosed);
QSignalSpy windowClosedSpy(client, &X11Window::windowClosed);
QVERIFY(windowClosedSpy.isValid());
QVERIFY(windowClosedSpy.wait());
xcb_destroy_window(c.data(), w);
......
......@@ -16,7 +16,7 @@
#include "wayland_server.h"
#include "window.h"
#include "workspace.h"
#include "x11client.h"
#include "x11window.h"
#include <kwineffects.h>
#include <netwm.h>
......@@ -140,7 +140,7 @@ void X11DesktopWindowTest::testDesktopWindow()
QSignalSpy windowCreatedSpy(workspace(), &Workspace::clientAdded);
QVERIFY(windowCreatedSpy.isValid());
QVERIFY(windowCreatedSpy.wait());
X11Client *client = windowCreatedSpy.first().first().value<X11Client *>();
X11Window *client = windowCreatedSpy.first().first().value<X11Window *>();
QVERIFY(client);
QCOMPARE(client->window(), w);
QVERIFY(!client->isDecorated());
......@@ -156,7 +156,7 @@ void X11DesktopWindowTest::testDesktopWindow()
xcb_flush(c.data());
c.reset();
QSignalSpy windowClosedSpy(client, &X11Client::windowClosed);
QSignalSpy windowClosedSpy(client, &X11Window::windowClosed);
QVERIFY(windowClosedSpy.isValid());
QVERIFY(windowClosedSpy.wait());
}
......
......@@ -15,7 +15,7 @@
#include "renderbackend.h"
#include "wayland_server.h"
#include "workspace.h"
#include "x11client.h"
#include "x11window.h"
#include <kwineffects.h>
#include <KDecoration2/Decoration>
......@@ -99,7 +99,7 @@ void DontCrashAuroraeDestroyDecoTest::testBorderlessMaximizedWindows()
QSignalSpy windowCreatedSpy(workspace(), &Workspace::clientAdded);
QVERIFY(windowCreatedSpy.isValid());
QVERIFY(windowCreatedSpy.wait());
X11Client *client = windowCreatedSpy.first().first().value<X11Client *>();
X11Window *client = windowCreatedSpy.first().first().value<X11Window *>();
QVERIFY(client);
QCOMPARE(client->window(), w);
QVERIFY(client->isDecorated());
......@@ -133,7 +133,7 @@ void DontCrashAuroraeDestroyDecoTest::testBorderlessMaximizedWindows()
xcb_flush(c);
xcb_disconnect(c);
QSignalSpy windowClosedSpy(client, &X11Client::windowClosed);
QSignalSpy windowClosedSpy(client, &X11Window::windowClosed);
QVERIFY(windowClosedSpy.isValid());
QVERIFY(windowClosedSpy.wait());
}
......
......@@ -17,7 +17,7 @@
#include "wayland_server.h"
#include "window.h"
#include "workspace.h"
#include "x11client.h"
#include "x11window.h"
#include <KDecoration2/Decoration>
......
......@@ -17,7 +17,7 @@
#include "wayland/output_interface.h"
#include "wayland_server.h"
#include "workspace.h"
#include "x11client.h"
#include "x11window.h"
#include <KConfigGroup>
......
......@@ -15,7 +15,7 @@
#include "renderbackend.h"
#include "wayland_server.h"
#include "workspace.h"
#include "x11client.h"
#include "x11window.h"
#include <kwineffects.h>
#include <KDecoration2/Decoration>
......@@ -84,7 +84,7 @@ void DontCrashEmptyDecorationTest::testBug361551()
QSignalSpy windowCreatedSpy(workspace(), &Workspace::clientAdded);
QVERIFY(windowCreatedSpy.isValid());
QVERIFY(windowCreatedSpy.wait());
X11Client *client = windowCreatedSpy.first().first().value<X11Client *>();
X11Window *client = windowCreatedSpy.first().first().value<X11Window *>();
QVERIFY(client);
QCOMPARE(client->window(), w);
QVERIFY(client->isDecorated());
......@@ -99,7 +99,7 @@ void DontCrashEmptyDecorationTest::testBug361551()
xcb_flush(c);
xcb_disconnect(c);
QSignalSpy windowClosedSpy(client, &X11Client::windowClosed);
QSignalSpy windowClosedSpy(client, &X11Window::windowClosed);
QVERIFY(windowClosedSpy.isValid());
QVERIFY(windowClosedSpy.wait());
}
......
......@@ -13,7 +13,7 @@
#include "wayland_server.h"
#include "window.h"
#include "workspace.h"
#include "x11client.h"
#include "x11window.h"
#include <KDecoration2/Decoration>
......@@ -57,9 +57,9 @@ void DontCrashGlxgearsTest::testGlxgears()
QVERIFY(clientAddedSpy.wait());
QCOMPARE(clientAddedSpy.count(), 1);
QCOMPARE(workspace()->clientList().count(), 1);
X11Client *glxgearsClient = workspace()->clientList().first();
X11Window *glxgearsClient = workspace()->clientList().first();
QVERIFY(glxgearsClient->isDecorated());
QSignalSpy closedSpy(glxgearsClient, &X11Client::windowClosed);
QSignalSpy closedSpy(glxgearsClient, &X11Window::windowClosed);
QVERIFY(closedSpy.isValid());
KDecoration2::Decoration *decoration = glxgearsClient->decoration();
QVERIFY(decoration);
......
......@@ -16,7 +16,7 @@
#include "renderbackend.h"
#include "wayland_server.h"
#include "workspace.h"
#include "x11client.h"
#include "x11window.h"
#include <kwineffects.h>
#include <KWayland/Client/surface.h>
......
......@@ -16,7 +16,7 @@
#include "renderbackend.h"
#include "wayland_server.h"
#include "workspace.h"
#include "x11client.h"
#include "x11window.h"
#include <KConfigGroup>
......@@ -201,7 +201,7 @@ void SlidingPopupsTest::testWithOtherEffect()
QSignalSpy windowCreatedSpy(workspace(), &Workspace::clientAdded);
QVERIFY(windowCreatedSpy.isValid());
QVERIFY(windowCreatedSpy.wait());
X11Client *client = windowCreatedSpy.first().first().value<X11Client *>();
X11Window *client = windowCreatedSpy.first().first().value<X11Window *>();
QVERIFY(client);
QCOMPARE(client->window(), w);
QVERIFY(client->isNormalWindow());
......@@ -220,7 +220,7 @@ void SlidingPopupsTest::testWithOtherEffect()
xcb_unmap_window(c.data(), w);
xcb_flush(c.data());
QSignalSpy windowClosedSpy(client, &X11Client::windowClosed);
QSignalSpy windowClosedSpy(client, &X11Window::windowClosed);
QVERIFY(windowClosedSpy.isValid());
QSignalSpy windowDeletedSpy(effects, &EffectsHandler::windowDeleted);
......@@ -339,7 +339,7 @@ void SlidingPopupsTest::testWithOtherEffectWayland()
shellSurface.reset();
surface.reset();
QSignalSpy windowClosedSpy(client, &X11Client::windowClosed);
QSignalSpy windowClosedSpy(client, &X11Window::windowClosed);
QVERIFY(windowClosedSpy.isValid());
QSignalSpy windowDeletedSpy(effects, &EffectsHandler::windowDeleted);
......
......@@ -15,7 +15,7 @@
#include "platform.h"
#include "wayland_server.h"
#include "workspace.h"
#include "x11client.h"
#include "x11window.h"
#include <KConfigGroup>
......@@ -137,7 +137,7 @@ void TranslucencyTest::testMoveAfterDesktopChange()
QSignalSpy windowCreatedSpy(workspace(), &Workspace::clientAdded);
QVERIFY(windowCreatedSpy.isValid());
QVERIFY(windowCreatedSpy.wait());
X11Client *client = windowCreatedSpy.first().first().value<X11Client *>();
X11Window *client = windowCreatedSpy.first().first().value<X11Window *>();
QVERIFY(client);
QCOMPARE(client->window(), w);
QVERIFY(client->isDecorated());
......@@ -165,7 +165,7 @@ void TranslucencyTest::testMoveAfterDesktopChange()
xcb_unmap_window(c.data(), w);
xcb_flush(c.data());
QSignalSpy windowClosedSpy(client, &X11Client::windowClosed);
QSignalSpy windowClosedSpy(client, &X11Window::windowClosed);
QVERIFY(windowClosedSpy.isValid());
QVERIFY(windowClosedSpy.wait());
xcb_destroy_window(c.data(), w);
......@@ -205,7 +205,7 @@ void TranslucencyTest::testDialogClose()
QSignalSpy windowCreatedSpy(workspace(), &Workspace::clientAdded);
QVERIFY(windowCreatedSpy.isValid());
QVERIFY(windowCreatedSpy.wait());
X11Client *client = windowCreatedSpy.first().first().value<X11Client *>();
X11Window *client = windowCreatedSpy.first().first().value<X11Window *>();
QVERIFY(client);
QCOMPARE(client->window(), w);
QVERIFY(client->isDecorated());
......@@ -217,7 +217,7 @@ void TranslucencyTest::testDialogClose()
xcb_unmap_window(c.data(), w);
xcb_flush(c.data());
QSignalSpy windowClosedSpy(client, &X11Client::windowClosed);
QSignalSpy windowClosedSpy(client, &X11Window::windowClosed);
QVERIFY(windowClosedSpy.isValid());
QSignalSpy windowDeletedSpy(effects, &EffectsHandler::windowDeleted);
......
......@@ -16,7 +16,7 @@
#include "renderbackend.h"
#include "wayland_server.h"
#include "workspace.h"
#include "x11client.h"
#include "x11window.h"
#include <KConfigGroup>
......@@ -122,7 +122,7 @@ void WobblyWindowsShadeTest::testShadeMove()
QSignalSpy windowCreatedSpy(workspace(), &Workspace::clientAdded);
QVERIFY(windowCreatedSpy.isValid());
QVERIFY(windowCreatedSpy.wait());
X11Client *client = windowCreatedSpy.first().first().value<X11Client *>();
X11Window *client = windowCreatedSpy.first().first().value<X11Window *>();
QVERIFY(client);
QCOMPARE(client->window(), w);
QVERIFY(client->isDecorated());
......
......@@ -18,7 +18,7 @@
#include "wayland/seat_interface.h"
#include "wayland_server.h"
#include "workspace.h"
#include "x11client.h"
#include "x11window.h"
#include <KWayland/Client/surface.h>
......@@ -333,7 +333,7 @@ void GlobalShortcutsTest::testX11ClientShortcut()
QSignalSpy windowCreatedSpy(workspace(), &Workspace::clientAdded);
QVERIFY(windowCreatedSpy.isValid());
QVERIFY(windowCreatedSpy.wait());
X11Client *client = windowCreatedSpy.last().first().value<X11Client *>();
X11Window *client = windowCreatedSpy.last().first().value<X11Window *>();
QVERIFY(client);
QCOMPARE(workspace()->activeClient(), client);
......@@ -364,7 +364,7 @@ void GlobalShortcutsTest::testX11ClientShortcut()
Test::keyboardKeyReleased(KEY_LEFTMETA, timestamp++);
// destroy window again
QSignalSpy windowClosedSpy(client, &X11Client::windowClosed);
QSignalSpy windowClosedSpy(client, &X11Window::windowClosed);
QVERIFY(windowClosedSpy.isValid());
xcb_unmap_window(c.data(), w);
xcb_destroy_window(c.data(), w);
......
......@@ -19,7 +19,7 @@
#include "wayland_server.h"
#include "window.h"
#include "workspace.h"
#include "x11client.h"
#include "x11window.h"
#include <KWayland/Client/compositor.h>
#include <KWayland/Client/connection_thread.h>
......@@ -654,7 +654,7 @@ void MoveResizeWindowTest::testNetMove()
QSignalSpy windowCreatedSpy(workspace(), &Workspace::clientAdded);
QVERIFY(windowCreatedSpy.isValid());
QVERIFY(windowCreatedSpy.wait());
X11Client *client = windowCreatedSpy.first().first().value<X11Client *>();
X11Window *client = windowCreatedSpy.first().first().value<X11Window *>();
QVERIFY(client);
QCOMPARE(client->window(), w);
const QRect origGeo = client->frameGeometry();
......@@ -663,11 +663,11 @@ void MoveResizeWindowTest::testNetMove()
Cursors::self()->mouse()->setPos(screens()->geometry(0).center());
QVERIFY(!origGeo.contains(Cursors::self()->mouse()->pos()));
QSignalSpy moveStartSpy(client, &X11Client::clientStartUserMovedResized);
QSignalSpy moveStartSpy(client, &X11Window::clientStartUserMovedResized);
QVERIFY(moveStartSpy.isValid());
QSignalSpy moveEndSpy(client, &X11Client::clientFinishUserMovedResized);
QSignalSpy moveEndSpy(client, &X11Window::clientFinishUserMovedResized);
QVERIFY(moveEndSpy.isValid());
QSignalSpy moveStepSpy(client, &X11Client::clientStepUserMovedResized);
QSignalSpy moveStepSpy(client, &X11Window::clientStepUserMovedResized);
QVERIFY(moveStepSpy.isValid());
QVERIFY(!workspace()->moveResizeClient());
......@@ -698,7 +698,7 @@ void MoveResizeWindowTest::testNetMove()
xcb_flush(c.data());
c.reset();
QSignalSpy windowClosedSpy(client, &X11Client::windowClosed);
QSignalSpy windowClosedSpy(client, &X11Window::windowClosed);
QVERIFY(windowClosedSpy.isValid());
QVERIFY(windowClosedSpy.wait());
}
......@@ -743,7 +743,7 @@ void MoveResizeWindowTest::testAdjustClientGeometryOfAutohidingX11Panel()
QSignalSpy windowCreatedSpy(workspace(), &Workspace::clientAdded);
QVERIFY(windowCreatedSpy.isValid());
QVERIFY(windowCreatedSpy.wait());
X11Client *panel = windowCreatedSpy.first().first().value<X11Client *>();
X11Window *panel = windowCreatedSpy.first().first().value<X11Window *>();
QVERIFY(panel);
QCOMPARE(panel->window(), w);
QCOMPARE(panel->frameGeometry(), panelGeometry);
......@@ -781,7 +781,7 @@ void MoveResizeWindowTest::testAdjustClientGeometryOfAutohidingX11Panel()
xcb_flush(c.data());
c.reset();
QSignalSpy panelClosedSpy(panel, &X11Client::windowClosed);
QSignalSpy panelClosedSpy(panel, &X11Window::windowClosed);
QVERIFY(panelClosedSpy.isValid());
QVERIFY(panelClosedSpy.wait());
......
......@@ -14,7 +14,7 @@
#include "wayland/seat_interface.h"
#include "wayland_server.h"
#include "workspace.h"
#include "x11client.h"
#include "x11window.h"
#include <kwineffects.h>
#include <KWayland/Client/compositor.h>
......@@ -127,7 +127,7 @@ void PlasmaWindowTest::testCreateDestroyX11PlasmaWindow()
QSignalSpy windowCreatedSpy(workspace(), &Workspace::clientAdded);
QVERIFY(windowCreatedSpy.isValid());
QVERIFY(windowCreatedSpy.wait());
X11Client *client = windowCreatedSpy.first().first().value<X11Client *>();
X11Window *client = windowCreatedSpy.first().first().value<X11Window *>();
QVERIFY(client);
QCOMPARE(client->window(), w);
QVERIFY(client->isDecorated());
......@@ -174,7 +174,7 @@ void PlasmaWindowTest::testCreateDestroyX11PlasmaWindow()
xcb_unmap_window(c.data(), w);
xcb_flush(c.data());
QSignalSpy windowClosedSpy(client, &X11Client::windowClosed);
QSignalSpy windowClosedSpy(client, &X11Window::windowClosed);
QVERIFY(windowClosedSpy.isValid());
QVERIFY(windowClosedSpy.wait());
xcb_destroy_window(c.data(), w);
......
......@@ -17,7 +17,7 @@
#include "wayland_server.h"
#include "window.h"
#include "workspace.h"
#include "x11client.h"
#include "x11window.h"
#include <KDecoration2/DecoratedClient>
#include <KDecoration2/Decoration>
......@@ -595,7 +595,7 @@ void QuickTilingTest::testX11QuickTiling()
QSignalSpy windowCreatedSpy(workspace(), &Workspace::clientAdded);
QVERIFY(windowCreatedSpy.isValid());
QVERIFY(windowCreatedSpy.wait());
X11Client *client = windowCreatedSpy.first().first().value<X11Client *>();
X11Window *client = windowCreatedSpy.first().first().value<X11Window *>();
QVERIFY(client);
QCOMPARE(client->window(), w);
......@@ -626,7 +626,7 @@ void QuickTilingTest::testX11QuickTiling()
xcb_flush(c.data());
c.reset();
QSignalSpy windowClosedSpy(client, &X11Client::windowClosed);
QSignalSpy windowClosedSpy(client, &X11Window::windowClosed);
QVERIFY(windowClosedSpy.isValid());
QVERIFY(windowClosedSpy.wait());
}
......@@ -677,7 +677,7 @@ void QuickTilingTest::testX11QuickTilingAfterVertMaximize()
QSignalSpy windowCreatedSpy(workspace(), &Workspace::clientAdded);
QVERIFY(windowCreatedSpy.isValid());
QVERIFY(windowCreatedSpy.wait());
X11Client *client = windowCreatedSpy.first().first().value<X11Client *>();
X11Window *client = windowCreatedSpy.first().first().value<X11Window *>();
QVERIFY(client);
QCOMPARE(client->window(), w);
......@@ -705,7 +705,7 @@ void QuickTilingTest::testX11QuickTilingAfterVertMaximize()
xcb_flush(c.data());
c.reset();
QSignalSpy windowClosedSpy(client, &X11Client::windowClosed);
QSignalSpy windowClosedSpy(client, &X11Window::windowClosed);
QVERIFY(windowClosedSpy.isValid());
QVERIFY(windowClosedSpy.wait());
}
......
......@@ -17,7 +17,7 @@
#include "wayland/surface_interface.h"
#include "wayland_server.h"
#include "workspace.h"
#include "x11client.h"
#include "x11window.h"
#include <KConfigGroup>
......@@ -356,7 +356,7 @@ void SceneQPainterTest::testX11Window()
QSignalSpy windowCreatedSpy(workspace(), &Workspace::clientAdded);
QVERIFY(windowCreatedSpy.isValid());
QVERIFY(windowCreatedSpy.wait());
X11Client *client = windowCreatedSpy.first().first().value<X11Client *>();
X11Window *client = windowCreatedSpy.first().first().value<X11Window *>();
QVERIFY(client);
QCOMPARE(client->window(), w);
QCOMPARE(client->clientSize(), QSize(100, 200));
......@@ -387,7 +387,7 @@ void SceneQPainterTest::testX11Window()
xcb_unmap_window(c.data(), w);
xcb_flush(c.data());
QSignalSpy windowClosedSpy(client, &X11Client::windowClosed);
QSignalSpy windowClosedSpy(client, &X11Window::windowClosed);
QVERIFY(windowClosedSpy.isValid());
QVERIFY(windowClosedSpy.wait());
xcb_destroy_window(c.data(), w);
......
......@@ -15,7 +15,7 @@
#include "screenedge.h"
#include "wayland_server.h"
#include "workspace.h"
#include "x11client.h"
#include "x11window.h"
#include <kwineffects.h>
#include <netwm.h>
......@@ -128,7 +128,7 @@ void ScreenEdgeClientShowTest::testScreenEdgeShowHideX11()
QSignalSpy windowCreatedSpy(workspace(), &Workspace::clientAdded);
QVERIFY(windowCreatedSpy.isValid());
QVERIFY(windowCreatedSpy.wait());
X11Client *client = windowCreatedSpy.last().first().value<X11Client *>();
X11Window *client = windowCreatedSpy.last().first().value<X11Window *>();
QVERIFY(client);
QVERIFY(!client->isDecorated());
QCOMPARE(client->frameGeometry(), windowGeometry);
......@@ -146,7 +146,7 @@ void ScreenEdgeClientShowTest::testScreenEdgeShowHideX11()
QSignalSpy effectsWindowHiddenSpy(effects, &EffectsHandler::windowHidden);
QVERIFY(effectsWindowHiddenSpy.isValid());
QSignalSpy clientHiddenSpy(client, &X11Client::windowHidden);
QSignalSpy clientHiddenSpy(client, &X11Window::windowHidden);
QVERIFY(clientHiddenSpy.isValid());
QVERIFY(clientHiddenSpy.wait());
QVERIFY(client->isHiddenInternal());
......@@ -177,7 +177,7 @@ void ScreenEdgeClientShowTest::testScreenEdgeShowHideX11()
QVERIFY(client->isHiddenInternal());
// destroy window again
QSignalSpy windowClosedSpy(client, &X11Client::windowClosed);
QSignalSpy windowClosedSpy(client, &X11Window::windowClosed);
QVERIFY(windowClosedSpy.isValid());
xcb_unmap_window(c.data(), w);
xcb_destroy_window(c.data(), w);
......@@ -232,7 +232,7 @@ void ScreenEdgeClientShowTest::testScreenEdgeShowX11Touch()
QSignalSpy windowCreatedSpy(workspace(), &Workspace::clientAdded);
QVERIFY(windowCreatedSpy.isValid());
QVERIFY(windowCreatedSpy.wait());
X11Client *client = windowCreatedSpy.last().first().value<X11Client *>();
X11Window *client = windowCreatedSpy.last().first().value<X11Window *>();
QVERIFY(client);
QVERIFY(!client->isDecorated());
QCOMPARE(client->frameGeometry(), windowGeometry);
......@@ -250,7 +250,7 @@ void ScreenEdgeClientShowTest::testScreenEdgeShowX11Touch()
QSignalSpy effectsWindowHiddenSpy(effects, &EffectsHandler::windowHidden);
QVERIFY(effectsWindowHiddenSpy.isValid());
QSignalSpy clientHiddenSpy(client, &X11Client::windowHidden);
QSignalSpy clientHiddenSpy(client, &X11Window::windowHidden);
QVERIFY(clientHiddenSpy.isValid());
QVERIFY(clientHiddenSpy.wait());
QVERIFY(client->isHiddenInternal());
......@@ -270,7 +270,7 @@ void ScreenEdgeClientShowTest::testScreenEdgeShowX11Touch()
QCOMPARE(effectsWindowShownSpy.count(), 1);
// destroy window again
QSignalSpy windowClosedSpy(client, &X11Client::windowClosed);
QSignalSpy windowClosedSpy(client, &X11Window::windowClosed);
QVERIFY(windowClosedSpy.isValid());
xcb_unmap_window(c.data(), w);
xcb_destroy_window(c.data(), w);
......
......@@ -13,7 +13,7 @@
#include "platform.h"
#include "wayland_server.h"
#include "workspace.h"
#include "x11client.h"
#include "x11window.h"
#include <kwineffects.h>
#include <KDecoration2/Decoration>
......@@ -94,7 +94,7 @@ void ShadeTest::testShadeGeometry()
QSignalSpy windowCreatedSpy(workspace(), &Workspace::clientAdded);
QVERIFY(windowCreatedSpy.isValid());
QVERIFY(windowCreatedSpy.wait());
X11Client *client = windowCreatedSpy.first().first().value<X11Client *>();
X11Window *client = windowCreatedSpy.first().first().value<X11Window *>();
QVERIFY(client);
QCOMPARE(client->window(), w);
QVERIFY(client->isDecorated());
......@@ -120,7 +120,7 @@ void ShadeTest::testShadeGeometry()
xcb_flush(c.data());
c.reset();
QSignalSpy windowClosedSpy(client, &X11Client::windowClosed);
QSignalSpy windowClosedSpy(client, &X11Window::windowClosed);
QVERIFY(windowClosedSpy.isValid());
QVERIFY(windowClosedSpy.wait());
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment