From d94de5707e05a0dfb4790086dce556b3d313b79e Mon Sep 17 00:00:00 2001
From: Ivailo Monev <xakepa10@gmail.com>
Date: Thu, 20 Aug 2015 04:39:20 +0300
Subject: [PATCH] kwin: adjust to NETWinInfo changes

---
 kwin/client.cpp    | 2 +-
 kwin/composite.cpp | 2 +-
 kwin/events.cpp    | 2 +-
 kwin/group.cpp     | 2 +-
 kwin/group.h       | 2 +-
 kwin/netinfo.cpp   | 2 +-
 kwin/netinfo.h     | 2 +-
 kwin/toplevel.h    | 2 +-
 kwin/unmanaged.cpp | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/kwin/client.cpp b/kwin/client.cpp
index 2620b2d9..49af633b 100644
--- a/kwin/client.cpp
+++ b/kwin/client.cpp
@@ -2121,7 +2121,7 @@ void Client::updateCompositeBlocking(bool readProperty)
 {
     if (readProperty) {
         const unsigned long properties[2] = {0, NET::WM2BlockCompositing};
-        NETWinInfo2 i(display(), window(), rootWindow(), properties, 2);
+        NETWinInfo i(display(), window(), rootWindow(), properties, 2);
         setBlockingCompositing(i.isBlockingCompositing());
     }
     else
diff --git a/kwin/composite.cpp b/kwin/composite.cpp
index d2c33460..470477c7 100644
--- a/kwin/composite.cpp
+++ b/kwin/composite.cpp
@@ -319,7 +319,7 @@ void Compositor::finish()
             ++it) {
         // forward all opacity values to the frame in case there'll be other CM running
         if ((*it)->opacity() != 1.0) {
-            NETWinInfo2 i(display(), (*it)->frameId(), rootWindow(), 0);
+            NETWinInfo i(display(), (*it)->frameId(), rootWindow(), 0);
             i.setOpacity(static_cast< unsigned long >((*it)->opacity() * 0xffffffff));
         }
     }
diff --git a/kwin/events.cpp b/kwin/events.cpp
index 98adbc00..8bb7bc70 100644
--- a/kwin/events.cpp
+++ b/kwin/events.cpp
@@ -437,7 +437,7 @@ bool Client::windowEvent(XEvent* e)
                 emit opacityChanged(this, old_opacity);
             } else {
                 // forward to the frame if there's possibly another compositing manager running
-                NETWinInfo2 i(display(), frameId(), rootWindow(), 0);
+                NETWinInfo i(display(), frameId(), rootWindow(), 0);
                 i.setOpacity(info->opacity());
             }
         }
diff --git a/kwin/group.cpp b/kwin/group.cpp
index 984e6d5d..c061e234 100644
--- a/kwin/group.cpp
+++ b/kwin/group.cpp
@@ -203,7 +203,7 @@ Group::Group(Window leader_P)
     if (leader_P != None) {
         leader_client = workspace()->findClient(WindowMatchPredicate(leader_P));
         unsigned long properties[ 2 ] = { 0, NET::WM2StartupId };
-        leader_info = new NETWinInfo2(display(), leader_P, rootWindow(),
+        leader_info = new NETWinInfo(display(), leader_P, rootWindow(),
                                       properties, 2);
     }
     effect_group = new EffectWindowGroupImpl(this);
diff --git a/kwin/group.h b/kwin/group.h
index e497fa8d..77bbac0f 100644
--- a/kwin/group.h
+++ b/kwin/group.h
@@ -60,7 +60,7 @@ private:
     ClientList _members;
     Client* leader_client;
     Window leader_wid;
-    NETWinInfo2* leader_info;
+    NETWinInfo* leader_info;
     Time user_time;
     int refcount;
     EffectWindowGroupImpl* effect_group;
diff --git a/kwin/netinfo.cpp b/kwin/netinfo.cpp
index e5699641..ed2a44b1 100644
--- a/kwin/netinfo.cpp
+++ b/kwin/netinfo.cpp
@@ -248,7 +248,7 @@ void RootInfo::changeShowingDesktop(bool showing)
 
 WinInfo::WinInfo(Client * c, Display * display, Window window,
                  Window rwin, const unsigned long pr[], int pr_size)
-    : NETWinInfo2(display, window, rwin, pr, pr_size, NET::WindowManager), m_client(c)
+    : NETWinInfo(display, window, rwin, pr, pr_size, NET::WindowManager), m_client(c)
 {
 }
 
diff --git a/kwin/netinfo.h b/kwin/netinfo.h
index 925d5cd3..49aa0755 100644
--- a/kwin/netinfo.h
+++ b/kwin/netinfo.h
@@ -71,7 +71,7 @@ inline RootInfo *rootInfo()
 /**
  * NET WM Protocol handler class
  */
-class WinInfo : public NETWinInfo2
+class WinInfo : public NETWinInfo
 {
 private:
     typedef KWin::Client Client; // Because of NET::Client
diff --git a/kwin/toplevel.h b/kwin/toplevel.h
index 46999e34..bd53cdd0 100644
--- a/kwin/toplevel.h
+++ b/kwin/toplevel.h
@@ -381,7 +381,7 @@ protected:
     QRect geom;
     Visual* vis;
     int bit_depth;
-    NETWinInfo2* info;
+    NETWinInfo* info;
     bool ready_for_painting;
     QRegion repaints_region; // updating, repaint just requires repaint of that area
     QRegion layer_repaints_region;
diff --git a/kwin/unmanaged.cpp b/kwin/unmanaged.cpp
index a2b9257e..00647d35 100644
--- a/kwin/unmanaged.cpp
+++ b/kwin/unmanaged.cpp
@@ -71,7 +71,7 @@ bool Unmanaged::track(Window w)
     properties[ NETWinInfo::PROTOCOLS2 ] =
         NET::WM2Opacity |
         0;
-    info = new NETWinInfo2(display(), w, rootWindow(), properties, 2);
+    info = new NETWinInfo(display(), w, rootWindow(), properties, 2);
     getResourceClass();
     getWindowRole();
     getWmClientLeader();
-- 
2.11.0