diff options
Diffstat (limited to 'kdesu')
| -rw-r--r-- | kdesu/client.cpp | 10 | ||||
| -rw-r--r-- | kdesu/kcookie.cpp | 2 | ||||
| -rw-r--r-- | kdesu/process.cpp | 8 | ||||
| -rw-r--r-- | kdesu/ssh.cpp | 4 | ||||
| -rw-r--r-- | kdesu/stub.cpp | 2 |
5 files changed, 13 insertions, 13 deletions
diff --git a/kdesu/client.cpp b/kdesu/client.cpp index 5261886fc..b5c9361aa 100644 --- a/kdesu/client.cpp +++ b/kdesu/client.cpp @@ -59,12 +59,12 @@ KDEsuClient::KDEsuClient() } // strip the screen number from the display - display.replace(TQRegExp("\\.[0-9]+$"), ""); + display.tqreplace(TQRegExp("\\.[0-9]+$"), ""); #else TQCString display("QWS"); #endif - sock = TQFile::encodeName(locateLocal("socket", TQString("kdesud_%1").arg(display))); + sock = TQFile::encodeName(locateLocal("socket", TQString("kdesud_%1").arg(display.data()))); d = new KDEsuClientPrivate; connect(); } @@ -169,13 +169,13 @@ TQCString KDEsuClient::escape(const TQCString &str) { TQCString copy = str; int n = 0; - while ((n = copy.find("\\", n)) != -1) + while ((n = copy.tqfind("\\", n)) != -1) { copy.insert(n, '\\'); n += 2; } n = 0; - while ((n = copy.find("\"", n)) != -1) + while ((n = copy.tqfind("\"", 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.find( '\007', index ); + pos = reply.tqfind( '\007', index ); if( pos == -1 ) { if( index == 0 ) diff --git a/kdesu/kcookie.cpp b/kdesu/kcookie.cpp index f60ec7314..60ddcfe3e 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.find(ch, i)) != -1) + while ((pos = line.tqfind(ch, i)) != -1) { result += line.mid(i, pos-i); i = pos+1; diff --git a/kdesu/process.cpp b/kdesu/process.cpp index 06558ce04..cce910c47 100644 --- a/kdesu/process.cpp +++ b/kdesu/process.cpp @@ -179,7 +179,7 @@ TQCString PtyProcess::readLine(bool block) if (!m_Inbuf.isEmpty()) { - pos = m_Inbuf.find('\n'); + pos = m_Inbuf.tqfind('\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.find('\n'); + pos = m_Inbuf.tqfind('\n'); if (pos == -1) { ret = m_Inbuf; @@ -356,7 +356,7 @@ int PtyProcess::exec(const TQCString &command, const QCStringList &args) for(QCStringList::ConstIterator it = d->env.begin(); it != d->env.end(); it++) { - putenv((*it).data()); + putenv(const_cast<TQCString&>(*it).data()); } unsetenv("KDE_FULL_SESSION"); @@ -513,7 +513,7 @@ int PtyProcess::waitForChild() if (!m_Exit.isEmpty()) { // match exit string only at line starts - int pos = output.find(m_Exit); + int pos = output.tqfind(m_Exit.data()); if ((pos >= 0) && ((pos == 0 && lineStart) || (output.at (pos - 1) == '\n'))) { kill(m_Pid, SIGTERM); diff --git a/kdesu/ssh.cpp b/kdesu/ssh.cpp index d39634ac5..03051b826 100644 --- a/kdesu/ssh.cpp +++ b/kdesu/ssh.cpp @@ -156,12 +156,12 @@ TQCString SshProcess::dcopForward() if (srv.isEmpty()) return result; - int i = srv.find('/'); + int i = srv.tqfind('/'); if (i == -1) return result; if (srv.left(i) != "tcp") return result; - int j = srv.find(':', ++i); + int j = srv.tqfind(':', ++i); if (j == -1) return result; TQCString host = srv.mid(i, j-i); diff --git a/kdesu/stub.cpp b/kdesu/stub.cpp index 2af171d72..c7f39c4a8 100644 --- a/kdesu/stub.cpp +++ b/kdesu/stub.cpp @@ -145,7 +145,7 @@ int StubProcess::ConverseStub(int check) it != env.end(); ++it ) { - if( (*it).find( "DESKTOP_STARTUP_ID=" ) == 0 ) + if( (*it).tqfind( "DESKTOP_STARTUP_ID=" ) == 0 ) tmp = (*it).mid( strlen( "DESKTOP_STARTUP_ID=" )); } if( tmp.isEmpty()) |