From aef5eada7f51ee48f3d21448db290bd8f06953a8 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 24 Jan 2013 13:50:20 -0600 Subject: Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4 --- ark/ChangeLog | 6 +- ark/ace.cpp | 38 ++++++------- ark/ace.h | 4 +- ark/ar.cpp | 76 ++++++++++++------------- ark/arch.cpp | 18 +++--- ark/arch.h | 20 +++---- ark/arj.cpp | 80 +++++++++++++------------- ark/arkwidget.cpp | 14 ++--- ark/arkwidget.h | 4 +- ark/compressedfile.cpp | 52 ++++++++--------- ark/compressedfile.h | 8 +-- ark/extractiondialog.cpp | 2 +- ark/filelistview.cpp | 6 +- ark/lha.cpp | 66 +++++++++++----------- ark/mainwindow.cpp | 4 +- ark/rar.cpp | 86 ++++++++++++++-------------- ark/sevenzip.cpp | 86 ++++++++++++++-------------- ark/sevenzip.h | 2 +- ark/tar.cpp | 144 +++++++++++++++++++++++------------------------ ark/tar.h | 22 ++++---- ark/zip.cpp | 80 +++++++++++++------------- ark/zoo.cpp | 66 +++++++++++----------- 22 files changed, 442 insertions(+), 442 deletions(-) (limited to 'ark') diff --git a/ark/ChangeLog b/ark/ChangeLog index bca2e19..394ec6c 100644 --- a/ark/ChangeLog +++ b/ark/ChangeLog @@ -173,8 +173,8 @@ changes will be lost.) 2000-03-06: Emily Ezust - * Got rid of KProcess data member in Arch - no need for it with the - new way that KProcess does its work: we are always passing it + * Got rid of TDEProcess data member in Arch - no need for it with the + new way that TDEProcess does its work: we are always passing it around to the functions that need it. This way we won't get confused when there are more than one processes happening. * Made tar more asynchronous, redid the temp file creation & updating. @@ -199,7 +199,7 @@ 2000-02-22: Emily Ezust * More work on the abstract base class for archives - moved lots of - slots dealing with the KProcess from zip.cpp to arch.cpp + slots dealing with the TDEProcess from zip.cpp to arch.cpp * Some work on tar. Doesn't work yet. 2000-02-16: Emily Ezust diff --git a/ark/ace.cpp b/ark/ace.cpp index 6ad5cd0..2f29bf3 100644 --- a/ark/ace.cpp +++ b/ark/ace.cpp @@ -83,23 +83,23 @@ void AceArch::open() m_header_removed = false; m_finished = false; - KProcess *kp = m_currentProcess = new KProcess; + TDEProcess *kp = m_currentProcess = new TDEProcess; *kp << m_archiver_program << "v" << m_filename; //kp->setUseShell( true ); kdDebug() << "AceArch::open(): kp->args(): " << kp->args() << endl; - connect( kp, TQT_SIGNAL( receivedStdout(KProcess*, char*, int) ), - TQT_SLOT( slotReceivedTOC(KProcess*, char*, int) ) ); - connect( kp, TQT_SIGNAL( receivedStderr(KProcess*, char*, int) ), - TQT_SLOT( slotReceivedOutput(KProcess*, char*, int) ) ); - connect( kp, TQT_SIGNAL( processExited(KProcess*) ), - TQT_SLOT( slotOpenExited(KProcess*) ) ); + connect( kp, TQT_SIGNAL( receivedStdout(TDEProcess*, char*, int) ), + TQT_SLOT( slotReceivedTOC(TDEProcess*, char*, int) ) ); + connect( kp, TQT_SIGNAL( receivedStderr(TDEProcess*, char*, int) ), + TQT_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, TQT_SIGNAL( processExited(TDEProcess*) ), + TQT_SLOT( slotOpenExited(TDEProcess*) ) ); - connect( kp, TQT_SIGNAL( receivedStdout(KProcess*, char*, int) ), - this, TQT_SLOT( catchMeIfYouCan(KProcess*, char*, int) ) ); + connect( kp, TQT_SIGNAL( receivedStdout(TDEProcess*, char*, int) ), + this, TQT_SLOT( catchMeIfYouCan(TDEProcess*, char*, int) ) ); - if ( !kp->start( KProcess::NotifyOnExit, KProcess::AllOutput ) ) + if ( !kp->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) ) { KMessageBox::error( 0, i18n( "Could not start a subprocess." ) ); emit sigOpen( this, false, TQString(), 0 ); @@ -132,7 +132,7 @@ void AceArch::unarchFileInternal( ) return; } - KProcess *kp = m_currentProcess = new KProcess; + TDEProcess *kp = m_currentProcess = new TDEProcess; kp->clearArguments(); // extract (and maybe overwrite) @@ -158,21 +158,21 @@ void AceArch::unarchFileInternal( ) } } - connect( kp, TQT_SIGNAL( receivedStdout(KProcess*, char*, int) ), - TQT_SLOT( slotReceivedOutput(KProcess*, char*, int) ) ); - connect( kp, TQT_SIGNAL( receivedStderr(KProcess*, char*, int) ), - TQT_SLOT( slotReceivedOutput(KProcess*, char*, int) ) ); - connect( kp, TQT_SIGNAL( processExited(KProcess*) ), - TQT_SLOT( slotExtractExited(KProcess*) ) ); + connect( kp, TQT_SIGNAL( receivedStdout(TDEProcess*, char*, int) ), + TQT_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, TQT_SIGNAL( receivedStderr(TDEProcess*, char*, int) ), + TQT_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, TQT_SIGNAL( processExited(TDEProcess*) ), + TQT_SLOT( slotExtractExited(TDEProcess*) ) ); - if ( !kp->start( KProcess::NotifyOnExit, KProcess::AllOutput ) ) + if ( !kp->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) ) { KMessageBox::error( 0, i18n( "Could not start a subprocess." ) ); emit sigExtract( false ); } } -void AceArch::catchMeIfYouCan( KProcess*, char *buffer, int buflen ) +void AceArch::catchMeIfYouCan( TDEProcess*, char *buffer, int buflen ) { TQString myBuf = TQString::fromLatin1( buffer, buflen ); kdDebug(1601) << " Wololo!: " << myBuf << endl; diff --git a/ark/ace.h b/ark/ace.h index 0598682..4a1c971 100644 --- a/ark/ace.h +++ b/ark/ace.h @@ -27,7 +27,7 @@ #include "arch.h" -class KProcess; // TODO: Remove me! +class TDEProcess; // TODO: Remove me! class AceArch : public Arch { @@ -47,7 +47,7 @@ class AceArch : public Arch virtual void unarchFileInternal( ); private slots: - void catchMeIfYouCan( KProcess*, char*, int ); + void catchMeIfYouCan( TDEProcess*, char*, int ); private: void setHeaders(); diff --git a/ark/ar.cpp b/ark/ar.cpp index 3456f81..8edb2dd 100644 --- a/ark/ar.cpp +++ b/ark/ar.cpp @@ -87,17 +87,17 @@ void ArArch::open() m_buffer = ""; - KProcess *kp = m_currentProcess = new KProcess; + TDEProcess *kp = m_currentProcess = new TDEProcess; *kp << m_archiver_program << "vt" << m_filename; - connect( kp, TQT_SIGNAL(receivedStdout(KProcess*, char*, int)), - this, TQT_SLOT(slotReceivedTOC(KProcess*, char*, int))); - connect( kp, TQT_SIGNAL(receivedStderr(KProcess*, char*, int)), - this, TQT_SLOT(slotReceivedOutput(KProcess*, char*, int))); + connect( kp, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)), + this, TQT_SLOT(slotReceivedTOC(TDEProcess*, char*, int))); + connect( kp, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)), + this, TQT_SLOT(slotReceivedOutput(TDEProcess*, char*, int))); - connect( kp, TQT_SIGNAL(processExited(KProcess*)), this, - TQT_SLOT(slotOpenExited(KProcess*))); + connect( kp, TQT_SIGNAL(processExited(TDEProcess*)), this, + TQT_SLOT(slotOpenExited(TDEProcess*))); - if (kp->start(KProcess::NotifyOnExit, KProcess::AllOutput) == false) + if (kp->start(TDEProcess::NotifyOnExit, TDEProcess::AllOutput) == false) { KMessageBox::error( 0, i18n("Could not start a subprocess.") ); emit sigOpen(this, false, TQString(), 0 ); @@ -107,16 +107,16 @@ void ArArch::open() void ArArch::create() { - KProcess *kp = m_currentProcess = new KProcess; + TDEProcess *kp = m_currentProcess = new TDEProcess; kp->clearArguments(); *kp << m_archiver_program << "c" << m_filename; - connect( kp, TQT_SIGNAL(receivedStdout(KProcess*, char*, int)), - this, TQT_SLOT(slotReceivedOutput(KProcess*, char*, int))); - connect( kp, TQT_SIGNAL(receivedStderr(KProcess*, char*, int)), - this, TQT_SLOT(slotReceivedOutput(KProcess*, char*, int))); + connect( kp, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)), + this, TQT_SLOT(slotReceivedOutput(TDEProcess*, char*, int))); + connect( kp, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)), + this, TQT_SLOT(slotReceivedOutput(TDEProcess*, char*, int))); - if (kp->start(KProcess::Block) == false) + if (kp->start(TDEProcess::Block) == false) { KMessageBox::error( 0, i18n("Could not start a subprocess.") ); emit sigCreate(this, false, m_filename, @@ -132,7 +132,7 @@ void ArArch::create() void ArArch::addFile( const TQStringList &urls ) { kdDebug(1601) << "+ArArch::addFile" << endl; - KProcess *kp = m_currentProcess = new KProcess; + TDEProcess *kp = m_currentProcess = new TDEProcess; kp->clearArguments(); *kp << m_archiver_program; @@ -152,15 +152,15 @@ void ArArch::addFile( const TQStringList &urls ) *kp << fileURL.fileName(); } - connect( kp, TQT_SIGNAL(receivedStdout(KProcess*, char*, int)), - this, TQT_SLOT(slotReceivedOutput(KProcess*, char*, int))); - connect( kp, TQT_SIGNAL(receivedStderr(KProcess*, char*, int)), - this, TQT_SLOT(slotReceivedOutput(KProcess*, char*, int))); + connect( kp, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)), + this, TQT_SLOT(slotReceivedOutput(TDEProcess*, char*, int))); + connect( kp, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)), + this, TQT_SLOT(slotReceivedOutput(TDEProcess*, char*, int))); - connect( kp, TQT_SIGNAL(processExited(KProcess*)), this, - TQT_SLOT(slotAddExited(KProcess*))); + connect( kp, TQT_SIGNAL(processExited(TDEProcess*)), this, + TQT_SLOT(slotAddExited(TDEProcess*))); - if (kp->start(KProcess::NotifyOnExit, KProcess::AllOutput) == false) + if (kp->start(TDEProcess::NotifyOnExit, TDEProcess::AllOutput) == false) { KMessageBox::error( 0, i18n("Could not start a subprocess.") ); emit sigAdd(false); @@ -191,7 +191,7 @@ void ArArch::unarchFileInternal() // I already checked the validity of the dir before coming here Q_ASSERT(ret); - KProcess *kp = m_currentProcess = new KProcess; + TDEProcess *kp = m_currentProcess = new TDEProcess; kp->clearArguments(); *kp << m_archiver_program; @@ -209,15 +209,15 @@ void ArArch::unarchFileInternal() } } - connect( kp, TQT_SIGNAL(receivedStdout(KProcess*, char*, int)), - this, TQT_SLOT(slotReceivedOutput(KProcess*, char*, int))); - connect( kp, TQT_SIGNAL(receivedStderr(KProcess*, char*, int)), - this, TQT_SLOT(slotReceivedOutput(KProcess*, char*, int))); + connect( kp, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)), + this, TQT_SLOT(slotReceivedOutput(TDEProcess*, char*, int))); + connect( kp, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)), + this, TQT_SLOT(slotReceivedOutput(TDEProcess*, char*, int))); - connect( kp, TQT_SIGNAL(processExited(KProcess*)), this, - TQT_SLOT(slotExtractExited(KProcess*))); + connect( kp, TQT_SIGNAL(processExited(TDEProcess*)), this, + TQT_SLOT(slotExtractExited(TDEProcess*))); - if (kp->start(KProcess::NotifyOnExit, KProcess::AllOutput) == false) + if (kp->start(TDEProcess::NotifyOnExit, TDEProcess::AllOutput) == false) { KMessageBox::error( 0, i18n("Could not start a subprocess.") ); emit sigExtract(false); @@ -231,7 +231,7 @@ void ArArch::remove(TQStringList *list) if (!list) return; - KProcess *kp = m_currentProcess = new KProcess; + TDEProcess *kp = m_currentProcess = new TDEProcess; kp->clearArguments(); *kp << m_archiver_program << "d" << m_filename; @@ -242,15 +242,15 @@ void ArArch::remove(TQStringList *list) *kp << str; } - connect( kp, TQT_SIGNAL(receivedStdout(KProcess*, char*, int)), - this, TQT_SLOT(slotReceivedOutput(KProcess*, char*, int))); - connect( kp, TQT_SIGNAL(receivedStderr(KProcess*, char*, int)), - this, TQT_SLOT(slotReceivedOutput(KProcess*, char*, int))); + connect( kp, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)), + this, TQT_SLOT(slotReceivedOutput(TDEProcess*, char*, int))); + connect( kp, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)), + this, TQT_SLOT(slotReceivedOutput(TDEProcess*, char*, int))); - connect( kp, TQT_SIGNAL(processExited(KProcess*)), this, - TQT_SLOT(slotDeleteExited(KProcess*))); + connect( kp, TQT_SIGNAL(processExited(TDEProcess*)), this, + TQT_SLOT(slotDeleteExited(TDEProcess*))); - if (kp->start(KProcess::NotifyOnExit, KProcess::AllOutput) == false) + if (kp->start(TDEProcess::NotifyOnExit, TDEProcess::AllOutput) == false) { KMessageBox::error( 0, i18n("Could not start a subprocess.") ); emit sigDelete(false); diff --git a/ark/arch.cpp b/ark/arch.cpp index b4fc0e8..18a589a 100644 --- a/ark/arch.cpp +++ b/ark/arch.cpp @@ -88,7 +88,7 @@ Arch::~Arch() void Arch::verifyCompressUtilityIsAvailable( const TQString &utility ) { // see if the utility is in the PATH of the user. - TQString cmd = KGlobal::dirs()->findExe( utility ); + TQString cmd = TDEGlobal::dirs()->findExe( utility ); m_bArchUtilityIsAvailable = !cmd.isEmpty(); } @@ -96,11 +96,11 @@ void Arch::verifyCompressUtilityIsAvailable( const TQString &utility ) void Arch::verifyUncompressUtilityIsAvailable( const TQString &utility ) { // see if the utility is in the PATH of the user. - TQString cmd = KGlobal::dirs()->findExe( utility ); + TQString cmd = TDEGlobal::dirs()->findExe( utility ); m_bUnarchUtilityIsAvailable = !cmd.isEmpty(); } -void Arch::slotOpenExited( KProcess* _kp ) +void Arch::slotOpenExited( TDEProcess* _kp ) { bool success = ( _kp->normalExit() && ( _kp->exitStatus() == 0 ) ); @@ -148,7 +148,7 @@ void Arch::slotOpenExited( KProcess* _kp ) _kp = m_currentProcess = 0; } -void Arch::slotDeleteExited( KProcess *_kp ) +void Arch::slotDeleteExited( TDEProcess *_kp ) { bool success = ( _kp->normalExit() && ( _kp->exitStatus() == 0 ) ); @@ -175,7 +175,7 @@ void Arch::slotDeleteExited( KProcess *_kp ) _kp = m_currentProcess = 0; } -void Arch::slotExtractExited( KProcess *_kp ) +void Arch::slotExtractExited( TDEProcess *_kp ) { bool success = ( _kp->normalExit() && ( _kp->exitStatus() == 0 ) ); @@ -234,7 +234,7 @@ void Arch::unarchFile( TQStringList *fileList, const TQString & destDir, unarchFileInternal(); } -void Arch::slotAddExited( KProcess *_kp ) +void Arch::slotAddExited( TDEProcess *_kp ) { bool success = ( _kp->normalExit() && ( _kp->exitStatus() == 0 ) ); @@ -261,7 +261,7 @@ void Arch::slotAddExited( KProcess *_kp ) _kp = m_currentProcess = 0; } -void Arch::slotReceivedOutput( KProcess*, char* data, int length ) +void Arch::slotReceivedOutput( TDEProcess*, char* data, int length ) { char c = data[ length ]; data[ length ] = '\0'; @@ -271,7 +271,7 @@ void Arch::slotReceivedOutput( KProcess*, char* data, int length ) } -void Arch::slotReceivedTOC( KProcess*, char* data, int length ) +void Arch::slotReceivedTOC( TDEProcess*, char* data, int length ) { char c = data[ length ]; data[ length ] = '\0'; @@ -400,7 +400,7 @@ void Arch::test() KMessageBox::information(0, i18n("Not implemented.")); } -void Arch::slotTestExited( KProcess *_kp ) +void Arch::slotTestExited( TDEProcess *_kp ) { bool success = ( _kp->normalExit() && ( _kp->exitStatus() == 0 ) ); diff --git a/ark/arch.h b/ark/arch.h index 85c6c7d..5592832 100644 --- a/ark/arch.h +++ b/ark/arch.h @@ -26,7 +26,7 @@ */ /* The following class is the base class for all of the archive types. - * In order for it to work properly with the KProcess, you have to + * In order for it to work properly with the TDEProcess, you have to * connect the ProcessExited signal appropriately before spawning * the core operations. Then the signal that the process exited can * be intercepted by the viewer (in ark, ArkWidget) and dealt with @@ -58,7 +58,7 @@ class TQCString; class TQStringList; -class KProcess; +class TDEProcess; class FileListView; class ArkWidget; @@ -156,16 +156,16 @@ class Arch : public TQObject virtual void createPassword() {} protected slots: - void slotOpenExited( KProcess* ); - void slotExtractExited( KProcess* ); - void slotDeleteExited( KProcess* ); - void slotAddExited( KProcess* ); - void slotTestExited( KProcess* ); + void slotOpenExited( TDEProcess* ); + void slotExtractExited( TDEProcess* ); + void slotDeleteExited( TDEProcess* ); + void slotAddExited( TDEProcess* ); + void slotTestExited( TDEProcess* ); - void slotReceivedOutput( KProcess *, char*, int ); + void slotReceivedOutput( TDEProcess *, char*, int ); virtual bool processLine( const TQCString &line ); - virtual void slotReceivedTOC( KProcess *, char *, int ); + virtual void slotReceivedTOC( TDEProcess *, char *, int ); signals: void sigOpen( Arch * archive, bool success, const TQString &filename, int ); @@ -202,7 +202,7 @@ class Arch : public TQObject TQPtrList m_archCols; int m_numCols, m_dateCol, m_fixYear, m_fixMonth, m_fixDay, m_fixTime; int m_repairYear, m_repairMonth, m_repairTime; - KProcess *m_currentProcess; + TDEProcess *m_currentProcess; TQStringList *m_fileList; TQString m_destDir; bool m_viewFriendly; diff --git a/ark/arj.cpp b/ark/arj.cpp index 95e5e98..146df76 100644 --- a/ark/arj.cpp +++ b/ark/arj.cpp @@ -95,7 +95,7 @@ void ArjArch::addDir( const TQString & _dirName ) void ArjArch::addFile( const TQStringList & urls ) { - KProcess *kp = m_currentProcess = new KProcess; + TDEProcess *kp = m_currentProcess = new TDEProcess; kp->clearArguments(); *kp << m_archiver_program; @@ -122,14 +122,14 @@ void ArjArch::addFile( const TQStringList & urls ) *kp << url.fileName(); } - connect( kp, SIGNAL( receivedStdout(KProcess*, char*, int) ), - SLOT( slotReceivedOutput(KProcess*, char*, int) ) ); - connect( kp, SIGNAL( receivedStderr(KProcess*, char*, int) ), - SLOT( slotReceivedOutput(KProcess*, char*, int) ) ); - connect( kp, SIGNAL( processExited(KProcess*) ), - SLOT( slotAddExited(KProcess*) ) ); + connect( kp, SIGNAL( receivedStdout(TDEProcess*, char*, int) ), + SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, SIGNAL( receivedStderr(TDEProcess*, char*, int) ), + SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, SIGNAL( processExited(TDEProcess*) ), + SLOT( slotAddExited(TDEProcess*) ) ); - if ( !kp->start( KProcess::NotifyOnExit, KProcess::AllOutput ) ) + if ( !kp->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) ) { KMessageBox::error( 0, i18n( "Could not start a subprocess." ) ); emit sigAdd( false ); @@ -186,18 +186,18 @@ void ArjArch::open() m_header_removed = false; m_finished = false; - KProcess *kp = m_currentProcess = new KProcess; + TDEProcess *kp = m_currentProcess = new TDEProcess; *kp << m_unarchiver_program << "v" << m_filename; - connect( kp, SIGNAL( receivedStdout(KProcess*, char*, int) ), - SLOT( slotReceivedTOC(KProcess*, char*, int) ) ); - connect( kp, SIGNAL( receivedStderr(KProcess*, char*, int) ), - SLOT( slotReceivedOutput(KProcess*, char*, int) ) ); - connect( kp, SIGNAL( processExited(KProcess*) ), - SLOT( slotOpenExited(KProcess*) ) ); + connect( kp, SIGNAL( receivedStdout(TDEProcess*, char*, int) ), + SLOT( slotReceivedTOC(TDEProcess*, char*, int) ) ); + connect( kp, SIGNAL( receivedStderr(TDEProcess*, char*, int) ), + SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, SIGNAL( processExited(TDEProcess*) ), + SLOT( slotOpenExited(TDEProcess*) ) ); - if ( !kp->start( KProcess::NotifyOnExit, KProcess::AllOutput ) ) + if ( !kp->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) ) { KMessageBox::error( 0, i18n( "Could not start a subprocess." ) ); emit sigOpen( this, false, TQString::null, 0 ); @@ -214,7 +214,7 @@ void ArjArch::unarchFileInternal() return; } - KProcess *kp = m_currentProcess = new KProcess; + TDEProcess *kp = m_currentProcess = new TDEProcess; kp->clearArguments(); *kp << m_unarchiver_program; @@ -246,14 +246,14 @@ void ArjArch::unarchFileInternal() } } - connect( kp, SIGNAL( receivedStdout(KProcess*, char*, int) ), - SLOT( slotReceivedOutput(KProcess*, char*, int) ) ); - connect( kp, SIGNAL( receivedStderr(KProcess*, char*, int) ), - SLOT( slotReceivedOutput(KProcess*, char*, int) ) ); - connect( kp, SIGNAL( processExited(KProcess*) ), - SLOT( slotExtractExited(KProcess*) ) ); + connect( kp, SIGNAL( receivedStdout(TDEProcess*, char*, int) ), + SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, SIGNAL( receivedStderr(TDEProcess*, char*, int) ), + SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, SIGNAL( processExited(TDEProcess*) ), + SLOT( slotExtractExited(TDEProcess*) ) ); - if ( !kp->start( KProcess::NotifyOnExit, KProcess::AllOutput ) ) + if ( !kp->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) ) { KMessageBox::error( 0, i18n( "Could not start a subprocess." ) ); emit sigExtract( false ); @@ -270,7 +270,7 @@ void ArjArch::remove( TQStringList *list ) if ( !list ) return; - KProcess *kp = m_currentProcess = new KProcess; + TDEProcess *kp = m_currentProcess = new TDEProcess; kp->clearArguments(); *kp << m_archiver_program << "d" << m_filename; @@ -282,14 +282,14 @@ void ArjArch::remove( TQStringList *list ) *kp << str; } - connect( kp, SIGNAL( receivedStdout(KProcess*, char*, int) ), - SLOT( slotReceivedOutput(KProcess*, char*, int) ) ); - connect( kp, SIGNAL( receivedStderr(KProcess*, char*, int) ), - SLOT( slotReceivedOutput(KProcess*, char*, int) ) ); - connect( kp, SIGNAL( processExited(KProcess*) ), - SLOT( slotDeleteExited(KProcess*) ) ); + connect( kp, SIGNAL( receivedStdout(TDEProcess*, char*, int) ), + SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, SIGNAL( receivedStderr(TDEProcess*, char*, int) ), + SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, SIGNAL( processExited(TDEProcess*) ), + SLOT( slotDeleteExited(TDEProcess*) ) ); - if ( !kp->start( KProcess::NotifyOnExit, KProcess::AllOutput ) ) + if ( !kp->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) ) { KMessageBox::error( 0, i18n( "Could not start a subprocess." ) ); emit sigDelete( false ); @@ -300,7 +300,7 @@ void ArjArch::test() { clearShellOutput(); - KProcess *kp = m_currentProcess = new KProcess; + TDEProcess *kp = m_currentProcess = new TDEProcess; kp->clearArguments(); *kp << m_unarchiver_program << "t"; @@ -310,14 +310,14 @@ void ArjArch::test() *kp << m_filename; - connect( kp, SIGNAL( receivedStdout(KProcess*, char*, int) ), - SLOT( slotReceivedOutput(KProcess*, char*, int) ) ); - connect( kp, SIGNAL( receivedStderr(KProcess*, char*, int) ), - SLOT( slotReceivedOutput(KProcess*, char*, int) ) ); - connect( kp, SIGNAL( processExited(KProcess*) ), - SLOT( slotTestExited(KProcess*) ) ); + connect( kp, SIGNAL( receivedStdout(TDEProcess*, char*, int) ), + SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, SIGNAL( receivedStderr(TDEProcess*, char*, int) ), + SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, SIGNAL( processExited(TDEProcess*) ), + SLOT( slotTestExited(TDEProcess*) ) ); - if ( !kp->start( KProcess::NotifyOnExit, KProcess::AllOutput ) ) + if ( !kp->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) ) { KMessageBox::error( 0, i18n( "Could not start a subprocess." ) ); emit sigTest( false ); diff --git a/ark/arkwidget.cpp b/ark/arkwidget.cpp index 0935e38..6a40e4a 100644 --- a/ark/arkwidget.cpp +++ b/ark/arkwidget.cpp @@ -1611,17 +1611,17 @@ ArkWidget::editStart() { kdDebug(1601) << "Edit in progress..." << endl; KURL::List list; - // edit will be in progress until the KProcess terminates. + // edit will be in progress until the TDEProcess terminates. KOpenWithDlg l( list, i18n("Edit with:"), TQString(), (TQWidget*)0L ); if ( l.exec() ) { - KProcess *kp = new KProcess; + TDEProcess *kp = new TDEProcess; *kp << l.text() << m_strFileToView; - connect( kp, TQT_SIGNAL(processExited(KProcess *)), - this, TQT_SLOT(slotEditFinished(KProcess *)) ); - if ( kp->start(KProcess::NotifyOnExit, KProcess::AllOutput) == false ) + connect( kp, TQT_SIGNAL(processExited(TDEProcess *)), + this, TQT_SLOT(slotEditFinished(TDEProcess *)) ); + if ( kp->start(TDEProcess::NotifyOnExit, TDEProcess::AllOutput) == false ) { KMessageBox::error(0, i18n("Trouble editing the file...")); } @@ -1629,7 +1629,7 @@ ArkWidget::editStart() } void -ArkWidget::slotEditFinished(KProcess *kp) +ArkWidget::slotEditFinished(TDEProcess *kp) { kdDebug(1601) << "+ArkWidget::slotEditFinished" << endl; connect( arch, TQT_SIGNAL( sigAdd( bool ) ), this, TQT_SLOT( editSlotAddDone( bool ) ) ); @@ -1841,7 +1841,7 @@ ArkWidget::updateStatusSelection() else if (m_nNumSelectedFiles != 1) { strInfo = i18n("%1 files selected %2") - .arg(KGlobal::locale()->formatNumber(m_nNumSelectedFiles, 0)) + .arg(TDEGlobal::locale()->formatNumber(m_nNumSelectedFiles, 0)) .arg(KIO::convertSize(m_nSizeOfSelectedFiles)); } else diff --git a/ark/arkwidget.h b/ark/arkwidget.h index fa2b68e..59d3ea7 100644 --- a/ark/arkwidget.h +++ b/ark/arkwidget.h @@ -45,7 +45,7 @@ class TQDragMoveEvent; class TQDropEvent; class KPopupMenu; -class KProcess; +class TDEProcess; class KURL; class KRun; class KTempFile; @@ -133,7 +133,7 @@ protected slots: void slotExtractDone(bool); void slotExtractRemoteDone(KIO::Job *job); void slotAddDone(bool); - void slotEditFinished(KProcess *); + void slotEditFinished(TDEProcess *); void slotTestDone(bool); signals: void openURLRequest( const KURL & url ); diff --git a/ark/compressedfile.cpp b/ark/compressedfile.cpp index 862d357..00d6a9d 100644 --- a/ark/compressedfile.cpp +++ b/ark/compressedfile.cpp @@ -143,7 +143,7 @@ void CompressedFile::initData() } if ( mimeType == "application/x-compress" ) { - m_unarchiver_program = KGlobal::dirs()->findExe( "uncompress" ).isNull()? "gunzip" : "uncompress"; + m_unarchiver_program = TDEGlobal::dirs()->findExe( "uncompress" ).isNull()? "gunzip" : "uncompress"; m_archiver_program = "compress"; m_defaultExtensions = ".Z"; } @@ -184,14 +184,14 @@ void CompressedFile::open() if ( !KIO::NetAccess::exists( target, true, NULL ) ) return; - KProcess *kp = m_currentProcess = new KProcess; + TDEProcess *kp = m_currentProcess = new TDEProcess; kp->clearArguments(); *kp << m_unarchiver_program << "-f" ; if ( m_unarchiver_program == "lzop") { *kp << "-d"; // lzop hack, see comment in tar.cpp createTmp() - kp->setUsePty( KProcess::Stdin, false ); + kp->setUsePty( TDEProcess::Stdin, false ); } // gunzip 1.3 seems not to like original names with directories in them // testcase: https://listman.redhat.com/pipermail/valhalla-list/2006-October.txt.gz @@ -202,14 +202,14 @@ void CompressedFile::open() kdDebug(1601) << "Command is " << m_unarchiver_program << " " << m_tmpfile<< endl; - connect( kp, TQT_SIGNAL(receivedStdout(KProcess*, char*, int)), - this, TQT_SLOT(slotReceivedOutput(KProcess*, char*, int))); - connect( kp, TQT_SIGNAL(receivedStderr(KProcess*, char*, int)), - this, TQT_SLOT(slotReceivedOutput(KProcess*, char*, int))); - connect( kp, TQT_SIGNAL(processExited(KProcess*)), this, - TQT_SLOT(slotUncompressDone(KProcess*))); + connect( kp, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)), + this, TQT_SLOT(slotReceivedOutput(TDEProcess*, char*, int))); + connect( kp, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)), + this, TQT_SLOT(slotReceivedOutput(TDEProcess*, char*, int))); + connect( kp, TQT_SIGNAL(processExited(TDEProcess*)), this, + TQT_SLOT(slotUncompressDone(TDEProcess*))); - if (kp->start(KProcess::NotifyOnExit, KProcess::AllOutput) == false) + if (kp->start(TDEProcess::NotifyOnExit, TDEProcess::AllOutput) == false) { KMessageBox::error( 0, i18n("Could not start a subprocess.") ); emit sigOpen(this, false, TQString(), 0 ); @@ -218,7 +218,7 @@ void CompressedFile::open() kdDebug(1601) << "-CompressedFile::open" << endl; } -void CompressedFile::slotUncompressDone(KProcess *_kp) +void CompressedFile::slotUncompressDone(TDEProcess *_kp) { bool bSuccess = false; kdDebug(1601) << "normalExit = " << _kp->normalExit() << endl; @@ -284,9 +284,9 @@ void CompressedFile::addFile( const TQStringList &urls ) TQString file; file = url.path(); - KProcess proc; + TDEProcess proc; proc << "cp" << file << m_tmpdir; - proc.start(KProcess::Block); + proc.start(TDEProcess::Block); m_tmpfile = file.right(file.length() - file.findRev("/")-1); @@ -296,23 +296,23 @@ void CompressedFile::addFile( const TQStringList &urls ) kdDebug(1601) << "File is " << file << endl; - KProcess *kp = m_currentProcess = new KProcess; + TDEProcess *kp = m_currentProcess = new TDEProcess; kp->clearArguments(); // lzop hack, see comment in tar.cpp createTmp() if ( m_archiver_program == "lzop") - kp->setUsePty( KProcess::Stdin, false ); + kp->setUsePty( TDEProcess::Stdin, false ); TQString compressor = m_archiver_program; *kp << compressor << "-c" << file; - connect( kp, TQT_SIGNAL(receivedStdout(KProcess*, char*, int)), - this, TQT_SLOT(slotAddInProgress(KProcess*, char*, int))); - connect( kp, TQT_SIGNAL(receivedStderr(KProcess*, char*, int)), - this, TQT_SLOT(slotReceivedOutput(KProcess*, char*, int))); - connect( kp, TQT_SIGNAL(processExited(KProcess*)), this, - TQT_SLOT(slotAddDone(KProcess*))); + connect( kp, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)), + this, TQT_SLOT(slotAddInProgress(TDEProcess*, char*, int))); + connect( kp, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)), + this, TQT_SLOT(slotReceivedOutput(TDEProcess*, char*, int))); + connect( kp, TQT_SIGNAL(processExited(TDEProcess*)), this, + TQT_SLOT(slotAddDone(TDEProcess*))); int f_desc = KDE_open(TQFile::encodeName(m_filename), O_CREAT | O_TRUNC | O_WRONLY, 0666); if (f_desc != -1) @@ -320,7 +320,7 @@ void CompressedFile::addFile( const TQStringList &urls ) else fd = NULL; - if (kp->start(KProcess::NotifyOnExit, KProcess::AllOutput) == false) + if (kp->start(TDEProcess::NotifyOnExit, TDEProcess::AllOutput) == false) { KMessageBox::error( 0, i18n("Could not start a subprocess.") ); } @@ -328,7 +328,7 @@ void CompressedFile::addFile( const TQStringList &urls ) kdDebug(1601) << "-CompressedFile::addFile" << endl; } -void CompressedFile::slotAddInProgress(KProcess*, char* _buffer, int _bufflen) +void CompressedFile::slotAddInProgress(TDEProcess*, char* _buffer, int _bufflen) { // we're trying to capture the output of a command like this // gzip -c myfile @@ -342,7 +342,7 @@ void CompressedFile::slotAddInProgress(KProcess*, char* _buffer, int _bufflen) } } -void CompressedFile::slotAddDone(KProcess *_kp) +void CompressedFile::slotAddDone(TDEProcess *_kp) { fclose(fd); slotAddExited(_kp); @@ -361,9 +361,9 @@ void CompressedFile::unarchFileInternal() else dest=m_destDir; - KProcess proc; + TDEProcess proc; proc << "cp" << m_tmpfile << dest; - proc.start(KProcess::Block); + proc.start(TDEProcess::Block); } emit sigExtract(true); } diff --git a/ark/compressedfile.h b/ark/compressedfile.h index 896b0fa..16d84fb 100644 --- a/ark/compressedfile.h +++ b/ark/compressedfile.h @@ -28,7 +28,7 @@ class TQString; class TQCString; class TQStringList; -class KProcess; +class TDEProcess; class KTempDir; class Arch; @@ -61,9 +61,9 @@ public: TQString tempFileName(){ return m_tmpfile; } private slots: - void slotUncompressDone(KProcess *); - void slotAddInProgress(KProcess*, char*, int); - void slotAddDone(KProcess*); + void slotUncompressDone(TDEProcess *); + void slotAddInProgress(TDEProcess*, char*, int); + void slotAddDone(TDEProcess*); private: void initExtract( bool, bool, bool ); diff --git a/ark/extractiondialog.cpp b/ark/extractiondialog.cpp index cf95d48..8057828 100644 --- a/ark/extractiondialog.cpp +++ b/ark/extractiondialog.cpp @@ -105,7 +105,7 @@ ExtractionDialog::ExtractionDialog( TQWidget *parent, const char *name, KURLCompletion *comp = new KURLCompletion(); comp->setReplaceHome( true ); - comp->setCompletionMode( KGlobalSettings::CompletionAuto ); + comp->setCompletionMode( TDEGlobalSettings::CompletionAuto ); combobox->setCompletionObject( comp ); combobox->setMaxCount( 20 ); combobox->setInsertionPolicy( TQComboBox::AtTop ); diff --git a/ark/filelistview.cpp b/ark/filelistview.cpp index ca941bd..16bcf8d 100644 --- a/ark/filelistview.cpp +++ b/ark/filelistview.cpp @@ -153,7 +153,7 @@ void FileLVI::setText( int column, const TQString &text ) else m_ratio = text.toDouble(); TQListViewItem::setText( column, i18n( "Packed Ratio", "%1 %" ) - .arg(KGlobal::locale()->formatNumber( m_ratio, 1 ) ) + .arg(TDEGlobal::locale()->formatNumber( m_ratio, 1 ) ) ); } else if ( colName == timeStampStrCol ) @@ -163,7 +163,7 @@ void FileLVI::setText( int column, const TQString &text ) else { m_timeStamp = TQDateTime::fromString( text, Qt::ISODate ); - TQListViewItem::setText( column, KGlobal::locale()->formatDateTime( m_timeStamp ) ); + TQListViewItem::setText( column, TDEGlobal::locale()->formatDateTime( m_timeStamp ) ); } } else @@ -354,7 +354,7 @@ FileListView::contentsMouseMoveEvent(TQMouseEvent *e) { KListView::contentsMouseMoveEvent(e); } - else if( ( m_presspos - e->pos() ).manhattanLength() > KGlobalSettings::dndEventDelay() ) + else if( ( m_presspos - e->pos() ).manhattanLength() > TDEGlobalSettings::dndEventDelay() ) { m_pressed = false; // Prevent triggering again if(isSelectionEmpty()) diff --git a/ark/lha.cpp b/ark/lha.cpp index 14fa68d..045be09 100644 --- a/ark/lha.cpp +++ b/ark/lha.cpp @@ -144,16 +144,16 @@ void LhaArch::open() m_finished = false; - KProcess *kp = m_currentProcess = new KProcess; + TDEProcess *kp = m_currentProcess = new TDEProcess; *kp << m_archiver_program << "v" << m_filename; - connect( kp, TQT_SIGNAL( receivedStdout(KProcess*, char*, int) ), - TQT_SLOT( slotReceivedTOC(KProcess*, char*, int) ) ); - connect( kp, TQT_SIGNAL( receivedStderr(KProcess*, char*, int) ), - TQT_SLOT( slotReceivedOutput(KProcess*, char*, int) ) ); - connect( kp, TQT_SIGNAL( processExited(KProcess*) ), - TQT_SLOT( slotOpenExited(KProcess*) ) ); - - if ( !kp->start( KProcess::NotifyOnExit, KProcess::AllOutput ) ) + connect( kp, TQT_SIGNAL( receivedStdout(TDEProcess*, char*, int) ), + TQT_SLOT( slotReceivedTOC(TDEProcess*, char*, int) ) ); + connect( kp, TQT_SIGNAL( receivedStderr(TDEProcess*, char*, int) ), + TQT_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, TQT_SIGNAL( processExited(TDEProcess*) ), + TQT_SLOT( slotOpenExited(TDEProcess*) ) ); + + if ( !kp->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) ) { KMessageBox::error( 0, i18n( "Could not start a subprocess." ) ); emit sigOpen( this, false, TQString(), 0 ); @@ -194,7 +194,7 @@ void LhaArch::addDir( const TQString & dirName ) void LhaArch::addFile( const TQStringList &urls ) { - KProcess *kp = m_currentProcess = new KProcess; + TDEProcess *kp = m_currentProcess = new TDEProcess; kp->clearArguments(); *kp << m_archiver_program; @@ -216,14 +216,14 @@ void LhaArch::addFile( const TQStringList &urls ) *kp << fileURL.fileName(); } - connect( kp, TQT_SIGNAL( receivedStdout(KProcess*, char*, int) ), - TQT_SLOT( slotReceivedOutput(KProcess*, char*, int) ) ); - connect( kp, TQT_SIGNAL( receivedStderr(KProcess*, char*, int) ), - TQT_SLOT( slotReceivedOutput(KProcess*, char*, int) ) ); - connect( kp, TQT_SIGNAL( processExited(KProcess*) ), - TQT_SLOT( slotAddExited(KProcess*) ) ); + connect( kp, TQT_SIGNAL( receivedStdout(TDEProcess*, char*, int) ), + TQT_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, TQT_SIGNAL( receivedStderr(TDEProcess*, char*, int) ), + TQT_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, TQT_SIGNAL( processExited(TDEProcess*) ), + TQT_SLOT( slotAddExited(TDEProcess*) ) ); - if ( !kp->start( KProcess::NotifyOnExit, KProcess::AllOutput ) ) + if ( !kp->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) ) { KMessageBox::error( 0, i18n( "Could not start a subprocess." ) ); emit sigAdd( false ); @@ -241,7 +241,7 @@ void LhaArch::unarchFileInternal() return; } - KProcess *kp = m_currentProcess = new KProcess; + TDEProcess *kp = m_currentProcess = new TDEProcess; kp->clearArguments(); *kp << m_archiver_program << "xfw=" + m_destDir << m_filename; @@ -257,14 +257,14 @@ void LhaArch::unarchFileInternal() } } - connect( kp, TQT_SIGNAL( receivedStdout(KProcess*, char*, int) ), - TQT_SLOT( slotReceivedOutput(KProcess*, char*, int) ) ); - connect( kp, TQT_SIGNAL( receivedStderr(KProcess*, char*, int) ), - TQT_SLOT( slotReceivedOutput(KProcess*, char*, int) ) ); - connect( kp, TQT_SIGNAL( processExited(KProcess*) ), - TQT_SLOT( slotExtractExited(KProcess*) ) ); + connect( kp, TQT_SIGNAL( receivedStdout(TDEProcess*, char*, int) ), + TQT_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, TQT_SIGNAL( receivedStderr(TDEProcess*, char*, int) ), + TQT_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, TQT_SIGNAL( processExited(TDEProcess*) ), + TQT_SLOT( slotExtractExited(TDEProcess*) ) ); - if ( !kp->start( KProcess::NotifyOnExit, KProcess::AllOutput ) ) + if ( !kp->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) ) { KMessageBox::error( 0, i18n( "Could not start a subprocess." ) ); emit sigExtract( false ); @@ -276,7 +276,7 @@ void LhaArch::remove( TQStringList *list ) if ( !list ) return; - KProcess *kp = m_currentProcess = new KProcess; + TDEProcess *kp = m_currentProcess = new TDEProcess; kp->clearArguments(); *kp << m_archiver_program << "df" << m_filename; @@ -287,14 +287,14 @@ void LhaArch::remove( TQStringList *list ) *kp << ( *it ); } - connect( kp, TQT_SIGNAL( receivedStdout(KProcess*, char*, int) ), - TQT_SLOT( slotReceivedOutput(KProcess*, char*, int) ) ); - connect( kp, TQT_SIGNAL( receivedStderr(KProcess*, char*, int) ), - TQT_SLOT( slotReceivedOutput(KProcess*, char*, int) ) ); - connect( kp, TQT_SIGNAL( processExited(KProcess*) ), - TQT_SLOT( slotDeleteExited(KProcess*) ) ); + connect( kp, TQT_SIGNAL( receivedStdout(TDEProcess*, char*, int) ), + TQT_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, TQT_SIGNAL( receivedStderr(TDEProcess*, char*, int) ), + TQT_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, TQT_SIGNAL( processExited(TDEProcess*) ), + TQT_SLOT( slotDeleteExited(TDEProcess*) ) ); - if ( !kp->start( KProcess::NotifyOnExit, KProcess::AllOutput ) ) + if ( !kp->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) ) { KMessageBox::error( 0, i18n( "Could not start a subprocess." ) ); emit sigDelete( false ); diff --git a/ark/mainwindow.cpp b/ark/mainwindow.cpp index fc26023..7096833 100644 --- a/ark/mainwindow.cpp +++ b/ark/mainwindow.cpp @@ -177,7 +177,7 @@ MainWindow::file_reload() void MainWindow::editToolbars() { - saveMainWindowSettings( KGlobal::config(), TQString::fromLatin1("MainWindow") ); + saveMainWindowSettings( TDEGlobal::config(), TQString::fromLatin1("MainWindow") ); KEditToolbar dlg( factory(), this ); connect(&dlg, TQT_SIGNAL( newToolbarConfig() ), this, TQT_SLOT( slotNewToolbarConfig() )); dlg.exec(); @@ -187,7 +187,7 @@ void MainWindow::slotNewToolbarConfig() { createGUI( m_part ); - applyMainWindowSettings( KGlobal::config(), TQString::fromLatin1("MainWindow") ); + applyMainWindowSettings( TDEGlobal::config(), TQString::fromLatin1("MainWindow") ); } void diff --git a/ark/rar.cpp b/ark/rar.cpp index 67ebc16..2b015f5 100644 --- a/ark/rar.cpp +++ b/ark/rar.cpp @@ -56,9 +56,9 @@ RarArch::RarArch( ArkWidget *_gui, const TQString & _fileName ) : Arch( _gui, _fileName ) { // Check if rar is available - bool have_rar = !KGlobal::dirs()->findExe( "rar" ).isNull(); - bool have_unrar = !KGlobal::dirs()->findExe( "unrar" ).isNull(); - bool have_unrar_free = !KGlobal::dirs()->findExe( "unrar-free" ).isNull(); + bool have_rar = !TDEGlobal::dirs()->findExe( "rar" ).isNull(); + bool have_unrar = !TDEGlobal::dirs()->findExe( "unrar" ).isNull(); + bool have_unrar_free = !TDEGlobal::dirs()->findExe( "unrar-free" ).isNull(); if ( have_rar ) { @@ -140,7 +140,7 @@ void RarArch::open() m_header_removed = false; m_finished = false; - KProcess *kp = m_currentProcess = new KProcess; + TDEProcess *kp = m_currentProcess = new TDEProcess; *kp << m_unarchiver_program << "v" << "-c-"; if ( !m_password.isEmpty() ) @@ -150,14 +150,14 @@ void RarArch::open() *kp << m_filename; - connect( kp, TQT_SIGNAL( receivedStdout(KProcess*, char*, int) ), - TQT_SLOT( slotReceivedTOC(KProcess*, char*, int) ) ); - connect( kp, TQT_SIGNAL( receivedStderr(KProcess*, char*, int) ), - TQT_SLOT( slotReceivedOutput(KProcess*, char*, int) ) ); - connect( kp, TQT_SIGNAL( processExited(KProcess*) ), - TQT_SLOT( slotOpenExited(KProcess*) ) ); + connect( kp, TQT_SIGNAL( receivedStdout(TDEProcess*, char*, int) ), + TQT_SLOT( slotReceivedTOC(TDEProcess*, char*, int) ) ); + connect( kp, TQT_SIGNAL( receivedStderr(TDEProcess*, char*, int) ), + TQT_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, TQT_SIGNAL( processExited(TDEProcess*) ), + TQT_SLOT( slotOpenExited(TDEProcess*) ) ); - if ( !kp->start( KProcess::NotifyOnExit, KProcess::AllOutput ) ) + if ( !kp->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) ) { KMessageBox::error( 0, i18n( "Could not start a subprocess." ) ); emit sigOpen( this, false, TQString(), 0 ); @@ -204,7 +204,7 @@ void RarArch::addDir( const TQString & _dirName ) void RarArch::addFile( const TQStringList & urls ) { - KProcess *kp = m_currentProcess = new KProcess; + TDEProcess *kp = m_currentProcess = new TDEProcess; kp->clearArguments(); *kp << m_archiver_program; @@ -234,14 +234,14 @@ void RarArch::addFile( const TQStringList & urls ) *kp << url.fileName(); } - connect( kp, TQT_SIGNAL( receivedStdout(KProcess*, char*, int) ), - TQT_SLOT( slotReceivedOutput(KProcess*, char*, int) ) ); - connect( kp, TQT_SIGNAL( receivedStderr(KProcess*, char*, int) ), - TQT_SLOT( slotReceivedOutput(KProcess*, char*, int) ) ); - connect( kp, TQT_SIGNAL( processExited(KProcess*) ), - TQT_SLOT( slotAddExited(KProcess*) ) ); + connect( kp, TQT_SIGNAL( receivedStdout(TDEProcess*, char*, int) ), + TQT_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, TQT_SIGNAL( receivedStderr(TDEProcess*, char*, int) ), + TQT_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, TQT_SIGNAL( processExited(TDEProcess*) ), + TQT_SLOT( slotAddExited(TDEProcess*) ) ); - if ( !kp->start( KProcess::NotifyOnExit, KProcess::AllOutput ) ) + if ( !kp->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) ) { KMessageBox::error( 0, i18n( "Could not start a subprocess." ) ); emit sigAdd( false ); @@ -256,7 +256,7 @@ void RarArch::unarchFileInternal() return; } - KProcess *kp = m_currentProcess = new KProcess; + TDEProcess *kp = m_currentProcess = new TDEProcess; kp->clearArguments(); // extract (and maybe overwrite) @@ -291,14 +291,14 @@ void RarArch::unarchFileInternal() *kp << m_destDir ; - connect( kp, TQT_SIGNAL( receivedStdout(KProcess*, char*, int) ), - TQT_SLOT( slotReceivedOutput(KProcess*, char*, int) ) ); - connect( kp, TQT_SIGNAL( receivedStderr(KProcess*, char*, int) ), - TQT_SLOT( slotReceivedOutput(KProcess*, char*, int) ) ); - connect( kp, TQT_SIGNAL( processExited(KProcess*) ), - TQT_SLOT( slotExtractExited(KProcess*) ) ); + connect( kp, TQT_SIGNAL( receivedStdout(TDEProcess*, char*, int) ), + TQT_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, TQT_SIGNAL( receivedStderr(TDEProcess*, char*, int) ), + TQT_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, TQT_SIGNAL( processExited(TDEProcess*) ), + TQT_SLOT( slotExtractExited(TDEProcess*) ) ); - if ( !kp->start( KProcess::NotifyOnExit, KProcess::AllOutput ) ) + if ( !kp->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) ) { KMessageBox::error( 0, i18n( "Could not start a subprocess." ) ); emit sigExtract( false ); @@ -315,7 +315,7 @@ void RarArch::remove( TQStringList *list ) if ( !list ) return; - KProcess *kp = m_currentProcess = new KProcess; + TDEProcess *kp = m_currentProcess = new TDEProcess; kp->clearArguments(); *kp << m_archiver_program << "d" << m_filename; @@ -327,14 +327,14 @@ void RarArch::remove( TQStringList *list ) *kp << str; } - connect( kp, TQT_SIGNAL( receivedStdout(KProcess*, char*, int) ), - TQT_SLOT( slotReceivedOutput(KProcess*, char*, int) ) ); - connect( kp, TQT_SIGNAL( receivedStderr(KProcess*, char*, int) ), - TQT_SLOT( slotReceivedOutput(KProcess*, char*, int) ) ); - connect( kp, TQT_SIGNAL( processExited(KProcess*) ), - TQT_SLOT( slotDeleteExited(KProcess*) ) ); + connect( kp, TQT_SIGNAL( receivedStdout(TDEProcess*, char*, int) ), + TQT_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, TQT_SIGNAL( receivedStderr(TDEProcess*, char*, int) ), + TQT_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, TQT_SIGNAL( processExited(TDEProcess*) ), + TQT_SLOT( slotDeleteExited(TDEProcess*) ) ); - if ( !kp->start( KProcess::NotifyOnExit, KProcess::AllOutput ) ) + if ( !kp->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) ) { KMessageBox::error( 0, i18n( "Could not start a subprocess." ) ); emit sigDelete( false ); @@ -345,7 +345,7 @@ void RarArch::test() { clearShellOutput(); - KProcess *kp = m_currentProcess = new KProcess; + TDEProcess *kp = m_currentProcess = new TDEProcess; kp->clearArguments(); *kp << m_unarchiver_program << "t"; @@ -355,14 +355,14 @@ void RarArch::test() *kp << m_filename; - connect( kp, SIGNAL( receivedStdout(KProcess*, char*, int) ), - SLOT( slotReceivedOutput(KProcess*, char*, int) ) ); - connect( kp, SIGNAL( receivedStderr(KProcess*, char*, int) ), - SLOT( slotReceivedOutput(KProcess*, char*, int) ) ); - connect( kp, SIGNAL( processExited(KProcess*) ), - SLOT( slotTestExited(KProcess*) ) ); + connect( kp, SIGNAL( receivedStdout(TDEProcess*, char*, int) ), + SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, SIGNAL( receivedStderr(TDEProcess*, char*, int) ), + SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, SIGNAL( processExited(TDEProcess*) ), + SLOT( slotTestExited(TDEProcess*) ) ); - if ( !kp->start( KProcess::NotifyOnExit, KProcess::AllOutput ) ) + if ( !kp->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) ) { KMessageBox::error( 0, i18n( "Could not start a subprocess." ) ); emit sigTest( false ); diff --git a/ark/sevenzip.cpp b/ark/sevenzip.cpp index 85e1a95..3ddf02f 100644 --- a/ark/sevenzip.cpp +++ b/ark/sevenzip.cpp @@ -46,9 +46,9 @@ SevenZipArch::SevenZipArch( ArkWidget *gui, const TQString &filename ) : Arch( gui, filename ), m_nameColumnPos( -1 ) { // Check if 7z is available - bool have_7z = !KGlobal::dirs()->findExe( "7z" ).isNull(); + bool have_7z = !TDEGlobal::dirs()->findExe( "7z" ).isNull(); // Check if 7za is available - bool have_7za = !KGlobal::dirs()->findExe( "7za" ).isNull(); + bool have_7za = !TDEGlobal::dirs()->findExe( "7za" ).isNull(); if ( have_7z ) m_archiver_program = m_unarchiver_program = "7z"; // Use 7z @@ -99,17 +99,17 @@ void SevenZipArch::open() m_header_removed = false; m_finished = false; - KProcess *kp = m_currentProcess = new KProcess; + TDEProcess *kp = m_currentProcess = new TDEProcess; *kp << m_archiver_program << "l" << m_filename; - connect( kp, TQT_SIGNAL( receivedStdout(KProcess*, char*, int) ), - TQT_SLOT( slotReceivedTOC(KProcess*, char*, int) ) ); - connect( kp, TQT_SIGNAL( receivedStderr(KProcess*, char*, int) ), - TQT_SLOT( slotReceivedOutput(KProcess*, char*, int) ) ); - connect( kp, TQT_SIGNAL( processExited(KProcess*) ), - TQT_SLOT( slotOpenExited(KProcess*) ) ); + connect( kp, TQT_SIGNAL( receivedStdout(TDEProcess*, char*, int) ), + TQT_SLOT( slotReceivedTOC(TDEProcess*, char*, int) ) ); + connect( kp, TQT_SIGNAL( receivedStderr(TDEProcess*, char*, int) ), + TQT_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, TQT_SIGNAL( processExited(TDEProcess*) ), + TQT_SLOT( slotOpenExited(TDEProcess*) ) ); - if ( !kp->start( KProcess::NotifyOnExit, KProcess::AllOutput ) ) + if ( !kp->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) ) { KMessageBox::error( 0, i18n( "Could not start a subprocess." ) ); emit sigOpen( this, false, TQString(), 0 ); @@ -130,7 +130,7 @@ void SevenZipArch::createPassword() void SevenZipArch::addFile( const TQStringList & urls ) { - KProcess *kp = m_currentProcess = new KProcess; + TDEProcess *kp = m_currentProcess = new TDEProcess; kp->clearArguments(); *kp << m_archiver_program << "a" ; @@ -150,14 +150,14 @@ void SevenZipArch::addFile( const TQStringList & urls ) *kp << url.fileName(); } - connect( kp, TQT_SIGNAL( receivedStdout(KProcess*, char*, int) ), - TQT_SLOT( slotReceivedOutput(KProcess*, char*, int) ) ); - connect( kp, TQT_SIGNAL( receivedStderr(KProcess*, char*, int) ), - TQT_SLOT( slotReceivedOutput(KProcess*, char*, int) ) ); - connect( kp, TQT_SIGNAL( processExited(KProcess*) ), - TQT_SLOT( slotAddExited(KProcess*) ) ); + connect( kp, TQT_SIGNAL( receivedStdout(TDEProcess*, char*, int) ), + TQT_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, TQT_SIGNAL( receivedStderr(TDEProcess*, char*, int) ), + TQT_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, TQT_SIGNAL( processExited(TDEProcess*) ), + TQT_SLOT( slotAddExited(TDEProcess*) ) ); - if ( !kp->start( KProcess::NotifyOnExit, KProcess::AllOutput ) ) + if ( !kp->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) ) { KMessageBox::error( 0, i18n( "Could not start a subprocess." ) ); emit sigAdd( false ); @@ -184,7 +184,7 @@ void SevenZipArch::remove( TQStringList *list ) if ( !list ) return; - KProcess *kp = m_currentProcess = new KProcess; + TDEProcess *kp = m_currentProcess = new TDEProcess; kp->clearArguments(); *kp << m_archiver_program << "d" << m_filename; @@ -195,14 +195,14 @@ void SevenZipArch::remove( TQStringList *list ) *kp << *it; } - connect( kp, TQT_SIGNAL( receivedStdout(KProcess*, char*, int) ), - TQT_SLOT( slotReceivedOutput(KProcess*, char*, int) ) ); - connect( kp, TQT_SIGNAL( receivedStderr(KProcess*, char*, int) ), - TQT_SLOT( slotReceivedOutput(KProcess*, char*, int) ) ); - connect( kp, TQT_SIGNAL( processExited(KProcess*) ), - TQT_SLOT( slotDeleteExited(KProcess*) ) ); + connect( kp, TQT_SIGNAL( receivedStdout(TDEProcess*, char*, int) ), + TQT_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, TQT_SIGNAL( receivedStderr(TDEProcess*, char*, int) ), + TQT_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, TQT_SIGNAL( processExited(TDEProcess*) ), + TQT_SLOT( slotDeleteExited(TDEProcess*) ) ); - if ( !kp->start( KProcess::NotifyOnExit, KProcess::AllOutput ) ) + if ( !kp->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) ) { KMessageBox::error( 0, i18n( "Could not start a subprocess." ) ); emit sigDelete( false ); @@ -217,7 +217,7 @@ void SevenZipArch::unarchFileInternal( ) return; } - KProcess *kp = m_currentProcess = new KProcess; + TDEProcess *kp = m_currentProcess = new TDEProcess; kp->clearArguments(); // extract (and maybe overwrite) @@ -249,14 +249,14 @@ void SevenZipArch::unarchFileInternal( ) *kp << "-o" + m_destDir ; - connect( kp, TQT_SIGNAL( receivedStdout(KProcess*, char*, int) ), - TQT_SLOT( slotReceivedOutput(KProcess*, char*, int) ) ); - connect( kp, TQT_SIGNAL( receivedStderr(KProcess*, char*, int) ), - TQT_SLOT( slotReceivedOutput(KProcess*, char*, int) ) ); - connect( kp, TQT_SIGNAL( processExited(KProcess*) ), - TQT_SLOT( slotExtractExited(KProcess*) ) ); + connect( kp, TQT_SIGNAL( receivedStdout(TDEProcess*, char*, int) ), + TQT_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, TQT_SIGNAL( receivedStderr(TDEProcess*, char*, int) ), + TQT_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, TQT_SIGNAL( processExited(TDEProcess*) ), + TQT_SLOT( slotExtractExited(TDEProcess*) ) ); - if ( !kp->start( KProcess::NotifyOnExit, KProcess::AllOutput ) ) + if ( !kp->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) ) { KMessageBox::error( 0, i18n( "Could not start a subprocess." ) ); emit sigExtract( false ); @@ -333,7 +333,7 @@ bool SevenZipArch::processLine( const TQCString& _line ) return true; } -void SevenZipArch::slotReceivedTOC( KProcess*, char* data, int length ) +void SevenZipArch::slotReceivedTOC( TDEProcess*, char* data, int length ) { char endchar = data[ length ]; data[ length ] = '\0'; @@ -395,7 +395,7 @@ void SevenZipArch::test() { clearShellOutput(); - KProcess *kp = m_currentProcess = new KProcess; + TDEProcess *kp = m_currentProcess = new TDEProcess; kp->clearArguments(); *kp << m_unarchiver_program << "t"; @@ -405,14 +405,14 @@ void SevenZipArch::test() *kp << m_filename; - connect( kp, SIGNAL( receivedStdout(KProcess*, char*, int) ), - SLOT( slotReceivedOutput(KProcess*, char*, int) ) ); - connect( kp, SIGNAL( receivedStderr(KProcess*, char*, int) ), - SLOT( slotReceivedOutput(KProcess*, char*, int) ) ); - connect( kp, SIGNAL( processExited(KProcess*) ), - SLOT( slotTestExited(KProcess*) ) ); + connect( kp, SIGNAL( receivedStdout(TDEProcess*, char*, int) ), + SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, SIGNAL( receivedStderr(TDEProcess*, char*, int) ), + SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, SIGNAL( processExited(TDEProcess*) ), + SLOT( slotTestExited(TDEProcess*) ) ); - if ( !kp->start( KProcess::NotifyOnExit, KProcess::AllOutput ) ) + if ( !kp->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) ) { KMessageBox::error( 0, i18n( "Could not start a subprocess." ) ); emit sigTest( false ); diff --git a/ark/sevenzip.h b/ark/sevenzip.h index de10693..8eaadc5 100644 --- a/ark/sevenzip.h +++ b/ark/sevenzip.h @@ -48,7 +48,7 @@ class SevenZipArch : public Arch protected slots: virtual bool processLine( const TQCString& line ); - virtual void slotReceivedTOC( KProcess*, char*, int ); + virtual void slotReceivedTOC( TDEProcess*, char*, int ); private: void setHeaders(); diff --git a/ark/tar.cpp b/ark/tar.cpp index 1c1fac9..7e5a772 100644 --- a/ark/tar.cpp +++ b/ark/tar.cpp @@ -149,13 +149,13 @@ void TarArch::updateArch() else fd = NULL; - KProcess *kp = m_currentProcess = new KProcess; + TDEProcess *kp = m_currentProcess = new TDEProcess; kp->clearArguments(); - KProcess::Communication flag = KProcess::AllOutput; + TDEProcess::Communication flag = TDEProcess::AllOutput; if ( getCompressor() == "lzop" ) { - kp->setUsePty( KProcess::Stdin, false ); - flag = KProcess::Stdout; + kp->setUsePty( TDEProcess::Stdin, false ); + flag = TDEProcess::Stdout; } if ( !getCompressor().isNull() ) *kp << getCompressor() << "-c" << tmpfile; @@ -163,15 +163,15 @@ void TarArch::updateArch() *kp << "cat" << tmpfile; - connect(kp, TQT_SIGNAL(receivedStdout(KProcess*, char*, int)), - this, TQT_SLOT(updateProgress( KProcess *, char *, int ))); - connect( kp, TQT_SIGNAL(receivedStderr(KProcess*, char*, int)), - (Arch *)this, TQT_SLOT(slotReceivedOutput(KProcess*, char*, int))); + connect(kp, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)), + this, TQT_SLOT(updateProgress( TDEProcess *, char *, int ))); + connect( kp, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)), + (Arch *)this, TQT_SLOT(slotReceivedOutput(TDEProcess*, char*, int))); - connect(kp, TQT_SIGNAL(processExited(KProcess *)), - this, TQT_SLOT(updateFinished(KProcess *)) ); + connect(kp, TQT_SIGNAL(processExited(TDEProcess *)), + this, TQT_SLOT(updateFinished(TDEProcess *)) ); - if ( !fd || kp->start(KProcess::NotifyOnExit, flag) == false) + if ( !fd || kp->start(TDEProcess::NotifyOnExit, flag) == false) { KMessageBox::error(0, i18n("Trouble writing to the archive...")); emit updateDone(); @@ -179,7 +179,7 @@ void TarArch::updateArch() } } -void TarArch::updateProgress( KProcess * _proc, char *_buffer, int _bufflen ) +void TarArch::updateProgress( TDEProcess * _proc, char *_buffer, int _bufflen ) { // we're trying to capture the output of a command like this // gzip -c myarch.tar @@ -257,7 +257,7 @@ TarArch::open() // // Now it's essential - used later to decide whether pathnames in the // tar archive are plain or start with "./" - KProcess *kp = m_currentProcess = new KProcess; + TDEProcess *kp = m_currentProcess = new TDEProcess; *kp << m_archiver_program; @@ -272,14 +272,14 @@ TarArch::open() m_header_removed = false; m_finished = false; - connect(kp, TQT_SIGNAL(processExited(KProcess *)), - this, TQT_SLOT(slotListingDone(KProcess *))); - connect(kp, TQT_SIGNAL(receivedStdout(KProcess*, char*, int)), - this, TQT_SLOT(slotReceivedOutput( KProcess *, char *, int ))); - connect( kp, TQT_SIGNAL(receivedStderr(KProcess*, char*, int)), - this, TQT_SLOT(slotReceivedOutput(KProcess*, char*, int))); + connect(kp, TQT_SIGNAL(processExited(TDEProcess *)), + this, TQT_SLOT(slotListingDone(TDEProcess *))); + connect(kp, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)), + this, TQT_SLOT(slotReceivedOutput( TDEProcess *, char *, int ))); + connect( kp, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)), + this, TQT_SLOT(slotReceivedOutput(TDEProcess*, char*, int))); - if (kp->start(KProcess::NotifyOnExit, KProcess::AllOutput) == false) + if (kp->start(TDEProcess::NotifyOnExit, TDEProcess::AllOutput) == false) { KMessageBox::error( 0, i18n("Could not start a subprocess.") ); } @@ -315,7 +315,7 @@ void TarArch::openFirstCreateTempDone() m_listingThread->start(); } -void TarArch::slotListingDone(KProcess *_kp) +void TarArch::slotListingDone(TDEProcess *_kp) { const TQString list = getLastShellOutput(); FileListView *flv = m_gui->fileList(); @@ -393,29 +393,29 @@ void TarArch::createTmp() else fd = NULL; - KProcess *kp = m_currentProcess = new KProcess; + TDEProcess *kp = m_currentProcess = new TDEProcess; kp->clearArguments(); kdDebug(1601) << "Uncompressor is " << strUncompressor << endl; *kp << strUncompressor; - KProcess::Communication flag = KProcess::AllOutput; + TDEProcess::Communication flag = TDEProcess::AllOutput; if (strUncompressor == "lzop") { // setting up a pty for lzop, since it doesn't like stdin to // be /dev/null ( "no filename allowed when reading from stdin" ) // - but it used to work without this ? ( Feb 13, 2003 ) - kp->setUsePty( KProcess::Stdin, false ); - flag = KProcess::Stdout; + kp->setUsePty( TDEProcess::Stdin, false ); + flag = TDEProcess::Stdout; *kp << "-d"; } *kp << "-c" << m_filename; - connect(kp, TQT_SIGNAL(processExited(KProcess *)), - this, TQT_SLOT(createTmpFinished(KProcess *))); - connect(kp, TQT_SIGNAL(receivedStdout(KProcess*, char*, int)), - this, TQT_SLOT(createTmpProgress( KProcess *, char *, int ))); - connect( kp, TQT_SIGNAL(receivedStderr(KProcess*, char*, int)), - this, TQT_SLOT(slotReceivedOutput(KProcess*, char*, int))); - if (kp->start(KProcess::NotifyOnExit, flag ) == false) + connect(kp, TQT_SIGNAL(processExited(TDEProcess *)), + this, TQT_SLOT(createTmpFinished(TDEProcess *))); + connect(kp, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)), + this, TQT_SLOT(createTmpProgress( TDEProcess *, char *, int ))); + connect( kp, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)), + this, TQT_SLOT(slotReceivedOutput(TDEProcess*, char*, int))); + if (kp->start(TDEProcess::NotifyOnExit, flag ) == false) { KMessageBox::error(0, i18n("Unable to fork a decompressor")); emit sigOpen( this, false, TQString(), 0 ); @@ -433,7 +433,7 @@ void TarArch::createTmp() } } -void TarArch::createTmpProgress( KProcess * _proc, char *_buffer, int _bufflen ) +void TarArch::createTmpProgress( TDEProcess * _proc, char *_buffer, int _bufflen ) { // we're trying to capture the output of a command like this // gunzip -c myarch.tar.gz @@ -532,7 +532,7 @@ void TarArch::addFileCreateTempDone() disconnect( this, TQT_SIGNAL( createTempDone() ), this, TQT_SLOT( addFileCreateTempDone() ) ); TQStringList * urls = &m_filesToAdd; - KProcess *kp = m_currentProcess = new KProcess; + TDEProcess *kp = m_currentProcess = new TDEProcess; *kp << m_archiver_program; if( ArkSettings::replaceOnlyWithNewer()) @@ -562,25 +562,25 @@ void TarArch::addFileCreateTempDone() kdDebug(1601) << *strTemp << " " << endl; } - connect( kp, TQT_SIGNAL(receivedStdout(KProcess*, char*, int)), - this, TQT_SLOT(slotReceivedOutput(KProcess*, char*, int))); - connect( kp, TQT_SIGNAL(receivedStderr(KProcess*, char*, int)), - this, TQT_SLOT(slotReceivedOutput(KProcess*, char*, int))); + connect( kp, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)), + this, TQT_SLOT(slotReceivedOutput(TDEProcess*, char*, int))); + connect( kp, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)), + this, TQT_SLOT(slotReceivedOutput(TDEProcess*, char*, int))); - connect( kp, TQT_SIGNAL(processExited(KProcess*)), this, - TQT_SLOT(slotAddFinished(KProcess*))); + connect( kp, TQT_SIGNAL(processExited(TDEProcess*)), this, + TQT_SLOT(slotAddFinished(TDEProcess*))); - if (kp->start(KProcess::NotifyOnExit, KProcess::AllOutput) == false) + if (kp->start(TDEProcess::NotifyOnExit, TDEProcess::AllOutput) == false) { KMessageBox::error( 0, i18n("Could not start a subprocess.") ); emit sigAdd(false); } } -void TarArch::slotAddFinished(KProcess *_kp) +void TarArch::slotAddFinished(TDEProcess *_kp) { - disconnect( _kp, TQT_SIGNAL(processExited(KProcess*)), this, - TQT_SLOT(slotAddFinished(KProcess*))); + disconnect( _kp, TQT_SIGNAL(processExited(TDEProcess*)), this, + TQT_SLOT(slotAddFinished(TDEProcess*))); m_pTmpProc = _kp; m_filesToAdd = TQStringList(); if ( compressed ) @@ -613,7 +613,7 @@ void TarArch::unarchFileInternal() TQString tmp; - KProcess *kp = m_currentProcess = new KProcess; + TDEProcess *kp = m_currentProcess = new TDEProcess; kp->clearArguments(); *kp << m_archiver_program; @@ -641,15 +641,15 @@ void TarArch::unarchFileInternal() } } - connect( kp, TQT_SIGNAL(receivedStdout(KProcess*, char*, int)), - this, TQT_SLOT(slotReceivedOutput(KProcess*, char*, int))); - connect( kp, TQT_SIGNAL(receivedStderr(KProcess*, char*, int)), - this, TQT_SLOT(slotReceivedOutput(KProcess*, char*, int))); + connect( kp, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)), + this, TQT_SLOT(slotReceivedOutput(TDEProcess*, char*, int))); + connect( kp, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)), + this, TQT_SLOT(slotReceivedOutput(TDEProcess*, char*, int))); - connect( kp, TQT_SIGNAL(processExited(KProcess*)), this, - TQT_SLOT(slotExtractExited(KProcess*))); + connect( kp, TQT_SIGNAL(processExited(TDEProcess*)), this, + TQT_SLOT(slotExtractExited(TDEProcess*))); - if (kp->start(KProcess::NotifyOnExit, KProcess::AllOutput) == false) + if (kp->start(TDEProcess::NotifyOnExit, TDEProcess::AllOutput) == false) { KMessageBox::error( 0, i18n("Could not start a subprocess.") ); emit sigExtract(false); @@ -670,7 +670,7 @@ void TarArch::removeCreateTempDone() disconnect( this, TQT_SIGNAL( createTempDone() ), this, TQT_SLOT( removeCreateTempDone() ) ); TQString name, tmp; - KProcess *kp = m_currentProcess = new KProcess; + TDEProcess *kp = m_currentProcess = new TDEProcess; kp->clearArguments(); *kp << m_archiver_program << "--delete" << "-f" ; if (compressed) @@ -685,22 +685,22 @@ void TarArch::removeCreateTempDone() } m_filesToRemove = TQStringList(); - connect( kp, TQT_SIGNAL(receivedStdout(KProcess*, char*, int)), - this, TQT_SLOT(slotReceivedOutput(KProcess*, char*, int))); - connect( kp, TQT_SIGNAL(receivedStderr(KProcess*, char*, int)), - this, TQT_SLOT(slotReceivedOutput(KProcess*, char*, int))); + connect( kp, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)), + this, TQT_SLOT(slotReceivedOutput(TDEProcess*, char*, int))); + connect( kp, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)), + this, TQT_SLOT(slotReceivedOutput(TDEProcess*, char*, int))); - connect( kp, TQT_SIGNAL(processExited(KProcess*)), this, - TQT_SLOT(slotDeleteExited(KProcess*))); + connect( kp, TQT_SIGNAL(processExited(TDEProcess*)), this, + TQT_SLOT(slotDeleteExited(TDEProcess*))); - if (kp->start(KProcess::NotifyOnExit, KProcess::AllOutput) == false) + if (kp->start(TDEProcess::NotifyOnExit, TDEProcess::AllOutput) == false) { KMessageBox::error( 0, i18n("Could not start a subprocess.") ); emit sigDelete(false); } } -void TarArch::slotDeleteExited(KProcess *_kp) +void TarArch::slotDeleteExited(TDEProcess *_kp) { m_pTmpProc2 = _kp; if ( compressed ) @@ -730,14 +730,14 @@ void TarArch::addDir(const TQString & _dirName) addFile(list); } -void TarArch::openFinished( KProcess * ) +void TarArch::openFinished( TDEProcess * ) { // do nothing // turn off busy light (when someone makes one) kdDebug(1601) << "Open finshed" << endl; } -void TarArch::createTmpFinished( KProcess *_kp ) +void TarArch::createTmpFinished( TDEProcess *_kp ) { createTmpInProgress = false; fclose(fd); @@ -747,7 +747,7 @@ void TarArch::createTmpFinished( KProcess *_kp ) emit createTempDone(); } -void TarArch::updateFinished( KProcess *_kp ) +void TarArch::updateFinished( TDEProcess *_kp ) { fclose(fd); updateInProgress = false; @@ -789,7 +789,7 @@ void TarArch::test() { clearShellOutput(); - KProcess *kp = m_currentProcess = new KProcess; + TDEProcess *kp = m_currentProcess = new TDEProcess; kp->clearArguments(); TQString uncomp = getUnCompressor(); @@ -808,14 +808,14 @@ void TarArch::test() *kp << m_filename; - connect( kp, SIGNAL( receivedStdout(KProcess*, char*, int) ), - SLOT( slotReceivedOutput(KProcess*, char*, int) ) ); - connect( kp, SIGNAL( receivedStderr(KProcess*, char*, int) ), - SLOT( slotReceivedOutput(KProcess*, char*, int) ) ); - connect( kp, SIGNAL( processExited(KProcess*) ), - SLOT( slotTestExited(KProcess*) ) ); + connect( kp, SIGNAL( receivedStdout(TDEProcess*, char*, int) ), + SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, SIGNAL( receivedStderr(TDEProcess*, char*, int) ), + SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, SIGNAL( processExited(TDEProcess*) ), + SLOT( slotTestExited(TDEProcess*) ) ); - if ( !kp->start( KProcess::NotifyOnExit, KProcess::AllOutput ) ) + if ( !kp->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) ) { KMessageBox::error( 0, i18n( "Could not start a subprocess." ) ); emit sigTest( false ); diff --git a/ark/tar.h b/ark/tar.h index 3b75008..4e7b7ec 100644 --- a/ark/tar.h +++ b/ark/tar.h @@ -37,7 +37,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. class TQString; class TQStrList; -class KProcess; +class TDEProcess; class KTempDir; class KTarDirectory; class KTar; @@ -77,14 +77,14 @@ class TarArch : public Arch TQString getUnCompressor(); public slots: - void updateProgress( KProcess *_kp, char *_buffer, int _bufflen ); - void openFinished( KProcess * ); - void updateFinished( KProcess * ); - void createTmpFinished( KProcess * ); - void createTmpProgress( KProcess *_kp, char *_buffer, int _bufflen ); - void slotAddFinished( KProcess * ); - void slotListingDone( KProcess * ); - void slotDeleteExited( KProcess * ); + void updateProgress( TDEProcess *_kp, char *_buffer, int _bufflen ); + void openFinished( TDEProcess * ); + void updateFinished( TDEProcess * ); + void createTmpFinished( TDEProcess * ); + void createTmpProgress( TDEProcess *_kp, char *_buffer, int _bufflen ); + void slotAddFinished( TDEProcess * ); + void slotListingDone( TDEProcess * ); + void slotDeleteExited( TDEProcess * ); signals: void removeDone(); @@ -126,8 +126,8 @@ class TarArch : public Arch FILE *fd; TQStringList m_filesToAdd; TQStringList m_filesToRemove; - KProcess * m_pTmpProc; - KProcess * m_pTmpProc2; + TDEProcess * m_pTmpProc; + TDEProcess * m_pTmpProc2; bool failed; bool m_dotslash; TarListingThread *m_listingThread; diff --git a/ark/zip.cpp b/ark/zip.cpp index 1888d50..3f48607 100644 --- a/ark/zip.cpp +++ b/ark/zip.cpp @@ -90,18 +90,18 @@ void ZipArch::open() m_header_removed = false; m_finished = false; - KProcess *kp = m_currentProcess = new KProcess; + TDEProcess *kp = m_currentProcess = new TDEProcess; *kp << m_unarchiver_program << "-v" << m_filename; - connect( kp, TQT_SIGNAL( receivedStdout(KProcess*, char*, int) ), - TQT_SLOT( slotReceivedTOC(KProcess*, char*, int) ) ); - connect( kp, TQT_SIGNAL( receivedStderr(KProcess*, char*, int) ), - TQT_SLOT( slotReceivedOutput(KProcess*, char*, int) ) ); - connect( kp, TQT_SIGNAL( processExited(KProcess*) ), - TQT_SLOT( slotOpenExited(KProcess*) ) ); + connect( kp, TQT_SIGNAL( receivedStdout(TDEProcess*, char*, int) ), + TQT_SLOT( slotReceivedTOC(TDEProcess*, char*, int) ) ); + connect( kp, TQT_SIGNAL( receivedStderr(TDEProcess*, char*, int) ), + TQT_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, TQT_SIGNAL( processExited(TDEProcess*) ), + TQT_SLOT( slotOpenExited(TDEProcess*) ) ); - if ( !kp->start( KProcess::NotifyOnExit, KProcess::AllOutput ) ) + if ( !kp->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) ) { KMessageBox::error( 0, i18n( "Could not start a subprocess." ) ); emit sigOpen( this, false, TQString(), 0 ); @@ -138,7 +138,7 @@ void ZipArch::addDir( const TQString & _dirName ) void ZipArch::addFile( const TQStringList &urls ) { - KProcess *kp = m_currentProcess = new KProcess; + TDEProcess *kp = m_currentProcess = new TDEProcess; kp->clearArguments(); *kp << m_archiver_program; @@ -172,14 +172,14 @@ void ZipArch::addFile( const TQStringList &urls ) *kp << fileURL.fileName(); } - connect( kp, TQT_SIGNAL( receivedStdout(KProcess*, char*, int) ), - TQT_SLOT( slotReceivedOutput(KProcess*, char*, int) ) ); - connect( kp, TQT_SIGNAL( receivedStderr(KProcess*, char*, int) ), - TQT_SLOT( slotReceivedOutput(KProcess*, char*, int) ) ); - connect( kp, TQT_SIGNAL( processExited(KProcess*) ), - TQT_SLOT( slotAddExited(KProcess*) ) ); + connect( kp, TQT_SIGNAL( receivedStdout(TDEProcess*, char*, int) ), + TQT_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, TQT_SIGNAL( receivedStderr(TDEProcess*, char*, int) ), + TQT_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, TQT_SIGNAL( processExited(TDEProcess*) ), + TQT_SLOT( slotAddExited(TDEProcess*) ) ); - if ( !kp->start( KProcess::NotifyOnExit, KProcess::AllOutput ) ) + if ( !kp->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) ) { KMessageBox::error( 0, i18n( "Could not start a subprocess." ) ); emit sigAdd( false ); @@ -196,7 +196,7 @@ void ZipArch::unarchFileInternal() return; } - KProcess *kp = m_currentProcess = new KProcess; + TDEProcess *kp = m_currentProcess = new TDEProcess; kp->clearArguments(); *kp << m_unarchiver_program; @@ -231,14 +231,14 @@ void ZipArch::unarchFileInternal() *kp << "-d" << m_destDir; - connect( kp, TQT_SIGNAL( receivedStdout(KProcess*, char*, int) ), - TQT_SLOT( slotReceivedOutput(KProcess*, char*, int) ) ); - connect( kp, TQT_SIGNAL( receivedStderr(KProcess*, char*, int) ), - TQT_SLOT( slotReceivedOutput(KProcess*, char*, int) ) ); - connect( kp, TQT_SIGNAL( processExited(KProcess*) ), - TQT_SLOT( slotExtractExited(KProcess*) ) ); + connect( kp, TQT_SIGNAL( receivedStdout(TDEProcess*, char*, int) ), + TQT_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, TQT_SIGNAL( receivedStderr(TDEProcess*, char*, int) ), + TQT_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, TQT_SIGNAL( processExited(TDEProcess*) ), + TQT_SLOT( slotExtractExited(TDEProcess*) ) ); - if ( !kp->start( KProcess::NotifyOnExit, KProcess::AllOutput ) ) + if ( !kp->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) ) { KMessageBox::error( 0, i18n( "Could not start a subprocess." ) ); emit sigExtract( false ); @@ -256,7 +256,7 @@ void ZipArch::remove( TQStringList *list ) return; - KProcess *kp = m_currentProcess = new KProcess; + TDEProcess *kp = m_currentProcess = new TDEProcess; kp->clearArguments(); *kp << m_archiver_program << "-d" << m_filename; @@ -268,14 +268,14 @@ void ZipArch::remove( TQStringList *list ) *kp << str; } - connect( kp, TQT_SIGNAL( receivedStdout(KProcess*, char*, int) ), - TQT_SLOT( slotReceivedOutput(KProcess*, char*, int) ) ); - connect( kp, TQT_SIGNAL( receivedStderr(KProcess*, char*, int) ), - TQT_SLOT( slotReceivedOutput(KProcess*, char*, int) ) ); - connect( kp, TQT_SIGNAL( processExited(KProcess*) ), - TQT_SLOT( slotDeleteExited(KProcess*) ) ); + connect( kp, TQT_SIGNAL( receivedStdout(TDEProcess*, char*, int) ), + TQT_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, TQT_SIGNAL( receivedStderr(TDEProcess*, char*, int) ), + TQT_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, TQT_SIGNAL( processExited(TDEProcess*) ), + TQT_SLOT( slotDeleteExited(TDEProcess*) ) ); - if ( !kp->start( KProcess::NotifyOnExit, KProcess::AllOutput ) ) + if ( !kp->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) ) { KMessageBox::error( 0, i18n( "Could not start a subprocess." ) ); emit sigDelete( false ); @@ -286,7 +286,7 @@ void ZipArch::test() { clearShellOutput(); - KProcess *kp = m_currentProcess = new KProcess; + TDEProcess *kp = m_currentProcess = new TDEProcess; kp->clearArguments(); *kp << m_unarchiver_program << "-t"; @@ -296,14 +296,14 @@ void ZipArch::test() *kp << m_filename; - connect( kp, SIGNAL( receivedStdout(KProcess*, char*, int) ), - SLOT( slotReceivedOutput(KProcess*, char*, int) ) ); - connect( kp, SIGNAL( receivedStderr(KProcess*, char*, int) ), - SLOT( slotReceivedOutput(KProcess*, char*, int) ) ); - connect( kp, SIGNAL( processExited(KProcess*) ), - SLOT( slotTestExited(KProcess*) ) ); + connect( kp, SIGNAL( receivedStdout(TDEProcess*, char*, int) ), + SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, SIGNAL( receivedStderr(TDEProcess*, char*, int) ), + SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, SIGNAL( processExited(TDEProcess*) ), + SLOT( slotTestExited(TDEProcess*) ) ); - if ( !kp->start( KProcess::NotifyOnExit, KProcess::AllOutput ) ) + if ( !kp->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) ) { KMessageBox::error( 0, i18n( "Could not start a subprocess." ) ); emit sigTest( false ); diff --git a/ark/zoo.cpp b/ark/zoo.cpp index 1ef7377..f94abdb 100644 --- a/ark/zoo.cpp +++ b/ark/zoo.cpp @@ -108,16 +108,16 @@ void ZooArch::open() m_finished = false; - KProcess *kp = m_currentProcess = new KProcess; + TDEProcess *kp = m_currentProcess = new TDEProcess; *kp << m_archiver_program << "l" << m_filename; - connect( kp, TQT_SIGNAL( receivedStdout(KProcess*, char*, int) ), - TQT_SLOT( slotReceivedTOC(KProcess*, char*, int) ) ); - connect( kp, TQT_SIGNAL( receivedStderr(KProcess*, char*, int) ), - TQT_SLOT( slotReceivedOutput(KProcess*, char*, int) ) ); - connect( kp, TQT_SIGNAL( processExited(KProcess*) ), - TQT_SLOT( slotOpenExited(KProcess*) ) ); - - if ( !kp->start( KProcess::NotifyOnExit, KProcess::AllOutput ) ) + connect( kp, TQT_SIGNAL( receivedStdout(TDEProcess*, char*, int) ), + TQT_SLOT( slotReceivedTOC(TDEProcess*, char*, int) ) ); + connect( kp, TQT_SIGNAL( receivedStderr(TDEProcess*, char*, int) ), + TQT_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, TQT_SIGNAL( processExited(TDEProcess*) ), + TQT_SLOT( slotOpenExited(TDEProcess*) ) ); + + if ( !kp->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) ) { KMessageBox::error( 0, i18n( "Could not start a subprocess." ) ); emit sigOpen( this, false, TQString(), 0 ); @@ -155,7 +155,7 @@ void ZooArch::addDir( const TQString & _dirName ) void ZooArch::addFile( const TQStringList &urls ) { - KProcess *kp = m_currentProcess = new KProcess; + TDEProcess *kp = m_currentProcess = new TDEProcess; kp->clearArguments(); *kp << m_archiver_program; @@ -177,14 +177,14 @@ void ZooArch::addFile( const TQStringList &urls ) *kp << fileURL.fileName(); } - connect( kp, TQT_SIGNAL( receivedStdout(KProcess*, char*, int) ), - TQT_SLOT( slotReceivedOutput(KProcess*, char*, int) ) ); - connect( kp, TQT_SIGNAL( receivedStderr(KProcess*, char*, int) ), - TQT_SLOT( slotReceivedOutput(KProcess*, char*, int) ) ); - connect( kp, TQT_SIGNAL( processExited(KProcess*) ), - TQT_SLOT( slotAddExited(KProcess*) ) ); + connect( kp, TQT_SIGNAL( receivedStdout(TDEProcess*, char*, int) ), + TQT_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, TQT_SIGNAL( receivedStderr(TDEProcess*, char*, int) ), + TQT_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, TQT_SIGNAL( processExited(TDEProcess*) ), + TQT_SLOT( slotAddExited(TDEProcess*) ) ); - if ( !kp->start( KProcess::NotifyOnExit, KProcess::AllOutput ) ) + if ( !kp->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) ) { KMessageBox::error( 0, i18n( "Could not start a subprocess." ) ); emit sigAdd( false ); @@ -209,7 +209,7 @@ void ZooArch::unarchFileInternal() // We already checked the validity of the dir before coming here Q_ASSERT(ret); - KProcess *kp = m_currentProcess = new KProcess; + TDEProcess *kp = m_currentProcess = new TDEProcess; kp->clearArguments(); *kp << m_archiver_program; @@ -236,14 +236,14 @@ void ZooArch::unarchFileInternal() } } - connect( kp, TQT_SIGNAL( receivedStdout(KProcess*, char*, int) ), - TQT_SLOT( slotReceivedOutput(KProcess*, char*, int) ) ); - connect( kp, TQT_SIGNAL( receivedStderr(KProcess*, char*, int) ), - TQT_SLOT( slotReceivedOutput(KProcess*, char*, int) ) ); - connect( kp, TQT_SIGNAL( processExited(KProcess*) ), - TQT_SLOT( slotExtractExited(KProcess*) ) ); + connect( kp, TQT_SIGNAL( receivedStdout(TDEProcess*, char*, int) ), + TQT_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, TQT_SIGNAL( receivedStderr(TDEProcess*, char*, int) ), + TQT_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, TQT_SIGNAL( processExited(TDEProcess*) ), + TQT_SLOT( slotExtractExited(TDEProcess*) ) ); - if ( !kp->start( KProcess::NotifyOnExit, KProcess::AllOutput ) ) + if ( !kp->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) ) { KMessageBox::error( 0, i18n( "Could not start a subprocess." ) ); emit sigExtract( false ); @@ -255,7 +255,7 @@ void ZooArch::remove( TQStringList *list ) if (!list) return; - KProcess *kp = m_currentProcess = new KProcess; + TDEProcess *kp = m_currentProcess = new TDEProcess; kp->clearArguments(); *kp << m_archiver_program << "D" << m_filename; @@ -267,14 +267,14 @@ void ZooArch::remove( TQStringList *list ) *kp << str; } - connect( kp, TQT_SIGNAL( receivedStdout(KProcess*, char*, int) ), - TQT_SLOT( slotReceivedOutput(KProcess*, char*, int) ) ); - connect( kp, TQT_SIGNAL( receivedStderr(KProcess*, char*, int) ), - TQT_SLOT( slotReceivedOutput(KProcess*, char*, int) ) ); - connect( kp, TQT_SIGNAL( processExited(KProcess*) ), - TQT_SLOT( slotDeleteExited(KProcess*) ) ); + connect( kp, TQT_SIGNAL( receivedStdout(TDEProcess*, char*, int) ), + TQT_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, TQT_SIGNAL( receivedStderr(TDEProcess*, char*, int) ), + TQT_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, TQT_SIGNAL( processExited(TDEProcess*) ), + TQT_SLOT( slotDeleteExited(TDEProcess*) ) ); - if ( !kp->start( KProcess::NotifyOnExit, KProcess::AllOutput ) ) + if ( !kp->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) ) { KMessageBox::error( 0, i18n( "Could not start a subprocess." ) ); emit sigDelete( false ); -- cgit v1.2.1