diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-01-13 08:32:36 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-01-13 08:32:36 +0000 |
| commit | f7e71d47719ab6094cf4a9fafffa5ea351973522 (patch) | |
| tree | 30834aa632d442019e14f88685001d94657d060b /kdeui/kdetrayproxy | |
| parent | b31cfd9a1ee986fe2ae9a693f3afd7f171dd897c (diff) | |
| download | tdelibs-f7e71d47719ab6094cf4a9fafffa5ea351973522.tar.gz tdelibs-f7e71d47719ab6094cf4a9fafffa5ea351973522.zip | |
Initial conversion for TQt for Qt4 3.4.0 TP2
This will also compile with TQt for Qt3, and should not cause any problems
with dependent modules such as kdebase. If it does then it needs to be fixed!
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1214149 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kdeui/kdetrayproxy')
| -rw-r--r-- | kdeui/kdetrayproxy/kdetrayproxy.cpp | 16 | ||||
| -rw-r--r-- | kdeui/kdetrayproxy/kdetrayproxy.h | 2 |
2 files changed, 9 insertions, 9 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 ); diff --git a/kdeui/kdetrayproxy/kdetrayproxy.h b/kdeui/kdetrayproxy/kdetrayproxy.h index 49a7164cc..8500bcb4f 100644 --- a/kdeui/kdetrayproxy/kdetrayproxy.h +++ b/kdeui/kdetrayproxy/kdetrayproxy.h @@ -26,7 +26,7 @@ #include <tqwidget.h> class KDETrayProxy - : public QWidget + : public TQWidget { Q_OBJECT public: |