From 27430f06c6cc2187c639f59f342f07f1fde91a8b Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 24 Jan 2013 13:47:46 -0600 Subject: Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4 --- .../audiocd/plugins/lame/collectingprocess.cpp | 24 +++++++-------- kioslave/audiocd/plugins/lame/collectingprocess.h | 10 +++--- kioslave/audiocd/plugins/lame/encoderlame.cpp | 36 +++++++++++----------- kioslave/audiocd/plugins/lame/encoderlame.h | 10 +++--- kioslave/audiocd/plugins/vorbis/encodervorbis.cpp | 2 +- 5 files changed, 41 insertions(+), 41 deletions(-) (limited to 'kioslave/audiocd/plugins') diff --git a/kioslave/audiocd/plugins/lame/collectingprocess.cpp b/kioslave/audiocd/plugins/lame/collectingprocess.cpp index ae121db4..4eaf5304 100644 --- a/kioslave/audiocd/plugins/lame/collectingprocess.cpp +++ b/kioslave/audiocd/plugins/lame/collectingprocess.cpp @@ -48,7 +48,7 @@ struct CollectingProcess::Private { CollectingProcess::CollectingProcess( TQObject * parent, const char * name ) - : KProcess( parent, name ) + : TDEProcess( parent, name ) { d = new Private(); } @@ -59,23 +59,23 @@ CollectingProcess::~CollectingProcess() { bool CollectingProcess::start( RunMode runmode, Communication comm ) { // prevent duplicate connection - disconnect( this, TQT_SIGNAL( receivedStdout( KProcess *, char *, int ) ), - this, TQT_SLOT( slotReceivedStdout( KProcess *, char *, int ) ) ); + disconnect( this, TQT_SIGNAL( receivedStdout( TDEProcess *, char *, int ) ), + this, TQT_SLOT( slotReceivedStdout( TDEProcess *, char *, int ) ) ); if ( comm & Stdout ) { - connect( this, TQT_SIGNAL( receivedStdout( KProcess *, char *, int ) ), - this, TQT_SLOT( slotReceivedStdout( KProcess *, char *, int ) ) ); + connect( this, TQT_SIGNAL( receivedStdout( TDEProcess *, char *, int ) ), + this, TQT_SLOT( slotReceivedStdout( TDEProcess *, char *, int ) ) ); } // prevent duplicate connection - disconnect( this, TQT_SIGNAL( receivedStderr( KProcess *, char *, int ) ), - this, TQT_SLOT( slotReceivedStderr( KProcess *, char *, int ) ) ); + disconnect( this, TQT_SIGNAL( receivedStderr( TDEProcess *, char *, int ) ), + this, TQT_SLOT( slotReceivedStderr( TDEProcess *, char *, int ) ) ); if ( comm & Stderr ) { - connect( this, TQT_SIGNAL( receivedStderr( KProcess *, char *, int ) ), - this, TQT_SLOT( slotReceivedStderr( KProcess *, char *, int ) ) ); + connect( this, TQT_SIGNAL( receivedStderr( TDEProcess *, char *, int ) ), + this, TQT_SLOT( slotReceivedStderr( TDEProcess *, char *, int ) ) ); } - return KProcess::start( runmode, comm ); + return TDEProcess::start( runmode, comm ); } -void CollectingProcess::slotReceivedStdout( KProcess *, char *buf, int len ) +void CollectingProcess::slotReceivedStdout( TDEProcess *, char *buf, int len ) { TQByteArray b; b.duplicate( buf, len ); @@ -83,7 +83,7 @@ void CollectingProcess::slotReceivedStdout( KProcess *, char *buf, int len ) d->stdoutSize += len; } -void CollectingProcess::slotReceivedStderr( KProcess *, char *buf, int len ) +void CollectingProcess::slotReceivedStderr( TDEProcess *, char *buf, int len ) { TQByteArray b; b.duplicate( buf, len ); diff --git a/kioslave/audiocd/plugins/lame/collectingprocess.h b/kioslave/audiocd/plugins/lame/collectingprocess.h index a98c4b47..df5c180d 100644 --- a/kioslave/audiocd/plugins/lame/collectingprocess.h +++ b/kioslave/audiocd/plugins/lame/collectingprocess.h @@ -36,14 +36,14 @@ #include /** - * @short An output collecting KProcess class. + * @short An output collecting TDEProcess class. * - * This class simplifies the usage of KProcess by collecting all output + * This class simplifies the usage of TDEProcess by collecting all output * (stdout/stderr) of the process. * * @author Ingo Kloecker */ -class CollectingProcess : public KProcess { +class CollectingProcess : public TDEProcess { Q_OBJECT public: @@ -61,8 +61,8 @@ public: TQByteArray collectedStderr(); private slots: - void slotReceivedStdout( KProcess *, char *, int ); - void slotReceivedStderr( KProcess *, char *, int ); + void slotReceivedStdout( TDEProcess *, char *, int ); + void slotReceivedStderr( TDEProcess *, char *, int ); private: class Private; diff --git a/kioslave/audiocd/plugins/lame/encoderlame.cpp b/kioslave/audiocd/plugins/lame/encoderlame.cpp index 1b8568a2..6e3d3ff3 100644 --- a/kioslave/audiocd/plugins/lame/encoderlame.cpp +++ b/kioslave/audiocd/plugins/lame/encoderlame.cpp @@ -53,7 +53,7 @@ public: TQString lastErrorMessage; TQStringList genreList; uint lastSize; - KProcess *currentEncodeProcess; + TDEProcess *currentEncodeProcess; KTempFile *tempFile; }; @@ -71,7 +71,7 @@ EncoderLame::~EncoderLame(){ TQWidget* EncoderLame::getConfigureWidget(KConfigSkeleton** manager) const { (*manager) = Settings::self(); - KGlobal::locale()->insertCatalogue("audiocd_encoder_lame"); + TDEGlobal::locale()->insertCatalogue("audiocd_encoder_lame"); EncoderLameConfig *config = new EncoderLameConfig(); config->cbr_settings->hide(); return config; @@ -86,7 +86,7 @@ bool EncoderLame::init(){ // e.g. lame --tg 'Vocal Jazz' CollectingProcess proc; proc << "lame" << "--genre-list"; - proc.start(KProcess::Block, KProcess::Stdout); + proc.start(TDEProcess::Block, TDEProcess::Stdout); if(proc.exitStatus() != 0) return false; @@ -210,8 +210,8 @@ unsigned long EncoderLame::size(long time_secs) const { } long EncoderLame::readInit(long /*size*/){ - // Create KProcess - d->currentEncodeProcess = new KProcess(0); + // Create TDEProcess + d->currentEncodeProcess = new TDEProcess(0); TQString prefix = locateLocal("tmp", ""); d->tempFile = new KTempFile(prefix, ".mp3"); d->tempFile->setAutoDelete(true); @@ -237,38 +237,38 @@ long EncoderLame::readInit(long /*size*/){ //kdDebug(7117) << d->currentEncodeProcess->args() << endl; - connect(d->currentEncodeProcess, TQT_SIGNAL(receivedStdout(KProcess *, char *, int)), - this, TQT_SLOT(receivedStdout(KProcess *, char *, int))); - connect(d->currentEncodeProcess, TQT_SIGNAL(receivedStderr(KProcess *, char *, int)), - this, TQT_SLOT(receivedStderr(KProcess *, char *, int))); - connect(d->currentEncodeProcess, TQT_SIGNAL(wroteStdin(KProcess *)), - this, TQT_SLOT(wroteStdin(KProcess *))); + connect(d->currentEncodeProcess, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)), + this, TQT_SLOT(receivedStdout(TDEProcess *, char *, int))); + connect(d->currentEncodeProcess, TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)), + this, TQT_SLOT(receivedStderr(TDEProcess *, char *, int))); + connect(d->currentEncodeProcess, TQT_SIGNAL(wroteStdin(TDEProcess *)), + this, TQT_SLOT(wroteStdin(TDEProcess *))); - connect(d->currentEncodeProcess, TQT_SIGNAL(processExited(KProcess *)), - this, TQT_SLOT(processExited(KProcess *))); + connect(d->currentEncodeProcess, TQT_SIGNAL(processExited(TDEProcess *)), + this, TQT_SLOT(processExited(TDEProcess *))); // Launch! - d->currentEncodeProcess->start(KProcess::NotifyOnExit, KShellProcess::All); + d->currentEncodeProcess->start(TDEProcess::NotifyOnExit, KShellProcess::All); return 0; } -void EncoderLame::processExited ( KProcess *process ){ +void EncoderLame::processExited ( TDEProcess *process ){ kdDebug(7117) << "Lame Encoding process exited with: " << process->exitStatus() << endl; d->processHasExited = true; } -void EncoderLame::receivedStderr( KProcess * /*process*/, char *buffer, int /*buflen*/ ){ +void EncoderLame::receivedStderr( TDEProcess * /*process*/, char *buffer, int /*buflen*/ ){ kdDebug(7117) << "Lame stderr: " << buffer << endl; if ( !d->lastErrorMessage.isEmpty() ) d->lastErrorMessage += '\t'; d->lastErrorMessage += TQString::fromLocal8Bit( buffer ); } -void EncoderLame::receivedStdout( KProcess * /*process*/, char *buffer, int /*length*/ ){ +void EncoderLame::receivedStdout( TDEProcess * /*process*/, char *buffer, int /*length*/ ){ kdDebug(7117) << "Lame stdout: " << buffer << endl; } -void EncoderLame::wroteStdin( KProcess * /*procces*/ ){ +void EncoderLame::wroteStdin( TDEProcess * /*procces*/ ){ d->waitingForWrite = false; } diff --git a/kioslave/audiocd/plugins/lame/encoderlame.h b/kioslave/audiocd/plugins/lame/encoderlame.h index c7c26ea4..5ef7d761 100644 --- a/kioslave/audiocd/plugins/lame/encoderlame.h +++ b/kioslave/audiocd/plugins/lame/encoderlame.h @@ -21,7 +21,7 @@ #include "audiocdencoder.h" -class KProcess; +class TDEProcess; /** * MP3 encoder using the LAME encoder. @@ -51,10 +51,10 @@ public: virtual TQWidget* getConfigureWidget(KConfigSkeleton** manager) const; protected slots: - void wroteStdin(KProcess *proc); - void receivedStdout(KProcess *, char *buffer, int length); - void receivedStderr(KProcess *proc, char *buffer, int buflen); - void processExited(KProcess *proc); + void wroteStdin(TDEProcess *proc); + void receivedStdout(TDEProcess *, char *buffer, int length); + void receivedStderr(TDEProcess *proc, char *buffer, int buflen); + void processExited(TDEProcess *proc); private: class Private; diff --git a/kioslave/audiocd/plugins/vorbis/encodervorbis.cpp b/kioslave/audiocd/plugins/vorbis/encodervorbis.cpp index 5c88f844..1aacbc24 100644 --- a/kioslave/audiocd/plugins/vorbis/encodervorbis.cpp +++ b/kioslave/audiocd/plugins/vorbis/encodervorbis.cpp @@ -81,7 +81,7 @@ EncoderVorbis::~EncoderVorbis(){ TQWidget* EncoderVorbis::getConfigureWidget(KConfigSkeleton** manager) const { (*manager) = Settings::self(); - KGlobal::locale()->insertCatalogue("audiocd_encoder_vorbis"); + TDEGlobal::locale()->insertCatalogue("audiocd_encoder_vorbis"); EncoderVorbisConfig *config = new EncoderVorbisConfig(); config->kcfg_vorbis_quality->setRange(0.0, 10.0, 0.2, true); config->vorbis_bitrate_settings->hide(); -- cgit v1.2.1