diff options
Diffstat (limited to 'kdesu')
| -rw-r--r-- | kdesu/kdesu/kdesu.cpp | 4 | ||||
| -rw-r--r-- | kdesu/kdesu/sudlg.cpp | 4 | ||||
| -rw-r--r-- | kdesu/kdesud/handler.cpp | 6 | ||||
| -rw-r--r-- | kdesu/kdesud/kdesud.cpp | 6 | ||||
| -rw-r--r-- | kdesu/kdesud/repo.cpp | 14 |
5 files changed, 17 insertions, 17 deletions
diff --git a/kdesu/kdesu/kdesu.cpp b/kdesu/kdesu/kdesu.cpp index 67ea55fe9..daa522ee1 100644 --- a/kdesu/kdesu/kdesu.cpp +++ b/kdesu/kdesu/kdesu.cpp @@ -128,7 +128,7 @@ int main(int argc, char *argv[]) if (result == 127) { - KMessageBox::sorry(0, i18n("Command '%1' not found.").arg(command)); + KMessageBox::sorry(0, i18n("Command '%1' not found.").arg(static_cast<const char *>(command))); } return result; @@ -204,7 +204,7 @@ static int startApp() int priority = tmp.toInt(&ok); if (!ok || (priority < 0) || (priority > 100)) { - KCmdLineArgs::usage(i18n("Illegal priority: %1").arg(tmp)); + KCmdLineArgs::usage(i18n("Illegal priority: %1").arg(static_cast<const char *>(tmp))); exit(1); } int scheduler = SuProcess::SchedNormal; diff --git a/kdesu/kdesu/sudlg.cpp b/kdesu/kdesu/sudlg.cpp index f2ec71723..483633739 100644 --- a/kdesu/kdesu/sudlg.cpp +++ b/kdesu/kdesu/sudlg.cpp @@ -26,7 +26,7 @@ KDEsuDialog::KDEsuDialog(TQCString user, TQCString auth_user, bool enableKeep,co } m_User = auth_user; - setCaption(i18n("Run as %1").arg(user)); + setCaption(i18n("Run as %1").arg(static_cast<const char *>(user))); TQString prompt; if (superUserCommand == "sudo" && m_User == "root") { @@ -39,7 +39,7 @@ KDEsuDialog::KDEsuDialog(TQCString user, TQCString auth_user, bool enableKeep,co } else { prompt = i18n("The action you requested needs additional privileges. " "Please enter the password for \"%1\" below or click " - "Ignore to continue with your current privileges.").arg(m_User); + "Ignore to continue with your current privileges.").arg(static_cast<const char *>(m_User)); } } setPrompt(prompt); diff --git a/kdesu/kdesud/handler.cpp b/kdesu/kdesud/handler.cpp index 1d52a58ac..45cce362b 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.find('\n')) != -1) + while ((n = m_Buf.tqfind('\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.contains('x')) + if (options.tqcontains('x')) proc.setXOnly(true); - if (options.contains('f')) + if (options.tqcontains('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 49006a401..e8227269c 100644 --- a/kdesu/kdesud/kdesud.cpp +++ b/kdesu/kdesud/kdesud.cpp @@ -166,9 +166,9 @@ int create_socket() } // strip the screen number from the display - display.replace(TQRegExp("\\.[0-9]+$"), ""); + display.tqreplace(TQRegExp("\\.[0-9]+$"), ""); - sock = TQFile::encodeName(locateLocal("socket", TQString("kdesud_%1").arg(display))); + sock = TQFile::encodeName(locateLocal("socket", TQString("kdesud_%1").arg(static_cast<const char *>(display)))); int stat_err=lstat(sock, &s); if(!stat_err && S_ISLNK(s.st_mode)) { kdWarning(1205) << "Someone is running a symlink attack on you\n"; @@ -400,7 +400,7 @@ int main(int argc, char *argv[]) if (fd+1 > (int) handler.size()) handler.resize(fd+1); handler.insert(fd, new ConnectionHandler(fd)); - maxfd = QMAX(maxfd, fd); + maxfd = TQMAX(maxfd, fd); FD_SET(fd, &active_fds); continue; } diff --git a/kdesu/kdesud/repo.cpp b/kdesu/kdesud/repo.cpp index cdbbcaed1..fb1d7eadb 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.find(key); + RepoIterator it = repo.tqfind(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.find(key); + RepoIterator it = repo.tqfind(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.find( it.data().group ) == 0 && - it.key().find( key ) >= 0 ) + if ( key.tqfind( static_cast<const char *>(it.data().group) ) == 0 && + it.key().tqfind( 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.findRev(sep); + pos = key.tqfindRev(sep); key.truncate( pos ); key.remove(0, 2); if (!list.isEmpty()) { // Add the same keys only once please :) - if( !list.contains(key) ) + if( !list.tqcontains(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.find(key); + RepoCIterator it = repo.tqfind(key); if (it == repo.end()) return 0; return it.data().value; |