diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-01-19 01:42:14 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-01-19 01:42:14 +0000 |
| commit | 8155225c9be993acc0512956416d195edfef4eb9 (patch) | |
| tree | de4f3cd17614fc67e47eefabcdbe2fbe170c9be7 /ksmserver/server.cpp | |
| parent | 364641b8e0279758d236af39abd138d379328a19 (diff) | |
| download | tdebase-8155225c9be993acc0512956416d195edfef4eb9.tar.gz tdebase-8155225c9be993acc0512956416d195edfef4eb9.zip | |
Enable compilation with TQt for Qt4 3.4.0 TP2
This should not break compatibility with TQt for Qt3; if it does please fix it ASAP!
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1215552 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'ksmserver/server.cpp')
| -rw-r--r-- | ksmserver/server.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/ksmserver/server.cpp b/ksmserver/server.cpp index d98faf09a..fc3afb288 100644 --- a/ksmserver/server.cpp +++ b/ksmserver/server.cpp @@ -297,7 +297,7 @@ void KSMGetPropertiesProc ( } -class KSMListener : public QSocketNotifier +class KSMListener : public TQSocketNotifier { public: KSMListener( IceListenObj obj ) @@ -310,7 +310,7 @@ public: IceListenObj listenObj; }; -class KSMConnection : public QSocketNotifier +class KSMConnection : public TQSocketNotifier { public: KSMConnection( IceConn conn ) @@ -632,9 +632,9 @@ KSMServer::KSMServer( const TQString& windowManager, bool _only_local ) TQCString fName = TQFile::encodeName(locateLocal("socket", "KSMserver")); TQCString display = ::getenv("DISPLAY"); // strip the screen number from the display - display.replace(TQRegExp("\\.[0-9]+$"), ""); + display.tqreplace(TQRegExp("\\.[0-9]+$"), ""); int i; - while( (i = display.find(':')) >= 0) + while( (i = display.tqfind(':')) >= 0) display[i] = '_'; fName += "_"+display; @@ -697,9 +697,9 @@ void KSMServer::cleanUp() TQCString fName = TQFile::encodeName(locateLocal("socket", "KSMserver")); TQCString display = ::getenv("DISPLAY"); // strip the screen number from the display - display.replace(TQRegExp("\\.[0-9]+$"), ""); + display.tqreplace(TQRegExp("\\.[0-9]+$"), ""); int i; - while( (i = display.find(':')) >= 0) + while( (i = display.tqfind(':')) >= 0) display[i] = '_'; fName += "_"+display; @@ -761,7 +761,7 @@ KSMClient* KSMServer::newClient( SmsConn conn ) void KSMServer::deleteClient( KSMClient* client ) { - if ( clients.findRef( client ) == -1 ) // paranoia + if ( clients.tqfindRef( client ) == -1 ) // paranoia return; clients.removeRef( client ); if ( client == clientInteracting ) { @@ -868,7 +868,7 @@ void KSMServer::storeSession() TQStringList restartCommand = c->restartCommand(); if (program.isEmpty() && restartCommand.isEmpty()) continue; - if (excludeApps.contains( program.lower())) + if (excludeApps.tqcontains( program.lower())) continue; count++; |