summaryrefslogtreecommitdiffstats
path: root/kdesu
diff options
context:
space:
mode:
Diffstat (limited to 'kdesu')
-rw-r--r--kdesu/client.cpp16
-rw-r--r--kdesu/client.h2
-rw-r--r--kdesu/kcookie.cpp2
-rw-r--r--kdesu/kdesu_pty.cpp2
-rw-r--r--kdesu/process.cpp10
-rw-r--r--kdesu/process.h2
-rw-r--r--kdesu/ssh.cpp4
-rw-r--r--kdesu/stub.cpp2
8 files changed, 20 insertions, 20 deletions
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<TQCString> 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<TQCString> 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;
diff --git a/kdesu/client.h b/kdesu/client.h
index a75e56331..c1df06ff1 100644
--- a/kdesu/client.h
+++ b/kdesu/client.h
@@ -134,7 +134,7 @@ public:
* @param group the group key
* @return true if the group is found
*/
- bool tqfindGroup(const TQCString &group);
+ bool findGroup(const TQCString &group);
/**
* Delete a persistent variable.
diff --git a/kdesu/kcookie.cpp b/kdesu/kcookie.cpp
index 60ddcfe3e..f60ec7314 100644
--- a/kdesu/kcookie.cpp
+++ b/kdesu/kcookie.cpp
@@ -54,7 +54,7 @@ QCStringList KCookie::split(const TQCString &line, char ch)
QCStringList result;
int i=0, pos;
- while ((pos = line.tqfind(ch, i)) != -1)
+ while ((pos = line.find(ch, i)) != -1)
{
result += line.mid(i, pos-i);
i = pos+1;
diff --git a/kdesu/kdesu_pty.cpp b/kdesu/kdesu_pty.cpp
index 3ab39e4f7..8f48f0b88 100644
--- a/kdesu/kdesu_pty.cpp
+++ b/kdesu/kdesu_pty.cpp
@@ -5,7 +5,7 @@
* This file is part of the KDE project, module kdesu.
* Copyright (C) 1999,2000 Geert Jansen <jansen@kde.org>
*
- * This file tqcontains code from TEShell.C of the KDE konsole.
+ * This file contains code from TEShell.C of the KDE konsole.
* Copyright (c) 1997,1998 by Lars Doelle <lars.doelle@on-line.de>
*
* This is free software; you can use this library under the GNU Library
diff --git a/kdesu/process.cpp b/kdesu/process.cpp
index 9f23f36fd..06558ce04 100644
--- a/kdesu/process.cpp
+++ b/kdesu/process.cpp
@@ -5,7 +5,7 @@
* This file is part of the KDE project, module kdesu.
* Copyright (C) 1999,2000 Geert Jansen <jansen@kde.org>
*
- * This file tqcontains code from TEShell.C of the KDE konsole.
+ * This file contains code from TEShell.C of the KDE konsole.
* Copyright (c) 1997,1998 by Lars Doelle <lars.doelle@on-line.de>
*
* This is free software; you can use this library under the GNU Library
@@ -179,7 +179,7 @@ TQCString PtyProcess::readLine(bool block)
if (!m_Inbuf.isEmpty())
{
- pos = m_Inbuf.tqfind('\n');
+ pos = m_Inbuf.find('\n');
if (pos == -1)
{
ret = m_Inbuf;
@@ -228,7 +228,7 @@ TQCString PtyProcess::readLine(bool block)
buf[nbytes] = '\000';
m_Inbuf += buf;
- pos = m_Inbuf.tqfind('\n');
+ pos = m_Inbuf.find('\n');
if (pos == -1)
{
ret = m_Inbuf;
@@ -371,7 +371,7 @@ int PtyProcess::exec(const TQCString &command, const QCStringList &args)
// From now on, terminal output goes through the tty.
TQCString path;
- if (command.tqcontains('/'))
+ if (command.contains('/'))
path = command;
else
{
@@ -513,7 +513,7 @@ int PtyProcess::waitForChild()
if (!m_Exit.isEmpty())
{
// match exit string only at line starts
- int pos = output.tqfind(m_Exit);
+ int pos = output.find(m_Exit);
if ((pos >= 0) && ((pos == 0 && lineStart) || (output.at (pos - 1) == '\n')))
{
kill(m_Pid, SIGTERM);
diff --git a/kdesu/process.h b/kdesu/process.h
index 536cb1f4a..c45132a9c 100644
--- a/kdesu/process.h
+++ b/kdesu/process.h
@@ -159,7 +159,7 @@ public: /* static */
** (which may be zero).
** If child @p has not exited, return -2.
*/
- enum checkPidtqStatus { Error=-1, NotExited=-2, Killed=-3 } ;
+ enum checkPidStatus { Error=-1, NotExited=-2, Killed=-3 } ;
static int checkPidExited(pid_t pid);
diff --git a/kdesu/ssh.cpp b/kdesu/ssh.cpp
index 03051b826..d39634ac5 100644
--- a/kdesu/ssh.cpp
+++ b/kdesu/ssh.cpp
@@ -156,12 +156,12 @@ TQCString SshProcess::dcopForward()
if (srv.isEmpty())
return result;
- int i = srv.tqfind('/');
+ int i = srv.find('/');
if (i == -1)
return result;
if (srv.left(i) != "tcp")
return result;
- int j = srv.tqfind(':', ++i);
+ int j = srv.find(':', ++i);
if (j == -1)
return result;
TQCString host = srv.mid(i, j-i);
diff --git a/kdesu/stub.cpp b/kdesu/stub.cpp
index c7f39c4a8..2af171d72 100644
--- a/kdesu/stub.cpp
+++ b/kdesu/stub.cpp
@@ -145,7 +145,7 @@ int StubProcess::ConverseStub(int check)
it != env.end();
++it )
{
- if( (*it).tqfind( "DESKTOP_STARTUP_ID=" ) == 0 )
+ if( (*it).find( "DESKTOP_STARTUP_ID=" ) == 0 )
tmp = (*it).mid( strlen( "DESKTOP_STARTUP_ID=" ));
}
if( tmp.isEmpty())
generated by cgit v1.2.1 (git 2.18.0) at 2024-05-01 18:49:37 +0000