summaryrefslogtreecommitdiffstats
path: root/tdesu
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:47:22 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:47:22 -0600
commit28edc0aa2ab09297288186f5bc15765eb7be58c0 (patch)
tree7b7a01768b3781763186c825af21bb14717d2c32 /tdesu
parent07c48c43ff72c237e4028154f4594102b798073f (diff)
downloadtdelibs-28edc0aa2ab09297288186f5bc15765eb7be58c0.tar.gz
tdelibs-28edc0aa2ab09297288186f5bc15765eb7be58c0.zip
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'tdesu')
-rw-r--r--tdesu/kcookie.cpp4
-rw-r--r--tdesu/process.cpp2
-rw-r--r--tdesu/su.cpp6
3 files changed, 6 insertions, 6 deletions
diff --git a/tdesu/kcookie.cpp b/tdesu/kcookie.cpp
index 99b34ec4..f5a2d547 100644
--- a/tdesu/kcookie.cpp
+++ b/tdesu/kcookie.cpp
@@ -100,7 +100,7 @@ void KCookie::getXCookie()
if (!memcmp(disp.data(), "localhost:", 10))
disp.remove(0, 9);
- TQString cmd = "xauth list "+KProcess::quote(disp);
+ TQString cmd = "xauth list "+TDEProcess::quote(disp);
blockSigChild(); // pclose uses waitpid()
if (!(f = popen(TQFile::encodeName(cmd), "r")))
{
@@ -163,7 +163,7 @@ void KCookie::getICECookie()
if (strncmp((*it).data(), m_dcopTransport.data(), m_dcopTransport.length()) != 0)
continue;
m_DCOPSrv = *it;
- TQCString cmd = DCOPClient::iceauthPath()+" list netid="+TQFile::encodeName(KProcess::quote(m_DCOPSrv));
+ TQCString cmd = DCOPClient::iceauthPath()+" list netid="+TQFile::encodeName(TDEProcess::quote(m_DCOPSrv));
blockSigChild();
if (!(f = popen(cmd, "r")))
{
diff --git a/tdesu/process.cpp b/tdesu/process.cpp
index 692c0155..f1b35339 100644
--- a/tdesu/process.cpp
+++ b/tdesu/process.cpp
@@ -74,7 +74,7 @@ int PtyProcess::waitMS(int fd,int ms)
*/
bool PtyProcess::checkPid(pid_t pid)
{
- KConfig* config = KGlobal::config();
+ KConfig* config = TDEGlobal::config();
config->setGroup("super-user-command");
TQString superUserCommand = config->readEntry("super-user-command", DEFAULT_SUPER_USER_COMMAND);
//sudo does not accept signals from user so we except it
diff --git a/tdesu/su.cpp b/tdesu/su.cpp
index c4e75772..5f8d2483 100644
--- a/tdesu/su.cpp
+++ b/tdesu/su.cpp
@@ -55,7 +55,7 @@ SuProcess::SuProcess(const TQCString &user, const TQCString &command)
m_User = user;
m_Command = command;
- KConfig* config = KGlobal::config();
+ KConfig* config = TDEGlobal::config();
config->setGroup("super-user-command");
superUserCommand = config->readEntry("super-user-command", DEFAULT_SUPER_USER_COMMAND);
if ( superUserCommand != "sudo" && superUserCommand != "su" ) {
@@ -128,8 +128,8 @@ int SuProcess::exec(const char *password, int check)
if (::access(command, X_OK) != 0)
{
- /// command = TQFile::encodeName(KGlobal::dirs()->findExe("su"));
- command = TQFile::encodeName( KGlobal::dirs()->findExe(superUserCommand.ascii()) );
+ /// command = TQFile::encodeName(TDEGlobal::dirs()->findExe("su"));
+ command = TQFile::encodeName( TDEGlobal::dirs()->findExe(superUserCommand.ascii()) );
if (command.isEmpty())
return check ? SuNotFound : -1;
}