diff options
Diffstat (limited to 'ksmserver/legacy.cpp')
| -rw-r--r-- | ksmserver/legacy.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/ksmserver/legacy.cpp b/ksmserver/legacy.cpp index 773cd514d..d7838253b 100644 --- a/ksmserver/legacy.cpp +++ b/ksmserver/legacy.cpp @@ -73,7 +73,7 @@ extern Time qt_x_time; static int winsErrorHandler(Display *, XErrorEvent *ev) { if (windowMapPtr) { - WindowMap::Iterator it = windowMapPtr->find(ev->resourceid); + WindowMap::Iterator it = windowMapPtr->tqfind(ev->resourceid); if (it != windowMapPtr->end()) (*it).type = SM_ERROR; } @@ -103,7 +103,7 @@ void KSMServer::performLegacySessionSave() for ( TQValueList<WId>::ConstIterator it = module.windows().begin(); it != module.windows().end(); ++it) { WId leader = windowWmClientLeader( *it ); - if (!legacyWindows.contains(leader) && windowSessionId( *it, leader ).isEmpty()) { + if (!legacyWindows.tqcontains(leader) && windowSessionId( *it, leader ).isEmpty()) { SMType wtype = SM_WMCOMMAND; int nprotocols = 0; Atom *protocols = 0; @@ -167,7 +167,7 @@ void KSMServer::performLegacySessionSave() XNextEvent(newdisplay, &ev); if ( ( ev.xany.type == UnmapNotify ) || ( ev.xany.type == PropertyNotify && ev.xproperty.atom == XA_WM_COMMAND ) ) { - WindowMap::Iterator it = legacyWindows.find( ev.xany.window ); + WindowMap::Iterator it = legacyWindows.tqfind( ev.xany.window ); if ( it != legacyWindows.end() && (*it).type != SM_WMCOMMAND ) { awaiting_replies -= 1; if ( (*it).type != SM_ERROR ) @@ -219,8 +219,8 @@ void KSMServer::storeLegacySession( KConfig* config ) int count = 0; for (WindowMap::ConstIterator it = legacyWindows.begin(); it != legacyWindows.end(); ++it) { if ( (*it).type != SM_ERROR) { - if( excludeApps.contains( (*it).wmclass1.lower()) - || excludeApps.contains( (*it).wmclass2.lower()) || (*it).wmCommand[0] == "compiz" || (*it).wmCommand[0] == "beryl" || (*it).wmCommand[0] == "aquamarine" || (*it).wmCommand[0] == "beryl-manager" || (*it).wmCommand[0] == "beryl-settings" || (*it).wmCommand[0] == "kde-window-decorator" || (*it).wmCommand[0] == "emerald") + if( excludeApps.tqcontains( (*it).wmclass1.lower()) + || excludeApps.tqcontains( (*it).wmclass2.lower()) || (*it).wmCommand[0] == "compiz" || (*it).wmCommand[0] == "beryl" || (*it).wmCommand[0] == "aquamarine" || (*it).wmCommand[0] == "beryl-manager" || (*it).wmCommand[0] == "beryl-settings" || (*it).wmCommand[0] == "kde-window-decorator" || (*it).wmCommand[0] == "emerald") continue; if ( !(*it).wmCommand.isEmpty() && !(*it).wmClientMachine.isEmpty() ) { count++; @@ -317,7 +317,7 @@ static TQStringList getQStringListProperty(WId w, Atom prop) if (!data) return result; for (int i=0; i<(int)nitems; i++) { - result << TQString::fromLatin1( (const char*)data + i ); + result << TQString::tqfromLatin1( (const char*)data + i ); while(data[i]) i++; } XFree(data); @@ -365,7 +365,7 @@ TQString KSMServer::windowWmClientMachine(WId w) } } } - return TQString::fromLatin1(result); + return TQString::tqfromLatin1(result); } WId KSMServer::windowWmClientLeader(WId w) |