diff options
Diffstat (limited to 'tdeioslave/audiocd/plugins')
9 files changed, 32 insertions, 32 deletions
diff --git a/tdeioslave/audiocd/plugins/audiocdencoder.cpp b/tdeioslave/audiocd/plugins/audiocdencoder.cpp index 05a1c145..cecee6a4 100644 --- a/tdeioslave/audiocd/plugins/audiocdencoder.cpp +++ b/tdeioslave/audiocd/plugins/audiocdencoder.cpp @@ -21,7 +21,7 @@ #include <kdebug.h> #include <tqdir.h> #include <tqregexp.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> /** * Attempt to load a plugin and see if it has the symbol create_audiocd_encoders. diff --git a/tdeioslave/audiocd/plugins/flac/encoderflac.cpp b/tdeioslave/audiocd/plugins/flac/encoderflac.cpp index ed1c5dde..acdc8128 100644 --- a/tdeioslave/audiocd/plugins/flac/encoderflac.cpp +++ b/tdeioslave/audiocd/plugins/flac/encoderflac.cpp @@ -37,7 +37,7 @@ extern "C" { - KDE_EXPORT void create_audiocd_encoders(TDEIO::SlaveBase *slave, TQPtrList<AudioCDEncoder> &encoders) + TDE_EXPORT void create_audiocd_encoders(TDEIO::SlaveBase *slave, TQPtrList<AudioCDEncoder> &encoders) { encoders.append(new EncoderFLAC(slave)); } @@ -187,7 +187,7 @@ void EncoderFLAC::fillSongInfo( KCDDB::CDInfo info, int track, const TQString &c Comment("Date", TQString() )}; if (info.get("Year").toInt() > 0) { TQDateTime dt(TQDate(info.get("Year").toInt(), 1, 1)); - comments[6] = Comment("Date", dt.toString(Qt::ISODate)); + comments[6] = Comment("Date", dt.toString(TQt::ISODate)); } FLAC__StreamMetadata_VorbisComment_Entry entry; diff --git a/tdeioslave/audiocd/plugins/lame/collectingprocess.cpp b/tdeioslave/audiocd/plugins/lame/collectingprocess.cpp index 4eaf5304..50bf5d42 100644 --- a/tdeioslave/audiocd/plugins/lame/collectingprocess.cpp +++ b/tdeioslave/audiocd/plugins/lame/collectingprocess.cpp @@ -59,18 +59,18 @@ CollectingProcess::~CollectingProcess() { bool CollectingProcess::start( RunMode runmode, Communication comm ) { // prevent duplicate connection - disconnect( this, TQT_SIGNAL( receivedStdout( TDEProcess *, char *, int ) ), - this, TQT_SLOT( slotReceivedStdout( TDEProcess *, char *, int ) ) ); + disconnect( this, TQ_SIGNAL( receivedStdout( TDEProcess *, char *, int ) ), + this, TQ_SLOT( slotReceivedStdout( TDEProcess *, char *, int ) ) ); if ( comm & Stdout ) { - connect( this, TQT_SIGNAL( receivedStdout( TDEProcess *, char *, int ) ), - this, TQT_SLOT( slotReceivedStdout( TDEProcess *, char *, int ) ) ); + connect( this, TQ_SIGNAL( receivedStdout( TDEProcess *, char *, int ) ), + this, TQ_SLOT( slotReceivedStdout( TDEProcess *, char *, int ) ) ); } // prevent duplicate connection - disconnect( this, TQT_SIGNAL( receivedStderr( TDEProcess *, char *, int ) ), - this, TQT_SLOT( slotReceivedStderr( TDEProcess *, char *, int ) ) ); + disconnect( this, TQ_SIGNAL( receivedStderr( TDEProcess *, char *, int ) ), + this, TQ_SLOT( slotReceivedStderr( TDEProcess *, char *, int ) ) ); if ( comm & Stderr ) { - connect( this, TQT_SIGNAL( receivedStderr( TDEProcess *, char *, int ) ), - this, TQT_SLOT( slotReceivedStderr( TDEProcess *, char *, int ) ) ); + connect( this, TQ_SIGNAL( receivedStderr( TDEProcess *, char *, int ) ), + this, TQ_SLOT( slotReceivedStderr( TDEProcess *, char *, int ) ) ); } return TDEProcess::start( runmode, comm ); } diff --git a/tdeioslave/audiocd/plugins/lame/collectingprocess.h b/tdeioslave/audiocd/plugins/lame/collectingprocess.h index df5c180d..d23e43ab 100644 --- a/tdeioslave/audiocd/plugins/lame/collectingprocess.h +++ b/tdeioslave/audiocd/plugins/lame/collectingprocess.h @@ -1,4 +1,4 @@ -/* -*- mode: C++ -*- +/* collectingprocess.h This file is a copy of the collectingprocess.h which is part of tdepim/libtdepim. @@ -33,7 +33,7 @@ #ifndef __COLLECTINGPROCESS_H__ #define __COLLECTINGPROCESS_H__ -#include <kprocess.h> +#include <tdeprocess.h> /** * @short An output collecting TDEProcess class. @@ -44,7 +44,7 @@ * @author Ingo Kloecker <kloecker@kde.org> */ class CollectingProcess : public TDEProcess { - Q_OBJECT + TQ_OBJECT public: CollectingProcess( TQObject * parent = 0, const char * name = 0 ); diff --git a/tdeioslave/audiocd/plugins/lame/encoderlame.cpp b/tdeioslave/audiocd/plugins/lame/encoderlame.cpp index f7535f5f..00f56f40 100644 --- a/tdeioslave/audiocd/plugins/lame/encoderlame.cpp +++ b/tdeioslave/audiocd/plugins/lame/encoderlame.cpp @@ -24,7 +24,7 @@ #include <kdebug.h> #include <tqgroupbox.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <kdebug.h> #include <tdeglobal.h> @@ -32,12 +32,12 @@ #include <tdeapplication.h> #include <tqfileinfo.h> #include <tdetempfile.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include "collectingprocess.h" extern "C" { - KDE_EXPORT void create_audiocd_encoders(TDEIO::SlaveBase *slave, TQPtrList<AudioCDEncoder> &encoders) { + TDE_EXPORT void create_audiocd_encoders(TDEIO::SlaveBase *slave, TQPtrList<AudioCDEncoder> &encoders) { encoders.append(new EncoderLame(slave)); } } @@ -233,15 +233,15 @@ long EncoderLame::readInit(long /*size*/){ //kdDebug(7117) << d->currentEncodeProcess->args() << endl; - 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, TQ_SIGNAL(receivedStdout(TDEProcess *, char *, int)), + this, TQ_SLOT(receivedStdout(TDEProcess *, char *, int))); + connect(d->currentEncodeProcess, TQ_SIGNAL(receivedStderr(TDEProcess *, char *, int)), + this, TQ_SLOT(receivedStderr(TDEProcess *, char *, int))); + connect(d->currentEncodeProcess, TQ_SIGNAL(wroteStdin(TDEProcess *)), + this, TQ_SLOT(wroteStdin(TDEProcess *))); - connect(d->currentEncodeProcess, TQT_SIGNAL(processExited(TDEProcess *)), - this, TQT_SLOT(processExited(TDEProcess *))); + connect(d->currentEncodeProcess, TQ_SIGNAL(processExited(TDEProcess *)), + this, TQ_SLOT(processExited(TDEProcess *))); // Launch! d->currentEncodeProcess->start(TDEProcess::NotifyOnExit, KShellProcess::All); @@ -281,7 +281,7 @@ long EncoderLame::read(int16_t *buf, int frames){ // We can't return until the buffer has been written d->waitingForWrite = true; while(d->waitingForWrite && d->currentEncodeProcess->isRunning()){ - kapp->processEvents(); + tdeApp->processEvents(); usleep(1); } @@ -299,7 +299,7 @@ long EncoderLame::readCleanup(){ // Let lame tag the first frame of the mp3 d->currentEncodeProcess->closeStdin(); while( d->currentEncodeProcess->isRunning()){ - kapp->processEvents(); + tdeApp->processEvents(); usleep(1); } diff --git a/tdeioslave/audiocd/plugins/lame/encoderlame.h b/tdeioslave/audiocd/plugins/lame/encoderlame.h index 09c323c3..2870c500 100644 --- a/tdeioslave/audiocd/plugins/lame/encoderlame.h +++ b/tdeioslave/audiocd/plugins/lame/encoderlame.h @@ -29,7 +29,7 @@ class TDEProcess; */ class EncoderLame : public TQObject, public AudioCDEncoder { -Q_OBJECT +TQ_OBJECT public: diff --git a/tdeioslave/audiocd/plugins/vorbis/encodervorbis.cpp b/tdeioslave/audiocd/plugins/vorbis/encodervorbis.cpp index 5507b6f2..1a11bbb3 100644 --- a/tdeioslave/audiocd/plugins/vorbis/encodervorbis.cpp +++ b/tdeioslave/audiocd/plugins/vorbis/encodervorbis.cpp @@ -40,7 +40,7 @@ extern "C" { - KDE_EXPORT void create_audiocd_encoders(TDEIO::SlaveBase *slave, TQPtrList<AudioCDEncoder> &encoders) + TDE_EXPORT void create_audiocd_encoders(TDEIO::SlaveBase *slave, TQPtrList<AudioCDEncoder> &encoders) { encoders.append(new EncoderVorbis(slave)); } @@ -313,7 +313,7 @@ void EncoderVorbis::fillSongInfo( KCDDB::CDInfo info, int track, const TQString if (info.get("year").toInt() > 0) { TQDateTime dt(TQDate(info.get("year").toInt(), 1, 1)); - commentFields.append(CommentField("date", dt.toString(Qt::ISODate).utf8().data())); + commentFields.append(CommentField("date", dt.toString(TQt::ISODate).utf8().data())); } for(TQValueListIterator<CommentField> it = commentFields.begin(); it != commentFields.end(); ++it) { diff --git a/tdeioslave/audiocd/plugins/vorbis/encodervorbisconfig.ui b/tdeioslave/audiocd/plugins/vorbis/encodervorbisconfig.ui index e54779ed..2576c8ed 100644 --- a/tdeioslave/audiocd/plugins/vorbis/encodervorbisconfig.ui +++ b/tdeioslave/audiocd/plugins/vorbis/encodervorbisconfig.ui @@ -368,7 +368,7 @@ <string>Add &track information</string> </property> <property name="whatsThis" stdset="0"> - <string>Add a description of the song to the file header. This makes it easy for the user to get advanced song information shown by his media player. You can get this information automatically via the Internet. Look at the <i>"CDDB Retrieval"</i> control module for details.</string> + <string>Add a description of the song to the file header. This makes it easy for the user to get advanced song information shown by their media player. You can get this information automatically via the Internet. Look at the <i>"CDDB Retrieval"</i> control module for details.</string> </property> </widget> </vbox> diff --git a/tdeioslave/audiocd/plugins/wav/encoderwav.cpp b/tdeioslave/audiocd/plugins/wav/encoderwav.cpp index 7bed1765..87487733 100644 --- a/tdeioslave/audiocd/plugins/wav/encoderwav.cpp +++ b/tdeioslave/audiocd/plugins/wav/encoderwav.cpp @@ -26,7 +26,7 @@ extern "C" { - KDE_EXPORT void create_audiocd_encoders(TDEIO::SlaveBase *slave, TQPtrList<AudioCDEncoder> &encoders) + TDE_EXPORT void create_audiocd_encoders(TDEIO::SlaveBase *slave, TQPtrList<AudioCDEncoder> &encoders) { encoders.append( new EncoderWav(slave)); encoders.append( new EncoderCda(slave)); |