diff options
Diffstat (limited to 'noatun/library')
53 files changed, 1140 insertions, 1140 deletions
diff --git a/noatun/library/app.cpp b/noatun/library/app.cpp index 04167fe7..cf340f68 100644 --- a/noatun/library/app.cpp +++ b/noatun/library/app.cpp @@ -30,11 +30,11 @@ #include <kmessagebox.h> #include <knotifyclient.h> #include <kpopupmenu.h> -#include <qfile.h> -#include <qimage.h> +#include <tqfile.h> +#include <tqimage.h> #include <qiomanager.h> -#include <qsessionmanager.h> -#include <qtextstream.h> +#include <tqsessionmanager.h> +#include <tqtextstream.h> #include <signal.h> #include <kmimetype.h> @@ -69,10 +69,10 @@ NoatunApp::NoatunApp() // set the default config data // TODO: Maybe a first time wizard instead? KConfig *config=KGlobal::config(); // + - config->setGroup(QString::null); // 1 + config->setGroup(TQString::null); // 1 if (!config->readEntry("Modules").length()) { - QStringList modules; + TQStringList modules; modules.append("excellent.plugin"); modules.append("splitplaylist.plugin"); modules.append("marquis.plugin"); @@ -101,7 +101,7 @@ NoatunApp::NoatunApp() mEffectView=new EffectView; // 859 mEqualizerView=new EqualizerView; // 24 - QTimer::singleShot(0, mDownloader, SLOT(start())); + TQTimer::singleShot(0, mDownloader, TQT_SLOT(start())); ::globalVideo = new GlobalVideo; @@ -122,7 +122,7 @@ NoatunApp::NoatunApp() } else { - config->setGroup(QString::null); // 0 + config->setGroup(TQString::null); // 0 player()->setVolume(config->readNumEntry("Volume", 100)); // 10 player()->loop(config->readNumEntry("LoopStyle", (int)Player::None)); mPlayer->engine()->setInitialized(); // 0 @@ -147,11 +147,11 @@ NoatunApp::~NoatunApp() { saveEngineState(); KConfig *config = KGlobal::config(); - config->setGroup(QString::null); + config->setGroup(TQString::null); config->writeEntry("Volume", player()->volume()); config->writeEntry("LoopStyle", player()->loopStyle()); // for version continuity in the future - config->writeEntry("Version", QString(version())); // 1 + config->writeEntry("Version", TQString(version())); // 1 config->sync(); // 40 mPlayer->stop(); @@ -171,7 +171,7 @@ NoatunApp::~NoatunApp() delete d; } -QCString NoatunApp::version() const +TQCString NoatunApp::version() const { return aboutData()->version().ascii(); } @@ -212,14 +212,14 @@ bool NoatunApp::clearOnStart() const int NoatunApp::startupPlayMode() const { KConfig *config=KGlobal::config(); - config->setGroup(QString::null); + config->setGroup(TQString::null); return config->readNumEntry("StartupPlayMode", autoPlay() ? Play : Restore); } void NoatunApp::setStartupPlayMode(int mode) { KConfig *config=KGlobal::config(); - config->setGroup(QString::null); + config->setGroup(TQString::null); config->writeEntry("StartupPlayMode", mode); config->sync(); } @@ -227,7 +227,7 @@ void NoatunApp::setStartupPlayMode(int mode) void NoatunApp::setHackUpPlaylist(bool b) { KConfig *config=KGlobal::config(); - config->setGroup(QString::null); + config->setGroup(TQString::null); config->writeEntry("HackUpPlaylist", b); config->sync(); } @@ -238,7 +238,7 @@ void NoatunApp::setFastMixer(bool b) if (whatBefore!=b) { KConfig *config=KGlobal::config(); - config->setGroup(QString::null); + config->setGroup(TQString::null); config->writeEntry("FastMixer", b); config->sync(); player()->engine()->useHardwareMixer(b); @@ -256,7 +256,7 @@ void NoatunApp::setOneInstance(bool b) void NoatunApp::setLoopList(bool b) { KConfig *config=KGlobal::config(); - config->setGroup(QString::null); + config->setGroup(TQString::null); config->writeEntry("LoopList", b); KGlobal::config()->sync(); } @@ -264,7 +264,7 @@ void NoatunApp::setLoopList(bool b) void NoatunApp::setAutoPlay(bool b) { KConfig *config=KGlobal::config(); - config->setGroup(QString::null); + config->setGroup(TQString::null); config->writeEntry("AutoPlay", b); KGlobal::config()->sync(); } @@ -272,37 +272,37 @@ void NoatunApp::setAutoPlay(bool b) void NoatunApp::setRememberPositions(bool b) { KConfig *config=KGlobal::config(); - config->setGroup(QString::null); + config->setGroup(TQString::null); config->writeEntry("RememberPositions", b); KGlobal::config()->sync(); } -void NoatunApp::setSaveDirectory(const QString &s) +void NoatunApp::setSaveDirectory(const TQString &s) { KConfig *config=KGlobal::config(); - config->setGroup(QString::null); + config->setGroup(TQString::null); config->writePathEntry("SaveDirectory", s); config->sync(); } -QString NoatunApp::saveDirectory() const +TQString NoatunApp::saveDirectory() const { KConfig *c=KGlobal::config(); - c->setGroup(QString::null); - return c->readPathEntry("SaveDirectory", QString(getenv("HOME"))); + c->setGroup(TQString::null); + return c->readPathEntry("SaveDirectory", TQString(getenv("HOME"))); } -QString NoatunApp::titleFormat() const +TQString NoatunApp::titleFormat() const { KConfig *c=KGlobal::config(); - c->setGroup(QString::null); + c->setGroup(TQString::null); return c->readEntry("TitleFormat", "$(\"[\"author\"] - \")$(title)$(\" (\"bitrate\"kbps)\")"); } -void NoatunApp::setTitleFormat(const QString &format) +void NoatunApp::setTitleFormat(const TQString &format) { KConfig *c=KGlobal::config(); - c->setGroup(QString::null); + c->setGroup(TQString::null); return c->writeEntry("TitleFormat", format); } @@ -314,7 +314,7 @@ void NoatunApp::setClearOnStart(bool b) void NoatunApp::setClearOnOpen(bool b) { KConfig *config=KGlobal::config(); - config->setGroup(QString::null); + config->setGroup(TQString::null); config->writeEntry("ClearOnOpen", b); config->sync(); } @@ -322,7 +322,7 @@ void NoatunApp::setClearOnOpen(bool b) void NoatunApp::setDisplayRemaining(bool b) { KConfig *config=KGlobal::config(); - config->setGroup(QString::null); + config->setGroup(TQString::null); config->writeEntry("DisplayRemaining", b); config->sync(); } @@ -350,7 +350,7 @@ void NoatunApp::hideInterfaces() } -int NoatunApp::pluginMenuAdd(const QString &text, const QObject *receiver, const char *member) +int NoatunApp::pluginMenuAdd(const TQString &text, const TQObject *receiver, const char *member) { return pluginActionMenu()->menuAdd(text, receiver, member); } @@ -432,9 +432,9 @@ Effects *NoatunApp::effects() const return d->effects; } -QString NoatunApp::mimeTypes() +TQString NoatunApp::mimeTypes() { - QString mimeTypes; + TQString mimeTypes; Arts::TraderQuery q; vector<Arts::TraderOffer> *results = q.query(); vector<Arts::TraderOffer>::iterator i; @@ -484,16 +484,16 @@ void NoatunApp::commitData(QSessionManager &) void NoatunApp::saveState(QSessionManager &sm) { - QStringList restartCommand = sm.restartCommand(); + TQStringList restartCommand = sm.restartCommand(); sm.setRestartCommand( restartCommand ); KApplication::saveState(sm); } // Deprecated -QImage NoatunApp::readPNG(const QString &filename) +TQImage NoatunApp::readPNG(const TQString &filename) { - QImageIO file(filename, "PNG"); + TQImageIO file(filename, "PNG"); file.setGamma(0.0); file.read(); return file.image(); @@ -502,7 +502,7 @@ QImage NoatunApp::readPNG(const QString &filename) void NoatunApp::restoreEngineState() { KConfig* config = KGlobal::config(); - config->setGroup(QString::null); + config->setGroup(TQString::null); int state = config->readNumEntry("EngineState", Arts::posPlaying); switch (state) { @@ -522,7 +522,7 @@ void NoatunApp::restoreEngineState() void NoatunApp::saveEngineState() { KConfig* config=KGlobal::config(); - config->setGroup(QString::null); + config->setGroup(TQString::null); config->writeEntry("EngineState", player()->engine()->state()); // we don't sync here since it's done in the destructor afterwards anyway } diff --git a/noatun/library/cmodule.cpp b/noatun/library/cmodule.cpp index a624fb64..27dbc686 100644 --- a/noatun/library/cmodule.cpp +++ b/noatun/library/cmodule.cpp @@ -3,24 +3,24 @@ #include <common.h> #include <noatun/app.h> -#include <qpushbutton.h> -#include <qbuttongroup.h> -#include <qradiobutton.h> -#include <qcheckbox.h> -#include <qlayout.h> +#include <tqpushbutton.h> +#include <tqbuttongroup.h> +#include <tqradiobutton.h> +#include <tqcheckbox.h> +#include <tqlayout.h> #include <klocale.h> #include <kdebug.h> #include <klistview.h> -#include <qsplitter.h> -#include <qlabel.h> -#include <qdragobject.h> +#include <tqsplitter.h> +#include <tqlabel.h> +#include <tqdragobject.h> #include <kurlrequester.h> #include <kfiledialog.h> #include <kdialog.h> #include <klineedit.h> -#include <qtextview.h> -#include <qwhatsthis.h> +#include <tqtextview.h> +#include <tqwhatsthis.h> #include "mimetypetree.h" @@ -28,67 +28,67 @@ * General options *****************************************************************/ -General::General(QObject *parent) +General::General(TQObject *parent) : CModule(i18n("General"), i18n("General Options"), "configure", parent) { - mLoopList=new QCheckBox(i18n("&Return to start of playlist on finish"), this); + mLoopList=new TQCheckBox(i18n("&Return to start of playlist on finish"), this); mLoopList->setChecked(napp->loopList()); - QWhatsThis::add(mLoopList, i18n("When the playlist is finished playing, return to the start, but do not start playing.")); + TQWhatsThis::add(mLoopList, i18n("When the playlist is finished playing, return to the start, but do not start playing.")); - mOneInstance=new QCheckBox(i18n("Allow only one &instance of Noatun"), this); + mOneInstance=new TQCheckBox(i18n("Allow only one &instance of Noatun"), this); mOneInstance->setChecked(napp->oneInstance()); - QWhatsThis::add(mOneInstance, i18n("Starting noatun a second time will cause it to just append items from the start to the current instance.")); + TQWhatsThis::add(mOneInstance, i18n("Starting noatun a second time will cause it to just append items from the start to the current instance.")); - mClearOnOpen = new QCheckBox(i18n("Clear playlist &when opening a file"), this); + mClearOnOpen = new TQCheckBox(i18n("Clear playlist &when opening a file"), this); mClearOnOpen->setChecked(napp->clearOnOpen()); - QWhatsThis::add(mClearOnOpen, i18n("Opening a file with the global Open menu item will clear the playlist first.")); + TQWhatsThis::add(mClearOnOpen, i18n("Opening a file with the global Open menu item will clear the playlist first.")); - mFastVolume=new QCheckBox(i18n("&Use fast hardware volume control"), this); + mFastVolume=new TQCheckBox(i18n("&Use fast hardware volume control"), this); mFastVolume->setChecked(napp->fastMixer()); - QWhatsThis::add(mFastVolume, i18n("Use the hardware mixer instead of aRts'. It affects all streams, not just Noatun's, but is a little faster.")); + TQWhatsThis::add(mFastVolume, i18n("Use the hardware mixer instead of aRts'. It affects all streams, not just Noatun's, but is a little faster.")); - mRemaining=new QCheckBox(i18n("Display &remaining play time"), this); + mRemaining=new TQCheckBox(i18n("Display &remaining play time"), this); mRemaining->setChecked(napp->displayRemaining()); - QWhatsThis::add(mRemaining, i18n("Counters count down towards zero, showing remaining time instead of elapsed time.")); + TQWhatsThis::add(mRemaining, i18n("Counters count down towards zero, showing remaining time instead of elapsed time.")); - QLabel *titleLabel=new QLabel(i18n("Title &format:"), this); + TQLabel *titleLabel=new TQLabel(i18n("Title &format:"), this); mTitleFormat=new KLineEdit(this); titleLabel->setBuddy(mTitleFormat); mTitleFormat->setText(napp->titleFormat()); - QWhatsThis::add(mTitleFormat, i18n( + TQWhatsThis::add(mTitleFormat, i18n( "Select a title to use for each file (in the playlist and user interface). " "Each element such as $(title) is replaced with the property with the name " "as given in the parentheses. The properties include, but are not limited to: " "title, author, date, comments and album.")); - QLabel *dlsaver=new QLabel(i18n("&Download folder:"), this); + TQLabel *dlsaver=new TQLabel(i18n("&Download folder:"), this); mDlSaver=new KURLRequester(napp->saveDirectory(), this); dlsaver->setBuddy(mDlSaver); - connect( mDlSaver, SIGNAL( openFileDialog( KURLRequester * )), - this, SLOT( slotRequesterClicked( KURLRequester * ))); - QWhatsThis::add(mDlSaver, i18n("When opening a non-local file, download it to the selected folder.")); + connect( mDlSaver, TQT_SIGNAL( openFileDialog( KURLRequester * )), + this, TQT_SLOT( slotRequesterClicked( KURLRequester * ))); + TQWhatsThis::add(mDlSaver, i18n("When opening a non-local file, download it to the selected folder.")); - mPlayOnStartup = new QButtonGroup(1, Horizontal, i18n("Play Behavior on Startup"), this); + mPlayOnStartup = new TQButtonGroup(1, Horizontal, i18n("Play Behavior on Startup"), this); mPlayOnStartup->setExclusive(true); mPlayOnStartup->insert( - new QRadioButton(i18n("Restore &play state"), mPlayOnStartup), + new TQRadioButton(i18n("Restore &play state"), mPlayOnStartup), NoatunApp::Restore ); mPlayOnStartup->insert( - new QRadioButton(i18n("Automatically play &first file"), mPlayOnStartup), + new TQRadioButton(i18n("Automatically play &first file"), mPlayOnStartup), NoatunApp::Play ); mPlayOnStartup->insert( - new QRadioButton(i18n("&Do not start playing"), mPlayOnStartup), + new TQRadioButton(i18n("&Do not start playing"), mPlayOnStartup), NoatunApp::DontPlay ); - if (QButton* b = mPlayOnStartup->find(napp->startupPlayMode())) + if (TQButton* b = mPlayOnStartup->find(napp->startupPlayMode())) { b->toggle(); } - QGridLayout *layout = new QGridLayout(this, 0, KDialog::spacingHint()); + TQGridLayout *layout = new TQGridLayout(this, 0, KDialog::spacingHint()); layout->setSpacing(KDialog::spacingHint()); layout->addMultiCellWidget(mLoopList, 0, 0, 0, 1); diff --git a/noatun/library/cmodule.h b/noatun/library/cmodule.h index 6e0e1179..881842a9 100644 --- a/noatun/library/cmodule.h +++ b/noatun/library/cmodule.h @@ -1,7 +1,7 @@ #ifndef CMODULE_H #define CMODULE_H -#include <qframe.h> +#include <tqframe.h> #include <klistview.h> #include "noatun/pref.h" @@ -23,16 +23,16 @@ class General : public CModule { Q_OBJECT public: - General(QObject *parent=0); + General(TQObject *parent=0); virtual void save(); private slots: void slotRequesterClicked( KURLRequester * ); private: - QCheckBox *mLoopList, *mOneInstance, *mRememberPositions, + TQCheckBox *mLoopList, *mOneInstance, *mRememberPositions, *mClearOnOpen, *mFastVolume, *mRemaining; - QButtonGroup* mPlayOnStartup; + TQButtonGroup* mPlayOnStartup; KURLRequester *mDlSaver; KLineEdit *mTitleFormat; }; diff --git a/noatun/library/controls.cpp b/noatun/library/controls.cpp index 1fb08269..dc67ffaa 100644 --- a/noatun/library/controls.cpp +++ b/noatun/library/controls.cpp @@ -1,14 +1,14 @@ #include <noatun/controls.h> -L33tSlider::L33tSlider(QWidget * parent, const char * name) : - QSlider(parent,name), pressed(false) +L33tSlider::L33tSlider(TQWidget * parent, const char * name) : + TQSlider(parent,name), pressed(false) {} -L33tSlider::L33tSlider(Orientation o, QWidget * parent, const char * name) : - QSlider(o,parent,name), pressed(false) +L33tSlider::L33tSlider(Orientation o, TQWidget * parent, const char * name) : + TQSlider(o,parent,name), pressed(false) {} L33tSlider::L33tSlider(int minValue, int maxValue, int pageStep, int value, - Orientation o, QWidget * parent, const char * name) : - QSlider(minValue, maxValue, pageStep, value, o, parent,name), pressed(false) + Orientation o, TQWidget * parent, const char * name) : + TQSlider(minValue, maxValue, pageStep, value, o, parent,name), pressed(false) {} bool L33tSlider::currentlyPressed() const @@ -19,28 +19,28 @@ bool L33tSlider::currentlyPressed() const void L33tSlider::setValue(int i) { if (!pressed) - QSlider::setValue(i); + TQSlider::setValue(i); } -void L33tSlider::mousePressEvent(QMouseEvent*e) +void L33tSlider::mousePressEvent(TQMouseEvent*e) { if (e->button()!=RightButton) { pressed=true; - QSlider::mousePressEvent(e); + TQSlider::mousePressEvent(e); } } -void L33tSlider::mouseReleaseEvent(QMouseEvent*e) +void L33tSlider::mouseReleaseEvent(TQMouseEvent*e) { pressed=false; - QSlider::mouseReleaseEvent(e); + TQSlider::mouseReleaseEvent(e); emit userChanged(value()); } -void L33tSlider::wheelEvent(QWheelEvent *e) +void L33tSlider::wheelEvent(TQWheelEvent *e) { - QSlider::wheelEvent(e); + TQSlider::wheelEvent(e); int newValue=value() /* +e->delta()/120 */; if (newValue<minValue()) newValue=minValue(); @@ -51,15 +51,15 @@ void L33tSlider::wheelEvent(QWheelEvent *e) } -SliderAction::SliderAction(const QString& text, int accel, const QObject *receiver, - const char *member, QObject* parent, const char* name ) +SliderAction::SliderAction(const TQString& text, int accel, const TQObject *receiver, + const char *member, TQObject* parent, const char* name ) : KAction( text, accel, parent, name ) { m_receiver = receiver; m_member = member; } -int SliderAction::plug( QWidget *w, int index ) +int SliderAction::plug( TQWidget *w, int index ) { if (!w->inherits("KToolBar")) return -1; @@ -73,11 +73,11 @@ int SliderAction::plug( QWidget *w, int index ) addContainer( toolBar, id ); - connect( toolBar, SIGNAL( destroyed() ), this, SLOT( slotDestroyed() ) ); + connect( toolBar, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotDestroyed() ) ); toolBar->setItemAutoSized( id, true ); if (w->inherits( "KToolBar" )) - connect(toolBar, SIGNAL(moved(KToolBar::BarPosition)), this, SLOT(toolbarMoved(KToolBar::BarPosition))); + connect(toolBar, TQT_SIGNAL(moved(KToolBar::BarPosition)), this, TQT_SLOT(toolbarMoved(KToolBar::BarPosition))); emit plugged(); @@ -102,7 +102,7 @@ return; */ } -void SliderAction::unplug( QWidget *w ) +void SliderAction::unplug( TQWidget *w ) { KToolBar *toolBar = (KToolBar *)w; int idx = findContainer( w ); diff --git a/noatun/library/downloader.cpp b/noatun/library/downloader.cpp index 734f5e11..cce6e4d9 100644 --- a/noatun/library/downloader.cpp +++ b/noatun/library/downloader.cpp @@ -1,8 +1,8 @@ #include <noatun/downloader.h> #include <noatun/app.h> #include <assert.h> -#include <qfile.h> -#include <qtimer.h> +#include <tqfile.h> +#include <tqtimer.h> #include <kio/job.h> #include <klocale.h> @@ -21,12 +21,12 @@ bool DownloadItem::isDownloaded() const return true; } -QString DownloadItem::localFilename() const +TQString DownloadItem::localFilename() const { return mLocalFilename; } -void DownloadItem::setLocalFilename(const QString &filename) +void DownloadItem::setLocalFilename(const TQString &filename) { mLocalFilename=filename; } @@ -65,11 +65,11 @@ void DownloadItem::dequeue() -Downloader::Downloader(QObject *parent) - : QObject(parent), localfile(0), current(0), mJob(0), mTimeout(0) +Downloader::Downloader(TQObject *parent) + : TQObject(parent), localfile(0), current(0), mJob(0), mTimeout(0) { mStarted=false; - mUnstartedQueue=new QPtrList<Downloader::QueueItem>; + mUnstartedQueue=new TQPtrList<Downloader::QueueItem>; } Downloader::~Downloader() @@ -84,7 +84,7 @@ void Downloader::start() if (current) emit enqueued(current->notifier, current->file); - for (QPtrListIterator<Downloader::QueueItem> i(*mUnstartedQueue); i.current(); ++i) + for (TQPtrListIterator<Downloader::QueueItem> i(*mUnstartedQueue); i.current(); ++i) { (*i)->notifier->mLocalFilename = (*i)->local; mQueue.append(*i); @@ -93,24 +93,24 @@ void Downloader::start() delete mUnstartedQueue; mUnstartedQueue=0; - QTimer::singleShot(0, this, SLOT(getNext())); + TQTimer::singleShot(0, this, TQT_SLOT(getNext())); } -static QString nonExistantFile(const QString &file) +static TQString nonExistantFile(const TQString &file) { if (file.right(1)=="/") return i18n("Unknown"); int i=0; - QString f(file); - while (QFile(f).exists()) + TQString f(file); + while (TQFile(f).exists()) { i++; f=file; - f.insert(f.findRev('.'), '_'+QString::number(i)); + f.insert(f.findRev('.'), '_'+TQString::number(i)); } return f; } -QString Downloader::enqueue(DownloadItem *notifier, const KURL &file) +TQString Downloader::enqueue(DownloadItem *notifier, const KURL &file) { if (file.isLocalFile()) return 0; QueueItem *i=new QueueItem; @@ -142,7 +142,7 @@ QString Downloader::enqueue(DownloadItem *notifier, const KURL &file) } mQueue.append(i); - QTimer::singleShot(0, this, SLOT(getNext())); + TQTimer::singleShot(0, this, TQT_SLOT(getNext())); emit enqueued(notifier, file); return i->local; } @@ -155,7 +155,7 @@ void Downloader::dequeue(DownloadItem *notifier) jobDone(mJob); return; } - for (QPtrListIterator<Downloader::QueueItem> i(mQueue); i.current(); ++i) + for (TQPtrListIterator<Downloader::QueueItem> i(mQueue); i.current(); ++i) { if ((*i)->notifier==notifier) { @@ -176,22 +176,22 @@ void Downloader::getNext() current=mQueue.take(0); // open the QFile - localfile=new QFile(current->local); + localfile=new TQFile(current->local); localfile->open(IO_ReadWrite | IO_Append); mJob= KIO::get(current->file, true, false); - connect(mJob, SIGNAL(data(KIO::Job*, const QByteArray&)), SLOT(data(KIO::Job*, const QByteArray&))); - connect(mJob, SIGNAL(result(KIO::Job*)), SLOT(jobDone(KIO::Job*))); - connect(mJob, SIGNAL(percent(KIO::Job*, unsigned long)), SLOT(percent(KIO::Job*, unsigned long))); + connect(mJob, TQT_SIGNAL(data(KIO::Job*, const TQByteArray&)), TQT_SLOT(data(KIO::Job*, const TQByteArray&))); + connect(mJob, TQT_SIGNAL(result(KIO::Job*)), TQT_SLOT(jobDone(KIO::Job*))); + connect(mJob, TQT_SIGNAL(percent(KIO::Job*, unsigned long)), TQT_SLOT(percent(KIO::Job*, unsigned long))); if (mTimeout) delete mTimeout; - mTimeout=new QTimer(this); + mTimeout=new TQTimer(this); mTimeout->start(30000, true); - connect(mTimeout, SIGNAL(timeout()), SLOT(giveUpWithThisDownloadServerIsRunningNT())); + connect(mTimeout, TQT_SIGNAL(timeout()), TQT_SLOT(giveUpWithThisDownloadServerIsRunningNT())); } -void Downloader::data(KIO::Job *, const QByteArray &data) +void Downloader::data(KIO::Job *, const TQByteArray &data) { localfile->writeBlock(data); localfile->flush(); diff --git a/noatun/library/effects.cpp b/noatun/library/effects.cpp index 3c6c601e..a71e0b43 100644 --- a/noatun/library/effects.cpp +++ b/noatun/library/effects.cpp @@ -7,7 +7,7 @@ #include <player.h> #include <soundserver.h> #include <noatunarts.h> -#include <qlayout.h> +#include <tqlayout.h> #include <config.h> @@ -28,8 +28,8 @@ using namespace Arts; class EffectConfigWidget : public QWidget { public: - EffectConfigWidget(Effect *e, QWidget *parent=0) - : QWidget(parent), mEf(e) + EffectConfigWidget(Effect *e, TQWidget *parent=0) + : TQWidget(parent), mEf(e) {} virtual ~EffectConfigWidget() @@ -62,8 +62,8 @@ StereoEffect *Effect::effect() const Effect *Effect::after() const { - QPtrList<Effect> effects=napp->effects()->effects(); - QPtrListIterator<Effect> i(effects); + TQPtrList<Effect> effects=napp->effects()->effects(); + TQPtrListIterator<Effect> i(effects); for(; i.current(); ++i) if ((*i)->id()==mId) { @@ -77,8 +77,8 @@ Effect *Effect::after() const Effect *Effect::before() const { - QPtrList<Effect> effects=napp->effects()->effects(); - QPtrListIterator<Effect> i(effects); + TQPtrList<Effect> effects=napp->effects()->effects(); + TQPtrListIterator<Effect> i(effects); for(; i.current(); ++i) if ((*i)->id()==mId) { @@ -90,17 +90,17 @@ Effect *Effect::before() const return 0; } -QCString Effect::name() const +TQCString Effect::name() const { return mName; } -QString Effect::title() const +TQString Effect::title() const { return clean(mName); } -QString Effect::clean(const QCString &name) +TQString Effect::clean(const TQCString &name) { int pos=name.findRev("::"); if (pos>0) @@ -113,7 +113,7 @@ bool Effect::isNull() const return effect()->isNull(); } -QWidget *Effect::configure(bool /*friendly*/) +TQWidget *Effect::configure(bool /*friendly*/) { #ifdef HAS_ARTSVERSION_H if (mConfig) return mConfig; @@ -127,7 +127,7 @@ QWidget *Effect::configure(bool /*friendly*/) mConfig=new EffectConfigWidget(this); mConfig->setCaption(title()); - QBoxLayout *l=new QHBoxLayout(mConfig); + TQBoxLayout *l=new TQHBoxLayout(mConfig); l->add(new KArtsWidget(gui, mConfig)); l->freeze(); } @@ -235,14 +235,14 @@ void Effects::remove(Effect *item, bool del) void Effects::removeAll(bool del) { - for (QPtrListIterator<Effect> i(mItems); i.current(); ++i) + for (TQPtrListIterator<Effect> i(mItems); i.current(); ++i) if ((*i)->id()) remove(*i, del); } -QStrList Effects::available() const +TQStrList Effects::available() const { - QStrList val; + TQStrList val; Arts::TraderQuery query; query.supports("Interface", "Arts::StereoEffect"); query.supports("Interface", "Arts::SynthModule"); @@ -251,7 +251,7 @@ QStrList Effects::available() const for (vector<Arts::TraderOffer>::iterator i=offers->begin(); i!=offers->end(); i++) { Arts::TraderOffer &offer=*i; - QCString name = offer.interfaceName().c_str(); + TQCString name = offer.interfaceName().c_str(); val.append(name); } delete offers; @@ -260,16 +260,16 @@ QStrList Effects::available() const Effect *Effects::findId(long id) const { - for (QPtrListIterator<Effect> i(mItems); i.current(); ++i) + for (TQPtrListIterator<Effect> i(mItems); i.current(); ++i) if ((*i)->id()==id) return *i; return 0; } -QPtrList<Effect> Effects::effects() const +TQPtrList<Effect> Effects::effects() const { vector<long> *items=stack.effectList(); - QPtrList<Effect> effects; + TQPtrList<Effect> effects; for (vector<long>::iterator i=items->begin();i!=items->end();i++) if (Effect *e=findId(*i)) effects.append(e); diff --git a/noatun/library/effectview.cpp b/noatun/library/effectview.cpp index 73af1fc2..334781a1 100644 --- a/noatun/library/effectview.cpp +++ b/noatun/library/effectview.cpp @@ -30,22 +30,22 @@ #include <kdialog.h> #include <kiconloader.h> #include <klocale.h> -#include <qdragobject.h> -#include <qheader.h> -#include <qhgroupbox.h> -#include <qlabel.h> -#include <qlayout.h> -#include <qpushbutton.h> -#include <qtextedit.h> -#include <qtoolbutton.h> -#include <qvgroupbox.h> -#include <qwhatsthis.h> +#include <tqdragobject.h> +#include <tqheader.h> +#include <tqhgroupbox.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqpushbutton.h> +#include <tqtextedit.h> +#include <tqtoolbutton.h> +#include <tqvgroupbox.h> +#include <tqwhatsthis.h> class EffectListItem : public QListViewItem { public: - EffectListItem(QListView *parent, QListViewItem *after, Effect *e) - : QListViewItem(parent, after, e->title()), mEffect(e) + EffectListItem(TQListView *parent, TQListViewItem *after, Effect *e) + : TQListViewItem(parent, after, e->title()), mEffect(e) { } @@ -55,24 +55,24 @@ private: Effect *mEffect; }; -EffectList::EffectList(QWidget *parent) +EffectList::EffectList(TQWidget *parent) : KListView(parent) { } -bool EffectList::acceptDrag(QDropEvent *event) const +bool EffectList::acceptDrag(TQDropEvent *event) const { - return QCString(event->format()) == "application/x-noatun-effectdrag"; + return TQCString(event->format()) == "application/x-noatun-effectdrag"; } -QDragObject *EffectList::dragObject() const +TQDragObject *EffectList::dragObject() const { if (!currentItem()) return 0; - return new QStoredDrag("application/x-noatun-effectdrag", (QWidget*)this); + return new TQStoredDrag("application/x-noatun-effectdrag", (TQWidget*)this); } EffectView::EffectView() - : KDialogBase((QWidget*)0L, 0, false, i18n("Effects"), Help | Close, Close, true) + : KDialogBase((TQWidget*)0L, 0, false, i18n("Effects"), Help | Close, Close, true) , initialized(false) { } @@ -85,13 +85,13 @@ void EffectView::show() namespace { -QToolButton *newButton(const QIconSet &iconSet, const QString &textLabel, QObject *receiver, const char * slot, QWidget *parent, const char *name = 0) +TQToolButton *newButton(const TQIconSet &iconSet, const TQString &textLabel, TQObject *receiver, const char * slot, TQWidget *parent, const char *name = 0) { - QToolButton *button = new QToolButton(parent, name); + TQToolButton *button = new TQToolButton(parent, name); button->setIconSet(iconSet); button->setTextLabel(textLabel, true); - QObject::connect(button, SIGNAL(clicked()), receiver, slot); - button->setFixedSize(QSize(22, 22)); + TQObject::connect(button, TQT_SIGNAL(clicked()), receiver, slot); + button->setFixedSize(TQSize(22, 22)); return button; } } @@ -105,21 +105,21 @@ void EffectView::init(void) setIcon(SmallIcon("effect")); // Create widgets and layouts - QFrame *box = makeMainWidget(); - QVBoxLayout *boxLayout = new QVBoxLayout(box, 0, KDialog::spacingHint()); + TQFrame *box = makeMainWidget(); + TQVBoxLayout *boxLayout = new TQVBoxLayout(box, 0, KDialog::spacingHint()); // Available - QVGroupBox *topBox = new QVGroupBox(i18n("Available Effects"), box); + TQVGroupBox *topBox = new TQVGroupBox(i18n("Available Effects"), box); topBox->setInsideSpacing(KDialog::spacingHint()); - QFrame *topTopFrame = new QFrame(topBox); - QHBoxLayout *topTopLayout = new QHBoxLayout(topTopFrame, 0, KDialog::spacingHint()); + TQFrame *topTopFrame = new TQFrame(topBox); + TQHBoxLayout *topTopLayout = new TQHBoxLayout(topTopFrame, 0, KDialog::spacingHint()); topTopLayout->setAutoAdd(true); available = new KComboBox(false, topTopFrame); - QToolButton *add = newButton(BarIconSet("down", KIcon::SizeSmall), i18n("Add"), this, SLOT(addEffect()), topTopFrame); + TQToolButton *add = newButton(BarIconSet("down", KIcon::SizeSmall), i18n("Add"), this, TQT_SLOT(addEffect()), topTopFrame); // Active - QHGroupBox *bottomBox = new QHGroupBox(i18n("Active Effects"), box); + TQHGroupBox *bottomBox = new TQHGroupBox(i18n("Active Effects"), box); bottomBox->setInsideSpacing(KDialog::spacingHint()); active = new EffectList(bottomBox); @@ -136,27 +136,27 @@ void EffectView::init(void) active->setSorting(-1); active->setDropVisualizer(true); active->setItemsMovable(true); - active->setSelectionMode(QListView::Single); + active->setSelectionMode(TQListView::Single); active->setDragEnabled(true); - connect(active, SIGNAL(dropped(QDropEvent *, QListViewItem *)), SLOT(activeDrop(QDropEvent *, QListViewItem *))); + connect(active, TQT_SIGNAL(dropped(TQDropEvent *, TQListViewItem *)), TQT_SLOT(activeDrop(TQDropEvent *, TQListViewItem *))); // when a new effect is added - connect(napp->effects(), SIGNAL(added(Effect *)), SLOT(added(Effect *))); - connect(napp->effects(), SIGNAL(removed(Effect *)), SLOT(removed(Effect *))); - connect(napp->effects(), SIGNAL(moved(Effect *)), SLOT(moved(Effect *))); + connect(napp->effects(), TQT_SIGNAL(added(Effect *)), TQT_SLOT(added(Effect *))); + connect(napp->effects(), TQT_SIGNAL(removed(Effect *)), TQT_SLOT(removed(Effect *))); + connect(napp->effects(), TQT_SIGNAL(moved(Effect *)), TQT_SLOT(moved(Effect *))); available->setCurrentItem(0); - connect(active, SIGNAL(currentChanged(QListViewItem *)), SLOT(activeChanged(QListViewItem *))); + connect(active, TQT_SIGNAL(currentChanged(TQListViewItem *)), TQT_SLOT(activeChanged(TQListViewItem *))); active->setCurrentItem(0); // the buttons - QFrame *bottomLeftFrame = new QFrame(bottomBox); - QVBoxLayout *bottomLeftLayout = new QVBoxLayout(bottomLeftFrame, 0, KDialog::spacingHint()); - up = newButton(BarIconSet("up", KIcon::SizeSmall), i18n("Up"), this, SLOT(moveUp()), bottomLeftFrame); - down = newButton(BarIconSet("down", KIcon::SizeSmall), i18n("Down"), this, SLOT(moveDown()), bottomLeftFrame); - configure = newButton(BarIconSet("configure", KIcon::SizeSmall), i18n("Configure"), this, SLOT(configureEffect()), bottomLeftFrame); - remove = newButton(BarIconSet("remove", KIcon::SizeSmall), i18n("Remove"), this, SLOT(removeEffect()), bottomLeftFrame); + TQFrame *bottomLeftFrame = new TQFrame(bottomBox); + TQVBoxLayout *bottomLeftLayout = new TQVBoxLayout(bottomLeftFrame, 0, KDialog::spacingHint()); + up = newButton(BarIconSet("up", KIcon::SizeSmall), i18n("Up"), this, TQT_SLOT(moveUp()), bottomLeftFrame); + down = newButton(BarIconSet("down", KIcon::SizeSmall), i18n("Down"), this, TQT_SLOT(moveDown()), bottomLeftFrame); + configure = newButton(BarIconSet("configure", KIcon::SizeSmall), i18n("Configure"), this, TQT_SLOT(configureEffect()), bottomLeftFrame); + remove = newButton(BarIconSet("remove", KIcon::SizeSmall), i18n("Remove"), this, TQT_SLOT(removeEffect()), bottomLeftFrame); bottomLeftLayout->addWidget(up); bottomLeftLayout->addWidget(down); bottomLeftLayout->addWidget(configure); @@ -167,18 +167,18 @@ void EffectView::init(void) activeChanged(active->currentItem()); // Inline documentation - QWhatsThis::add(available, i18n("This shows all available effects.\n\nTo activate a plugin, drag files from here to the active pane on the right.")); - QWhatsThis::add(add, i18n("This will place the selected effect at the bottom of your chain.")); - QWhatsThis::add(active, i18n("This shows your effect chain. Noatun supports an unlimited amount of effects in any order. You can even have the same effect twice.\n\nDrag the items to and from here to add and remove them, respectively. You may also reorder them with drag-and-drop. These actions can also be performed with the buttons to the right.")); - QWhatsThis::add(up, i18n("Move the currently selected effect up in the chain.")); - QWhatsThis::add(down, i18n("Move the currently selected effect down in the chain.")); - QWhatsThis::add(configure, i18n("Configure the currently selected effect.\n\nYou can change things such as intensity from here.")); - QWhatsThis::add(remove, i18n("This will remove the selected effect from your chain.")); + TQWhatsThis::add(available, i18n("This shows all available effects.\n\nTo activate a plugin, drag files from here to the active pane on the right.")); + TQWhatsThis::add(add, i18n("This will place the selected effect at the bottom of your chain.")); + TQWhatsThis::add(active, i18n("This shows your effect chain. Noatun supports an unlimited amount of effects in any order. You can even have the same effect twice.\n\nDrag the items to and from here to add and remove them, respectively. You may also reorder them with drag-and-drop. These actions can also be performed with the buttons to the right.")); + TQWhatsThis::add(up, i18n("Move the currently selected effect up in the chain.")); + TQWhatsThis::add(down, i18n("Move the currently selected effect down in the chain.")); + TQWhatsThis::add(configure, i18n("Configure the currently selected effect.\n\nYou can change things such as intensity from here.")); + TQWhatsThis::add(remove, i18n("This will remove the selected effect from your chain.")); resize(300, 400); } -void EffectView::activeDrop(QDropEvent *, QListViewItem *pafter) +void EffectView::activeDrop(TQDropEvent *, TQListViewItem *pafter) { EffectListItem *after(static_cast<EffectListItem*>(pafter)); napp->effects()->move(after ? after->effect() : 0, @@ -186,9 +186,9 @@ void EffectView::activeDrop(QDropEvent *, QListViewItem *pafter) activeChanged(active->currentItem()); } -QListViewItem *EffectView::toListItem(Effect *e) const +TQListViewItem *EffectView::toListItem(Effect *e) const { - for(QListViewItem *i = active->firstChild(); i; i = i->itemBelow()) + for(TQListViewItem *i = active->firstChild(); i; i = i->itemBelow()) if(static_cast<EffectListItem*>(i)->effect() == e) return i; return 0; @@ -257,11 +257,11 @@ void EffectView::configureEffect() Effect *e = static_cast<EffectListItem*>(active->currentItem())->effect(); if(!e) return; - QWidget *c = e->configure(); + TQWidget *c = e->configure(); if(c) c->show(); } -void EffectView::activeChanged(QListViewItem *i) +void EffectView::activeChanged(TQListViewItem *i) { if(i) { diff --git a/noatun/library/effectview.h b/noatun/library/effectview.h index 1cdb1907..2a6e3ce6 100644 --- a/noatun/library/effectview.h +++ b/noatun/library/effectview.h @@ -53,20 +53,20 @@ public slots: void addEffect(); void configureEffect(); - void activeChanged(QListViewItem *); + void activeChanged(TQListViewItem *); protected slots: - void activeDrop(QDropEvent *, QListViewItem *); + void activeDrop(TQDropEvent *, TQListViewItem *); private: - QListViewItem *toListItem(Effect *) const; + TQListViewItem *toListItem(Effect *) const; void init(void); bool initialized; KComboBox *available; - QToolButton *up, *down, *configure, *remove; + TQToolButton *up, *down, *configure, *remove; EffectList *active; }; @@ -75,9 +75,9 @@ class EffectList : public KListView { Q_OBJECT public: - EffectList(QWidget *parent); - virtual bool acceptDrag(QDropEvent *) const; - virtual QDragObject *dragObject() const; + EffectList(TQWidget *parent); + virtual bool acceptDrag(TQDropEvent *) const; + virtual TQDragObject *dragObject() const; }; #endif diff --git a/noatun/library/engine.cpp b/noatun/library/engine.cpp index e937fa7f..00f26022 100644 --- a/noatun/library/engine.cpp +++ b/noatun/library/engine.cpp @@ -14,8 +14,8 @@ #include <kstandarddirs.h> #include <kconfig.h> #include <kdebug.h> -#include <qfile.h> -#include <qdir.h> +#include <tqfile.h> +#include <tqdir.h> #include <sys/wait.h> #include <kplayobject.h> #include <kplayobjectfactory.h> @@ -248,7 +248,7 @@ Noatun::StereoEffectStack *Engine::globalEffectStack() const { return &d->globa Noatun::Equalizer *Engine::equalizer() const { return &d->equalizer; } Noatun::Session *Engine::session() const { return &d->session; } -Engine::Engine(QObject *parent) : QObject(parent, "Engine"), mPlay(false) +Engine::Engine(TQObject *parent) : TQObject(parent, "Engine"), mPlay(false) { d=new EnginePrivate; // Connect to aRts @@ -293,19 +293,19 @@ bool Engine::open(const PlaylistItem &file) d->pProxy = new TitleProxy::Proxy(KURL(file.property("stream_"))); d->playobj = factory.createPlayObject(d->pProxy->proxyUrl(), false); - connect(d->playobj, SIGNAL(destroyed()), this, SLOT(deleteProxy())); + connect(d->playobj, TQT_SIGNAL(destroyed()), this, TQT_SLOT(deleteProxy())); connect( - d->pProxy, SIGNAL( + d->pProxy, TQT_SIGNAL( metaData( - const QString &, const QString &, - const QString &, const QString &, - const QString &, const QString &)), - this, SIGNAL( - receivedStreamMeta(const QString &, const QString &, - const QString &, const QString &, - const QString &, const QString &)) + const TQString &, const TQString &, + const TQString &, const TQString &, + const TQString &, const TQString &)), + this, TQT_SIGNAL( + receivedStreamMeta(const TQString &, const TQString &, + const TQString &, const TQString &, + const TQString &, const TQString &)) ); - connect(d->pProxy, SIGNAL(proxyError()), this, SLOT(slotProxyError())); + connect(d->pProxy, TQT_SIGNAL(proxyError()), this, TQT_SLOT(slotProxyError())); } else { @@ -328,7 +328,7 @@ bool Engine::open(const PlaylistItem &file) } else { - connect( d->playobj, SIGNAL( playObjectCreated() ), this, SLOT( connectPlayObject() ) ); + connect( d->playobj, TQT_SIGNAL( playObjectCreated() ), this, TQT_SLOT( connectPlayObject() ) ); } if (mPlay) @@ -463,7 +463,7 @@ bool Engine::initArts() // aRts seems not to be running, let's try to run it // First, let's read the configuration as in kcmarts KConfig config("kcmartsrc"); - QCString cmdline; + TQCString cmdline; config.setGroup("Arts"); @@ -472,7 +472,7 @@ bool Engine::initArts() // put the value of x11Comm into .mcoprc { - KConfig X11CommConfig(QDir::homeDirPath()+"/.mcoprc"); + KConfig X11CommConfig(TQDir::homeDirPath()+"/.mcoprc"); if(x11Comm) X11CommConfig.writeEntry("GlobalComm", "Arts::X11GlobalComm"); @@ -482,15 +482,15 @@ bool Engine::initArts() X11CommConfig.sync(); } - cmdline = QFile::encodeName(KStandardDirs::findExe(QString::fromLatin1("kdeinit_wrapper"))); + cmdline = TQFile::encodeName(KStandardDirs::findExe(TQString::fromLatin1("kdeinit_wrapper"))); cmdline += " "; if (rt) - cmdline += QFile::encodeName(KStandardDirs::findExe( - QString::fromLatin1("artswrapper"))); + cmdline += TQFile::encodeName(KStandardDirs::findExe( + TQString::fromLatin1("artswrapper"))); else - cmdline += QFile::encodeName(KStandardDirs::findExe( - QString::fromLatin1("artsd"))); + cmdline += TQFile::encodeName(KStandardDirs::findExe( + TQString::fromLatin1("artsd"))); cmdline += " "; cmdline += config.readEntry("Arguments","-F 10 -S 4096 -s 60 -m artsmessage -l 3 -f").utf8(); diff --git a/noatun/library/equalizer.cpp b/noatun/library/equalizer.cpp index 2ee208db..61b10d01 100644 --- a/noatun/library/equalizer.cpp +++ b/noatun/library/equalizer.cpp @@ -8,10 +8,10 @@ #include <soundserver.h> #include <noatunarts.h> #include <ktempfile.h> -#include <qdom.h> +#include <tqdom.h> #include <kio/netaccess.h> #include <kstandarddirs.h> -#include <qtextstream.h> +#include <tqtextstream.h> #include <math.h> #include <kconfig.h> #include <klocale.h> @@ -28,7 +28,7 @@ struct OldEqCruft static OldEqCruft *eqCruft=0; -Preset::Preset(const QString &) +Preset::Preset(const TQString &) { } // unused Preset::Preset(VPreset p) @@ -36,7 +36,7 @@ Preset::Preset(VPreset p) VPreset *copy = new VPreset(p); // isn't this horrible? :) - mFile = QString::number((unsigned long)copy); + mFile = TQString::number((unsigned long)copy); } Preset::Preset() @@ -48,12 +48,12 @@ VPreset &Preset::vpreset() const return *(VPreset*)addr; } -QString Preset::name() const +TQString Preset::name() const { return vpreset().name(); } -bool Preset::setName(const QString &name) +bool Preset::setName(const TQString &name) { return vpreset().setName(name); } @@ -75,7 +75,7 @@ void Preset::remove() vpreset().remove(); } -QString Preset::file() const +TQString Preset::file() const { return vpreset().file(); } @@ -120,17 +120,17 @@ int Band::center() const return eqCruft->interpolated->band(mNum).center(); } -QString Band::formatStart(bool withHz) const +TQString Band::formatStart(bool withHz) const { return eqCruft->interpolated->band(mNum).formatStart(withHz); } -QString Band::formatEnd(bool withHz) const +TQString Band::formatEnd(bool withHz) const { return eqCruft->interpolated->band(mNum).formatEnd(withHz); } -QString Band::format(bool withHz) const +TQString Band::format(bool withHz) const { return eqCruft->interpolated->band(mNum).format(withHz); } @@ -164,19 +164,19 @@ void Equalizer::init() mBands.append(new Band(4)); mBands.append(new Band(5)); - connect(VEQ, SIGNAL(changed()), SIGNAL(changed())); + connect(VEQ, TQT_SIGNAL(changed()), TQT_SIGNAL(changed())); - connect(VEQ, SIGNAL(created(VPreset)), SLOT(created(VPreset))); - connect(VEQ, SIGNAL(selected(VPreset)), SLOT(selected(VPreset))); - connect(VEQ, SIGNAL(renamed(VPreset)), SLOT(renamed(VPreset))); - connect(VEQ, SIGNAL(removed(VPreset)), SLOT(removed(VPreset))); + connect(VEQ, TQT_SIGNAL(created(VPreset)), TQT_SLOT(created(VPreset))); + connect(VEQ, TQT_SIGNAL(selected(VPreset)), TQT_SLOT(selected(VPreset))); + connect(VEQ, TQT_SIGNAL(renamed(VPreset)), TQT_SLOT(renamed(VPreset))); + connect(VEQ, TQT_SIGNAL(removed(VPreset)), TQT_SLOT(removed(VPreset))); - connect(VEQ, SIGNAL(enabled()), SIGNAL(enabled())); - connect(VEQ, SIGNAL(disabled()), SIGNAL(disabled())); - connect(VEQ, SIGNAL(enabled(bool)), SIGNAL(enabled(bool))); + connect(VEQ, TQT_SIGNAL(enabled()), TQT_SIGNAL(enabled())); + connect(VEQ, TQT_SIGNAL(disabled()), TQT_SIGNAL(disabled())); + connect(VEQ, TQT_SIGNAL(enabled(bool)), TQT_SIGNAL(enabled(bool))); - connect(VEQ, SIGNAL(preampChanged(int)), SIGNAL(preampChanged(int))); - connect(VEQ, SIGNAL(preampChanged(int)), SIGNAL(preampChanged(int))); + connect(VEQ, TQT_SIGNAL(preampChanged(int)), TQT_SIGNAL(preampChanged(int))); + connect(VEQ, TQT_SIGNAL(preampChanged(int)), TQT_SIGNAL(preampChanged(int))); } void Equalizer::created(VPreset preset) @@ -207,12 +207,12 @@ void Equalizer::removed(VPreset preset) delete p; } -QPtrList<Preset> Equalizer::presets() const +TQPtrList<Preset> Equalizer::presets() const { - QValueList<VPreset> presets = VEQ->presets(); - QPtrList<Preset> list; + TQValueList<VPreset> presets = VEQ->presets(); + TQPtrList<Preset> list; for ( - QValueList<VPreset>::Iterator i(presets.begin()); + TQValueList<VPreset>::Iterator i(presets.begin()); i != presets.end(); ++i ) { @@ -221,35 +221,35 @@ QPtrList<Preset> Equalizer::presets() const return list; } -Preset *Equalizer::preset(const QString &file) +Preset *Equalizer::preset(const TQString &file) { VPreset p = VEQ->presetByFile(file); if (!p) return 0; return new Preset(p); } -bool Equalizer::presetExists(const QString &name) const +bool Equalizer::presetExists(const TQString &name) const { return VEQ->presetExists(name); } -Preset *Equalizer::createPreset(const QString &name, bool smart) +Preset *Equalizer::createPreset(const TQString &name, bool smart) { VPreset p = VEQ->createPreset(name, smart); if (!p) return 0; return new Preset(p); } -const QPtrList<Band> &Equalizer::bands() const +const TQPtrList<Band> &Equalizer::bands() const { return mBands; } Band *Equalizer::band(int num) const { - // can't use QPtrList::at since it sets current + // can't use TQPtrList::at since it sets current - QPtrListIterator<Band> item(mBands); + TQPtrListIterator<Band> item(mBands); item+=(unsigned int)num; return *item; } @@ -290,17 +290,17 @@ void Equalizer::setEnabled(bool e) VEQ->setEnabled(e); } -QString Equalizer::toString(const QString &name) const +TQString Equalizer::toString(const TQString &name) const { return VEQ->toString(name); } -bool Equalizer::fromString(const QString &str) +bool Equalizer::fromString(const TQString &str) { return VEQ->fromString(str); } -bool Equalizer::save(const KURL &filename, const QString &name) const +bool Equalizer::save(const KURL &filename, const TQString &name) const { return VEQ->save(filename, name); } diff --git a/noatun/library/equalizerview.cpp b/noatun/library/equalizerview.cpp index 5e406e13..098226a7 100644 --- a/noatun/library/equalizerview.cpp +++ b/noatun/library/equalizerview.cpp @@ -11,18 +11,18 @@ #include <kiconloader.h> #include <klocale.h> -#include <qlayout.h> -#include <qslider.h> -#include <qcheckbox.h> -#include <qlabel.h> -#include <qtabwidget.h> -#include <qpushbutton.h> -#include <qheader.h> -#include <qfileinfo.h> -#include <qhbox.h> -#include <qvbox.h> -#include <qframe.h> -#include <qgroupbox.h> +#include <tqlayout.h> +#include <tqslider.h> +#include <tqcheckbox.h> +#include <tqlabel.h> +#include <tqtabwidget.h> +#include <tqpushbutton.h> +#include <tqheader.h> +#include <tqfileinfo.h> +#include <tqhbox.h> +#include <tqvbox.h> +#include <tqframe.h> +#include <tqgroupbox.h> #define EQ (napp->vequalizer()) @@ -30,14 +30,14 @@ //////////////////////////////////////////////// // PresetList -PresetList::PresetList(QWidget *parent, const char *name) +PresetList::PresetList(TQWidget *parent, const char *name) : KListView(parent, name) { setItemsRenameable(true); setRenameable(0, true); addColumn(""); // first column is the visible one addColumn("", 0); // create one column to store cruft in - setColumnWidthMode(0, QListView::Maximum); + setColumnWidthMode(0, TQListView::Maximum); header()->setStretchEnabled(true,0); header()->hide(); // a try to set a sne minimum width. unfortuately the custom item @@ -45,14 +45,14 @@ PresetList::PresetList(QWidget *parent, const char *name) setMinimumWidth(kapp->fontMetrics().boundingRect(i18n("Custom")).width()+2*itemMargin()); } -void PresetList::rename(QListViewItem *item, int c) +void PresetList::rename(TQListViewItem *item, int c) { // We can't rename the "Custom" metapreset if (item->text(0)==i18n("Custom")) return; // Or presets we don't have write access to - if (!QFileInfo(item->text(1)).isWritable()) + if (!TQFileInfo(item->text(1)).isWritable()) return; KListView::rename(item, c); @@ -61,18 +61,18 @@ void PresetList::rename(QListViewItem *item, int c) //////////////////////////////////////////////// // EqualizerLevel -EqualizerLevel::EqualizerLevel(QWidget *parent, VBand band) - : QWidget(parent), mBand(band) +EqualizerLevel::EqualizerLevel(TQWidget *parent, VBand band) + : TQWidget(parent), mBand(band) { - QVBoxLayout *layout = new QVBoxLayout(this, + TQVBoxLayout *layout = new TQVBoxLayout(this, 0, 0, "EqualizerLevel::layout"); - mSlider = new QSlider(-200, 200, 25, 0, Qt::Vertical, this, "EqualizerLevel::mSlider"); - mSlider->setTickmarks(QSlider::Left); + mSlider = new TQSlider(-200, 200, 25, 0, Qt::Vertical, this, "EqualizerLevel::mSlider"); + mSlider->setTickmarks(TQSlider::Left); mSlider->setTickInterval(25); layout->addWidget(mSlider); - connect(mSlider, SIGNAL(valueChanged(int)), SLOT(changed(int))); - mLabel = new QLabel("", this, "EqualizerLevel::mLabel"); + connect(mSlider, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changed(int))); + mLabel = new TQLabel("", this, "EqualizerLevel::mLabel"); mLabel->setAlignment(AlignHCenter | AlignVCenter); layout->addWidget(mLabel); @@ -82,8 +82,8 @@ EqualizerLevel::EqualizerLevel(QWidget *parent, VBand band) setBand(band); - connect(EQ, SIGNAL(modified()), SLOT(changed())); - connect(mSlider, SIGNAL(valueChanged(int)), SLOT(changed(int))); + connect(EQ, TQT_SIGNAL(modified()), TQT_SLOT(changed())); + connect(mSlider, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changed(int))); } void EqualizerLevel::setBand(VBand band) @@ -123,56 +123,56 @@ void EqualizerView::show() mWidget = new EqualizerWidget(this, "mWidget"); setMainWidget(mWidget); - bandsLayout = new QHBoxLayout(mWidget->bandsFrame, + bandsLayout = new TQHBoxLayout(mWidget->bandsFrame, 0, KDialog::spacingHint(), "bandsLayout"); - connect(mWidget->preampSlider, SIGNAL(valueChanged(int)), - this, SLOT(setPreamp(int))); - connect(EQ, SIGNAL(preampChanged(int)), - this, SLOT(changedPreamp(int))); + connect(mWidget->preampSlider, TQT_SIGNAL(valueChanged(int)), + this, TQT_SLOT(setPreamp(int))); + connect(EQ, TQT_SIGNAL(preampChanged(int)), + this, TQT_SLOT(changedPreamp(int))); mWidget->bandCount->setRange(EQ->minBands(), EQ->maxBands()); - connect(mWidget->bandCount, SIGNAL(valueChanged(int)), - EQ, SLOT(setBands(int))); + connect(mWidget->bandCount, TQT_SIGNAL(valueChanged(int)), + EQ, TQT_SLOT(setBands(int))); - QVBoxLayout *l = new QVBoxLayout(mWidget->presetFrame); + TQVBoxLayout *l = new TQVBoxLayout(mWidget->presetFrame); mPresets = new PresetList(mWidget->presetFrame, "mPresets"); l->addWidget(mPresets); - connect(mWidget->removePresetButton, SIGNAL(clicked()), SLOT(remove())); - connect(mWidget->addPresetButton, SIGNAL(clicked()), SLOT(create())); - connect(mWidget->resetEqButton, SIGNAL(clicked()), SLOT(reset())); + connect(mWidget->removePresetButton, TQT_SIGNAL(clicked()), TQT_SLOT(remove())); + connect(mWidget->addPresetButton, TQT_SIGNAL(clicked()), TQT_SLOT(create())); + connect(mWidget->resetEqButton, TQT_SIGNAL(clicked()), TQT_SLOT(reset())); new KListViewItem(mPresets, i18n("Custom")); - connect(mPresets, SIGNAL(currentChanged(QListViewItem*)), - this, SLOT(select(QListViewItem*))); + connect(mPresets, TQT_SIGNAL(currentChanged(TQListViewItem*)), + this, TQT_SLOT(select(TQListViewItem*))); - connect(mPresets, SIGNAL(itemRenamed(QListViewItem*)), - this, SLOT(rename(QListViewItem*))); + connect(mPresets, TQT_SIGNAL(itemRenamed(TQListViewItem*)), + this, TQT_SLOT(rename(TQListViewItem*))); // populate the preset list - QValueList<VPreset> presets = EQ->presets(); - QValueList<VPreset>::Iterator it; + TQValueList<VPreset> presets = EQ->presets(); + TQValueList<VPreset>::Iterator it; for (it=presets.begin(); it!=presets.end(); ++it) { created(*it); } - connect(EQ, SIGNAL(created(VPreset)), SLOT(created(VPreset))); - connect(EQ, SIGNAL(renamed(VPreset)), SLOT(renamed(VPreset))); - connect(EQ, SIGNAL(removed(VPreset)), SLOT(removed(VPreset))); + connect(EQ, TQT_SIGNAL(created(VPreset)), TQT_SLOT(created(VPreset))); + connect(EQ, TQT_SIGNAL(renamed(VPreset)), TQT_SLOT(renamed(VPreset))); + connect(EQ, TQT_SIGNAL(removed(VPreset)), TQT_SLOT(removed(VPreset))); mWidget->enabledCheckBox->setChecked(EQ->isEnabled()); - connect(mWidget->enabledCheckBox, SIGNAL(toggled(bool)), - EQ, SLOT(setEnabled(bool))); - connect(EQ, SIGNAL(enabled(bool)), - mWidget->enabledCheckBox, SLOT(setChecked(bool))); + connect(mWidget->enabledCheckBox, TQT_SIGNAL(toggled(bool)), + EQ, TQT_SLOT(setEnabled(bool))); + connect(EQ, TQT_SIGNAL(enabled(bool)), + mWidget->enabledCheckBox, TQT_SLOT(setChecked(bool))); - connect(EQ, SIGNAL(changed()), - this, SLOT(changedEq())); - connect(EQ, SIGNAL(changedBands()), - this, SLOT(changedBands())); + connect(EQ, TQT_SIGNAL(changed()), + this, TQT_SLOT(changedEq())); + connect(EQ, TQT_SIGNAL(changedBands()), + this, TQT_SLOT(changedBands())); changedBands(); changedEq(); @@ -184,23 +184,23 @@ void EqualizerView::show() KDialogBase::show(); } -QListViewItem *EqualizerView::itemFor(const QString &filename) +TQListViewItem *EqualizerView::itemFor(const TQString &filename) { - for (QListViewItem *i=mPresets->firstChild(); i!=0; i=i->itemBelow()) + for (TQListViewItem *i=mPresets->firstChild(); i!=0; i=i->itemBelow()) { - QString t = i->text(1); + TQString t = i->text(1); if ((t.length()==0 && filename.length()==0) || t==filename) return i; } return 0; } -QListViewItem *EqualizerView::itemFor(const VPreset &preset) +TQListViewItem *EqualizerView::itemFor(const VPreset &preset) { return itemFor(preset.file()); } -// why is it that when you move a QSlider up, it goes down? +// why is it that when you move a TQSlider up, it goes down? void EqualizerView::setPreamp(int x) { EQ->setPreamp(-x); @@ -233,7 +233,7 @@ void EqualizerView::changedEq() { if (!mGoingPreset) { - QListViewItem *customitem = itemFor(""); + TQListViewItem *customitem = itemFor(""); if (!customitem) // this should never happen! return; mPresets->setSelected(customitem, true); @@ -247,15 +247,15 @@ void EqualizerView::removed(VPreset p) void EqualizerView::created(VPreset p) { - // store the filename in QListViewItem::text(0) - QString n = p.name(); - QString f = p.file(); + // store the filename in TQListViewItem::text(0) + TQString n = p.name(); + TQString f = p.file(); new KListViewItem(mPresets, n, f); } void EqualizerView::renamed(VPreset p) { - QListViewItem *renamed = itemFor(p); + TQListViewItem *renamed = itemFor(p); if (!renamed) // WTF ! { created(p); @@ -266,10 +266,10 @@ void EqualizerView::renamed(VPreset p) void EqualizerView::remove() { - QListViewItem *current=mPresets->currentItem(); + TQListViewItem *current=mPresets->currentItem(); if (current->text(0)==i18n("Custom")) return; - QListViewItem *then=current->itemAbove(); + TQListViewItem *then=current->itemAbove(); if (!then) then=current->itemBelow(); if (then) @@ -290,7 +290,7 @@ void EqualizerView::create() // We should have just made a list view item for this preset // See EquailizerView::presetAdded() - QListViewItem *i = itemFor(p); + TQListViewItem *i = itemFor(p); if (i) mPresets->setSelected(i, true); @@ -307,13 +307,13 @@ void EqualizerView::reset() } -void EqualizerView::rename(QListViewItem *item) +void EqualizerView::rename(TQListViewItem *item) { EQ->presetByFile(item->text(1)).setName(item->text(0)); item->setText(0, EQ->presetByFile(item->text(1)).name()); } -void EqualizerView::select(QListViewItem *item) +void EqualizerView::select(TQListViewItem *item) { mGoingPreset = true; EQ->presetByFile(item->text(1)).load(); diff --git a/noatun/library/equalizerview.h b/noatun/library/equalizerview.h index 98778fcc..321b5ef0 100644 --- a/noatun/library/equalizerview.h +++ b/noatun/library/equalizerview.h @@ -1,7 +1,7 @@ #ifndef EQUALIZERVIEW_H #define EQUALIZERVIEW_H -#include <qwidget.h> +#include <tqwidget.h> #include <kdialogbase.h> #include <klistview.h> @@ -18,7 +18,7 @@ class EqualizerLevel : public QWidget { Q_OBJECT public: - EqualizerLevel(QWidget *parent, VBand band); + EqualizerLevel(TQWidget *parent, VBand band); public slots: void changed(); @@ -28,8 +28,8 @@ public slots: private: VBand mBand; - QSlider *mSlider; - QLabel *mLabel; + TQSlider *mSlider; + TQLabel *mLabel; }; @@ -37,24 +37,24 @@ class PresetList : public KListView { Q_OBJECT public: - PresetList(QWidget *parent, const char *name=0); + PresetList(TQWidget *parent, const char *name=0); public: - void rename(QListViewItem *item, int c); + void rename(TQListViewItem *item, int c); }; class EqualizerView : public KDialogBase { Q_OBJECT - QPtrList<EqualizerLevel> mBands; + TQPtrList<EqualizerLevel> mBands; public: EqualizerView(); virtual void show(); - QListViewItem *itemFor(const QString &filename); - QListViewItem *itemFor(const VPreset &preset); + TQListViewItem *itemFor(const TQString &filename); + TQListViewItem *itemFor(const VPreset &preset); public slots: void setPreamp(int); @@ -71,19 +71,19 @@ private slots: void remove(); void create(); void reset(); - void rename(QListViewItem *); - void select(QListViewItem*); + void rename(TQListViewItem *); + void select(TQListViewItem*); private: bool first; EqualizerWidget *mWidget; - QHBoxLayout *bandsLayout; -// QCheckBox *mOn; -// QSlider *mPreamp; + TQHBoxLayout *bandsLayout; +// TQCheckBox *mOn; +// TQSlider *mPreamp; PresetList *mPresets; bool mGoingPreset; -// QPushButton *mRemovePreset, *mAddPreset; -// QFrame *mSliders; +// TQPushButton *mRemovePreset, *mAddPreset; +// TQFrame *mSliders; // KIntNumInput *mBandCount; }; diff --git a/noatun/library/globalvideo.h b/noatun/library/globalvideo.h index e0f28cb0..c070ab30 100644 --- a/noatun/library/globalvideo.h +++ b/noatun/library/globalvideo.h @@ -7,7 +7,7 @@ class GlobalVideo : public QWidget { Q_OBJECT - QPopupMenu *menu; + TQPopupMenu *menu; VideoFrame *video; public: @@ -19,7 +19,7 @@ public slots: void slotAdaptSize(int w, int h); protected: - void mouseReleaseEvent(QMouseEvent *e); + void mouseReleaseEvent(TQMouseEvent *e); }; diff --git a/noatun/library/ksaver.cpp b/noatun/library/ksaver.cpp index f1cc6a61..40b3606c 100644 --- a/noatun/library/ksaver.cpp +++ b/noatun/library/ksaver.cpp @@ -39,11 +39,11 @@ public: KSaverPrivate() : isLocal(true), tempFile(0), file(0), textStream(0), dataStream(0) {}; bool isLocal; KTempFile *tempFile; - QFile *file; + TQFile *file; KURL url; - QString error; - QTextStream *textStream; - QDataStream *dataStream; + TQString error; + TQTextStream *textStream; + TQDataStream *dataStream; }; Noatun::KSaver::KSaver(const KURL &_target) @@ -54,7 +54,7 @@ Noatun::KSaver::KSaver(const KURL &_target) if(d->url.protocol() == "file") { d->isLocal = true; - d->file = new QFile(d->url.path()); + d->file = new TQFile(d->url.path()); } else { @@ -124,22 +124,22 @@ bool Noatun::KSaver::close(void) } } -QString Noatun::KSaver::error(void) +TQString Noatun::KSaver::error(void) { return d->error; } -QFile &Noatun::KSaver::file(void) +TQFile &Noatun::KSaver::file(void) { if(d->isLocal && d->file) return *d->file; else if(!d->isLocal && d->tempFile) return *d->tempFile->file(); else - return *static_cast<QFile *>(0); + return *static_cast<TQFile *>(0); } -QTextStream &Noatun::KSaver::textStream() +TQTextStream &Noatun::KSaver::textStream() { if(d->textStream) { @@ -147,7 +147,7 @@ QTextStream &Noatun::KSaver::textStream() } else if(d->isLocal && d->file) { - d->textStream = new QTextStream(d->file); + d->textStream = new TQTextStream(d->file); return *d->textStream; } else if(!d->isLocal && d->tempFile) @@ -157,11 +157,11 @@ QTextStream &Noatun::KSaver::textStream() } else { - return *static_cast<QTextStream *>(0); + return *static_cast<TQTextStream *>(0); } } -QDataStream &Noatun::KSaver::dataStream() +TQDataStream &Noatun::KSaver::dataStream() { if(d->dataStream) { @@ -169,7 +169,7 @@ QDataStream &Noatun::KSaver::dataStream() } else if(d->isLocal && d->file) { - d->dataStream = new QDataStream(d->file); + d->dataStream = new TQDataStream(d->file); return *d->dataStream; } else if(!d->isLocal && d->tempFile) @@ -179,6 +179,6 @@ QDataStream &Noatun::KSaver::dataStream() } else { - return *static_cast<QDataStream *>(0); + return *static_cast<TQDataStream *>(0); } } diff --git a/noatun/library/ksaver.h b/noatun/library/ksaver.h index e55b2c0d..91fc4af8 100644 --- a/noatun/library/ksaver.h +++ b/noatun/library/ksaver.h @@ -25,10 +25,10 @@ #define KSAVER_H #include <kurl.h> -#include <qfile.h> -#include <qstring.h> -#include <qtextstream.h> -#include <qdatastream.h> +#include <tqfile.h> +#include <tqstring.h> +#include <tqtextstream.h> +#include <tqdatastream.h> namespace Noatun { @@ -42,7 +42,7 @@ class KSaver public: /** * The constructor takes the url and decides the best way to save, - * which will mean using something like KIO::NetAccess or QFile. + * which will mean using something like KIO::NetAccess or TQFile. */ KSaver(const KURL &_target); @@ -69,29 +69,29 @@ public: * If open or close returns false, there was an error, and error * returns what the error was, when available. */ - QString error(void); + TQString error(void); /** - * file returns a QFile open for writing, which may be for a temporary + * file returns a TQFile open for writing, which may be for a temporary * file on the local filesystem. * * If this is called before the file is opened, you will crash. */ - QFile &file(void); + TQFile &file(void); /** * You can use this to write out your data. * * If this is called before the file is opened, you will crash. */ - QTextStream &textStream(void); + TQTextStream &textStream(void); /** * You can use this to write out your data. * * If this is called before the file is opened, you will crash. */ - QDataStream &dataStream(void); + TQDataStream &dataStream(void); private: class KSaverPrivate; KSaverPrivate *d; diff --git a/noatun/library/mimetypetree.cpp b/noatun/library/mimetypetree.cpp index c2b60c81..0370b048 100644 --- a/noatun/library/mimetypetree.cpp +++ b/noatun/library/mimetypetree.cpp @@ -1,54 +1,54 @@ #include "mimetypetree.h" #include <kmimetype.h> -#include <qdict.h> -#include <qheader.h> +#include <tqdict.h> +#include <tqheader.h> -MimeTypeTree::MimeTypeTree(QWidget *parent) +MimeTypeTree::MimeTypeTree(TQWidget *parent) : KListView(parent) { KMimeType::List list=KMimeType::allMimeTypes(); - QDict<QListViewItem> map; + TQDict<TQListViewItem> map; setRootIsDecorated(true); addColumn("-"); header()->hide(); - QValueListIterator<KMimeType::Ptr> i(list.begin()); + TQValueListIterator<KMimeType::Ptr> i(list.begin()); for (; i != list.end(); ++i) { - QString mimetype = (*i)->name(); + TQString mimetype = (*i)->name(); int slash = mimetype.find("/"); - QString major = mimetype.left(slash); + TQString major = mimetype.left(slash); // hide all and inode majors if (major == "all" || major=="inode") continue; - QString minor = mimetype.mid(slash+1); - QListViewItem *majorItem=map[major]; + TQString minor = mimetype.mid(slash+1); + TQListViewItem *majorItem=map[major]; if (!majorItem) { majorItem=addMajor(major); map.insert(major, majorItem); } - new QListViewItem(majorItem, minor); + new TQListViewItem(majorItem, minor); } } -void MimeTypeTree::sel(QListViewItem *item) +void MimeTypeTree::sel(TQListViewItem *item) { - QListViewItem *p=item->parent(); + TQListViewItem *p=item->parent(); if (!p) return; - QString major=p->text(0); - QString minor=item->text(0); + TQString major=p->text(0); + TQString minor=item->text(0); emit selected(major+'/'+minor); } -QListViewItem* MimeTypeTree::addMajor(const QString &name) +TQListViewItem* MimeTypeTree::addMajor(const TQString &name) { - return new QListViewItem(this, name); + return new TQListViewItem(this, name); } diff --git a/noatun/library/mimetypetree.h b/noatun/library/mimetypetree.h index 1f315526..92af43ec 100644 --- a/noatun/library/mimetypetree.h +++ b/noatun/library/mimetypetree.h @@ -20,15 +20,15 @@ class MimeTypeTree : public KListView { Q_OBJECT public: - MimeTypeTree(QWidget *parent); + MimeTypeTree(TQWidget *parent); private: - QListViewItem *addMajor(const QString &name); + TQListViewItem *addMajor(const TQString &name); private slots: - void sel(QListViewItem *item); + void sel(TQListViewItem *item); signals: - void selected(const QString &mimetype); + void selected(const TQString &mimetype); }; #endif diff --git a/noatun/library/noatun/app.h b/noatun/library/noatun/app.h index c4effa4d..0b8af3ee 100644 --- a/noatun/library/noatun/app.h +++ b/noatun/library/noatun/app.h @@ -56,20 +56,20 @@ public: /** * @return a list of mimetypes aRts (and thus Noatun) can play - * KFileDialog accepts this QString instead of the shell globs in + * KFileDialog accepts this TQString instead of the shell globs in * its static functions, make use of it :) **/ - QString mimeTypes(); + TQString mimeTypes(); LibraryLoader *libraryLoader() const { return mLibraryLoader; } Downloader *downloader() const { return mDownloader; } - static QImage readPNG(const QString &filename); + static TQImage readPNG(const TQString &filename); Effects *effects() const; ::Equalizer *equalizer() const { return mEqualizer; } ::VEqualizer *vequalizer(); KDialogBase *equalizerView() const { return mEqualizerView; } - QCString version() const; + TQCString version() const; virtual void commitData(QSessionManager &); virtual void saveState(QSessionManager &); @@ -121,7 +121,7 @@ public: //options int startupPlayMode() const; bool loopList() const; bool oneInstance() const; - QString saveDirectory() const; + TQString saveDirectory() const; /** * @deprecated * now merged with clearOnOpen() @@ -138,7 +138,7 @@ public: //options * software mixing is active **/ bool fastMixer() const; - QString titleFormat() const; + TQString titleFormat() const; /** * @return true if remaining time is displayed to the user, false if * played time is displayed @@ -152,7 +152,7 @@ public: //options */ void setAutoPlay(bool); void setStartupPlayMode(int mode); - void setSaveDirectory(const QString &); + void setSaveDirectory(const TQString &); void setRememberPositions(bool); /** * @deprecated @@ -171,7 +171,7 @@ public: //options **/ void setFastMixer(bool); - void setTitleFormat(const QString &); + void setTitleFormat(const TQString &); /** * Pass true if remaining time should be displayed to the user, false if @@ -192,7 +192,7 @@ public: //options * * @return the ID associated with the menu item, for use in pluginMenuRemove() **/ - int pluginMenuAdd(const QString &text, const QObject *receiver, const char *member); + int pluginMenuAdd(const TQString &text, const TQObject *receiver, const char *member); /** * @deprecated diff --git a/noatun/library/noatun/controls.h b/noatun/library/noatun/controls.h index 6db8d1cd..27186c08 100644 --- a/noatun/library/noatun/controls.h +++ b/noatun/library/noatun/controls.h @@ -1,12 +1,12 @@ #ifndef __CONTROLS_H #define __CONTROLS_H -#include <qguardedptr.h> +#include <tqguardedptr.h> #include <kaction.h> #include <ktoolbar.h> -#include <qslider.h> -#include <qstringlist.h> +#include <tqslider.h> +#include <tqstringlist.h> #include <kdemacros.h> class QComboBox; @@ -16,7 +16,7 @@ class QLabel; * A slider that can be moved around while being * changed internally * - * @short Special QSlider based class suitable for time sliders + * @short Special TQSlider based class suitable for time sliders * @author Charles Samuels * @version 2.3 **/ @@ -24,10 +24,10 @@ class KDE_EXPORT L33tSlider : public QSlider { Q_OBJECT public: - L33tSlider(QWidget * parent, const char * name=0); - L33tSlider(Orientation, QWidget * parent, const char * name=0); + L33tSlider(TQWidget * parent, const char * name=0); + L33tSlider(Orientation, TQWidget * parent, const char * name=0); L33tSlider(int minValue, int maxValue, int pageStep, int value, - Orientation, QWidget * parent, const char * name=0); + Orientation, TQWidget * parent, const char * name=0); bool currentlyPressed() const; signals: @@ -40,9 +40,9 @@ public slots: virtual void setValue(int); protected: - virtual void mousePressEvent(QMouseEvent*); - virtual void mouseReleaseEvent(QMouseEvent*); - virtual void wheelEvent(QWheelEvent *); + virtual void mousePressEvent(TQMouseEvent*); + virtual void mouseReleaseEvent(TQMouseEvent*); + virtual void wheelEvent(TQWheelEvent *); private: bool pressed; @@ -57,11 +57,11 @@ class SliderAction : public KAction { Q_OBJECT public: - SliderAction(const QString& text, int accel, const QObject *receiver, - const char *member, QObject* parent, const char* name ); - virtual int plug( QWidget *w, int index = -1 ); - virtual void unplug( QWidget *w ); - QSlider* slider() const { return m_slider; } + SliderAction(const TQString& text, int accel, const TQObject *receiver, + const char *member, TQObject* parent, const char* name ); + virtual int plug( TQWidget *w, int index = -1 ); + virtual void unplug( TQWidget *w ); + TQSlider* slider() const { return m_slider; } signals: void plugged(); @@ -70,9 +70,9 @@ public slots: void toolbarMoved(KToolBar::BarPosition pos); private: - QGuardedPtr<QSlider> m_slider; - QStringList m_items; - const QObject *m_receiver; + TQGuardedPtr<TQSlider> m_slider; + TQStringList m_items; + const TQObject *m_receiver; const char *m_member; }; diff --git a/noatun/library/noatun/downloader.h b/noatun/library/noatun/downloader.h index c281a006..624518d0 100644 --- a/noatun/library/noatun/downloader.h +++ b/noatun/library/noatun/downloader.h @@ -2,8 +2,8 @@ #define _DOWNLOADER_H #include <kurl.h> -#include <qobject.h> -#include <qptrlist.h> +#include <tqobject.h> +#include <tqptrlist.h> class QFile; class QTimer; @@ -31,9 +31,9 @@ public: /** * @return the local filename this item will be saved to **/ - QString localFilename() const; + TQString localFilename() const; - virtual void setLocalFilename(const QString &filename); + virtual void setLocalFilename(const TQString &filename); /** * Called if this item has been fully downloaded @@ -57,7 +57,7 @@ public: void dequeue(); private: - QString mLocalFilename; + TQString mLocalFilename; }; /** @@ -70,15 +70,15 @@ Q_OBJECT { DownloadItem *notifier; KURL file; - QString local; + TQString local; }; public: - Downloader(QObject *parent=0); + Downloader(TQObject *parent=0); virtual ~Downloader(); public slots: - QString enqueue(DownloadItem *notifier, const KURL &file); + TQString enqueue(DownloadItem *notifier, const KURL &file); void dequeue(DownloadItem *notifier); /** @@ -101,18 +101,18 @@ signals: private slots: void getNext(); - void data( KIO::Job *, const QByteArray &data); + void data( KIO::Job *, const TQByteArray &data); void percent( KIO::Job *, unsigned long percent); void jobDone( KIO::Job *); void giveUpWithThisDownloadServerIsRunningNT(); private: - QPtrList<Downloader::QueueItem> mQueue; - QPtrList<Downloader::QueueItem> *mUnstartedQueue; - QFile *localfile; + TQPtrList<Downloader::QueueItem> mQueue; + TQPtrList<Downloader::QueueItem> *mUnstartedQueue; + TQFile *localfile; Downloader::QueueItem *current; KIO::TransferJob *mJob; - QTimer *mTimeout; + TQTimer *mTimeout; bool mStarted; }; diff --git a/noatun/library/noatun/effects.h b/noatun/library/noatun/effects.h index c39cb8aa..4c014a93 100644 --- a/noatun/library/noatun/effects.h +++ b/noatun/library/noatun/effects.h @@ -1,10 +1,10 @@ #ifndef EFFECTS_H #define EFFECTS_H -#include <qptrlist.h> -#include <qcstring.h> -#include <qstrlist.h> -#include <qobject.h> +#include <tqptrlist.h> +#include <tqcstring.h> +#include <tqstrlist.h> +#include <tqobject.h> namespace Arts { class StereoEffect; } class Engine; @@ -48,12 +48,12 @@ public: /** * Get the name of the object. **/ - QCString name() const; + TQCString name() const; /** * get the "clean" title of effect **/ - QString title() const; + TQString title() const; /** * @return true if this effect name is invalid, false otherwise @@ -69,7 +69,7 @@ public: * set an icon and make it purdy. Otherwise * create a plan widget that you can reparent. **/ - QWidget *configure(bool friendly=true); + TQWidget *configure(bool friendly=true); /** * Does this widget have a configurable @@ -82,12 +82,12 @@ public: * Return an effect name that can be presented to a user * i.e. Arts::FREEVERB will end up as FREEVERB **/ - static QString clean(const QCString &name); + static TQString clean(const TQCString &name); private: long mId; Arts::StereoEffect *mEffect; - QCString mName; - QWidget *mConfig; + TQCString mName; + TQWidget *mConfig; }; /** @@ -137,12 +137,12 @@ public: * each of these can be given to the first * argument of the Effect constructor **/ - QStrList available() const; + TQStrList available() const; /** * A list of all available effects objects **/ - QPtrList<Effect> effects() const; + TQPtrList<Effect> effects() const; /** * Get the Effect that has the following id @@ -150,7 +150,7 @@ public: Effect *findId(long id) const; private: - QPtrListIterator<Effect> stackPosition() const; + TQPtrListIterator<Effect> stackPosition() const; signals: /** @@ -177,7 +177,7 @@ signals: private: // stored in no specific order - QPtrList<Effect> mItems; + TQPtrList<Effect> mItems; }; diff --git a/noatun/library/noatun/engine.h b/noatun/library/noatun/engine.h index 2244fa1e..b47eb087 100644 --- a/noatun/library/noatun/engine.h +++ b/noatun/library/noatun/engine.h @@ -1,7 +1,7 @@ #ifndef _ENGINE_H #define _ENGINE_H -#include <qobject.h> +#include <tqobject.h> #include <kurl.h> #include <arts/kmedia2.h> #include <noatun/playlist.h> @@ -35,7 +35,7 @@ class KDE_EXPORT Engine : public QObject Q_OBJECT friend class NoatunApp; public: - Engine(QObject *parent=0); + Engine(TQObject *parent=0); ~Engine(); void setInitialized(); bool initialized() const; @@ -78,9 +78,9 @@ signals: void aboutToPlay(); void receivedStreamMeta( - const QString &streamName, const QString &streamGenre, - const QString &streamUrl, const QString &streamBitrate, - const QString &trackTitle, const QString &trackUrl + const TQString &streamName, const TQString &streamGenre, + const TQString &streamUrl, const TQString &streamBitrate, + const TQString &trackTitle, const TQString &trackUrl ); void playingFailed(); diff --git a/noatun/library/noatun/equalizer.h b/noatun/library/noatun/equalizer.h index 10de88c5..d048d21d 100644 --- a/noatun/library/noatun/equalizer.h +++ b/noatun/library/noatun/equalizer.h @@ -1,8 +1,8 @@ #ifndef NOATUN_EQUALIZER_H #define NOATUN_EQUALIZER_H -#include <qptrlist.h> -#include <qobject.h> +#include <tqptrlist.h> +#include <tqobject.h> #include <kurl.h> #include <noatun/vequalizer.h> @@ -20,23 +20,23 @@ class Preset { friend class Equalizer; - Preset(const QString &file); + Preset(const TQString &file); Preset(); Preset(VPreset p); public: - QString name() const; - bool setName(const QString &name); + TQString name() const; + bool setName(const TQString &name); bool save() const; bool load(); void remove(); - QString file() const; + TQString file() const; VPreset &vpreset() const; private: - QString mFile; + TQString mFile; }; /** @@ -49,7 +49,7 @@ private: class Band { friend class Equalizer; -friend class QPtrList<Band>; +friend class TQPtrList<Band>; private: Band(); @@ -75,12 +75,12 @@ public: **/ int center() const; - QString formatStart(bool withHz=true) const; - QString formatEnd(bool withHz=true) const; + TQString formatStart(bool withHz=true) const; + TQString formatEnd(bool withHz=true) const; /** * return the format for center() **/ - QString format(bool withHz=true) const; + TQString format(bool withHz=true) const; private: int mOffset; @@ -110,7 +110,7 @@ public: Equalizer(); ~Equalizer(); - const QPtrList<Band> &bands() const; + const TQPtrList<Band> &bands() const; Band *band(int num) const; int bandCount() const; @@ -141,7 +141,7 @@ public: * pattern. Nevertheless, the file can be identified * by magic, so it's not required **/ - bool save(const KURL &file, const QString &friendly) const; + bool save(const KURL &file, const TQString &friendly) const; /** * restore the EQ settings from this file @@ -154,14 +154,14 @@ public: * * @see fromString **/ - QString toString(const QString &name="stored") const; + TQString toString(const TQString &name="stored") const; /** * undo a toString, restoring the EQ * to the settings in the given string, * emitting the changed signals **/ - bool fromString(const QString &str); + bool fromString(const TQString &str); /** * create a preset with such a name @@ -171,16 +171,16 @@ public: * If smart is true, append a number to the end * of the name, if one already exists by the given **/ - Preset *createPreset(const QString &name, bool smart=true); + Preset *createPreset(const TQString &name, bool smart=true); /** * return all the presets * remember to setAutoDelete on this **/ - QPtrList<Preset> presets() const; + TQPtrList<Preset> presets() const; - Preset *preset(const QString &file); - bool presetExists(const QString &name) const; + Preset *preset(const TQString &file); + bool presetExists(const TQString &name) const; signals: void changed(Band *band); @@ -227,7 +227,7 @@ private: void update(bool full=false); private: - QPtrList<Band> mBands; + TQPtrList<Band> mBands; bool mUpdates; int mPreamp; }; diff --git a/noatun/library/noatun/player.h b/noatun/library/noatun/player.h index bccda62b..a61c2335 100644 --- a/noatun/library/noatun/player.h +++ b/noatun/library/noatun/player.h @@ -1,8 +1,8 @@ #ifndef PLAYER_H #define PLAYER_H -#include <qobject.h> -#include <qtimer.h> +#include <tqobject.h> +#include <tqtimer.h> #include <kurl.h> #include <noatun/playlist.h> #include <kdemacros.h> @@ -41,14 +41,14 @@ public: enum LoopType { None=0, Song, Playlist, Random }; public: - Player(QObject *parent=0); + Player(TQObject *parent=0); ~Player(); /** * @return a string with the time that can be used in the UI: * CC:CC/LL:LL (mm:ss) **/ - QString lengthString(int _position=-1); + TQString lengthString(int _position=-1); /** * @return LoopType enum **/ @@ -180,9 +180,9 @@ private slots: void posTimeout(); void aboutToPlay(); void slotUpdateStreamMeta( - const QString &streamName, const QString &streamGenre, - const QString &streamUrl, const QString &streamBitrate, - const QString &trackTitle, const QString &trackUrl + const TQString &streamName, const TQString &streamGenre, + const TQString &streamUrl, const TQString &streamBitrate, + const TQString &trackTitle, const TQString &trackUrl ); signals: @@ -257,12 +257,12 @@ signals: private: Engine *mEngine; - QTimer filePos; + TQTimer filePos; int position; int mLoopStyle; bool firstTimeout; PlaylistItem mCurrent; // TODO eliminate - QPtrList<PlaylistNotifier> mNotifiers; + TQPtrList<PlaylistNotifier> mNotifiers; }; diff --git a/noatun/library/noatun/playlist.h b/noatun/library/noatun/playlist.h index 37eabb0b..013d63a4 100644 --- a/noatun/library/noatun/playlist.h +++ b/noatun/library/noatun/playlist.h @@ -1,10 +1,10 @@ #ifndef NOATUNPLAYLIST_H #define NOATUNPLAYLIST_H -#include <qobject.h> +#include <tqobject.h> #include <kurl.h> -#include <qdict.h> -#include <qstringlist.h> +#include <tqdict.h> +#include <tqstringlist.h> #include <cassert> #include <kdemacros.h> @@ -35,7 +35,7 @@ public: /** * Noatun asks your playlist for properties. It is your - * responsiblity to store the information. But usually a QMap<QString,QString> + * responsiblity to store the information. But usually a TQMap<TQString,TQString> * is enough. * * If you return the default value, the default should not @@ -43,30 +43,30 @@ public: * * This returns the property, or def if such a property doesn't exist **/ - virtual QString property(const QString &key, const QString &def=0) const=0; + virtual TQString property(const TQString &key, const TQString &def=0) const=0; /** * This sets the property with the given key and value. * - * Important: If you use a QMap, you'll have to remove the current + * Important: If you use a TQMap, you'll have to remove the current * item before adding a new one **/ - virtual void setProperty(const QString &key, const QString &property)=0; + virtual void setProperty(const TQString &key, const TQString &property)=0; /** * remove the item with given key **/ - virtual void clearProperty(const QString &key)=0; + virtual void clearProperty(const TQString &key)=0; /** * return a list of property keys **/ - virtual QStringList properties() const=0; + virtual TQStringList properties() const=0; /** * return whether if the given key exists **/ - virtual bool isProperty(const QString &key) const=0; + virtual bool isProperty(const TQString &key) const=0; /** * return the title of the song. By default, this will @@ -78,7 +78,7 @@ public: * * you shouldn't need to override this. **/ - virtual QString title() const; + virtual TQString title() const; /** * the true filename of the song, remote or local @@ -93,18 +93,18 @@ public: * first, this checks for the property "mimetype", else * it'l ask KMimeType based on file() **/ - virtual QCString mimetype() const; + virtual TQCString mimetype() const; /** * first, checks for the property "playObject", else, * it'l ask aRts **/ - virtual QCString playObject() const; + virtual TQCString playObject() const; /** * return the filename to send to the playobject **/ - virtual QString file() const { return url().path(); } + virtual TQString file() const { return url().path(); } /** * what's the length of the song, in milliseconds? @@ -120,7 +120,7 @@ public: * returns a friendly representation of the length * of this file **/ - QString lengthString() const; + TQString lengthString() const; /** * compare yourself with the given PlaylistItemData @@ -243,31 +243,31 @@ public: bool operator !=(const PlaylistItemData *i) const { return ! (*this->data()==*i); } - QString property(const QString &key, const QString &def=0) const + TQString property(const TQString &key, const TQString &def=0) const { assert(mData); return mData->property(key, def); } - void setProperty(const QString &key, const QString &property) + void setProperty(const TQString &key, const TQString &property) { assert(mData); const_cast<PlaylistItemData*>(mData)->setProperty(key, property); } - void clearProperty(const QString &key) + void clearProperty(const TQString &key) { assert(mData); const_cast<PlaylistItemData*>(mData)->clearProperty(key); } - QStringList properties() const + TQStringList properties() const { assert(mData); return mData->properties(); } - bool isProperty(const QString &key) const + bool isProperty(const TQString &key) const { assert(mData); return mData->isProperty(key); @@ -280,11 +280,11 @@ public: const_cast<PlaylistItemData*>(mData)->setUrl(url); } - QCString mimetype() const { assert(mData); return mData->mimetype(); } - QCString playObject() const { assert(mData); return mData->playObject(); } - QString file() const { assert(mData); return mData->file(); } + TQCString mimetype() const { assert(mData); return mData->mimetype(); } + TQCString playObject() const { assert(mData); return mData->playObject(); } + TQString file() const { assert(mData); return mData->file(); } - QString title() const + TQString title() const { assert(mData); return mData->title(); @@ -302,7 +302,7 @@ public: mData->setLength(ms); } - QString lengthString() const { assert(mData); return mData->lengthString(); } + TQString lengthString() const { assert(mData); return mData->lengthString(); } void remove() { assert(mData); mData->remove(); } @@ -331,7 +331,7 @@ class Playlist : public QObject Q_OBJECT friend class PlaylistItemData; public: - Playlist(QObject *parent, const char *name); + Playlist(TQObject *parent, const char *name); /** * on playlist unload, your playlist must * have current()==0 and emit playCurrent @@ -432,8 +432,8 @@ public: * to the items in the playlist. The keys * are always compared with case sensitivity **/ - virtual QValueList<PlaylistItem> select( - const QStringList &keys, const QStringList &values, + virtual TQValueList<PlaylistItem> select( + const TQStringList &keys, const TQStringList &values, int limit=-1, bool exact=false, bool caseSensitive=false ); @@ -443,21 +443,21 @@ public: * both of these (with different mechanisms if need be) * for speed **/ - virtual QValueList<PlaylistItem> select( - const QString &key, const QString &value, + virtual TQValueList<PlaylistItem> select( + const TQString &key, const TQString &value, int limit=-1, bool exact=false, bool caseSensitive=false ); /** * exactly the same as the above, except converts - * the const char* to QString (utf8) + * the const char* to TQString (utf8) **/ - inline QValueList<PlaylistItem> select( + inline TQValueList<PlaylistItem> select( const char *key, const char *value, int limit=-1, bool exact=false, bool caseSensitive=false ) { return select( - QString(key), QString(value), + TQString(key), TQString(value), limit, exact, caseSensitive ); } diff --git a/noatun/library/noatun/playlistsaver.h b/noatun/library/noatun/playlistsaver.h index e83761ca..781b8fc6 100644 --- a/noatun/library/noatun/playlistsaver.h +++ b/noatun/library/noatun/playlistsaver.h @@ -2,7 +2,7 @@ #define NOATUNPLAYLISTSAVER_H #include <kurl.h> -#include <qmap.h> +#include <tqmap.h> #include <noatun/playlist.h> class Structure; @@ -52,7 +52,7 @@ public: * unused, for future expansion, do not use * @internal **/ - virtual void setGroup(const QString &); + virtual void setGroup(const TQString &); protected: /** @@ -60,7 +60,7 @@ protected: * Given is a list of properties which coincide * with the standard noatun ones **/ - virtual void readItem(const QMap<QString,QString> &properties) = 0; + virtual void readItem(const TQMap<TQString,TQString> &properties) = 0; /** * add this item to the XML file @@ -72,7 +72,7 @@ protected: * unused, for future expansion * @internal **/ - virtual void changeGroup(const QString &) {} + virtual void changeGroup(const TQString &) {} /** * this is called when you should either diff --git a/noatun/library/noatun/plugin.h b/noatun/library/noatun/plugin.h index f90dcc0d..2bd8c994 100644 --- a/noatun/library/noatun/plugin.h +++ b/noatun/library/noatun/plugin.h @@ -2,7 +2,7 @@ #define NPLUGIN_H #include <noatun/pluginloader.h> -#include <qmemarray.h> +#include <tqmemarray.h> #include <vector> #include <kdemacros.h> @@ -153,7 +153,7 @@ public: private: int mTimeout; TimerThingy *mTimerThingy; - QCString mVisualizationStack; + TQCString mVisualizationStack; Arts::SoundServerV2 *mServer; static Arts::Dispatcher *mDispatcher; static bool internalVis; @@ -408,7 +408,7 @@ Q_OBJECT friend class NoatunListenerNotif; public: - NoatunListener(QObject *parent=0); + NoatunListener(TQObject *parent=0); virtual ~NoatunListener(); signals: @@ -432,11 +432,11 @@ protected: class ExitNotifier : public NoatunListener { public: - ExitNotifier(int pid, QObject *parent=0); + ExitNotifier(int pid, TQObject *parent=0); virtual ~ExitNotifier(); private: - QCString appid; + TQCString appid; }; /** @@ -454,7 +454,7 @@ class BoolNotifier : public QObject { Q_OBJECT public: - BoolNotifier(bool *value, NoatunListener *listener, QObject *parent=0); + BoolNotifier(bool *value, NoatunListener *listener, TQObject *parent=0); private slots: void event() {*mValue=false;} diff --git a/noatun/library/noatun/pluginloader.h b/noatun/library/noatun/pluginloader.h index 611fe358..04c1b750 100644 --- a/noatun/library/noatun/pluginloader.h +++ b/noatun/library/noatun/pluginloader.h @@ -1,27 +1,27 @@ #ifndef PLUGIN_LOADER_H #define PLUGIN_LOADER_H -#include <qstring.h> -#include <qvaluelist.h> -#include <qstringlist.h> +#include <tqstring.h> +#include <tqvaluelist.h> +#include <tqstringlist.h> #include <noatun/app.h> #include <klibloader.h> -#include <qdict.h> +#include <tqdict.h> #include <kdemacros.h> struct NoatunLibraryInfo { - QString specfile; - QString filename; - QString author; - QString license; - QString type; - QString site; - QString email; - QString name; - QString comment; - QStringList require; + TQString specfile; + TQString filename; + TQString author; + TQString license; + TQString type; + TQString site; + TQString email; + TQString name; + TQString comment; + TQStringList require; }; bool operator ==(const NoatunLibraryInfo &, const NoatunLibraryInfo &); @@ -46,30 +46,30 @@ public: LibraryLoader(); ~LibraryLoader(); - QValueList<NoatunLibraryInfo> available() const; - QValueList<NoatunLibraryInfo> loaded() const; - QValueList<NoatunLibraryInfo> loadedByType(const QString &type) const; + TQValueList<NoatunLibraryInfo> available() const; + TQValueList<NoatunLibraryInfo> loaded() const; + TQValueList<NoatunLibraryInfo> loadedByType(const TQString &type) const; /** * loads all the enabled plugins **/ bool loadAll(void); - bool loadAll(const QStringList &); + bool loadAll(const TQStringList &); - bool isLoaded(const QString &spec) const; - void add(const QString &spec); - void setModules(const QStringList &mods); + bool isLoaded(const TQString &spec) const; + void add(const TQString &spec); + void setModules(const TQStringList &mods); /** * unload the plugin specified by spec **/ - bool remove(const QString &spec); + bool remove(const TQString &spec); /** * Same as the above, but does not call kapp->exit() even * when the last userinterface plugin is removed. Necessary * during session management (see marquis plugin). * ### BIC: merge with above with terminateOnLastUI = true */ - bool remove(const QString &spec, bool terminateOnLastUI); + bool remove(const TQString &spec, bool terminateOnLastUI); /** * unload the plugin that is referenced by @par plugin **/ @@ -83,15 +83,15 @@ public: * to see what plugins are required to show * (when required by another noatun-plugin) **/ - NoatunLibraryInfo getInfo(const QString &spec) const; - QPtrList<Plugin> plugins() const; + NoatunLibraryInfo getInfo(const TQString &spec) const; + TQPtrList<Plugin> plugins() const; private: - bool loadSO(const QString &spec); - void removeNow(const QString &spec); + bool loadSO(const TQString &spec); + void removeNow(const TQString &spec); private: - QDict<LibraryLoader::PluginLibrary> mLibHash; + TQDict<LibraryLoader::PluginLibrary> mLibHash; Playlist *mPlaylist; }; diff --git a/noatun/library/noatun/pref.h b/noatun/library/noatun/pref.h index 95be5e0e..5a7d056e 100644 --- a/noatun/library/noatun/pref.h +++ b/noatun/library/noatun/pref.h @@ -2,7 +2,7 @@ #define NOATUNPREF_H #include <kdialogbase.h> -#include <qptrlist.h> +#include <tqptrlist.h> #include <kdemacros.h> class CModule; @@ -19,7 +19,7 @@ public: /** * @internal **/ - NoatunPreferences(QWidget *); + NoatunPreferences(TQWidget *); public: /** @@ -44,7 +44,7 @@ private: class NoatunPreferencesPrivate; NoatunPreferencesPrivate *d; - QPtrList<CModule> mModules; + TQPtrList<CModule> mModules; }; /** @@ -65,7 +65,7 @@ public: * parent is the object that is this modules virtual-parent. * When that is deleted, this also will go away, automagically. **/ - CModule(const QString &name, const QString &description, const QString &icon, QObject *parent=0); + CModule(const TQString &name, const TQString &description, const TQString &icon, TQObject *parent=0); virtual ~CModule(); diff --git a/noatun/library/noatun/scrollinglabel.h b/noatun/library/noatun/scrollinglabel.h index 1615a64f..231d3158 100644 --- a/noatun/library/noatun/scrollinglabel.h +++ b/noatun/library/noatun/scrollinglabel.h @@ -23,7 +23,7 @@ #ifndef SCROLLING_LABEL_H #define SCROLLING_LABEL_H -#include <qwidget.h> +#include <tqwidget.h> /** * A clever label that scrolls its contents as soon as there is not enough * space to show everything at once. @@ -33,7 +33,7 @@ class ScrollingLabel : public QWidget Q_OBJECT public: - ScrollingLabel(const QString &initialText,QWidget *parent, + ScrollingLabel(const TQString &initialText,TQWidget *parent, const char * name = 0); virtual ~ScrollingLabel(); @@ -41,15 +41,15 @@ class ScrollingLabel : public QWidget * Sets the label's text * set @p time (ms) if you want to display a temporary message **/ - virtual void setText(const QString &text, int time = -1); + virtual void setText(const TQString &text, int time = -1); - virtual QSize sizeHint() const; - virtual QSize minimumSizeHint() const; + virtual TQSize sizeHint() const; + virtual TQSize minimumSizeHint() const; /** * @return the label's text. **/ - virtual QString text() const; + virtual TQString text() const; /** * Used to enable/disable scrolling manually @@ -58,8 +58,8 @@ class ScrollingLabel : public QWidget protected: - virtual void paintEvent(QPaintEvent *); - virtual void resizeEvent(QResizeEvent *); + virtual void paintEvent(TQPaintEvent *); + virtual void resizeEvent(TQResizeEvent *); protected slots: diff --git a/noatun/library/noatun/stdaction.h b/noatun/library/noatun/stdaction.h index 7cac67fe..bfa34164 100644 --- a/noatun/library/noatun/stdaction.h +++ b/noatun/library/noatun/stdaction.h @@ -21,7 +21,7 @@ class PlayAction : public KAction { Q_OBJECT public: - PlayAction(QObject *parent, const char *name); + PlayAction(TQObject *parent, const char *name); private slots: void playing(); void notplaying(); @@ -34,7 +34,7 @@ class PlaylistAction : public KToggleAction { Q_OBJECT public: - PlaylistAction(QObject *parent, const char *name); + PlaylistAction(TQObject *parent, const char *name); private slots: void shown(); void hidden(); @@ -48,7 +48,7 @@ class PluginActionMenu : public KActionMenu { Q_OBJECT public: - PluginActionMenu(QObject *parent, const char *name); + PluginActionMenu(TQObject *parent, const char *name); /** * inserts the given @p action into the action-menu * @param action the action to insert @@ -63,7 +63,7 @@ public: * Wrapper method for old Noatun API * <b>DON'T USE</b> **/ - int menuAdd(const QString &text, const QObject *receiver, const char *member); + int menuAdd(const TQString &text, const TQObject *receiver, const char *member); /** * Wrapper method for old Noatun API * <b>DON'T USE</b> @@ -81,12 +81,12 @@ class VisActionMenu : public KActionMenu { Q_OBJECT public: - VisActionMenu(QObject *parent, const char *name); + VisActionMenu(TQObject *parent, const char *name); private slots: void fillPopup(); void toggleVisPlugin(int); private: - QMap<int, QString>mSpecMap; + TQMap<int, TQString>mSpecMap; }; @@ -98,7 +98,7 @@ class LoopActionMenu : public KActionMenu { Q_OBJECT public: - LoopActionMenu(QObject *parent, const char *name); + LoopActionMenu(TQObject *parent, const char *name); private slots: void updateLooping(int); void loopNoneSelected(); @@ -116,48 +116,48 @@ private: /** * @return pointer to a KAction which opens the effects dialog on activation */ -KDE_EXPORT KAction *effects(QObject *parent = 0, const char *name = 0); +KDE_EXPORT KAction *effects(TQObject *parent = 0, const char *name = 0); /** * @return pointer to a KAction which opens the equalizer dialog on activation */ -KDE_EXPORT KAction *equalizer(QObject *parent = 0, const char *name = 0); +KDE_EXPORT KAction *equalizer(TQObject *parent = 0, const char *name = 0); /** * @return pointer to a KAction which goes back one track on activation */ -KDE_EXPORT KAction *back(QObject *parent = 0, const char *name = 0); +KDE_EXPORT KAction *back(TQObject *parent = 0, const char *name = 0); /** * @return pointer to a KAction which stops playback on activation */ -KDE_EXPORT KAction *stop(QObject *parent = 0, const char *name = 0); +KDE_EXPORT KAction *stop(TQObject *parent = 0, const char *name = 0); /** * @return pointer to a KAction which starts/pauses playback on activation */ -KDE_EXPORT KAction *playpause(QObject *parent = 0, const char *name = 0); +KDE_EXPORT KAction *playpause(TQObject *parent = 0, const char *name = 0); /** * @return pointer to a KAction which advances one track on activation */ -KDE_EXPORT KAction *forward(QObject *parent = 0, const char *name = 0); +KDE_EXPORT KAction *forward(TQObject *parent = 0, const char *name = 0); /** * @return pointer to a KToggleAction which shows/hides the playlist */ -KDE_EXPORT KToggleAction *playlist(QObject *parent = 0, const char *name = 0); +KDE_EXPORT KToggleAction *playlist(TQObject *parent = 0, const char *name = 0); /** * loop action **/ -KDE_EXPORT LoopActionMenu *loop(QObject *parent, const char *name); +KDE_EXPORT LoopActionMenu *loop(TQObject *parent, const char *name); /** * play action */ -KDE_EXPORT KAction *play(QObject *parent = 0, const char *name = 0); +KDE_EXPORT KAction *play(TQObject *parent = 0, const char *name = 0); /** * pause action */ -KDE_EXPORT KAction *pause(QObject *parent = 0, const char *name = 0); +KDE_EXPORT KAction *pause(TQObject *parent = 0, const char *name = 0); /** * @return pointer to the global PluginActionMenu object (there is only one instance) @@ -167,7 +167,7 @@ KDE_EXPORT PluginActionMenu *actions(); /** * @return pointer to a VisActionMenu object */ -KDE_EXPORT VisActionMenu *visualizations(QObject *parent = 0, const char *name = 0); +KDE_EXPORT VisActionMenu *visualizations(TQObject *parent = 0, const char *name = 0); /** * The global popupmenu of noatun, there's not two or three but only one of these :) @@ -176,7 +176,7 @@ KDE_EXPORT VisActionMenu *visualizations(QObject *parent = 0, const char *name = class KDE_EXPORT ContextMenu { public: - static KPopupMenu *createContextMenu(QWidget *p); + static KPopupMenu *createContextMenu(TQWidget *p); /** * One menu to show them all, One menu to find them @@ -189,7 +189,7 @@ public: /** * Show the context menu at point **/ - static void showContextMenu(const QPoint &); + static void showContextMenu(const TQPoint &); /** * show the context menu at the mouse's current position diff --git a/noatun/library/noatun/stereobuttonaction.h b/noatun/library/noatun/stereobuttonaction.h index ce423b64..d6d6edb9 100644 --- a/noatun/library/noatun/stereobuttonaction.h +++ b/noatun/library/noatun/stereobuttonaction.h @@ -14,12 +14,12 @@ class StereoButtonAction : public KAction { Q_OBJECT public: - StereoButtonAction(const QString& text, int accel = 0, QObject* parent = 0, const char* name = 0 ); - StereoButtonAction(const QString& text, int accel, const QObject* receiver, const char* slot, QObject* parent, const char* name = 0 ); - StereoButtonAction(const QString& text, const QIconSet& pix, int accel = 0, QObject* parent = 0, const char* name = 0 ); - StereoButtonAction(const QString& text, const QString& pix, int accel = 0, QObject* parent = 0, const char* name = 0 ); - StereoButtonAction(const QString& text, const QIconSet& pix, int accel, const QObject* receiver, const char* slot, QObject* parent, const char* name = 0 ); - StereoButtonAction(const QString& text, const QString& pix, int accel, const QObject* receiver, const char* slot, QObject* parent, const char* name = 0 ); + StereoButtonAction(const TQString& text, int accel = 0, TQObject* parent = 0, const char* name = 0 ); + StereoButtonAction(const TQString& text, int accel, const TQObject* receiver, const char* slot, TQObject* parent, const char* name = 0 ); + StereoButtonAction(const TQString& text, const TQIconSet& pix, int accel = 0, TQObject* parent = 0, const char* name = 0 ); + StereoButtonAction(const TQString& text, const TQString& pix, int accel = 0, TQObject* parent = 0, const char* name = 0 ); + StereoButtonAction(const TQString& text, const TQIconSet& pix, int accel, const TQObject* receiver, const char* slot, TQObject* parent, const char* name = 0 ); + StereoButtonAction(const TQString& text, const TQString& pix, int accel, const TQObject* receiver, const char* slot, TQObject* parent, const char* name = 0 ); public slots: void disable(void); void enable(void); diff --git a/noatun/library/noatun/vequalizer.h b/noatun/library/noatun/vequalizer.h index 73c421e1..d5ee7ecf 100644 --- a/noatun/library/noatun/vequalizer.h +++ b/noatun/library/noatun/vequalizer.h @@ -39,8 +39,8 @@ #ifndef NOATUN_VEQUALIZER_H #define NOATUN_VEQUALIZER_H -#include <qptrlist.h> -#include <qobject.h> +#include <tqptrlist.h> +#include <tqobject.h> #include <kurl.h> #include <kdemacros.h> class VBand; @@ -111,12 +111,12 @@ public: **/ int center() const; - QString formatStart(bool withHz=true) const; - QString formatEnd(bool withHz=true) const; + TQString formatStart(bool withHz=true) const; + TQString formatEnd(bool withHz=true) const; /** * return the format for center() **/ - QString format(bool withHz=true) const; + TQString format(bool withHz=true) const; }; @@ -134,7 +134,7 @@ public: * @short interpolated representation of Eq data * @author Charles Samuels **/ -class KDE_EXPORT VInterpolation : public QObject, public VBandsInterface +class KDE_EXPORT VInterpolation : public TQObject, public VBandsInterface { Q_OBJECT struct Private; @@ -173,7 +173,7 @@ class VPreset; * @short Noatun EQ * @author Charles Samuels **/ -class KDE_EXPORT VEqualizer : public QObject, public VBandsInterface +class KDE_EXPORT VEqualizer : public TQObject, public VBandsInterface { Q_OBJECT friend class VBand; @@ -197,7 +197,7 @@ public: * of each band, for example: { 40, 60, 100 } if * you hear up to 40hz **/ - static QValueList<int> frequencies(int num); + static TQValueList<int> frequencies(int num); /** * @return number of bands I have, which may be different @@ -243,7 +243,7 @@ public: // serialization * pattern. Nevertheless, the file can be identified * by magic, so it's not required **/ - bool save(const KURL &file, const QString &friendly) const; + bool save(const KURL &file, const TQString &friendly) const; /** * restore the EQ settings from this file @@ -256,14 +256,14 @@ public: // serialization * * @see fromString **/ - QString toString(const QString &name="stored") const; + TQString toString(const TQString &name="stored") const; /** * undo a toString, restoring the EQ * to the settings in the given string, * emitting the changed signals **/ - bool fromString(const QString &str); + bool fromString(const TQString &str); public: // presets /** @@ -274,31 +274,31 @@ public: // presets * If smart is true, append a number to the end * of the name, if one already exists by the given **/ - VPreset createPreset(const QString &name, bool smart=true); + VPreset createPreset(const TQString &name, bool smart=true); /** * return all the presets * remember to setAutoDelete on this **/ - QValueList<VPreset> presets() const; + TQValueList<VPreset> presets() const; /** * @returns the preset with the given name * or an invalid Preset if none exists **/ - VPreset presetByName(const QString &name); + VPreset presetByName(const TQString &name); /** * @returns the preset in the given file * or an invalid Preset if none exists **/ - VPreset presetByFile(const QString &file); + VPreset presetByFile(const TQString &file); /** * @returns whether a preset with the * given name exists **/ - bool presetExists(const QString &name) const; + bool presetExists(const TQString &name) const; signals: /** @@ -374,7 +374,7 @@ public slots: private: virtual int level(int index) const; virtual void setLevel(int index, int level); - void setLevels(const QValueList<int> &levels); + void setLevels(const TQValueList<int> &levels); private: /** @@ -405,7 +405,7 @@ class VPreset Private *d; void *_bc; - VPreset(const QString &file); + VPreset(const TQString &file); public: VPreset(); VPreset(const VPreset ©); @@ -416,7 +416,7 @@ public: /** * @returns the name of the preset, which is user visible **/ - QString name() const; + TQString name() const; /** * set the user-presentable name of the preset * @@ -425,12 +425,12 @@ public: * @returns success. If another preset is named * this, it'l fail. **/ - bool setName(const QString &name); + bool setName(const TQString &name); /** * @returns the file that this preset is in **/ - QString file() const; + TQString file() const; bool isValid() const; bool isNull() const { return !isValid(); } diff --git a/noatun/library/noatun/video.h b/noatun/library/noatun/video.h index 3655c489..e6fde310 100644 --- a/noatun/library/noatun/video.h +++ b/noatun/library/noatun/video.h @@ -15,12 +15,12 @@ Q_OBJECT struct Private; VideoFrame::Private *d; - static QPtrList<VideoFrame> frames; + static TQPtrList<VideoFrame> frames; static VideoFrame *whose; public: - VideoFrame(KXMLGUIClient *clientParent, QWidget *parent=0, const char *name=0, WFlags f=0); - VideoFrame(QWidget *parent = 0, const char *name=0, WFlags f=0); + VideoFrame(KXMLGUIClient *clientParent, TQWidget *parent=0, const char *name=0, WFlags f=0); + VideoFrame(TQWidget *parent = 0, const char *name=0, WFlags f=0); ~VideoFrame(); /** @@ -28,8 +28,8 @@ public: **/ static VideoFrame *playing(); - QPopupMenu *popupMenu(QWidget *parent); - QPopupMenu *popupMenu() { return popupMenu(this); } + TQPopupMenu *popupMenu(TQWidget *parent); + TQPopupMenu *popupMenu() { return popupMenu(this); } public slots: /** diff --git a/noatun/library/noatunlistview.h b/noatun/library/noatunlistview.h index 1571f64e..851751ef 100644 --- a/noatun/library/noatunlistview.h +++ b/noatun/library/noatunlistview.h @@ -1,5 +1,5 @@ // yeah yeah yeah.. fix qt and this can go away #define private protected -#include <qlistview.h> +#include <tqlistview.h> #undef private diff --git a/noatun/library/noatunstdaction.cpp b/noatun/library/noatunstdaction.cpp index f2837623..99b69cb3 100644 --- a/noatun/library/noatunstdaction.cpp +++ b/noatun/library/noatunstdaction.cpp @@ -9,8 +9,8 @@ #include <klocale.h> #include <kpopupmenu.h> #include <kstdaction.h> -#include <qcursor.h> -#include <qmap.h> +#include <tqcursor.h> +#include <tqmap.h> #include <kdebug.h> #include <kstdguiitem.h> @@ -21,12 +21,12 @@ namespace NoatunStdAction { ///////////////////////////////////////////////////// -PlayAction::PlayAction(QObject *parent, const char *name) - : KAction(i18n("Play"), 0, napp->player(), SLOT(playpause()), parent, name) +PlayAction::PlayAction(TQObject *parent, const char *name) + : KAction(i18n("Play"), 0, napp->player(), TQT_SLOT(playpause()), parent, name) { - connect(napp->player(), SIGNAL(playing()), SLOT(playing())); - connect(napp->player(), SIGNAL(paused()), SLOT(notplaying())); - connect(napp->player(), SIGNAL(stopped()), SLOT(notplaying())); + connect(napp->player(), TQT_SIGNAL(playing()), TQT_SLOT(playing())); + connect(napp->player(), TQT_SIGNAL(paused()), TQT_SLOT(notplaying())); + connect(napp->player(), TQT_SIGNAL(stopped()), TQT_SLOT(notplaying())); if (napp->player()->isPlaying()) playing(); else if (napp->player()->isPaused() || napp->player()->isStopped()) @@ -35,23 +35,23 @@ PlayAction::PlayAction(QObject *parent, const char *name) void PlayAction::playing() { - setIconSet(QIconSet(SmallIcon("player_pause"))); + setIconSet(TQIconSet(SmallIcon("player_pause"))); setText(i18n("Pause")); } void PlayAction::notplaying() { - setIconSet(QIconSet(SmallIcon("player_play"))); + setIconSet(TQIconSet(SmallIcon("player_play"))); setText(i18n("Play")); } ///////////////////////////////////////////////////// -PlaylistAction::PlaylistAction(QObject *parent, const char *name) - : KToggleAction(i18n("Show Playlist"), "playlist", 0, napp->player(), SLOT(toggleListView()), parent, name) +PlaylistAction::PlaylistAction(TQObject *parent, const char *name) + : KToggleAction(i18n("Show Playlist"), "playlist", 0, napp->player(), TQT_SLOT(toggleListView()), parent, name) { setCheckedState(i18n("Hide Playlist")); - connect(napp->player(), SIGNAL(playlistShown()), SLOT(shown())); - connect(napp->player(), SIGNAL(playlistHidden()), SLOT(hidden())); + connect(napp->player(), TQT_SIGNAL(playlistShown()), TQT_SLOT(shown())); + connect(napp->player(), TQT_SIGNAL(playlistHidden()), TQT_SLOT(hidden())); setChecked(napp->playlist()->listVisible()); } @@ -67,7 +67,7 @@ void PlaylistAction::hidden() //////////////////////////////////////////////////// -PluginActionMenu::PluginActionMenu(QObject *parent, const char *name) +PluginActionMenu::PluginActionMenu(TQObject *parent, const char *name) : KActionMenu(i18n("&Actions"), parent, name) { // kdDebug(66666) << k_funcinfo << "called" << endl; @@ -92,7 +92,7 @@ void PluginActionMenu::remove(KAction *action) setEnabled(false); } -int PluginActionMenu::menuAdd(const QString &text, const QObject *receiver, const char *member) +int PluginActionMenu::menuAdd(const TQString &text, const TQObject *receiver, const char *member) { // kdDebug(66666) << k_funcinfo << "called, mCount is currently at " << mCount << endl; setEnabled(true); @@ -111,11 +111,11 @@ void PluginActionMenu::menuRemove(int id) //////////////////////////////////////////////////// -VisActionMenu::VisActionMenu(QObject *parent, const char *name) +VisActionMenu::VisActionMenu(TQObject *parent, const char *name) : KActionMenu(i18n("&Visualizations"), parent, name) { - connect(popupMenu(), SIGNAL(aboutToShow()), this, SLOT(fillPopup())); - connect(popupMenu(), SIGNAL(activated(int)), this, SLOT(toggleVisPlugin(int))); + connect(popupMenu(), TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(fillPopup())); + connect(popupMenu(), TQT_SIGNAL(activated(int)), this, TQT_SLOT(toggleVisPlugin(int))); } void VisActionMenu::fillPopup() @@ -124,10 +124,10 @@ void VisActionMenu::fillPopup() popupMenu()->clear(); mSpecMap.clear(); - QValueList<NoatunLibraryInfo> available = napp->libraryLoader()->available(); - QValueList<NoatunLibraryInfo> loaded = napp->libraryLoader()->loaded(); + TQValueList<NoatunLibraryInfo> available = napp->libraryLoader()->available(); + TQValueList<NoatunLibraryInfo> loaded = napp->libraryLoader()->loaded(); - for(QValueList<NoatunLibraryInfo>::Iterator i = available.begin(); i != available.end(); ++i) + for(TQValueList<NoatunLibraryInfo>::Iterator i = available.begin(); i != available.end(); ++i) { if ((*i).type == "visualization") { @@ -143,7 +143,7 @@ void VisActionMenu::toggleVisPlugin(int id) if(!mSpecMap.contains(id)) return; - QString specfile = mSpecMap[id]; + TQString specfile = mSpecMap[id]; if(popupMenu()->isItemChecked(id)) { @@ -159,30 +159,30 @@ void VisActionMenu::toggleVisPlugin(int id) //////////////////////////////////////////////////// -LoopActionMenu::LoopActionMenu(QObject *parent, const char *name) +LoopActionMenu::LoopActionMenu(TQObject *parent, const char *name) : KActionMenu(i18n("&Loop"), parent, name) { - mLoopNone = new KRadioAction(i18n("&None"), QString::fromLocal8Bit("noatunloopnone"), - 0, this, SLOT(loopNoneSelected()), this, "loop_none"); + mLoopNone = new KRadioAction(i18n("&None"), TQString::fromLocal8Bit("noatunloopnone"), + 0, this, TQT_SLOT(loopNoneSelected()), this, "loop_none"); mLoopNone->setExclusiveGroup("loopType"); insert(mLoopNone); - mLoopSong = new KRadioAction(i18n("&Song"), QString::fromLocal8Bit("noatunloopsong"), - 0, this, SLOT(loopSongSelected()), this, "loop_song"); + mLoopSong = new KRadioAction(i18n("&Song"), TQString::fromLocal8Bit("noatunloopsong"), + 0, this, TQT_SLOT(loopSongSelected()), this, "loop_song"); mLoopSong->setExclusiveGroup("loopType"); insert(mLoopSong); - mLoopPlaylist = new KRadioAction(i18n("&Playlist"), QString::fromLocal8Bit("noatunloopplaylist"), - 0, this, SLOT(loopPlaylistSelected()), this, "loop_playlist"); + mLoopPlaylist = new KRadioAction(i18n("&Playlist"), TQString::fromLocal8Bit("noatunloopplaylist"), + 0, this, TQT_SLOT(loopPlaylistSelected()), this, "loop_playlist"); mLoopPlaylist->setExclusiveGroup("loopType"); insert(mLoopPlaylist); - mLoopRandom = new KRadioAction(i18n("&Random"), QString::fromLocal8Bit("noatunlooprandom"), - 0, this, SLOT(loopRandomSelected()), this, "loop_random"); + mLoopRandom = new KRadioAction(i18n("&Random"), TQString::fromLocal8Bit("noatunlooprandom"), + 0, this, TQT_SLOT(loopRandomSelected()), this, "loop_random"); mLoopRandom->setExclusiveGroup("loopType"); insert(mLoopRandom); - connect(napp->player(), SIGNAL(loopTypeChange(int)), this, SLOT(updateLooping(int))); + connect(napp->player(), TQT_SIGNAL(loopTypeChange(int)), this, TQT_SLOT(updateLooping(int))); updateLooping(static_cast<int>(napp->player()->loopStyle())); } @@ -232,32 +232,32 @@ void LoopActionMenu::loopRandomSelected() //////////////////////////////////////////////////// -KAction *playpause(QObject *parent, const char *name) +KAction *playpause(TQObject *parent, const char *name) { return new PlayAction(parent, name); } -KAction *effects(QObject *parent, const char *name) +KAction *effects(TQObject *parent, const char *name) { - return new KAction(i18n("&Effects..."), "effect", 0, napp, SLOT(effectView()), parent, name); + return new KAction(i18n("&Effects..."), "effect", 0, napp, TQT_SLOT(effectView()), parent, name); } -KAction *equalizer(QObject *parent, const char *name) +KAction *equalizer(TQObject *parent, const char *name) { - return new KAction(i18n("E&qualizer..."), "equalizer", 0, napp, SLOT(equalizerView()), parent, name); + return new KAction(i18n("E&qualizer..."), "equalizer", 0, napp, TQT_SLOT(equalizerView()), parent, name); } -KAction *back(QObject *parent, const char *name) +KAction *back(TQObject *parent, const char *name) { - return new KAction(i18n("&Back"), "player_start", 0, napp->player(), SLOT(back()), parent, name); + return new KAction(i18n("&Back"), "player_start", 0, napp->player(), TQT_SLOT(back()), parent, name); } -KAction *stop(QObject *parent, const char *name) +KAction *stop(TQObject *parent, const char *name) { - StereoButtonAction *action = new StereoButtonAction(i18n("Stop"), "player_stop", 0, napp->player(), SLOT(stop()), parent, name); - QObject::connect(napp->player(), SIGNAL(playing()), action, SLOT(enable())); - QObject::connect(napp->player(), SIGNAL(paused()), action, SLOT(enable())); - QObject::connect(napp->player(), SIGNAL(stopped()), action, SLOT(disable())); + StereoButtonAction *action = new StereoButtonAction(i18n("Stop"), "player_stop", 0, napp->player(), TQT_SLOT(stop()), parent, name); + TQObject::connect(napp->player(), TQT_SIGNAL(playing()), action, TQT_SLOT(enable())); + TQObject::connect(napp->player(), TQT_SIGNAL(paused()), action, TQT_SLOT(enable())); + TQObject::connect(napp->player(), TQT_SIGNAL(stopped()), action, TQT_SLOT(disable())); if(napp->player()->isStopped()) action->disable(); else @@ -265,17 +265,17 @@ KAction *stop(QObject *parent, const char *name) return action; } -KAction *forward(QObject *parent, const char *name) +KAction *forward(TQObject *parent, const char *name) { - return new KAction(i18n("&Forward"), "player_end", 0, napp->player(), SLOT(forward()), parent, name); + return new KAction(i18n("&Forward"), "player_end", 0, napp->player(), TQT_SLOT(forward()), parent, name); } -KAction *play(QObject *parent, const char *name) +KAction *play(TQObject *parent, const char *name) { - StereoButtonAction *action = new StereoButtonAction(i18n("&Play"), "player_play", 0, napp->player(), SLOT(playpause()), parent, name); - QObject::connect(napp->player(), SIGNAL(playing()), action, SLOT(disable())); - QObject::connect(napp->player(), SIGNAL(paused()), action, SLOT(enable())); - QObject::connect(napp->player(), SIGNAL(stopped()), action, SLOT(enable())); + StereoButtonAction *action = new StereoButtonAction(i18n("&Play"), "player_play", 0, napp->player(), TQT_SLOT(playpause()), parent, name); + TQObject::connect(napp->player(), TQT_SIGNAL(playing()), action, TQT_SLOT(disable())); + TQObject::connect(napp->player(), TQT_SIGNAL(paused()), action, TQT_SLOT(enable())); + TQObject::connect(napp->player(), TQT_SIGNAL(stopped()), action, TQT_SLOT(enable())); if(napp->player()->isPlaying()) action->disable(); else @@ -283,12 +283,12 @@ KAction *play(QObject *parent, const char *name) return action; } -KAction *pause(QObject *parent, const char *name) +KAction *pause(TQObject *parent, const char *name) { - StereoButtonAction *action = new StereoButtonAction(i18n("&Pause"), "player_pause", 0, napp->player(), SLOT(playpause()), parent, name); - QObject::connect(napp->player(), SIGNAL(playing()), action, SLOT(enable())); - QObject::connect(napp->player(), SIGNAL(paused()), action, SLOT(disable())); - QObject::connect(napp->player(), SIGNAL(stopped()), action, SLOT(disable())); + StereoButtonAction *action = new StereoButtonAction(i18n("&Pause"), "player_pause", 0, napp->player(), TQT_SLOT(playpause()), parent, name); + TQObject::connect(napp->player(), TQT_SIGNAL(playing()), action, TQT_SLOT(enable())); + TQObject::connect(napp->player(), TQT_SIGNAL(paused()), action, TQT_SLOT(disable())); + TQObject::connect(napp->player(), TQT_SIGNAL(stopped()), action, TQT_SLOT(disable())); if(napp->player()->isPlaying()) action->enable(); else @@ -296,7 +296,7 @@ KAction *pause(QObject *parent, const char *name) return action; } -LoopActionMenu *loop(QObject *parent, const char *name) +LoopActionMenu *loop(TQObject *parent, const char *name) { return new LoopActionMenu(parent, name); } @@ -307,12 +307,12 @@ PluginActionMenu *actions() return napp->pluginActionMenu(); } -VisActionMenu *visualizations(QObject *parent, const char *name) +VisActionMenu *visualizations(TQObject *parent, const char *name) { return new VisActionMenu(parent, name); } -KToggleAction *playlist(QObject *parent, const char *name) +KToggleAction *playlist(TQObject *parent, const char *name) { return new PlaylistAction(parent, name); } @@ -326,18 +326,18 @@ KPopupMenu *ContextMenu::contextMenu() return mContextMenu; } -KPopupMenu *ContextMenu::createContextMenu(QWidget *p) +KPopupMenu *ContextMenu::createContextMenu(TQWidget *p) { KPopupMenu *contextMenu = new KPopupMenu(p, "NoatunContextMenu"); KHelpMenu *helpmenu = new KHelpMenu(contextMenu, kapp->aboutData(), false); KActionCollection* actions = new KActionCollection(helpmenu); - KStdAction::open(napp, SLOT(fileOpen()), actions)->plug(contextMenu); - KStdAction::quit(napp, SLOT(quit()), actions)->plug(contextMenu); + KStdAction::open(napp, TQT_SLOT(fileOpen()), actions)->plug(contextMenu); + KStdAction::quit(napp, TQT_SLOT(quit()), actions)->plug(contextMenu); contextMenu->insertItem(SmallIcon("help"), KStdGuiItem::help().text(), helpmenu->menu()); contextMenu->insertSeparator(); - KStdAction::preferences(napp, SLOT(preferences()), actions)->plug(contextMenu); + KStdAction::preferences(napp, TQT_SLOT(preferences()), actions)->plug(contextMenu); NoatunStdAction::playlist(contextMenu)->plug(contextMenu); NoatunStdAction::effects(contextMenu)->plug(contextMenu); NoatunStdAction::equalizer(napp)->plug(contextMenu); @@ -347,14 +347,14 @@ KPopupMenu *ContextMenu::createContextMenu(QWidget *p) return contextMenu; } -void ContextMenu::showContextMenu(const QPoint &p) +void ContextMenu::showContextMenu(const TQPoint &p) { contextMenu()->exec(p); } void ContextMenu::showContextMenu() { - showContextMenu(QCursor::pos()); + showContextMenu(TQCursor::pos()); } } // END namespace NoatunStdAction diff --git a/noatun/library/noatuntags/tags.cpp b/noatun/library/noatuntags/tags.cpp index 38fd4abf..268f7bd9 100644 --- a/noatun/library/noatuntags/tags.cpp +++ b/noatun/library/noatuntags/tags.cpp @@ -1,22 +1,22 @@ #include "tags.h" #include "tagsgetter.h" #include <klocale.h> -#include <qslider.h> -#include <qspinbox.h> +#include <tqslider.h> +#include <tqspinbox.h> #include <kconfig.h> -#include <qlayout.h> -#include <qhbox.h> -#include <qlabel.h> -#include <qtimer.h> +#include <tqlayout.h> +#include <tqhbox.h> +#include <tqlabel.h> +#include <tqtimer.h> #include <noatun/player.h> -#include <qcheckbox.h> +#include <tqcheckbox.h> TagsGetter *Tags::getter=0; TagsGetter::TagsGetter() { new Control(this); - connect(napp->player(), SIGNAL(newSong()), SLOT(newSong())); + connect(napp->player(), TQT_SIGNAL(newSong()), TQT_SLOT(newSong())); } int TagsGetter::interval() const @@ -50,7 +50,7 @@ void TagsGetter::getSongs() startTimer(interval()); } -void TagsGetter::timerEvent(QTimerEvent *) +void TagsGetter::timerEvent(TQTimerEvent *) { if (!items.size()) { @@ -115,7 +115,7 @@ void TagsGetter::associate(Tags *t) tags.append(t); sortPriority(); // getSongs(); - QTimer::singleShot(interval(), this, SLOT(getSongs())); + TQTimer::singleShot(interval(), this, TQT_SLOT(getSongs())); } void TagsGetter::sortPriority() @@ -129,7 +129,7 @@ void TagsGetter::sortPriority() lowest=i->mPriority; } - QPtrList<Tags> sorted; + TQPtrList<Tags> sorted; while (tags.count()) { // find the one equal to myself @@ -183,41 +183,41 @@ Control::Control(TagsGetter *parent) // todo (void)I18N_NOOP("Rescan All Tags"); - QVBoxLayout *l=new QVBoxLayout(this); - QCheckBox *onPlay; + TQVBoxLayout *l=new TQVBoxLayout(this); + TQCheckBox *onPlay; { - onPlay=new QCheckBox(i18n("Load tags &automatically"), this); + onPlay=new TQCheckBox(i18n("Load tags &automatically"), this); l->addWidget(onPlay); onPlay->show(); } { - QHBox *intervalLine=new QHBox(this); + TQHBox *intervalLine=new TQHBox(this); l->addWidget(intervalLine); l->addStretch(); - new QLabel(i18n( + new TQLabel(i18n( "The time between each time noatun scans for a new file" ", and updates tags (e.g., ID3)", "Interval:"), intervalLine); - QSlider *slider=new QSlider( + TQSlider *slider=new TQSlider( 0, 2000, 100, 0, Horizontal, intervalLine ); - QSpinBox *spin=new QSpinBox( + TQSpinBox *spin=new TQSpinBox( 0, 2000, 10, intervalLine ); spin->setSuffix(i18n("Milliseconds", " ms")); - connect(slider, SIGNAL(valueChanged(int)), spin, SLOT(setValue(int))); - connect(spin, SIGNAL(valueChanged(int)), slider, SLOT(setValue(int))); + connect(slider, TQT_SIGNAL(valueChanged(int)), spin, TQT_SLOT(setValue(int))); + connect(spin, TQT_SIGNAL(valueChanged(int)), slider, TQT_SLOT(setValue(int))); slider->setValue(parent->interval()); - connect(slider, SIGNAL(valueChanged(int)), parent, SLOT(setInterval(int))); + connect(slider, TQT_SIGNAL(valueChanged(int)), parent, TQT_SLOT(setInterval(int))); - connect(onPlay, SIGNAL(toggled(bool)), intervalLine, SLOT(setEnabled(bool))); + connect(onPlay, TQT_SIGNAL(toggled(bool)), intervalLine, TQT_SLOT(setEnabled(bool))); } - connect(onPlay, SIGNAL(toggled(bool)), parent, SLOT(setLoadAuto(bool))); + connect(onPlay, TQT_SIGNAL(toggled(bool)), parent, TQT_SLOT(setLoadAuto(bool))); onPlay->setChecked(parent->loadAuto()); } diff --git a/noatun/library/noatuntags/tagsgetter.h b/noatun/library/noatuntags/tagsgetter.h index 269b7b90..8b6eddb9 100644 --- a/noatun/library/noatuntags/tagsgetter.h +++ b/noatun/library/noatuntags/tagsgetter.h @@ -1,13 +1,13 @@ #ifndef TAGSGET_H #define TAGSGET_H -#include <qobject.h> +#include <tqobject.h> #include <cmodule.h> -#include <qvaluelist.h> -#include <qptrlist.h> +#include <tqvaluelist.h> +#include <tqptrlist.h> #include "tags.h" -class TagsGetter : public QObject, public PlaylistNotifier +class TagsGetter : public TQObject, public PlaylistNotifier { Q_OBJECT public: @@ -24,7 +24,7 @@ public: //playlistnotifier virtual void removed(PlaylistItem &); protected: - void timerEvent(QTimerEvent *); + void timerEvent(TQTimerEvent *); private slots: // select the songs that need updating @@ -40,8 +40,8 @@ private: void sortPriority(); private: - QPtrList<Tags> tags; - QValueList<PlaylistItem> items; + TQPtrList<Tags> tags; + TQValueList<PlaylistItem> items; }; class Control : public CModule diff --git a/noatun/library/player.cpp b/noatun/library/player.cpp index 7760d9a8..0b90952c 100644 --- a/noatun/library/player.cpp +++ b/noatun/library/player.cpp @@ -8,28 +8,28 @@ #include <klibloader.h> #include <knotifyclient.h> #include <klocale.h> -#include <qfile.h> +#include <tqfile.h> enum ArtsPOS { posIdle=0, posPlaying, posPaused }; -Player::Player(QObject *parent) : QObject(parent, "Player"), +Player::Player(TQObject *parent) : TQObject(parent, "Player"), position(-1), mLoopStyle(None), firstTimeout(true) { mEngine=new Engine; - connect(&filePos, SIGNAL(timeout()), SLOT(posTimeout())); - connect(mEngine, SIGNAL(aboutToPlay()), this, SLOT(aboutToPlay())); + connect(&filePos, TQT_SIGNAL(timeout()), TQT_SLOT(posTimeout())); + connect(mEngine, TQT_SIGNAL(aboutToPlay()), this, TQT_SLOT(aboutToPlay())); connect(mEngine, - SIGNAL(receivedStreamMeta(const QString &, const QString &, - const QString &, const QString &, - const QString &, const QString &)), - this, SLOT( - slotUpdateStreamMeta(const QString &, const QString &, - const QString &, const QString &, - const QString &, const QString &)) + TQT_SIGNAL(receivedStreamMeta(const TQString &, const TQString &, + const TQString &, const TQString &, + const TQString &, const TQString &)), + this, TQT_SLOT( + slotUpdateStreamMeta(const TQString &, const TQString &, + const TQString &, const TQString &, + const TQString &, const TQString &)) ); - connect(mEngine, SIGNAL(playingFailed()), this, SLOT(forward())); + connect(mEngine, TQT_SIGNAL(playingFailed()), this, TQT_SLOT(forward())); handleButtons(); } @@ -231,13 +231,13 @@ void Player::posTimeout() emit timeout(); } -QString Player::lengthString(int _position) +TQString Player::lengthString(int _position) { if (!current()) - return QString("--:--/--:--"); + return TQString("--:--/--:--"); - QString posString; - QString lenString; + TQString posString; + TQString lenString; int secs, seconds, minutes; if (_position < 0) @@ -352,9 +352,9 @@ void Player::aboutToPlay() } void Player::slotUpdateStreamMeta( - const QString &streamName, const QString &streamGenre, - const QString &streamUrl, const QString &streamBitrate, - const QString &trackTitle, const QString &trackUrl) + const TQString &streamName, const TQString &streamGenre, + const TQString &streamUrl, const TQString &streamBitrate, + const TQString &trackTitle, const TQString &trackUrl) { PlaylistItem currentItem = napp->playlist()->current(); if(currentItem) diff --git a/noatun/library/playlist.cpp b/noatun/library/playlist.cpp index 4e729924..7cc28337 100644 --- a/noatun/library/playlist.cpp +++ b/noatun/library/playlist.cpp @@ -7,9 +7,9 @@ #include <kcmdlineargs.h> #include <kfile.h> #include <kmimetype.h> -#include <qregexp.h> +#include <tqregexp.h> #include <assert.h> -#include <qmetaobject.h> +#include <tqmetaobject.h> #include <kmedia2.h> #include <vector> @@ -22,7 +22,7 @@ PlaylistItemData::~PlaylistItemData() { } -QCString PlaylistItemData::mimetype() const +TQCString PlaylistItemData::mimetype() const { if (isProperty("mimetype")) return property("mimetype").latin1(); @@ -31,7 +31,7 @@ QCString PlaylistItemData::mimetype() const return mimetype->name().latin1(); } -QCString PlaylistItemData::playObject() const +TQCString PlaylistItemData::playObject() const { if (isProperty("playObject")) return property("playObject").latin1(); @@ -50,19 +50,19 @@ QCString PlaylistItemData::playObject() const delete offers; - return QCString(objectType.c_str()); + return TQCString(objectType.c_str()); } -QString PlaylistItemData::title() const +TQString PlaylistItemData::title() const { if (isProperty("realtitle")) return property("realtitle"); // "$(property)" - QString format=napp->titleFormat(); + TQString format=napp->titleFormat(); - QRegExp find("(?:(?:\\\\\\\\))*\\$\\((.*)"); + TQRegExp find("(?:(?:\\\\\\\\))*\\$\\((.*)"); int start=0; while (start != -1) @@ -76,7 +76,7 @@ QString PlaylistItemData::title() const // yes, so half the amount of backslashes // count how many there are first - QRegExp counter("([\\\\]+)"); + TQRegExp counter("([\\\\]+)"); counter.search(format, start-1); uint len=counter.cap(1).length()-1; @@ -91,7 +91,7 @@ QString PlaylistItemData::title() const if (format[start]=='\\') { // count how many there are first - QRegExp counter("([\\\\]+)"); + TQRegExp counter("([\\\\]+)"); counter.search(format, start); uint len=counter.cap(1).length(); @@ -101,8 +101,8 @@ QString PlaylistItemData::title() const } // "sth"foo"sth" - QString cont(find.cap(1)); - QString prefix,suffix,propname; + TQString cont(find.cap(1)); + TQString prefix,suffix,propname; unsigned int i=0; if (cont[i] == '"') { @@ -141,7 +141,7 @@ QString PlaylistItemData::title() const i++; - QString propval = property(propname); + TQString propval = property(propname); if (propname == "title" && !propval.length()) { propval = url().filename(); @@ -175,7 +175,7 @@ int PlaylistItemData::length() const void PlaylistItemData::setLength(int ms) { - setProperty("length", QString::number(ms)); + setProperty("length", TQString::number(ms)); } PlaylistItem::PlaylistItem(const PlaylistItem &source) @@ -246,14 +246,14 @@ void PlaylistItem::addRef() const mData->addRef(); } -QString PlaylistItemData::lengthString() const +TQString PlaylistItemData::lengthString() const { if ( length() == -1 ) // no file loaded - return QString("--:--"); + return TQString("--:--"); int secs = length()/1000; // convert milliseconds -> seconds int seconds = secs % 60; - return QString().sprintf("%.2d:%.2d", ((secs-seconds)/60), seconds); + return TQString().sprintf("%.2d:%.2d", ((secs-seconds)/60), seconds); } @@ -278,11 +278,11 @@ bool PlaylistItemData::operator != (const PlaylistItemData &d) const -Playlist::Playlist(QObject *parent, const char *name) : QObject(parent, name) +Playlist::Playlist(TQObject *parent, const char *name) : TQObject(parent, name) { - napp->player()->connect(this, SIGNAL(playCurrent()), SLOT(playCurrent())); - napp->player()->connect(this, SIGNAL(listHidden()), SIGNAL(playlistHidden())); - napp->player()->connect(this, SIGNAL(listShown()), SIGNAL(playlistShown())); + napp->player()->connect(this, TQT_SIGNAL(playCurrent()), TQT_SLOT(playCurrent())); + napp->player()->connect(this, TQT_SIGNAL(listHidden()), TQT_SIGNAL(playlistHidden())); + napp->player()->connect(this, TQT_SIGNAL(listShown()), TQT_SIGNAL(playlistShown())); } @@ -316,15 +316,15 @@ int Playlist::handleArguments() return i; } -QValueList<PlaylistItem> Playlist::select( - const QStringList &keys, const QStringList &values, +TQValueList<PlaylistItem> Playlist::select( + const TQStringList &keys, const TQStringList &values, int limit, bool exact, bool caseSensitive ) { - QValueList<PlaylistItem> list; - QString k; - QString v; - QStringList::ConstIterator key, val; + TQValueList<PlaylistItem> list; + TQString k; + TQString v; + TQStringList::ConstIterator key, val; for (PlaylistItem i(getFirst()); i && limit; i=getAfter(i)) { for (key = keys.begin(); key != keys.end() && limit ; ++key) @@ -371,13 +371,13 @@ QValueList<PlaylistItem> Playlist::select( return list; } -QValueList<PlaylistItem> Playlist::select( - const QString &key, const QString &value, +TQValueList<PlaylistItem> Playlist::select( + const TQString &key, const TQString &value, int limit, bool exact, bool caseSensitive ) { - QStringList keys(key); - QStringList values(value); + TQStringList keys(key); + TQStringList values(value); return select(keys, values, limit, exact, caseSensitive); } diff --git a/noatun/library/playlistsaver.cpp b/noatun/library/playlistsaver.cpp index 58f5d5d2..8b34deca 100644 --- a/noatun/library/playlistsaver.cpp +++ b/noatun/library/playlistsaver.cpp @@ -1,15 +1,15 @@ #include <noatun/playlistsaver.h> -#include <qdom.h> +#include <tqdom.h> #include <kio/netaccess.h> -#include <qfile.h> -#include <qtextstream.h> +#include <tqfile.h> +#include <tqtextstream.h> #include <noatun/app.h> #include "ksaver.h" #include <ksimpleconfig.h> #include <kmimetype.h> #include <klocale.h> -#include <qregexp.h> -#include <qxml.h> +#include <tqregexp.h> +#include <tqxml.h> #include <kdebug.h> PlaylistSaver::PlaylistSaver() @@ -71,7 +71,7 @@ bool PlaylistSaver::metalist(const KURL &url) { kdDebug(66666) << k_funcinfo << "url=" << url.url() << endl; - QString end=url.filename().right(3).lower(); + TQString end=url.filename().right(3).lower(); /* if (end=="mp3" || end=="ogg") // we want to download streams only { @@ -100,12 +100,12 @@ bool PlaylistSaver::metalist(const KURL &url) url.protocol().lower()=="http") { KMimeType::Ptr mimetype = KMimeType::findByURL(url); - QString type=mimetype->name(); + TQString type=mimetype->name(); if (type!="application/octet-stream") return false; - QMap<QString,QString> map; + TQMap<TQString,TQString> map; map["playObject"]="Arts::StreamPlayObject"; map["title"] = i18n("Stream from %1").arg(url.host()); @@ -138,29 +138,29 @@ bool PlaylistSaver::metalist(const KURL &url) bool PlaylistSaver::saveXML(const KURL &file, int ) { - QString localFile; + TQString localFile; if (file.isLocalFile()) - localFile = QFile::encodeName(file.path()); + localFile = TQFile::encodeName(file.path()); else localFile = napp->tempSaveName(file.path()); // QDom is a pain :) - QDomDocument doc("playlist"); - doc.setContent(QString("<!DOCTYPE XMLPlaylist><playlist version=\"1.0\" client=\"noatun\"/>")); + TQDomDocument doc("playlist"); + doc.setContent(TQString("<!DOCTYPE XMLPlaylist><playlist version=\"1.0\" client=\"noatun\"/>")); - QDomElement docElem=doc.documentElement(); + TQDomElement docElem=doc.documentElement(); reset(); PlaylistItem i; - QStringList props; + TQStringList props; while ((i=writeItem())) { // write all properties props=i.properties(); - QDomElement elem=doc.createElement("item"); - for (QStringList::Iterator pi(props.begin()); pi!=props.end(); ++pi) + TQDomElement elem=doc.createElement("item"); + for (TQStringList::Iterator pi(props.begin()); pi!=props.end(); ++pi) { - QString val=i.property(*pi); + TQString val=i.property(*pi); elem.setAttribute(*pi, val); if ((*pi)=="url") @@ -179,7 +179,7 @@ bool PlaylistSaver::saveXML(const KURL &file, int ) Noatun::KSaver saver(localFile); if (!saver.open()) return false; - saver.textStream().setEncoding(QTextStream::UnicodeUTF8); + saver.textStream().setEncoding(TQTextStream::UnicodeUTF8); saver.textStream() << doc.toString(); saver.close(); @@ -198,8 +198,8 @@ public: } bool startElement( - const QString&, const QString &, - const QString &name, const QXmlAttributes &a + const TQString&, const TQString &, + const TQString &name, const TQXmlAttributes &a ) { if (fresh) @@ -218,7 +218,7 @@ public: if (name != "item") return true; - QMap<QString,QString> propMap; + TQMap<TQString,TQString> propMap; for (int i=0; i<a.count(); i++) { @@ -237,18 +237,18 @@ public: PlaylistSaver *saver; bool fresh; bool inEntry, inTitle; - QMap<QString,QString> propMap; - QString mAbsPath; + TQMap<TQString,TQString> propMap; + TQString mAbsPath; - MSASXStructure(PlaylistSaver *s, const QString &absPath) + MSASXStructure(PlaylistSaver *s, const TQString &absPath) : saver(s), fresh(true), inEntry(false), inTitle(false), mAbsPath(absPath) { //kdDebug(66666) << k_funcinfo << endl; } - bool startElement(const QString&, const QString &, - const QString &name, const QXmlAttributes &a) + bool startElement(const TQString&, const TQString &, + const TQString &name, const TQXmlAttributes &a) { if (fresh) { @@ -290,12 +290,12 @@ public: { if(a.qName(i).lower()=="href") { - QString filename=a.value(i); - if (filename.find(QRegExp("^[a-zA-Z0-9]+:/"))==0) + TQString filename=a.value(i); + if (filename.find(TQRegExp("^[a-zA-Z0-9]+:/"))==0) { KURL url(filename); KMimeType::Ptr mimetype = KMimeType::findByURL(url); - QString type=mimetype->name(); + TQString type=mimetype->name(); if (type != "application/octet-stream") { propMap["url"]=filename; @@ -333,7 +333,7 @@ public: } else if(name.lower()=="param") { - QString keyName="", keyValue=""; + TQString keyName="", keyValue=""; for (int i=0; i<a.count(); i++) { @@ -382,7 +382,7 @@ public: return true; } - bool endElement(const QString&,const QString&, const QString& name) + bool endElement(const TQString&,const TQString&, const TQString& name) { // kdDebug(66666) << k_funcinfo << "name='" << name << "'" << endl; if (name.lower()=="entry") @@ -390,7 +390,7 @@ public: if(inEntry) { /* kdDebug(66666) << "</ENTRY> =====================" << endl; - for (QMap<QString,QString>::ConstIterator it=propMap.begin(); it!=propMap.end(); ++it ) + for (TQMap<TQString,TQString>::ConstIterator it=propMap.begin(); it!=propMap.end(); ++it ) kdDebug(66666) << "key='" << it.key() << "', val='" << it.data() << "'" << endl; */ saver->readItem(propMap); @@ -419,7 +419,7 @@ public: return true; } - bool characters(const QString &ch) + bool characters(const TQString &ch) { if(inTitle) { @@ -439,18 +439,18 @@ bool PlaylistSaver::loadXML(const KURL &url, int opt) kdDebug(66666) << k_funcinfo << "file='" << url.url() << "', opt=" << opt << endl; - QString dest; + TQString dest; if(KIO::NetAccess::download(url, dest, 0L)) { - QFile file(dest); + TQFile file(dest); if (!file.open(IO_ReadOnly)) return false; reset(); // QXml is horribly documented - QXmlInputSource source(&file); - QXmlSimpleReader reader; + TQXmlInputSource source(&file); + TQXmlSimpleReader reader; if (opt == ASX || url.path().right(4).lower()==".wax" || @@ -478,7 +478,7 @@ bool PlaylistSaver::loadM3U(const KURL &file, int /*opt*/) { kdDebug(66666) << k_funcinfo << "file='" << file.path() << endl; - QString localFile; + TQString localFile; if(!KIO::NetAccess::download(file, localFile, 0L)) return false; @@ -489,7 +489,7 @@ bool PlaylistSaver::loadM3U(const KURL &file, int /*opt*/) list.setGroup("playlist"); // some stupid Windows lusers like to be case insensitive - QStringList groups=list.groupList().grep(QRegExp("^playlist$", false)); + TQStringList groups=list.groupList().grep(TQRegExp("^playlist$", false)); if (groups.count()) { KURL l; @@ -499,14 +499,14 @@ bool PlaylistSaver::loadM3U(const KURL &file, int /*opt*/) } #endif - QFile saver(localFile); + TQFile saver(localFile); saver.open(IO_ReadOnly); - QTextStream t(&saver); + TQTextStream t(&saver); bool isExt = false; // flag telling if we load an EXTM3U file - QString filename; - QString extinf; - QMap<QString,QString> prop; + TQString filename; + TQString extinf; + TQMap<TQString,TQString> prop; reset(); while (!t.eof()) @@ -541,7 +541,7 @@ bool PlaylistSaver::loadM3U(const KURL &file, int /*opt*/) if (filename.isEmpty()) continue; - if (filename.find(QRegExp("^[a-zA-Z0-9]+:/"))==0) + if (filename.find(TQRegExp("^[a-zA-Z0-9]+:/"))==0) { //kdDebug(66666) << k_funcinfo << "url filename = " << filename << endl; @@ -591,9 +591,9 @@ bool PlaylistSaver::loadM3U(const KURL &file, int /*opt*/) int length = (extinf.left(timeTitleSep)).toInt(); if (length>0) - prop["length"]=QString::number(length*1000); + prop["length"]=TQString::number(length*1000); - QString displayTitle=extinf.mid(timeTitleSep+1); + TQString displayTitle=extinf.mid(timeTitleSep+1); if (!displayTitle.isEmpty()) { int artistTitleSep = displayTitle.find(" - ",0); @@ -628,14 +628,14 @@ bool PlaylistSaver::saveM3U(const KURL &file, int opt) bool isExt=(opt==EXTM3U); // easier ;) - QString local(napp->tempSaveName(file.path())); - QFile saver(local); + TQString local(napp->tempSaveName(file.path())); + TQFile saver(local); saver.open(IO_ReadWrite | IO_Truncate); - QTextStream t(&saver); + TQTextStream t(&saver); reset(); PlaylistItem i; - QStringList props; + TQStringList props; // this is more code but otoh faster than checking for isExt inside the loop if(isExt) @@ -647,7 +647,7 @@ bool PlaylistSaver::saveM3U(const KURL &file, int opt) int length = static_cast<int>(((i.property("length")).toInt())/1000); if(length==0) length=-1; // special value in an EXTM3U file, means "unknown" KURL u(i.property("url")); - QString title; + TQString title; // if a playlistitem is without a tag or ONLY title is set if((i.property("author").isEmpty() && i.property("title").isEmpty()) @@ -656,8 +656,8 @@ bool PlaylistSaver::saveM3U(const KURL &file, int opt) else title = i.property("author") + " - " + i.property("title"); -// kdDebug(66666) << "#EXTINF:"<< QString::number(length) << "," << title << endl; - t << "#EXTINF:"<< QString::number(length) << "," << title << '\n'; +// kdDebug(66666) << "#EXTINF:"<< TQString::number(length) << "," << title << endl; + t << "#EXTINF:"<< TQString::number(length) << "," << title << '\n'; if (u.isLocalFile()) t << u.path() << '\n'; @@ -683,9 +683,9 @@ bool PlaylistSaver::saveM3U(const KURL &file, int opt) return true; } -static QString findNoCase(const QMap<QString,QString> &map, const QString &key) +static TQString findNoCase(const TQMap<TQString,TQString> &map, const TQString &key) { - for (QMap<QString,QString>::ConstIterator i=map.begin(); i!=map.end(); ++i) + for (TQMap<TQString,TQString>::ConstIterator i=map.begin(); i!=map.end(); ++i) { if (i.key().lower() == key.lower()) return i.data(); @@ -697,14 +697,14 @@ bool PlaylistSaver::loadPLS(const KURL &file, int /*opt*/) { kdDebug(66666) << k_funcinfo << "file='" << file.path() << endl; - QString localFile; + TQString localFile; if(!KIO::NetAccess::download(file, localFile, 0L)) return false; - QFile checkFile(localFile); + TQFile checkFile(localFile); checkFile.open(IO_ReadOnly); - QTextStream t(&checkFile); - QString firstLine = t.readLine(); + TQTextStream t(&checkFile); + TQString firstLine = t.readLine(); if(firstLine.lower() != "[playlist]") { kdDebug(66666) << k_funcinfo << "PLS didn't start with '[playlist]', aborting" << endl; @@ -716,15 +716,15 @@ bool PlaylistSaver::loadPLS(const KURL &file, int /*opt*/) //list.setGroup("playlist"); // some stupid Windows lusers like to be case insensitive - QStringList groups = list.groupList().grep(QRegExp("^playlist$", false)); + TQStringList groups = list.groupList().grep(TQRegExp("^playlist$", false)); /* if (!groups.count()) // didn't find "[playlist]", it's not a .pls file return false; */ - QMap<QString,QString> group = list.entryMap(groups[0]); + TQMap<TQString,TQString> group = list.entryMap(groups[0]); - QString numOfEntries = findNoCase(group, "numberofentries"); + TQString numOfEntries = findNoCase(group, "numberofentries"); if(numOfEntries.isEmpty()) return false; @@ -733,14 +733,14 @@ bool PlaylistSaver::loadPLS(const KURL &file, int /*opt*/) unsigned int nEntries = numOfEntries.toInt(); for(unsigned int entry = 1; entry <= nEntries; ++entry ) { - QString str; + TQString str; str.sprintf("file%d", entry); - QString cast = findNoCase(group, str.utf8()); + TQString cast = findNoCase(group, str.utf8()); str.sprintf("title%d", entry); - QString title = findNoCase(group, str.utf8()); + TQString title = findNoCase(group, str.utf8()); // assume that everything in a pls is a streamable file - QMap<QString,QString> map; + TQMap<TQString,TQString> map; KURL url(cast); if (!url.hasPath()) @@ -764,7 +764,7 @@ bool PlaylistSaver::savePLS(const KURL &, int) return false; } -void PlaylistSaver::setGroup(const QString &) +void PlaylistSaver::setGroup(const TQString &) { } diff --git a/noatun/library/plugin.cpp b/noatun/library/plugin.cpp index e9090609..3c5b6f5d 100644 --- a/noatun/library/plugin.cpp +++ b/noatun/library/plugin.cpp @@ -1,5 +1,5 @@ -#include <qtimer.h> -#include <qfile.h> +#include <tqtimer.h> +#include <tqfile.h> #include <artsflow.h> #include <vector> #include <artsflow.h> @@ -46,7 +46,7 @@ TimerThingy::TimerThingy(Visualization *vis) { } -void TimerThingy::timerEvent(QTimerEvent *) +void TimerThingy::timerEvent(TQTimerEvent *) { mVis->timeout(); } @@ -88,15 +88,15 @@ Visualization::Visualization(int timeout, int pid) int parent=pid ? pid : getppid(); if (getenv("NOATUN_PID")) - parent = QString::fromLatin1(getenv("NOATUN_PID")).toInt(); + parent = TQString::fromLatin1(getenv("NOATUN_PID")).toInt(); DCOPClient c; c.attach(); - QCString appids[2]; - appids[0]=QString("noatun-%1").arg(parent).local8Bit(); + TQCString appids[2]; + appids[0]=TQString("noatun-%1").arg(parent).local8Bit(); appids[1]="noatun"; - QCString &appid=appids[0]; + TQCString &appid=appids[0]; if (!internalVis && c.isApplicationRegistered(appids[0])) { @@ -115,10 +115,10 @@ Visualization::Visualization(int timeout, int pid) } { - QByteArray replyData; - QCString replyType; + TQByteArray replyData; + TQCString replyType; - if (!c.call(appid, "Noatun", "visStack()", QByteArray(), replyType, replyData)) + if (!c.call(appid, "Noatun", "visStack()", TQByteArray(), replyType, replyData)) { kdDebug(66666) << "Error communicating to parent noatun" << endl; } @@ -127,8 +127,8 @@ Visualization::Visualization(int timeout, int pid) initDispatcher(); mServer=new Arts::SoundServerV2; *mServer = Arts::Reference("global:Arts_SoundServerV2"); - QDataStream reply(replyData, IO_ReadOnly); - QCString result; + TQDataStream reply(replyData, IO_ReadOnly); + TQCString result; reply >> result; mVisualizationStack=result; } @@ -213,8 +213,8 @@ FFTScope::FFTScope(int interval, int pid) : Visualization(interval, pid) float FFTScope::magic(int bands) { -/* QString path=locate("data", "noatun/magictable"); - QFile magic(path); +/* TQString path=locate("data", "noatun/magictable"); + TQFile magic(path); if (!magic.open(IO_ReadOnly | IO_Raw)) return 0; if (!magic.at(bands*sizeof(float))) @@ -473,7 +473,7 @@ void StereoScope::setSamples(int len) -NoatunListener::NoatunListener(QObject *parent) : QObject(parent) +NoatunListener::NoatunListener(TQObject *parent) : TQObject(parent) { } NoatunListener::~NoatunListener() @@ -495,7 +495,7 @@ void NoatunListenerNotif::message() } -ExitNotifier::ExitNotifier(int pid, QObject *parent) : NoatunListener(parent) +ExitNotifier::ExitNotifier(int pid, TQObject *parent) : NoatunListener(parent) { mNotif=new NoatunListenerNotif(this); @@ -503,8 +503,8 @@ ExitNotifier::ExitNotifier(int pid, QObject *parent) : NoatunListener(parent) c.attach(); - QCString appids[2]; - appids[0]=QString("noatun-%1").arg(pid).local8Bit(); + TQCString appids[2]; + appids[0]=TQString("noatun-%1").arg(pid).local8Bit(); appids[1]="noatun"; appid=appids[0]; @@ -521,18 +521,18 @@ ExitNotifier::ExitNotifier(int pid, QObject *parent) : NoatunListener(parent) return; } - QByteArray replyData; - QCString replyType; + TQByteArray replyData; + TQCString replyType; - QCString sessionName; + TQCString sessionName; - if (!c.call(appid, "Noatun", "session()", QByteArray(), replyType, replyData)) + if (!c.call(appid, "Noatun", "session()", TQByteArray(), replyType, replyData)) { kdDebug(66666) << "Error communicating to parent noatun" << endl; } else { - QDataStream reply(replyData, IO_ReadOnly); + TQDataStream reply(replyData, IO_ReadOnly); reply >> sessionName; } @@ -544,17 +544,17 @@ ExitNotifier::ExitNotifier(int pid, QObject *parent) : NoatunListener(parent) ExitNotifier::~ExitNotifier() { - QByteArray replyData; - QCString replyType; + TQByteArray replyData; + TQCString replyType; - QCString sessionName; + TQCString sessionName; DCOPClient c; c.attach(); - if (c.call(appid, "Noatun", "session()", QByteArray(), replyType, replyData)) + if (c.call(appid, "Noatun", "session()", TQByteArray(), replyType, replyData)) { - QDataStream reply(replyData, IO_ReadOnly); + TQDataStream reply(replyData, IO_ReadOnly); reply >> sessionName; Noatun::Session session=Arts::Reference(sessionName); @@ -563,10 +563,10 @@ ExitNotifier::~ExitNotifier() delete mNotif; } -BoolNotifier::BoolNotifier(bool *value, NoatunListener *listener, QObject *parent) - : QObject(parent) +BoolNotifier::BoolNotifier(bool *value, NoatunListener *listener, TQObject *parent) + : TQObject(parent) { - connect(listener, SIGNAL(event()), SLOT(event())); + connect(listener, TQT_SIGNAL(event()), TQT_SLOT(event())); mValue=value; } diff --git a/noatun/library/plugin_deps.h b/noatun/library/plugin_deps.h index a2f3f628..330636e3 100644 --- a/noatun/library/plugin_deps.h +++ b/noatun/library/plugin_deps.h @@ -1,8 +1,8 @@ #ifndef PLUGIN_DEPS_H #define PLUGIN_DEPS_H -#include <qtimer.h> -#include <qobject.h> +#include <tqtimer.h> +#include <tqobject.h> #include <noatunarts.h> class Visualization; @@ -20,7 +20,7 @@ public: void start(); public: - virtual void timerEvent(QTimerEvent *); + virtual void timerEvent(TQTimerEvent *); private: Visualization *mVis; diff --git a/noatun/library/pluginloader.cpp b/noatun/library/pluginloader.cpp index c367228a..0897e76d 100644 --- a/noatun/library/pluginloader.cpp +++ b/noatun/library/pluginloader.cpp @@ -1,6 +1,6 @@ -#include <qfile.h> +#include <tqfile.h> #include <kglobal.h> -#include <qdir.h> +#include <tqdir.h> #include <ksimpleconfig.h> #include <kstandarddirs.h> #include <knotifyclient.h> @@ -22,10 +22,10 @@ LibraryLoader::LibraryLoader() : mPlaylist(0) LibraryLoader::~LibraryLoader() { - QValueList<NoatunLibraryInfo> l; + TQValueList<NoatunLibraryInfo> l; l = loaded(); - for(QValueList<NoatunLibraryInfo>::Iterator i = l.begin(); i != l.end(); ++i) + for(TQValueList<NoatunLibraryInfo>::Iterator i = l.begin(); i != l.end(); ++i) { if((*i).type != "userinterface" && (*i).type != "playlist" && (*i).type != "systray") { @@ -34,7 +34,7 @@ LibraryLoader::~LibraryLoader() } l = loaded(); - for(QValueList<NoatunLibraryInfo>::Iterator i = l.begin(); i != l.end(); ++i) + for(TQValueList<NoatunLibraryInfo>::Iterator i = l.begin(); i != l.end(); ++i) { if((*i).type == "userinterface") { @@ -43,26 +43,26 @@ LibraryLoader::~LibraryLoader() } l = loaded(); - for(QValueList<NoatunLibraryInfo>::Iterator i = l.begin(); i != l.end(); ++i) + for(TQValueList<NoatunLibraryInfo>::Iterator i = l.begin(); i != l.end(); ++i) { removeNow((*i).specfile); } } -QValueList<NoatunLibraryInfo> LibraryLoader::available() const +TQValueList<NoatunLibraryInfo> LibraryLoader::available() const { - QValueList<NoatunLibraryInfo> items; - QStringList files=KGlobal::dirs()->findAllResources("appdata", "*.plugin", false, true); - for (QStringList::Iterator i=files.begin(); i!=files.end(); ++i) + TQValueList<NoatunLibraryInfo> items; + TQStringList files=KGlobal::dirs()->findAllResources("appdata", "*.plugin", false, true); + for (TQStringList::Iterator i=files.begin(); i!=files.end(); ++i) items.append(getInfo(*i)); return items; } -QPtrList<Plugin> LibraryLoader::plugins() const +TQPtrList<Plugin> LibraryLoader::plugins() const { - QPtrList<Plugin> list; - for (QDictIterator<LibraryLoader::PluginLibrary> i(mLibHash); i.current(); ++i) + TQPtrList<Plugin> list; + for (TQDictIterator<LibraryLoader::PluginLibrary> i(mLibHash); i.current(); ++i) list.append(i.current()->plugin); return list; } @@ -71,14 +71,14 @@ bool LibraryLoader::loadAll() { KConfig *config=KGlobal::config(); config->setGroup(""); - QStringList modules = config->readListEntry("Modules"); + TQStringList modules = config->readListEntry("Modules"); return loadAll(modules); } -bool LibraryLoader::loadAll(const QStringList &modules) +bool LibraryLoader::loadAll(const TQStringList &modules) { // Session management... - for(QStringList::ConstIterator i=modules.begin(); i!=modules.end(); ++i) + for(TQStringList::ConstIterator i=modules.begin(); i!=modules.end(); ++i) { NoatunLibraryInfo info=getInfo(*i); if (!info.type.contains("sm")) @@ -87,7 +87,7 @@ bool LibraryLoader::loadAll(const QStringList &modules) } // load all the playlists in the first - for(QStringList::ConstIterator i=modules.begin(); i!=modules.end(); ++i) + for(TQStringList::ConstIterator i=modules.begin(); i!=modules.end(); ++i) { NoatunLibraryInfo info=getInfo(*i); if (!info.type.contains("playlist")) @@ -103,7 +103,7 @@ bool LibraryLoader::loadAll(const QStringList &modules) } // load all the user interfaces now - for(QStringList::ConstIterator i=modules.begin(); i!=modules.end(); ++i) + for(TQStringList::ConstIterator i=modules.begin(); i!=modules.end(); ++i) { NoatunLibraryInfo info=getInfo(*i); if (!info.type.contains("userinterface")) @@ -118,7 +118,7 @@ bool LibraryLoader::loadAll(const QStringList &modules) return false; } - for(QStringList::ConstIterator i=modules.begin(); i!=modules.end(); ++i) + for(TQStringList::ConstIterator i=modules.begin(); i!=modules.end(); ++i) { NoatunLibraryInfo info=getInfo(*i); if((!info.type.contains("playlist")) @@ -132,11 +132,11 @@ bool LibraryLoader::loadAll(const QStringList &modules) return true; } -NoatunLibraryInfo LibraryLoader::getInfo(const QString &spec) const +NoatunLibraryInfo LibraryLoader::getInfo(const TQString &spec) const { NoatunLibraryInfo info; - QString specPath = (spec[0]=='/') ? spec : KGlobal::dirs()->findResource("appdata", spec); - if (!QFile::exists(specPath)) + TQString specPath = (spec[0]=='/') ? spec : KGlobal::dirs()->findResource("appdata", spec); + if (!TQFile::exists(specPath)) return info; KSimpleConfig file(specPath); if (spec.find('/')>=0) @@ -155,14 +155,14 @@ NoatunLibraryInfo LibraryLoader::getInfo(const QString &spec) const return info; } -bool LibraryLoader::isLoaded(const QString &spec) const +bool LibraryLoader::isLoaded(const TQString &spec) const { PluginLibrary *lib=mLibHash[spec]; if (!lib) return false; return lib->plugin; } -bool LibraryLoader::loadSO(const QString &spec) +bool LibraryLoader::loadSO(const TQString &spec) { if(!isLoaded(spec)) { @@ -170,7 +170,7 @@ bool LibraryLoader::loadSO(const QString &spec) if (info.specfile != spec) return false; - for (QStringList::ConstIterator it = info.require.begin(); it != info.require.end(); ++it) + for (TQStringList::ConstIterator it = info.require.begin(); it != info.require.end(); ++it) loadSO(*it); // get the library loader instance @@ -180,8 +180,8 @@ bool LibraryLoader::loadSO(const QString &spec) if (!listitem) { - QString filename = KGlobal::dirs()->findResource("module", info.filename); - KLibrary *lib = loader->library(QFile::encodeName(filename)); + TQString filename = KGlobal::dirs()->findResource("module", info.filename); + KLibrary *lib = loader->library(TQFile::encodeName(filename)); if (!lib) return false; listitem=new PluginLibrary; @@ -210,7 +210,7 @@ bool LibraryLoader::loadSO(const QString &spec) return false; } -void LibraryLoader::add(const QString &spec) +void LibraryLoader::add(const TQString &spec) { PluginLibrary *lib=mLibHash[spec]; if (lib) @@ -219,7 +219,7 @@ void LibraryLoader::add(const QString &spec) loadSO(spec); } -void LibraryLoader::setModules(const QStringList &mods) +void LibraryLoader::setModules(const TQStringList &mods) { KConfig *config=KGlobal::config(); config->setGroup(0); @@ -227,7 +227,7 @@ void LibraryLoader::setModules(const QStringList &mods) config->sync(); } -bool LibraryLoader::remove(const QString& spec, bool terminateOnLastUI) +bool LibraryLoader::remove(const TQString& spec, bool terminateOnLastUI) { bool SystrayPluginEnabled=false; @@ -235,10 +235,10 @@ bool LibraryLoader::remove(const QString& spec, bool terminateOnLastUI) // exit if this is the last UI if (info.type=="userinterface" && terminateOnLastUI) { - QValueList<NoatunLibraryInfo> l=loaded(); + TQValueList<NoatunLibraryInfo> l=loaded(); // Iterate over other plugins - for (QValueList<NoatunLibraryInfo>::Iterator i=l.begin(); i!=l.end(); ++i) + for (TQValueList<NoatunLibraryInfo>::Iterator i=l.begin(); i!=l.end(); ++i) { // Is this a UI plugin? if ((*i).specfile!=spec && (*i).type=="userinterface") @@ -275,7 +275,7 @@ bool LibraryLoader::remove(const QString& spec, bool terminateOnLastUI) return true; } -bool LibraryLoader::remove(const QString &spec) +bool LibraryLoader::remove(const TQString &spec) { remove(spec, true); return true; @@ -283,7 +283,7 @@ bool LibraryLoader::remove(const QString &spec) bool LibraryLoader::remove(const PluginLibrary *pl) { - for (QDictIterator<PluginLibrary> i(mLibHash); i.current(); ++i) + for (TQDictIterator<PluginLibrary> i(mLibHash); i.current(); ++i) { if (i.current()==pl) return remove(i.currentKey()); @@ -293,7 +293,7 @@ bool LibraryLoader::remove(const PluginLibrary *pl) bool LibraryLoader::remove(const Plugin *plugin) { - for (QDictIterator<PluginLibrary> i(mLibHash); i.current(); ++i) + for (TQDictIterator<PluginLibrary> i(mLibHash); i.current(); ++i) { if (i.current()->plugin==plugin) return remove(i.currentKey()); @@ -309,22 +309,22 @@ Playlist *LibraryLoader::playlist() const return mPlaylist; } -QValueList<NoatunLibraryInfo> LibraryLoader::loaded() const +TQValueList<NoatunLibraryInfo> LibraryLoader::loaded() const { - QValueList<NoatunLibraryInfo> items; + TQValueList<NoatunLibraryInfo> items; - for (QDictIterator<PluginLibrary> i(mLibHash); i.current(); ++i) + for (TQDictIterator<PluginLibrary> i(mLibHash); i.current(); ++i) if (isLoaded(i.currentKey())) items.append(getInfo(i.currentKey())); return items; } -QValueList<NoatunLibraryInfo> LibraryLoader::loadedByType(const QString &type) const +TQValueList<NoatunLibraryInfo> LibraryLoader::loadedByType(const TQString &type) const { - QValueList<NoatunLibraryInfo> items; + TQValueList<NoatunLibraryInfo> items; - for (QDictIterator<PluginLibrary> i(mLibHash); i.current(); ++i) + for (TQDictIterator<PluginLibrary> i(mLibHash); i.current(); ++i) { if (isLoaded(i.currentKey())) { @@ -337,15 +337,15 @@ QValueList<NoatunLibraryInfo> LibraryLoader::loadedByType(const QString &type) c return items; } -void LibraryLoader::removeNow(const QString &spec) +void LibraryLoader::removeNow(const TQString &spec) { NoatunLibraryInfo info = getInfo(spec); if (info.specfile == spec) { - QValueList<NoatunLibraryInfo> l = loaded(); - for (QValueList<NoatunLibraryInfo>::Iterator i = l.begin(); i != l.end(); ++i) + TQValueList<NoatunLibraryInfo> l = loaded(); + for (TQValueList<NoatunLibraryInfo>::Iterator i = l.begin(); i != l.end(); ++i) { - for (QStringList::ConstIterator it = (*i).require.begin(); it != (*i).require.end(); ++it) + for (TQStringList::ConstIterator it = (*i).require.begin(); it != (*i).require.end(); ++it) { if (*it == spec) removeNow((*i).specfile); diff --git a/noatun/library/pluginmodule.cpp b/noatun/library/pluginmodule.cpp index aec76e44..77047471 100644 --- a/noatun/library/pluginmodule.cpp +++ b/noatun/library/pluginmodule.cpp @@ -25,20 +25,20 @@ #include <kiconloader.h> #include <klocale.h> #include <kmessagebox.h> -#include <qtabwidget.h> -#include <qheader.h> -#include <qlabel.h> -#include <qlayout.h> +#include <tqtabwidget.h> +#include <tqheader.h> +#include <tqlabel.h> +#include <tqlayout.h> #include "noatunlistview.h" #include "pluginmodule.h" -#include <qwhatsthis.h> +#include <tqwhatsthis.h> #include "common.h" -PluginListItem::PluginListItem(const bool _exclusive, bool _checked, const NoatunLibraryInfo &_info, QListView *_parent) - : QCheckListItem(_parent, _info.name, CheckBox) +PluginListItem::PluginListItem(const bool _exclusive, bool _checked, const NoatunLibraryInfo &_info, TQListView *_parent) + : TQCheckListItem(_parent, _info.name, CheckBox) , mInfo(_info) , silentStateChange(false) , exclusive(_exclusive) @@ -61,14 +61,14 @@ void PluginListItem::stateChange(bool b) static_cast<PluginListView *>(listView())->stateChanged(this, b); } -void PluginListItem::paintCell(QPainter *p, const QColorGroup &cg, int a, int b, int c) +void PluginListItem::paintCell(TQPainter *p, const TQColorGroup &cg, int a, int b, int c) { if(exclusive) myType = RadioButton; - QCheckListItem::paintCell(p, cg, a, b, c); + TQCheckListItem::paintCell(p, cg, a, b, c); if(exclusive) myType = CheckBox; } -PluginListView::PluginListView(unsigned _min, unsigned _max, QWidget *_parent, const char *_name) +PluginListView::PluginListView(unsigned _min, unsigned _max, TQWidget *_parent, const char *_name) : KListView(_parent, _name) , hasMaximum(true) , max(_max) @@ -77,7 +77,7 @@ PluginListView::PluginListView(unsigned _min, unsigned _max, QWidget *_parent, c { } -PluginListView::PluginListView(unsigned _min, QWidget *_parent, const char *_name) +PluginListView::PluginListView(unsigned _min, TQWidget *_parent, const char *_name) : KListView(_parent, _name) , hasMaximum(false) , min(_min) @@ -85,7 +85,7 @@ PluginListView::PluginListView(unsigned _min, QWidget *_parent, const char *_nam { } -PluginListView::PluginListView(QWidget *_parent, const char *_name) +PluginListView::PluginListView(TQWidget *_parent, const char *_name) : KListView(_parent, _name) , hasMaximum(false) , min(0) @@ -110,7 +110,7 @@ void PluginListView::stateChanged(PluginListItem *item, bool b) { // Find a different one and turn it off - QListViewItem *cur = firstChild(); + TQListViewItem *cur = firstChild(); PluginListItem *curItem = dynamic_cast<PluginListItem *>(cur); while(cur == item || !curItem || !curItem->isOn()) @@ -136,58 +136,58 @@ void PluginListView::stateChanged(PluginListItem *item, bool b) } } -Plugins::Plugins(QObject *_parent) +Plugins::Plugins(TQObject *_parent) : CModule(i18n("Plugins"), i18n("Select Your Plugins"), "gear", _parent) , shown(false) { - (new QVBoxLayout(this))->setAutoAdd(true); - QTabWidget *tabControl = new QTabWidget(this,"tabControl"); + (new TQVBoxLayout(this))->setAutoAdd(true); + TQTabWidget *tabControl = new TQTabWidget(this,"tabControl"); - QFrame *interfaceTab = new QFrame(tabControl); - (new QVBoxLayout(interfaceTab, KDialog::marginHint(), KDialog::spacingHint()))->setAutoAdd(true); - (void)new QLabel(i18n("<b>Select one or more interfaces to use:</b>"), interfaceTab); + TQFrame *interfaceTab = new TQFrame(tabControl); + (new TQVBoxLayout(interfaceTab, KDialog::marginHint(), KDialog::spacingHint()))->setAutoAdd(true); + (void)new TQLabel(i18n("<b>Select one or more interfaces to use:</b>"), interfaceTab); // At least one interface is required interfaceList = new PluginListView(1, interfaceTab); interfaceList->addColumn(i18n("Name")); interfaceList->addColumn(i18n("Description")); interfaceList->addColumn(i18n("Author")); interfaceList->addColumn(i18n("License")); - connect(interfaceList, SIGNAL(stateChange(PluginListItem *, bool)), this, SLOT(stateChange(PluginListItem *, bool))); + connect(interfaceList, TQT_SIGNAL(stateChange(PluginListItem *, bool)), this, TQT_SLOT(stateChange(PluginListItem *, bool))); tabControl->addTab(interfaceTab, i18n("&Interfaces")); - QFrame *playlistTab = new QFrame(tabControl); - (new QVBoxLayout(playlistTab, KDialog::marginHint(), KDialog::spacingHint()))->setAutoAdd(true); - (void)new QLabel(i18n("<b>Select one playlist to use:</b>"), playlistTab); + TQFrame *playlistTab = new TQFrame(tabControl); + (new TQVBoxLayout(playlistTab, KDialog::marginHint(), KDialog::spacingHint()))->setAutoAdd(true); + (void)new TQLabel(i18n("<b>Select one playlist to use:</b>"), playlistTab); // Exactly one playlist is required playlistList = new PluginListView(1, 1, playlistTab); playlistList->addColumn(i18n("Name")); playlistList->addColumn(i18n("Description")); playlistList->addColumn(i18n("Author")); playlistList->addColumn(i18n("License")); - connect(playlistList, SIGNAL(stateChange(PluginListItem *, bool)), this, SLOT(stateChange(PluginListItem *, bool))); + connect(playlistList, TQT_SIGNAL(stateChange(PluginListItem *, bool)), this, TQT_SLOT(stateChange(PluginListItem *, bool))); tabControl->addTab(playlistTab, i18n("&Playlist")); - QFrame *visTab = new QFrame(tabControl); - (new QVBoxLayout(visTab, KDialog::marginHint(), KDialog::spacingHint()))->setAutoAdd(true); - (void)new QLabel(i18n("<b>Select any visualizations to use:</b>"), visTab); + TQFrame *visTab = new TQFrame(tabControl); + (new TQVBoxLayout(visTab, KDialog::marginHint(), KDialog::spacingHint()))->setAutoAdd(true); + (void)new TQLabel(i18n("<b>Select any visualizations to use:</b>"), visTab); visList = new PluginListView(0, visTab); visList->addColumn(i18n("Name")); visList->addColumn(i18n("Description")); visList->addColumn(i18n("Author")); visList->addColumn(i18n("License")); - connect(visList, SIGNAL(stateChange(PluginListItem *, bool)), this, SLOT(stateChange(PluginListItem *, bool))); + connect(visList, TQT_SIGNAL(stateChange(PluginListItem *, bool)), this, TQT_SLOT(stateChange(PluginListItem *, bool))); tabControl->addTab(visTab, i18n("&Visualizations")); // Other plugins are not restricted - QFrame *otherTab = new QFrame(tabControl); - (new QVBoxLayout(otherTab, KDialog::marginHint(), KDialog::spacingHint()))->setAutoAdd(true); - (void)new QLabel(i18n("<b>Select any other plugins to use:</b>"), otherTab); + TQFrame *otherTab = new TQFrame(tabControl); + (new TQVBoxLayout(otherTab, KDialog::marginHint(), KDialog::spacingHint()))->setAutoAdd(true); + (void)new TQLabel(i18n("<b>Select any other plugins to use:</b>"), otherTab); otherList = new PluginListView(0, otherTab); otherList->addColumn(i18n("Name")); otherList->addColumn(i18n("Description")); otherList->addColumn(i18n("Author")); otherList->addColumn(i18n("License")); - connect(otherList, SIGNAL(stateChange(PluginListItem *, bool)), this, SLOT(stateChange(PluginListItem *, bool))); + connect(otherList, TQT_SIGNAL(stateChange(PluginListItem *, bool)), this, TQT_SLOT(stateChange(PluginListItem *, bool))); tabControl->addTab(otherTab, i18n("O&ther Plugins")); } @@ -198,10 +198,10 @@ void Plugins::reopen() otherList->clear(); visList->clear(); - QValueList<NoatunLibraryInfo> available = napp->libraryLoader()->available(); - QValueList<NoatunLibraryInfo> loaded = napp->libraryLoader()->loaded(); + TQValueList<NoatunLibraryInfo> available = napp->libraryLoader()->available(); + TQValueList<NoatunLibraryInfo> loaded = napp->libraryLoader()->loaded(); - for(QValueList<NoatunLibraryInfo>::Iterator i = available.begin(); i != available.end(); ++i) + for(TQValueList<NoatunLibraryInfo>::Iterator i = available.begin(); i != available.end(); ++i) { PluginListView *parent; bool exclusive = false; @@ -250,7 +250,7 @@ void Plugins::stateChange(PluginListItem *item, bool b) void Plugins::addPlugin(const NoatunLibraryInfo &info) { // Load any that this one depends upon - for(QStringList::ConstIterator i = info.require.begin(); i != info.require.end(); ++i) + for(TQStringList::ConstIterator i = info.require.begin(); i != info.require.end(); ++i) { NoatunLibraryInfo requiredInfo = napp->libraryLoader()->getInfo(*i); PluginListItem *item = findItem(requiredInfo); @@ -268,20 +268,20 @@ void Plugins::removePlugin(const NoatunLibraryInfo &info) LibraryLoader &loader = *(napp->libraryLoader()); // Here are the ones loaded - QValueList<NoatunLibraryInfo> loaded = napp->libraryLoader()->loaded(); + TQValueList<NoatunLibraryInfo> loaded = napp->libraryLoader()->loaded(); // Add the ones marked for loading - for(QStringList::ConstIterator i = mAdded.begin(); i != mAdded.end(); ++i) + for(TQStringList::ConstIterator i = mAdded.begin(); i != mAdded.end(); ++i) loaded.append(loader.getInfo(*i)); // Subtract the ones marked for removal - for(QStringList::ConstIterator i = mDeleted.begin(); i != mDeleted.end(); ++i) + for(TQStringList::ConstIterator i = mDeleted.begin(); i != mDeleted.end(); ++i) loaded.remove(loader.getInfo(*i)); // If any depend on this plugin, mark them for removal (or remove them from mAdded) - for(QValueList<NoatunLibraryInfo>::Iterator i = loaded.begin(); i != loaded.end(); ++i) + for(TQValueList<NoatunLibraryInfo>::Iterator i = loaded.begin(); i != loaded.end(); ++i) { - for(QStringList::ConstIterator j = (*i).require.begin(); j != (*i).require.end(); ++j) + for(TQStringList::ConstIterator j = (*i).require.begin(); j != (*i).require.end(); ++j) { if(*j == info.specfile) { @@ -299,7 +299,7 @@ void Plugins::removePlugin(const NoatunLibraryInfo &info) PluginListItem *Plugins::findItem(const NoatunLibraryInfo &info) const { - for(QListViewItem *cur = otherList->firstChild(); cur != 0; cur = cur->itemBelow()) + for(TQListViewItem *cur = otherList->firstChild(); cur != 0; cur = cur->itemBelow()) { PluginListItem *item = dynamic_cast<PluginListItem *>(cur); if(item && item->info() == info) @@ -307,7 +307,7 @@ PluginListItem *Plugins::findItem(const NoatunLibraryInfo &info) const } // visualizations - for(QListViewItem *cur = visList->firstChild(); cur != 0; cur = cur->itemBelow()) + for(TQListViewItem *cur = visList->firstChild(); cur != 0; cur = cur->itemBelow()) { PluginListItem *item = dynamic_cast<PluginListItem *>(cur); if(item && item->info() == info) @@ -316,7 +316,7 @@ PluginListItem *Plugins::findItem(const NoatunLibraryInfo &info) const // If our only interface has a dependency removed, that's a double dose of trouble // We may as well have this here for completeness, though - for(QListViewItem *cur = interfaceList->firstChild(); cur != 0; cur = cur->itemBelow()) + for(TQListViewItem *cur = interfaceList->firstChild(); cur != 0; cur = cur->itemBelow()) { PluginListItem *item = dynamic_cast<PluginListItem *>(cur); if(item && item->info() == info) @@ -325,7 +325,7 @@ PluginListItem *Plugins::findItem(const NoatunLibraryInfo &info) const // If a playlist is added or removed due to a dependency, we're doom-diddly-oomed // We may as well have this here for completeness, though - for(QListViewItem *cur = playlistList->firstChild(); cur != 0; cur = cur->itemBelow()) + for(TQListViewItem *cur = playlistList->firstChild(); cur != 0; cur = cur->itemBelow()) { PluginListItem *item = dynamic_cast<PluginListItem *>(cur); if(item && item->info() == info) @@ -342,20 +342,20 @@ void Plugins::save() // Load the plugins the user added //loader.loadAll(mAdded); - QString oldPlaylist, newPlaylist; + TQString oldPlaylist, newPlaylist; // first load all non playlist things - for (QStringList::Iterator i = mAdded.begin(); i != mAdded.end(); ++i) + for (TQStringList::Iterator i = mAdded.begin(); i != mAdded.end(); ++i) { NoatunLibraryInfo info = loader.getInfo(*i); if(info.type != "playlist") - loader.loadAll(QStringList(*i)); + loader.loadAll(TQStringList(*i)); else newPlaylist = (*i); } // Remove the plugins the user removed - for (QStringList::Iterator i = mDeleted.begin(); i != mDeleted.end(); ++i) + for (TQStringList::Iterator i = mDeleted.begin(); i != mDeleted.end(); ++i) { NoatunLibraryInfo info = loader.getInfo(*i); if(info.type != "playlist") @@ -372,15 +372,15 @@ void Plugins::save() kdDebug(66666) << k_funcinfo << "Unloading " << oldPlaylist << endl; loader.remove(oldPlaylist); kdDebug(66666) << k_funcinfo << "Loading " << oldPlaylist << endl; - loader.loadAll(QStringList(newPlaylist)); + loader.loadAll(TQStringList(newPlaylist)); } // Round up the ones that weren't loaded right now, for saving in the configuration - QStringList specList(mAdded); + TQStringList specList(mAdded); - QValueList<NoatunLibraryInfo> loaded = loader.loaded(); - for(QValueList<NoatunLibraryInfo>::Iterator i = loaded.begin(); i != loaded.end(); ++i) + TQValueList<NoatunLibraryInfo> loaded = loader.loaded(); + for(TQValueList<NoatunLibraryInfo>::Iterator i = loaded.begin(); i != loaded.end(); ++i) { if(!specList.contains((*i).specfile) && loader.isLoaded((*i).specfile)) specList += (*i).specfile; @@ -393,12 +393,12 @@ void Plugins::save() mAdded.clear(); } -void Plugins::showEvent(QShowEvent *e) +void Plugins::showEvent(TQShowEvent *e) { if(!shown) { shown = true; - KMessageBox::information(this, i18n("<qt>Changing your playlist plugin will stop playback. Different playlists may use different methods of storing information, so after changing playlists you may have to recreate your playlist.</qt>"), QString::null, "Plugin warning"); + KMessageBox::information(this, i18n("<qt>Changing your playlist plugin will stop playback. Different playlists may use different methods of storing information, so after changing playlists you may have to recreate your playlist.</qt>"), TQString::null, "Plugin warning"); } CModule::showEvent(e); } diff --git a/noatun/library/pluginmodule.h b/noatun/library/pluginmodule.h index 75d3e04d..59ece235 100644 --- a/noatun/library/pluginmodule.h +++ b/noatun/library/pluginmodule.h @@ -25,15 +25,15 @@ #include "noatun/pluginloader.h" #include <klistview.h> -#include <qframe.h> -#include <qstringlist.h> +#include <tqframe.h> +#include <tqstringlist.h> class KTabCtl; class PluginListItem : public QCheckListItem { public: - PluginListItem(const bool _exclusive, bool _checked, const NoatunLibraryInfo &_info, QListView *_parent); + PluginListItem(const bool _exclusive, bool _checked, const NoatunLibraryInfo &_info, TQListView *_parent); const NoatunLibraryInfo &info() const { return mInfo; } // This will toggle the state without "emitting" the stateChange @@ -41,7 +41,7 @@ public: protected: virtual void stateChange(bool); - virtual void paintCell(QPainter *, const QColorGroup &, int, int, int); + virtual void paintCell(TQPainter *, const TQColorGroup &, int, int, int); private: NoatunLibraryInfo mInfo; bool silentStateChange; @@ -55,9 +55,9 @@ Q_OBJECT friend class PluginListItem; public: - PluginListView(QWidget *_parent = 0, const char *_name = 0); - PluginListView(unsigned _min, QWidget *_parent = 0, const char *_name = 0); - PluginListView(unsigned _min, unsigned _max, QWidget *_parent = 0, const char *_name = 0); + PluginListView(TQWidget *_parent = 0, const char *_name = 0); + PluginListView(unsigned _min, TQWidget *_parent = 0, const char *_name = 0); + PluginListView(unsigned _min, unsigned _max, TQWidget *_parent = 0, const char *_name = 0); virtual void clear(); @@ -76,12 +76,12 @@ class Plugins : public CModule { Q_OBJECT public: - Plugins(QObject *_parent = 0); + Plugins(TQObject *_parent = 0); virtual void save(); virtual void reopen(); protected: - virtual void showEvent(QShowEvent *); + virtual void showEvent(TQShowEvent *); private slots: void stateChange(PluginListItem *, bool); @@ -91,7 +91,7 @@ private: void removePlugin(const NoatunLibraryInfo &); PluginListItem *findItem(const NoatunLibraryInfo &) const; - QStringList mAdded, mDeleted; + TQStringList mAdded, mDeleted; PluginListView *interfaceList, *playlistList, *otherList, *visList; bool shown; diff --git a/noatun/library/pref.cpp b/noatun/library/pref.cpp index 98e71645..658e7951 100644 --- a/noatun/library/pref.cpp +++ b/noatun/library/pref.cpp @@ -4,11 +4,11 @@ #include <kglobal.h> #include <kiconloader.h> #include <kdebug.h> -#include <qlayout.h> -//#include <qlabel.h> +#include <tqlayout.h> +//#include <tqlabel.h> #include "cmodule.h" -NoatunPreferences::NoatunPreferences(QWidget *parent) +NoatunPreferences::NoatunPreferences(TQWidget *parent) : KDialogBase(TreeList, i18n("Preferences - Noatun"), Ok|Apply|Cancel|Help, Ok, parent, "NoatunPreferences", false, true) { @@ -32,7 +32,7 @@ void NoatunPreferences::show() void NoatunPreferences::show(CModule *page) { - int index = pageIndex( static_cast<QWidget *>(page->parent()) ); + int index = pageIndex( static_cast<TQWidget *>(page->parent()) ); if (index != -1) showPage(index); show(); @@ -54,19 +54,19 @@ void NoatunPreferences::remove(CModule *page) mModules.removeRef(page); } -CModule::CModule(const QString &name, const QString &description, const QString &icon, QObject *owner) - : QWidget(napp->preferencesBox()->addPage(name, description, KGlobal::iconLoader()->loadIcon( +CModule::CModule(const TQString &name, const TQString &description, const TQString &icon, TQObject *owner) + : TQWidget(napp->preferencesBox()->addPage(name, description, KGlobal::iconLoader()->loadIcon( icon, KIcon::Small,0, KIcon::DefaultState,0, true))) { if (owner) - connect(owner, SIGNAL(destroyed()), SLOT(ownerDeleted())); + connect(owner, TQT_SIGNAL(destroyed()), TQT_SLOT(ownerDeleted())); //kdDebug(66666) << k_funcinfo << "name = " << name << endl; napp->preferencesBox()->add(this); - QFrame *page=static_cast<QFrame*>(parent()); - (new QHBoxLayout(page))->addWidget(this); + TQFrame *page=static_cast<TQFrame*>(parent()); + (new TQHBoxLayout(page))->addWidget(this); } CModule::~CModule() @@ -87,7 +87,7 @@ CModule::~CModule() void CModule::ownerDeleted() { - QObject *p=parent(); + TQObject *p=parent(); delete this; p->deleteLater(); } diff --git a/noatun/library/scrollinglabel.cpp b/noatun/library/scrollinglabel.cpp index d7bdd643..09d64678 100644 --- a/noatun/library/scrollinglabel.cpp +++ b/noatun/library/scrollinglabel.cpp @@ -22,10 +22,10 @@ #include <noatun/scrollinglabel.h> -#include <qpainter.h> -#include <qpixmap.h> -#include <qtimer.h> -#include <qtooltip.h> +#include <tqpainter.h> +#include <tqpixmap.h> +#include <tqtimer.h> +#include <tqtooltip.h> class ScrollingLabel::Private { @@ -58,12 +58,12 @@ ScrollingLabel::ScrollingLabel QWidget * parent, const char * name ) - : QWidget(parent, name) + : TQWidget(parent, name) { d = new Private; - connect(&d->scrollTimer, SIGNAL(timeout()), this, SLOT(scroll())); - connect(&d->resetTimer, SIGNAL(timeout()), this, SLOT(restoreText())); + connect(&d->scrollTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(scroll())); + connect(&d->resetTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(restoreText())); setText(initialText); } @@ -74,7 +74,7 @@ ScrollingLabel::~ScrollingLabel() } void -ScrollingLabel::setText(const QString & t, int time) +ScrollingLabel::setText(const TQString & t, int time) { d->resetTimer.stop(); @@ -92,8 +92,8 @@ ScrollingLabel::setText(const QString & t, int time) _update(); } - QToolTip::remove(this); - QToolTip::add(this, d->text); + TQToolTip::remove(this); + TQToolTip::add(this, d->text); } void @@ -121,7 +121,7 @@ ScrollingLabel::_update() d->buf.resize(w, h); d->buf.fill(colorGroup().background()); - QPainter p(&d->buf); + TQPainter p(&d->buf); p.setFont(font()); p.drawText(0, fontMetrics().ascent(), d->text); @@ -132,14 +132,14 @@ ScrollingLabel::_update() } void -ScrollingLabel::paintEvent(QPaintEvent *) +ScrollingLabel::paintEvent(TQPaintEvent *) { bitBlt (this, 0, 0, &d->buf, d->pos, 0, d->pos + width(), height(), Qt::CopyROP); } void -ScrollingLabel::resizeEvent(QResizeEvent *) +ScrollingLabel::resizeEvent(TQResizeEvent *) { _update(); } @@ -174,7 +174,7 @@ ScrollingLabel::sizeHint() const QSize ScrollingLabel::minimumSizeHint() const { - return QSize(0, fontMetrics().height()); + return TQSize(0, fontMetrics().height()); } QString diff --git a/noatun/library/stereobuttonaction.cpp b/noatun/library/stereobuttonaction.cpp index bfb688f7..e8df0046 100644 --- a/noatun/library/stereobuttonaction.cpp +++ b/noatun/library/stereobuttonaction.cpp @@ -3,27 +3,27 @@ namespace NoatunStdAction { -StereoButtonAction::StereoButtonAction(const QString& text, int accel, QObject* parent, const char* name ) +StereoButtonAction::StereoButtonAction(const TQString& text, int accel, TQObject* parent, const char* name ) : KAction(text, accel, parent, name) {} -StereoButtonAction::StereoButtonAction(const QString& text, int accel, const QObject* receiver, const char* slot, QObject* parent, const char* name ) +StereoButtonAction::StereoButtonAction(const TQString& text, int accel, const TQObject* receiver, const char* slot, TQObject* parent, const char* name ) : KAction(text, accel, receiver, slot, parent, name) {} -StereoButtonAction::StereoButtonAction(const QString& text, const QIconSet& pix, int accel, QObject* parent, const char* name ) +StereoButtonAction::StereoButtonAction(const TQString& text, const TQIconSet& pix, int accel, TQObject* parent, const char* name ) : KAction(text, pix, accel, parent, name) {} -StereoButtonAction::StereoButtonAction(const QString& text, const QString& pix, int accel, QObject* parent, const char* name ) +StereoButtonAction::StereoButtonAction(const TQString& text, const TQString& pix, int accel, TQObject* parent, const char* name ) : KAction(text, pix, accel, parent, name) {} -StereoButtonAction::StereoButtonAction(const QString& text, const QIconSet& pix, int accel, const QObject* receiver, const char* slot, QObject* parent, const char* name ) +StereoButtonAction::StereoButtonAction(const TQString& text, const TQIconSet& pix, int accel, const TQObject* receiver, const char* slot, TQObject* parent, const char* name ) : KAction(text, pix, accel, receiver, slot, parent, name) {} -StereoButtonAction::StereoButtonAction(const QString& text, const QString& pix, int accel, const QObject* receiver, const char* slot, QObject* parent, const char* name ) +StereoButtonAction::StereoButtonAction(const TQString& text, const TQString& pix, int accel, const TQObject* receiver, const char* slot, TQObject* parent, const char* name ) : KAction(text, pix, accel, receiver, slot, parent, name) {} diff --git a/noatun/library/titleproxy.cpp b/noatun/library/titleproxy.cpp index 7515a35a..ee62863c 100644 --- a/noatun/library/titleproxy.cpp +++ b/noatun/library/titleproxy.cpp @@ -21,8 +21,8 @@ email : markey@web.de #include <kprotocolmanager.h> #include <kmdcodec.h> -#include <qstring.h> -#include <qtimer.h> +#include <tqstring.h> +#include <tqtimer.h> #include "noatun/app.h" using namespace TitleProxy; @@ -32,7 +32,7 @@ static const uint MAX_PROXYPORT = 7777; static const int BUFSIZE = 32768; Proxy::Proxy( KURL url ) - : QObject() + : TQObject() , m_url( url ) , m_initSuccess( true ) , m_metaInt( 0 ) @@ -50,9 +50,9 @@ Proxy::Proxy( KURL url ) if ( m_url.port() < 1 ) m_url.setPort( 80 ); - connect( &m_sockRemote, SIGNAL( error( int ) ), this, SLOT( connectError() ) ); - connect( &m_sockRemote, SIGNAL( connected() ), this, SLOT( sendRequest() ) ); - connect( &m_sockRemote, SIGNAL( readyRead() ), this, SLOT( readRemote() ) ); + connect( &m_sockRemote, TQT_SIGNAL( error( int ) ), this, TQT_SLOT( connectError() ) ); + connect( &m_sockRemote, TQT_SIGNAL( connected() ), this, TQT_SLOT( sendRequest() ) ); + connect( &m_sockRemote, TQT_SIGNAL( readyRead() ), this, TQT_SLOT( readRemote() ) ); uint i = 0; Server* server = 0; @@ -74,7 +74,7 @@ Proxy::Proxy( KURL url ) return; } m_usedPort = i; - connect( server, SIGNAL( connected( int ) ), this, SLOT( accept( int ) ) ); + connect( server, TQT_SIGNAL( connected( int ) ), this, TQT_SLOT( accept( int ) ) ); } @@ -129,8 +129,8 @@ void Proxy::connectToHost() //SLOT } { //connect to server - QTimer::singleShot( KProtocolManager::connectTimeout() * 1000, - this, SLOT( connectError() ) ); + TQTimer::singleShot( KProtocolManager::connectTimeout() * 1000, + this, TQT_SLOT( connectError() ) ); kdDebug(66666) << k_funcinfo << "Connecting to " << m_url.host() << ":" << m_url.port() << endl; @@ -146,12 +146,12 @@ void Proxy::sendRequest() //SLOT { //kdDebug(66666) << "BEGIN " << k_funcinfo << endl; - QCString username = m_url.user().utf8(); - QCString password = m_url.pass().utf8(); - QCString authString = KCodecs::base64Encode( username + ":" + password ); + TQCString username = m_url.user().utf8(); + TQCString password = m_url.pass().utf8(); + TQCString authString = KCodecs::base64Encode( username + ":" + password ); bool auth = !( username.isEmpty() && password.isEmpty() ); - QString request = QString( "GET %1 HTTP/1.0\r\n" + TQString request = TQString( "GET %1 HTTP/1.0\r\n" "Host: %2\r\n" "User-Agent: Noatun/%5\r\n" "%3" @@ -159,8 +159,8 @@ void Proxy::sendRequest() //SLOT "\r\n" ) .arg( m_url.path( -1 ).isEmpty() ? "/" : m_url.path( -1 ) ) .arg( m_url.host() ) - .arg( m_icyMode ? QString( "Icy-MetaData:1\r\n" ) : QString::null ) - .arg( auth ? QString( "Authorization: Basic " ).append( authString ) : QString::null ) + .arg( m_icyMode ? TQString( "Icy-MetaData:1\r\n" ) : TQString::null ) + .arg( auth ? TQString( "Authorization: Basic " ).append( authString ) : TQString::null ) .arg( NOATUN_VERSION ); m_sockRemote.writeBlock( request.latin1(), request.length() ); @@ -257,7 +257,7 @@ bool Proxy::processHeader( Q_LONG &index, Q_LONG bytesRead ) "Got shoutcast header: '" << m_headerStr << "'" << endl;*/ // Handle redirection - QString loc( "Location: " ); + TQString loc( "Location: " ); int index = m_headerStr.find( loc ); if ( index >= 0 ) { @@ -276,31 +276,31 @@ bool Proxy::processHeader( Q_LONG &index, Q_LONG bytesRead ) if (m_headerStr.startsWith("ICY")) { - m_metaInt = m_headerStr.section( "icy-metaint:", 1, 1, QString::SectionCaseInsensitiveSeps ).section( "\r", 0, 0 ).toInt(); - m_bitRate = m_headerStr.section( "icy-br:", 1, 1, QString::SectionCaseInsensitiveSeps ).section( "\r", 0, 0 ); - m_streamName = m_headerStr.section( "icy-name:", 1, 1, QString::SectionCaseInsensitiveSeps ).section( "\r", 0, 0 ); - m_streamGenre = m_headerStr.section( "icy-genre:", 1, 1, QString::SectionCaseInsensitiveSeps ).section( "\r", 0, 0 ); - m_streamUrl = m_headerStr.section( "icy-url:", 1, 1, QString::SectionCaseInsensitiveSeps ).section( "\r", 0, 0 ); + m_metaInt = m_headerStr.section( "icy-metaint:", 1, 1, TQString::SectionCaseInsensitiveSeps ).section( "\r", 0, 0 ).toInt(); + m_bitRate = m_headerStr.section( "icy-br:", 1, 1, TQString::SectionCaseInsensitiveSeps ).section( "\r", 0, 0 ); + m_streamName = m_headerStr.section( "icy-name:", 1, 1, TQString::SectionCaseInsensitiveSeps ).section( "\r", 0, 0 ); + m_streamGenre = m_headerStr.section( "icy-genre:", 1, 1, TQString::SectionCaseInsensitiveSeps ).section( "\r", 0, 0 ); + m_streamUrl = m_headerStr.section( "icy-url:", 1, 1, TQString::SectionCaseInsensitiveSeps ).section( "\r", 0, 0 ); } else // not ShoutCast { - QString serverName = m_headerStr.section( "Server:", 1, 1, QString::SectionCaseInsensitiveSeps ).section( "\r", 0, 0 ); + TQString serverName = m_headerStr.section( "Server:", 1, 1, TQString::SectionCaseInsensitiveSeps ).section( "\r", 0, 0 ); kdDebug(66666) << k_funcinfo << "Server name: " << serverName << endl; if (serverName == "Icecast") { m_metaInt = 0; - m_streamName = m_headerStr.section( "ice-name:", 1, 1, QString::SectionCaseInsensitiveSeps ).section( "\r", 0, 0 ); - m_streamGenre = m_headerStr.section( "ice-genre:", 1, 1, QString::SectionCaseInsensitiveSeps ).section( "\r", 0, 0 ); - m_streamUrl = m_headerStr.section( "ice-url:", 1, 1, QString::SectionCaseInsensitiveSeps ).section( "\r", 0, 0 ); + m_streamName = m_headerStr.section( "ice-name:", 1, 1, TQString::SectionCaseInsensitiveSeps ).section( "\r", 0, 0 ); + m_streamGenre = m_headerStr.section( "ice-genre:", 1, 1, TQString::SectionCaseInsensitiveSeps ).section( "\r", 0, 0 ); + m_streamUrl = m_headerStr.section( "ice-url:", 1, 1, TQString::SectionCaseInsensitiveSeps ).section( "\r", 0, 0 ); } else if (serverName.startsWith("icecast/1.")) { m_metaInt = 0; - m_bitRate = m_headerStr.section( "x-audiocast-bitrate:", 1, 1, QString::SectionCaseInsensitiveSeps ).section( "\r", 0, 0 ); - m_streamName = m_headerStr.section( "x-audiocast-name:", 1, 1, QString::SectionCaseInsensitiveSeps ).section( "\r", 0, 0 ); - m_streamGenre = m_headerStr.section( "x-audiocast-genre:", 1, 1, QString::SectionCaseInsensitiveSeps ).section( "\r", 0, 0 ); - m_streamUrl = m_headerStr.section( "x-audiocast-url:", 1, 1, QString::SectionCaseInsensitiveSeps ).section( "\r", 0, 0 ); + m_bitRate = m_headerStr.section( "x-audiocast-bitrate:", 1, 1, TQString::SectionCaseInsensitiveSeps ).section( "\r", 0, 0 ); + m_streamName = m_headerStr.section( "x-audiocast-name:", 1, 1, TQString::SectionCaseInsensitiveSeps ).section( "\r", 0, 0 ); + m_streamGenre = m_headerStr.section( "x-audiocast-genre:", 1, 1, TQString::SectionCaseInsensitiveSeps ).section( "\r", 0, 0 ); + m_streamUrl = m_headerStr.section( "x-audiocast-url:", 1, 1, TQString::SectionCaseInsensitiveSeps ).section( "\r", 0, 0 ); } } @@ -316,8 +316,8 @@ bool Proxy::processHeader( Q_LONG &index, Q_LONG bytesRead ) return false; } - connect( &m_sockRemote, SIGNAL( connectionClosed() ), - this, SLOT( connectError() ) ); + connect( &m_sockRemote, TQT_SIGNAL( connectionClosed() ), + this, TQT_SLOT( connectError() ) ); return true; } } @@ -325,7 +325,7 @@ bool Proxy::processHeader( Q_LONG &index, Q_LONG bytesRead ) } -void Proxy::transmitData( const QString &data ) +void Proxy::transmitData( const TQString &data ) { /*kdDebug(66666) << k_funcinfo << " received new metadata: '" << data << "'" << endl;*/ @@ -339,8 +339,8 @@ void Proxy::transmitData( const QString &data ) emit metaData( m_streamName, m_streamGenre, m_streamUrl, m_bitRate, - extractStr(data, QString::fromLatin1("StreamTitle")), - extractStr(data, QString::fromLatin1("StreamUrl"))); + extractStr(data, TQString::fromLatin1("StreamTitle")), + extractStr(data, TQString::fromLatin1("StreamUrl"))); } @@ -358,12 +358,12 @@ void Proxy::error() } -QString Proxy::extractStr( const QString &str, const QString &key ) +TQString Proxy::extractStr( const TQString &str, const TQString &key ) { int index = str.find( key, 0, true ); if ( index == -1 ) { - return QString::null; + return TQString::null; } else { diff --git a/noatun/library/titleproxy.h b/noatun/library/titleproxy.h index 058943d6..541f3190 100644 --- a/noatun/library/titleproxy.h +++ b/noatun/library/titleproxy.h @@ -20,9 +20,9 @@ email : #include <kurl.h> //stack allocated -#include <qobject.h> -#include <qserversocket.h> //baseclass -#include <qsocket.h> //stack allocated +#include <tqobject.h> +#include <tqserversocket.h> //baseclass +#include <tqsocket.h> //stack allocated class QString; @@ -58,12 +58,12 @@ namespace TitleProxy signals: void metaData( - const QString &streamName, - const QString &streamGenre, - const QString &streamUrl, - const QString &streamBitrate, - const QString &trackTitle, - const QString &trackUrl); + const TQString &streamName, + const TQString &streamGenre, + const TQString &streamUrl, + const TQString &streamBitrate, + const TQString &trackTitle, + const TQString &trackUrl); void proxyError(); private slots: @@ -75,9 +75,9 @@ namespace TitleProxy private: bool processHeader( Q_LONG &index, Q_LONG bytesRead ); - void transmitData( const QString &data ); + void transmitData( const TQString &data ); void error(); - QString extractStr( const QString &str, const QString &key ); + TQString extractStr( const TQString &str, const TQString &key ); //ATTRIBUTES: KURL m_url; @@ -86,25 +86,25 @@ namespace TitleProxy bool m_connectSuccess; int m_metaInt; - QString m_bitRate; + TQString m_bitRate; int m_byteCount; uint m_metaLen; - QString m_metaData; + TQString m_metaData; bool m_headerFinished; - QString m_headerStr; + TQString m_headerStr; int m_usedPort; - QString m_lastMetadata; + TQString m_lastMetadata; bool m_icyMode; - QString m_streamName; - QString m_streamGenre; - QString m_streamUrl; + TQString m_streamName; + TQString m_streamGenre; + TQString m_streamUrl; char *m_pBuf; - QSocket m_sockRemote; - QSocket m_sockProxy; + TQSocket m_sockRemote; + TQSocket m_sockProxy; }; @@ -113,8 +113,8 @@ namespace TitleProxy Q_OBJECT public: - Server( Q_UINT16 port, QObject* parent ) - : QServerSocket( port, 1, parent, "TitleProxyServer" ) {}; + Server( Q_UINT16 port, TQObject* parent ) + : TQServerSocket( port, 1, parent, "TitleProxyServer" ) {}; signals: void connected( int socket ); diff --git a/noatun/library/vequalizer.cpp b/noatun/library/vequalizer.cpp index 4b131e8a..c081d84b 100644 --- a/noatun/library/vequalizer.cpp +++ b/noatun/library/vequalizer.cpp @@ -56,9 +56,9 @@ #include <kconfig.h> #include <klocale.h> -#include <qdom.h> -#include <qtextstream.h> -#include <qfile.h> +#include <tqdom.h> +#include <tqtextstream.h> +#include <tqfile.h> #include <math.h> @@ -155,13 +155,13 @@ int VBand::center() const return (d->start + d->end)/2; } -static QString formatFreq(int f, bool withHz) +static TQString formatFreq(int f, bool withHz) { - QString format; + TQString format; if (f<991) - format=QString::number(f); + format=TQString::number(f); else - format=QString::number((int)((f+500)/1000.0))+"k"; + format=TQString::number((int)((f+500)/1000.0))+"k"; if (withHz) format+="Hz"; @@ -169,17 +169,17 @@ static QString formatFreq(int f, bool withHz) return format; } -QString VBand::formatStart(bool withHz) const +TQString VBand::formatStart(bool withHz) const { return formatFreq(d->start, withHz); } -QString VBand::formatEnd(bool withHz) const +TQString VBand::formatEnd(bool withHz) const { return formatFreq(d->end, withHz); } -QString VBand::format(bool withHz) const +TQString VBand::format(bool withHz) const { return formatFreq(center(), withHz); } @@ -212,7 +212,7 @@ int VInterpolation::bands() const void VInterpolation::getFrequencies(int num, int *low, int *high) const { - QValueList<int> fs = VEqualizer::frequencies(bands()); + TQValueList<int> fs = VEqualizer::frequencies(bands()); if (num == 0) *low = 1; else *low = fs[num-1]+1; @@ -249,7 +249,7 @@ void VInterpolation::setLevel(int index, int level) } int realbands = EQ->bands(); - QValueList<int> values; + TQValueList<int> values; for (int i=0; i < realbands; ++i) { // i @@ -360,10 +360,10 @@ int VEqualizer::minBands() const } -QValueList<int> VEqualizer::frequencies(int _num) +TQValueList<int> VEqualizer::frequencies(int _num) { #if 0 - QValueList<int> fs; + TQValueList<int> fs; fs += 108; fs += 217; fs += 810; @@ -389,7 +389,7 @@ QValueList<int> VEqualizer::frequencies(int _num) double vend = double(end()); const double base = ::pow(10.0, ::log10(vend-vstart)/num); - QValueList<int> fs; + TQValueList<int> fs; for (double i=1.0; i <= num; i++) { @@ -416,11 +416,11 @@ void VEqualizer::setBands(int num, bool interpolate) if (num == bands()) return; - QValueList<int> fs = VEqualizer::frequencies(num); + TQValueList<int> fs = VEqualizer::frequencies(num); std::vector<Private::BandInfo> modified; int bstart=0; - for (QValueList<int>::Iterator i(fs.begin()); i != fs.end(); ++i) + for (TQValueList<int>::Iterator i(fs.begin()); i != fs.end(); ++i) { Private::BandInfo info; info.start = bstart+1; @@ -514,11 +514,11 @@ void VEqualizer::setLevel(int index, int level) emit modified(); } -void VEqualizer::setLevels(const QValueList<int> &levels) +void VEqualizer::setLevels(const TQValueList<int> &levels) { int index=0; for ( - QValueList<int>::ConstIterator i(levels.begin()); + TQValueList<int>::ConstIterator i(levels.begin()); i != levels.end(); ++i ) { @@ -572,7 +572,7 @@ void VEqualizer::update(bool full) -bool VEqualizer::save(const KURL &filename, const QString &friendly) const +bool VEqualizer::save(const KURL &filename, const TQString &friendly) const { Noatun::KSaver saver(filename); if(!saver.open()) return false; @@ -585,26 +585,26 @@ bool VEqualizer::save(const KURL &filename, const QString &friendly) const bool VEqualizer::load(const KURL &filename) { - QString dest; + TQString dest; if(KIO::NetAccess::download(filename, dest, 0L)) { - QFile file(dest); + TQFile file(dest); if (!file.open(IO_ReadOnly)) return false; - QTextStream t(&file); - QString str = t.read(); + TQTextStream t(&file); + TQString str = t.read(); fromString(str); return true; } return false; } -QString VEqualizer::toString(const QString &name) const +TQString VEqualizer::toString(const TQString &name) const { - QDomDocument doc("noatunequalizer"); - doc.setContent(QString("<!DOCTYPE NoatunEqualizer><noatunequalizer/>")); - QDomElement docElem = doc.documentElement(); + TQDomDocument doc("noatunequalizer"); + doc.setContent(TQString("<!DOCTYPE NoatunEqualizer><noatunequalizer/>")); + TQDomElement docElem = doc.documentElement(); { docElem.setAttribute("level", preamp()); @@ -616,7 +616,7 @@ QString VEqualizer::toString(const QString &name) const for (int i=0; i < bandc; ++i) { VBand band = const_cast<VEqualizer*>(this)->operator[](i); - QDomElement elem = doc.createElement("band"); + TQDomElement elem = doc.createElement("band"); elem.setAttribute("start", band.start()); elem.setAttribute("end", band.end()); elem.setAttribute("level", band.level()); @@ -627,22 +627,22 @@ QString VEqualizer::toString(const QString &name) const return doc.toString(); } -bool VEqualizer::fromString(const QString &str) +bool VEqualizer::fromString(const TQString &str) { - QDomDocument doc("noatunequalizer"); + TQDomDocument doc("noatunequalizer"); if (!doc.setContent(str)) return false; - QDomElement docElem = doc.documentElement(); + TQDomElement docElem = doc.documentElement(); if (docElem.tagName()!="noatunequalizer") return false; setPreamp(docElem.attribute("level", "0").toInt()); std::vector<Private::BandInfo> modified; - for (QDomNode n = docElem.firstChild(); !n.isNull(); n = n.nextSibling()) + for (TQDomNode n = docElem.firstChild(); !n.isNull(); n = n.nextSibling()) { - QDomElement e = n.toElement(); + TQDomElement e = n.toElement(); if(e.isNull()) continue; if (e.tagName().lower() != "band") continue; @@ -662,34 +662,34 @@ bool VEqualizer::fromString(const QString &str) return true; } -static QString makePresetFile() +static TQString makePresetFile() { - QString basedir=kapp->dirs()->localkdedir()+"/share/apps/noatun/eq.preset/"; + TQString basedir=kapp->dirs()->localkdedir()+"/share/apps/noatun/eq.preset/"; // now append a filename that doesn't exist KStandardDirs::makeDir(basedir); - QString fullpath; + TQString fullpath; int num=0; do { if (num) - fullpath=basedir+"preset."+QString::number(num); + fullpath=basedir+"preset."+TQString::number(num); else fullpath=basedir+"preset"; num++; } - while (QFile(fullpath).exists()); + while (TQFile(fullpath).exists()); return fullpath; } -VPreset VEqualizer::createPreset(const QString &name, bool smart) +VPreset VEqualizer::createPreset(const TQString &name, bool smart) { if (presetExists(name) && !smart) return VPreset(); - QString nameReal=name; + TQString nameReal=name; { int number=1; while (presetExists(nameReal)) { - nameReal=name+" ("+QString::number(number)+')'; + nameReal=name+" ("+TQString::number(number)+')'; number++; } } @@ -700,7 +700,7 @@ VPreset VEqualizer::createPreset(const QString &name, bool smart) save(preset.file(), nameReal); KConfig *config=kapp->config(); config->setGroup("Equalizer"); - QStringList list = config->readListEntry("presets"); + TQStringList list = config->readListEntry("presets"); list += preset.file(); config->writeEntry("presets", list); config->sync(); @@ -710,12 +710,12 @@ VPreset VEqualizer::createPreset(const QString &name, bool smart) } -QValueList<VPreset> VEqualizer::presets() const +TQValueList<VPreset> VEqualizer::presets() const { KConfig *conf=KGlobal::config(); conf->setGroup("Equalizer"); - QStringList list; + TQStringList list; if (conf->hasKey("presets")) { list=conf->readListEntry("presets"); @@ -727,17 +727,17 @@ QValueList<VPreset> VEqualizer::presets() const conf->sync(); } - QValueList<VPreset> presets; + TQValueList<VPreset> presets; - for (QStringList::Iterator i = list.begin(); i!=list.end(); ++i) + for (TQStringList::Iterator i = list.begin(); i!=list.end(); ++i) { - QFile file(*i); + TQFile file(*i); if (!file.open(IO_ReadOnly)) continue; - QDomDocument doc("noatunequalizer"); + TQDomDocument doc("noatunequalizer"); if (!doc.setContent(&file)) continue; - QDomElement docElem = doc.documentElement(); + TQDomElement docElem = doc.documentElement(); if (docElem.tagName()!="noatunequalizer") continue; presets.append(VPreset(*i)); @@ -745,11 +745,11 @@ QValueList<VPreset> VEqualizer::presets() const return presets; } -VPreset VEqualizer::presetByName(const QString &name) +VPreset VEqualizer::presetByName(const TQString &name) { - QValueList<VPreset> pr = presets(); + TQValueList<VPreset> pr = presets(); for ( - QValueList<VPreset>::Iterator i(pr.begin()); + TQValueList<VPreset>::Iterator i(pr.begin()); i != pr.end(); ++i ) { @@ -759,21 +759,21 @@ VPreset VEqualizer::presetByName(const QString &name) return VPreset(); } -VPreset VEqualizer::presetByFile(const QString &file) +VPreset VEqualizer::presetByFile(const TQString &file) { KConfig *conf=KGlobal::config(); conf->setGroup("Equalizer"); - QStringList list=kapp->config()->readListEntry("presets"); + TQStringList list=kapp->config()->readListEntry("presets"); if (list.contains(file)) return VPreset(file); return VPreset(); } -bool VEqualizer::presetExists(const QString &name) const +bool VEqualizer::presetExists(const TQString &name) const { - QValueList<VPreset> list=presets(); + TQValueList<VPreset> list=presets(); for ( - QValueList<VPreset>::Iterator i(list.begin()); + TQValueList<VPreset>::Iterator i(list.begin()); i != list.end(); ++i ) { @@ -787,12 +787,12 @@ bool VEqualizer::presetExists(const QString &name) const struct VPreset::Private { - QString file; + TQString file; }; -VPreset::VPreset(const QString &file) +VPreset::VPreset(const TQString &file) { d = new Private; d->file = file; @@ -827,18 +827,18 @@ VPreset & VPreset::operator=(const VPreset ©) return *this; } -QString VPreset::name() const +TQString VPreset::name() const { - QFile file(d->file); + TQFile file(d->file); if (!file.open(IO_ReadOnly)) return 0; - QDomDocument doc("noatunequalizer"); + TQDomDocument doc("noatunequalizer"); if (!doc.setContent(&file)) return 0; - QDomElement docElem = doc.documentElement(); + TQDomElement docElem = doc.documentElement(); if (docElem.tagName()!="noatunequalizer") return 0; bool standard=docElem.attribute("default", "0")=="0"; - QString n=docElem.attribute("name", 0); + TQString n=docElem.attribute("name", 0); { // All the translations for the presets # ifdef I18N_STUFF @@ -857,15 +857,15 @@ QString VPreset::name() const return n; } -bool VPreset::setName(const QString &name) +bool VPreset::setName(const TQString &name) { - QFile file(d->file); + TQFile file(d->file); if (!file.open(IO_ReadOnly)) return false; - QDomDocument doc("noatunequalizer"); + TQDomDocument doc("noatunequalizer"); if (!doc.setContent(&file)) return false; - QDomElement docElem = doc.documentElement(); + TQDomElement docElem = doc.documentElement(); if (docElem.tagName()!="noatunequalizer") return false; if (docElem.attribute("name") == name) return true; @@ -876,7 +876,7 @@ bool VPreset::setName(const QString &name) if (!file.open(IO_ReadWrite | IO_Truncate)) return false; - QTextStream s(&file); + TQTextStream s(&file); s << doc.toString(); file.close(); @@ -904,7 +904,7 @@ void VPreset::load() const EQ->load(url); } -QString VPreset::file() const +TQString VPreset::file() const { return d->file; } @@ -913,7 +913,7 @@ void VPreset::remove() { KConfig *config=kapp->config(); config->setGroup("Equalizer"); - QStringList items=config->readListEntry("presets"); + TQStringList items=config->readListEntry("presets"); items.remove(file()); config->writeEntry("presets", items); config->sync(); @@ -922,7 +922,7 @@ void VPreset::remove() if (file().find(kapp->dirs()->localkdedir())==0) { - QFile f(file()); + TQFile f(file()); f.remove(); } d->file = ""; diff --git a/noatun/library/video.cpp b/noatun/library/video.cpp index c259d4ba..94646315 100644 --- a/noatun/library/video.cpp +++ b/noatun/library/video.cpp @@ -8,14 +8,14 @@ #include <noatun/player.h> #include <noatun/engine.h> -#include <qpopupmenu.h> +#include <tqpopupmenu.h> #include <kaction.h> #include <klocale.h> #include "globalvideo.h" // sorry :) -QPtrList<VideoFrame> VideoFrame::frames; +TQPtrList<VideoFrame> VideoFrame::frames; VideoFrame *VideoFrame::whose=0; @@ -24,21 +24,21 @@ struct VideoFrame::Private }; -VideoFrame::VideoFrame(KXMLGUIClient *clientParent, QWidget *parent, const char*name, WFlags f) +VideoFrame::VideoFrame(KXMLGUIClient *clientParent, TQWidget *parent, const char*name, WFlags f) : KVideoWidget(clientParent, parent, name, f) { d = new Private; - connect(napp->player(), SIGNAL(newSong()), SLOT(changed())); - connect(napp->player(), SIGNAL(stopped()), SLOT(stopped())); + connect(napp->player(), TQT_SIGNAL(newSong()), TQT_SLOT(changed())); + connect(napp->player(), TQT_SIGNAL(stopped()), TQT_SLOT(stopped())); frames.append(this); } -VideoFrame::VideoFrame(QWidget *parent, const char *name, WFlags f) +VideoFrame::VideoFrame(TQWidget *parent, const char *name, WFlags f) : KVideoWidget(parent, name, f) { d = new Private; - connect(napp->player(), SIGNAL(newSong()), SLOT(changed())); - connect(napp->player(), SIGNAL(stopped()), SLOT(stopped())); + connect(napp->player(), TQT_SIGNAL(newSong()), TQT_SLOT(changed())); + connect(napp->player(), TQT_SIGNAL(stopped()), TQT_SLOT(stopped())); frames.append(this); } @@ -62,9 +62,9 @@ VideoFrame *VideoFrame::playing() return whose; } -QPopupMenu *VideoFrame::popupMenu(QWidget *parent) +TQPopupMenu *VideoFrame::popupMenu(TQWidget *parent) { - QPopupMenu *view = new QPopupMenu(parent); + TQPopupMenu *view = new TQPopupMenu(parent); action( "half_size" )->plug( view ); action( "normal_size" )->plug( view ); action( "double_size" )->plug( view ); @@ -110,14 +110,14 @@ void VideoFrame::stopped() } } -#include <qlayout.h> +#include <tqlayout.h> GlobalVideo::GlobalVideo() - : QWidget( 0, 0, WType_TopLevel | WStyle_Customize | WStyle_DialogBorder | WStyle_Title ) + : TQWidget( 0, 0, WType_TopLevel | WStyle_Customize | WStyle_DialogBorder | WStyle_Title ) { setCaption(i18n("Video - Noatun")); - (new QVBoxLayout(this))->setAutoAdd(true); + (new TQVBoxLayout(this))->setAutoAdd(true); video = new VideoFrame(this); menu = video->popupMenu(this); @@ -126,9 +126,9 @@ GlobalVideo::GlobalVideo() // video->setMinimumSize(101,35); video->setMinimumSize(128,96); - connect(video, SIGNAL(acquired()), SLOT(appear())); - connect(video, SIGNAL(lost()), SLOT(hide())); - connect(video, SIGNAL(adaptSize(int,int)), this, SLOT(slotAdaptSize(int,int))); + connect(video, TQT_SIGNAL(acquired()), TQT_SLOT(appear())); + connect(video, TQT_SIGNAL(lost()), TQT_SLOT(hide())); + connect(video, TQT_SIGNAL(adaptSize(int,int)), this, TQT_SLOT(slotAdaptSize(int,int))); video->setNormalSize(); video->give(); @@ -141,15 +141,15 @@ void GlobalVideo::slotAdaptSize(int w, int h) void GlobalVideo::appear() { - QWidget::show(); + TQWidget::show(); } void GlobalVideo::hide() { - QWidget::hide(); + TQWidget::hide(); } -void GlobalVideo::mouseReleaseEvent(QMouseEvent *e) +void GlobalVideo::mouseReleaseEvent(TQMouseEvent *e) { if (e->button() == RightButton) { |