From ce674ed509301a6756bc9f1a8e946e9c21c4205d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Gr=C3=A4=C3=9Flin?= Date: Mon, 18 Nov 2013 13:57:46 +0100 Subject: [PATCH] [kwin] Window -> xcb_window_t or WId --- effects/taskbarthumbnail/taskbarthumbnail.h | 2 +- layers.cpp | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/effects/taskbarthumbnail/taskbarthumbnail.h b/effects/taskbarthumbnail/taskbarthumbnail.h index 50f70401fd..e5cb235c9b 100644 --- a/effects/taskbarthumbnail/taskbarthumbnail.h +++ b/effects/taskbarthumbnail/taskbarthumbnail.h @@ -48,7 +48,7 @@ public Q_SLOTS: void screenLockingChanged(); private: struct Data { - Window window; // thumbnail of this window + WId window; // thumbnail of this window QRect rect; }; long atom; diff --git a/layers.cpp b/layers.cpp index 95267955b4..a0e857a667 100644 --- a/layers.cpp +++ b/layers.cpp @@ -212,9 +212,9 @@ void Workspace::propagateClients(bool propagate_new_clients) Xcb::restackWindows(newWindowStack); int pos = 0; - Window *cl(NULL); + xcb_window_t *cl(nullptr); if (propagate_new_clients) { - cl = new Window[ desktops.count() + clients.count()]; + cl = new xcb_window_t[ desktops.count() + clients.count()]; // TODO this is still not completely in the map order for (ClientList::ConstIterator it = desktops.constBegin(); it != desktops.constEnd(); ++it) cl[pos++] = (*it)->window(); @@ -224,7 +224,7 @@ void Workspace::propagateClients(bool propagate_new_clients) delete [] cl; } - cl = new Window[ stacking_order.count()]; + cl = new xcb_window_t[ stacking_order.count()]; pos = 0; for (ToplevelList::ConstIterator it = stacking_order.constBegin(); it != stacking_order.constEnd(); ++it) { if ((*it)->isClient())