diff options
| author | Timothy Pearson <[email protected]> | 2013-01-24 13:19:29 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-24 13:19:29 -0600 |
| commit | 2a3ced9fbd85b4fdbfa9b0a91f8d22e35ceaf6b5 (patch) | |
| tree | 36de2281c8b4cf238a5e27a76b5c6e07f40151ab /plugins/encoder/external | |
| parent | 2a3289ab87c52551fd2f5655492988ca02c17892 (diff) | |
| download | k3b-2a3ced9fbd85b4fdbfa9b0a91f8d22e35ceaf6b5.tar.gz k3b-2a3ced9fbd85b4fdbfa9b0a91f8d22e35ceaf6b5.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'plugins/encoder/external')
| -rw-r--r-- | plugins/encoder/external/k3bexternalencoder.cpp | 8 | ||||
| -rw-r--r-- | plugins/encoder/external/k3bexternalencoder.h | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/plugins/encoder/external/k3bexternalencoder.cpp b/plugins/encoder/external/k3bexternalencoder.cpp index 2290012..f3a1716 100644 --- a/plugins/encoder/external/k3bexternalencoder.cpp +++ b/plugins/encoder/external/k3bexternalencoder.cpp @@ -161,7 +161,7 @@ void K3bExternalEncoder::finishEncoderInternal() } -void K3bExternalEncoder::slotExternalProgramFinished( KProcess* p ) +void K3bExternalEncoder::slotExternalProgramFinished( TDEProcess* p ) { if( !p->normalExit() || p->exitStatus() != 0 ) kdDebug() << "(K3bExternalEncoder) program exited with error." << endl; @@ -207,8 +207,8 @@ bool K3bExternalEncoder::initEncoderInternal( const TQString& extension ) d->process->setSplitStdout(true); d->process->setRawStdin(true); - connect( d->process, TQT_SIGNAL(processExited(KProcess*)), - this, TQT_SLOT(slotExternalProgramFinished(KProcess*)) ); + connect( d->process, TQT_SIGNAL(processExited(TDEProcess*)), + this, TQT_SLOT(slotExternalProgramFinished(TDEProcess*)) ); connect( d->process, TQT_SIGNAL(stderrLine(const TQString&)), this, TQT_SLOT(slotExternalProgramOutputLine(const TQString&)) ); connect( d->process, TQT_SIGNAL(stdoutLine(const TQString&)), @@ -244,7 +244,7 @@ bool K3bExternalEncoder::initEncoderInternal( const TQString& extension ) // set one general error message setLastError( i18n("Command failed: %1").arg( s ) ); - if( d->process->start( KProcess::NotifyOnExit, KProcess::All ) ) { + if( d->process->start( TDEProcess::NotifyOnExit, TDEProcess::All ) ) { if( d->cmd.writeWaveHeader ) return writeWaveHeader(); else diff --git a/plugins/encoder/external/k3bexternalencoder.h b/plugins/encoder/external/k3bexternalencoder.h index 45b9642..1ef865a 100644 --- a/plugins/encoder/external/k3bexternalencoder.h +++ b/plugins/encoder/external/k3bexternalencoder.h @@ -21,7 +21,7 @@ class base_K3bExternalEncoderConfigWidget; -class KProcess; +class TDEProcess; class K3bExternalEncoder : public K3bAudioEncoder @@ -52,7 +52,7 @@ class K3bExternalEncoder : public K3bAudioEncoder class Command; private slots: - void slotExternalProgramFinished( KProcess* ); + void slotExternalProgramFinished( TDEProcess* ); void slotExternalProgramOutputLine( const TQString& ); private: |