diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:47:22 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:47:22 -0600 |
| commit | 28edc0aa2ab09297288186f5bc15765eb7be58c0 (patch) | |
| tree | 7b7a01768b3781763186c825af21bb14717d2c32 /tdecore/kpty.cpp | |
| parent | 07c48c43ff72c237e4028154f4594102b798073f (diff) | |
| download | tdelibs-28edc0aa2ab09297288186f5bc15765eb7be58c0.tar.gz tdelibs-28edc0aa2ab09297288186f5bc15765eb7be58c0.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'tdecore/kpty.cpp')
| -rw-r--r-- | tdecore/kpty.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/tdecore/kpty.cpp b/tdecore/kpty.cpp index f6fc9d5cd..e13540e19 100644 --- a/tdecore/kpty.cpp +++ b/tdecore/kpty.cpp @@ -144,7 +144,7 @@ extern "C" { /////////////////////// #ifdef HAVE_UTEMPTER -class KProcess_Utmp : public KProcess +class TDEProcess_Utmp : public TDEProcess { public: int commSetupDoneC() @@ -440,12 +440,12 @@ void KPty::setCTty() void KPty::login(const char *user, const char *remotehost) { #ifdef HAVE_UTEMPTER - KProcess_Utmp utmp; + TDEProcess_Utmp utmp; utmp.cmdFd = d->masterFd; utmp << "/usr/lib/utempter/utempter" << "add"; if (remotehost) utmp << remotehost; - utmp.start(KProcess::Block); + utmp.start(TDEProcess::Block); Q_UNUSED(user); Q_UNUSED(remotehost); #elif defined(USE_LOGIN) @@ -485,10 +485,10 @@ void KPty::login(const char *user, const char *remotehost) void KPty::logout() { #ifdef HAVE_UTEMPTER - KProcess_Utmp utmp; + TDEProcess_Utmp utmp; utmp.cmdFd = d->masterFd; utmp << "/usr/lib/utempter/utempter" << "del"; - utmp.start(KProcess::Block); + utmp.start(TDEProcess::Block); #elif defined(USE_LOGIN) const char *str_ptr = d->ttyName.data(); if (!memcmp(str_ptr, "/dev/", 5)) @@ -572,8 +572,8 @@ int KPty::slaveFd() const // private bool KPty::chownpty(bool grant) { - KProcess proc; + TDEProcess proc; proc << locate("exe", BASE_CHOWN) << (grant?"--grant":"--revoke") << TQString::number(d->masterFd); - return proc.start(KProcess::Block) && proc.normalExit() && !proc.exitStatus(); + return proc.start(TDEProcess::Block) && proc.normalExit() && !proc.exitStatus(); } |