From 10308be19ef7fa44699562cc75946e7ea1fdf6b9 Mon Sep 17 00:00:00 2001 From: tpearson Date: Fri, 7 Jan 2011 03:45:53 +0000 Subject: 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/kdelibs@1212479 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kdesu/client.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'kdesu/client.cpp') diff --git a/kdesu/client.cpp b/kdesu/client.cpp index 30d6cf3e3..5261886fc 100644 --- a/kdesu/client.cpp +++ b/kdesu/client.cpp @@ -59,7 +59,7 @@ KDEsuClient::KDEsuClient() } // strip the screen number from the display - display.tqreplace(TQRegExp("\\.[0-9]+$"), ""); + display.replace(TQRegExp("\\.[0-9]+$"), ""); #else TQCString display("QWS"); #endif @@ -169,13 +169,13 @@ TQCString KDEsuClient::escape(const TQCString &str) { TQCString copy = str; int n = 0; - while ((n = copy.tqfind("\\", n)) != -1) + while ((n = copy.find("\\", n)) != -1) { copy.insert(n, '\\'); n += 2; } n = 0; - while ((n = copy.tqfind("\"", n)) != -1) + while ((n = copy.find("\"", n)) != -1) { copy.insert(n, '\\'); n += 2; @@ -313,7 +313,7 @@ TQValueList KDEsuClient::getKeys(const TQCString &group) // kdDebug(900) << "Found a matching entry: " << reply << endl; while (1) { - pos = reply.tqfind( '\007', index ); + pos = reply.find( '\007', index ); if( pos == -1 ) { if( index == 0 ) @@ -332,7 +332,7 @@ TQValueList KDEsuClient::getKeys(const TQCString &group) return list; } -bool KDEsuClient::tqfindGroup(const TQCString &group) +bool KDEsuClient::findGroup(const TQCString &group) { TQCString cmd = "CHKG "; cmd += escape(group); @@ -385,7 +385,7 @@ int KDEsuClient::stopServer() return command("STOP\n"); } -static TQString tqfindDaemon() +static TQString findDaemon() { TQString daemon = locate("bin", "kdesud"); if (daemon.isEmpty()) // if not in KDEDIRS, rely on PATH @@ -401,7 +401,7 @@ static TQString tqfindDaemon() bool KDEsuClient::isServerSGID() { if (d->daemon.isEmpty()) - d->daemon = tqfindDaemon(); + d->daemon = findDaemon(); if (d->daemon.isEmpty()) return false; @@ -417,7 +417,7 @@ bool KDEsuClient::isServerSGID() int KDEsuClient::startServer() { if (d->daemon.isEmpty()) - d->daemon = tqfindDaemon(); + d->daemon = findDaemon(); if (d->daemon.isEmpty()) return -1; -- cgit v1.2.3