summaryrefslogtreecommitdiffstats
path: root/kdeui/kdetrayproxy/kdetrayproxy.cpp
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-03 04:12:51 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-03 04:12:51 +0000
commit560378aaca1784ba19806a0414a32b20c744de39 (patch)
treece0dfd7c3febf2a1adc7603d1019a8be2083c415 /kdeui/kdetrayproxy/kdetrayproxy.cpp
parentd4d5af1cdbd3cc65d095e0afc5b1f4260091cf5d (diff)
downloadtdelibs-560378aaca1784ba19806a0414a32b20c744de39.tar.gz
tdelibs-560378aaca1784ba19806a0414a32b20c744de39.zip
Automated conversion for enhanced compatibility with TQt for Qt4 3.4.0 TP1
NOTE: This will not compile with Qt4 (yet), however it does compile with Qt3 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1211081 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kdeui/kdetrayproxy/kdetrayproxy.cpp')
-rw-r--r--kdeui/kdetrayproxy/kdetrayproxy.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/kdeui/kdetrayproxy/kdetrayproxy.cpp b/kdeui/kdetrayproxy/kdetrayproxy.cpp
index e49f3a148..bf2298fd3 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.contains( w ))
+ if( !tray_windows.tqcontains( w ))
tray_windows.append( w );
withdrawWindow( w );
// window will be removed from pending_windows when after docked
- if( !pending_windows.contains( w ))
+ if( !pending_windows.tqcontains( 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.contains( e->xdestroywindow.window ))
+ if( e->type == DestroyNotify && tray_windows.tqcontains( 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.contains( e->xreparent.window ))
+ if( e->type == ReparentNotify && tray_windows.tqcontains( e->xreparent.window ))
{
if( e->xreparent.parent == qt_xrootwin())
{
- if( !docked_windows.contains( e->xreparent.window ) || e->xreparent.serial >= docked_windows[ e->xreparent.window ] )
+ if( !docked_windows.tqcontains( 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.contains( e->xreparent.window ))
+ if( !pending_windows.tqcontains( 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.contains( e->xunmap.window ))
+ if( e->type == UnmapNotify && tray_windows.tqcontains( e->xunmap.window ))
{
- if( docked_windows.contains( e->xunmap.window ) && e->xunmap.serial >= docked_windows[ e->xunmap.window ] )
+ if( docked_windows.tqcontains( 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 );