diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:51:01 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:51:01 -0600 |
commit | b9e542d0c805e9adee3a67e44532d5321032e21e (patch) | |
tree | e82d85b9035cc2ca322911e8a6e38a3bd8b1d431 /lib/util/execcommand.cpp | |
parent | 7a392a04059bd904dab4c78910a6d34aa0b37798 (diff) | |
download | tdevelop-b9e542d0c805e9adee3a67e44532d5321032e21e.tar.gz tdevelop-b9e542d0c805e9adee3a67e44532d5321032e21e.zip |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'lib/util/execcommand.cpp')
-rw-r--r-- | lib/util/execcommand.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/lib/util/execcommand.cpp b/lib/util/execcommand.cpp index 62eb5924..d62cb2e7 100644 --- a/lib/util/execcommand.cpp +++ b/lib/util/execcommand.cpp @@ -32,21 +32,21 @@ ExecCommand::ExecCommand( const TQString& executable, const TQStringList& args, { progressDlg = 0; - proc = new KProcess(); + proc = new TDEProcess(); proc->setWorkingDirectory( workingDir ); for ( TQStringList::ConstIterator it = env.begin(); it != env.end(); ++it ) proc->setEnvironment( (*it).section( '=', 0, 0 ), (*it).section( '=', 1, 1 ) ); *proc << executable; *proc << args; - connect( proc, TQT_SIGNAL(processExited(KProcess*)), + connect( proc, TQT_SIGNAL(processExited(TDEProcess*)), this, TQT_SLOT(processExited()) ); - connect( proc, TQT_SIGNAL(receivedStdout(KProcess*,char*,int)), - this, TQT_SLOT(receivedStdout(KProcess*,char*,int)) ); - connect( proc, TQT_SIGNAL(receivedStderr(KProcess*,char*,int)), - this, TQT_SLOT(receivedStderr(KProcess*,char*,int)) ); + connect( proc, TQT_SIGNAL(receivedStdout(TDEProcess*,char*,int)), + this, TQT_SLOT(receivedStdout(TDEProcess*,char*,int)) ); + connect( proc, TQT_SIGNAL(receivedStderr(TDEProcess*,char*,int)), + this, TQT_SLOT(receivedStderr(TDEProcess*,char*,int)) ); - bool ok = proc->start( KProcess::NotifyOnExit, KProcess::AllOutput ); + bool ok = proc->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ); if ( !ok ) { KMessageBox::error( 0, i18n("Could not invoke \"%1\". Please make sure it is installed correctly").arg( executable ), @@ -63,12 +63,12 @@ ExecCommand::ExecCommand( const TQString& executable, const TQStringList& args, } } -void ExecCommand::receivedStdout (KProcess*, char *buffer, int buflen) +void ExecCommand::receivedStdout (TDEProcess*, char *buffer, int buflen) { out += TQString::fromUtf8( buffer, buflen ); } -void ExecCommand::receivedStderr (KProcess*, char *buffer, int buflen) +void ExecCommand::receivedStderr (TDEProcess*, char *buffer, int buflen) { err += TQString::fromUtf8( buffer, buflen ); } |