summaryrefslogtreecommitdiffstats
path: root/kdesu
diff options
context:
space:
mode:
Diffstat (limited to 'kdesu')
-rw-r--r--kdesu/kdesud/handler.cpp6
-rw-r--r--kdesu/kdesud/kdesud.cpp2
-rw-r--r--kdesu/kdesud/repo.cpp14
3 files changed, 11 insertions, 11 deletions
diff --git a/kdesu/kdesud/handler.cpp b/kdesu/kdesud/handler.cpp
index 45cce362b..1d52a58ac 100644
--- a/kdesu/kdesud/handler.cpp
+++ b/kdesu/kdesud/handler.cpp
@@ -87,7 +87,7 @@ int ConnectionHandler::handle()
// Do we have a complete command yet?
int n;
TQCString newbuf;
- while ((n = m_Buf.tqfind('\n')) != -1)
+ while ((n = m_Buf.find('\n')) != -1)
{
newbuf = m_Buf.left(n+1);
m_Buf.fill('x', n+1);
@@ -304,9 +304,9 @@ int ConnectionHandler::doCommand(TQCString buf)
SuProcess proc;
proc.setCommand(command);
proc.setUser(user);
- if (options.tqcontains('x'))
+ if (options.contains('x'))
proc.setXOnly(true);
- if (options.tqcontains('f'))
+ if (options.contains('f'))
proc.setDCOPForwarding(true);
proc.setPriority(m_Priority);
proc.setScheduler(m_Scheduler);
diff --git a/kdesu/kdesud/kdesud.cpp b/kdesu/kdesud/kdesud.cpp
index e8227269c..f4b4081e9 100644
--- a/kdesu/kdesud/kdesud.cpp
+++ b/kdesu/kdesud/kdesud.cpp
@@ -166,7 +166,7 @@ int create_socket()
}
// strip the screen number from the display
- display.tqreplace(TQRegExp("\\.[0-9]+$"), "");
+ display.replace(TQRegExp("\\.[0-9]+$"), "");
sock = TQFile::encodeName(locateLocal("socket", TQString("kdesud_%1").arg(static_cast<const char *>(display))));
int stat_err=lstat(sock, &s);
diff --git a/kdesu/kdesud/repo.cpp b/kdesu/kdesud/repo.cpp
index fb1d7eadb..cc0f79ae5 100644
--- a/kdesu/kdesud/repo.cpp
+++ b/kdesu/kdesud/repo.cpp
@@ -27,7 +27,7 @@ Repository::~Repository()
void Repository::add(const TQCString &key, Data_entry &data)
{
- RepoIterator it = repo.tqfind(key);
+ RepoIterator it = repo.find(key);
if (it != repo.end())
remove(key);
if (data.timeout == 0)
@@ -43,7 +43,7 @@ int Repository::remove(const TQCString &key)
if( key.isEmpty() )
return -1;
- RepoIterator it = repo.tqfind(key);
+ RepoIterator it = repo.find(key);
if (it == repo.end())
return -1;
it.data().value.fill('x');
@@ -60,8 +60,8 @@ int Repository::removeSpecialKey(const TQCString &key)
TQValueStack<TQCString> rm_keys;
for (RepoCIterator it=repo.begin(); it!=repo.end(); ++it)
{
- if ( key.tqfind( static_cast<const char *>(it.data().group) ) == 0 &&
- it.key().tqfind( static_cast<const char *>(key) ) >= 0 )
+ if ( key.find( static_cast<const char *>(it.data().group) ) == 0 &&
+ it.key().find( static_cast<const char *>(key) ) >= 0 )
{
rm_keys.push(it.key());
found = 0;
@@ -128,13 +128,13 @@ TQCString Repository::findKeys(const TQCString &group, const char *sep ) const
{
key = it.key().copy();
kdDebug(1205) << "Matching key found: " << key << endl;
- pos = key.tqfindRev(sep);
+ pos = key.findRev(sep);
key.truncate( pos );
key.remove(0, 2);
if (!list.isEmpty())
{
// Add the same keys only once please :)
- if( !list.tqcontains(static_cast<const char *>(key)) )
+ if( !list.contains(static_cast<const char *>(key)) )
{
kdDebug(1205) << "Key added to list: " << key << endl;
list += '\007'; // I do not know
@@ -154,7 +154,7 @@ TQCString Repository::find(const TQCString &key) const
if( key.isEmpty() )
return 0;
- RepoCIterator it = repo.tqfind(key);
+ RepoCIterator it = repo.find(key);
if (it == repo.end())
return 0;
return it.data().value;