diff options
author | Timothy Pearson <[email protected]> | 2013-01-24 13:47:22 -0600 |
---|---|---|
committer | Timothy Pearson <[email protected]> | 2013-01-24 13:47:22 -0600 |
commit | 28edc0aa2ab09297288186f5bc15765eb7be58c0 (patch) | |
tree | 7b7a01768b3781763186c825af21bb14717d2c32 /interfaces/kscript | |
parent | 07c48c43ff72c237e4028154f4594102b798073f (diff) | |
download | tdelibs-28edc0aa2ab09297288186f5bc15765eb7be58c0.tar.gz tdelibs-28edc0aa2ab09297288186f5bc15765eb7be58c0.zip |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'interfaces/kscript')
-rw-r--r-- | interfaces/kscript/sample/shellscript.cpp | 16 | ||||
-rw-r--r-- | interfaces/kscript/sample/shellscript.h | 8 |
2 files changed, 12 insertions, 12 deletions
diff --git a/interfaces/kscript/sample/shellscript.cpp b/interfaces/kscript/sample/shellscript.cpp index 49aee0727..9ec34f7a2 100644 --- a/interfaces/kscript/sample/shellscript.cpp +++ b/interfaces/kscript/sample/shellscript.cpp @@ -30,10 +30,10 @@ K_EXPORT_COMPONENT_FACTORY( libshellscript, ShellScriptFactory( "ShellScript" ) ShellScript::ShellScript(KScriptClientInterface *parent, const char *, const TQStringList & ) : ScriptClientInterface(parent) { - m_script = new KProcess(); - connect ( m_script, TQT_SIGNAL(processExited(KProcess *)), TQT_SLOT(Exit(KProcess *))); - connect ( m_script, TQT_SIGNAL(receivedStdout(KProcess *, char *, int)), TQT_SLOT(stdOut(KProcess *, char *, int ))); - connect ( m_script, TQT_SIGNAL(receivedStderr(KProcess *, char *, int)), TQT_SLOT(stdErr(KProcess *, char *, int ))); + m_script = new TDEProcess(); + connect ( m_script, TQT_SIGNAL(processExited(TDEProcess *)), TQT_SLOT(Exit(TDEProcess *))); + connect ( m_script, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)), TQT_SLOT(stdOut(TDEProcess *, char *, int ))); + connect ( m_script, TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)), TQT_SLOT(stdErr(TDEProcess *, char *, int ))); // Connect feedback signals and slots //kdDebug() << "Building new script engine" << endl; } @@ -60,7 +60,7 @@ void ShellScript::setScript( const TQString &, const TQString & ) void ShellScript::run(TQObject *, const TQVariant &) { - m_script->start(KProcess::NotifyOnExit,KProcess::All); + m_script->start(TDEProcess::NotifyOnExit,TDEProcess::All); } void ShellScript::kill() { @@ -68,16 +68,16 @@ void ShellScript::kill() m_script->kill(9); // Kill it harder } -void ShellScript::Exit(KProcess *proc) +void ShellScript::Exit(TDEProcess *proc) { ScriptClientInterface->done((KScriptClientInterface::Result)proc->exitStatus(), ""); } -void ShellScript::stdErr(KProcess *, char *buffer, int) +void ShellScript::stdErr(TDEProcess *, char *buffer, int) { ScriptClientInterface->error(buffer); } -void ShellScript::stdOut(KProcess *, char *buffer, int) +void ShellScript::stdOut(TDEProcess *, char *buffer, int) { ScriptClientInterface->output(buffer); } diff --git a/interfaces/kscript/sample/shellscript.h b/interfaces/kscript/sample/shellscript.h index 853a7bd12..2cdaf7e5a 100644 --- a/interfaces/kscript/sample/shellscript.h +++ b/interfaces/kscript/sample/shellscript.h @@ -36,11 +36,11 @@ public: void run(TQObject *context = 0, const TQVariant &arg = 0); void kill(); private slots: - void Exit(KProcess *proc); - void stdErr(KProcess *proc, char *buffer, int buflen); - void stdOut(KProcess *proc, char *buffer, int buflen); + void Exit(TDEProcess *proc); + void stdErr(TDEProcess *proc, char *buffer, int buflen); + void stdOut(TDEProcess *proc, char *buffer, int buflen); private: - KProcess *m_script; + TDEProcess *m_script; KScriptClientInterface *ScriptClientInterface; TQString m_scriptName; }; |