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/sox | |
| 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/sox')
| -rw-r--r-- | plugins/encoder/sox/k3bsoxencoder.cpp | 12 | ||||
| -rw-r--r-- | plugins/encoder/sox/k3bsoxencoder.h | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/plugins/encoder/sox/k3bsoxencoder.cpp b/plugins/encoder/sox/k3bsoxencoder.cpp index ee69541..37b5a66 100644 --- a/plugins/encoder/sox/k3bsoxencoder.cpp +++ b/plugins/encoder/sox/k3bsoxencoder.cpp @@ -68,11 +68,11 @@ class K3bSoxProgram : public K3bExternalProgram K3bExternalBin* bin = 0; // probe version - KProcess vp; + TDEProcess vp; K3bProcessOutputCollector out( &vp ); vp << path << "-h"; - if( vp.start( KProcess::Block, KProcess::AllOutput ) ) { + if( vp.start( TDEProcess::Block, TDEProcess::AllOutput ) ) { int pos = out.output().find( "sox: SoX Version" ); if ( pos < 0 ) pos = out.output().find( "sox: SoX v" ); // newer sox versions @@ -153,7 +153,7 @@ void K3bSoxEncoder::finishEncoderInternal() } -void K3bSoxEncoder::slotSoxFinished( KProcess* p ) +void K3bSoxEncoder::slotSoxFinished( TDEProcess* p ) { if( !p->normalExit() || p->exitStatus() != 0 ) kdDebug() << "(K3bSoxEncoder) sox exited with error." << endl; @@ -182,8 +182,8 @@ bool K3bSoxEncoder::initEncoderInternal( const TQString& extension ) d->process->setSplitStdout(true); d->process->setRawStdin(true); - connect( d->process, TQT_SIGNAL(processExited(KProcess*)), - this, TQT_SLOT(slotSoxFinished(KProcess*)) ); + connect( d->process, TQT_SIGNAL(processExited(TDEProcess*)), + this, TQT_SLOT(slotSoxFinished(TDEProcess*)) ); connect( d->process, TQT_SIGNAL(stderrLine(const TQString&)), this, TQT_SLOT(slotSoxOutputLine(const TQString&)) ); connect( d->process, TQT_SIGNAL(stdoutLine(const TQString&)), @@ -240,7 +240,7 @@ bool K3bSoxEncoder::initEncoderInternal( const TQString& extension ) kdDebug() << s << flush << endl; - return d->process->start( KProcess::NotifyOnExit, KProcess::All ); + return d->process->start( TDEProcess::NotifyOnExit, TDEProcess::All ); } else { kdDebug() << "(K3bSoxEncoder) could not find sox bin." << endl; diff --git a/plugins/encoder/sox/k3bsoxencoder.h b/plugins/encoder/sox/k3bsoxencoder.h index 22faf85..a34271f 100644 --- a/plugins/encoder/sox/k3bsoxencoder.h +++ b/plugins/encoder/sox/k3bsoxencoder.h @@ -22,7 +22,7 @@ class base_K3bSoxEncoderConfigWidget; -class KProcess; +class TDEProcess; class K3bSoxEncoder : public K3bAudioEncoder { @@ -51,7 +51,7 @@ class K3bSoxEncoder : public K3bAudioEncoder void closeFile(); private slots: - void slotSoxFinished( KProcess* ); + void slotSoxFinished( TDEProcess* ); void slotSoxOutputLine( const TQString& ); private: |