From 10308be19ef7fa44699562cc75946e7ea1fdf6b9 Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Fri, 7 Jan 2011 03:45:53 +0000
Subject: Revert automated changes Sorry guys, they are just not ready for
 prime time Work will continue as always

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1212479 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
---
 kdeui/kdetrayproxy/kdetrayproxy.cpp | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'kdeui/kdetrayproxy')

diff --git a/kdeui/kdetrayproxy/kdetrayproxy.cpp b/kdeui/kdetrayproxy/kdetrayproxy.cpp
index bf2298fd3..e49f3a148 100644
--- a/kdeui/kdetrayproxy/kdetrayproxy.cpp
+++ b/kdeui/kdetrayproxy/kdetrayproxy.cpp
@@ -57,11 +57,11 @@ void KDETrayProxy::windowAdded( WId w )
     if ( !trayWinFor ) // not a KDE tray window
         return;
 //    kdDebug() << "New tray window:" << w << endl;
-    if( !tray_windows.tqcontains( w ))
+    if( !tray_windows.contains( w ))
         tray_windows.append( w );
     withdrawWindow( w );
     // window will be removed from pending_windows when after docked
-    if( !pending_windows.tqcontains( w ))
+    if( !pending_windows.contains( w ))
         pending_windows.append( w );
     docked_windows.remove( w );
     Window owner = selection.owner();
@@ -87,21 +87,21 @@ bool KDETrayProxy::x11Event( XEvent* e )
     {
     if( tray_windows.isEmpty())
         return false;
-    if( e->type == DestroyNotify && tray_windows.tqcontains( e->xdestroywindow.window ))
+    if( e->type == DestroyNotify && tray_windows.contains( e->xdestroywindow.window ))
         {
         tray_windows.remove( e->xdestroywindow.window );
         pending_windows.remove( e->xdestroywindow.window );
         docked_windows.remove( e->xdestroywindow.window );
         }
-    if( e->type == ReparentNotify && tray_windows.tqcontains( e->xreparent.window ))
+    if( e->type == ReparentNotify && tray_windows.contains( e->xreparent.window ))
         {
         if( e->xreparent.parent == qt_xrootwin())
             {
-            if( !docked_windows.tqcontains( e->xreparent.window ) || e->xreparent.serial >= docked_windows[ e->xreparent.window ] )
+            if( !docked_windows.contains( e->xreparent.window ) || e->xreparent.serial >= docked_windows[ e->xreparent.window ] )
                 {
 //                kdDebug() << "Window released:" << e->xreparent.window << endl;
                 docked_windows.remove( e->xreparent.window );
-                if( !pending_windows.tqcontains( e->xreparent.window ))
+                if( !pending_windows.contains( e->xreparent.window ))
                     pending_windows.append( e->xreparent.window );
                 }
             }
@@ -111,9 +111,9 @@ bool KDETrayProxy::x11Event( XEvent* e )
             pending_windows.remove( e->xreparent.window );
             }
         }
-    if( e->type == UnmapNotify && tray_windows.tqcontains( e->xunmap.window ))
+    if( e->type == UnmapNotify && tray_windows.contains( e->xunmap.window ))
         {
-        if( docked_windows.tqcontains( e->xunmap.window ) && e->xunmap.serial >= docked_windows[ e->xunmap.window ] )
+        if( docked_windows.contains( e->xunmap.window ) && e->xunmap.serial >= docked_windows[ e->xunmap.window ] )
             {
 //            kdDebug() << "Window unmapped:" << e->xunmap.window << endl;
             XReparentWindow( qt_xdisplay(), e->xunmap.window, qt_xrootwin(), 0, 0 );
-- 
cgit v1.2.1