summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--kdesktop/minicli.cpp4
-rw-r--r--kdesktop/minicli.h2
-rw-r--r--tdesu/tdesu/sudlg.cpp8
-rw-r--r--tdesu/tdesu/sudlg.h6
-rw-r--r--tdesu/tdesu/tdesu.cpp10
-rw-r--r--tdesu/tdesud/tdesud.cpp2
6 files changed, 16 insertions, 16 deletions
diff --git a/kdesktop/minicli.cpp b/kdesktop/minicli.cpp
index 86e241391..dc1fa94a2 100644
--- a/kdesktop/minicli.cpp
+++ b/kdesktop/minicli.cpp
@@ -439,7 +439,7 @@ int Minicli::runCommand()
if (!kapp->authorize("shell_access"))
useTerminal = false;
- if( needsKDEsu() )
+ if( needsTDEsu() )
{
TQCString user;
struct passwd *pw;
@@ -983,7 +983,7 @@ void Minicli::slotChangeScheduler(bool enable)
updateAuthLabel();
}
-bool Minicli::needsKDEsu()
+bool Minicli::needsTDEsu()
{
return ((m_dlg->cbPriority->isChecked() && ((m_iPriority > 50) ||
(m_iScheduler != StubProcess::SchedNormal))) ||
diff --git a/kdesktop/minicli.h b/kdesktop/minicli.h
index 35e216028..9d92825c7 100644
--- a/kdesktop/minicli.h
+++ b/kdesktop/minicli.h
@@ -69,7 +69,7 @@ protected slots:
protected:
void loadConfig();
- bool needsKDEsu();
+ bool needsTDEsu();
virtual void keyPressEvent( TQKeyEvent* );
virtual void fontChange( const TQFont & );
diff --git a/tdesu/tdesu/sudlg.cpp b/tdesu/tdesu/sudlg.cpp
index 4ecf0cc1a..934930814 100644
--- a/tdesu/tdesu/sudlg.cpp
+++ b/tdesu/tdesu/sudlg.cpp
@@ -14,7 +14,7 @@
#include <tdesu/su.h>
#include "sudlg.h"
-KDEsuDialog::KDEsuDialog(TQCString user, TQCString auth_user, bool enableKeep,const TQString& icon, bool withIgnoreButton, int timeout)
+TDEsuDialog::TDEsuDialog(TQCString user, TQCString auth_user, bool enableKeep,const TQString& icon, bool withIgnoreButton, int timeout)
: KPasswordDialog(Password, enableKeep, (withIgnoreButton ? User1:NoDefault), icon)
{
TDEConfig* config = TDEGlobal::config();
@@ -63,11 +63,11 @@ KDEsuDialog::KDEsuDialog(TQCString user, TQCString auth_user, bool enableKeep,co
}
-KDEsuDialog::~KDEsuDialog()
+TDEsuDialog::~TDEsuDialog()
{
}
-bool KDEsuDialog::checkPassword(const char *password)
+bool TDEsuDialog::checkPassword(const char *password)
{
SuProcess proc;
proc.setUser(m_User);
@@ -109,7 +109,7 @@ bool KDEsuDialog::checkPassword(const char *password)
}
}
-void KDEsuDialog::slotUser1()
+void TDEsuDialog::slotUser1()
{
done(AsUser);
}
diff --git a/tdesu/tdesu/sudlg.h b/tdesu/tdesu/sudlg.h
index b72186603..32d466105 100644
--- a/tdesu/tdesu/sudlg.h
+++ b/tdesu/tdesu/sudlg.h
@@ -9,14 +9,14 @@
#include <kpassdlg.h>
-class KDEsuDialog
+class TDEsuDialog
: public KPasswordDialog
{
Q_OBJECT
public:
- KDEsuDialog(TQCString user, TQCString auth_user, bool enableKeep, const TQString& icon , bool withIgnoreButton=false, int timeout=-1);
- ~KDEsuDialog();
+ TDEsuDialog(TQCString user, TQCString auth_user, bool enableKeep, const TQString& icon , bool withIgnoreButton=false, int timeout=-1);
+ ~TDEsuDialog();
enum ResultCodes { AsUser = 10 };
diff --git a/tdesu/tdesu/tdesu.cpp b/tdesu/tdesu/tdesu.cpp
index 47673e2b8..d75c0e83a 100644
--- a/tdesu/tdesu/tdesu.cpp
+++ b/tdesu/tdesu/tdesu.cpp
@@ -141,7 +141,7 @@ static int startApp()
// Stop daemon and exit?
if (args->isSet("s"))
{
- KDEsuClient client;
+ TDEsuClient client;
if (client.ping() == -1)
{
kdError(1206) << "Daemon not running -- nothing to stop\n";
@@ -248,7 +248,7 @@ static int startApp()
// Check for daemon and start if necessary
bool just_started = false;
bool have_daemon = true;
- KDEsuClient client;
+ TDEsuClient client;
if (!client.isServerSGID())
{
kdWarning(1206) << "Daemon not safe (not sgid), not using it.\n";
@@ -352,7 +352,7 @@ static int startApp()
TDEStartupInfoData data;
data.setSilent( TDEStartupInfoData::Yes );
TDEStartupInfo::sendChange( id, data );
- KDEsuDialog dlg(user, auth_user, keep && !terminal,icon, withIgnoreButton, timeout);
+ TDEsuDialog dlg(user, auth_user, keep && !terminal,icon, withIgnoreButton, timeout);
if (prompt)
dlg.addLine(i18n("Command:"), command);
if ((priority != 50) || (scheduler != SuProcess::SchedNormal))
@@ -365,12 +365,12 @@ static int startApp()
dlg.addLine(i18n("Priority:"), prio);
}
int ret = dlg.exec();
- if (ret == KDEsuDialog::Rejected)
+ if (ret == TDEsuDialog::Rejected)
{
TDEStartupInfo::sendFinish( id );
exit(0);
}
- if (ret == KDEsuDialog::AsUser)
+ if (ret == TDEsuDialog::AsUser)
change_uid = false;
password = dlg.password();
keep = dlg.keep();
diff --git a/tdesu/tdesud/tdesud.cpp b/tdesu/tdesud/tdesud.cpp
index 592fb9ffe..92295445e 100644
--- a/tdesu/tdesud/tdesud.cpp
+++ b/tdesu/tdesud/tdesud.cpp
@@ -180,7 +180,7 @@ int create_socket()
if (!access(sock, R_OK|W_OK))
{
- KDEsuClient client;
+ TDEsuClient client;
if (client.ping() == -1)
{
kdWarning(1205) << "stale socket exists\n";