diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:19:29 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:19:29 -0600 |
commit | 2a3ced9fbd85b4fdbfa9b0a91f8d22e35ceaf6b5 (patch) | |
tree | 36de2281c8b4cf238a5e27a76b5c6e07f40151ab /libk3b/projects | |
parent | 2a3289ab87c52551fd2f5655492988ca02c17892 (diff) | |
download | k3b-2a3ced9fbd85b4fdbfa9b0a91f8d22e35ceaf6b5.tar.gz k3b-2a3ced9fbd85b4fdbfa9b0a91f8d22e35ceaf6b5.zip |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'libk3b/projects')
20 files changed, 75 insertions, 75 deletions
diff --git a/libk3b/projects/audiocd/k3baudionormalizejob.cpp b/libk3b/projects/audiocd/k3baudionormalizejob.cpp index d78862e..89fdb99 100644 --- a/libk3b/projects/audiocd/k3baudionormalizejob.cpp +++ b/libk3b/projects/audiocd/k3baudionormalizejob.cpp @@ -50,7 +50,7 @@ void K3bAudioNormalizeJob::start() m_process = new K3bProcess(); connect( m_process, TQT_SIGNAL(stderrLine(const TQString&)), this, TQT_SLOT(slotStdLine(const TQString&)) ); - connect( m_process, TQT_SIGNAL(processExited(KProcess*)), this, TQT_SLOT(slotProcessExited(KProcess*)) ); + connect( m_process, TQT_SIGNAL(processExited(TDEProcess*)), this, TQT_SLOT(slotProcessExited(TDEProcess*)) ); const K3bExternalBin* bin = k3bcore->externalBinManager()->binObject( "normalize-audio" ); @@ -79,7 +79,7 @@ void K3bAudioNormalizeJob::start() *m_process << m_files[i]; // now start the process - if( !m_process->start( KProcess::NotifyOnExit, KProcess::AllOutput ) ) { + if( !m_process->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) ) { // something went wrong when starting the program // it "should" be the executable kdDebug() << "(K3bAudioNormalizeJob) could not start normalize-audio" << endl; @@ -175,7 +175,7 @@ void K3bAudioNormalizeJob::slotStdLine( const TQString& line ) } -void K3bAudioNormalizeJob::slotProcessExited( KProcess* p ) +void K3bAudioNormalizeJob::slotProcessExited( TDEProcess* p ) { if( p->normalExit() ) { switch( p->exitStatus() ) { diff --git a/libk3b/projects/audiocd/k3baudionormalizejob.h b/libk3b/projects/audiocd/k3baudionormalizejob.h index db033e2..f4340b1 100644 --- a/libk3b/projects/audiocd/k3baudionormalizejob.h +++ b/libk3b/projects/audiocd/k3baudionormalizejob.h @@ -23,7 +23,7 @@ #include <tqvaluevector.h> class K3bProcess; -class KProcess; +class TDEProcess; class K3bAudioNormalizeJob : public K3bJob @@ -43,7 +43,7 @@ class K3bAudioNormalizeJob : public K3bJob private slots: void slotStdLine( const TQString& line ); - void slotProcessExited( KProcess* p ); + void slotProcessExited( TDEProcess* p ); private: K3bProcess* m_process; diff --git a/libk3b/projects/datacd/k3bisoimager.cpp b/libk3b/projects/datacd/k3bisoimager.cpp index d83581c..6b1de51 100644 --- a/libk3b/projects/datacd/k3bisoimager.cpp +++ b/libk3b/projects/datacd/k3bisoimager.cpp @@ -155,7 +155,7 @@ void K3bIsoImager::handleMkisofsInfoMessage( const TQString& line, int type ) } -void K3bIsoImager::slotProcessExited( KProcess* p ) +void K3bIsoImager::slotProcessExited( TDEProcess* p ) { kdDebug() << k_funcinfo << endl; @@ -340,11 +340,11 @@ void K3bIsoImager::startSizeCalculation() // TODO: use K3bProcess::OutputCollector instead iof our own two slots. - connect( m_process, TQT_SIGNAL(receivedStderr(KProcess*, char*, int)), - this, TQT_SLOT(slotCollectMkisofsPrintSizeStderr(KProcess*, char*, int)) ); + connect( m_process, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)), + this, TQT_SLOT(slotCollectMkisofsPrintSizeStderr(TDEProcess*, char*, int)) ); connect( m_process, TQT_SIGNAL(stdoutLine(const TQString&)), this, TQT_SLOT(slotCollectMkisofsPrintSizeStdout(const TQString&)) ); - connect( m_process, TQT_SIGNAL(processExited(KProcess*)), + connect( m_process, TQT_SIGNAL(processExited(TDEProcess*)), this, TQT_SLOT(slotMkisofsPrintSizeFinished()) ); // we also want error messages @@ -355,7 +355,7 @@ void K3bIsoImager::startSizeCalculation() m_collectedMkisofsPrintSizeStderr = TQString(); m_mkisofsPrintSizeResult = 0; - if( !m_process->start( KProcess::NotifyOnExit, KProcess::AllOutput ) ) { + if( !m_process->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) ) { emit infoMessage( i18n("Could not start %1.").arg("mkisofs"), K3bJob::ERROR ); cleanup(); @@ -365,7 +365,7 @@ void K3bIsoImager::startSizeCalculation() } -void K3bIsoImager::slotCollectMkisofsPrintSizeStderr(KProcess*, char* data , int len) +void K3bIsoImager::slotCollectMkisofsPrintSizeStderr(TDEProcess*, char* data , int len) { emit debuggingOutput( "mkisofs", TQString::fromLocal8Bit( data, len ) ); m_collectedMkisofsPrintSizeStderr.append( TQString::fromLocal8Bit( data, len ) ); @@ -485,8 +485,8 @@ void K3bIsoImager::start() return; } - connect( m_process, TQT_SIGNAL(processExited(KProcess*)), - this, TQT_SLOT(slotProcessExited(KProcess*)) ); + connect( m_process, TQT_SIGNAL(processExited(TDEProcess*)), + this, TQT_SLOT(slotProcessExited(TDEProcess*)) ); connect( m_process, TQT_SIGNAL(stderrLine( const TQString& )), this, TQT_SLOT(slotReceivedStderr( const TQString& )) ); @@ -528,7 +528,7 @@ void K3bIsoImager::start() kdDebug() << s << endl << flush; emit debuggingOutput("mkisofs command:", s); - if( !m_process->start( KProcess::NotifyOnExit, KProcess::AllOutput) ) { + if( !m_process->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput) ) { // something went wrong when starting the program // it "should" be the executable kdDebug() << "(K3bIsoImager) could not start mkisofs" << endl; diff --git a/libk3b/projects/datacd/k3bisoimager.h b/libk3b/projects/datacd/k3bisoimager.h index 51bee7b..42277c2 100644 --- a/libk3b/projects/datacd/k3bisoimager.h +++ b/libk3b/projects/datacd/k3bisoimager.h @@ -28,7 +28,7 @@ class K3bDataItem; class K3bFileItem; class TQTextStream; class K3bProcess; -class KProcess; +class TDEProcess; class K3bDevice::Device; class KTempFile; @@ -146,10 +146,10 @@ class K3bIsoImager : public K3bJob, public K3bMkisofsHandler protected slots: virtual void slotReceivedStderr( const TQString& ); - virtual void slotProcessExited( KProcess* ); + virtual void slotProcessExited( TDEProcess* ); private slots: - void slotCollectMkisofsPrintSizeStderr(KProcess*, char*, int); + void slotCollectMkisofsPrintSizeStderr(TDEProcess*, char*, int); void slotCollectMkisofsPrintSizeStdout( const TQString& ); void slotMkisofsPrintSizeFinished(); void slotDataPreparationDone( bool success ); diff --git a/libk3b/projects/datacd/k3bmsinfofetcher.cpp b/libk3b/projects/datacd/k3bmsinfofetcher.cpp index 3aa90b3..e81c98b 100644 --- a/libk3b/projects/datacd/k3bmsinfofetcher.cpp +++ b/libk3b/projects/datacd/k3bmsinfofetcher.cpp @@ -79,7 +79,7 @@ void K3bMsInfoFetcher::start() void K3bMsInfoFetcher::getMsInfo() { delete m_process; - m_process = new KProcess(); + m_process = new TDEProcess(); const K3bExternalBin* bin = 0; if( m_dvd ) { @@ -116,18 +116,18 @@ void K3bMsInfoFetcher::getMsInfo() emit debuggingOutput( "msinfo command:", s ); - // connect( m_process, TQT_SIGNAL(receivedStderr(KProcess*, char*, int)), - // this, TQT_SLOT(slotCollectOutput(KProcess*, char*, int)) ); - connect( m_process, TQT_SIGNAL(receivedStdout(KProcess*, char*, int)), - this, TQT_SLOT(slotCollectOutput(KProcess*, char*, int)) ); - connect( m_process, TQT_SIGNAL(processExited(KProcess*)), + // connect( m_process, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)), + // this, TQT_SLOT(slotCollectOutput(TDEProcess*, char*, int)) ); + connect( m_process, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)), + this, TQT_SLOT(slotCollectOutput(TDEProcess*, char*, int)) ); + connect( m_process, TQT_SIGNAL(processExited(TDEProcess*)), this, TQT_SLOT(slotProcessExited()) ); m_msInfo = TQString(); m_collectedOutput = TQString(); m_canceled = false; - if( !m_process->start( KProcess::NotifyOnExit, KProcess::AllOutput ) ) { + if( !m_process->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) ) { emit infoMessage( i18n("Could not start %1.").arg(bin->name()), K3bJob::ERROR ); jobFinished(false); } @@ -218,7 +218,7 @@ void K3bMsInfoFetcher::slotProcessExited() } -void K3bMsInfoFetcher::slotCollectOutput( KProcess*, char* output, int len ) +void K3bMsInfoFetcher::slotCollectOutput( TDEProcess*, char* output, int len ) { emit debuggingOutput( "msinfo", TQString::fromLocal8Bit( output, len ) ); diff --git a/libk3b/projects/datacd/k3bmsinfofetcher.h b/libk3b/projects/datacd/k3bmsinfofetcher.h index a661519..88a174f 100644 --- a/libk3b/projects/datacd/k3bmsinfofetcher.h +++ b/libk3b/projects/datacd/k3bmsinfofetcher.h @@ -22,7 +22,7 @@ namespace K3bDevice { class Device; class DeviceHandler; } -class KProcess; +class TDEProcess; class K3bMsInfoFetcher : public K3bJob { @@ -45,7 +45,7 @@ class K3bMsInfoFetcher : public K3bJob private slots: void slotProcessExited(); - void slotCollectOutput( KProcess*, char* output, int len ); + void slotCollectOutput( TDEProcess*, char* output, int len ); void slotMediaDetectionFinished( K3bDevice::DeviceHandler* ); void getMsInfo(); @@ -55,7 +55,7 @@ class K3bMsInfoFetcher : public K3bJob int m_nextSessionStart; TQString m_collectedOutput; - KProcess* m_process; + TDEProcess* m_process; K3bDevice::Device* m_device; bool m_canceled; diff --git a/libk3b/projects/datadvd/k3bdvdbooktypejob.cpp b/libk3b/projects/datadvd/k3bdvdbooktypejob.cpp index 358bfde..cefafdf 100644 --- a/libk3b/projects/datadvd/k3bdvdbooktypejob.cpp +++ b/libk3b/projects/datadvd/k3bdvdbooktypejob.cpp @@ -177,7 +177,7 @@ void K3bDvdBooktypeJob::slotStderrLine( const TQString& line ) } -void K3bDvdBooktypeJob::slotProcessFinished( KProcess* p ) +void K3bDvdBooktypeJob::slotProcessFinished( TDEProcess* p ) { if( d->canceled ) { emit canceled(); @@ -281,7 +281,7 @@ void K3bDvdBooktypeJob::startBooktypeChange() d->process->setRunPrivileged(true); d->process->setSuppressEmptyLines(true); connect( d->process, TQT_SIGNAL(stderrLine(const TQString&)), this, TQT_SLOT(slotStderrLine(const TQString&)) ); - connect( d->process, TQT_SIGNAL(processExited(KProcess*)), this, TQT_SLOT(slotProcessFinished(KProcess*)) ); + connect( d->process, TQT_SIGNAL(processExited(TDEProcess*)), this, TQT_SLOT(slotProcessFinished(TDEProcess*)) ); d->dvdBooktypeBin = k3bcore->externalBinManager()->binObject( "dvd+rw-booktype" ); if( !d->dvdBooktypeBin ) { @@ -335,7 +335,7 @@ void K3bDvdBooktypeJob::startBooktypeChange() emit debuggingOutput( "dvd+rw-booktype command:", s ); - if( !d->process->start( KProcess::NotifyOnExit, KProcess::All ) ) { + if( !d->process->start( TDEProcess::NotifyOnExit, TDEProcess::All ) ) { // something went wrong when starting the program // it "should" be the executable emit infoMessage( i18n("Could not start %1.").arg(d->dvdBooktypeBin->name()), K3bJob::ERROR ); diff --git a/libk3b/projects/datadvd/k3bdvdbooktypejob.h b/libk3b/projects/datadvd/k3bdvdbooktypejob.h index d720563..165c29b 100644 --- a/libk3b/projects/datadvd/k3bdvdbooktypejob.h +++ b/libk3b/projects/datadvd/k3bdvdbooktypejob.h @@ -20,7 +20,7 @@ #include <k3bjob.h> -class KProcess; +class TDEProcess; namespace K3bDevice { class Device; class DeviceHandler; @@ -83,7 +83,7 @@ class K3bDvdBooktypeJob : public K3bJob private slots: void slotStderrLine( const TQString& ); - void slotProcessFinished( KProcess* ); + void slotProcessFinished( TDEProcess* ); void slotDeviceHandlerFinished( K3bDevice::DeviceHandler* ); void slotEjectingFinished( K3bDevice::DeviceHandler* ); diff --git a/libk3b/projects/k3bcdrdaowriter.cpp b/libk3b/projects/k3bcdrdaowriter.cpp index 2ac9559..6d61005 100644 --- a/libk3b/projects/k3bcdrdaowriter.cpp +++ b/libk3b/projects/k3bcdrdaowriter.cpp @@ -466,8 +466,8 @@ void K3bCdrdaoWriter::start() m_process->setRawStdin(true); connect( m_process, TQT_SIGNAL(stderrLine(const TQString&)), this, TQT_SLOT(slotStdLine(const TQString&)) ); - connect( m_process, TQT_SIGNAL(processExited(KProcess*)), - this, TQT_SLOT(slotProcessExited(KProcess*)) ); + connect( m_process, TQT_SIGNAL(processExited(TDEProcess*)), + this, TQT_SLOT(slotProcessExited(TDEProcess*)) ); m_canceled = false; m_knownError = false; @@ -577,7 +577,7 @@ void K3bCdrdaoWriter::start() burnDevice()->close(); burnDevice()->usageLock(); - if( !m_process->start( KProcess::NotifyOnExit, KProcess::AllOutput ) ) + if( !m_process->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) ) { // something went wrong when starting the program // it "should" be the executable @@ -709,7 +709,7 @@ void K3bCdrdaoWriter::slotStdLine( const TQString& line ) } -void K3bCdrdaoWriter::slotProcessExited( KProcess* p ) +void K3bCdrdaoWriter::slotProcessExited( TDEProcess* p ) { // release the device within this process burnDevice()->usageUnlock(); @@ -775,7 +775,7 @@ void K3bCdrdaoWriter::slotProcessExited( KProcess* p ) if( m_command == WRITE || m_command == COPY ) { int s = d->speedEst->average(); - emit infoMessage( i18n("Average overall write speed: %1 KB/s (%2x)").arg(s).arg(KGlobal::locale()->formatNumber((double)s/150.0), 2), INFO ); + emit infoMessage( i18n("Average overall write speed: %1 KB/s (%2x)").arg(s).arg(TDEGlobal::locale()->formatNumber((double)s/150.0), 2), INFO ); } jobFinished( true ); diff --git a/libk3b/projects/k3bcdrdaowriter.h b/libk3b/projects/k3bcdrdaowriter.h index c6457ff..c1d1457 100644 --- a/libk3b/projects/k3bcdrdaowriter.h +++ b/libk3b/projects/k3bcdrdaowriter.h @@ -23,7 +23,7 @@ class K3bExternalBin; class K3bProcess; -class KProcess; +class TDEProcess; class K3bDevice::Device; class TQSocket; @@ -93,7 +93,7 @@ class K3bCdrdaoWriter : public K3bAbstractWriter private slots: void slotStdLine( const TQString& line ); - void slotProcessExited(KProcess*); + void slotProcessExited(TDEProcess*); void parseCdrdaoMessage(); void slotThroughput( int t ); diff --git a/libk3b/projects/k3bcdrecordwriter.cpp b/libk3b/projects/k3bcdrecordwriter.cpp index 78ffb6a..15047a1 100644 --- a/libk3b/projects/k3bcdrecordwriter.cpp +++ b/libk3b/projects/k3bcdrecordwriter.cpp @@ -141,13 +141,13 @@ void K3bCdrecordWriter::prepareProcess() if( m_process ) delete m_process; // tdelibs want this! m_process = new K3bProcess(); m_process->setRunPrivileged(true); - // m_process->setPriority( KProcess::PrioHighest ); + // m_process->setPriority( TDEProcess::PrioHighest ); m_process->setSplitStdout(true); m_process->setSuppressEmptyLines(true); m_process->setRawStdin(true); // we only use stdin when writing on-the-fly connect( m_process, TQT_SIGNAL(stdoutLine(const TQString&)), this, TQT_SLOT(slotStdLine(const TQString&)) ); connect( m_process, TQT_SIGNAL(stderrLine(const TQString&)), this, TQT_SLOT(slotStdLine(const TQString&)) ); - connect( m_process, TQT_SIGNAL(processExited(KProcess*)), this, TQT_SLOT(slotProcessExited(KProcess*)) ); + connect( m_process, TQT_SIGNAL(processExited(TDEProcess*)), this, TQT_SLOT(slotProcessExited(TDEProcess*)) ); m_cdrecordBinObject = k3bcore->externalBinManager()->binObject("cdrecord"); @@ -339,7 +339,7 @@ void K3bCdrecordWriter::start() burnDevice()->close(); burnDevice()->usageLock(); - if( !m_process->start( KProcess::NotifyOnExit, KProcess::All ) ) { + if( !m_process->start( TDEProcess::NotifyOnExit, TDEProcess::All ) ) { // something went wrong when starting the program // it "should" be the executable kdDebug() << "(K3bCdrecordWriter) could not start " << m_cdrecordBinObject->name() << endl; @@ -653,7 +653,7 @@ void K3bCdrecordWriter::slotStdLine( const TQString& line ) } -void K3bCdrecordWriter::slotProcessExited( KProcess* p ) +void K3bCdrecordWriter::slotProcessExited( TDEProcess* p ) { // remove temporary cdtext file delete d->cdTextFile; @@ -682,7 +682,7 @@ void K3bCdrecordWriter::slotProcessExited( KProcess* p ) emit infoMessage( i18n("Writing successfully completed"), K3bJob::SUCCESS ); int s = d->speedEst->average(); - emit infoMessage( i18n("Average overall write speed: %1 KB/s (%2x)").arg(s).arg(KGlobal::locale()->formatNumber((double)s/150.0), 2), INFO ); + emit infoMessage( i18n("Average overall write speed: %1 KB/s (%2x)").arg(s).arg(TDEGlobal::locale()->formatNumber((double)s/150.0), 2), INFO ); jobFinished( true ); } diff --git a/libk3b/projects/k3bcdrecordwriter.h b/libk3b/projects/k3bcdrecordwriter.h index 1ebc1e5..dd81402 100644 --- a/libk3b/projects/k3bcdrecordwriter.h +++ b/libk3b/projects/k3bcdrecordwriter.h @@ -24,7 +24,7 @@ class K3bExternalBin; class K3bProcess; -class KProcess; +class TDEProcess; class K3bDevice::Device; @@ -67,7 +67,7 @@ class K3bCdrecordWriter : public K3bAbstractWriter protected slots: void slotStdLine( const TQString& line ); - void slotProcessExited(KProcess*); + void slotProcessExited(TDEProcess*); void slotThroughput( int t ); protected: diff --git a/libk3b/projects/k3bdvdrecordwriter.cpp b/libk3b/projects/k3bdvdrecordwriter.cpp index 052315b..46dc75a 100644 --- a/libk3b/projects/k3bdvdrecordwriter.cpp +++ b/libk3b/projects/k3bdvdrecordwriter.cpp @@ -44,8 +44,8 @@ void K3bDvdrecordWriter::prepareProcess() m_process->setSplitStdout(true); connect( m_process, TQT_SIGNAL(stdoutLine(const TQString&)), this, TQT_SLOT(slotStdLine(const TQString&)) ); connect( m_process, TQT_SIGNAL(stderrLine(const TQString&)), this, TQT_SLOT(slotStdLine(const TQString&)) ); - connect( m_process, TQT_SIGNAL(processExited(KProcess*)), this, TQT_SLOT(slotProcessExited(KProcess*)) ); - connect( m_process, TQT_SIGNAL(wroteStdin(KProcess*)), this, TQT_SIGNAL(dataWritten()) ); + connect( m_process, TQT_SIGNAL(processExited(TDEProcess*)), this, TQT_SLOT(slotProcessExited(TDEProcess*)) ); + connect( m_process, TQT_SIGNAL(wroteStdin(TDEProcess*)), this, TQT_SIGNAL(dataWritten()) ); // if( k3bcore->externalBinManager()->binObject("cdrecord")->hasFeature( "dvd-patch" ) ) // m_cdrecordBinObject = k3bcore->externalBinManager()->binObject("cdrecord"); diff --git a/libk3b/projects/k3bgrowisofshandler.cpp b/libk3b/projects/k3bgrowisofshandler.cpp index d38e0d2..edaaa40 100644 --- a/libk3b/projects/k3bgrowisofshandler.cpp +++ b/libk3b/projects/k3bgrowisofshandler.cpp @@ -178,7 +178,7 @@ void K3bGrowisofsHandler::handleLine( const TQString& line ) if( ok ) emit infoMessage( i18n("Writing speed: %1 KB/s (%2x)") .arg((int)(speed*1385.0)) - .arg(KGlobal::locale()->formatNumber(speed)), K3bJob::INFO ); + .arg(TDEGlobal::locale()->formatNumber(speed)), K3bJob::INFO ); else kdDebug() << "(K3bGrowisofsHandler) parsing error: '" << line.mid( pos, endPos-pos ) << "'" << endl; } diff --git a/libk3b/projects/k3bgrowisofswriter.cpp b/libk3b/projects/k3bgrowisofswriter.cpp index b17f9b8..f8b64a3 100644 --- a/libk3b/projects/k3bgrowisofswriter.cpp +++ b/libk3b/projects/k3bgrowisofswriter.cpp @@ -179,12 +179,12 @@ bool K3bGrowisofsWriter::prepareProcess() delete d->process; d->process = new K3bProcess(); d->process->setRunPrivileged(true); - // d->process->setPriority( KProcess::PrioHighest ); + // d->process->setPriority( TDEProcess::PrioHighest ); d->process->setSplitStdout(true); d->process->setRawStdin(true); connect( d->process, TQT_SIGNAL(stderrLine(const TQString&)), this, TQT_SLOT(slotReceivedStderr(const TQString&)) ); connect( d->process, TQT_SIGNAL(stdoutLine(const TQString&)), this, TQT_SLOT(slotReceivedStderr(const TQString&)) ); - connect( d->process, TQT_SIGNAL(processExited(KProcess*)), this, TQT_SLOT(slotProcessExited(KProcess*)) ); + connect( d->process, TQT_SIGNAL(processExited(TDEProcess*)), this, TQT_SLOT(slotProcessExited(TDEProcess*)) ); // @@ -370,7 +370,7 @@ void K3bGrowisofsWriter::start() burnDevice()->close(); burnDevice()->usageLock(); - if( !d->process->start( KProcess::NotifyOnExit, KProcess::All ) ) { + if( !d->process->start( TDEProcess::NotifyOnExit, TDEProcess::All ) ) { // something went wrong when starting the program // it "should" be the executable kdDebug() << "(K3bGrowisofsWriter) could not start " << d->growisofsBin->path << endl; @@ -524,7 +524,7 @@ void K3bGrowisofsWriter::slotReceivedStderr( const TQString& line ) } -void K3bGrowisofsWriter::slotProcessExited( KProcess* p ) +void K3bGrowisofsWriter::slotProcessExited( TDEProcess* p ) { d->inputFile.close(); @@ -551,7 +551,7 @@ void K3bGrowisofsWriter::slotProcessExited( KProcess* p ) int s = d->speedEst->average(); if( s > 0 ) emit infoMessage( i18n("Average overall write speed: %1 KB/s (%2x)") - .arg(s).arg(KGlobal::locale()->formatNumber((double)s/1385.0), 2), INFO ); + .arg(s).arg(TDEGlobal::locale()->formatNumber((double)s/1385.0), 2), INFO ); if( simulate() ) emit infoMessage( i18n("Simulation successfully completed"), K3bJob::SUCCESS ); diff --git a/libk3b/projects/k3bgrowisofswriter.h b/libk3b/projects/k3bgrowisofswriter.h index b8d46cc..723bce3 100644 --- a/libk3b/projects/k3bgrowisofswriter.h +++ b/libk3b/projects/k3bgrowisofswriter.h @@ -23,7 +23,7 @@ namespace K3bDevice { class Device; class DeviceHandler; } -class KProcess; +class TDEProcess; @@ -93,7 +93,7 @@ class K3bGrowisofsWriter : public K3bAbstractWriter protected slots: void slotReceivedStderr( const TQString& ); - void slotProcessExited( KProcess* ); + void slotProcessExited( TDEProcess* ); void slotEjectingFinished( K3bDevice::DeviceHandler* dh ); void slotThroughput( int t ); void slotFlushingCache(); diff --git a/libk3b/projects/movixcd/k3bmovixprogram.cpp b/libk3b/projects/movixcd/k3bmovixprogram.cpp index 4c609db..24f7a98 100644 --- a/libk3b/projects/movixcd/k3bmovixprogram.cpp +++ b/libk3b/projects/movixcd/k3bmovixprogram.cpp @@ -49,11 +49,11 @@ bool K3bMovixProgram::scan( const TQString& p ) // // probe version and data dir // - KProcess vp, dp; + TDEProcess vp, dp; vp << path + "movix-version"; dp << path + "movix-conf"; K3bProcessOutputCollector vout( &vp ), dout( &dp ); - if( vp.start( KProcess::Block, KProcess::AllOutput ) && dp.start( KProcess::Block, KProcess::AllOutput ) ) { + if( vp.start( TDEProcess::Block, TDEProcess::AllOutput ) && dp.start( TDEProcess::Block, TDEProcess::AllOutput ) ) { // movix-version just gives us the version number on stdout if( !vout.output().isEmpty() && !dout.output().isEmpty() ) { bin = new K3bMovixBin( this ); @@ -133,10 +133,10 @@ bool K3bMovixProgram::scanOldEMovix( K3bMovixBin* bin, const TQString& path ) if( TQFile::exists( path + "movix-files" ) ) { bin->addFeature( "files" ); - KProcess p; + TDEProcess p; K3bProcessOutputCollector out( &p ); p << bin->path + "movix-files"; - if( p.start( KProcess::Block, KProcess::AllOutput ) ) { + if( p.start( TDEProcess::Block, TDEProcess::AllOutput ) ) { bin->m_movixFiles = TQStringList::split( "\n", out.output() ); } } @@ -300,10 +300,10 @@ TQStringList K3bMovixBin::supportedCodecs() const TQStringList K3bMovixBin::supported( const TQString& type ) const { - KProcess p; + TDEProcess p; K3bProcessOutputCollector out( &p ); p << path + "movix-conf" << "--supported=" + type; - if( p.start( KProcess::Block, KProcess::AllOutput ) ) + if( p.start( TDEProcess::Block, TDEProcess::AllOutput ) ) return TQStringList::split( "\n", out.output() ); else return TQStringList(); @@ -316,7 +316,7 @@ TQStringList K3bMovixBin::files( const TQString& kbd, const TQString& lang, const TQStringList& codecs ) const { - KProcess p; + TDEProcess p; K3bProcessOutputCollector out( &p ); p << path + "movix-conf" << "--files"; @@ -332,7 +332,7 @@ TQStringList K3bMovixBin::files( const TQString& kbd, if( !codecs.isEmpty() ) p << "--codecs" << codecs.join( "," ); - if( p.start( KProcess::Block, KProcess::AllOutput ) ) + if( p.start( TDEProcess::Block, TDEProcess::AllOutput ) ) return TQStringList::split( "\n", out.output() ); else return TQStringList(); diff --git a/libk3b/projects/videocd/k3bvcdjob.cpp b/libk3b/projects/videocd/k3bvcdjob.cpp index 18c5678..fe62515 100644 --- a/libk3b/projects/videocd/k3bvcdjob.cpp +++ b/libk3b/projects/videocd/k3bvcdjob.cpp @@ -225,11 +225,11 @@ void K3bVcdJob::vcdxBuild() *m_process << TQString( "%1" ).arg( TQFile::encodeName( m_xmlFile ).data() ); - connect( m_process, TQT_SIGNAL( receivedStderr( KProcess*, char*, int ) ), - this, TQT_SLOT( slotParseVcdxBuildOutput( KProcess*, char*, int ) ) ); - connect( m_process, TQT_SIGNAL( receivedStdout( KProcess*, char*, int ) ), - this, TQT_SLOT( slotParseVcdxBuildOutput( KProcess*, char*, int ) ) ); - connect( m_process, TQT_SIGNAL( processExited( KProcess* ) ), + connect( m_process, TQT_SIGNAL( receivedStderr( TDEProcess*, char*, int ) ), + this, TQT_SLOT( slotParseVcdxBuildOutput( TDEProcess*, char*, int ) ) ); + connect( m_process, TQT_SIGNAL( receivedStdout( TDEProcess*, char*, int ) ), + this, TQT_SLOT( slotParseVcdxBuildOutput( TDEProcess*, char*, int ) ) ); + connect( m_process, TQT_SIGNAL( processExited( TDEProcess* ) ), this, TQT_SLOT( slotVcdxBuildFinished() ) ); // vcdxbuild commandline parameters @@ -243,7 +243,7 @@ void K3bVcdJob::vcdxBuild() kdDebug() << s << flush << endl; emit debuggingOutput( "vcdxbuild command:", s ); - if ( !m_process->start( KProcess::NotifyOnExit, KProcess::AllOutput ) ) { + if ( !m_process->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) ) { kdDebug() << "(K3bVcdJob) could not start vcdxbuild" << endl; emit infoMessage( i18n( "Could not start %1." ).arg( "vcdxbuild" ), K3bJob::ERROR ); cancelAll(); @@ -251,7 +251,7 @@ void K3bVcdJob::vcdxBuild() } } -void K3bVcdJob::slotParseVcdxBuildOutput( KProcess*, char* output, int len ) +void K3bVcdJob::slotParseVcdxBuildOutput( TDEProcess*, char* output, int len ) { TQString buffer = TQString::fromLocal8Bit( output, len ); diff --git a/libk3b/projects/videocd/k3bvcdjob.h b/libk3b/projects/videocd/k3bvcdjob.h index a96fe68..329646f 100644 --- a/libk3b/projects/videocd/k3bvcdjob.h +++ b/libk3b/projects/videocd/k3bvcdjob.h @@ -22,7 +22,7 @@ class K3bVcdDoc; class K3bVcdTrack; class TQString; class K3bProcess; -class KProcess; +class TDEProcess; class TQDataStream; class K3bAbstractWriter; class K3bDevice::Device; @@ -56,7 +56,7 @@ class K3bVcdJob : public K3bBurnJob protected slots: void slotVcdxBuildFinished(); - void slotParseVcdxBuildOutput( KProcess*, char* output, int len ); + void slotParseVcdxBuildOutput( TDEProcess*, char* output, int len ); void slotWriterJobPercent( int p ); void slotProcessedSize( int cs, int ts ); diff --git a/libk3b/projects/videodvd/k3bvideodvdimager.cpp b/libk3b/projects/videodvd/k3bvideodvdimager.cpp index 3319754..9d72448 100644 --- a/libk3b/projects/videodvd/k3bvideodvdimager.cpp +++ b/libk3b/projects/videodvd/k3bvideodvdimager.cpp @@ -104,7 +104,7 @@ int K3bVideoDvdImager::writePathSpec() // // We do this here since K3bIsoImager::start calls cleanup which deletes the temp files // - TQDir dir( KGlobal::dirs()->resourceDirs( "tmp" ).first() ); + TQDir dir( TDEGlobal::dirs()->resourceDirs( "tmp" ).first() ); d->tempPath = K3b::findUniqueFilePrefix( "k3bVideoDvd", dir.path() ); kdDebug() << "(K3bVideoDvdImager) creating temp dir: " << d->tempPath << endl; if( !dir.mkdir( d->tempPath, true ) ) { |