diff options
81 files changed, 298 insertions, 298 deletions
@@ -434,7 +434,7 @@ Fixed VideoDVD project with a HACK. mkisofs is not able to create a VideoDVD usi 0.11.1 fixed an issue introduced with KDE 3.2rc1 which caused on-the-fly data writing to fail all the time. - (If you need to know: For some reason KProcess makes the Stdin fd O_NONBLOCK. This way mkisofs is + (If you need to know: For some reason TDEProcess makes the Stdin fd O_NONBLOCK. This way mkisofs is not able to write properly to cdrecord's stdin anymore.) 0.11 diff --git a/libk3b/core/k3bdefaultexternalprograms.cpp b/libk3b/core/k3bdefaultexternalprograms.cpp index 2cece94..4b86055 100644 --- a/libk3b/core/k3bdefaultexternalprograms.cpp +++ b/libk3b/core/k3bdefaultexternalprograms.cpp @@ -148,11 +148,11 @@ bool K3bCdrecordProgram::scan( const TQString& p ) K3bExternalBin* bin = 0; // probe version - KProcess vp; + TDEProcess vp; K3bProcessOutputCollector out( &vp ); vp << path << "-version"; - if( vp.start( KProcess::Block, KProcess::AllOutput ) ) { + if( vp.start( TDEProcess::Block, TDEProcess::AllOutput ) ) { int pos = -1; if( wodim ) { pos = out.output().find( "Wodim" ); @@ -199,10 +199,10 @@ bool K3bCdrecordProgram::scan( const TQString& p ) } // probe features - KProcess fp; + TDEProcess fp; out.setProcess( &fp ); fp << path << "-help"; - if( fp.start( KProcess::Block, KProcess::AllOutput ) ) { + if( fp.start( TDEProcess::Block, TDEProcess::AllOutput ) ) { if( out.output().contains( "gracetime" ) ) bin->addFeature( "gracetime" ); if( out.output().contains( "-overburn" ) ) @@ -297,10 +297,10 @@ bool K3bMkisofsProgram::scan( const TQString& p ) K3bExternalBin* bin = 0; // probe version - KProcess vp; + TDEProcess vp; vp << path << "-version"; K3bProcessOutputCollector out( &vp ); - if( vp.start( KProcess::Block, KProcess::AllOutput ) ) { + if( vp.start( TDEProcess::Block, TDEProcess::AllOutput ) ) { int pos = -1; if( genisoimage ) pos = out.output().find( "genisoimage" ); @@ -333,10 +333,10 @@ bool K3bMkisofsProgram::scan( const TQString& p ) // probe features - KProcess fp; + TDEProcess fp; fp << path << "-help"; out.setProcess( &fp ); - if( fp.start( KProcess::Block, KProcess::AllOutput ) ) { + if( fp.start( TDEProcess::Block, TDEProcess::AllOutput ) ) { if( out.output().contains( "-udf" ) ) bin->addFeature( "udf" ); if( out.output().contains( "-dvd-video" ) ) @@ -412,10 +412,10 @@ bool K3bReadcdProgram::scan( const TQString& p ) K3bExternalBin* bin = 0; // probe version - KProcess vp; + TDEProcess vp; vp << path << "-version"; K3bProcessOutputCollector out( &vp ); - if( vp.start( KProcess::Block, KProcess::AllOutput ) ) { + if( vp.start( TDEProcess::Block, TDEProcess::AllOutput ) ) { int pos = -1; if( readom ) pos = out.output().find( "readom" ); @@ -447,10 +447,10 @@ bool K3bReadcdProgram::scan( const TQString& p ) // probe features - KProcess fp; + TDEProcess fp; fp << path << "-help"; out.setProcess( &fp ); - if( fp.start( KProcess::Block, KProcess::AllOutput ) ) { + if( fp.start( TDEProcess::Block, TDEProcess::AllOutput ) ) { if( out.output().contains( "-clone" ) ) bin->addFeature( "clone" ); @@ -503,10 +503,10 @@ bool K3bCdrdaoProgram::scan( const TQString& p ) K3bExternalBin* bin = 0; // probe version - KProcess vp; + TDEProcess vp; vp << path ; K3bProcessOutputCollector out( &vp ); - if( vp.start( KProcess::Block, KProcess::AllOutput ) ) { + if( vp.start( TDEProcess::Block, TDEProcess::AllOutput ) ) { int pos = out.output().find( "Cdrdao version" ); if( pos < 0 ) return false; @@ -535,10 +535,10 @@ bool K3bCdrdaoProgram::scan( const TQString& p ) // probe features - KProcess fp; + TDEProcess fp; fp << path << "write" << "-h"; out.setProcess( &fp ); - if( fp.start( KProcess::Block, KProcess::AllOutput ) ) { + if( fp.start( TDEProcess::Block, TDEProcess::AllOutput ) ) { if( out.output().contains( "--overburn" ) ) bin->addFeature( "overburn" ); if( out.output().contains( "--multi" ) ) @@ -601,10 +601,10 @@ bool K3bTranscodeProgram::scan( const TQString& p ) K3bExternalBin* bin = 0; // probe version - KProcess vp; + TDEProcess vp; vp << appPath << "-v"; K3bProcessOutputCollector out( &vp ); - if( vp.start( KProcess::Block, KProcess::AllOutput ) ) { + if( vp.start( TDEProcess::Block, TDEProcess::AllOutput ) ) { int pos = out.output().find( "transcode v" ); if( pos < 0 ) return false; @@ -628,10 +628,10 @@ bool K3bTranscodeProgram::scan( const TQString& p ) // Check features // TQString modInfoBin = path + "tcmodinfo"; - KProcess modp; + TDEProcess modp; modp << modInfoBin << "-p"; out.setProcess( &modp ); - if( modp.start( KProcess::Block, KProcess::AllOutput ) ) { + if( modp.start( TDEProcess::Block, TDEProcess::AllOutput ) ) { TQString modPath = out.output().stripWhiteSpace(); TQDir modDir( modPath ); if( !modDir.entryList( "*export_xvid*", TQDir::Files ).isEmpty() ) @@ -675,10 +675,10 @@ bool K3bVcdbuilderProgram::scan( const TQString& p ) K3bExternalBin* bin = 0; // probe version - KProcess vp; + TDEProcess vp; vp << path << "-V"; K3bProcessOutputCollector out( &vp ); - if( vp.start( KProcess::Block, KProcess::AllOutput ) ) { + if( vp.start( TDEProcess::Block, TDEProcess::AllOutput ) ) { int pos = out.output().find( "GNU VCDImager" ); if( pos < 0 ) return false; @@ -732,11 +732,11 @@ bool K3bNormalizeProgram::scan( const TQString& p ) K3bExternalBin* bin = 0; // probe version - KProcess vp; + TDEProcess vp; K3bProcessOutputCollector out( &vp ); vp << path << "--version"; - if( vp.start( KProcess::Block, KProcess::AllOutput ) ) { + if( vp.start( TDEProcess::Block, TDEProcess::AllOutput ) ) { int pos = out.output().find( "normalize" ); if( pos < 0 ) return false; @@ -791,11 +791,11 @@ bool K3bGrowisofsProgram::scan( const TQString& p ) K3bExternalBin* bin = 0; // probe version - KProcess vp; + TDEProcess vp; K3bProcessOutputCollector out( &vp ); vp << path << "-version"; - if( vp.start( KProcess::Block, KProcess::AllOutput ) ) { + if( vp.start( TDEProcess::Block, TDEProcess::AllOutput ) ) { int pos = out.output().find( "growisofs" ); if( pos < 0 ) return false; @@ -856,11 +856,11 @@ bool K3bDvdformatProgram::scan( const TQString& p ) K3bExternalBin* bin = 0; // probe version - KProcess vp; + TDEProcess vp; K3bProcessOutputCollector out( &vp ); vp << path; - if( vp.start( KProcess::Block, KProcess::AllOutput ) ) { + if( vp.start( TDEProcess::Block, TDEProcess::AllOutput ) ) { // different locales make searching for the +- char difficult // so we simply ignore it. int pos = out.output().find( TQRegExp("DVD.*RAM format utility") ); @@ -926,11 +926,11 @@ bool K3bDvdBooktypeProgram::scan( const TQString& p ) K3bExternalBin* bin = 0; // probe version - KProcess vp; + TDEProcess vp; K3bProcessOutputCollector out( &vp ); vp << path; - if( vp.start( KProcess::Block, KProcess::AllOutput ) ) { + if( vp.start( TDEProcess::Block, TDEProcess::AllOutput ) ) { int pos = out.output().find( "dvd+rw-booktype" ); if( pos < 0 ) return false; @@ -975,11 +975,11 @@ bool K3bCdda2wavProgram::scan( const TQString& p ) 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( "cdda2wav" ); if( pos < 0 ) return false; diff --git a/libk3b/core/k3bexternalbinmanager.h b/libk3b/core/k3bexternalbinmanager.h index 3ba57ae..74be6b7 100644 --- a/libk3b/core/k3bexternalbinmanager.h +++ b/libk3b/core/k3bexternalbinmanager.h @@ -25,7 +25,7 @@ #include "k3bversion.h" class KConfig; -class KProcess; +class TDEProcess; class K3bExternalProgram; diff --git a/libk3b/core/k3bglobals.cpp b/libk3b/core/k3bglobals.cpp index c01e289..23225b6 100644 --- a/libk3b/core/k3bglobals.cpp +++ b/libk3b/core/k3bglobals.cpp @@ -177,7 +177,7 @@ TQString K3b::defaultTempPath() { TQString oldGroup = kapp->config()->group(); kapp->config()->setGroup( "General Options" ); - TQString url = kapp->config()->readPathEntry( "Temp Dir", KGlobal::dirs()->resourceDirs( "tmp" ).first() ); + TQString url = kapp->config()->readPathEntry( "Temp Dir", TDEGlobal::dirs()->resourceDirs( "tmp" ).first() ); kapp->config()->setGroup( oldGroup ); return prepareDir(url); } @@ -560,11 +560,11 @@ bool K3b::unmount( K3bDevice::Device* dev ) TQString umountBin = K3b::findExe( "umount" ); if( !umountBin.isEmpty() ) { - KProcess p; + TDEProcess p; p << umountBin; p << "-l"; // lazy unmount p << dev->blockDeviceName(); - p.start( KProcess::Block ); + p.start( TDEProcess::Block ); if( !p.exitStatus() ) return true; } @@ -572,11 +572,11 @@ bool K3b::unmount( K3bDevice::Device* dev ) // now try pmount TQString pumountBin = K3b::findExe( "pumount" ); if( !pumountBin.isEmpty() ) { - KProcess p; + TDEProcess p; p << pumountBin; p << "-l"; // lazy unmount p << dev->blockDeviceName(); - p.start( KProcess::Block ); + p.start( TDEProcess::Block ); return !p.exitStatus(); } else { @@ -610,10 +610,10 @@ bool K3b::mount( K3bDevice::Device* dev ) // now try pmount TQString pmountBin = K3b::findExe( "pmount" ); if( !pmountBin.isEmpty() ) { - KProcess p; + TDEProcess p; p << pmountBin; p << mntDev; - p.start( KProcess::Block ); + p.start( TDEProcess::Block ); return !p.exitStatus(); } return false; diff --git a/libk3b/core/k3bprocess.cpp b/libk3b/core/k3bprocess.cpp index c46fd0a..304c0f5 100644 --- a/libk3b/core/k3bprocess.cpp +++ b/libk3b/core/k3bprocess.cpp @@ -54,7 +54,7 @@ public: K3bProcess::K3bProcess() - : KProcess(), + : TDEProcess(), m_bSplitStdout(false) { d = new Data(); @@ -78,25 +78,25 @@ K3bProcess& K3bProcess::operator<<( const K3bExternalBin* bin ) K3bProcess& K3bProcess::operator<<( const TQString& arg ) { - static_cast<KProcess*>(this)->operator<<( arg ); + static_cast<TDEProcess*>(this)->operator<<( arg ); return *this; } K3bProcess& K3bProcess::operator<<( const char* arg ) { - static_cast<KProcess*>(this)->operator<<( arg ); + static_cast<TDEProcess*>(this)->operator<<( arg ); return *this; } K3bProcess& K3bProcess::operator<<( const TQCString& arg ) { - static_cast<KProcess*>(this)->operator<<( arg ); + static_cast<TDEProcess*>(this)->operator<<( arg ); return *this; } K3bProcess& K3bProcess::operator<<( const TQStringList& args ) { - static_cast<KProcess*>(this)->operator<<( args ); + static_cast<TDEProcess*>(this)->operator<<( args ); return *this; } @@ -104,19 +104,19 @@ K3bProcess& K3bProcess::operator<<( const TQStringList& args ) bool K3bProcess::start( RunMode run, Communication com ) { if( com & Stderr ) { - connect( this, TQT_SIGNAL(receivedStderr(KProcess*, char*, int)), - this, TQT_SLOT(slotSplitStderr(KProcess*, char*, int)) ); + connect( this, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)), + this, TQT_SLOT(slotSplitStderr(TDEProcess*, char*, int)) ); } if( com & Stdout ) { - connect( this, TQT_SIGNAL(receivedStdout(KProcess*, char*, int)), - this, TQT_SLOT(slotSplitStdout(KProcess*, char*, int)) ); + connect( this, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)), + this, TQT_SLOT(slotSplitStdout(TDEProcess*, char*, int)) ); } - return KProcess::start( run, com ); + return TDEProcess::start( run, com ); } -void K3bProcess::slotSplitStdout( KProcess*, char* data, int len ) +void K3bProcess::slotSplitStdout( TDEProcess*, char* data, int len ) { if( m_bSplitStdout ) { TQStringList lines = splitOutput( data, len, d->unfinishedStdoutLine, d->suppressEmptyLines ); @@ -134,7 +134,7 @@ void K3bProcess::slotSplitStdout( KProcess*, char* data, int len ) } -void K3bProcess::slotSplitStderr( KProcess*, char* data, int len ) +void K3bProcess::slotSplitStderr( TDEProcess*, char* data, int len ) { TQStringList lines = splitOutput( data, len, d->unfinishedStderrLine, d->suppressEmptyLines ); @@ -208,7 +208,7 @@ TQStringList K3bProcess::splitOutput( char* data, int len, int K3bProcess::setupCommunication( Communication comm ) { - if( KProcess::setupCommunication( comm ) ) { + if( TDEProcess::setupCommunication( comm ) ) { // // Setup our own socketpair @@ -255,13 +255,13 @@ void K3bProcess::commClose() d->out[0] = -1; } - KProcess::commClose(); + TDEProcess::commClose(); } int K3bProcess::commSetupDoneP() { - int ok = KProcess::commSetupDoneP(); + int ok = TDEProcess::commSetupDoneP(); if( d->rawStdin ) close(d->in[0]); @@ -276,7 +276,7 @@ int K3bProcess::commSetupDoneP() int K3bProcess::commSetupDoneC() { - int ok = KProcess::commSetupDoneC(); + int ok = TDEProcess::commSetupDoneC(); if( d->dupStdoutFd != -1 ) { // @@ -396,7 +396,7 @@ bool K3bProcess::closeStdin() return true; } else - return KProcess::closeStdin(); + return TDEProcess::closeStdin(); } @@ -408,27 +408,27 @@ bool K3bProcess::closeStdout() return true; } else - return KProcess::closeStdout(); + return TDEProcess::closeStdout(); } -K3bProcessOutputCollector::K3bProcessOutputCollector( KProcess* p ) +K3bProcessOutputCollector::K3bProcessOutputCollector( TDEProcess* p ) : m_process(0) { setProcess( p ); } -void K3bProcessOutputCollector::setProcess( KProcess* p ) +void K3bProcessOutputCollector::setProcess( TDEProcess* p ) { if( m_process ) m_process->disconnect( this ); m_process = p; if( p ) { - connect( p, TQT_SIGNAL(receivedStdout(KProcess*, char*, int)), - this, TQT_SLOT(slotGatherStdout(KProcess*, char*, int)) ); - connect( p, TQT_SIGNAL(receivedStderr(KProcess*, char*, int)), - this, TQT_SLOT(slotGatherStderr(KProcess*, char*, int)) ); + connect( p, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)), + this, TQT_SLOT(slotGatherStdout(TDEProcess*, char*, int)) ); + connect( p, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)), + this, TQT_SLOT(slotGatherStderr(TDEProcess*, char*, int)) ); } m_gatheredOutput.truncate( 0 ); @@ -436,13 +436,13 @@ void K3bProcessOutputCollector::setProcess( KProcess* p ) m_stdoutOutput.truncate( 0 ); } -void K3bProcessOutputCollector::slotGatherStderr( KProcess*, char* data, int len ) +void K3bProcessOutputCollector::slotGatherStderr( TDEProcess*, char* data, int len ) { m_gatheredOutput.append( TQString::fromLocal8Bit( data, len ) ); m_stderrOutput.append( TQString::fromLocal8Bit( data, len ) ); } -void K3bProcessOutputCollector::slotGatherStdout( KProcess*, char* data, int len ) +void K3bProcessOutputCollector::slotGatherStdout( TDEProcess*, char* data, int len ) { m_gatheredOutput.append( TQString::fromLocal8Bit( data, len ) ); m_stdoutOutput.append( TQString::fromLocal8Bit( data, len ) ); diff --git a/libk3b/core/k3bprocess.h b/libk3b/core/k3bprocess.h index 009280d..19fb024 100644 --- a/libk3b/core/k3bprocess.h +++ b/libk3b/core/k3bprocess.h @@ -26,7 +26,7 @@ class K3bExternalBin; /** - * This is an enhanced KProcess. + * This is an enhanced TDEProcess. * It splits the stderr output to lines making sure the client gets every line as it * was written by the process. * Aditionally one may set raw stdout and stdin handling using the stdin() and stdout() methods @@ -35,7 +35,7 @@ class K3bExternalBin; * K3bProcesses like used in K3bDataJob to duplicate mkisofs' stdout to the stdin of the writer * (cdrecord or cdrdao) */ -class LIBK3B_EXPORT K3bProcess : public KProcess +class LIBK3B_EXPORT K3bProcess : public TDEProcess { Q_OBJECT @@ -135,8 +135,8 @@ class LIBK3B_EXPORT K3bProcess : public KProcess bool closeStdout(); private slots: - void slotSplitStderr( KProcess*, char*, int ); - void slotSplitStdout( KProcess*, char*, int ); + void slotSplitStderr( TDEProcess*, char*, int ); + void slotSplitStdout( TDEProcess*, char*, int ); signals: void stderrLine( const TQString& line ); @@ -150,22 +150,22 @@ class LIBK3B_EXPORT K3bProcess : public KProcess protected: /** - * reimplemeted from KProcess + * reimplemeted from TDEProcess */ int commSetupDoneP(); /** - * reimplemeted from KProcess + * reimplemeted from TDEProcess */ int commSetupDoneC(); /** - * reimplemeted from KProcess + * reimplemeted from TDEProcess */ int setupCommunication( Communication comm ); /** - * reimplemeted from KProcess + * reimplemeted from TDEProcess */ void commClose(); @@ -184,22 +184,22 @@ class LIBK3B_EXPORT K3bProcessOutputCollector: public TQObject public: - K3bProcessOutputCollector( KProcess* ); - void setProcess( KProcess* ); + K3bProcessOutputCollector( TDEProcess* ); + void setProcess( TDEProcess* ); const TQString& output() const { return m_gatheredOutput; } const TQString& stderrOutput() const { return m_stderrOutput; } const TQString& stdoutOutput() const { return m_stdoutOutput; } private slots: - void slotGatherStderr( KProcess*, char*, int ); - void slotGatherStdout( KProcess*, char*, int ); + void slotGatherStderr( TDEProcess*, char*, int ); + void slotGatherStdout( TDEProcess*, char*, int ); private: TQString m_gatheredOutput; TQString m_stderrOutput; TQString m_stdoutOutput; - KProcess* m_process; + TDEProcess* m_process; }; 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: /** diff --git a/libk3b/plugin/k3bpluginfactory.h b/libk3b/plugin/k3bpluginfactory.h index 6e4da16..ab415fa 100644 --- a/libk3b/plugin/k3bpluginfactory.h +++ b/libk3b/plugin/k3bpluginfactory.h @@ -43,7 +43,7 @@ class K3bPluginFactory : public KLibFactory ~K3bPluginFactory() { if ( s_instance ) - KGlobal::locale()->removeCatalogue( s_instance->instanceName() ); + TDEGlobal::locale()->removeCatalogue( s_instance->instanceName() ); delete s_instance; s_instance = 0; s_self = 0; @@ -54,7 +54,7 @@ class K3bPluginFactory : public KLibFactory protected: virtual void setupTranslations( void ) { if( instance() ) - KGlobal::locale()->insertCatalogue( instance()->instanceName() ); + TDEGlobal::locale()->insertCatalogue( instance()->instanceName() ); } void initializeMessageCatalogue() { diff --git a/libk3b/plugin/k3bpluginmanager.cpp b/libk3b/plugin/k3bpluginmanager.cpp index bf6d914..2e3724d 100644 --- a/libk3b/plugin/k3bpluginmanager.cpp +++ b/libk3b/plugin/k3bpluginmanager.cpp @@ -145,7 +145,7 @@ void K3bPluginManager::loadPlugin( const TQString& fileName ) void K3bPluginManager::loadAll() { // we simply search the K3b plugin dir for now - TQStringList dirs = KGlobal::dirs()->findDirs( "data", "k3b/plugins/" ); + TQStringList dirs = TDEGlobal::dirs()->findDirs( "data", "k3b/plugins/" ); for( TQStringList::const_iterator it = dirs.begin(); it != dirs.end(); ++it ) { 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 ) ) { diff --git a/libk3b/tools/k3bbusywidget.cpp b/libk3b/tools/k3bbusywidget.cpp index 34615e3..929e1f1 100644 --- a/libk3b/tools/k3bbusywidget.cpp +++ b/libk3b/tools/k3bbusywidget.cpp @@ -96,7 +96,7 @@ void K3bBusyWidget::drawContents( TQPainter* p ) // p->eraseRect( rect ); if( m_bBusy ) - p->fillRect( pos, (rect.height() - squareSize)/2, squareSize, squareSize, KGlobalSettings::highlightColor() ); + p->fillRect( pos, (rect.height() - squareSize)/2, squareSize, squareSize, TDEGlobalSettings::highlightColor() ); } diff --git a/libk3b/tools/k3bdirsizejob.cpp b/libk3b/tools/k3bdirsizejob.cpp index cddf0e7..eedca01 100644 --- a/libk3b/tools/k3bdirsizejob.cpp +++ b/libk3b/tools/k3bdirsizejob.cpp @@ -69,8 +69,8 @@ public: } bool countDir( const TQString& dir ) { - const TQString& dot = KGlobal::staticQString( "." ); - const TQString& dotdot = KGlobal::staticQString( ".." ); + const TQString& dot = TDEGlobal::staticQString( "." ); + const TQString& dotdot = TDEGlobal::staticQString( ".." ); TQStringList l = TQDir(dir).entryList( TQDir::All|TQDir::Hidden|TQDir::System ); l.remove( dot ); l.remove( dotdot ); diff --git a/libk3b/tools/k3bpushbutton.cpp b/libk3b/tools/k3bpushbutton.cpp index 69c6ed5..7a01caf 100644 --- a/libk3b/tools/k3bpushbutton.cpp +++ b/libk3b/tools/k3bpushbutton.cpp @@ -105,7 +105,7 @@ bool K3bPushButton::eventFilter( TQObject* o, TQEvent* ev ) } else if( ev->type() == TQEvent::MouseMove ) { TQMouseEvent* mev = TQT_TQMOUSEEVENT(ev); - if( ( mev->pos() - d->mousePressPos).manhattanLength() > KGlobalSettings::dndEventDelay() ) { + if( ( mev->pos() - d->mousePressPos).manhattanLength() > TDEGlobalSettings::dndEventDelay() ) { d->popupTimer->stop(); slotDelayedPopup(); return true; diff --git a/libk3b/tools/k3brichtextlabel.cpp b/libk3b/tools/k3brichtextlabel.cpp index 1dee2b1..36c0a63 100644 --- a/libk3b/tools/k3brichtextlabel.cpp +++ b/libk3b/tools/k3brichtextlabel.cpp @@ -37,14 +37,14 @@ static TQString qrichtextify( const TQString& text ) K3bRichTextLabel::K3bRichTextLabel( const TQString &text , TQWidget *parent, const char *name ) : TQLabel ( parent, name ) { - m_defaultWidth = TQMIN(400, KGlobalSettings::desktopGeometry(this).width()*2/5); + m_defaultWidth = TQMIN(400, TDEGlobalSettings::desktopGeometry(this).width()*2/5); setAlignment( TQt::WordBreak ); setText(text); } K3bRichTextLabel::K3bRichTextLabel( TQWidget *parent, const char *name ) : TQLabel ( parent, name ) { - m_defaultWidth = TQMIN(400, KGlobalSettings::desktopGeometry(this).width()*2/5); + m_defaultWidth = TQMIN(400, TDEGlobalSettings::desktopGeometry(this).width()*2/5); setAlignment( TQt::WordBreak ); } diff --git a/libk3b/tools/k3btempfile.cpp b/libk3b/tools/k3btempfile.cpp index 18ad803..0136f91 100644 --- a/libk3b/tools/k3btempfile.cpp +++ b/libk3b/tools/k3btempfile.cpp @@ -24,7 +24,7 @@ static inline TQString defaultTempDir() // we need a world-readable temp dir // FIXME: check if the default is world-readable -// TQStringList dirs = KGlobal::dirs()->resourceDirs( "tmp" ); +// TQStringList dirs = TDEGlobal::dirs()->resourceDirs( "tmp" ); // for( TQStringList::const_iterator it = dirs.begin(); // it != dirs.end(); ++it ) { // const TQString& dir = *it; diff --git a/libk3b/tools/k3btoolbutton.cpp b/libk3b/tools/k3btoolbutton.cpp index 04d767c..b897ebd 100644 --- a/libk3b/tools/k3btoolbutton.cpp +++ b/libk3b/tools/k3btoolbutton.cpp @@ -97,7 +97,7 @@ bool K3bToolButton::eventFilter( TQObject* o, TQEvent* ev ) else if( ev->type() == TQEvent::MouseMove ) { TQMouseEvent* mev = TQT_TQMOUSEEVENT(ev); if( !d->instantMenu && - ( mev->pos() - d->mousePressPos).manhattanLength() > KGlobalSettings::dndEventDelay() ) { + ( mev->pos() - d->mousePressPos).manhattanLength() > TDEGlobalSettings::dndEventDelay() ) { openPopup(); return true; } diff --git a/libk3bdevice/k3bdevicemanager.h b/libk3bdevice/k3bdevicemanager.h index 0c34912..4381a52 100644 --- a/libk3bdevice/k3bdevicemanager.h +++ b/libk3bdevice/k3bdevicemanager.h @@ -26,7 +26,7 @@ #include "k3bdevice_export.h" #include <kdebug.h> -class KProcess; +class TDEProcess; class KConfig; class K3bExternalBin; 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: 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: diff --git a/src/k3b.cpp b/src/k3b.cpp index 962caa6..a2c7940 100644 --- a/src/k3b.cpp +++ b/src/k3b.cpp @@ -620,7 +620,7 @@ void K3bMainWindow::saveProperties( KConfig* c ) // 3. save the url of the project (might be something like "AudioCD1") in the config // 4. save the status of every project (modified/saved) - TQString saveDir = KGlobal::dirs()->saveLocation( "appdata", "sessions/" + tqApp->sessionId() + "/", true ); + TQString saveDir = TDEGlobal::dirs()->saveLocation( "appdata", "sessions/" + tqApp->sessionId() + "/", true ); // FIXME: for some reason the config entries are not properly stored when using the default // KMainWindow session config. Since I was not able to find the bug I use another config object @@ -675,7 +675,7 @@ void K3bMainWindow::readProperties( KConfig* c ) // 3. reset the saved urls and the modified state // 4. delete "~/.trinity/share/apps/k3b/sessions/" + KApp->sessionId() - TQString saveDir = KGlobal::dirs()->saveLocation( "appdata", "sessions/" + tqApp->sessionId() + "/", true ); + TQString saveDir = TDEGlobal::dirs()->saveLocation( "appdata", "sessions/" + tqApp->sessionId() + "/", true ); // FIXME: for some reason the config entries are not properly stored when using the default // KMainWindow session config. Since I was not able to find the bug I use another config object @@ -1290,9 +1290,9 @@ void K3bMainWindow::slotProjectAddFiles() void K3bMainWindow::slotK3bSetup() { - KProcess p; - p << "tdesu" << "kcmshell k3bsetup2 --lang " + KGlobal::locale()->language(); - if( !p.start( KProcess::DontCare ) ) + TDEProcess p; + p << "tdesu" << "kcmshell k3bsetup2 --lang " + TDEGlobal::locale()->language(); + if( !p.start( TDEProcess::DontCare ) ) KMessageBox::error( 0, i18n("Could not find tdesu to run K3bSetup with root privileges. " "Please run it manually as root.") ); } diff --git a/src/k3bapplication.cpp b/src/k3bapplication.cpp index 1fa5d3f..ee1d36a 100644 --- a/src/k3bapplication.cpp +++ b/src/k3bapplication.cpp @@ -69,8 +69,8 @@ K3bApplication::K3bApplication() m_needToInit(true) { // insert library i18n data - KGlobal::locale()->insertCatalogue( "libk3bdevice" ); - KGlobal::locale()->insertCatalogue( "libk3b" ); + TDEGlobal::locale()->insertCatalogue( "libk3bdevice" ); + TDEGlobal::locale()->insertCatalogue( "libk3b" ); m_core = new Core( TQT_TQOBJECT(this) ); diff --git a/src/k3bburnprogressdialog.cpp b/src/k3bburnprogressdialog.cpp index bea7c60..a143610 100644 --- a/src/k3bburnprogressdialog.cpp +++ b/src/k3bburnprogressdialog.cpp @@ -128,7 +128,7 @@ void K3bBurnProgressDialog::slotDeviceBuffer( int b ) void K3bBurnProgressDialog::slotWriteSpeed( int s, int multiplicator ) { - m_labelWritingSpeed->setText( TQString("%1 KB/s (%2x)").arg(s).arg(KGlobal::locale()->formatNumber((double)s/(double)multiplicator,2)) ); + m_labelWritingSpeed->setText( TQString("%1 KB/s (%2x)").arg(s).arg(TDEGlobal::locale()->formatNumber((double)s/(double)multiplicator,2)) ); } #include "k3bburnprogressdialog.moc" diff --git a/src/k3bdebuggingoutputdialog.cpp b/src/k3bdebuggingoutputdialog.cpp index 47b88d0..426b652 100644 --- a/src/k3bdebuggingoutputdialog.cpp +++ b/src/k3bdebuggingoutputdialog.cpp @@ -47,7 +47,7 @@ K3bDebuggingOutputDialog::K3bDebuggingOutputDialog( TQWidget* parent ) debugView = new TQTextEdit( this ); debugView->setReadOnly(true); debugView->setTextFormat( TQTextEdit::PlainText ); - debugView->setCurrentFont( KGlobalSettings::fixedFont() ); + debugView->setCurrentFont( TDEGlobalSettings::fixedFont() ); debugView->setWordWrap( TQTextEdit::NoWrap ); setMainWidget( debugView ); diff --git a/src/k3bemptydiscwaiter.cpp b/src/k3bemptydiscwaiter.cpp index cf7138d..afeadf8 100644 --- a/src/k3bemptydiscwaiter.cpp +++ b/src/k3bemptydiscwaiter.cpp @@ -208,10 +208,10 @@ int K3bEmptyDiscWaiter::waitForDisc( int mediaState, int mediaType, const TQStri d->labelRequest->setText( message ); if( d->wantedMediaType & K3bDevice::MEDIA_WRITABLE_DVD ) - d->pixLabel->setPixmap( KGlobal::instance()->iconLoader()->loadIcon( "dvd_unmount", + d->pixLabel->setPixmap( TDEGlobal::instance()->iconLoader()->loadIcon( "dvd_unmount", KIcon::NoGroup, KIcon::SizeMedium ) ); else - d->pixLabel->setPixmap( KGlobal::instance()->iconLoader()->loadIcon( "cdwriter_unmount", + d->pixLabel->setPixmap( TDEGlobal::instance()->iconLoader()->loadIcon( "cdwriter_unmount", KIcon::NoGroup, KIcon::SizeMedium ) ); adjustSize(); diff --git a/src/k3bfiletreeview.cpp b/src/k3bfiletreeview.cpp index a1f52d5..6fb3d87 100644 --- a/src/k3bfiletreeview.cpp +++ b/src/k3bfiletreeview.cpp @@ -696,7 +696,7 @@ void K3bFileTreeView::slotSettingsChangedK3b(int category) disconnect(this, TQT_SIGNAL(mouseButtonClicked(int, TQListViewItem*, const TQPoint &, int)), this, TQT_SLOT(slotMouseButtonClickedK3b(int, TQListViewItem*, const TQPoint &, int))); - if( !KGlobalSettings::singleClick() ) + if( !TDEGlobalSettings::singleClick() ) connect(this, TQT_SIGNAL(mouseButtonClicked(int, TQListViewItem*, const TQPoint &, int)), this, TQT_SLOT(slotMouseButtonClickedK3b(int, TQListViewItem*, const TQPoint &, int))); } diff --git a/src/k3bflatbutton.cpp b/src/k3bflatbutton.cpp index 4300c8c..e46c0b3 100644 --- a/src/k3bflatbutton.cpp +++ b/src/k3bflatbutton.cpp @@ -52,7 +52,7 @@ K3bFlatButton::K3bFlatButton( KAction* a, TQWidget *parent, const char *name ) setText( a->text() ); TQToolTip::add( this, a->toolTip() ); - setPixmap( KGlobal::iconLoader()->loadIcon( a->icon(), KIcon::NoGroup, 32 ) ); + setPixmap( TDEGlobal::iconLoader()->loadIcon( a->icon(), KIcon::NoGroup, 32 ) ); connect( this, TQT_SIGNAL(clicked()), a, TQT_SLOT(activate()) ); } diff --git a/src/k3binteractiondialog.cpp b/src/k3binteractiondialog.cpp index af95c3e..a2bf746 100644 --- a/src/k3binteractiondialog.cpp +++ b/src/k3binteractiondialog.cpp @@ -143,7 +143,7 @@ K3bInteractionDialog::K3bInteractionDialog( TQWidget* parent, // our buttons are always to the right of the dialog int btl = 0; #if KDE_IS_VERSION(3,3,0) - btl = KGlobalSettings::buttonLayout(); + btl = TDEGlobalSettings::buttonLayout(); #endif switch( btl ) { case 0: // KDE default diff --git a/src/k3bjobprogressosd.cpp b/src/k3bjobprogressosd.cpp index 1e8dfcf..ab2c310 100644 --- a/src/k3bjobprogressosd.cpp +++ b/src/k3bjobprogressosd.cpp @@ -118,7 +118,7 @@ void K3bJobProgressOSD::renderOSD() // calculate needed size if( K3bTheme* theme = k3bappcore->themeManager()->currentTheme() ) { - TQPixmap icon = KGlobal::iconLoader()->loadIcon( "k3b", KIcon::NoGroup, 32 ); + TQPixmap icon = TDEGlobal::iconLoader()->loadIcon( "k3b", KIcon::NoGroup, 32 ); int margin = 10; int textWidth = fontMetrics().width( m_text ); diff --git a/src/k3blsofwrapper.cpp b/src/k3blsofwrapper.cpp index 0362de6..ee44f06 100644 --- a/src/k3blsofwrapper.cpp +++ b/src/k3blsofwrapper.cpp @@ -62,7 +62,7 @@ bool K3bLsofWrapper::checkDevice( K3bDevice::Device* dev ) return false; // run lsof - KProcess p; + TDEProcess p; K3bProcessOutputCollector out( &p ); // @@ -72,7 +72,7 @@ bool K3bLsofWrapper::checkDevice( K3bDevice::Device* dev ) // p << d->lsofBin << "-Fpc" << dev->blockDeviceName(); - if( !p.start( KProcess::Block, KProcess::Stdout ) ) + if( !p.start( TDEProcess::Block, TDEProcess::Stdout ) ) return false; // diff --git a/src/k3bservicemenuinstaller.cpp b/src/k3bservicemenuinstaller.cpp index 43413d9..497c29a 100644 --- a/src/k3bservicemenuinstaller.cpp +++ b/src/k3bservicemenuinstaller.cpp @@ -33,7 +33,7 @@ public: void update() { // the list of installable servicemenus the application provides - allServiceMenus = KGlobal::dirs()->findAllResources( "data", + allServiceMenus = TDEGlobal::dirs()->findAllResources( "data", "k3b/servicemenus/*.desktop", false, true ); @@ -44,7 +44,7 @@ public: allServiceMenuFiles.append( allServiceMenus[i].section( '/', -1 ) ); // the local konqueror servicemenu folder (we just create it here to be on the safe side) - konqiServicemenusFolder = KGlobal::dirs()->saveLocation( "data", "konqueror/servicemenus/", true ); + konqiServicemenusFolder = TDEGlobal::dirs()->saveLocation( "data", "konqueror/servicemenus/", true ); } }; diff --git a/src/k3bsystemproblemdialog.cpp b/src/k3bsystemproblemdialog.cpp index 5af3e59..84fdb1d 100644 --- a/src/k3bsystemproblemdialog.cpp +++ b/src/k3bsystemproblemdialog.cpp @@ -607,9 +607,9 @@ void K3bSystemProblemDialog::checkSystem( TQWidget* parent, void K3bSystemProblemDialog::slotK3bSetup() { - KProcess p; - p << "tdesu" << "kcmshell k3bsetup2 --lang " + KGlobal::locale()->language(); - if( !p.start( KProcess::DontCare ) ) + TDEProcess p; + p << "tdesu" << "kcmshell k3bsetup2 --lang " + TDEGlobal::locale()->language(); + if( !p.start( TDEProcess::DontCare ) ) KMessageBox::error( 0, i18n("Unable to start K3bSetup2.") ); } @@ -623,7 +623,7 @@ int K3bSystemProblemDialog::dmaActivated( K3bDevice::Device* dev ) K3bProcess p; K3bProcessOutputCollector out( &p ); p << hdparm << "-d" << dev->blockDeviceName(); - if( !p.start( KProcess::Block, KProcess::AllOutput ) ) + if( !p.start( TDEProcess::Block, TDEProcess::AllOutput ) ) return -1; // output is something like: diff --git a/src/k3bthememanager.cpp b/src/k3bthememanager.cpp index 3471342..a73bb2b 100644 --- a/src/k3bthememanager.cpp +++ b/src/k3bthememanager.cpp @@ -42,7 +42,7 @@ TQColor K3bTheme::backgroundColor() const if( m_bgColor.isValid() ) return m_bgColor; else - return KGlobalSettings::activeTitleColor(); + return TDEGlobalSettings::activeTitleColor(); } @@ -51,7 +51,7 @@ TQColor K3bTheme::foregroundColor() const if( m_fgColor.isValid() ) return m_fgColor; else - return KGlobalSettings::activeTextColor(); + return TDEGlobalSettings::activeTextColor(); } @@ -256,7 +256,7 @@ void K3bThemeManager::loadThemes() delete *it; d->themes.clear(); - TQStringList dirs = KGlobal::dirs()->findDirs( "data", "k3b/pics" ); + TQStringList dirs = TDEGlobal::dirs()->findDirs( "data", "k3b/pics" ); // now search for themes. As there may be multiple themes with the same name // we only use the names from this list and then use findResourceDir to make sure // the local is preferred over the global stuff (like testing a theme by copying it @@ -299,7 +299,7 @@ void K3bThemeManager::loadThemes() void K3bThemeManager::loadTheme( const TQString& name ) { - TQString path = KGlobal::dirs()->findResource( "data", "k3b/pics/" + name + "/k3b.theme" ); + TQString path = TDEGlobal::dirs()->findResource( "data", "k3b/pics/" + name + "/k3b.theme" ); if( !path.isEmpty() ) { K3bTheme* t = new K3bTheme(); t->m_name = name; diff --git a/src/main.cpp b/src/main.cpp index 06a6d21..f9bd6b0 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -138,9 +138,9 @@ int main( int argc, char* argv[] ) if( K3bApplication::start() ) { TDECmdLineArgs* args = TDECmdLineArgs::parsedArgs(); if( args->isSet("lang") ) - if( !KGlobal::locale()->setLanguage(args->getOption("lang")) ) + if( !TDEGlobal::locale()->setLanguage(args->getOption("lang")) ) kdDebug() << "Unable to set to language " << args->getOption("lang") - << " current is: " << KGlobal::locale()->language() << endl; + << " current is: " << TDEGlobal::locale()->language() << endl; K3bApplication app; diff --git a/src/option/k3bexternalbinwidget.cpp b/src/option/k3bexternalbinwidget.cpp index 28c6375..13904e4 100644 --- a/src/option/k3bexternalbinwidget.cpp +++ b/src/option/k3bexternalbinwidget.cpp @@ -49,9 +49,9 @@ K3bExternalBinWidget::K3bExternalProgramViewItem::K3bExternalProgramViewItem( K3 TQFont f( listView()->font() ); f.setBold(true); setFont( 0, f ); - setBackgroundColor( 0, KGlobalSettings::alternateBackgroundColor() ); - setBackgroundColor( 1, KGlobalSettings::alternateBackgroundColor() ); - setBackgroundColor( 2, KGlobalSettings::alternateBackgroundColor() ); + setBackgroundColor( 0, TDEGlobalSettings::alternateBackgroundColor() ); + setBackgroundColor( 1, TDEGlobalSettings::alternateBackgroundColor() ); + setBackgroundColor( 2, TDEGlobalSettings::alternateBackgroundColor() ); setText( 0, p->name() ); setSelectable( false ); } diff --git a/src/option/k3bmiscoptiontab.cpp b/src/option/k3bmiscoptiontab.cpp index 04e660d..19d3b28 100644 --- a/src/option/k3bmiscoptiontab.cpp +++ b/src/option/k3bmiscoptiontab.cpp @@ -80,7 +80,7 @@ void K3bMiscOptionTab::readSettings() K3bInteractionDialog::LOAD_SAVED_SETTINGS ) ); m_checkSystemConfig->setChecked( c->readBoolEntry( "check system config", true ) ); - TQString tempdir = c->readPathEntry( "Temp Dir", KGlobal::dirs()->resourceDirs( "tmp" ).first() ); + TQString tempdir = c->readPathEntry( "Temp Dir", TDEGlobal::dirs()->resourceDirs( "tmp" ).first() ); m_editTempDir->setURL( tempdir ); // if( c->readEntry( "Multiple Instances", "smart" ) == "smart" ) diff --git a/src/option/k3boptiondialog.cpp b/src/option/k3boptiondialog.cpp index 2b2b6af..d222134 100644 --- a/src/option/k3boptiondialog.cpp +++ b/src/option/k3boptiondialog.cpp @@ -127,7 +127,7 @@ void K3bOptionDialog::slotDefault() void K3bOptionDialog::setupBurningPage() { TQFrame* frame = addPage( i18n("Advanced"), i18n("Advanced Settings"), - KGlobal::instance()->iconLoader()->loadIcon( "cdwriter_unmount", KIcon::NoGroup, KIcon::SizeMedium ) ); + TDEGlobal::instance()->iconLoader()->loadIcon( "cdwriter_unmount", KIcon::NoGroup, KIcon::SizeMedium ) ); TQGridLayout* _frameLayout = new TQGridLayout( frame ); _frameLayout->setSpacing( 0 ); @@ -141,7 +141,7 @@ void K3bOptionDialog::setupBurningPage() void K3bOptionDialog::setupProgramsPage() { TQFrame* frame = addPage( i18n("Programs"), i18n("Setup External Programs"), - KGlobal::instance()->iconLoader()->loadIcon( "exec", KIcon::NoGroup, KIcon::SizeMedium ) ); + TDEGlobal::instance()->iconLoader()->loadIcon( "exec", KIcon::NoGroup, KIcon::SizeMedium ) ); TQGridLayout* _frameLayout = new TQGridLayout( frame ); _frameLayout->setSpacing( 0 ); @@ -155,7 +155,7 @@ void K3bOptionDialog::setupProgramsPage() void K3bOptionDialog::setupCddbPage() { TQFrame* frame = addPage( i18n("CDDB"), i18n("Setup the CDDB Server"), - KGlobal::instance()->iconLoader()->loadIcon( "connect_established", KIcon::NoGroup, KIcon::SizeMedium ) ); + TDEGlobal::instance()->iconLoader()->loadIcon( "connect_established", KIcon::NoGroup, KIcon::SizeMedium ) ); TQGridLayout* mainGrid = new TQGridLayout( frame ); mainGrid->setSpacing(0); @@ -173,7 +173,7 @@ void K3bOptionDialog::setupCddbPage() void K3bOptionDialog::setupDevicePage() { TQFrame* frame = addPage( i18n("Devices"), i18n("Setup Devices"), - KGlobal::instance()->iconLoader()->loadIcon( "blockdevice", KIcon::NoGroup, KIcon::SizeMedium ) ); + TDEGlobal::instance()->iconLoader()->loadIcon( "blockdevice", KIcon::NoGroup, KIcon::SizeMedium ) ); TQHBoxLayout* box = new TQHBoxLayout( frame ); box->setSpacing(0); @@ -186,7 +186,7 @@ void K3bOptionDialog::setupDevicePage() void K3bOptionDialog::setupMiscPage() { TQFrame* frame = addPage( i18n("Misc"), i18n("Miscellaneous Settings"), - KGlobal::instance()->iconLoader()->loadIcon( "misc", KIcon::NoGroup, KIcon::SizeMedium ) ); + TDEGlobal::instance()->iconLoader()->loadIcon( "misc", KIcon::NoGroup, KIcon::SizeMedium ) ); TQVBoxLayout* box = new TQVBoxLayout( frame ); box->setSpacing( 0 ); @@ -200,7 +200,7 @@ void K3bOptionDialog::setupMiscPage() void K3bOptionDialog::setupNotifyPage() { TQFrame* frame = addPage( i18n("Notifications"), i18n("System Notifications"), - KGlobal::instance()->iconLoader()->loadIcon( "knotify", + TDEGlobal::instance()->iconLoader()->loadIcon( "knotify", KIcon::NoGroup, KIcon::SizeMedium ) ); TQVBoxLayout* box = new TQVBoxLayout( frame ); box->setSpacing( 0 ); @@ -214,7 +214,7 @@ void K3bOptionDialog::setupNotifyPage() void K3bOptionDialog::setupPluginPage() { TQFrame* frame = addPage( i18n("Plugins"), i18n("K3b Plugin Configuration"), - KGlobal::instance()->iconLoader()->loadIcon( "gear", + TDEGlobal::instance()->iconLoader()->loadIcon( "gear", KIcon::NoGroup, KIcon::SizeMedium ) ); TQVBoxLayout* box = new TQVBoxLayout( frame ); box->setSpacing( 0 ); @@ -228,7 +228,7 @@ void K3bOptionDialog::setupPluginPage() void K3bOptionDialog::setupThemePage() { TQFrame* frame = addPage( i18n("Themes"), i18n("K3b GUI Themes"), - KGlobal::instance()->iconLoader()->loadIcon( "style", + TDEGlobal::instance()->iconLoader()->loadIcon( "style", KIcon::NoGroup, KIcon::SizeMedium ) ); TQVBoxLayout* box = new TQVBoxLayout( frame ); box->setSpacing( 0 ); diff --git a/src/option/k3bpluginoptiontab.cpp b/src/option/k3bpluginoptiontab.cpp index 6072e0a..37a66c8 100644 --- a/src/option/k3bpluginoptiontab.cpp +++ b/src/option/k3bpluginoptiontab.cpp @@ -97,11 +97,11 @@ void K3bPluginOptionTab::readSettings() TQFont f( font() ); f.setBold(true); groupViewItem->setFont( 0, f ); - groupViewItem->setBackgroundColor( 0, KGlobalSettings::alternateBackgroundColor() ); - groupViewItem->setBackgroundColor( 1, KGlobalSettings::alternateBackgroundColor() ); - groupViewItem->setBackgroundColor( 2, KGlobalSettings::alternateBackgroundColor() ); - groupViewItem->setBackgroundColor( 3, KGlobalSettings::alternateBackgroundColor() ); - groupViewItem->setBackgroundColor( 4, KGlobalSettings::alternateBackgroundColor() ); + groupViewItem->setBackgroundColor( 0, TDEGlobalSettings::alternateBackgroundColor() ); + groupViewItem->setBackgroundColor( 1, TDEGlobalSettings::alternateBackgroundColor() ); + groupViewItem->setBackgroundColor( 2, TDEGlobalSettings::alternateBackgroundColor() ); + groupViewItem->setBackgroundColor( 3, TDEGlobalSettings::alternateBackgroundColor() ); + groupViewItem->setBackgroundColor( 4, TDEGlobalSettings::alternateBackgroundColor() ); groupViewItem->setSelectable( false ); TQPtrList<K3bPlugin> fl = k3bcore->pluginManager()->plugins( group ); diff --git a/src/projects/k3baudiotracktrmlookupdialog.cpp b/src/projects/k3baudiotracktrmlookupdialog.cpp index 85a651b..d20838b 100644 --- a/src/projects/k3baudiotracktrmlookupdialog.cpp +++ b/src/projects/k3baudiotracktrmlookupdialog.cpp @@ -57,7 +57,7 @@ K3bAudioTrackTRMLookupDialog::K3bAudioTrackTRMLookupDialog( TQWidget* parent, co m_infoLabel = new TQLabel( plainPage() ); TQLabel* pixLabel = new TQLabel( plainPage() ); - pixLabel->setPixmap( KGlobal::iconLoader()->loadIcon( "musicbrainz", KIcon::NoGroup, 64 ) ); + pixLabel->setPixmap( TDEGlobal::iconLoader()->loadIcon( "musicbrainz", KIcon::NoGroup, 64 ) ); pixLabel->setScaledContents( false ); m_busyWidget = new K3bBusyWidget( plainPage() ); diff --git a/src/projects/k3bdataurladdingdialog.cpp b/src/projects/k3bdataurladdingdialog.cpp index 287191c..a471308 100644 --- a/src/projects/k3bdataurladdingdialog.cpp +++ b/src/projects/k3bdataurladdingdialog.cpp @@ -562,8 +562,8 @@ void K3bDataUrlAddingDialog::slotAddUrls() int dirFilter = TQDir::All|TQDir::Hidden|TQDir::System; TQStringList dlist = newDir.entryList( dirFilter ); - const TQString& dot = KGlobal::staticQString( "." ); - const TQString& dotdot = KGlobal::staticQString( ".." ); + const TQString& dot = TDEGlobal::staticQString( "." ); + const TQString& dotdot = TDEGlobal::staticQString( ".." ); dlist.remove( dot ); dlist.remove( dotdot ); diff --git a/src/projects/k3bfillstatusdisplay.cpp b/src/projects/k3bfillstatusdisplay.cpp index e71db6e..15534b5 100644 --- a/src/projects/k3bfillstatusdisplay.cpp +++ b/src/projects/k3bfillstatusdisplay.cpp @@ -287,7 +287,7 @@ public: void maybeTip( const TQPoint& ) { tip( parentWidget()->rect(), KIO::convertSize( m_doc->size() ) + - " (" + KGlobal::locale()->formatNumber( m_doc->size(), 0 ) + "), " + + " (" + TDEGlobal::locale()->formatNumber( m_doc->size(), 0 ) + "), " + m_doc->length().toString(false) + " " + i18n("min") + " (" + i18n("Right click for media sizes") + ")"); } @@ -542,13 +542,13 @@ void K3bFillStatusDisplay::slotCustomSize() TQString mbS = i18n("mb"); TQString minS = i18n("min"); - TQRegExp rx( "(\\d+\\" + KGlobal::locale()->decimalSymbol() + "?\\d*)(" + gbS + "|" + mbS + "|" + minS + ")?" ); + TQRegExp rx( "(\\d+\\" + TDEGlobal::locale()->decimalSymbol() + "?\\d*)(" + gbS + "|" + mbS + "|" + minS + ")?" ); bool ok; TQString size = KInputDialog::getText( i18n("Custom Size"), i18n("<p>Please specify the size of the media. Use suffixes <b>gb</b>,<b>mb</b>, " "and <b>min</b> for <em>gigabytes</em>, <em>megabytes</em>, and <em>minutes</em>" " respectively."), - d->showDvdSizes ? TQString("4%14%2").arg(KGlobal::locale()->decimalSymbol()).arg(gbS) : + d->showDvdSizes ? TQString("4%14%2").arg(TDEGlobal::locale()->decimalSymbol()).arg(gbS) : (d->showTime ? TQString("74")+minS : TQString("650")+mbS), &ok, this, (const char*)0, new TQRegExpValidator( rx, TQT_TQOBJECT(this) ) ); @@ -556,9 +556,9 @@ void K3bFillStatusDisplay::slotCustomSize() // determine size if( rx.exactMatch( size ) ) { TQString valStr = rx.cap(1); - if( valStr.endsWith( KGlobal::locale()->decimalSymbol() ) ) + if( valStr.endsWith( TDEGlobal::locale()->decimalSymbol() ) ) valStr += "0"; - double val = KGlobal::locale()->readNumber( valStr, &ok ); + double val = TDEGlobal::locale()->readNumber( valStr, &ok ); if( ok ) { TQString s = rx.cap(2); if( s == gbS || (s.isEmpty() && d->showDvdSizes) ) diff --git a/src/projects/k3bmovixoptionswidget.cpp b/src/projects/k3bmovixoptionswidget.cpp index 5041244..094de6e 100644 --- a/src/projects/k3bmovixoptionswidget.cpp +++ b/src/projects/k3bmovixoptionswidget.cpp @@ -46,7 +46,7 @@ public: if( *it == i18n("default") ) m_box->insertItem( *it ); else { - TQString lang = KGlobal::locale()->twoAlphaToLanguageName( *it ); + TQString lang = TDEGlobal::locale()->twoAlphaToLanguageName( *it ); if( lang.isEmpty() ) lang = *it; diff --git a/src/rip/k3bpatternparser.cpp b/src/rip/k3bpatternparser.cpp index 0ab14d8..382c00d 100644 --- a/src/rip/k3bpatternparser.cpp +++ b/src/rip/k3bpatternparser.cpp @@ -171,7 +171,7 @@ TQString K3bPatternParser::parsePattern( const K3bCddbResultEntry& entry, dir.append( s ); // I think it makes more sense to allow empty comments break; case DATE: - dir.append( KGlobal::locale()->formatDate( TQDate::currentDate() ) ); + dir.append( TDEGlobal::locale()->formatDate( TQDate::currentDate() ) ); break; default: dir.append( pattern.mid(i, len) ); @@ -247,7 +247,7 @@ TQString K3bPatternParser::parsePattern( const K3bCddbResultEntry& entry, s = entry.cdExtInfo; break; case DATE: - s = KGlobal::locale()->formatDate( TQDate::currentDate() ); + s = TDEGlobal::locale()->formatDate( TQDate::currentDate() ); break; default: // we must never get here, break; // all choices should be covered diff --git a/src/rip/k3bvideocdinfo.cpp b/src/rip/k3bvideocdinfo.cpp index ace8fb2..af29a37 100644 --- a/src/rip/k3bvideocdinfo.cpp +++ b/src/rip/k3bvideocdinfo.cpp @@ -67,21 +67,21 @@ void K3bVideoCdInfo::info( const TQString& device ) *m_process << "-q" << "--norip" << "-i" << device << "-o" << "-"; - connect( m_process, TQT_SIGNAL( receivedStderr( KProcess*, char*, int ) ), - this, TQT_SLOT( slotParseOutput( KProcess*, char*, int ) ) ); - connect( m_process, TQT_SIGNAL( receivedStdout( KProcess*, char*, int ) ), - this, TQT_SLOT( slotParseOutput( KProcess*, char*, int ) ) ); - connect( m_process, TQT_SIGNAL( processExited( KProcess* ) ), + connect( m_process, TQT_SIGNAL( receivedStderr( TDEProcess*, char*, int ) ), + this, TQT_SLOT( slotParseOutput( TDEProcess*, char*, int ) ) ); + connect( m_process, TQT_SIGNAL( receivedStdout( TDEProcess*, char*, int ) ), + this, TQT_SLOT( slotParseOutput( TDEProcess*, char*, int ) ) ); + connect( m_process, TQT_SIGNAL( processExited( TDEProcess* ) ), this, TQT_SLOT( slotInfoFinished() ) ); - if ( !m_process->start( KProcess::NotifyOnExit, KProcess::AllOutput ) ) { + if ( !m_process->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) ) { kdDebug() << "(K3bVideoCdInfo::info) could not start vcdxrip" << endl; cancelAll(); emit infoFinished( false ); } } -void K3bVideoCdInfo::slotParseOutput( KProcess*, char* output, int len ) +void K3bVideoCdInfo::slotParseOutput( TDEProcess*, char* output, int len ) { TQString buffer = TQString::fromLocal8Bit( output, len ); diff --git a/src/rip/k3bvideocdinfo.h b/src/rip/k3bvideocdinfo.h index 683a515..d6efd0a 100644 --- a/src/rip/k3bvideocdinfo.h +++ b/src/rip/k3bvideocdinfo.h @@ -24,7 +24,7 @@ #include <k3btoc.h> #include <k3bcore.h> -class KProcess; +class TDEProcess; class K3bVideoCdInfoResultEntry { @@ -90,7 +90,7 @@ class K3bVideoCdInfo : public TQObject private slots: void slotInfoFinished(); - void slotParseOutput( KProcess*, char* output, int len ); + void slotParseOutput( TDEProcess*, char* output, int len ); private: void cancelAll(); @@ -98,7 +98,7 @@ class K3bVideoCdInfo : public TQObject K3bVideoCdInfoResult m_Result; void parseXmlData(); - KProcess* m_process; + TDEProcess* m_process; TQString m_xmlData; bool m_isXml; diff --git a/src/rip/k3bvideocdrip.cpp b/src/rip/k3bvideocdrip.cpp index be91fa9..7df8305 100644 --- a/src/rip/k3bvideocdrip.cpp +++ b/src/rip/k3bvideocdrip.cpp @@ -150,11 +150,11 @@ void K3bVideoCdRip::vcdxRip() *m_process << "-o" << "/dev/null"; - connect( m_process, TQT_SIGNAL( receivedStderr( KProcess*, char*, int ) ), - this, TQT_SLOT( slotParseVcdXRipOutput( KProcess*, char*, int ) ) ); - connect( m_process, TQT_SIGNAL( receivedStdout( KProcess*, char*, int ) ), - this, TQT_SLOT( slotParseVcdXRipOutput( KProcess*, char*, int ) ) ); - connect( m_process, TQT_SIGNAL( processExited( KProcess* ) ), + connect( m_process, TQT_SIGNAL( receivedStderr( TDEProcess*, char*, int ) ), + this, TQT_SLOT( slotParseVcdXRipOutput( TDEProcess*, char*, int ) ) ); + connect( m_process, TQT_SIGNAL( receivedStdout( TDEProcess*, char*, int ) ), + this, TQT_SLOT( slotParseVcdXRipOutput( TDEProcess*, char*, int ) ) ); + connect( m_process, TQT_SIGNAL( processExited( TDEProcess* ) ), this, TQT_SLOT( slotVcdXRipFinished() ) ); m_process->setWorkingDirectory( TQUrl( m_videooptions ->getVideoCdDestination() ).dirPath() ); @@ -174,7 +174,7 @@ void K3bVideoCdRip::vcdxRip() emit infoMessage( i18n( "Start extracting." ), K3bJob::INFO ); emit infoMessage( i18n( "Extract files from %1 to %2." ).arg( m_videooptions ->getVideoCdSource() ).arg( m_videooptions ->getVideoCdDestination() ), K3bJob::INFO ); - if ( !m_process->start( KProcess::NotifyOnExit, KProcess::AllOutput ) ) { + if ( !m_process->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) ) { kdDebug() << "(K3bVideoCdRip) could not start vcdxrip" << endl; emit infoMessage( i18n( "Could not start %1." ).arg( "vcdxrip" ), K3bJob::ERROR ); cancelAll(); @@ -182,7 +182,7 @@ void K3bVideoCdRip::vcdxRip() } } -void K3bVideoCdRip::slotParseVcdXRipOutput( KProcess*, char* output, int len ) +void K3bVideoCdRip::slotParseVcdXRipOutput( TDEProcess*, char* output, int len ) { TQString buffer = TQString::fromLocal8Bit( output, len ); diff --git a/src/rip/k3bvideocdrip.h b/src/rip/k3bvideocdrip.h index 21aade0..a6d4582 100644 --- a/src/rip/k3bvideocdrip.h +++ b/src/rip/k3bvideocdrip.h @@ -21,7 +21,7 @@ #include "k3bvideocdrippingoptions.h" class TQString; -class KProcess; +class TDEProcess; class TQDataStream; class K3bVideoCdRip : public K3bJob @@ -47,7 +47,7 @@ class K3bVideoCdRip : public K3bJob protected slots: void slotVcdXRipFinished(); - void slotParseVcdXRipOutput( KProcess*, char* output, int len ); + void slotParseVcdXRipOutput( TDEProcess*, char* output, int len ); private: void vcdxRip(); @@ -68,7 +68,7 @@ class K3bVideoCdRip : public K3bJob bool m_canceled; - KProcess* m_process; + TDEProcess* m_process; }; diff --git a/src/rip/videodvd/k3bvideodvdrippingdialog.cpp b/src/rip/videodvd/k3bvideodvdrippingdialog.cpp index 95093de..3ba01b4 100644 --- a/src/rip/videodvd/k3bvideodvdrippingdialog.cpp +++ b/src/rip/videodvd/k3bvideodvdrippingdialog.cpp @@ -212,7 +212,7 @@ void K3bVideoDVDRippingDialog::populateTitleView( const TQValueList<int>& titles // ri.audioStream = 0; for( unsigned int i = 0; i < m_dvd[*it-1].numAudioStreams(); ++i ) { - if( m_dvd[*it-1].audioStream(i).langCode() == KGlobal::locale()->language() && + if( m_dvd[*it-1].audioStream(i).langCode() == TDEGlobal::locale()->language() && m_dvd[*it-1].audioStream(i).format() != K3bVideoDVD::AUDIO_FORMAT_DTS ) { ri.audioStream = i; break; @@ -226,7 +226,7 @@ void K3bVideoDVDRippingDialog::populateTitleView( const TQValueList<int>& titles .arg( m_dvd[*it-1].audioStream(i).channels() ) .arg( m_dvd[*it-1].audioStream(i).langCode().isEmpty() ? i18n("unknown language") - : KGlobal::locale()->twoAlphaToLanguageName( m_dvd[*it-1].audioStream(i).langCode() ) ) + : TDEGlobal::locale()->twoAlphaToLanguageName( m_dvd[*it-1].audioStream(i).langCode() ) ) .arg( m_dvd[*it-1].audioStream(i).codeExtension() != K3bVideoDVD::AUDIO_CODE_EXT_UNSPECIFIED ? TQString(" ") + K3bVideoDVD::audioCodeExtensionString( m_dvd[*it-1].audioStream(i).codeExtension() ) : TQString() ); @@ -436,7 +436,7 @@ TQString K3bVideoDVDRippingDialog::createFilename( const K3bVideoDVDRippingJob:: break; case PATTERN_LANGUAGE_NAME: if( title.numAudioStreams() > 0 ) - f.append( KGlobal::locale()->twoAlphaToLanguageName( title.audioStream( info.audioStream ).langCode() ) ); + f.append( TDEGlobal::locale()->twoAlphaToLanguageName( title.audioStream( info.audioStream ).langCode() ) ); break; case PATTERN_AUDIO_FORMAT: // FIXME: what about MPEG audio streams? @@ -471,7 +471,7 @@ TQString K3bVideoDVDRippingDialog::createFilename( const K3bVideoDVDRippingJob:: f.append( "16:9" ); break; case PATTERN_CURRENT_DATE: - f.append( KGlobal::locale()->formatDate( TQDate::currentDate() ) ); + f.append( TDEGlobal::locale()->formatDate( TQDate::currentDate() ) ); break; default: f.append( pattern[i-1] ); diff --git a/src/rip/videodvd/k3bvideodvdrippingpreview.cpp b/src/rip/videodvd/k3bvideodvdrippingpreview.cpp index 2081d32..2f2b38e 100644 --- a/src/rip/videodvd/k3bvideodvdrippingpreview.cpp +++ b/src/rip/videodvd/k3bvideodvdrippingpreview.cpp @@ -74,7 +74,7 @@ void K3bVideoDVDRippingPreview::generatePreview( const K3bVideoDVD::VideoDVD& dv m_tempDir = new KTempDir(); m_tempDir->setAutoDelete( true ); - m_process = new KProcess(); + m_process = new TDEProcess(); *m_process << bin->path; *m_process << "-i" << dvd.device()->blockDeviceName(); *m_process << "-T" << TQString("%1,%2").arg(title).arg(chapter); @@ -85,9 +85,9 @@ void K3bVideoDVDRippingPreview::generatePreview( const K3bVideoDVD::VideoDVD& dv *m_process << "-Z" << "x200"; *m_process << "-o" << m_tempDir->name(); - connect( m_process, TQT_SIGNAL(processExited(KProcess*)), - this, TQT_SLOT(slotTranscodeFinished(KProcess*)) ); - if( !m_process->start( KProcess::NotifyOnExit, KProcess::AllOutput ) ) { // we use AllOutput to not pollute stdout + connect( m_process, TQT_SIGNAL(processExited(TDEProcess*)), + this, TQT_SLOT(slotTranscodeFinished(TDEProcess*)) ); + if( !m_process->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) ) { // we use AllOutput to not pollute stdout // something went wrong when starting the program // it "should" be the executable kdDebug() << "(K3bVideoDVDRippingPreview) Could not start transcode." << endl; @@ -109,7 +109,7 @@ void K3bVideoDVDRippingPreview::cancel() } -void K3bVideoDVDRippingPreview::slotTranscodeFinished( KProcess* ) +void K3bVideoDVDRippingPreview::slotTranscodeFinished( TDEProcess* ) { // read the image TQString filename = m_tempDir->name() + "000000.ppm";// + tempTQDir->entryList( TQDir::Files ).first(); diff --git a/src/rip/videodvd/k3bvideodvdrippingpreview.h b/src/rip/videodvd/k3bvideodvdrippingpreview.h index 7459ae8..92706dc 100644 --- a/src/rip/videodvd/k3bvideodvdrippingpreview.h +++ b/src/rip/videodvd/k3bvideodvdrippingpreview.h @@ -23,7 +23,7 @@ class KTempDir; -class KProcess; +class TDEProcess; class K3bVideoDVDRippingPreview : public TQObject { @@ -51,12 +51,12 @@ class K3bVideoDVDRippingPreview : public TQObject void previewDone( bool ); private slots: - void slotTranscodeFinished( KProcess* ); + void slotTranscodeFinished( TDEProcess* ); private: TQImage m_preview; KTempDir* m_tempDir; - KProcess* m_process; + TDEProcess* m_process; int m_title; int m_chapter; K3bVideoDVD::VideoDVD m_dvd; diff --git a/src/rip/videodvd/k3bvideodvdrippingtitlelistview.cpp b/src/rip/videodvd/k3bvideodvdrippingtitlelistview.cpp index d3f1e72..4d03c64 100644 --- a/src/rip/videodvd/k3bvideodvdrippingtitlelistview.cpp +++ b/src/rip/videodvd/k3bvideodvdrippingtitlelistview.cpp @@ -49,7 +49,7 @@ static TQString audioStreamString( const K3bVideoDVD::Title& title, unsigned int .arg( title.audioStream(i).channels() ) .arg( title.audioStream(i).langCode().isEmpty() ? i18n("unknown language") - : KGlobal::locale()->twoAlphaToLanguageName( title.audioStream(i).langCode() ) ) + : TDEGlobal::locale()->twoAlphaToLanguageName( title.audioStream(i).langCode() ) ) .arg( includeExtInfo && title.audioStream(i).codeExtension() != K3bVideoDVD::AUDIO_CODE_EXT_UNSPECIFIED ? TQString(" ") + K3bVideoDVD::audioCodeExtensionString( title.audioStream(i).codeExtension() ) : TQString() ); @@ -74,7 +74,7 @@ static TQString subpictureStreamString( const K3bVideoDVD::Title& title, unsigne : i18n("Extended") ) .arg( title.subPictureStream(i).langCode().isEmpty() ? i18n("unknown language") - : KGlobal::locale()->twoAlphaToLanguageName( title.subPictureStream(i).langCode() ) ) + : TDEGlobal::locale()->twoAlphaToLanguageName( title.subPictureStream(i).langCode() ) ) .arg( includeExtInfo && title.subPictureStream(i).codeExtension() != K3bVideoDVD::SUBPIC_CODE_EXT_UNSPECIFIED ? TQString(" ") + K3bVideoDVD::subPictureCodeExtensionString( title.subPictureStream(i).codeExtension() ) : TQString() ); |