summaryrefslogtreecommitdiffstats
path: root/tdeioslave
diff options
context:
space:
mode:
Diffstat (limited to 'tdeioslave')
-rw-r--r--tdeioslave/audiocd/audiocd.cpp2
-rw-r--r--tdeioslave/audiocd/kcmaudiocd/audiocdconfig.ui4
-rw-r--r--tdeioslave/audiocd/kcmaudiocd/kcmaudiocd.cpp28
-rw-r--r--tdeioslave/audiocd/kcmaudiocd/kcmaudiocd.h2
-rw-r--r--tdeioslave/audiocd/plugins/flac/encoderflac.cpp4
-rw-r--r--tdeioslave/audiocd/plugins/lame/collectingprocess.cpp16
-rw-r--r--tdeioslave/audiocd/plugins/lame/collectingprocess.h4
-rw-r--r--tdeioslave/audiocd/plugins/lame/encoderlame.cpp18
-rw-r--r--tdeioslave/audiocd/plugins/lame/encoderlame.h2
-rw-r--r--tdeioslave/audiocd/plugins/vorbis/encodervorbis.cpp4
-rw-r--r--tdeioslave/audiocd/plugins/vorbis/encodervorbisconfig.ui2
-rw-r--r--tdeioslave/audiocd/plugins/wav/encoderwav.cpp2
12 files changed, 44 insertions, 44 deletions
diff --git a/tdeioslave/audiocd/audiocd.cpp b/tdeioslave/audiocd/audiocd.cpp
index efd7dc14..8d477987 100644
--- a/tdeioslave/audiocd/audiocd.cpp
+++ b/tdeioslave/audiocd/audiocd.cpp
@@ -31,7 +31,7 @@ extern "C"
void paranoiaCallback(long, int);
#include <kdemacros.h>
- KDE_EXPORT int kdemain(int argc, char ** argv);
+ TDE_EXPORT int kdemain(int argc, char ** argv);
}
#include "audiocd.h"
diff --git a/tdeioslave/audiocd/kcmaudiocd/audiocdconfig.ui b/tdeioslave/audiocd/kcmaudiocd/audiocdconfig.ui
index 25a6d6f5..fba43890 100644
--- a/tdeioslave/audiocd/kcmaudiocd/audiocdconfig.ui
+++ b/tdeioslave/audiocd/kcmaudiocd/audiocdconfig.ui
@@ -619,8 +619,8 @@
<include location="global" impldecl="in declaration">tdecmodule.h</include>
<include location="global" impldecl="in implementation">klineedit.h</include>
</includes>
-<Q_SLOTS>
+<slots>
<slot>toggleLowpass()</slot>
-</Q_SLOTS>
+</slots>
<layoutdefaults spacing="6" margin="11"/>
</UI>
diff --git a/tdeioslave/audiocd/kcmaudiocd/kcmaudiocd.cpp b/tdeioslave/audiocd/kcmaudiocd/kcmaudiocd.cpp
index 1954422c..a0dcf468 100644
--- a/tdeioslave/audiocd/kcmaudiocd/kcmaudiocd.cpp
+++ b/tdeioslave/audiocd/kcmaudiocd/kcmaudiocd.cpp
@@ -62,25 +62,25 @@ KAudiocdModule::KAudiocdModule(TQWidget *parent, const char *name)
TDEConfigDialogManager *widget;
for ( widget = encoderSettings.first(); widget; widget = encoderSettings.next() ){
- connect(widget, TQT_SIGNAL(widgetModified()), this, TQT_SLOT(slotModuleChanged()));
+ connect(widget, TQ_SIGNAL(widgetModified()), this, TQ_SLOT(slotModuleChanged()));
}
//CDDA Options
- connect(cd_specify_device,TQT_SIGNAL(clicked()),this,TQT_SLOT(slotConfigChanged()));
- connect(ec_enable_check,TQT_SIGNAL(clicked()),this,TQT_SLOT(slotEcEnable()));
- connect(ec_skip_check,TQT_SIGNAL(clicked()),TQT_SLOT(slotConfigChanged()));
- connect(cd_device_string,TQT_SIGNAL(textChanged(const TQString &)),TQT_SLOT(slotConfigChanged()));
- connect(niceLevel,TQT_SIGNAL(valueChanged(int)),TQT_SLOT(slotConfigChanged()));
+ connect(cd_specify_device,TQ_SIGNAL(clicked()),this,TQ_SLOT(slotConfigChanged()));
+ connect(ec_enable_check,TQ_SIGNAL(clicked()),this,TQ_SLOT(slotEcEnable()));
+ connect(ec_skip_check,TQ_SIGNAL(clicked()),TQ_SLOT(slotConfigChanged()));
+ connect(cd_device_string,TQ_SIGNAL(textChanged(const TQString &)),TQ_SLOT(slotConfigChanged()));
+ connect(niceLevel,TQ_SIGNAL(valueChanged(int)),TQ_SLOT(slotConfigChanged()));
// File Name
- connect(fileNameLineEdit, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(slotConfigChanged()));
- connect(albumNameLineEdit, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(slotConfigChanged()));
- connect( kcfg_replaceInput, TQT_SIGNAL( textChanged(const TQString&) ), this, TQT_SLOT( updateExample() ) );
- connect( kcfg_replaceOutput, TQT_SIGNAL( textChanged(const TQString&) ), this, TQT_SLOT( updateExample() ) );
- connect( example, TQT_SIGNAL( textChanged(const TQString&) ), this, TQT_SLOT( updateExample() ) );
- connect( kcfg_replaceInput, TQT_SIGNAL( textChanged(const TQString&) ), this, TQT_SLOT( slotConfigChanged() ) );
- connect( kcfg_replaceOutput, TQT_SIGNAL( textChanged(const TQString&) ), this, TQT_SLOT( slotConfigChanged() ) );
- connect( example, TQT_SIGNAL( textChanged(const TQString&) ), this, TQT_SLOT( slotConfigChanged() ) );
+ connect(fileNameLineEdit, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(slotConfigChanged()));
+ connect(albumNameLineEdit, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(slotConfigChanged()));
+ connect( kcfg_replaceInput, TQ_SIGNAL( textChanged(const TQString&) ), this, TQ_SLOT( updateExample() ) );
+ connect( kcfg_replaceOutput, TQ_SIGNAL( textChanged(const TQString&) ), this, TQ_SLOT( updateExample() ) );
+ connect( example, TQ_SIGNAL( textChanged(const TQString&) ), this, TQ_SLOT( updateExample() ) );
+ connect( kcfg_replaceInput, TQ_SIGNAL( textChanged(const TQString&) ), this, TQ_SLOT( slotConfigChanged() ) );
+ connect( kcfg_replaceOutput, TQ_SIGNAL( textChanged(const TQString&) ), this, TQ_SLOT( slotConfigChanged() ) );
+ connect( example, TQ_SIGNAL( textChanged(const TQString&) ), this, TQ_SLOT( slotConfigChanged() ) );
TDEAboutData *about =
new TDEAboutData(I18N_NOOP("kcmaudiocd"), I18N_NOOP("TDE Audio CD IO Slave"),
diff --git a/tdeioslave/audiocd/kcmaudiocd/kcmaudiocd.h b/tdeioslave/audiocd/kcmaudiocd/kcmaudiocd.h
index f89ef32f..b7f186cb 100644
--- a/tdeioslave/audiocd/kcmaudiocd/kcmaudiocd.h
+++ b/tdeioslave/audiocd/kcmaudiocd/kcmaudiocd.h
@@ -31,7 +31,7 @@ class TDEConfigDialogManager;
#include "audiocdconfig.h"
class KAudiocdModule : public AudiocdConfig
{
- Q_OBJECT
+ TQ_OBJECT
public:
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..963a59d3 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.
@@ -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..76a19122 100644
--- a/tdeioslave/audiocd/plugins/lame/encoderlame.cpp
+++ b/tdeioslave/audiocd/plugins/lame/encoderlame.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 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);
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 &amp;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 &lt;i&gt;"CDDB Retrieval"&lt;/i&gt; 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 &lt;i&gt;"CDDB Retrieval"&lt;/i&gt; 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));