diff options
Diffstat (limited to 'src/common/nokde')
-rw-r--r-- | src/common/nokde/nokde_kcmdlineargs.cpp | 6 | ||||
-rw-r--r-- | src/common/nokde/nokde_kprocess.cpp | 24 | ||||
-rw-r--r-- | src/common/nokde/nokde_kprocess.h | 14 |
3 files changed, 22 insertions, 22 deletions
diff --git a/src/common/nokde/nokde_kcmdlineargs.cpp b/src/common/nokde/nokde_kcmdlineargs.cpp index dea5d6a..6f45ef0 100644 --- a/src/common/nokde/nokde_kcmdlineargs.cpp +++ b/src/common/nokde/nokde_kcmdlineargs.cpp @@ -757,10 +757,10 @@ void TDECmdLineArgs::enable_i18n() { // called twice or too late -/* if (KGlobal::_locale) +/* if (TDEGlobal::_locale) return; - if (!KGlobal::_instance) { + if (!TDEGlobal::_instance) { TDEInstance *instance = new TDEInstance(about); (void) instance->config(); // Don't delete instance! @@ -770,7 +770,7 @@ TDECmdLineArgs::enable_i18n() void TDECmdLineArgs::usage(const TQString &error) { -// assert(KGlobal::_locale); +// assert(TDEGlobal::_locale); # if [[[TQT_VERSION IS DEPRECATED]]]<0x040000 TQCString localError = error.local8Bit(); #else diff --git a/src/common/nokde/nokde_kprocess.cpp b/src/common/nokde/nokde_kprocess.cpp index 8bbb711..ee3e35b 100644 --- a/src/common/nokde/nokde_kprocess.cpp +++ b/src/common/nokde/nokde_kprocess.cpp @@ -11,7 +11,7 @@ # include <signal.h> #endif -KProcess::KProcess(TQObject *parent, const char *name) +TDEProcess::TDEProcess(TQObject *parent, const char *name) : TQObject(parent, name) { _process = new Q3Process(this); @@ -20,7 +20,7 @@ KProcess::KProcess(TQObject *parent, const char *name) connect(_process, TQT_SIGNAL(readyReadStderr()), TQT_SLOT(readyReadStderrSlot())); } -bool KProcess::start() +bool TDEProcess::start() { _process->setArguments(_arguments); TQStringList env; @@ -31,26 +31,26 @@ bool KProcess::start() return _process->start(env.isEmpty() ? 0 : &env); } -void KProcess::processExitedSlot() +void TDEProcess::processExitedSlot() { readyReadStdoutSlot(); readyReadStderrSlot(); emit processExited(this); } -void KProcess::readyReadStdoutSlot() +void TDEProcess::readyReadStdoutSlot() { TQByteArray a = _process->readStdout(); emit receivedStdout(this, a.data(), a.count()); } -void KProcess::readyReadStderrSlot() +void TDEProcess::readyReadStderrSlot() { TQByteArray a = _process->readStderr(); emit receivedStderr(this, a.data(), a.count()); } -bool KProcess::writeStdin(const char *buffer, int len) +bool TDEProcess::writeStdin(const char *buffer, int len) { #if [[[TQT_VERSION IS DEPRECATED]]]<0x040000 TQByteArray a; @@ -62,13 +62,13 @@ bool KProcess::writeStdin(const char *buffer, int len) return true; } -bool KProcess::kill() +bool TDEProcess::kill() { _process->kill(); return true; } -bool KProcess::kill(int n) +bool TDEProcess::kill(int n) { #if defined(Q_OS_UNIX) return ( ::kill(_process->processIdentifier(), n)!=-1 ); @@ -78,22 +78,22 @@ bool KProcess::kill(int n) #endif } -int KProcess::exitStatus() const +int TDEProcess::exitStatus() const { return _process->exitStatus(); } -bool KProcess::isRunning() const +bool TDEProcess::isRunning() const { return _process->isRunning(); } -void KProcess::setWorkingDirectory(const TQDir &dir) +void TDEProcess::setWorkingDirectory(const TQDir &dir) { return _process->setWorkingDirectory(dir); } -void KProcess::setUseShell(bool useShell) +void TDEProcess::setUseShell(bool useShell) { // ### TODO: just issue "/bin/sh" "-c" "command" Q_ASSERT(false); diff --git a/src/common/nokde/nokde_kprocess.h b/src/common/nokde/nokde_kprocess.h index 06d6851..b51d05b 100644 --- a/src/common/nokde/nokde_kprocess.h +++ b/src/common/nokde/nokde_kprocess.h @@ -10,15 +10,15 @@ class TQProcess; class Q3Process; #endif -class KProcess : public TQObject +class TDEProcess : public TQObject { Q_OBJECT public: - KProcess(TQObject *parent = 0, const char *name = 0); + TDEProcess(TQObject *parent = 0, const char *name = 0); void clearArguments() { _arguments.clear(); } - KProcess &operator<< (const TQString &arg) { _arguments += arg; return *this; } - KProcess &operator<< (const TQStringList &args) { _arguments += args; return *this; } + TDEProcess &operator<< (const TQString &arg) { _arguments += arg; return *this; } + TDEProcess &operator<< (const TQStringList &args) { _arguments += args; return *this; } TQStringList args() const { return _arguments; } void setEnvironment(const TQString &name, const TQString &value) { _environment += name + "=" + value; } bool start(); @@ -31,9 +31,9 @@ public: void setUseShell(bool useShell); signals: - void processExited(KProcess *process); - void receivedStdout(KProcess *process, char *buffer, int len); - void receivedStderr(KProcess *process, char *buffer, int len); + void processExited(TDEProcess *process); + void receivedStdout(TDEProcess *process, char *buffer, int len); + void receivedStderr(TDEProcess *process, char *buffer, int len); private slots: void processExitedSlot(); |