diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-01-07 04:10:07 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-01-07 04:10:07 +0000 |
| commit | fd3a982e26813f5bcc82c7e89ce6fa2ad44432bf (patch) | |
| tree | 9eda848e56fcb862fdfdf479adeccd95b6fe387a /ksmserver/legacy.cpp | |
| parent | 02f67d0e1355b79b1806746efb0f2f640e57f13d (diff) | |
| download | tdebase-fd3a982e26813f5bcc82c7e89ce6fa2ad44432bf.tar.gz tdebase-fd3a982e26813f5bcc82c7e89ce6fa2ad44432bf.zip | |
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/kdebase@1212480 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'ksmserver/legacy.cpp')
| -rw-r--r-- | ksmserver/legacy.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/ksmserver/legacy.cpp b/ksmserver/legacy.cpp index 3d908f6fd..773cd514d 100644 --- a/ksmserver/legacy.cpp +++ b/ksmserver/legacy.cpp @@ -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.tqcontains(leader) && windowSessionId( *it, leader ).isEmpty()) { + if (!legacyWindows.contains(leader) && windowSessionId( *it, leader ).isEmpty()) { SMType wtype = SM_WMCOMMAND; int nprotocols = 0; Atom *protocols = 0; @@ -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.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") + 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") 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::tqfromLatin1( (const char*)data + i ); + result << TQString::fromLatin1( (const char*)data + i ); while(data[i]) i++; } XFree(data); @@ -365,7 +365,7 @@ TQString KSMServer::windowWmClientMachine(WId w) } } } - return TQString::tqfromLatin1(result); + return TQString::fromLatin1(result); } WId KSMServer::windowWmClientLeader(WId w) |