From 28d7b3c563e3e153ad41a8755503a605921c05ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Gr=C3=A4=C3=9Flin?= <mgraesslin@kde.org>
Date: Tue, 30 Apr 2013 15:41:59 +0200
Subject: [PATCH] s/Window/xcb_window_t/g in workspace.h

---
 events.cpp    |  2 +-
 group.cpp     |  4 ++--
 workspace.cpp |  8 ++++----
 workspace.h   | 14 +++++++-------
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/events.cpp b/events.cpp
index 8f0a60dc9..67aa5e5c0 100644
--- a/events.cpp
+++ b/events.cpp
@@ -365,7 +365,7 @@ bool Workspace::workspaceEvent(QEvent* e)
 // Some events don't have the actual window which caused the event
 // as e->xany.window (e.g. ConfigureRequest), but as some other
 // field in the XEvent structure.
-Window Workspace::findSpecialEventWindow(XEvent* e)
+xcb_window_t Workspace::findSpecialEventWindow(XEvent *e)
 {
     switch(e->type) {
     case CreateNotify:
diff --git a/group.cpp b/group.cpp
index 33125e66f..98686c44d 100644
--- a/group.cpp
+++ b/group.cpp
@@ -323,7 +323,7 @@ void Group::lostLeader()
 // Workspace
 //***************************************
 
-Group* Workspace::findGroup(Window leader) const
+Group* Workspace::findGroup(xcb_window_t leader) const
 {
     assert(leader != None);
     for (GroupList::ConstIterator it = groups.constBegin();
@@ -419,7 +419,7 @@ void Workspace::updateOnAllDesktopsOfTransients(Client* c)
 }
 
 // A new window has been mapped. Check if it's not a mainwindow for some already existing transient window.
-void Workspace::checkTransients(Window w)
+void Workspace::checkTransients(xcb_window_t w)
 {
     TRANSIENCY_CHECK(NULL);
     for (ClientList::ConstIterator it = clients.constBegin();
diff --git a/workspace.cpp b/workspace.cpp
index e9739228c..e652c68ef 100644
--- a/workspace.cpp
+++ b/workspace.cpp
@@ -519,7 +519,7 @@ Workspace::~Workspace()
     _self = 0;
 }
 
-Client* Workspace::createClient(Window w, bool is_mapped)
+Client* Workspace::createClient(xcb_window_t w, bool is_mapped)
 {
     StackingUpdatesBlocker blocker(this);
     Client* c = new Client(this);
@@ -540,7 +540,7 @@ Client* Workspace::createClient(Window w, bool is_mapped)
     return c;
 }
 
-Unmanaged* Workspace::createUnmanaged(Window w)
+Unmanaged* Workspace::createUnmanaged(xcb_window_t w)
 {
     if (m_compositor && m_compositor->checkForOverlayWindow(w))
         return NULL;
@@ -1331,7 +1331,7 @@ void Workspace::sendClientToScreen(Client* c, int screen)
         sendClientToScreen(*it, screen);
 }
 
-void Workspace::sendPingToWindow(Window window, Time timestamp)
+void Workspace::sendPingToWindow(xcb_window_t window, xcb_timestamp_t timestamp)
 {
     rootInfo->sendPing(window, timestamp);
 }
@@ -1367,7 +1367,7 @@ void Workspace::cancelDelayFocus()
     delayFocusTimer = 0;
 }
 
-bool Workspace::checkStartupNotification(Window w, KStartupInfoId& id, KStartupInfoData& data)
+bool Workspace::checkStartupNotification(xcb_window_t w, KStartupInfoId &id, KStartupInfoData &data)
 {
     return startup->checkStartup(w, id, data) == KStartupInfo::Match;
 }
diff --git a/workspace.h b/workspace.h
index e28c3b316..08e87b529 100644
--- a/workspace.h
+++ b/workspace.h
@@ -231,7 +231,7 @@ public:
 
     void updateMinimizedOfTransients(Client*);
     void updateOnAllDesktopsOfTransients(Client*);
-    void checkTransients(Window w);
+    void checkTransients(xcb_window_t w);
 
     void performWindowOperation(Client* c, WindowOperation op);
 
@@ -252,12 +252,12 @@ public:
     void resetShowingDesktop(bool keep_hidden);
     bool showingDesktop() const;
 
-    void sendPingToWindow(Window w, Time timestamp);   // Called from Client::pingWindow()
+    void sendPingToWindow(xcb_window_t w, xcb_timestamp_t timestamp);   // Called from Client::pingWindow()
     void sendTakeActivity(Client* c, Time timestamp, long flags);   // Called from Client::takeActivity()
 
     void removeClient(Client*);   // Only called from Client::destroyClient() or Client::releaseWindow()
     void setActiveClient(Client*);
-    Group* findGroup(Window leader) const;
+    Group* findGroup(xcb_window_t leader) const;
     void addGroup(Group* group);
     void removeGroup(Group* group);
     Group* findClientLeaderGroup(const Client* c) const;
@@ -266,7 +266,7 @@ public:
     void removeDeleted(Deleted*);
     void addDeleted(Deleted*, Toplevel*);
 
-    bool checkStartupNotification(Window w, KStartupInfoId& id, KStartupInfoData& data);
+    bool checkStartupNotification(xcb_window_t w, KStartupInfoId& id, KStartupInfoData& data);
 
     void focusToNull(); // SELI TODO: Public?
 
@@ -446,12 +446,12 @@ private:
     void saveOldScreenSizes();
 
     /// This is the right way to create a new client
-    Client* createClient(Window w, bool is_mapped);
+    Client* createClient(xcb_window_t w, bool is_mapped);
     void addClient(Client* c);
-    Unmanaged* createUnmanaged(Window w);
+    Unmanaged* createUnmanaged(xcb_window_t w);
     void addUnmanaged(Unmanaged* c);
 
-    Window findSpecialEventWindow(XEvent* e);
+    xcb_window_t findSpecialEventWindow(XEvent* e);
 
     //---------------------------------------------------------------------