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 /libk3b/jobs | |
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/jobs')
-rw-r--r-- | libk3b/jobs/k3bblankingjob.h | 2 | ||||
-rw-r--r-- | libk3b/jobs/k3bcdda2wavreader.cpp | 6 | ||||
-rw-r--r-- | libk3b/jobs/k3bcdda2wavreader.h | 4 | ||||
-rw-r--r-- | libk3b/jobs/k3bdvdformattingjob.cpp | 6 | ||||
-rw-r--r-- | libk3b/jobs/k3bdvdformattingjob.h | 4 | ||||
-rw-r--r-- | libk3b/jobs/k3breadcdreader.cpp | 6 | ||||
-rw-r--r-- | libk3b/jobs/k3breadcdreader.h | 4 | ||||
-rw-r--r-- | libk3b/jobs/k3bvideodvdtitledetectclippingjob.cpp | 6 | ||||
-rw-r--r-- | libk3b/jobs/k3bvideodvdtitledetectclippingjob.h | 4 | ||||
-rw-r--r-- | libk3b/jobs/k3bvideodvdtitletranscodingjob.cpp | 6 | ||||
-rw-r--r-- | libk3b/jobs/k3bvideodvdtitletranscodingjob.h | 4 |
11 files changed, 26 insertions, 26 deletions
diff --git a/libk3b/jobs/k3bblankingjob.h b/libk3b/jobs/k3bblankingjob.h index f081318..18234bd 100644 --- a/libk3b/jobs/k3bblankingjob.h +++ b/libk3b/jobs/k3bblankingjob.h @@ -18,7 +18,7 @@ #include <k3bjob.h> #include "k3b_export.h" -class KProcess; +class TDEProcess; class TQString; class K3bDevice::Device; class K3bAbstractWriter; diff --git a/libk3b/jobs/k3bcdda2wavreader.cpp b/libk3b/jobs/k3bcdda2wavreader.cpp index cab71b9..889993b 100644 --- a/libk3b/jobs/k3bcdda2wavreader.cpp +++ b/libk3b/jobs/k3bcdda2wavreader.cpp @@ -109,7 +109,7 @@ void K3bCdda2wavReader::start( bool onlyInfo ) d->process->setWorkingDirectory( m_imagePath ); connect( d->process, TQT_SIGNAL(stdoutLine(const TQString&)), this, TQT_SLOT(slotProcessLine(const TQString&)) ); connect( d->process, TQT_SIGNAL(stderrLine(const TQString&)), this, TQT_SLOT(slotProcessLine(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*)) ); // create the command line *d->process << d->cdda2wavBin->path; @@ -130,7 +130,7 @@ void K3bCdda2wavReader::start( bool onlyInfo ) *d->process << *it; // start the thing - 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() << "(K3bCdda2wavReader) could not start cdda2wav" << endl; @@ -222,7 +222,7 @@ void K3bCdda2wavReader::slotProcessLine( const TQString& line ) } -void K3bCdda2wavReader::slotProcessExited( KProcess* p ) +void K3bCdda2wavReader::slotProcessExited( TDEProcess* p ) { d->running = false; diff --git a/libk3b/jobs/k3bcdda2wavreader.h b/libk3b/jobs/k3bcdda2wavreader.h index 2979367..24a2246 100644 --- a/libk3b/jobs/k3bcdda2wavreader.h +++ b/libk3b/jobs/k3bcdda2wavreader.h @@ -18,7 +18,7 @@ #include <k3bjob.h> -class KProcess; +class TDEProcess; namespace K3bDevice { class Device; }; @@ -57,7 +57,7 @@ class K3bCdda2wavReader : public K3bJob private slots: void slotProcessLine( const TQString& ); - void slotProcessExited( KProcess* ); + void slotProcessExited( TDEProcess* ); private: K3bDevice::Device* m_device; diff --git a/libk3b/jobs/k3bdvdformattingjob.cpp b/libk3b/jobs/k3bdvdformattingjob.cpp index 21858e4..e0d177f 100644 --- a/libk3b/jobs/k3bdvdformattingjob.cpp +++ b/libk3b/jobs/k3bdvdformattingjob.cpp @@ -249,7 +249,7 @@ void K3bDvdFormattingJob::slotStderrLine( const TQString& line ) } -void K3bDvdFormattingJob::slotProcessFinished( KProcess* p ) +void K3bDvdFormattingJob::slotProcessFinished( TDEProcess* p ) { if( d->canceled ) { emit canceled(); @@ -468,7 +468,7 @@ void K3bDvdFormattingJob::startFormatting( const K3bDevice::DiskInfo& diskInfo ) d->process->setRunPrivileged(true); // d->process->setSuppressEmptyLines(false); 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->dvdFormatBin = k3bcore->externalBinManager()->binObject( "dvd+rw-format" ); if( !d->dvdFormatBin ) { @@ -513,7 +513,7 @@ void K3bDvdFormattingJob::startFormatting( const K3bDevice::DiskInfo& diskInfo ) kdDebug() << s << endl << flush; emit debuggingOutput( "dvd+rw-format 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 kdDebug() << "(K3bDvdFormattingJob) could not start " << d->dvdFormatBin->path << endl; diff --git a/libk3b/jobs/k3bdvdformattingjob.h b/libk3b/jobs/k3bdvdformattingjob.h index 949e470..49481d0 100644 --- a/libk3b/jobs/k3bdvdformattingjob.h +++ b/libk3b/jobs/k3bdvdformattingjob.h @@ -20,7 +20,7 @@ #include <k3bjob.h> #include "k3b_export.h" -class KProcess; +class TDEProcess; namespace K3bDevice { class Device; class DeviceHandler; @@ -77,7 +77,7 @@ class LIBK3B_EXPORT K3bDvdFormattingJob : public K3bBurnJob private slots: void slotStderrLine( const TQString& ); - void slotProcessFinished( KProcess* ); + void slotProcessFinished( TDEProcess* ); void slotDeviceHandlerFinished( K3bDevice::DeviceHandler* ); void slotEjectingFinished( K3bDevice::DeviceHandler* ); diff --git a/libk3b/jobs/k3breadcdreader.cpp b/libk3b/jobs/k3breadcdreader.cpp index b8b2b0a..ed4aacd 100644 --- a/libk3b/jobs/k3breadcdreader.cpp +++ b/libk3b/jobs/k3breadcdreader.cpp @@ -139,7 +139,7 @@ void K3bReadcdReader::start() delete d->process; d->process = new K3bProcess(); connect( d->process, TQT_SIGNAL(stderrLine(const TQString&)), this, TQT_SLOT(slotStdLine(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*)) ); *d->process << d->readcdBinObject; @@ -204,7 +204,7 @@ void K3bReadcdReader::start() d->canceled = false; - if( !d->process->start( KProcess::NotifyOnExit, KProcess::AllOutput) ) { + if( !d->process->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput) ) { // something went wrong when starting the program // it "should" be the executable kdError() << "(K3bReadcdReader) could not start readcd" << endl; @@ -303,7 +303,7 @@ void K3bReadcdReader::slotStdLine( const TQString& line ) } } -void K3bReadcdReader::slotProcessExited( KProcess* p ) +void K3bReadcdReader::slotProcessExited( TDEProcess* p ) { if( d->canceled ) { emit canceled(); diff --git a/libk3b/jobs/k3breadcdreader.h b/libk3b/jobs/k3breadcdreader.h index 81eabf3..b2b7135 100644 --- a/libk3b/jobs/k3breadcdreader.h +++ b/libk3b/jobs/k3breadcdreader.h @@ -21,7 +21,7 @@ class K3bProcess; -class KProcess; +class TDEProcess; class K3bExternalBin; namespace K3bDevice { class Device; @@ -71,7 +71,7 @@ class K3bReadcdReader : public K3bJob private slots: void slotStdLine( const TQString& line ); - void slotProcessExited(KProcess*); + void slotProcessExited(TDEProcess*); private: bool m_noCorr; diff --git a/libk3b/jobs/k3bvideodvdtitledetectclippingjob.cpp b/libk3b/jobs/k3bvideodvdtitledetectclippingjob.cpp index 96d9619..67832b9 100644 --- a/libk3b/jobs/k3bvideodvdtitledetectclippingjob.cpp +++ b/libk3b/jobs/k3bvideodvdtitledetectclippingjob.cpp @@ -138,7 +138,7 @@ void K3bVideoDVDTitleDetectClippingJob::startTranscode( int chapter ) d->process->setSplitStdout(true); // connect( d->process, TQT_SIGNAL(stderrLine(const TQString&)), this, TQT_SLOT(slotTranscodeStderr(const TQString&)) ); connect( d->process, TQT_SIGNAL(stdoutLine(const TQString&)), this, TQT_SLOT(slotTranscodeStderr(const TQString&)) ); - connect( d->process, TQT_SIGNAL(processExited(KProcess*)), this, TQT_SLOT(slotTranscodeExited(KProcess*)) ); + connect( d->process, TQT_SIGNAL(processExited(TDEProcess*)), this, TQT_SLOT(slotTranscodeExited(TDEProcess*)) ); // the executable *d->process << d->usedTranscodeBin; @@ -178,7 +178,7 @@ void K3bVideoDVDTitleDetectClippingJob::startTranscode( int chapter ) emit debuggingOutput( d->usedTranscodeBin->name() + " command:", s); // start the process - 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->usedTranscodeBin->name()), K3bJob::ERROR ); @@ -249,7 +249,7 @@ void K3bVideoDVDTitleDetectClippingJob::slotTranscodeStderr( const TQString& lin } -void K3bVideoDVDTitleDetectClippingJob::slotTranscodeExited( KProcess* p ) +void K3bVideoDVDTitleDetectClippingJob::slotTranscodeExited( TDEProcess* p ) { switch( p->exitStatus() ) { case 0: diff --git a/libk3b/jobs/k3bvideodvdtitledetectclippingjob.h b/libk3b/jobs/k3bvideodvdtitledetectclippingjob.h index 4594793..9118e6e 100644 --- a/libk3b/jobs/k3bvideodvdtitledetectclippingjob.h +++ b/libk3b/jobs/k3bvideodvdtitledetectclippingjob.h @@ -20,7 +20,7 @@ #include <k3bjob.h> #include <k3bvideodvd.h> -class KProcess; +class TDEProcess; /** * Job to detect the clipping values for a Video DVD title. @@ -84,7 +84,7 @@ class LIBK3B_EXPORT K3bVideoDVDTitleDetectClippingJob : public K3bJob private slots: void slotTranscodeStderr( const TQString& ); - void slotTranscodeExited( KProcess* ); + void slotTranscodeExited( TDEProcess* ); private: void startTranscode( int chapter ); diff --git a/libk3b/jobs/k3bvideodvdtitletranscodingjob.cpp b/libk3b/jobs/k3bvideodvdtitletranscodingjob.cpp index fd115ff..39eb7dc 100644 --- a/libk3b/jobs/k3bvideodvdtitletranscodingjob.cpp +++ b/libk3b/jobs/k3bvideodvdtitletranscodingjob.cpp @@ -196,7 +196,7 @@ void K3bVideoDVDTitleTranscodingJob::startTranscode( int pass ) d->process->setSplitStdout(true); connect( d->process, TQT_SIGNAL(stderrLine(const TQString&)), this, TQT_SLOT(slotTranscodeStderr(const TQString&)) ); connect( d->process, TQT_SIGNAL(stdoutLine(const TQString&)), this, TQT_SLOT(slotTranscodeStderr(const TQString&)) ); - connect( d->process, TQT_SIGNAL(processExited(KProcess*)), this, TQT_SLOT(slotTranscodeExited(KProcess*)) ); + connect( d->process, TQT_SIGNAL(processExited(TDEProcess*)), this, TQT_SLOT(slotTranscodeExited(TDEProcess*)) ); // the executable *d->process << d->usedTranscodeBin; @@ -336,7 +336,7 @@ void K3bVideoDVDTitleTranscodingJob::startTranscode( int pass ) emit debuggingOutput( d->usedTranscodeBin->name() + " command:", s); // start the process - 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->usedTranscodeBin->name()), K3bJob::ERROR ); @@ -414,7 +414,7 @@ void K3bVideoDVDTitleTranscodingJob::slotTranscodeStderr( const TQString& line ) } -void K3bVideoDVDTitleTranscodingJob::slotTranscodeExited( KProcess* p ) +void K3bVideoDVDTitleTranscodingJob::slotTranscodeExited( TDEProcess* p ) { if( d->canceled ) { emit canceled(); diff --git a/libk3b/jobs/k3bvideodvdtitletranscodingjob.h b/libk3b/jobs/k3bvideodvdtitletranscodingjob.h index 43d9063..b618a41 100644 --- a/libk3b/jobs/k3bvideodvdtitletranscodingjob.h +++ b/libk3b/jobs/k3bvideodvdtitletranscodingjob.h @@ -20,7 +20,7 @@ #include <k3bjob.h> #include <k3bvideodvd.h> -class KProcess; +class TDEProcess; class K3bExternalBin; @@ -230,7 +230,7 @@ class LIBK3B_EXPORT K3bVideoDVDTitleTranscodingJob : public K3bJob private slots: void slotTranscodeStderr( const TQString& ); - void slotTranscodeExited( KProcess* ); + void slotTranscodeExited( TDEProcess* ); private: /** |