From 7346aee26bf190a7e70333c40fab4caca847cd27 Mon Sep 17 00:00:00 2001 From: tpearson Date: Sat, 31 Jul 2010 19:22:56 +0000 Subject: Trinity Qt initial conversion git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdeaddons@1157634 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- noatun-plugins/alarm/kminutespinbox.cpp | 10 +- noatun-plugins/alarm/kminutespinbox.h | 6 +- noatun-plugins/alarm/kpercentspinbox.cpp | 10 +- noatun-plugins/alarm/kpercentspinbox.h | 6 +- noatun-plugins/alarm/wakeup.cpp | 122 ++++++------- noatun-plugins/alarm/wakeup.h | 54 +++--- noatun-plugins/alsaplayer/configmodule.cpp | 10 +- noatun-plugins/alsaplayer/configmodule.h | 4 +- noatun-plugins/alsaplayer/seeker.cpp | 10 +- noatun-plugins/alsaplayer/seeker.h | 4 +- noatun-plugins/alsaplayer/userinterface.cpp | 110 +++++------ noatun-plugins/alsaplayer/userinterface.h | 16 +- noatun-plugins/charlatan/configmodule.cpp | 10 +- noatun-plugins/charlatan/configmodule.h | 4 +- noatun-plugins/charlatan/seeker.cpp | 20 +- noatun-plugins/charlatan/seeker.h | 6 +- noatun-plugins/charlatan/userinterface.cpp | 146 +++++++-------- noatun-plugins/charlatan/userinterface.h | 30 +-- noatun-plugins/dub/dub/dub.cpp | 60 +++--- noatun-plugins/dub/dub/dub.h | 38 ++-- noatun-plugins/dub/dub/dubapp.cpp | 14 +- noatun-plugins/dub/dub/dubapp.h | 6 +- noatun-plugins/dub/dub/dubconfigmodule.cpp | 16 +- noatun-plugins/dub/dub/dubconfigmodule.h | 4 +- noatun-plugins/dub/dub/dubplaylistitem.cpp | 12 +- noatun-plugins/dub/dub/dubplaylistitem.h | 14 +- noatun-plugins/dub/dub/dubview.cpp | 16 +- noatun-plugins/dub/dub/dubview.h | 8 +- noatun-plugins/dub/dub/fileselectorwidget.cpp | 92 +++++----- noatun-plugins/dub/dub/fileselectorwidget.h | 28 +-- noatun-plugins/ffrs/ffrs.cpp | 96 +++++----- noatun-plugins/ffrs/ffrs.h | 20 +- noatun-plugins/luckytag/luckytag.h | 2 +- noatun-plugins/luckytag/parsedmp3filename.cpp | 14 +- noatun-plugins/luckytag/parsedmp3filename.h | 24 +-- noatun-plugins/lyrics/cmodule.cpp | 74 ++++---- noatun-plugins/lyrics/cmodule.h | 18 +- noatun-plugins/lyrics/historymanager.cpp | 2 +- noatun-plugins/lyrics/historymanager.h | 12 +- noatun-plugins/lyrics/lyrics.cpp | 60 +++--- noatun-plugins/lyrics/lyrics.h | 6 +- noatun-plugins/nexscope/bitmappool.cpp | 4 +- noatun-plugins/nexscope/gui.cpp | 60 +++--- noatun-plugins/nexscope/gui.h | 20 +- noatun-plugins/nexscope/nex.cpp | 74 ++++---- noatun-plugins/nexscope/nex.h | 64 +++---- noatun-plugins/nexscope/noatunplugin.cpp | 2 +- noatun-plugins/nexscope/noatunplugin.h | 2 +- noatun-plugins/nexscope/regionwidget.cpp | 20 +- noatun-plugins/nexscope/regionwidget.h | 20 +- noatun-plugins/nexscope/renderers.cpp | 12 +- noatun-plugins/nexscope/renderers.h | 2 +- noatun-plugins/noatunmadness/madness.cpp | 18 +- noatun-plugins/noatunmadness/madness.h | 12 +- noatun-plugins/oblique/base.cpp | 112 ++++++------ noatun-plugins/oblique/base.h | 26 +-- noatun-plugins/oblique/cmodule.cpp | 222 +++++++++++------------ noatun-plugins/oblique/cmodule.h | 36 ++-- noatun-plugins/oblique/file.cpp | 48 ++--- noatun-plugins/oblique/file.h | 18 +- noatun-plugins/oblique/kbuffer.h | 4 +- noatun-plugins/oblique/kdatacollection.cpp | 56 +++--- noatun-plugins/oblique/kdatacollection.h | 40 ++-- noatun-plugins/oblique/kdbt.h | 16 +- noatun-plugins/oblique/menu.cpp | 68 +++---- noatun-plugins/oblique/menu.h | 32 ++-- noatun-plugins/oblique/oblique.cpp | 32 ++-- noatun-plugins/oblique/oblique.h | 10 +- noatun-plugins/oblique/query.cpp | 86 ++++----- noatun-plugins/oblique/query.h | 46 ++--- noatun-plugins/oblique/selector.cpp | 12 +- noatun-plugins/oblique/selector.h | 10 +- noatun-plugins/oblique/tree.cpp | 106 +++++------ noatun-plugins/oblique/tree.h | 38 ++-- noatun-plugins/oblique/view.cpp | 60 +++--- noatun-plugins/oblique/view.h | 16 +- noatun-plugins/pitchablespeed/pitchablespeed.cpp | 20 +- noatun-plugins/pitchablespeed/pitchablespeed.h | 2 +- noatun-plugins/synaescope/cmodule.cpp | 28 +-- noatun-plugins/synaescope/cmodule.h | 6 +- noatun-plugins/synaescope/syna.h | 4 +- noatun-plugins/synaescope/synaescope.cpp | 18 +- noatun-plugins/synaescope/synaescope.h | 4 +- noatun-plugins/synaescope/ui.cpp | 8 +- noatun-plugins/tippercanoe/syna.h | 4 +- noatun-plugins/tippercanoe/synaescope.cpp | 16 +- noatun-plugins/tippercanoe/synaescope.h | 4 +- noatun-plugins/tyler/file.cpp | 10 +- noatun-plugins/tyler/tyler.cpp | 4 +- noatun-plugins/tyler/tyler.h | 4 +- noatun-plugins/wavecapture/wavecapture.cpp | 42 ++--- noatun-plugins/wavecapture/wavecapture.h | 4 +- 92 files changed, 1398 insertions(+), 1398 deletions(-) (limited to 'noatun-plugins') diff --git a/noatun-plugins/alarm/kminutespinbox.cpp b/noatun-plugins/alarm/kminutespinbox.cpp index 3eac84d..72b6d9d 100644 --- a/noatun-plugins/alarm/kminutespinbox.cpp +++ b/noatun-plugins/alarm/kminutespinbox.cpp @@ -23,19 +23,19 @@ #include "kminutespinbox.h" -KMinuteSpinBox::KMinuteSpinBox(int _step, QWidget *_parent, const char *_name) - : QSpinBox(0, 59, _step, _parent, _name) +KMinuteSpinBox::KMinuteSpinBox(int _step, TQWidget *_parent, const char *_name) + : TQSpinBox(0, 59, _step, _parent, _name) { setButtonSymbols(PlusMinus); setWrapping(true); } -QString KMinuteSpinBox::mapValueToText(int v) +TQString KMinuteSpinBox::mapValueToText(int v) { if(v < 10) - return QString("0%1").arg(v); + return TQString("0%1").arg(v); else - return QString::number(v); + return TQString::number(v); } #include "kminutespinbox.moc" diff --git a/noatun-plugins/alarm/kminutespinbox.h b/noatun-plugins/alarm/kminutespinbox.h index 14e2c4f..701caad 100644 --- a/noatun-plugins/alarm/kminutespinbox.h +++ b/noatun-plugins/alarm/kminutespinbox.h @@ -24,15 +24,15 @@ #ifndef KMINUTESPINBOX_H #define KMINUTESPINBOX_H -#include +#include class KMinuteSpinBox : public QSpinBox { Q_OBJECT public: - KMinuteSpinBox(int _step = 1, QWidget *_parent = 0, const char *_name = 0); + KMinuteSpinBox(int _step = 1, TQWidget *_parent = 0, const char *_name = 0); protected: - virtual QString mapValueToText(int v); + virtual TQString mapValueToText(int v); }; #endif diff --git a/noatun-plugins/alarm/kpercentspinbox.cpp b/noatun-plugins/alarm/kpercentspinbox.cpp index 32b5820..3b16c97 100644 --- a/noatun-plugins/alarm/kpercentspinbox.cpp +++ b/noatun-plugins/alarm/kpercentspinbox.cpp @@ -16,20 +16,20 @@ #include "kpercentspinbox.h" -KPercentSpinBox::KPercentSpinBox(int _step, QWidget *_parent, const char *_name) - : QSpinBox(0, 100, _step, _parent, _name) +KPercentSpinBox::KPercentSpinBox(int _step, TQWidget *_parent, const char *_name) + : TQSpinBox(0, 100, _step, _parent, _name) { setButtonSymbols(PlusMinus); } -QString KPercentSpinBox::mapValueToText(int v) +TQString KPercentSpinBox::mapValueToText(int v) { - return QString::number(v)+'%'; + return TQString::number(v)+'%'; } #if 0 int KPercentSpinBox::mapTextToValue(bool *ok) { - QString mapText= text(); + TQString mapText= text(); // mapText.truncate(mapText.length()-1); return mapText.toInt(ok); diff --git a/noatun-plugins/alarm/kpercentspinbox.h b/noatun-plugins/alarm/kpercentspinbox.h index abcdd49..7f1a3a2 100644 --- a/noatun-plugins/alarm/kpercentspinbox.h +++ b/noatun-plugins/alarm/kpercentspinbox.h @@ -17,16 +17,16 @@ #ifndef KPERCENT_SPINBOX_H #define KPERCENT_SPINBOX_H -#include +#include class KPercentSpinBox : public QSpinBox { Q_OBJECT public: - KPercentSpinBox (int _step=1, QWidget *_parent=0, const char *name=0); + KPercentSpinBox (int _step=1, TQWidget *_parent=0, const char *name=0); protected: - virtual QString mapValueToText(int v); + virtual TQString mapValueToText(int v); // virtual int mapTextToValue(bool *ok); }; diff --git a/noatun-plugins/alarm/wakeup.cpp b/noatun-plugins/alarm/wakeup.cpp index 648d3e3..58c478c 100644 --- a/noatun-plugins/alarm/wakeup.cpp +++ b/noatun-plugins/alarm/wakeup.cpp @@ -20,17 +20,17 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include @@ -47,7 +47,7 @@ extern "C" Plugin *create_plugin() Wakeup *Wakeup::wakeme = 0; -Wakeup::Wakeup() : QObject(), Plugin() +Wakeup::Wakeup() : TQObject(), Plugin() { wakeme = this; @@ -56,8 +56,8 @@ Wakeup::Wakeup() : QObject(), Plugin() update(); - QTimer *timer=new QTimer(this); - connect (timer,SIGNAL(timeout()),SLOT(slotCheckTime())); + TQTimer *timer=new TQTimer(this); + connect (timer,TQT_SIGNAL(timeout()),TQT_SLOT(slotCheckTime())); timer->start(60000,false); } @@ -100,11 +100,11 @@ void Wakeup::update() void Wakeup::slotCheckTime() { - QTime t; - QDate d; + TQTime t; + TQDate d; - t=QTime::currentTime(); - d=QDate::currentDate(); + t=TQTime::currentTime(); + d=TQDate::currentDate(); if (t.minute()!=minute[d.dayOfWeek()-1] || t.hour()!=hour[d.dayOfWeek()-1]) return; @@ -125,8 +125,8 @@ void Wakeup::PlayerAct() if (!napp->player()->isPlaying() && modeAlarm!=2) napp->player()->play(); // timer for volume (up/down) according to prefs :-) - volTimer = new QTimer (this); - connect (volTimer,SIGNAL(timeout()), SLOT(slotVolumeChange())); + volTimer = new TQTimer (this); + connect (volTimer,TQT_SIGNAL(timeout()), TQT_SLOT(slotVolumeChange())); volTimer->start(1000,false); // updates volume every seconds @@ -165,52 +165,52 @@ void Wakeup::slotVolumeChange() /////////////////////////////////////////////////////////////////// // Prefs CModule /////////////////////////////////////////////////////////////////// -WakeupPrefs::WakeupPrefs( QObject *parent ) : +WakeupPrefs::WakeupPrefs( TQObject *parent ) : CModule( i18n("Wakeup"), i18n("Alarm Configuration"), "date", parent ) { - QVBoxLayout *layout = new QVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); - QGridLayout *grid = new QGridLayout (layout,8,4); + TQVBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); + TQGridLayout *grid = new TQGridLayout (layout,8,4); - monday=new QCheckBox(i18n("Monday"),this); - tuesday=new QCheckBox(i18n("Tuesday"),this); - wednesday=new QCheckBox(i18n("Wednesday"),this); - thursday=new QCheckBox(i18n("Thursday"),this); - friday=new QCheckBox(i18n("Friday"),this); - saturday=new QCheckBox(i18n("Saturday"),this); - sunday=new QCheckBox(i18n("Sunday"),this); - hour1 = new QSpinBox(0, 23, 1, this , "Hour1"); - hour1->setButtonSymbols(QSpinBox::PlusMinus); + monday=new TQCheckBox(i18n("Monday"),this); + tuesday=new TQCheckBox(i18n("Tuesday"),this); + wednesday=new TQCheckBox(i18n("Wednesday"),this); + thursday=new TQCheckBox(i18n("Thursday"),this); + friday=new TQCheckBox(i18n("Friday"),this); + saturday=new TQCheckBox(i18n("Saturday"),this); + sunday=new TQCheckBox(i18n("Sunday"),this); + hour1 = new TQSpinBox(0, 23, 1, this , "Hour1"); + hour1->setButtonSymbols(TQSpinBox::PlusMinus); minute1 = new KMinuteSpinBox(1, this , "Minute1"); - hour2 = new QSpinBox(0, 23, 1, this, "Hour2"); - hour2->setButtonSymbols(QSpinBox::PlusMinus); + hour2 = new TQSpinBox(0, 23, 1, this, "Hour2"); + hour2->setButtonSymbols(TQSpinBox::PlusMinus); minute2 = new KMinuteSpinBox(1, this, "Minute2"); - hour3 = new QSpinBox(0, 23, 1, this, "Hour3"); - hour3->setButtonSymbols(QSpinBox::PlusMinus); + hour3 = new TQSpinBox(0, 23, 1, this, "Hour3"); + hour3->setButtonSymbols(TQSpinBox::PlusMinus); minute3 = new KMinuteSpinBox(1, this, "Minute3"); - hour4 = new QSpinBox(0, 23, 1, this, "Hour4"); - hour4->setButtonSymbols(QSpinBox::PlusMinus); + hour4 = new TQSpinBox(0, 23, 1, this, "Hour4"); + hour4->setButtonSymbols(TQSpinBox::PlusMinus); minute4 = new KMinuteSpinBox(1, this, "Minute4"); - hour5 = new QSpinBox(0, 23, 1, this, "Hour5"); - hour5->setButtonSymbols(QSpinBox::PlusMinus); + hour5 = new TQSpinBox(0, 23, 1, this, "Hour5"); + hour5->setButtonSymbols(TQSpinBox::PlusMinus); minute5 = new KMinuteSpinBox(1, this, "Minute5"); - hour6 = new QSpinBox(0, 23, 1, this, "Hour6"); - hour6->setButtonSymbols(QSpinBox::PlusMinus); + hour6 = new TQSpinBox(0, 23, 1, this, "Hour6"); + hour6->setButtonSymbols(TQSpinBox::PlusMinus); minute6 = new KMinuteSpinBox(1, this, "Minute6"); - hour7 = new QSpinBox(0, 23, 1, this, "Hour7"); - hour7->setButtonSymbols(QSpinBox::PlusMinus); + hour7 = new TQSpinBox(0, 23, 1, this, "Hour7"); + hour7->setButtonSymbols(TQSpinBox::PlusMinus); minute7 = new KMinuteSpinBox(1, this, "Minute7"); - QLabel *selectday = new QLabel (i18n("Select days:"),this); - QLabel *choosehour = new QLabel (i18n("Hour"),this); - QLabel *choosemin = new QLabel (i18n("Minute"),this); + TQLabel *selectday = new TQLabel (i18n("Select days:"),this); + TQLabel *choosehour = new TQLabel (i18n("Hour"),this); + TQLabel *choosemin = new TQLabel (i18n("Minute"),this); grid->addWidget (selectday,0,0,Qt::AlignLeft); grid->addWidget (choosehour,0,1,Qt::AlignLeft); grid->addWidget (choosemin,0,2,Qt::AlignLeft); - applyall = new QPushButton (this,"applyall"); + applyall = new TQPushButton (this,"applyall"); applyall->setPixmap( BarIcon("down", KIcon::SizeSmall) ); - applyall->setSizePolicy( QSizePolicy( QSizePolicy::Fixed, - QSizePolicy::Fixed, + applyall->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, + TQSizePolicy::Fixed, applyall->sizePolicy().hasHeightForWidth()) ); grid->addWidget (applyall,1,3,Qt::AlignLeft); @@ -237,28 +237,28 @@ WakeupPrefs::WakeupPrefs( QObject *parent ) : grid->addWidget (minute7,7,2,Qt::AlignLeft); grid->setColStretch (0,3); - QButtonGroup *modeGroup = new QButtonGroup (3, Qt::Vertical, i18n ("Volume Control"),this); - alarmmode = new QRadioButton (i18n("No change to volume, just starts the player"),modeGroup); - nightmode = new QRadioButton (i18n("The volume decreases slowly and finally stops the player"),modeGroup); - morningmode = new QRadioButton (i18n("The player starts and the volume increases to the chosen value"),modeGroup); + TQButtonGroup *modeGroup = new TQButtonGroup (3, Qt::Vertical, i18n ("Volume Control"),this); + alarmmode = new TQRadioButton (i18n("No change to volume, just starts the player"),modeGroup); + nightmode = new TQRadioButton (i18n("The volume decreases slowly and finally stops the player"),modeGroup); + morningmode = new TQRadioButton (i18n("The player starts and the volume increases to the chosen value"),modeGroup); modeGroup->setExclusive(true); morningmode->setChecked(true); - volFrame = new QFrame (this); - QLabel *volEndLabel = new QLabel (i18n("Volume increases to:"), volFrame); + volFrame = new TQFrame (this); + TQLabel *volEndLabel = new TQLabel (i18n("Volume increases to:"), volFrame); volEndValue = new KPercentSpinBox (1 ,volFrame,"volendvalue"); layout->addWidget(modeGroup); layout->addWidget(volFrame); layout->addStretch(); - QHBoxLayout *volLayout = new QHBoxLayout(volFrame, KDialog::marginHint(), KDialog::spacingHint()); + TQHBoxLayout *volLayout = new TQHBoxLayout(volFrame, KDialog::marginHint(), KDialog::spacingHint()); volLayout->addWidget(volEndLabel); volLayout->addWidget(volEndValue); volLayout->addStretch(); - connect (morningmode,SIGNAL(stateChanged(int)),SLOT(slotViewFrame(int))); - connect (applyall,SIGNAL(clicked()),SLOT(slotApplyAll())); + connect (morningmode,TQT_SIGNAL(stateChanged(int)),TQT_SLOT(slotViewFrame(int))); + connect (applyall,TQT_SIGNAL(clicked()),TQT_SLOT(slotApplyAll())); load(); } @@ -310,7 +310,7 @@ void WakeupPrefs::save() config->writeEntry("Minute6",minute6->text()); config->writeEntry("Hour7",hour7->text()); config->writeEntry("Minute7",minute7->text()); - QString val(volEndValue->text()); + TQString val(volEndValue->text()); config->writeEntry("VolumeEnd",val); if (nightmode->isChecked()) config->writeEntry("ModeAlarm",2); @@ -349,7 +349,7 @@ void WakeupPrefs::load() hour7->setValue(KGlobal::config()->readNumEntry("Hour7",7)); minute7->setValue(KGlobal::config()->readNumEntry("Minute7",0)); - QString volend(KGlobal::config()->readEntry("VolumeEnd","80%")); + TQString volend(KGlobal::config()->readEntry("VolumeEnd","80%")); volend.truncate(volend.length()-1); volEndValue->setValue(volend.toInt()); diff --git a/noatun-plugins/alarm/wakeup.h b/noatun-plugins/alarm/wakeup.h index e2992a8..65dc644 100644 --- a/noatun-plugins/alarm/wakeup.h +++ b/noatun-plugins/alarm/wakeup.h @@ -20,16 +20,16 @@ #include #include -#include -#include -#include +#include +#include +#include class QSpinBox; class QCheckBox; class KMinuteSpinBox; class KPercentSpinBox; -class Wakeup : public QObject, public Plugin +class Wakeup : public TQObject, public Plugin { Q_OBJECT NOATUNPLUGIND @@ -46,12 +46,12 @@ public slots: void slotCheckTime(); private: - QStringList *day_list; -// QString songlist; + TQStringList *day_list; +// TQString songlist; int hour[7]; int minute[7]; bool days[7]; - QTimer *volTimer; + TQTimer *volTimer; int volEndVal; int modeAlarm; }; @@ -62,7 +62,7 @@ class WakeupPrefs : public CModule Q_OBJECT public: - WakeupPrefs( QObject *parent ); + WakeupPrefs( TQObject *parent ); virtual void save(); virtual void load(); public slots: @@ -70,13 +70,13 @@ public slots: void slotApplyAll(); private: - QCheckBox *monday; - QCheckBox *tuesday; - QCheckBox *wednesday; - QCheckBox *thursday; - QCheckBox *friday; - QCheckBox *saturday; - QCheckBox *sunday; + TQCheckBox *monday; + TQCheckBox *tuesday; + TQCheckBox *wednesday; + TQCheckBox *thursday; + TQCheckBox *friday; + TQCheckBox *saturday; + TQCheckBox *sunday; KMinuteSpinBox *minute1; KMinuteSpinBox *minute2; KMinuteSpinBox *minute3; @@ -84,20 +84,20 @@ private: KMinuteSpinBox *minute5; KMinuteSpinBox *minute6; KMinuteSpinBox *minute7; - QSpinBox *hour1; - QSpinBox *hour2; - QSpinBox *hour3; - QSpinBox *hour4; - QSpinBox *hour5; - QSpinBox *hour6; - QSpinBox *hour7; + TQSpinBox *hour1; + TQSpinBox *hour2; + TQSpinBox *hour3; + TQSpinBox *hour4; + TQSpinBox *hour5; + TQSpinBox *hour6; + TQSpinBox *hour7; KPercentSpinBox *volEndValue; - QRadioButton *alarmmode; - QRadioButton *morningmode; - QRadioButton *nightmode; - QFrame *volFrame; - QPushButton *applyall; + TQRadioButton *alarmmode; + TQRadioButton *morningmode; + TQRadioButton *nightmode; + TQFrame *volFrame; + TQPushButton *applyall; }; #endif // WAKEUP_H diff --git a/noatun-plugins/alsaplayer/configmodule.cpp b/noatun-plugins/alsaplayer/configmodule.cpp index 07c5cfd..6fd02f8 100644 --- a/noatun-plugins/alsaplayer/configmodule.cpp +++ b/noatun-plugins/alsaplayer/configmodule.cpp @@ -24,12 +24,12 @@ #include #include -#include -#include +#include +#include #include "configmodule.h" -AlsaPlayerConfigModule::AlsaPlayerConfigModule(QObject * parent) +AlsaPlayerConfigModule::AlsaPlayerConfigModule(TQObject * parent) : CModule ( @@ -39,9 +39,9 @@ AlsaPlayerConfigModule::AlsaPlayerConfigModule(QObject * parent) parent ) { - scroll_ = new QCheckBox(i18n("Scroll song title"), this); + scroll_ = new TQCheckBox(i18n("Scroll song title"), this); - QVBoxLayout * layout = new QVBoxLayout(this); + TQVBoxLayout * layout = new TQVBoxLayout(this); layout->addWidget(scroll_); diff --git a/noatun-plugins/alsaplayer/configmodule.h b/noatun-plugins/alsaplayer/configmodule.h index 2104fdf..701a699 100644 --- a/noatun-plugins/alsaplayer/configmodule.h +++ b/noatun-plugins/alsaplayer/configmodule.h @@ -33,7 +33,7 @@ class AlsaPlayerConfigModule : public CModule public: - AlsaPlayerConfigModule(QObject *); + AlsaPlayerConfigModule(TQObject *); signals: @@ -46,7 +46,7 @@ class AlsaPlayerConfigModule : public CModule private: - QCheckBox * scroll_; + TQCheckBox * scroll_; }; #endif // ALSAPLAYER_CONFIG_MODULE_H diff --git a/noatun-plugins/alsaplayer/seeker.cpp b/noatun-plugins/alsaplayer/seeker.cpp index 6ffac8c..606b461 100644 --- a/noatun-plugins/alsaplayer/seeker.cpp +++ b/noatun-plugins/alsaplayer/seeker.cpp @@ -20,18 +20,18 @@ * */ -#include +#include #include #include #include "seeker.h" -Seeker::Seeker(QWidget * parent, const char * name) +Seeker::Seeker(TQWidget * parent, const char * name) : L33tSlider(0, 1000, 10, 0, Horizontal, parent, name) { - connect(this, SIGNAL(userChanged(int)), SLOT(slotValueChanged(int))); + connect(this, TQT_SIGNAL(userChanged(int)), TQT_SLOT(slotValueChanged(int))); - connect(napp->player(), SIGNAL(timeout()), SLOT(slotTimeout())); + connect(napp->player(), TQT_SIGNAL(timeout()), TQT_SLOT(slotTimeout())); } Seeker::~Seeker() @@ -52,7 +52,7 @@ void Seeker::slotTimeout() setValue((int)napp->player()->getTime() / 1000 ); } -void Seeker::wheelEvent(QWheelEvent *) +void Seeker::wheelEvent(TQWheelEvent *) { // ignore } diff --git a/noatun-plugins/alsaplayer/seeker.h b/noatun-plugins/alsaplayer/seeker.h index ec5504e..d17a760 100644 --- a/noatun-plugins/alsaplayer/seeker.h +++ b/noatun-plugins/alsaplayer/seeker.h @@ -31,7 +31,7 @@ class Seeker : public L33tSlider public: - Seeker(QWidget * parent, const char * name = 0); + Seeker(TQWidget * parent, const char * name = 0); virtual ~Seeker(); protected slots: @@ -41,7 +41,7 @@ class Seeker : public L33tSlider protected: - void wheelEvent(QWheelEvent *); + void wheelEvent(TQWheelEvent *); private: }; diff --git a/noatun-plugins/alsaplayer/userinterface.cpp b/noatun-plugins/alsaplayer/userinterface.cpp index 1071736..f329c4f 100644 --- a/noatun-plugins/alsaplayer/userinterface.cpp +++ b/noatun-plugins/alsaplayer/userinterface.cpp @@ -28,11 +28,11 @@ #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include @@ -60,92 +60,92 @@ AlsaPlayer::AlsaPlayer() connect ( playlistButton, - SIGNAL(clicked()), + TQT_SIGNAL(clicked()), napp->player(), - SLOT(toggleListView()) + TQT_SLOT(toggleListView()) ); connect ( previousButton, - SIGNAL(clicked()), + TQT_SIGNAL(clicked()), napp->player(), - SLOT(back()) + TQT_SLOT(back()) ); connect ( nextButton, - SIGNAL(clicked()), + TQT_SIGNAL(clicked()), napp->player(), - SLOT(forward()) + TQT_SLOT(forward()) ); connect ( stopButton, - SIGNAL(clicked()), + TQT_SIGNAL(clicked()), napp->player(), - SLOT(stop()) + TQT_SLOT(stop()) ); connect ( playButton, - SIGNAL(clicked()), + TQT_SIGNAL(clicked()), napp->player(), - SLOT(playpause()) + TQT_SLOT(playpause()) ); - connect(napp, SIGNAL(hideYourself()), SLOT(hide())); - connect(napp, SIGNAL(showYourself()), SLOT(show())); + connect(napp, TQT_SIGNAL(hideYourself()), TQT_SLOT(hide())); + connect(napp, TQT_SIGNAL(showYourself()), TQT_SLOT(show())); - connect(napp->player(), SIGNAL(playlistShown()), SLOT(slotPlayListShown())); - connect(napp->player(), SIGNAL(playlistHidden()), SLOT(slotPlayListHidden())); - connect(napp->player(), SIGNAL(playing()), SLOT(slotPlaying())); - connect(napp->player(), SIGNAL(stopped()), SLOT(slotStopped())); - connect(napp->player(), SIGNAL(paused()), SLOT(slotPaused())); + connect(napp->player(), TQT_SIGNAL(playlistShown()), TQT_SLOT(slotPlayListShown())); + connect(napp->player(), TQT_SIGNAL(playlistHidden()), TQT_SLOT(slotPlayListHidden())); + connect(napp->player(), TQT_SIGNAL(playing()), TQT_SLOT(slotPlaying())); + connect(napp->player(), TQT_SIGNAL(stopped()), TQT_SLOT(slotStopped())); + connect(napp->player(), TQT_SIGNAL(paused()), TQT_SLOT(slotPaused())); - connect(napp->player(), SIGNAL(timeout()), SLOT(slotTimeout())); - connect(napp->player(), SIGNAL(changed()), SLOT(slotTrackChanged())); + connect(napp->player(), TQT_SIGNAL(timeout()), TQT_SLOT(slotTimeout())); + connect(napp->player(), TQT_SIGNAL(changed()), TQT_SLOT(slotTrackChanged())); connect ( napp->player(), - SIGNAL(volumeChanged(int)), - SLOT(slotVolumeChanged(int)) + TQT_SIGNAL(volumeChanged(int)), + TQT_SLOT(slotVolumeChanged(int)) ); connect ( new AlsaPlayerConfigModule(this), - SIGNAL(saved()), - SLOT(slotConfigChanged()) + TQT_SIGNAL(saved()), + TQT_SLOT(slotConfigChanged()) ); connect ( volumeSlider, - SIGNAL(valueChanged(int)), + TQT_SIGNAL(valueChanged(int)), napp->player(), - SLOT(setVolume(int)) + TQT_SLOT(setVolume(int)) ); connect ( forwardButton, - SIGNAL(clicked()), - SLOT(slotForward()) + TQT_SIGNAL(clicked()), + TQT_SLOT(slotForward()) ); connect ( pauseButton, - SIGNAL(clicked()), - SLOT(slotPause()) + TQT_SIGNAL(clicked()), + TQT_SLOT(slotPause()) ); - connect(speedSlider, SIGNAL(valueChanged(int)), SLOT(slotSetSpeed(int))); + connect(speedSlider, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotSetSpeed(int))); menuButton->setPopup(NoatunStdAction::ContextMenu::contextMenu()); @@ -165,17 +165,17 @@ AlsaPlayer::~AlsaPlayer() // Empty. } -void AlsaPlayer::closeEvent(QCloseEvent *) +void AlsaPlayer::closeEvent(TQCloseEvent *) { unload(); } -void AlsaPlayer::dragEnterEvent(QDragEnterEvent *event) +void AlsaPlayer::dragEnterEvent(TQDragEnterEvent *event) { event->accept(KURLDrag::canDecode(event)); } -void AlsaPlayer::dropEvent(QDropEvent *event) +void AlsaPlayer::dropEvent(TQDropEvent *event) { KURL::List uri; if (KURLDrag::decode(event, uri)) @@ -185,9 +185,9 @@ void AlsaPlayer::dropEvent(QDropEvent *event) } } -void AlsaPlayer::setTitleText(const QString & s) +void AlsaPlayer::setTitleText(const TQString & s) { - QString titleText + TQString titleText (s.isNull() ? napp->player()->current().title() : s); if (titleLabel->text() != titleText) @@ -196,7 +196,7 @@ void AlsaPlayer::setTitleText(const QString & s) void AlsaPlayer::slotPlaying() { - setTitleText(QString::null); + setTitleText(TQString::null); playButton->setOn(true); stopButton->setEnabled(true); @@ -212,22 +212,22 @@ void AlsaPlayer::slotStopped() void AlsaPlayer::slotPaused() { - setTitleText(QString::null); + setTitleText(TQString::null); stopButton->setEnabled(true); playButton->setOn(false); } -bool AlsaPlayer::eventFilter(QObject *o, QEvent *e) +bool AlsaPlayer::eventFilter(TQObject *o, TQEvent *e) { switch (e->type()) { - case QEvent::MouseButtonPress: - mousePressEvent(static_cast(e)); + case TQEvent::MouseButtonPress: + mousePressEvent(static_cast(e)); break; - case QEvent::Wheel: - wheelEvent(static_cast(e)); + case TQEvent::Wheel: + wheelEvent(static_cast(e)); return true; break; @@ -235,7 +235,7 @@ bool AlsaPlayer::eventFilter(QObject *o, QEvent *e) break; } - return QWidget::eventFilter(o, e); + return TQWidget::eventFilter(o, e); } void AlsaPlayer::slotPlayListShown() @@ -248,7 +248,7 @@ void AlsaPlayer::slotPlayListHidden() playlistButton->setOn(false); } -void AlsaPlayer::mousePressEvent(QMouseEvent * e) +void AlsaPlayer::mousePressEvent(TQMouseEvent * e) { if (e->button() == RightButton) { @@ -256,10 +256,10 @@ void AlsaPlayer::mousePressEvent(QMouseEvent * e) return; } - return QWidget::mousePressEvent(e); + return TQWidget::mousePressEvent(e); } -void AlsaPlayer::wheelEvent(QWheelEvent * e) +void AlsaPlayer::wheelEvent(TQWheelEvent * e) { int newVolume = napp->player()->volume() + (e->delta() / 120); napp->player()->setVolume(newVolume); @@ -272,7 +272,7 @@ void AlsaPlayer::slotConfigChanged() void AlsaPlayer::slotVolumeChanged(int i) { - QString text("%1%"); + TQString text("%1%"); volumeLabel->setText(text.arg(i)); volumeSlider->setValue(i); } @@ -284,9 +284,9 @@ void AlsaPlayer::slotTimeout() if (!napp->player()->current()) return; - setTitleText(QString::null); + setTitleText(TQString::null); - QString lengthText(napp->player()->lengthString()); + TQString lengthText(napp->player()->lengthString()); if (timeLabel->text() != lengthText) timeLabel->setText(lengthText); @@ -312,7 +312,7 @@ void AlsaPlayer::slotSetSpeed(int newSpeed) speed_ = newSpeed; pauseButton->setEnabled(0 != speed_); - speedLabel->setText(QString("%1%").arg(speed_)); + speedLabel->setText(TQString("%1%").arg(speed_)); Arts::PlayObject playobject(napp->player()->engine()->playObject()); Arts::PitchablePlayObject pitchable = Arts::DynamicCast(playobject); diff --git a/noatun-plugins/alsaplayer/userinterface.h b/noatun-plugins/alsaplayer/userinterface.h index 2a97b86..210f16b 100644 --- a/noatun-plugins/alsaplayer/userinterface.h +++ b/noatun-plugins/alsaplayer/userinterface.h @@ -43,7 +43,7 @@ class AlsaPlayer : public APMainWindow, public UserInterface AlsaPlayer(); virtual ~AlsaPlayer(); - void load(const QString & url); + void load(const TQString & url); protected slots: @@ -70,13 +70,13 @@ class AlsaPlayer : public APMainWindow, public UserInterface protected: - virtual void mousePressEvent (QMouseEvent *); - virtual void dragEnterEvent (QDragEnterEvent *); - virtual void dropEvent (QDropEvent *); - virtual void closeEvent (QCloseEvent *); - virtual bool eventFilter (QObject *, QEvent *); - virtual void wheelEvent (QWheelEvent *); - virtual void setTitleText (const QString &); + virtual void mousePressEvent (TQMouseEvent *); + virtual void dragEnterEvent (TQDragEnterEvent *); + virtual void dropEvent (TQDropEvent *); + virtual void closeEvent (TQCloseEvent *); + virtual bool eventFilter (TQObject *, TQEvent *); + virtual void wheelEvent (TQWheelEvent *); + virtual void setTitleText (const TQString &); void loadConfig(); diff --git a/noatun-plugins/charlatan/configmodule.cpp b/noatun-plugins/charlatan/configmodule.cpp index 0b2e178..3624e0b 100644 --- a/noatun-plugins/charlatan/configmodule.cpp +++ b/noatun-plugins/charlatan/configmodule.cpp @@ -24,12 +24,12 @@ #include #include -#include -#include +#include +#include #include "configmodule.h" #include "configmodule.moc" -CharlatanConfigModule::CharlatanConfigModule(QObject * parent) +CharlatanConfigModule::CharlatanConfigModule(TQObject * parent) : CModule ( @@ -39,9 +39,9 @@ CharlatanConfigModule::CharlatanConfigModule(QObject * parent) parent ) { - scroll_ = new QCheckBox(i18n("Scroll song title"), this); + scroll_ = new TQCheckBox(i18n("Scroll song title"), this); - QVBoxLayout * layout = new QVBoxLayout(this); + TQVBoxLayout * layout = new TQVBoxLayout(this); layout->addWidget(scroll_); diff --git a/noatun-plugins/charlatan/configmodule.h b/noatun-plugins/charlatan/configmodule.h index 92b0bf7..b4631da 100644 --- a/noatun-plugins/charlatan/configmodule.h +++ b/noatun-plugins/charlatan/configmodule.h @@ -33,7 +33,7 @@ class CharlatanConfigModule : public CModule public: - CharlatanConfigModule(QObject *); + CharlatanConfigModule(TQObject *); signals: @@ -46,7 +46,7 @@ class CharlatanConfigModule : public CModule private: - QCheckBox * scroll_; + TQCheckBox * scroll_; }; #endif // CHARLATAN_CONFIG_MODULE_H diff --git a/noatun-plugins/charlatan/seeker.cpp b/noatun-plugins/charlatan/seeker.cpp index 4c07411..c5ca084 100644 --- a/noatun-plugins/charlatan/seeker.cpp +++ b/noatun-plugins/charlatan/seeker.cpp @@ -20,25 +20,25 @@ * */ -#include +#include #include #include #include "seeker.h" #include "seeker.moc" -Seeker::Seeker(QWidget * parent) - : QSlider(0, 60, 10, 0, Horizontal, parent), +Seeker::Seeker(TQWidget * parent) + : TQSlider(0, 60, 10, 0, Horizontal, parent), adjusting_(false) { - delayedUpdateTimer_ = new QTimer(this); + delayedUpdateTimer_ = new TQTimer(this); - connect(this, SIGNAL(sliderPressed()), SLOT(slotSliderPressed())); - connect(this, SIGNAL(sliderReleased()), SLOT(slotSliderReleased())); - connect(this, SIGNAL(valueChanged(int)), SLOT(slotValueChanged(int))); + connect(this, TQT_SIGNAL(sliderPressed()), TQT_SLOT(slotSliderPressed())); + connect(this, TQT_SIGNAL(sliderReleased()), TQT_SLOT(slotSliderReleased())); + connect(this, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotValueChanged(int))); - connect(napp->player(), SIGNAL(timeout()), SLOT(slotTimeout())); - connect(delayedUpdateTimer_, SIGNAL(timeout()), SLOT(slotDelayedUpdate())); + connect(napp->player(), TQT_SIGNAL(timeout()), TQT_SLOT(slotTimeout())); + connect(delayedUpdateTimer_, TQT_SIGNAL(timeout()), TQT_SLOT(slotDelayedUpdate())); } Seeker::~Seeker() @@ -73,7 +73,7 @@ Seeker::slotSliderReleased() } void -Seeker::wheelEvent(QWheelEvent *) +Seeker::wheelEvent(TQWheelEvent *) { // Ignore. } diff --git a/noatun-plugins/charlatan/seeker.h b/noatun-plugins/charlatan/seeker.h index ff7af93..c5e6cff 100644 --- a/noatun-plugins/charlatan/seeker.h +++ b/noatun-plugins/charlatan/seeker.h @@ -23,7 +23,7 @@ #ifndef SEEKER_H #define SEEKER_H -#include +#include class QTimer; @@ -33,7 +33,7 @@ class Seeker : public QSlider public: - Seeker(QWidget * parent); + Seeker(TQWidget * parent); virtual ~Seeker(); protected slots: @@ -46,7 +46,7 @@ class Seeker : public QSlider protected: - void wheelEvent(QWheelEvent *); + void wheelEvent(TQWheelEvent *); private: diff --git a/noatun-plugins/charlatan/userinterface.cpp b/noatun-plugins/charlatan/userinterface.cpp index e15a686..b9bb4c1 100644 --- a/noatun-plugins/charlatan/userinterface.cpp +++ b/noatun-plugins/charlatan/userinterface.cpp @@ -27,12 +27,12 @@ #include #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include #include #include @@ -64,43 +64,43 @@ Charlatan::Charlatan() { setAcceptDrops(true); - showingVolumeTimer_ = new QTimer(this); + showingVolumeTimer_ = new TQTimer(this); connect ( showingVolumeTimer_, - SIGNAL(timeout()), - SLOT(slotStopShowingVolume()) + TQT_SIGNAL(timeout()), + TQT_SLOT(slotStopShowingVolume()) ); - playListToggleButton_ = new QToolButton(this); - previousButton_ = new QToolButton(this); - nextButton_ = new QToolButton(this); - stopButton_ = new QToolButton(this); - restartButton_ = new QToolButton(this); - playButton_ = new QToolButton(this); + playListToggleButton_ = new TQToolButton(this); + previousButton_ = new TQToolButton(this); + nextButton_ = new TQToolButton(this); + stopButton_ = new TQToolButton(this); + restartButton_ = new TQToolButton(this); + playButton_ = new TQToolButton(this); seekSlider_ = new Seeker(this); - positionLabel_ = new QLabel(this); + positionLabel_ = new TQLabel(this); titleLabel_ = new ScrollingLabel(i18n("No File Loaded"), this); - playListToggleButton_ ->setPixmap(QPixmap((const char **)px_playlist)); - previousButton_ ->setPixmap(QPixmap((const char **)px_previous)); - nextButton_ ->setPixmap(QPixmap((const char **)px_next)); - stopButton_ ->setPixmap(QPixmap((const char **)px_stop)); - restartButton_ ->setPixmap(QPixmap((const char **)px_restart)); - playButton_ ->setPixmap(QPixmap((const char **)px_play1)); + playListToggleButton_ ->setPixmap(TQPixmap((const char **)px_playlist)); + previousButton_ ->setPixmap(TQPixmap((const char **)px_previous)); + nextButton_ ->setPixmap(TQPixmap((const char **)px_next)); + stopButton_ ->setPixmap(TQPixmap((const char **)px_stop)); + restartButton_ ->setPixmap(TQPixmap((const char **)px_restart)); + playButton_ ->setPixmap(TQPixmap((const char **)px_play1)); playListToggleButton_ ->setToggleButton(true); - QVBoxLayout * mainLayout = new QVBoxLayout(this); + TQVBoxLayout * mainLayout = new TQVBoxLayout(this); mainLayout->addWidget(titleLabel_); mainLayout->addSpacing(2); - QHBoxLayout * positionLayout = new QHBoxLayout(mainLayout); + TQHBoxLayout * positionLayout = new TQHBoxLayout(mainLayout); positionLayout->addWidget(seekSlider_); positionLayout->addSpacing(2); @@ -108,7 +108,7 @@ Charlatan::Charlatan() mainLayout->addSpacing(2); - QHBoxLayout * buttonLayout = new QHBoxLayout(mainLayout); + TQHBoxLayout * buttonLayout = new TQHBoxLayout(mainLayout); buttonLayout->addWidget(playListToggleButton_); buttonLayout->addWidget(previousButton_); @@ -130,68 +130,68 @@ Charlatan::Charlatan() connect ( playListToggleButton_, - SIGNAL(clicked()), + TQT_SIGNAL(clicked()), napp->player(), - SLOT(toggleListView()) + TQT_SLOT(toggleListView()) ); connect ( previousButton_, - SIGNAL(clicked()), + TQT_SIGNAL(clicked()), napp->player(), - SLOT(back()) + TQT_SLOT(back()) ); connect ( nextButton_, - SIGNAL(clicked()), + TQT_SIGNAL(clicked()), napp->player(), - SLOT(forward()) + TQT_SLOT(forward()) ); connect ( stopButton_, - SIGNAL(clicked()), + TQT_SIGNAL(clicked()), napp->player(), - SLOT(stop()) + TQT_SLOT(stop()) ); - connect(restartButton_, SIGNAL(clicked()), SLOT(slotRestart())); + connect(restartButton_, TQT_SIGNAL(clicked()), TQT_SLOT(slotRestart())); connect ( playButton_, - SIGNAL(clicked()), + TQT_SIGNAL(clicked()), napp->player(), - SLOT(playpause()) + TQT_SLOT(playpause()) ); - connect(napp, SIGNAL(hideYourself()), SLOT(hide())); - connect(napp, SIGNAL(showYourself()), SLOT(show())); + connect(napp, TQT_SIGNAL(hideYourself()), TQT_SLOT(hide())); + connect(napp, TQT_SIGNAL(showYourself()), TQT_SLOT(show())); - connect(napp->player(), SIGNAL(playlistShown()), SLOT(slotPlayListShown())); - connect(napp->player(), SIGNAL(playlistHidden()), SLOT(slotPlayListHidden())); - connect(napp->player(), SIGNAL(playing()), SLOT(slotPlaying())); - connect(napp->player(), SIGNAL(stopped()), SLOT(slotStopped())); - connect(napp->player(), SIGNAL(paused()), SLOT(slotPaused())); + connect(napp->player(), TQT_SIGNAL(playlistShown()), TQT_SLOT(slotPlayListShown())); + connect(napp->player(), TQT_SIGNAL(playlistHidden()), TQT_SLOT(slotPlayListHidden())); + connect(napp->player(), TQT_SIGNAL(playing()), TQT_SLOT(slotPlaying())); + connect(napp->player(), TQT_SIGNAL(stopped()), TQT_SLOT(slotStopped())); + connect(napp->player(), TQT_SIGNAL(paused()), TQT_SLOT(slotPaused())); - connect(napp->player(), SIGNAL(timeout()), SLOT(slotTimeout())); + connect(napp->player(), TQT_SIGNAL(timeout()), TQT_SLOT(slotTimeout())); connect ( napp->player(), - SIGNAL(volumeChanged(int)), - SLOT(slotVolumeChanged(int)) + TQT_SIGNAL(volumeChanged(int)), + TQT_SLOT(slotVolumeChanged(int)) ); connect ( new CharlatanConfigModule(this), - SIGNAL(saved()), - SLOT(slotConfigChanged()) + TQT_SIGNAL(saved()), + TQT_SLOT(slotConfigChanged()) ); setCaption(i18n("Noatun")); @@ -201,10 +201,10 @@ Charlatan::Charlatan() loadConfig(); - // Using QAccel, because I don't want any strings associated or + // Using TQAccel, because I don't want any strings associated or // configurability. - QAccel * a = new QAccel(this, "Accelerators"); + TQAccel * a = new TQAccel(this, "Accelerators"); int accelPlay = a->insertItem(Key_Space); int accelNext = a->insertItem(Key_H); @@ -213,12 +213,12 @@ Charlatan::Charlatan() int accelRstt = a->insertItem(Key_Return); int accelQuit = a->insertItem(Key_Q); - a->connectItem(accelPlay, napp->player(), SLOT(playpause())); - a->connectItem(accelNext, napp->player(), SLOT(forward())); - a->connectItem(accelPrev, napp->player(), SLOT(back())); - a->connectItem(accelStop, napp->player(), SLOT(stop())); - a->connectItem(accelRstt, this, SLOT(slotRestart())); - a->connectItem(accelQuit, napp, SLOT(quit())); + a->connectItem(accelPlay, napp->player(), TQT_SLOT(playpause())); + a->connectItem(accelNext, napp->player(), TQT_SLOT(forward())); + a->connectItem(accelPrev, napp->player(), TQT_SLOT(back())); + a->connectItem(accelStop, napp->player(), TQT_SLOT(stop())); + a->connectItem(accelRstt, this, TQT_SLOT(slotRestart())); + a->connectItem(accelQuit, napp, TQT_SLOT(quit())); show(); @@ -230,17 +230,17 @@ Charlatan::~Charlatan() // Empty. } -void Charlatan::closeEvent(QCloseEvent *) +void Charlatan::closeEvent(TQCloseEvent *) { unload(); } -void Charlatan::dragEnterEvent(QDragEnterEvent *event) +void Charlatan::dragEnterEvent(TQDragEnterEvent *event) { event->accept(KURLDrag::canDecode(event)); } -void Charlatan::dropEvent(QDropEvent *event) +void Charlatan::dropEvent(TQDropEvent *event) { KURL::List uri; if (KURLDrag::decode(event, uri)) @@ -251,9 +251,9 @@ void Charlatan::dropEvent(QDropEvent *event) } -void Charlatan::setTitleText(const QString & s) +void Charlatan::setTitleText(const TQString & s) { - QString titleText; + TQString titleText; if (!s.isNull()) { @@ -295,7 +295,7 @@ void Charlatan::slotPlaying() playButton_->setOn(true); stopButton_->setEnabled(true); - playButton_->setPixmap(QPixmap((const char **)px_pause)); + playButton_->setPixmap(TQPixmap((const char **)px_pause)); } void Charlatan::slotStopped() @@ -304,7 +304,7 @@ void Charlatan::slotStopped() stopButton_->setEnabled(false); playButton_->setOn(false); - playButton_->setPixmap(QPixmap((const char **)px_play1)); + playButton_->setPixmap(TQPixmap((const char **)px_play1)); } void Charlatan::slotPaused() @@ -313,15 +313,15 @@ void Charlatan::slotPaused() stopButton_->setEnabled(true); playButton_->setOn(false); - playButton_->setPixmap(QPixmap((const char **)px_play1)); + playButton_->setPixmap(TQPixmap((const char **)px_play1)); } -bool Charlatan::eventFilter(QObject *o, QEvent *e) +bool Charlatan::eventFilter(TQObject *o, TQEvent *e) { switch (e->type()) { - case QEvent::Wheel: - wheelEvent(static_cast(e)); + case TQEvent::Wheel: + wheelEvent(static_cast(e)); return true; break; @@ -329,7 +329,7 @@ bool Charlatan::eventFilter(QObject *o, QEvent *e) break; } - return QWidget::eventFilter(o, e); + return TQWidget::eventFilter(o, e); } void Charlatan::slotPlayListShown() @@ -342,7 +342,7 @@ void Charlatan::slotPlayListHidden() playListToggleButton_->setOn(false); } -void Charlatan::mousePressEvent(QMouseEvent * e) +void Charlatan::mousePressEvent(TQMouseEvent * e) { if (e->button() == RightButton) { @@ -350,10 +350,10 @@ void Charlatan::mousePressEvent(QMouseEvent * e) return; } - return QWidget::mousePressEvent(e); + return TQWidget::mousePressEvent(e); } -void Charlatan::wheelEvent(QWheelEvent * e) +void Charlatan::wheelEvent(TQWheelEvent * e) { int newVolume = napp->player()->volume() + (e->delta() / 120) * 4; napp->player()->setVolume(newVolume); @@ -366,7 +366,7 @@ void Charlatan::slotConfigChanged() void Charlatan::slotVolumeChanged(int i) { - QString message(i18n("Volume: %1").arg(i)); + TQString message(i18n("Volume: %1").arg(i)); showingVolumeTimer_->start(2000, true); titleLabel_->setText(message); @@ -386,7 +386,7 @@ void Charlatan::slotTimeout() setTitleText(); - QString lengthText(napp->player()->lengthString()); + TQString lengthText(napp->player()->lengthString()); if (positionLabel_->text() != lengthText) positionLabel_->setText(lengthText); diff --git a/noatun-plugins/charlatan/userinterface.h b/noatun-plugins/charlatan/userinterface.h index c6a4e06..05882d7 100644 --- a/noatun-plugins/charlatan/userinterface.h +++ b/noatun-plugins/charlatan/userinterface.h @@ -35,7 +35,7 @@ class QLabel; * @author Rik Hemsley * @version 1.0 */ -class Charlatan : public QWidget, public UserInterface +class Charlatan : public TQWidget, public UserInterface { Q_OBJECT @@ -44,7 +44,7 @@ class Charlatan : public QWidget, public UserInterface Charlatan(); virtual ~Charlatan(); - void load(const QString & url); + void load(const TQString & url); protected slots: @@ -67,24 +67,24 @@ class Charlatan : public QWidget, public UserInterface protected: - virtual void mousePressEvent (QMouseEvent *); - virtual void dragEnterEvent (QDragEnterEvent *); - virtual void dropEvent (QDropEvent *); - virtual void closeEvent (QCloseEvent *); - virtual bool eventFilter (QObject *, QEvent *); - virtual void wheelEvent (QWheelEvent *); - virtual void setTitleText (const QString & = QString::null); + virtual void mousePressEvent (TQMouseEvent *); + virtual void dragEnterEvent (TQDragEnterEvent *); + virtual void dropEvent (TQDropEvent *); + virtual void closeEvent (TQCloseEvent *); + virtual bool eventFilter (TQObject *, TQEvent *); + virtual void wheelEvent (TQWheelEvent *); + virtual void setTitleText (const TQString & = TQString::null); void loadConfig(); private: - QToolButton * previousButton_; - QToolButton * stopButton_; - QToolButton * playButton_; - QToolButton * nextButton_; - QToolButton * playListToggleButton_; - QToolButton * restartButton_; + TQToolButton * previousButton_; + TQToolButton * stopButton_; + TQToolButton * playButton_; + TQToolButton * nextButton_; + TQToolButton * playListToggleButton_; + TQToolButton * restartButton_; Seeker * seekSlider_; ScrollingLabel * titleLabel_; diff --git a/noatun-plugins/dub/dub/dub.cpp b/noatun-plugins/dub/dub/dub.cpp index 4faf221..5de4104 100644 --- a/noatun-plugins/dub/dub/dub.cpp +++ b/noatun-plugins/dub/dub/dub.cpp @@ -16,9 +16,9 @@ ***************************************************************************/ // include files for QT -#include -#include -#include +#include +#include +#include // include files for KDE #include @@ -62,17 +62,17 @@ Dub::Dub(DubPlaylist* plist) , shuffle_recursive(this) { connect( view->dirOperator(), - SIGNAL(fileSelected(const KFileItem*)), + TQT_SIGNAL(fileSelected(const KFileItem*)), this, - SLOT(fileSelected(const KFileItem*)) ); + TQT_SLOT(fileSelected(const KFileItem*)) ); connect( dubconfig.prefs->mediaDirectory, - SIGNAL( urlSelected (const QString &) ), + TQT_SIGNAL( urlSelected (const TQString &) ), this, - SLOT( mediaHomeSelected (const QString &) ) ); + TQT_SLOT( mediaHomeSelected (const TQString &) ) ); connect( this, - SIGNAL(setMediaHome(KURL)), + TQT_SIGNAL(setMediaHome(KURL)), view, - SLOT(setDir(KURL)) ); + TQT_SLOT(setDir(KURL)) ); configure_sequencing(); emit setMediaHome(dubconfig.mediaDirectory); } @@ -84,7 +84,7 @@ void Dub::fileSelected(const KFileItem * file) { playlist.setCurrent(file, true); } -void Dub::mediaHomeSelected(const QString& url) { +void Dub::mediaHomeSelected(const TQString& url) { kdDebug(90010) << "media home selected:" << endl; emit setMediaHome( KURL(url) ); } @@ -148,7 +148,7 @@ void Dub::Sequencer::set_file(KFileItem** file, KFileItem* val) { kdDebug(90010) << "set_file to " << val->url() << endl; } -KFileItem* Dub::Linear_Seq::first(QPtrList & items) +KFileItem* Dub::Linear_Seq::first(TQPtrList & items) { // find first file KFileItem* firstFile = 0; @@ -161,7 +161,7 @@ KFileItem* Dub::Linear_Seq::first(QPtrList & items) return firstFile; } -KFileItem* Dub::Linear_Seq::last(QPtrList & items) +KFileItem* Dub::Linear_Seq::last(TQPtrList & items) { // find last file KFileItem* lastFile = 0; @@ -174,7 +174,7 @@ KFileItem* Dub::Linear_Seq::last(QPtrList & items) return lastFile; } -bool Dub::Linear_Seq::find(QPtrList & items, KFileItem* a_file) +bool Dub::Linear_Seq::find(TQPtrList & items, KFileItem* a_file) { // find file for (KFileItem *file=items.first(); file; file=items.next() ) @@ -185,7 +185,7 @@ bool Dub::Linear_Seq::find(QPtrList & items, KFileItem* a_file) return false; } -KFileItem* Dub::Linear_Seq::next(QPtrList & items, +KFileItem* Dub::Linear_Seq::next(TQPtrList & items, KFileItem** active_file) { KFileItem* ret = 0; @@ -211,7 +211,7 @@ KFileItem* Dub::Linear_Seq::next(QPtrList & items, return ret; } -KFileItem* Dub::Linear_Seq::prev(QPtrList & items, +KFileItem* Dub::Linear_Seq::prev(TQPtrList & items, KFileItem** active_file) { KFileItem* ret = 0; @@ -274,16 +274,16 @@ void Dub::Linear_OneDir::prev() } } -Dub::Dir_Node::Dir_Node(QString d, bool forward) +Dub::Dir_Node::Dir_Node(TQString d, bool forward) : dir(d), past_begin(false) { kdDebug(90010) << "cons dir node " << d << endl; // process entry list, form a list of subdirs and normal files file_items.setAutoDelete(true); - QDir dir_obj(dir); + TQDir dir_obj(dir); QFileInfoList* entries = const_cast(dir_obj.entryInfoList()); - for ( QFileInfo *file = entries->first(); file; file = entries->next() ) { + for ( TQFileInfo *file = entries->first(); file; file = entries->next() ) { if (file->isDir() && file->absFilePath().length()>d.length()) { kdDebug(90010) << "dub: dir " << file->absFilePath() << endl; subdirs.append(file->absFilePath()); @@ -330,7 +330,7 @@ Dub::Recursive_Seq::Recursive_Seq() void Dub::Recursive_Seq::init(const KURL & root) { - QString new_root = canonical_path(root.path()); + TQString new_root = canonical_path(root.path()); if (recursion_root != new_root) { // change recursion stack recursion_root = new_root; @@ -341,16 +341,16 @@ void Dub::Recursive_Seq::init(const KURL & root) } // get canonical path, we need this -QString Dub::Recursive_Seq::canonical_path(QString dir) +TQString Dub::Recursive_Seq::canonical_path(TQString dir) { // kdDebug(90010) << "canonical_path " << dir << endl; //assert(dir.isLocalFile()); - QDir path(dir); + TQDir path(dir); return path.canonicalPath(); } // check if dir is contained in the stack -bool Dub::Recursive_Seq::check_dir(QString dir) +bool Dub::Recursive_Seq::check_dir(TQString dir) { kdDebug(90010) << "check_dir " << dir << endl; bool found = false; @@ -362,10 +362,10 @@ bool Dub::Recursive_Seq::check_dir(QString dir) return found; } -bool Dub::Recursive_Seq::push_dir(QString dir, bool forward) +bool Dub::Recursive_Seq::push_dir(TQString dir, bool forward) { kdDebug(90010) << "push_dir " << dir << ", forward?" << forward << endl; - QString cpath = canonical_path(dir); + TQString cpath = canonical_path(dir); if (check_dir(cpath)) // is it in stack? return false; // avoid infinite recursion else { @@ -434,7 +434,7 @@ void Dub::Recursive_Seq::next_preorder() pop_preorder(true); // pop if subtrees done } else { - QString subdir = *top->current_subdir; // we have a subdir + TQString subdir = *top->current_subdir; // we have a subdir push_dir(subdir, true); // push directory w/ forward iterators } } @@ -450,7 +450,7 @@ void Dub::Recursive_Seq::prev_preorder() pop_preorder(false); } else { - QString subdir = *top->current_subdir; + TQString subdir = *top->current_subdir; kdDebug(90010) << "we have children, pushing now " << subdir << endl; push_dir(subdir, false); // push directory w/ backward iterators } @@ -478,7 +478,7 @@ void Dub::Linear_Recursive::next() { assert(!play_stack.isEmpty()); Dir_Node* top = top_dir(); - QString dir = top->dir; + TQString dir = top->dir; top->current_file = top->file_items.next(); kdDebug(90010) << "dub current dir: " << dir << endl; kdDebug(90010) << "dub current file: " << top->current_file << endl; @@ -505,7 +505,7 @@ void Dub::Linear_Recursive::prev() { assert(!play_stack.isEmpty()); Dir_Node* top = top_dir(); - QString dir = top->dir; + TQString dir = top->dir; top->current_file = top->file_items.prev(); kdDebug(90010) << "dub current dir: " << dir << endl; kdDebug(90010) << "dub current file: " << top->current_file << endl; @@ -528,7 +528,7 @@ void Dub::Linear_Recursive::prev() } } -void Dub::Shuffle_OneDir::init(const QString& dir) +void Dub::Shuffle_OneDir::init(const TQString& dir) { if (shuffle_dir != dir) { kdDebug(90010) << "shuffle/onedir init" << endl; @@ -537,7 +537,7 @@ void Dub::Shuffle_OneDir::init(const QString& dir) // make a deep copy items.clear(); - QPtrList & view_items = dub.view->items(); // + TQPtrList & view_items = dub.view->items(); // for (KFileItem *file=view_items.first(); file; file=view_items.next() ) if (file->isFile()) // add only files items.append(new KFileItem(*file)); diff --git a/noatun-plugins/dub/dub/dub.h b/noatun-plugins/dub/dub/dub.h index 5317f86..da220e8 100644 --- a/noatun-plugins/dub/dub/dub.h +++ b/noatun-plugins/dub/dub/dub.h @@ -55,7 +55,7 @@ public: public slots: /** A file selected */ void fileSelected(const KFileItem*); - void mediaHomeSelected(const QString& url); + void mediaHomeSelected(const TQString& url); signals: void setMediaHome(KURL); @@ -106,11 +106,11 @@ private: // linear sequencing subsystem struct Linear_Seq : public Sequencer { Linear_Seq(Dub* d) : Sequencer(d) {} - KFileItem* first(QPtrList & items); - KFileItem* last(QPtrList & items); - KFileItem* next(QPtrList & items, KFileItem** active_file); - KFileItem* prev(QPtrList & items, KFileItem** active_file); - bool find(QPtrList & items, KFileItem* a_file); + KFileItem* first(TQPtrList & items); + KFileItem* last(TQPtrList & items); + KFileItem* next(TQPtrList & items, KFileItem** active_file); + KFileItem* prev(TQPtrList & items, KFileItem** active_file); + bool find(TQPtrList & items, KFileItem* a_file); }; // sequencer that traverses current directory in view order @@ -127,11 +127,11 @@ private: // directory node for recursive play struct Dir_Node { - Dir_Node(QString dir, bool forward = true); - QString dir; - QStringList subdirs; - QStringList::iterator current_subdir; - QPtrList file_items; + Dir_Node(TQString dir, bool forward = true); + TQString dir; + TQStringList subdirs; + TQStringList::iterator current_subdir; + TQPtrList file_items; KFileItem* current_file; void init_traversal(bool forward); bool past_begin; // stupid iterators @@ -141,11 +141,11 @@ private: struct Recursive_Seq { Recursive_Seq(); void init(const KURL & root); - QString canonical_path(QString dir); - bool check_dir(QString dir); + TQString canonical_path(TQString dir); + bool check_dir(TQString dir); Dir_Node* top_dir() { return play_stack.getLast(); } Dir_Node* bottom_dir() { return play_stack.getFirst(); } - bool push_dir(QString dir, bool forward = true); + bool push_dir(TQString dir, bool forward = true); bool pop_dir(); bool advance(bool forward = true); void pop_preorder(bool forward = true); @@ -153,8 +153,8 @@ private: void prev_preorder(); void print_stack(); - QString recursion_root; - QPtrList play_stack; + TQString recursion_root; + TQPtrList play_stack; }; // sequencer to make a preorder walk of the directory tree @@ -175,7 +175,7 @@ private: items.setAutoDelete(true); } virtual ~Shuffle_OneDir() {}; - void init(const QString& dir); + void init(const TQString& dir); KFileItem* first(); void next(); void prev(); @@ -184,7 +184,7 @@ private: int play_index; std::vector play_order; KURL shuffle_dir; - QPtrList items; + TQPtrList items; }; Shuffle_OneDir shuffle_onedir; @@ -198,7 +198,7 @@ private: void next(); void prev(); - QString shuffle_root; + TQString shuffle_root; }; Shuffle_Recursive shuffle_recursive; diff --git a/noatun-plugins/dub/dub/dubapp.cpp b/noatun-plugins/dub/dub/dubapp.cpp index 7097940..4908382 100644 --- a/noatun-plugins/dub/dub/dubapp.cpp +++ b/noatun-plugins/dub/dub/dubapp.cpp @@ -12,9 +12,9 @@ // // include files for QT -#include -#include -#include +#include +#include +#include // include files for KDE #include @@ -34,7 +34,7 @@ #define ID_STATUS_MSG 1 -DubApp::DubApp(QWidget* parent, const char* name) +DubApp::DubApp(TQWidget* parent, const char* name) : KMainWindow(parent, name) { kdDebug(90010) << "cons dubapp" << endl; @@ -54,7 +54,7 @@ DubApp::~DubApp() void DubApp::initActions() { - fileClose = KStdAction::close(this, SLOT(close()), actionCollection()); + fileClose = KStdAction::close(this, TQT_SLOT(close()), actionCollection()); setStandardToolBarMenuEnabled(true); createStandardStatusBarAction(); @@ -83,7 +83,7 @@ void DubApp::initView() // slots -void DubApp::slotStatusMsg(const QString &text) +void DubApp::slotStatusMsg(const TQString &text) { // change status message permanently statusBar()->clear(); @@ -92,7 +92,7 @@ void DubApp::slotStatusMsg(const QString &text) // events -void DubApp::closeEvent(QCloseEvent*) +void DubApp::closeEvent(TQCloseEvent*) { hide(); } diff --git a/noatun-plugins/dub/dub/dubapp.h b/noatun-plugins/dub/dub/dubapp.h index e06a2fe..014d176 100644 --- a/noatun-plugins/dub/dub/dubapp.h +++ b/noatun-plugins/dub/dub/dubapp.h @@ -37,7 +37,7 @@ class DubApp : public KMainWindow public: /** construtor of DubApp, calls all init functions to create the application. */ - DubApp(QWidget* parent, const char* name="Dub Playlist"); + DubApp(TQWidget* parent, const char* name="Dub Playlist"); ~DubApp(); void initActions(); @@ -55,7 +55,7 @@ public: } protected: - virtual void closeEvent(QCloseEvent*e); + virtual void closeEvent(TQCloseEvent*e); private: KConfig *config; @@ -75,7 +75,7 @@ public slots: /** changes the statusbar contents for the standard label permanently, used to indicate current actions. * @param text the text that is displayed in the statusbar */ - void slotStatusMsg(const QString &text); + void slotStatusMsg(const TQString &text); /** get a pointer to view object */ }; diff --git a/noatun-plugins/dub/dub/dubconfigmodule.cpp b/noatun-plugins/dub/dub/dubconfigmodule.cpp index ff1f3dd..581bbf2 100644 --- a/noatun-plugins/dub/dub/dubconfigmodule.cpp +++ b/noatun-plugins/dub/dub/dubconfigmodule.cpp @@ -18,19 +18,19 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include "dubconfigmodule.h" -DubConfigModule::DubConfigModule(QObject* parent) +DubConfigModule::DubConfigModule(TQObject* parent) : CModule(i18n("Dub"), i18n("Folder-Based Playlist"), "noatun", parent) , playMode(oneDir) , playOrder(normal) { - QVBoxLayout *vbox = new QVBoxLayout(this); + TQVBoxLayout *vbox = new TQVBoxLayout(this); vbox->setAutoAdd(true); vbox->setSpacing( 0 ); vbox->setMargin( 0 ); @@ -52,7 +52,7 @@ void DubConfigModule::save(void) mediaDirectory = prefs->mediaDirectory->url(); - QButton* selectedMode = prefs->playMode->selected(); + TQButton* selectedMode = prefs->playMode->selected(); if (selectedMode==prefs->allFiles) playMode = DubConfigModule::allFiles; else @@ -61,7 +61,7 @@ void DubConfigModule::save(void) else playMode = DubConfigModule::oneDir; - QButton* selectedOrder = prefs->playOrder->selected(); + TQButton* selectedOrder = prefs->playOrder->selected(); if (selectedOrder==prefs->shuffle) playOrder = DubConfigModule::shuffle; else diff --git a/noatun-plugins/dub/dub/dubconfigmodule.h b/noatun-plugins/dub/dub/dubconfigmodule.h index cfb662b..1793017 100644 --- a/noatun-plugins/dub/dub/dubconfigmodule.h +++ b/noatun-plugins/dub/dub/dubconfigmodule.h @@ -18,7 +18,7 @@ public: enum PlayOrder { normal, shuffle, repeat, single }; enum PlayMode { allFiles, oneDir, recursiveDir }; - DubConfigModule(QObject *parent); + DubConfigModule(TQObject *parent); ~DubConfigModule(); @@ -28,7 +28,7 @@ public: void apply(); /** The directory in which media files are stored */ - QString mediaDirectory; + TQString mediaDirectory; PlayMode playMode; PlayOrder playOrder; diff --git a/noatun-plugins/dub/dub/dubplaylistitem.cpp b/noatun-plugins/dub/dub/dubplaylistitem.cpp index d38eb24..62d2e5c 100644 --- a/noatun-plugins/dub/dub/dubplaylistitem.cpp +++ b/noatun-plugins/dub/dub/dubplaylistitem.cpp @@ -37,7 +37,7 @@ DubPlaylistItem::~DubPlaylistItem(){ PlaylistItemData::removeRef(); } -QString DubPlaylistItem::property(const QString &key, const QString &def) const { +TQString DubPlaylistItem::property(const TQString &key, const TQString &def) const { // kdDebug(90010) << "property " << key << endl; if (isProperty(key)) { kdDebug(90010) << key << " -> " << property_map.find(key).data() << endl; @@ -47,19 +47,19 @@ QString DubPlaylistItem::property(const QString &key, const QString &def) const return def; } -void DubPlaylistItem::setProperty(const QString &key, const QString &val) { +void DubPlaylistItem::setProperty(const TQString &key, const TQString &val) { // kdDebug(90010) << "set property" << endl; property_map[key] = val; } -void DubPlaylistItem::clearProperty(const QString &key) { +void DubPlaylistItem::clearProperty(const TQString &key) { // kdDebug(90010) << "clear property" << endl; property_map.remove(key); } -QStringList DubPlaylistItem::properties() const { +TQStringList DubPlaylistItem::properties() const { // kdDebug(90010) << "properties" << endl; - QStringList list; + TQStringList list; for (Properties::const_iterator i=property_map.begin(); i!=property_map.end(); i++) { list.append(i.data()); @@ -67,7 +67,7 @@ QStringList DubPlaylistItem::properties() const { return list; } -bool DubPlaylistItem::isProperty(const QString &key) const { +bool DubPlaylistItem::isProperty(const TQString &key) const { // kdDebug(90010) << "is property? " << key << endl; return (property_map.find(key) != property_map.end()); } diff --git a/noatun-plugins/dub/dub/dubplaylistitem.h b/noatun-plugins/dub/dub/dubplaylistitem.h index 6f7a96d..f61daaf 100644 --- a/noatun-plugins/dub/dub/dubplaylistitem.h +++ b/noatun-plugins/dub/dub/dubplaylistitem.h @@ -31,11 +31,11 @@ public: DubPlaylistItem(const KFileItem&); virtual ~DubPlaylistItem(); - virtual QString property(const QString &, const QString & = 0) const; - virtual void setProperty(const QString &, const QString &); - virtual void clearProperty(const QString &); - virtual QStringList properties() const; - virtual bool isProperty(const QString &) const; + virtual TQString property(const TQString &, const TQString & = 0) const; + virtual void setProperty(const TQString &, const TQString &); + virtual void clearProperty(const TQString &); + virtual TQStringList properties() const; + virtual bool isProperty(const TQString &) const; virtual KURL url() const; KFileItem& getFileItem() { return fileItem; @@ -45,10 +45,10 @@ public: private: KFileItem fileItem; - typedef QMap Properties; + typedef TQMap Properties; Properties property_map; -// virtual QString file() const; +// virtual TQString file() const; }; diff --git a/noatun-plugins/dub/dub/dubview.cpp b/noatun-plugins/dub/dub/dubview.cpp index e1e4713..087e92e 100644 --- a/noatun-plugins/dub/dub/dubview.cpp +++ b/noatun-plugins/dub/dub/dubview.cpp @@ -16,8 +16,8 @@ ***************************************************************************/ // include files for Qt -#include -#include +#include +#include #include // application specific includes @@ -26,12 +26,12 @@ #include "dub.h" #include "fileselectorwidget.h" -//DubView::DubView(QWidget *parent, const char *name) : QWidget(parent, name) +//DubView::DubView(TQWidget *parent, const char *name) : TQWidget(parent, name) //{ // setBackgroundMode(PaletteBase); //} -DubView::DubView(QWidget *parent) : FileSelectorWidget(parent) +DubView::DubView(TQWidget *parent) : FileSelectorWidget(parent) { kdDebug(90010) << "dub view cons" << endl; setBackgroundMode(PaletteBase); @@ -41,9 +41,9 @@ DubView::~DubView() { } -void DubView::print(QPrinter *pPrinter) +void DubView::print(TQPrinter *pPrinter) { - QPainter printpainter; + TQPainter printpainter; printpainter.begin(pPrinter); // TODO: add your printing code here @@ -51,9 +51,9 @@ void DubView::print(QPrinter *pPrinter) printpainter.end(); } /** Return item list of view */ -QPtrList& DubView::items() +TQPtrList& DubView::items() { - return const_cast&>( *dirOperator()->view()->items() ); + return const_cast&>( *dirOperator()->view()->items() ); } /** Select a file */ diff --git a/noatun-plugins/dub/dub/dubview.h b/noatun-plugins/dub/dub/dubview.h index c768ca6..079b833 100644 --- a/noatun-plugins/dub/dub/dubview.h +++ b/noatun-plugins/dub/dub/dubview.h @@ -23,7 +23,7 @@ #endif // include files for Qt -#include +#include #include @@ -33,15 +33,15 @@ class DubView : public FileSelectorWidget Q_OBJECT public: /** Constructor for the main view */ - DubView(QWidget *parent = 0); + DubView(TQWidget *parent = 0); /** Destructor for the main view */ ~DubView(); /** contains the implementation for printing functionality */ - void print(QPrinter *pPrinter); + void print(TQPrinter *pPrinter); /** Return item list of view */ - QPtrList& items(); + TQPtrList& items(); /** select a particular file */ void selectFile(KFileItem* file); diff --git a/noatun-plugins/dub/dub/fileselectorwidget.cpp b/noatun-plugins/dub/dub/fileselectorwidget.cpp index 153af20..c030040 100644 --- a/noatun-plugins/dub/dub/fileselectorwidget.cpp +++ b/noatun-plugins/dub/dub/fileselectorwidget.cpp @@ -14,12 +14,12 @@ * * ***************************************************************************/ -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include #include @@ -36,79 +36,79 @@ #include "fileselectorwidget.h" -FileSelectorWidget::FileSelectorWidget(QWidget *parent) - : QWidget(parent, "file selector widget") +FileSelectorWidget::FileSelectorWidget(TQWidget *parent) + : TQWidget(parent, "file selector widget") { // widgets and layout - QVBoxLayout* lo = new QVBoxLayout(this); + TQVBoxLayout* lo = new TQVBoxLayout(this); - QHBox *hlow = new QHBox (this); + TQHBox *hlow = new TQHBox (this); lo->addWidget(hlow); - home = new QPushButton( hlow ); + home = new TQPushButton( hlow ); home->setPixmap(SmallIcon("gohome")); - QToolTip::add(home, i18n("Home folder")); - up = new QPushButton( /*i18n("&Up"),*/ hlow ); + TQToolTip::add(home, i18n("Home folder")); + up = new TQPushButton( /*i18n("&Up"),*/ hlow ); up->setPixmap(SmallIcon("up")); - QToolTip::add(up, i18n("Up one level")); - back = new QPushButton( /*i18n("&Back"),*/ hlow ); + TQToolTip::add(up, i18n("Up one level")); + back = new TQPushButton( /*i18n("&Back"),*/ hlow ); back->setPixmap(SmallIcon("back")); - QToolTip::add(back, i18n("Previous folder")); - forward = new QPushButton( /*i18n("&Next"),*/ hlow ); + TQToolTip::add(back, i18n("Previous folder")); + forward = new TQPushButton( /*i18n("&Next"),*/ hlow ); forward->setPixmap(SmallIcon("forward")); - QToolTip::add(forward, i18n("Next folder")); + TQToolTip::add(forward, i18n("Next folder")); // HACK - QWidget* spacer = new QWidget(hlow); + TQWidget* spacer = new TQWidget(hlow); hlow->setStretchFactor(spacer, 1); hlow->setMaximumHeight(up->height()); cmbPath = new KURLComboBox( KURLComboBox::Directories, true, this, "path combo" ); - cmbPath->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Fixed )); + cmbPath->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed )); KURLCompletion* cmpl = new KURLCompletion(); cmbPath->setCompletionObject( cmpl ); lo->addWidget(cmbPath); - dir = new KDirOperator(QString::null, this, "operator"); + dir = new KDirOperator(TQString::null, this, "operator"); dir->setView(KFile::Detail); lo->addWidget(dir); lo->setStretchFactor(dir, 2); - QHBox* filterBox = new QHBox(this); - filterIcon = new QLabel(filterBox); + TQHBox* filterBox = new TQHBox(this); + filterIcon = new TQLabel(filterBox); filterIcon->setPixmap( BarIcon("filter") ); filter = new KHistoryCombo(filterBox, "filter"); - filter->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Fixed )); + filter->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed )); filterBox->setStretchFactor(filter, 2); lo->addWidget(filterBox); // slots and signals - connect( filter, SIGNAL( activated(const QString&) ), SLOT( slotFilterChange(const QString&) ) ); - connect( filter, SIGNAL( returnPressed(const QString&) ),filter, SLOT( addToHistory(const QString&) ) ); + connect( filter, TQT_SIGNAL( activated(const TQString&) ), TQT_SLOT( slotFilterChange(const TQString&) ) ); + connect( filter, TQT_SIGNAL( returnPressed(const TQString&) ),filter, TQT_SLOT( addToHistory(const TQString&) ) ); - connect( home, SIGNAL( clicked() ), dir, SLOT( home() ) ); - connect( up, SIGNAL( clicked() ), dir, SLOT( cdUp() ) ); - connect( back, SIGNAL( clicked() ), dir, SLOT( back() ) ); - connect( forward, SIGNAL( clicked() ), dir, SLOT( forward() ) ); + connect( home, TQT_SIGNAL( clicked() ), dir, TQT_SLOT( home() ) ); + connect( up, TQT_SIGNAL( clicked() ), dir, TQT_SLOT( cdUp() ) ); + connect( back, TQT_SIGNAL( clicked() ), dir, TQT_SLOT( back() ) ); + connect( forward, TQT_SIGNAL( clicked() ), dir, TQT_SLOT( forward() ) ); - connect( cmbPath, SIGNAL( urlActivated( const KURL& )), - this, SLOT( cmbPathActivated( const KURL& ) )); - connect( cmbPath, SIGNAL( returnPressed( const QString& )), - this, SLOT( cmbPathReturnPressed( const QString& ) )); - connect(dir, SIGNAL(urlEntered(const KURL&)), - this, SLOT(dirUrlEntered(const KURL&)) ); + connect( cmbPath, TQT_SIGNAL( urlActivated( const KURL& )), + this, TQT_SLOT( cmbPathActivated( const KURL& ) )); + connect( cmbPath, TQT_SIGNAL( returnPressed( const TQString& )), + this, TQT_SLOT( cmbPathReturnPressed( const TQString& ) )); + connect(dir, TQT_SIGNAL(urlEntered(const KURL&)), + this, TQT_SLOT(dirUrlEntered(const KURL&)) ); - connect(dir, SIGNAL(finishedLoading()), - this, SLOT(dirFinishedLoading()) ); + connect(dir, TQT_SIGNAL(finishedLoading()), + this, TQT_SLOT(dirFinishedLoading()) ); - connect(dir, SIGNAL(fileHighlighted(const KFileItem *)), - SLOT(fileHighlighted(const KFileItem *))); - connect(dir, SIGNAL(fileSelected(const KFileItem *)), - SLOT(fileSelected(const KFileItem *))); + connect(dir, TQT_SIGNAL(fileHighlighted(const KFileItem *)), + TQT_SLOT(fileHighlighted(const KFileItem *))); + connect(dir, TQT_SIGNAL(fileSelected(const KFileItem *)), + TQT_SLOT(fileSelected(const KFileItem *))); kdDebug(90010) << "connected stuff!" << endl; } @@ -122,7 +122,7 @@ KURL FileSelectorWidget::currentDirectory() return dirLister()->url(); } -void FileSelectorWidget::slotFilterChange( const QString & nf ) +void FileSelectorWidget::slotFilterChange( const TQString & nf ) { dir->setNameFilter( nf ); dir->rereadDir(); @@ -133,7 +133,7 @@ void FileSelectorWidget::cmbPathActivated( const KURL& u ) dir->setURL( u, true ); } -void FileSelectorWidget::cmbPathReturnPressed( const QString& u ) +void FileSelectorWidget::cmbPathReturnPressed( const TQString& u ) { dir->setFocus(); dir->setURL( KURL(u), true ); @@ -143,7 +143,7 @@ void FileSelectorWidget::cmbPathReturnPressed( const QString& u ) void FileSelectorWidget::dirUrlEntered( const KURL& u ) { cmbPath->removeURL( u ); - QStringList urls = cmbPath->urls(); + TQStringList urls = cmbPath->urls(); urls.prepend( u.url() ); while ( urls.count() >= (uint)cmbPath->maxItems() ) urls.remove( urls.last() ); @@ -162,7 +162,7 @@ void FileSelectorWidget::dirFinishedLoading() } -void FileSelectorWidget::focusInEvent(QFocusEvent*) +void FileSelectorWidget::focusInEvent(TQFocusEvent*) { dir->setFocus(); } diff --git a/noatun-plugins/dub/dub/fileselectorwidget.h b/noatun-plugins/dub/dub/fileselectorwidget.h index 724173a..e31b721 100644 --- a/noatun-plugins/dub/dub/fileselectorwidget.h +++ b/noatun-plugins/dub/dub/fileselectorwidget.h @@ -12,16 +12,16 @@ #ifndef _FILESELECTORWIDGET_H_ #define _FILESELECTORWIDGET_H_ -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include -#include -#include +#include +#include #include #include #include @@ -38,7 +38,7 @@ class FileSelectorWidget : public QWidget friend class DubPlayListItem; public: - FileSelectorWidget(QWidget *parent); + FileSelectorWidget(TQWidget *parent); ~FileSelectorWidget(); KDirOperator* dirOperator() {return dir;} @@ -46,12 +46,12 @@ public: KURL currentDirectory(); public slots: - void slotFilterChange(const QString&); + void slotFilterChange(const TQString&); void setDir(KURL); private slots: void cmbPathActivated( const KURL& u ); - void cmbPathReturnPressed( const QString& u ); + void cmbPathReturnPressed( const TQString& u ); void dirUrlEntered( const KURL& u ); void dirFinishedLoading(); void fileHighlighted(const KFileItem *); @@ -59,15 +59,15 @@ private slots: // void setCurrentDocDir(); protected: - void focusInEvent(QFocusEvent*); + void focusInEvent(TQFocusEvent*); private: KURLComboBox *cmbPath; KHistoryCombo * filter; - QLabel* filterIcon; + TQLabel* filterIcon; KDirOperator * dir; - QPushButton *home, *up, *back, *forward, *cfdir; + TQPushButton *home, *up, *back, *forward, *cfdir; }; diff --git a/noatun-plugins/ffrs/ffrs.cpp b/noatun-plugins/ffrs/ffrs.cpp index 5c4282a..38fd56e 100644 --- a/noatun-plugins/ffrs/ffrs.cpp +++ b/noatun-plugins/ffrs/ffrs.cpp @@ -3,12 +3,12 @@ #include #include -#include -#include +#include +#include #include #include -#include -#include +#include +#include #include @@ -21,8 +21,8 @@ extern "C" Plugin *create_plugin() } -View::View(int width, int height, int block, int unblock, QColor front, QColor back, int channel) - : QWidget(0,0, Qt::WStyle_Customize | Qt::WStyle_NoBorder | Qt::WStyle_StaysOnTop | Qt::WType_TopLevel), mChannel(channel) +View::View(int width, int height, int block, int unblock, TQColor front, TQColor back, int channel) + : TQWidget(0,0, Qt::WStyle_Customize | Qt::WStyle_NoBorder | Qt::WStyle_StaysOnTop | Qt::WType_TopLevel), mChannel(channel) { fg = front; bg = back; @@ -33,22 +33,22 @@ View::View(int width, int height, int block, int unblock, QColor front, QColor b KConfig *c = napp->config(); c->setGroup("FFRS"); - QSize size = napp->desktop()->size(); - QRect desktop(0,0, size.width(), size.height()); + TQSize size = napp->desktop()->size(); + TQRect desktop(0,0, size.width(), size.height()); - QPoint at; + TQPoint at; if (channel==0) { - at = QPoint(size.width()-width*4, size.height()-height-32); - QToolTip::add(this, i18n("Left")); + at = TQPoint(size.width()-width*4, size.height()-height-32); + TQToolTip::add(this, i18n("Left")); } else // if (channel==1) { - at = QPoint(size.width()-width*2, size.height()-height-32); - QToolTip::add(this, i18n("Right")); + at = TQPoint(size.width()-width*2, size.height()-height-32); + TQToolTip::add(this, i18n("Right")); } - move(c->readPointEntry("at"+QString::number(mChannel), &at)); + move(c->readPointEntry("at"+TQString::number(mChannel), &at)); // make sure we're on the desktop if ( @@ -60,8 +60,8 @@ View::View(int width, int height, int block, int unblock, QColor front, QColor b } - QBitmap mask(width, height); - QPainter p(&mask); + TQBitmap mask(width, height); + TQPainter p(&mask); // Qt::color0 = transparent // Qt::color1 = opaque @@ -82,24 +82,24 @@ View::~View() { KConfig *c = napp->config(); c->setGroup("FFRS"); - c->writeEntry("at"+QString::number(mChannel), pos()); + c->writeEntry("at"+TQString::number(mChannel), pos()); } -void View::mouseMoveEvent(QMouseEvent *) +void View::mouseMoveEvent(TQMouseEvent *) { if (moving) { - move ( QCursor::pos()-mMousePoint ); + move ( TQCursor::pos()-mMousePoint ); } } -void View::mousePressEvent(QMouseEvent *) +void View::mousePressEvent(TQMouseEvent *) { moving = true; - mMousePoint = mapFromGlobal(QCursor::pos()); + mMousePoint = mapFromGlobal(TQCursor::pos()); } -void View::mouseReleaseEvent(QMouseEvent *) +void View::mouseReleaseEvent(TQMouseEvent *) { moving = false; } @@ -123,19 +123,19 @@ void View::draw(float level) // and draw it (it updates too quickly for it to // need a paintEvent) - QPainter p(this); + TQPainter p(this); p.fillRect(0, 0, w, h-pix, bg); p.fillRect(0, h-pix, w, h - (h-pix), fg); } -FFRS::FFRS() : QObject(), Plugin() +FFRS::FFRS() : TQObject(), Plugin() { dpyleft = dpyright = 0; changed(); prefs = new FFRSPrefs(this); - connect(prefs, SIGNAL(changed()), SLOT(changed())); + connect(prefs, TQT_SIGNAL(changed()), TQT_SLOT(changed())); setSamples(256); @@ -180,53 +180,53 @@ void FFRS::changed() #include #include -#include -#include -#include +#include +#include +#include -FFRSPrefs::FFRSPrefs( QObject *parent ) +FFRSPrefs::FFRSPrefs( TQObject *parent ) : CModule(i18n("Foreign Region"), i18n("French Foreign Region"),"",parent) { - QVBoxLayout *layout = new QVBoxLayout(this); + TQVBoxLayout *layout = new TQVBoxLayout(this); - QHBox *box = new QHBox(this); + TQHBox *box = new TQHBox(this); layout->addWidget(box); - new QLabel(i18n("Width:"), box); + new TQLabel(i18n("Width:"), box); mWidth = new KIntNumInput(width(), box); mWidth->setMinValue(0); - box = new QHBox(this); + box = new TQHBox(this); layout->addWidget(box); - new QLabel(i18n("Height:"), box); + new TQLabel(i18n("Height:"), box); mHeight = new KIntNumInput(height(), box); mHeight->setMinValue(0); - box = new QHBox(this); + box = new TQHBox(this); layout->addWidget(box); - new QLabel(i18n("Visible block size:"), box); + new TQLabel(i18n("Visible block size:"), box); mFgblock = new KIntNumInput(fgblock(), box); mFgblock->setMinValue(0); - box = new QHBox(this); + box = new TQHBox(this); layout->addWidget(box); - new QLabel(i18n("Transparent block size:"), box); + new TQLabel(i18n("Transparent block size:"), box); mBgblock = new KIntNumInput(bgblock(), box); mBgblock->setMinValue(0); - box = new QHBox(this); + box = new TQHBox(this); layout->addWidget(box); - new QLabel(i18n("Update interval:"), box); + new TQLabel(i18n("Update interval:"), box); mRate = new KIntNumInput(rate(), box); mRate->setMinValue(0); - box = new QHBox(this); + box = new TQHBox(this); layout->addWidget(box); - new QLabel(i18n("Foreground color:"), box); + new TQLabel(i18n("Foreground color:"), box); mFgcolor = new KColorButton(fgcolor(), box); - box = new QHBox(this); + box = new TQHBox(this); layout->addWidget(box); - new QLabel(i18n("Background color:"), box); + new TQLabel(i18n("Background color:"), box); mBgcolor = new KColorButton(bgcolor(), box); layout->addStretch(); @@ -285,19 +285,19 @@ int FFRSPrefs::rate() } -QColor FFRSPrefs::bgcolor() +TQColor FFRSPrefs::bgcolor() { KConfig *c = napp->config(); c->setGroup("FFRS"); - QColor dumbass(0, 64, 0); + TQColor dumbass(0, 64, 0); return c->readColorEntry("bgcolor", &dumbass); } -QColor FFRSPrefs::fgcolor() +TQColor FFRSPrefs::fgcolor() { KConfig *c = napp->config(); c->setGroup("FFRS"); - QColor dumbass(0, 255, 0); + TQColor dumbass(0, 255, 0); return c->readColorEntry("fgcolor", &dumbass); } diff --git a/noatun-plugins/ffrs/ffrs.h b/noatun-plugins/ffrs/ffrs.h index b97c576..a29a1c2 100644 --- a/noatun-plugins/ffrs/ffrs.h +++ b/noatun-plugins/ffrs/ffrs.h @@ -9,26 +9,26 @@ class View : public QWidget { Q_OBJECT public: - View(int width, int height, int block, int unblock, QColor front, QColor back, int channel); + View(int width, int height, int block, int unblock, TQColor front, TQColor back, int channel); ~View(); void draw(float intensity); - virtual void mouseMoveEvent(QMouseEvent *e); - virtual void mousePressEvent(QMouseEvent *e); - virtual void mouseReleaseEvent(QMouseEvent *e); + virtual void mouseMoveEvent(TQMouseEvent *e); + virtual void mousePressEvent(TQMouseEvent *e); + virtual void mouseReleaseEvent(TQMouseEvent *e); private: int units; - QColor fg, bg; + TQColor fg, bg; bool moving; - QPoint mMousePoint; + TQPoint mMousePoint; int mChannel; }; class FFRSPrefs; -class FFRS : public QObject, public Plugin, public StereoScope +class FFRS : public TQObject, public Plugin, public StereoScope { Q_OBJECT @@ -55,7 +55,7 @@ class FFRSPrefs : public CModule Q_OBJECT public: - FFRSPrefs( QObject *parent ); + FFRSPrefs( TQObject *parent ); virtual void save(); int width(); @@ -64,8 +64,8 @@ public: int bgblock(); int rate(); - QColor bgcolor(); - QColor fgcolor(); + TQColor bgcolor(); + TQColor fgcolor(); signals: void changed(); diff --git a/noatun-plugins/luckytag/luckytag.h b/noatun-plugins/luckytag/luckytag.h index 964cd8d..6a4c1c1 100644 --- a/noatun-plugins/luckytag/luckytag.h +++ b/noatun-plugins/luckytag/luckytag.h @@ -22,7 +22,7 @@ #include #include -#include +#include class LuckyTagger : public Tags, public Plugin { diff --git a/noatun-plugins/luckytag/parsedmp3filename.cpp b/noatun-plugins/luckytag/parsedmp3filename.cpp index a3006bd..1c75958 100644 --- a/noatun-plugins/luckytag/parsedmp3filename.cpp +++ b/noatun-plugins/luckytag/parsedmp3filename.cpp @@ -19,17 +19,17 @@ #include "parsedmp3filename.h" -#include -#include +#include +#include #include -ParsedMP3FileName::ParsedMP3FileName(const QString &path) +ParsedMP3FileName::ParsedMP3FileName(const TQString &path) { KURL url = path; - QString fileName = url.fileName(false); - m_directories = QStringList::split("/", url.directory()); + TQString fileName = url.fileName(false); + m_directories = TQStringList::split("/", url.directory()); if (fileName.startsWith("(") && fileName.contains(")")) { @@ -80,9 +80,9 @@ void ParsedMP3FileName::validateArtist() m_album = m_directories.last(); } -QString ParsedMP3FileName::beautifyString(const QString &s) +TQString ParsedMP3FileName::beautifyString(const TQString &s) { - QString temp = s.lower().simplifyWhiteSpace(); + TQString temp = s.lower().simplifyWhiteSpace(); temp[0] = temp[0].upper(); diff --git a/noatun-plugins/luckytag/parsedmp3filename.h b/noatun-plugins/luckytag/parsedmp3filename.h index 5dc2809..7c8b83e 100644 --- a/noatun-plugins/luckytag/parsedmp3filename.h +++ b/noatun-plugins/luckytag/parsedmp3filename.h @@ -20,30 +20,30 @@ #ifndef PARSEDMP3FILENAME_H #define PARSEDMP3FILENAME_H -#include +#include class ParsedMP3FileName { public: - ParsedMP3FileName(const QString &); + ParsedMP3FileName(const TQString &); ~ParsedMP3FileName() {} - QString title() const { return m_title; } - QString artist() const { return m_artist; } - QString album() const { return m_album; } - QString comment() const { return m_comment; } + TQString title() const { return m_title; } + TQString artist() const { return m_artist; } + TQString album() const { return m_album; } + TQString comment() const { return m_comment; } protected: - QString m_title; - QString m_artist; - QString m_album; - QString m_comment; + TQString m_title; + TQString m_artist; + TQString m_album; + TQString m_comment; private: void validateArtist(); - QString beautifyString(const QString &); + TQString beautifyString(const TQString &); - QStringList m_directories; + TQStringList m_directories; }; #endif diff --git a/noatun-plugins/lyrics/cmodule.cpp b/noatun-plugins/lyrics/cmodule.cpp index 2501ebb..efc2d77 100644 --- a/noatun-plugins/lyrics/cmodule.cpp +++ b/noatun-plugins/lyrics/cmodule.cpp @@ -1,11 +1,11 @@ #include "cmodule.h" #include "lyrics.h" -#include -#include -#include +#include +#include +#include #include -#include -#include +#include +#include #include #include #include @@ -44,47 +44,47 @@ const char *const DEFAULT_QUERY = "http://everything2.com/index.pl?node=$(author)," "http://www.letssingit.com/cgi-exe/am.cgi?a=search&p=1&s=$(title)&l=song"; -LyricsCModule::LyricsCModule(QObject *_parent) : CModule(i18n("Lyrics"), i18n("Configure Lyrics Plugin"), "document", _parent) { +LyricsCModule::LyricsCModule(TQObject *_parent) : CModule(i18n("Lyrics"), i18n("Configure Lyrics Plugin"), "document", _parent) { /* Thanks to the kde-usability guys for the help designing this dialog! * help to simon edwards of KGuardGod, for a big help designing it */ - QVBoxLayout *vlayout = new QVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); - QHBoxLayout *hlayout = new QHBoxLayout(vlayout, KDialog::spacingHint()); + TQVBoxLayout *vlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); + TQHBoxLayout *hlayout = new TQHBoxLayout(vlayout, KDialog::spacingHint()); vlayout->setStretchFactor( hlayout, 1 ); // Search box - QVBoxLayout *boxlayout = new QVBoxLayout( hlayout, KDialog::spacingHint() ); - boxlayout->addWidget( new QLabel( i18n("Search providers:" ), this ) ); + TQVBoxLayout *boxlayout = new TQVBoxLayout( hlayout, KDialog::spacingHint() ); + boxlayout->addWidget( new TQLabel( i18n("Search providers:" ), this ) ); providersBox = new KListBox( this, "providersBox" ); boxlayout->addWidget(providersBox); boxButtons = new KButtonBox( this, Vertical ); - boxButtons->addButton( i18n( "New Search Provider" ), this, SLOT( newSearch() ) ); - boxButtons->addButton( i18n( "Delete Search Provider" ), this, SLOT( delSearch() ) ); - boxButtons->addButton( i18n( "Move Up" ), this, SLOT( moveUpSearch() ) ); - boxButtons->addButton( i18n( "Move Down" ), this, SLOT( moveDownSearch() ) ); + boxButtons->addButton( i18n( "New Search Provider" ), this, TQT_SLOT( newSearch() ) ); + boxButtons->addButton( i18n( "Delete Search Provider" ), this, TQT_SLOT( delSearch() ) ); + boxButtons->addButton( i18n( "Move Up" ), this, TQT_SLOT( moveUpSearch() ) ); + boxButtons->addButton( i18n( "Move Down" ), this, TQT_SLOT( moveDownSearch() ) ); boxButtons->layout(); boxlayout->addWidget( boxButtons ); // Edit box - QGroupBox *propBox = new QVGroupBox( i18n("Search Provider Properties" ), this ); - QGrid *editGrid = new QGrid(2, propBox ); + TQGroupBox *propBox = new TQVGroupBox( i18n("Search Provider Properties" ), this ); + TQGrid *editGrid = new TQGrid(2, propBox ); editGrid->setSpacing( propBox->insideSpacing() ); - new QLabel( i18n( "Name:" ), editGrid ); + new TQLabel( i18n( "Name:" ), editGrid ); nameEdit = new KLineEdit( editGrid ); - new QLabel( i18n( "Query:" ), editGrid ); + new TQLabel( i18n( "Query:" ), editGrid ); queryEdit = new KLineEdit( editGrid ); /* ATTENTION to translators: * The property names can't be translated. This means that $(author) must be kept as $(author), $(title) as $(title), etc, or it won't work.*/ - QLabel *textLabel = new QLabel(i18n("For your query, you can use any property of your multimedia item, just enclosing it with a $(property).\n\nSome common properties used are $(title), $(author) and $(album). For example, to search in Google for the author, title and track, just use:\nhttp://www.google.com/search?q=$(author)+$(title)+$(track)"), propBox, "textLabel"); + TQLabel *textLabel = new TQLabel(i18n("For your query, you can use any property of your multimedia item, just enclosing it with a $(property).\n\nSome common properties used are $(title), $(author) and $(album). For example, to search in Google for the author, title and track, just use:\nhttp://www.google.com/search?q=$(author)+$(title)+$(track)"), propBox, "textLabel"); textLabel->setAlignment(Qt::WordBreak); hlayout->addWidget( propBox, 1 ); /* Signal/slots */ nameEdit->setEnabled( false ); queryEdit->setEnabled( false ); - connect( providersBox, SIGNAL( highlighted( QListBoxItem * ) ), this, SLOT( selected( QListBoxItem * ) ) ); - connect( nameEdit, SIGNAL( textChanged( const QString &) ), this, SLOT( nameChanged( const QString & ) ) ); - connect( queryEdit, SIGNAL( textChanged( const QString & ) ), this, SLOT( queryChanged( const QString & ) ) ); + connect( providersBox, TQT_SIGNAL( highlighted( TQListBoxItem * ) ), this, TQT_SLOT( selected( TQListBoxItem * ) ) ); + connect( nameEdit, TQT_SIGNAL( textChanged( const TQString &) ), this, TQT_SLOT( nameChanged( const TQString & ) ) ); + connect( queryEdit, TQT_SIGNAL( textChanged( const TQString & ) ), this, TQT_SLOT( queryChanged( const TQString & ) ) ); @@ -93,7 +93,7 @@ LyricsCModule::LyricsCModule(QObject *_parent) : CModule(i18n("Lyrics"), i18n("C save(); } -void LyricsCModule::newSearch(QString name, QString query) { +void LyricsCModule::newSearch(TQString name, TQString query) { kdDebug(90020) << "New search" << endl; SearchProvider s = { name, query }; mProviders.push_back( s ); @@ -105,7 +105,7 @@ void LyricsCModule::newSearch(QString name, QString query) { //X providersBox->setCurrentItem( 0 ); } -void LyricsCModule::selected( QListBoxItem *i ) { +void LyricsCModule::selected( TQListBoxItem *i ) { kdDebug(90020) << "selected" << endl; int index = providersBox->index( i ); if ( index < 0 ) @@ -123,7 +123,7 @@ void LyricsCModule::delSearch() { return; } int index = providersBox->currentItem(); - QValueVector::iterator it; + TQValueVector::iterator it; for ( it = mProviders.begin(); ( *it ).name != mProviders[ index ].name || ( *it ).url != mProviders[ index ].url; ++it ); mProviders.erase( it ); providersBox->removeItem( index ); @@ -134,8 +134,8 @@ void LyricsCModule::moveUpSearch() { if ( providersBox->currentItem() <= 0 ) return; int index = providersBox->currentItem(); - QString name = mProviders[ index ].name; - QString url = mProviders[ index ].url; + TQString name = mProviders[ index ].name; + TQString url = mProviders[ index ].url; mProviders[ index ].name = mProviders[ index-1 ].name; mProviders[ index ].url = mProviders[ index-1 ].url; mProviders[ index-1 ].name = name; @@ -149,8 +149,8 @@ void LyricsCModule::moveDownSearch() { if ( static_cast( providersBox->currentItem() ) >= providersBox->count()-1 ) return; int index = providersBox->currentItem(); - QString name = mProviders[ index ].name; - QString url = mProviders[ index ].url; + TQString name = mProviders[ index ].name; + TQString url = mProviders[ index ].url; mProviders[ index ].name = mProviders[ index+1 ].name; mProviders[ index ].url = mProviders[ index+1 ].url; mProviders[ index+1 ].name = name; @@ -160,7 +160,7 @@ void LyricsCModule::moveDownSearch() { providersBox->setSelected( index+1, true ); } -void LyricsCModule::nameChanged( const QString &name ) { +void LyricsCModule::nameChanged( const TQString &name ) { kdDebug(90020) << "name changed" << endl; if ( providersBox->currentItem() < 0 ) return; @@ -169,7 +169,7 @@ void LyricsCModule::nameChanged( const QString &name ) { providersBox->changeItem( name, providersBox->currentItem() ); } -void LyricsCModule::queryChanged( const QString &query ) { +void LyricsCModule::queryChanged( const TQString &query ) { kdDebug(90020) << "query changed" << endl; if ( providersBox->currentItem() < 0 ) return; @@ -180,8 +180,8 @@ void LyricsCModule::queryChanged( const QString &query ) { void LyricsCModule::save() { KConfig *conf = KGlobal::config(); conf->setGroup( "Lyrics" ); - QStringList queryList, nameList; - QValueVector::iterator it; + TQStringList queryList, nameList; + TQValueVector::iterator it; for ( it = mProviders.begin(); it != mProviders.end(); ++it ) { kdDebug(90020) << "query:" << ( *it ).url << endl; queryList += ( *it ).url; @@ -196,7 +196,7 @@ void LyricsCModule::save() { } void LyricsCModule::reopen() { - QStringList queryList, nameList; + TQStringList queryList, nameList; KConfig *conf = KGlobal::config(); mProviders.clear(); providersBox->clear(); @@ -205,10 +205,10 @@ void LyricsCModule::reopen() { queryList = conf->readListEntry( "queryList" ); nameList = conf->readListEntry( "nameList" ); if ( queryList.count() == 0 && nameList.count() == 0 ) { - queryList = QStringList::split( ",", DEFAULT_QUERY ); - nameList = QStringList::split( ",", DEFAULT_NAME ); + queryList = TQStringList::split( ",", DEFAULT_QUERY ); + nameList = TQStringList::split( ",", DEFAULT_NAME ); } - QStringList::Iterator queryIt, nameIt; + TQStringList::Iterator queryIt, nameIt; for ( queryIt = queryList.begin(), nameIt = nameList.begin(); queryIt != queryList.end() && nameIt != nameList.end(); ++queryIt, ++nameIt ) { kdDebug(90020) << "Read:" << *queryIt << " and " << *nameIt << endl; newSearch( *nameIt, *queryIt ); diff --git a/noatun-plugins/lyrics/cmodule.h b/noatun-plugins/lyrics/cmodule.h index dbb2da7..a7fdc08 100644 --- a/noatun-plugins/lyrics/cmodule.h +++ b/noatun-plugins/lyrics/cmodule.h @@ -2,7 +2,7 @@ #define _LYRICSCMODULE_H_ #include -#include +#include #include class KLineEdit; @@ -10,30 +10,30 @@ class KListBox; class KButtonBox; struct SearchProvider { - QString name; - QString url; + TQString name; + TQString url; }; class LyricsCModule : public CModule { Q_OBJECT public: - LyricsCModule(QObject *_parent); + LyricsCModule(TQObject *_parent); public slots: virtual void save(void); virtual void reopen(void); - void newSearch(QString name = i18n( "New Search Provider" ), QString query = ""); + void newSearch(TQString name = i18n( "New Search Provider" ), TQString query = ""); void delSearch(); void moveUpSearch(); void moveDownSearch(); - void selected( QListBoxItem *i ); - void nameChanged( const QString &name ); - void queryChanged( const QString &query ); + void selected( TQListBoxItem *i ); + void nameChanged( const TQString &name ); + void queryChanged( const TQString &query ); protected: KListBox *providersBox; KButtonBox *boxButtons; KLineEdit *nameEdit; KLineEdit *queryEdit; - QValueVector mProviders; + TQValueVector mProviders; }; diff --git a/noatun-plugins/lyrics/historymanager.cpp b/noatun-plugins/lyrics/historymanager.cpp index 1524d7b..629466d 100644 --- a/noatun-plugins/lyrics/historymanager.cpp +++ b/noatun-plugins/lyrics/historymanager.cpp @@ -4,7 +4,7 @@ *** TODO: Add more complex support (like in Konqueror) Maybe use Konqueror's History Manager */ -HistoryManager::HistoryManager(QObject *parent) : QObject(parent) { +HistoryManager::HistoryManager(TQObject *parent) : TQObject(parent) { } HistoryManager::~HistoryManager() { diff --git a/noatun-plugins/lyrics/historymanager.h b/noatun-plugins/lyrics/historymanager.h index d2fdb29..910e463 100644 --- a/noatun-plugins/lyrics/historymanager.h +++ b/noatun-plugins/lyrics/historymanager.h @@ -2,13 +2,13 @@ #define _HISTORY_MANAGER_H #include -#include -#include +#include +#include -class HistoryManager : public QObject { +class HistoryManager : public TQObject { Q_OBJECT public: - HistoryManager(QObject *parent = NULL); + HistoryManager(TQObject *parent = NULL); ~HistoryManager(); KURL back(); KURL forward(); @@ -20,8 +20,8 @@ class HistoryManager : public QObject { signals: void uiChanged(int, bool); protected: - QValueStack back_stack; - QValueStack forward_stack; + TQValueStack back_stack; + TQValueStack forward_stack; KURL currentURL; }; diff --git a/noatun-plugins/lyrics/lyrics.cpp b/noatun-plugins/lyrics/lyrics.cpp index 611db9c..1c7a05b 100644 --- a/noatun-plugins/lyrics/lyrics.cpp +++ b/noatun-plugins/lyrics/lyrics.cpp @@ -5,7 +5,7 @@ #include #include #include -#include +#include #include "lyrics.h" #include #include @@ -27,25 +27,25 @@ Lyrics::Lyrics() : KMainWindow(), Plugin(), active(false) { lyrics = this; /* Create default actions */ - (void)KStdAction::close(this, SLOT(close()), actionCollection()); - ( void )KStdAction::goTo( this, SLOT( goTo() ), actionCollection(), "go_web_goTo" ); - //(void)KStdAction::print(this, SLOT(print()), actionCollection()); - //(void)KStdAction::printPreview(this, SLOT(printPreview()), actionCollection()); - //(void)KStdAction::mail(this, SLOT(mail()), actionCollection()); - //(void)KStdAction::find(this, SLOT(find()), actionCollection()); + (void)KStdAction::close(this, TQT_SLOT(close()), actionCollection()); + ( void )KStdAction::goTo( this, TQT_SLOT( goTo() ), actionCollection(), "go_web_goTo" ); + //(void)KStdAction::print(this, TQT_SLOT(print()), actionCollection()); + //(void)KStdAction::printPreview(this, TQT_SLOT(printPreview()), actionCollection()); + //(void)KStdAction::mail(this, TQT_SLOT(mail()), actionCollection()); + //(void)KStdAction::find(this, TQT_SLOT(find()), actionCollection()); follow_act = new KToggleAction(i18n("&Follow Noatun Playlist"), "goto", 0, actionCollection(), "follow"); - KStdAction::redisplay(this, SLOT(viewLyrics()), actionCollection()); + KStdAction::redisplay(this, TQT_SLOT(viewLyrics()), actionCollection()); attach_act = new KToggleAction(i18n("&Link URL to File"), "attach", KShortcut("CTRL+ALT+A"), actionCollection(), "attach_url"); - connect(attach_act, SIGNAL(toggled(bool)), this, SLOT(attach(bool))); - back_act = KStdAction::back(this, SLOT(back()), actionCollection()); + connect(attach_act, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(attach(bool))); + back_act = KStdAction::back(this, TQT_SLOT(back()), actionCollection()); back_act->setEnabled(false); - forward_act = KStdAction::forward(this, SLOT(forward()), actionCollection()); + forward_act = KStdAction::forward(this, TQT_SLOT(forward()), actionCollection()); forward_act->setEnabled(false); - new KWidgetAction( new QLabel(i18n("Search provider:"), this, "kde toolbar widget"), i18n("Search Provider"), 0, 0, 0, actionCollection(), "search_label"); - site_act = new KSelectAction(i18n("&Search Provider"), 0, this, SLOT(viewLyrics()), actionCollection(), "search_provider"); + new KWidgetAction( new TQLabel(i18n("Search provider:"), this, "kde toolbar widget"), i18n("Search Provider"), 0, 0, 0, actionCollection(), "search_label"); + site_act = new KSelectAction(i18n("&Search Provider"), 0, this, TQT_SLOT(viewLyrics()), actionCollection(), "search_provider"); /* Add entry to menu */ - menuID = napp->pluginMenuAdd(i18n("&View Lyrics"), this, SLOT(viewLyrics())); + menuID = napp->pluginMenuAdd(i18n("&View Lyrics"), this, TQT_SLOT(viewLyrics())); /* Create history manager and htmlpart */ history = new HistoryManager(this); @@ -53,11 +53,11 @@ Lyrics::Lyrics() : KMainWindow(), Plugin(), active(false) //htmlpart->view()->setMinimumSize(350, 420); /* Connect signals/slots */ - connect( htmlpart->browserExtension(), SIGNAL(openURLRequestDelayed( const KURL &, const KParts::URLArgs & )), this, SLOT(openURLRequest( const KURL &, const KParts::URLArgs & ))); - connect( htmlpart, SIGNAL(started(KIO::Job *)), this, SLOT(loadingURL(KIO::Job *)) ); - connect( htmlpart, SIGNAL(completed()), this, SLOT(loadedURL()) ); - connect( history, SIGNAL(uiChanged(int, bool)), this, SLOT(changeUI(int, bool)) ); - connect( napp->player(), SIGNAL(newSong()), this, SLOT(newSong()) ); + connect( htmlpart->browserExtension(), TQT_SIGNAL(openURLRequestDelayed( const KURL &, const KParts::URLArgs & )), this, TQT_SLOT(openURLRequest( const KURL &, const KParts::URLArgs & ))); + connect( htmlpart, TQT_SIGNAL(started(KIO::Job *)), this, TQT_SLOT(loadingURL(KIO::Job *)) ); + connect( htmlpart, TQT_SIGNAL(completed()), this, TQT_SLOT(loadedURL()) ); + connect( history, TQT_SIGNAL(uiChanged(int, bool)), this, TQT_SLOT(changeUI(int, bool)) ); + connect( napp->player(), TQT_SIGNAL(newSong()), this, TQT_SLOT(newSong()) ); /* Status bar */ statusBar()->insertItem(i18n("Ready"), 0, 1); @@ -79,14 +79,14 @@ Lyrics::Lyrics() : KMainWindow(), Plugin(), active(false) void Lyrics::goTo() { bool sel = false; - QString url = KLineEditDlg::getText( i18n( "Please enter the URL you want to go to:" ), htmlpart->url().prettyURL(), &sel, this ); + TQString url = KLineEditDlg::getText( i18n( "Please enter the URL you want to go to:" ), htmlpart->url().prettyURL(), &sel, this ); if ( !url.isEmpty() && sel ) go( KURL( url ) ); } -void Lyrics::setProviders( QValueVector &sites ) { +void Lyrics::setProviders( TQValueVector &sites ) { mSites = sites; - QStringList sitesName; + TQStringList sitesName; for (unsigned int i = 0; i < mSites.size(); ++i) { sitesName += mSites[i].name; } @@ -98,7 +98,7 @@ void Lyrics::attach(bool a) { if ( !napp->player()->current() ) return; if (a) { - KMessageBox::information(this, i18n("Choosing this option, the current URL will be attached to the current file. This way, if you try to view the lyrics of this file later, you won't have to search for it again. This information can be stored between sessions, as long as your playlist stores metadata about the multimedia items (almost all the playlists do). If you want to be able to search for other lyrics for this music, you must select this option again to clear the stored URL."), QString::null, "lyrics::attach_info"); + KMessageBox::information(this, i18n("Choosing this option, the current URL will be attached to the current file. This way, if you try to view the lyrics of this file later, you won't have to search for it again. This information can be stored between sessions, as long as your playlist stores metadata about the multimedia items (almost all the playlists do). If you want to be able to search for other lyrics for this music, you must select this option again to clear the stored URL."), TQString::null, "lyrics::attach_info"); kdDebug(90020) << "Setting URL for (attach)" << napp->player()->current().title() << endl; napp->player()->current().setProperty("Lyrics::URL", htmlpart->url().url()); site_act->setEnabled(false); @@ -181,21 +181,21 @@ void Lyrics::viewLyrics(int index) return; } //X (if the above information is incorrect, the search may not find the correct music. If that's the case, use a tag editor to fix it. Hint: Use the luckytag plugin from the kdeaddons module to try to guess title, author and album from the song filename)
- QString url, name; + TQString url, name; if (index < 0) index = site_act->currentItem(); if ( index < 0 ) return; url = mSites[index].url; name = mSites[index].name; - QRegExp props_regexp("\\$\\((\\w+)\\)"); + TQRegExp props_regexp("\\$\\((\\w+)\\)"); int pos = props_regexp.search(url); while (pos >= 0) { - QString property = props_regexp.cap(1); + TQString property = props_regexp.cap(1); url.replace(pos, props_regexp.matchedLength(), napp->player()->current().property(property)); pos = props_regexp.search(url); } - QString title(napp->player()->current().property("title")); + TQString title(napp->player()->current().property("title")); setCaption(i18n("Loading Lyrics for %1").arg(title)); // Check if we have a music playing if (napp->player()->current()) { @@ -213,7 +213,7 @@ void Lyrics::viewLyrics(int index) if (napp->player()->current().property("Lyrics::URL").isEmpty()) { /* Use the query one */ _url = url; - _url.setQuery(_url.query().replace(QRegExp("%20"), "+")); + _url.setQuery(_url.query().replace(TQRegExp("%20"), "+")); kdDebug(90020) << "I'm using the query url" << endl; attach_act->setChecked(false); site_act->setEnabled(true); @@ -221,7 +221,7 @@ void Lyrics::viewLyrics(int index) htmlpart->write( i18n( "

Searching at %1
(%2)

" ).arg( name ).arg( _url.prettyURL() ).arg( _url.url() ) ); } else { _url = napp->player()->current().property("Lyrics::URL"); - _url.setQuery(_url.query().replace(QRegExp("%20"), "+")); + _url.setQuery(_url.query().replace(TQRegExp("%20"), "+")); kdDebug(90020) << "I'm using the stored url" << endl; attach_act->setChecked(true); site_act->setEnabled(false); @@ -232,7 +232,7 @@ void Lyrics::viewLyrics(int index) htmlpart->end(); go(_url); this->show(); - KMessageBox::information( this, i18n( "In order to find the lyrics for the current song, this plugin uses the properties stored with each song, such as its title, author and album. These properties are usually retrieved by a tag reader, but in some cases they may not be present or be incorrect. In that case, the Lyrics plugin will not be able to find the lyrics until these properties are fixed (you can fix them using the tag editor).\nHint: The lucky tag plugin, present in the kdeaddons module, can try to guess properties such as title and author from the filename of a song. Enabling it may increase the probability of finding lyrics." ), QString::null, "Lyrics::usage_info" ); + KMessageBox::information( this, i18n( "In order to find the lyrics for the current song, this plugin uses the properties stored with each song, such as its title, author and album. These properties are usually retrieved by a tag reader, but in some cases they may not be present or be incorrect. In that case, the Lyrics plugin will not be able to find the lyrics until these properties are fixed (you can fix them using the tag editor).\nHint: The lucky tag plugin, present in the kdeaddons module, can try to guess properties such as title and author from the filename of a song. Enabling it may increase the probability of finding lyrics." ), TQString::null, "Lyrics::usage_info" ); active = true; } } diff --git a/noatun-plugins/lyrics/lyrics.h b/noatun-plugins/lyrics/lyrics.h index 9454604..362c7a4 100644 --- a/noatun-plugins/lyrics/lyrics.h +++ b/noatun-plugins/lyrics/lyrics.h @@ -5,7 +5,7 @@ #include #include #include -#include +#include #include #include #include "cmodule.h" @@ -19,7 +19,7 @@ public: Lyrics(); ~Lyrics(); void go(const KURL &); - void setProviders( QValueVector &sites ); + void setProviders( TQValueVector &sites ); public slots: void viewLyrics(int index = -1); @@ -45,7 +45,7 @@ private: KToggleAction *attach_act; KSelectAction *site_act; KHTMLPart *htmlpart; - QValueVector mSites; + TQValueVector mSites; HistoryManager *history; bool active; diff --git a/noatun-plugins/nexscope/bitmappool.cpp b/noatun-plugins/nexscope/bitmappool.cpp index 0a0ad78..45f35d0 100644 --- a/noatun-plugins/nexscope/bitmappool.cpp +++ b/noatun-plugins/nexscope/bitmappool.cpp @@ -22,7 +22,7 @@ Bitmap *BitmapPool::get(bool clear) { mMutex.lock(); BitmapPool::PoolItem *p=0; - for (QPtrListIterator i(mBitmaps); i.current(); ++i) + for (TQPtrListIterator i(mBitmaps); i.current(); ++i) { if (!(*i)->used) p=*i; @@ -44,7 +44,7 @@ Bitmap *BitmapPool::get(bool clear) void BitmapPool::release(Bitmap *bitmap) { mMutex.lock(); - for (QPtrListIterator i(mBitmaps); i.current(); ++i) + for (TQPtrListIterator i(mBitmaps); i.current(); ++i) { if (&((*i)->bitmap)==bitmap) (*i)->used=false; diff --git a/noatun-plugins/nexscope/gui.cpp b/noatun-plugins/nexscope/gui.cpp index 912d8ea..9a4776e 100644 --- a/noatun-plugins/nexscope/gui.cpp +++ b/noatun-plugins/nexscope/gui.cpp @@ -1,7 +1,7 @@ #include -#include -#include -#include +#include +#include +#include #include #include #include @@ -13,8 +13,8 @@ class CreatorItem : public QListViewItem { public: - CreatorItem(QListView *parent, const QString &title) - : QListViewItem(parent, title) + CreatorItem(TQListView *parent, const TQString &title) + : TQListViewItem(parent, title) {} }; @@ -22,7 +22,7 @@ class TreeItem : public QListViewItem { public: TreeItem(TreeItem *parent, TreeItem *after, CreatorItem *creator) - : QListViewItem(parent, after, creator->text(0)) + : TQListViewItem(parent, after, creator->text(0)) { RendererList *list; if (parent) @@ -42,8 +42,8 @@ public: list->unlock(); } - TreeItem(QListView *parent, TreeItem *after, const QString &title) - : QListViewItem(parent, after, title) + TreeItem(TQListView *parent, TreeItem *after, const TQString &title) + : TQListViewItem(parent, after, title) { mRenderer=nex->rendererList(); setExpandable(true); @@ -72,27 +72,27 @@ Control::Control() : mConfigurator(0) { { KToolBar *tools=toolBar(); - KStdAction::save(this, SLOT(save()), actionCollection())->plug(tools); - KStdAction::saveAs(this, SLOT(saveAs()), actionCollection())->plug(tools); - KStdAction::open(this, SLOT(open()), actionCollection())->plug(tools); + KStdAction::save(this, TQT_SLOT(save()), actionCollection())->plug(tools); + KStdAction::saveAs(this, TQT_SLOT(saveAs()), actionCollection())->plug(tools); + KStdAction::open(this, TQT_SLOT(open()), actionCollection())->plug(tools); } setCaption(i18n("Nex Configuration")); - QSplitter *mainSplitter=new QSplitter(this); + TQSplitter *mainSplitter=new TQSplitter(this); setCentralWidget(mainSplitter); - QSplitter *left=new QSplitter(Qt::Vertical, mainSplitter); + TQSplitter *left=new TQSplitter(Qt::Vertical, mainSplitter); { mTree=new RendererListView(left); mTree->setItemsMovable(true); mTree->setSorting(-1); mTree->setRootIsDecorated(true); - connect(mTree, SIGNAL(dropped(QDropEvent*, QListViewItem*, QListViewItem*)), - SLOT(dropEvent(QDropEvent*, QListViewItem*, QListViewItem*))); + connect(mTree, TQT_SIGNAL(dropped(TQDropEvent*, TQListViewItem*, TQListViewItem*)), + TQT_SLOT(dropEvent(TQDropEvent*, TQListViewItem*, TQListViewItem*))); - connect(mTree, SIGNAL(currentChanged(QListViewItem*)), - SLOT(currentChanged(QListViewItem*))); + connect(mTree, TQT_SIGNAL(currentChanged(TQListViewItem*)), + TQT_SLOT(currentChanged(TQListViewItem*))); mCreatorsList=new RendererListView(left); mCreatorsList->addColumn(i18n("Name")); @@ -100,11 +100,11 @@ Control::Control() : mConfigurator(0) mCreatorsList->setDropVisualizer(false); } - mRight=new QWidget(mainSplitter); - (new QHBoxLayout(mRight))->setAutoAdd(true); + mRight=new TQWidget(mainSplitter); + (new TQHBoxLayout(mRight))->setAutoAdd(true); - QStringList list=nex->renderers(); - for (QStringList::Iterator i=list.begin(); i!=list.end(); ++i) + TQStringList list=nex->renderers(); + for (TQStringList::Iterator i=list.begin(); i!=list.end(); ++i) addCreator(*i); new TreeItem(mTree, 0, i18n("Main")); @@ -144,12 +144,12 @@ void Control::open(const KURL &file) } -void Control::addCreator(const QString &title) +void Control::addCreator(const TQString &title) { new CreatorItem(mCreatorsList, title); } -void Control::dropEvent(QDropEvent *e, QListViewItem *parent, QListViewItem *pafter) +void Control::dropEvent(TQDropEvent *e, TQListViewItem *parent, TQListViewItem *pafter) { // if ((e->source() == mCreatorsList) && parent) { @@ -163,7 +163,7 @@ void Control::dropEvent(QDropEvent *e, QListViewItem *parent, QListViewItem *paf } } -void Control::currentChanged(QListViewItem *item) +void Control::currentChanged(TQListViewItem *item) { TreeItem *treeItem=static_cast(item); delete mConfigurator; @@ -173,24 +173,24 @@ void Control::currentChanged(QListViewItem *item) } -RendererListView::RendererListView(QWidget *p) : KListView(p) +RendererListView::RendererListView(TQWidget *p) : KListView(p) { addColumn(i18n("Name")); header()->hide(); setDragEnabled(true); setAcceptDrops(true); - setSelectionMode(QListView::Single); + setSelectionMode(TQListView::Single); } -bool RendererListView::acceptDrag(QDropEvent *event) const +bool RendererListView::acceptDrag(TQDropEvent *event) const { - return true; //QCString(event->format()) == "application/x-nex-rendererdrag"; + return true; //TQCString(event->format()) == "application/x-nex-rendererdrag"; } -QDragObject *RendererListView::dragObject() const +TQDragObject *RendererListView::dragObject() const { if (!currentItem()) return 0; - return new QStoredDrag("application/x-nex-rendererdrag", (QWidget*)this); + return new TQStoredDrag("application/x-nex-rendererdrag", (TQWidget*)this); } diff --git a/noatun-plugins/nexscope/gui.h b/noatun-plugins/nexscope/gui.h index 84fd2bf..3fea2ae 100644 --- a/noatun-plugins/nexscope/gui.h +++ b/noatun-plugins/nexscope/gui.h @@ -3,8 +3,8 @@ #include #include -#include -#include +#include +#include #include #include @@ -17,7 +17,7 @@ Q_OBJECT public: Control(); - void addCreator(const QString &title); + void addCreator(const TQString &title); public slots: void save(const KURL &file); @@ -28,13 +28,13 @@ public slots: void open(const KURL &file); protected slots: - void dropEvent(QDropEvent *e, QListViewItem *parent, QListViewItem *pafter); - void currentChanged(QListViewItem *item); + void dropEvent(TQDropEvent *e, TQListViewItem *parent, TQListViewItem *pafter); + void currentChanged(TQListViewItem *item); private: - QWidget *mRight; + TQWidget *mRight; KListView *mTree, *mCreatorsList; - QWidget *mConfigurator; + TQWidget *mConfigurator; KURL mCurrentURL; }; @@ -43,11 +43,11 @@ class RendererListView : public KListView { Q_OBJECT public: - RendererListView(QWidget *p); + RendererListView(TQWidget *p); protected: - virtual bool acceptDrag(QDropEvent *event) const; - virtual QDragObject *dragObject() const; + virtual bool acceptDrag(TQDropEvent *event) const; + virtual TQDragObject *dragObject() const; }; diff --git a/noatun-plugins/nexscope/nex.cpp b/noatun-plugins/nexscope/nex.cpp index af19409..c152c95 100644 --- a/noatun-plugins/nexscope/nex.cpp +++ b/noatun-plugins/nexscope/nex.cpp @@ -8,16 +8,16 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include "renderers.h" Mutex runLock; Nex *Nex::sNex=0; -QTime timer; +TQTime timer; Renderer::Renderer() {} Renderer::~Renderer() {} @@ -56,13 +56,13 @@ int Thread::threadRun(void *v) return t->run(); } -NexCheckBox::NexCheckBox(QWidget *parent, - const QString &name, bool *v) - : QCheckBox(name, parent) +NexCheckBox::NexCheckBox(TQWidget *parent, + const TQString &name, bool *v) + : TQCheckBox(name, parent) { value=v; setChecked(*v); - connect(this, SIGNAL(toggled(bool)), SLOT(change(bool))); + connect(this, TQT_SIGNAL(toggled(bool)), TQT_SLOT(change(bool))); } void NexCheckBox::change(bool b) { @@ -71,16 +71,16 @@ void NexCheckBox::change(bool b) -NexColorButton::NexColorButton(QWidget *parent, Pixel *color) +NexColorButton::NexColorButton(TQWidget *parent, Pixel *color) : KColorButton(parent) { c=color; - QColor temp( (*c >> 16) & 0xFF, (*c >> 8) & 0xFF, *c & 0xFF); + TQColor temp( (*c >> 16) & 0xFF, (*c >> 8) & 0xFF, *c & 0xFF); setColor(temp); - connect(this, SIGNAL(changed(const QColor&)), SLOT(change(const QColor&))); + connect(this, TQT_SIGNAL(changed(const TQColor&)), TQT_SLOT(change(const TQColor&))); } -void NexColorButton::change(const QColor &co) +void NexColorButton::change(const TQColor &co) { *c= COLOR(qRed(co.rgb()), qGreen(co.rgb()), qBlue(co.rgb())); } @@ -313,7 +313,7 @@ Bitmap *RendererList::render(float *pcm[4], Bitmap *source) if (mClearAfter) mFrame->clear(); lock(); - for (QPtrListIterator i(mRendererList); i.current(); ++i) + for (TQPtrListIterator i(mRendererList); i.current(); ++i) { Bitmap *newframe=(*i)->render(pcm, mFrame); @@ -359,14 +359,14 @@ Bitmap *RendererList::render(float *pcm[4], Bitmap *source) return source; } -void RendererList::save(QDomElement &e) +void RendererList::save(TQDomElement &e) { lock(); e.setTagName("List"); - for (QPtrListIterator i(mRendererList); *i; ++i) + for (TQPtrListIterator i(mRendererList); *i; ++i) { - QDomElement item; + TQDomElement item; (*i)->save(item); e.appendChild(item); } @@ -374,14 +374,14 @@ void RendererList::save(QDomElement &e) unlock(); } -void RendererList::load(const QDomElement &e) +void RendererList::load(const TQDomElement &e) { lock(); - for (QDomNode n=e.firstChild(); !n.isNull(); n=n.nextSibling()) + for (TQDomNode n=e.firstChild(); !n.isNull(); n=n.nextSibling()) { if (!n.isElement()) continue; - QDomElement child=n.toElement(); + TQDomElement child=n.toElement(); Renderer *r=0; @@ -401,31 +401,31 @@ void RendererList::load(const QDomElement &e) -QWidget *RendererList::configure(QWidget *parent) +TQWidget *RendererList::configure(TQWidget *parent) { return new RendererListConfigurator(this, parent); } -RendererListConfigurator::RendererListConfigurator(RendererList *l, QWidget *parent) - : QWidget(parent), mList(l) +RendererListConfigurator::RendererListConfigurator(RendererList *l, TQWidget *parent) + : TQWidget(parent), mList(l) { - (new QVBoxLayout(this))->setAutoAdd(true); - mErase=new QCheckBox(i18n("&Erase between frames"), this); - connect(mErase, SIGNAL(toggled(bool)), SLOT(eraseOn(bool))); + (new TQVBoxLayout(this))->setAutoAdd(true); + mErase=new TQCheckBox(i18n("&Erase between frames"), this); + connect(mErase, TQT_SIGNAL(toggled(bool)), TQT_SLOT(eraseOn(bool))); mErase->setChecked(mList->mClearAfter); if (nex->rendererList()==l) { - QCheckBox *mConvolve=new QCheckBox(i18n("&Convolve audio"), this); - connect(mConvolve, SIGNAL(toggled(bool)), SLOT(convolve(bool))); + TQCheckBox *mConvolve=new TQCheckBox(i18n("&Convolve audio"), this); + connect(mConvolve, TQT_SIGNAL(toggled(bool)), TQT_SLOT(convolve(bool))); mConvolve->setChecked(nex->input()->convolve()); } - new QLabel(i18n("Comments"), this); + new TQLabel(i18n("Comments"), this); - mComments=new QMultiLineEdit(this); + mComments=new TQMultiLineEdit(this); mComments->setText(l->mComments); - mComments->setWordWrap(QMultiLineEdit::WidgetWidth); + mComments->setWordWrap(TQMultiLineEdit::WidgetWidth); } RendererListConfigurator::~RendererListConfigurator() @@ -488,7 +488,7 @@ void Nex::go() frame=mBitmapPool->get(true); int frames=0; - QTime start(QTime::currentTime()); + TQTime start(TQTime::currentTime()); while (1) { @@ -506,7 +506,7 @@ void Nex::go() std::cerr << "Deleted" << std::endl; std::cout << "Frames per Second: " - << frames/start.secsTo(QTime::currentTime()) << std::endl; + << frames/start.secsTo(TQTime::currentTime()) << std::endl; return; case OutputSDL::Resize: // setupSize(width, height); @@ -520,7 +520,7 @@ void Nex::go() } -Renderer *Nex::renderer(const QString &name) +Renderer *Nex::renderer(const TQString &name) { CreatorSig **sig=mCreators[name]; if (sig) @@ -529,10 +529,10 @@ Renderer *Nex::renderer(const QString &name) return 0; } -QStringList Nex::renderers() const +TQStringList Nex::renderers() const { - QDictIterator i(mCreators); - QStringList list; + TQDictIterator i(mCreators); + TQStringList list; for (;i.current(); ++i) list += i.currentKey(); diff --git a/noatun-plugins/nexscope/nex.h b/noatun-plugins/nexscope/nex.h index 05c7f81..81fd680 100644 --- a/noatun-plugins/nexscope/nex.h +++ b/noatun-plugins/nexscope/nex.h @@ -1,16 +1,16 @@ #ifndef NEX_H #define NEX_H -#include -#include +#include +#include #include #include -#include +#include -#include +#include #include -#include +#include #include "SDL.h" #include "SDL_thread.h" @@ -20,8 +20,8 @@ typedef uint8_t Byte; #define COLOR(r,g,b) ((r<<16) | (g<<8) | (b)) #define COLORSTR(pixel) \ - QString("#%1%2%3").arg(QString::number((pixel>>16) & 8, 16)) \ - .arg(QString::number((pixel>>8) & 8, 16)).arg(QString::number(pixel& 8, 16)) + TQString("#%1%2%3").arg(TQString::number((pixel>>16) & 8, 16)) \ + .arg(TQString::number((pixel>>8) & 8, 16)).arg(TQString::number(pixel& 8, 16)) #define STRCOLOR(pixel) \ Pixel(((pixel.mid(1,2).toInt(0, 16)) <<16) \ @@ -76,10 +76,10 @@ class Spacer : public QWidget { Q_OBJECT public: - Spacer(QWidget *parent) : QWidget(parent) + Spacer(TQWidget *parent) : TQWidget(parent) { - setSizePolicy(QSizePolicy(QSizePolicy::MinimumExpanding, - QSizePolicy::MinimumExpanding)); + setSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, + TQSizePolicy::MinimumExpanding)); } }; @@ -153,7 +153,7 @@ public: private: struct PoolItem; - QPtrList mBitmaps; + TQPtrList mBitmaps; Mutex mMutex; }; @@ -198,7 +198,7 @@ private: float fhtTab[(samples-256)*2]; bool ok; - QObject *notifier; + TQObject *notifier; }; class OutputSDL @@ -217,14 +217,14 @@ private: static SDL_Surface *surface; }; -#include +#include #include class NexCheckBox : public QCheckBox { Q_OBJECT public: - NexCheckBox(QWidget *parent, const QString &, bool *v); + NexCheckBox(TQWidget *parent, const TQString &, bool *v); private slots: void change(bool b); @@ -238,10 +238,10 @@ class NexColorButton : public KColorButton { Q_OBJECT public: - NexColorButton(QWidget *parent, Pixel *color); + NexColorButton(TQWidget *parent, Pixel *color); private slots: - void change(const QColor &c); + void change(const TQColor &c); private: Pixel *c; @@ -255,11 +255,11 @@ public: virtual Bitmap *render(float *pcm[4], Bitmap *source) = 0; - virtual QWidget *configure(QWidget*) { return 0; } + virtual TQWidget *configure(TQWidget*) { return 0; } - virtual void save(QDomElement &) {} + virtual void save(TQDomElement &) {} - virtual void load(const QDomElement &) {} + virtual void load(const TQDomElement &) {} }; class QCheckBox; @@ -270,7 +270,7 @@ class RendererListConfigurator : public QWidget { Q_OBJECT public: - RendererListConfigurator(RendererList *l, QWidget *parent); + RendererListConfigurator(RendererList *l, TQWidget *parent); ~RendererListConfigurator(); public slots: @@ -278,8 +278,8 @@ public slots: void convolve(bool state); private: - QCheckBox *mErase; - QMultiLineEdit *mComments; + TQCheckBox *mErase; + TQMultiLineEdit *mComments; RendererList *mList; }; @@ -293,22 +293,22 @@ public: virtual ~RendererList(); virtual Bitmap *render(float *pcm[4], Bitmap *source); - QPtrList &renderers() { return mRendererList; } - const QPtrList &renderers() const { return mRendererList; } + TQPtrList &renderers() { return mRendererList; } + const TQPtrList &renderers() const { return mRendererList; } bool clearAfter() const { return mClearAfter; } void setClearAfter(bool b) { mClearAfter=b; } - virtual QWidget *configure(QWidget *parent); + virtual TQWidget *configure(TQWidget *parent); - virtual void save(QDomElement &e); + virtual void save(TQDomElement &e); - virtual void load(const QDomElement &e); + virtual void load(const TQDomElement &e); private: - QPtrList mRendererList; + TQPtrList mRendererList; volatile bool mClearAfter; - QString mComments; + TQString mComments; Bitmap *mFrame; }; @@ -331,9 +331,9 @@ public: Input *input() { return mInput; } - Renderer *renderer(const QString &name); + Renderer *renderer(const TQString &name); - QStringList renderers() const; + TQStringList renderers() const; public: static Nex *sNex; @@ -343,7 +343,7 @@ private: OutputSDL mOutput; BitmapPool *mBitmapPool; RendererList *mRendererList; - QDict mCreators; + TQDict mCreators; }; #define nex Nex::nex() diff --git a/noatun-plugins/nexscope/noatunplugin.cpp b/noatun-plugins/nexscope/noatunplugin.cpp index 8bbc860..e0b3d28 100644 --- a/noatun-plugins/nexscope/noatunplugin.cpp +++ b/noatun-plugins/nexscope/noatunplugin.cpp @@ -18,7 +18,7 @@ Plugin *create_plugin() NexPlugin::NexPlugin() { - connect(&process, SIGNAL(processExited(KProcess *)), this, SLOT(processExited(KProcess *))); + connect(&process, TQT_SIGNAL(processExited(KProcess *)), this, TQT_SLOT(processExited(KProcess *))); } NexPlugin::~NexPlugin() diff --git a/noatun-plugins/nexscope/noatunplugin.h b/noatun-plugins/nexscope/noatunplugin.h index 8f8abb2..d1b0ec8 100644 --- a/noatun-plugins/nexscope/noatunplugin.h +++ b/noatun-plugins/nexscope/noatunplugin.h @@ -4,7 +4,7 @@ #include #include -class NexPlugin : public QObject, public Plugin +class NexPlugin : public TQObject, public Plugin { Q_OBJECT diff --git a/noatun-plugins/nexscope/regionwidget.cpp b/noatun-plugins/nexscope/regionwidget.cpp index 32e9987..119096b 100644 --- a/noatun-plugins/nexscope/regionwidget.cpp +++ b/noatun-plugins/nexscope/regionwidget.cpp @@ -1,23 +1,23 @@ #include "regionwidget.h" -RegionWidget::RegionWidget(QWidget *parent) +RegionWidget::RegionWidget(TQWidget *parent) { } -RegionWidget::RegionWidget(const QSize &viewsize, QWidget *parent) +RegionWidget::RegionWidget(const TQSize &viewsize, TQWidget *parent) { } -RegionWidget::RegionWidget(int x, int y, int w, int h, const QSize &viewsize, - QWidget *parent) +RegionWidget::RegionWidget(int x, int y, int w, int h, const TQSize &viewsize, + TQWidget *parent) { } -RegionWidget::RegionWidget(const QRect ®ion, const QSize &viewsize, - QWidget *parent) +RegionWidget::RegionWidget(const TQRect ®ion, const TQSize &viewsize, + TQWidget *parent) { } @@ -28,9 +28,9 @@ RegionWidget::~RegionWidget() } -QRect RegionWidget::region() const +TQRect RegionWidget::region() const { - return QRect(0,0,0,0); + return TQRect(0,0,0,0); } void RegionWidget::setX(int x) @@ -53,12 +53,12 @@ void RegionWidget::setHeight(int h) } -void RegionWidget::setRegion(const QRect ®ion) +void RegionWidget::setRegion(const TQRect ®ion) { } -void RegionWidget::setViewSize(const QSize &size) +void RegionWidget::setViewSize(const TQSize &size) { } diff --git a/noatun-plugins/nexscope/regionwidget.h b/noatun-plugins/nexscope/regionwidget.h index eeac8b4..38c919a 100644 --- a/noatun-plugins/nexscope/regionwidget.h +++ b/noatun-plugins/nexscope/regionwidget.h @@ -1,7 +1,7 @@ #ifndef REGIONWIDGET_H #define REGIONWIDGET_H -#include +#include /** * show a widget with a field rectangle, and a mini-region inside @@ -13,15 +13,15 @@ class RegionWidget : public QFrame { Q_OBJECT public: - RegionWidget(QWidget *parent); - RegionWidget(const QSize &viewsize, QWidget *parent); - RegionWidget(int x, int y, int w, int h, const QSize &viewsize, - QWidget *parent); - RegionWidget(const QRect ®ion, const QSize &viewsize, QWidget *parent); + RegionWidget(TQWidget *parent); + RegionWidget(const TQSize &viewsize, TQWidget *parent); + RegionWidget(int x, int y, int w, int h, const TQSize &viewsize, + TQWidget *parent); + RegionWidget(const TQRect ®ion, const TQSize &viewsize, TQWidget *parent); ~RegionWidget(); - QRect region() const; + TQRect region() const; public slots: void setX(int x); @@ -29,14 +29,14 @@ public slots: void setWidth(int w); void setHeight(int h); - void setRegion(const QRect ®ion); + void setRegion(const TQRect ®ion); - void setViewSize(const QSize &size); + void setViewSize(const TQSize &size); signals: void changed(); void changed(int x, int y, int w, int h); - void changed(const QRect ®ion); + void changed(const TQRect ®ion); protected: virtual void moved(int x, int y); diff --git a/noatun-plugins/nexscope/renderers.cpp b/noatun-plugins/nexscope/renderers.cpp index 830024b..f5e97c9 100644 --- a/noatun-plugins/nexscope/renderers.cpp +++ b/noatun-plugins/nexscope/renderers.cpp @@ -3,7 +3,7 @@ #include #include #include -#include +#include #include struct HorizontalPair : public Renderer @@ -15,10 +15,10 @@ struct HorizontalPair : public Renderer pair=true; } - QWidget *configure(QWidget *parent) + TQWidget *configure(TQWidget *parent) { - QWidget *config=new QWidget(parent); - (new QVBoxLayout(config))->setAutoAdd(true); + TQWidget *config=new TQWidget(parent); + (new TQVBoxLayout(config))->setAutoAdd(true); new NexColorButton(config, &color); new NexCheckBox(config, i18n("Horizontal"), &horizontal); @@ -99,7 +99,7 @@ struct HorizontalPair : public Renderer return src; } - virtual void save(QDomElement &e) + virtual void save(TQDomElement &e) { e.setTagName("Waveform"); e.setAttribute("horizontal", (int)horizontal); @@ -108,7 +108,7 @@ struct HorizontalPair : public Renderer e.setAttribute("color", COLORSTR(color)); } - virtual void load(const QDomElement &e) + virtual void load(const TQDomElement &e) { horizontal=(bool)e.attribute("horizontal", 0).toInt(); pair=(bool)e.attribute("pair", 0).toInt(); diff --git a/noatun-plugins/nexscope/renderers.h b/noatun-plugins/nexscope/renderers.h index 3105849..5d75eeb 100644 --- a/noatun-plugins/nexscope/renderers.h +++ b/noatun-plugins/nexscope/renderers.h @@ -1,7 +1,7 @@ #ifndef RENDERERS_H #define RENDERERS_H -#include +#include class Renderer; diff --git a/noatun-plugins/noatunmadness/madness.cpp b/noatun-plugins/noatunmadness/madness.cpp index 0b0d086..7027029 100644 --- a/noatun-plugins/noatunmadness/madness.cpp +++ b/noatun-plugins/noatunmadness/madness.cpp @@ -30,16 +30,16 @@ Plugin *create_plugin() Madness::Madness() : MonoFFTScope(100), Plugin(), mWm(this) { - connect(&mWm, SIGNAL(currentDesktopChanged(int)), SLOT(update())); - connect(&mWm, SIGNAL(windowAdded(WId)), SLOT(update())); - connect(&mWm, SIGNAL(windowRemoved(WId)), SLOT(update())); - connect(&mWm, SIGNAL(strutChanged()), SLOT(update())); + connect(&mWm, TQT_SIGNAL(currentDesktopChanged(int)), TQT_SLOT(update())); + connect(&mWm, TQT_SIGNAL(windowAdded(WId)), TQT_SLOT(update())); + connect(&mWm, TQT_SIGNAL(windowRemoved(WId)), TQT_SLOT(update())); + connect(&mWm, TQT_SIGNAL(strutChanged()), TQT_SLOT(update())); } Madness::~Madness() { - QMap::ConstIterator it(mOriginalPositions.begin()); + TQMap::ConstIterator it(mOriginalPositions.begin()); for (; it != mOriginalPositions.end(); ++it) XMoveWindow(qt_xdisplay(), it.key(), (*it).x(), (*it).y()); @@ -50,11 +50,11 @@ void Madness::update() mWindowList = mWm.windows(); mWorkArea = mWm.workArea(); - QValueList::ConstIterator it(mWindowList.begin()); + TQValueList::ConstIterator it(mWindowList.begin()); for (; it != mWindowList.end(); ++it) { - QRect area=KWin::info(*it).frameGeometry; + TQRect area=KWin::info(*it).frameGeometry; if (!mOriginalPositions.contains(*it)) mOriginalPositions.insert(*it, area.topLeft()); } @@ -76,7 +76,7 @@ void Madness::scopeEvent(float *d, int size) // cout << "delta: " << delta << endl; - QValueList::ConstIterator it(mWindowList.begin()); + TQValueList::ConstIterator it(mWindowList.begin()); for (; it != mWindowList.end(); ++it) { @@ -92,7 +92,7 @@ void Madness::scopeEvent(float *d, int size) || (mWm.currentDesktop() != i.desktop)) continue; - QRect area=i.frameGeometry; + TQRect area=i.frameGeometry; float lightness=100000.0/(area.width()*area.height()); int x=area.x(); diff --git a/noatun-plugins/noatunmadness/madness.h b/noatun-plugins/noatunmadness/madness.h index b36c468..8076d0a 100644 --- a/noatun-plugins/noatunmadness/madness.h +++ b/noatun-plugins/noatunmadness/madness.h @@ -3,11 +3,11 @@ #include #include -#include -#include +#include +#include #include -class Madness : public QObject, public MonoFFTScope, public Plugin +class Madness : public TQObject, public MonoFFTScope, public Plugin { Q_OBJECT public: @@ -24,9 +24,9 @@ protected: private: KWinModule mWm; - QValueList mWindowList; - QRect mWorkArea; - QMap mOriginalPositions; + TQValueList mWindowList; + TQRect mWorkArea; + TQMap mOriginalPositions; }; #endif diff --git a/noatun-plugins/oblique/base.cpp b/noatun-plugins/oblique/base.cpp index 60bb272..c9e6fb6 100644 --- a/noatun-plugins/oblique/base.cpp +++ b/noatun-plugins/oblique/base.cpp @@ -7,10 +7,10 @@ #include "kdbt.h" #include "kbuffer.h" -#include -#include -#include -#include +#include +#include +#include +#include #include #include @@ -23,24 +23,24 @@ struct Base::Private Private() : db(0, DB_CXX_NO_EXCEPTIONS) { } Db db; typedef KDbt Key; - typedef KDbt Data; + typedef KDbt Data; FileId high; FileId cachedId; - mutable QMap cachedProperties; + mutable TQMap cachedProperties; - QPtrList slices; + TQPtrList slices; int sliceHigh; }; -Base::Base(const QString &file) +Base::Base(const TQString &file) { d = new Private; d->cachedId = 0; - QCString filename = QFile::encodeName(file); + TQCString filename = TQFile::encodeName(file); bool create = true; if (d->db.open( @@ -55,7 +55,7 @@ Base::Base(const QString &file) Private::Key key(0); if (d->db.get(0, &key, &data, 0)==0) { - QStringList strs; + TQStringList strs; data.get(strs); mFormatVersion = strs[0].toUInt(0, 16); // TODO @@ -71,7 +71,7 @@ Base::Base(const QString &file) } if (create) { // failure - QFile(filename).remove(); + TQFile(filename).remove(); d->db.open( #if DB_VERSION_MINOR > 0 && DB_VERSION_MAJOR >= 4 NULL, @@ -80,7 +80,7 @@ Base::Base(const QString &file) ); d->high=0; - QStringList strs; + TQStringList strs; strs << "00010002" << "0" << ""; resetFormatVersion(); loadMetaXML(""); @@ -102,8 +102,8 @@ void Base::resetFormatVersion() Base::~Base() { - QStringList strs; - strs << QString::number(mFormatVersion, 16) << QString::number(d->high); + TQStringList strs; + strs << TQString::number(mFormatVersion, 16) << TQString::number(d->high); strs << saveMetaXML(); Private::Data data(strs); @@ -114,10 +114,10 @@ Base::~Base() delete d; } -File Base::add(const QString &file) +File Base::add(const TQString &file) { Private::Key key(++d->high); - QStringList properties; + TQStringList properties; properties << "file" << file; Private::Data data(properties); @@ -180,23 +180,23 @@ File Base::first(FileId first) return File(this, first); } -QString Base::property(FileId id, const QString &property) const +TQString Base::property(FileId id, const TQString &property) const { loadIntoCache(id); - if (!d->cachedProperties.contains(property)) return QString::null; - QMap::Iterator i = d->cachedProperties.find(property); + if (!d->cachedProperties.contains(property)) return TQString::null; + TQMap::Iterator i = d->cachedProperties.find(property); return i.data(); } -void Base::setProperty(FileId id, const QString &key, const QString &value) +void Base::setProperty(FileId id, const TQString &key, const TQString &value) { loadIntoCache(id); d->cachedProperties.insert(key, value); // reinsert it into the DB - QStringList props; + TQStringList props; for ( - QMap::Iterator i(d->cachedProperties.begin()); + TQMap::Iterator i(d->cachedProperties.begin()); i != d->cachedProperties.end(); ++i ) { @@ -211,12 +211,12 @@ void Base::setProperty(FileId id, const QString &key, const QString &value) emit modified(File(this, id)); } -QStringList Base::properties(FileId id) const +TQStringList Base::properties(FileId id) const { loadIntoCache(id); - QStringList props; + TQStringList props; for ( - QMap::Iterator i(d->cachedProperties.begin()); + TQMap::Iterator i(d->cachedProperties.begin()); i != d->cachedProperties.end(); ++i ) { @@ -225,15 +225,15 @@ QStringList Base::properties(FileId id) const return props; } -void Base::clearProperty(FileId id, const QString &key) +void Base::clearProperty(FileId id, const TQString &key) { loadIntoCache(id); d->cachedProperties.remove(key); // reinsert it into the DB - QStringList props; + TQStringList props; for ( - QMap::Iterator i(d->cachedProperties.begin()); + TQMap::Iterator i(d->cachedProperties.begin()); i != d->cachedProperties.end(); ++i ) { @@ -275,7 +275,7 @@ void Base::loadIntoCache(FileId id) const Private::Data data; unless (d->db.get(0, &key, &data, 0)) { - QStringList props; + TQStringList props; data.get(props); if (props.count() % 2) @@ -284,28 +284,28 @@ void Base::loadIntoCache(FileId id) const return; } - for (QStringList::Iterator i(props.begin()); i != props.end(); ++i) + for (TQStringList::Iterator i(props.begin()); i != props.end(); ++i) { - QString &key = *i; - QString &value = *++i; + TQString &key = *i; + TQString &value = *++i; d->cachedProperties.insert(key, value); } } } -QString Base::saveMetaXML() +TQString Base::saveMetaXML() { - QDomDocument doc; - doc.setContent(QString("")); - QDomElement doce = doc.documentElement(); + TQDomDocument doc; + doc.setContent(TQString("")); + TQDomElement doce = doc.documentElement(); - QDomElement e = doc.createElement("slices"); - e.setAttribute("highslice", QString::number(d->sliceHigh)); + TQDomElement e = doc.createElement("slices"); + e.setAttribute("highslice", TQString::number(d->sliceHigh)); doce.appendChild(e); - for (QPtrListIterator i(d->slices); *i; ++i) + for (TQPtrListIterator i(d->slices); *i; ++i) { - QDomElement slice = doc.createElement("slice"); + TQDomElement slice = doc.createElement("slice"); slice.setAttribute("id", (*i)->id()); slice.setAttribute("name", (*i)->name()); e.appendChild(slice); @@ -319,7 +319,7 @@ void Base::move(FileId oldid, FileId newid) Private::Data data; unless (d->db.get(0, &key, &data, 0)) { - QStringList props; + TQStringList props; data.get(props); d->db.del(0, &key, 0); @@ -332,11 +332,11 @@ void Base::dump() { for (FileId id=1; id <= high(); id++) { - QStringList props = properties(id); + TQStringList props = properties(id); std::cerr << id << '.'; - for (QStringList::Iterator i(props.begin()); i != props.end(); ++i) + for (TQStringList::Iterator i(props.begin()); i != props.end(); ++i) { - QString prop = *i; + TQString prop = *i; std::cerr << ' ' << prop.latin1() << '=' << property(id, prop).latin1(); } std::cerr << std::endl; @@ -349,12 +349,12 @@ void Base::notifyChanged(const File &file) } -QPtrList Base::slices() +TQPtrList Base::slices() { return d->slices; } -Slice *Base::addSlice(const QString &name) +Slice *Base::addSlice(const TQString &name) { Slice *sl = new Slice(this, d->sliceHigh++, name); d->slices.append(sl); @@ -364,7 +364,7 @@ Slice *Base::addSlice(const QString &name) Slice *Base::defaultSlice() { - for (QPtrListIterator i(d->slices); *i; ++i) + for (TQPtrListIterator i(d->slices); *i; ++i) { if ((*i)->id() == 0) return *i; } @@ -382,7 +382,7 @@ void Base::removeSlice(Slice *slice) Slice *Base::sliceById(int id) { - for (QPtrListIterator i(d->slices); *i; ++i) + for (TQPtrListIterator i(d->slices); *i; ++i) { if ((*i)->id() == id) return *i; } @@ -390,35 +390,35 @@ Slice *Base::sliceById(int id) } -void Base::loadMetaXML(const QString &xml) +void Base::loadMetaXML(const TQString &xml) { d->slices.setAutoDelete(true); d->slices.clear(); d->slices.setAutoDelete(false); - QDomDocument doc; + TQDomDocument doc; doc.setContent(xml); - QDomElement doce = doc.documentElement(); + TQDomElement doce = doc.documentElement(); bool loadedId0=false; - for (QDomNode n = doce.firstChild(); !n.isNull(); n = n.nextSibling()) + for (TQDomNode n = doce.firstChild(); !n.isNull(); n = n.nextSibling()) { - QDomElement e = n.toElement(); + TQDomElement e = n.toElement(); if (e.isNull()) continue; if (e.tagName().lower() == "slices") { d->sliceHigh = e.attribute("highslice", "1").toInt(); - for (QDomNode n = e.firstChild(); !n.isNull(); n = n.nextSibling()) + for (TQDomNode n = e.firstChild(); !n.isNull(); n = n.nextSibling()) { - QDomElement e = n.toElement(); + TQDomElement e = n.toElement(); if (e.isNull()) continue; if (e.tagName().lower() == "slice") { int id = e.attribute("id").toInt(); if (id==0 && loadedId0) break; loadedId0=true; - QString name = e.attribute("name"); + TQString name = e.attribute("name"); d->slices.append(new Slice(this, id, name)); } } diff --git a/noatun-plugins/oblique/base.h b/noatun-plugins/oblique/base.h index c9cb8d4..611c5fe 100644 --- a/noatun-plugins/oblique/base.h +++ b/noatun-plugins/oblique/base.h @@ -6,9 +6,9 @@ // ;) #define unless(e) if(!(e)) -#include -#include -#include +#include +#include +#include class File; class Slice; @@ -26,10 +26,10 @@ Q_OBJECT unsigned int mFormatVersion; public: - Base(const QString &file); + Base(const TQString &file); ~Base(); - File add(const QString &file); + File add(const TQString &file); File find(FileId id); @@ -45,10 +45,10 @@ public: **/ File first(FileId id=1); - QString property(FileId id, const QString &property) const; - void setProperty(FileId id, const QString &key, const QString &value); - QStringList properties(FileId id) const; - void clearProperty(FileId, const QString &key); + TQString property(FileId id, const TQString &property) const; + void setProperty(FileId id, const TQString &key, const TQString &value); + TQStringList properties(FileId id) const; + void clearProperty(FileId, const TQString &key); /** * same as File::remove @@ -62,8 +62,8 @@ public: void dump(); - QPtrList slices(); - Slice *addSlice(const QString &name); + TQPtrList slices(); + Slice *addSlice(const TQString &name); Slice *defaultSlice(); Slice *sliceById(int id); @@ -98,8 +98,8 @@ private: * load the xml that lives at the head of the db and contains * potentially lots of structured data **/ - void loadMetaXML(const QString &xml); - QString saveMetaXML(); + void loadMetaXML(const TQString &xml); + TQString saveMetaXML(); }; #endif diff --git a/noatun-plugins/oblique/cmodule.cpp b/noatun-plugins/oblique/cmodule.cpp index 93b4069..729ff54 100644 --- a/noatun-plugins/oblique/cmodule.cpp +++ b/noatun-plugins/oblique/cmodule.cpp @@ -14,72 +14,72 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -SchemaConfig::SchemaConfig(QWidget *parent, Oblique *oblique) - : QWidget(parent) +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +SchemaConfig::SchemaConfig(TQWidget *parent, Oblique *oblique) + : TQWidget(parent) { mOblique = oblique; mIgnore = true; mRegexpEditor=0; { - QVBoxLayout *layout = new QVBoxLayout(this, 11, 7); + TQVBoxLayout *layout = new TQVBoxLayout(this, 11, 7); layout->setAutoAdd(true); layout->setSpacing(7); } { - QHBox *box = new QHBox(this); + TQHBox *box = new TQHBox(this); box->setSpacing(7); - mSchemaList = new QComboBox(box); + mSchemaList = new TQComboBox(box); connect( - mSchemaList, SIGNAL(activated(const QString&)), - SLOT(selectSchema(const QString&)) + mSchemaList, TQT_SIGNAL(activated(const TQString&)), + TQT_SLOT(selectSchema(const TQString&)) ); - mAdd = new QPushButton(BarIconSet("filenew"), 0, box); + mAdd = new TQPushButton(BarIconSet("filenew"), 0, box); mAdd->setFixedWidth(mAdd->height()); - QToolTip::add(mAdd, i18n("Create new schema")); - connect(mAdd, SIGNAL(clicked()), SLOT(newSchema())); + TQToolTip::add(mAdd, i18n("Create new schema")); + connect(mAdd, TQT_SIGNAL(clicked()), TQT_SLOT(newSchema())); - mRemove = new QPushButton(BarIconSet("editdelete"), 0, box); + mRemove = new TQPushButton(BarIconSet("editdelete"), 0, box); mRemove->setFixedWidth(mRemove->height()); - QToolTip::add(mRemove, i18n("Remove this schema")); - connect(mRemove, SIGNAL(clicked()), SLOT(removeSchema())); + TQToolTip::add(mRemove, i18n("Remove this schema")); + connect(mRemove, TQT_SIGNAL(clicked()), TQT_SLOT(removeSchema())); - mCopy = new QPushButton(BarIconSet("editcopy"), 0, box); + mCopy = new TQPushButton(BarIconSet("editcopy"), 0, box); mCopy->setFixedWidth(mCopy->height()); - QToolTip::add(mCopy, i18n("Copy this schema")); - connect(mCopy, SIGNAL(clicked()), SLOT(copySchema())); + TQToolTip::add(mCopy, i18n("Copy this schema")); + connect(mCopy, TQT_SIGNAL(clicked()), TQT_SLOT(copySchema())); } { - QHBox *middle = new QHBox(this); + TQHBox *middle = new TQHBox(this); middle->setSpacing(7); mSchemaTree = new KListView(middle); connect( - mSchemaTree, SIGNAL(currentChanged(QListViewItem*)), - SLOT(setCurrent(QListViewItem*)) + mSchemaTree, TQT_SIGNAL(currentChanged(TQListViewItem*)), + TQT_SLOT(setCurrent(TQListViewItem*)) ); connect( - mSchemaTree, SIGNAL(moved(QListViewItem *, QListViewItem *, QListViewItem *)), - SLOT(move(QListViewItem *, QListViewItem *, QListViewItem *)) + mSchemaTree, TQT_SIGNAL(moved(TQListViewItem *, TQListViewItem *, TQListViewItem *)), + TQT_SLOT(move(TQListViewItem *, TQListViewItem *, TQListViewItem *)) ); mSchemaTree->setAcceptDrops(true); @@ -92,79 +92,79 @@ SchemaConfig::SchemaConfig(QWidget *parent, Oblique *oblique) mSchemaTree->addColumn(i18n("Value")); mSchemaTree->addColumn(i18n("Presentation")); - QVBox *buttons = new QVBox(middle); + TQVBox *buttons = new TQVBox(middle); - mAddSibling = new QPushButton(BarIconSet("1rightarrow", KIcon::SizeSmall), "",buttons); + mAddSibling = new TQPushButton(BarIconSet("1rightarrow", KIcon::SizeSmall), "",buttons); mAddSibling->setFixedWidth(mAddSibling->height()); - connect(mAddSibling, SIGNAL(clicked()), SLOT(addSibling())); - QToolTip::add(mAddSibling, i18n("Create a new item after the selected one")); + connect(mAddSibling, TQT_SIGNAL(clicked()), TQT_SLOT(addSibling())); + TQToolTip::add(mAddSibling, i18n("Create a new item after the selected one")); - mAddChild = new QPushButton(BarIconSet("2rightarrow", KIcon::SizeSmall), "", buttons); + mAddChild = new TQPushButton(BarIconSet("2rightarrow", KIcon::SizeSmall), "", buttons); mAddChild->setFixedWidth(mAddChild->height()); - connect(mAddChild, SIGNAL(clicked()), SLOT(addChild())); - QToolTip::add(mAddChild, i18n("Create a new child item under the selected one")); + connect(mAddChild, TQT_SIGNAL(clicked()), TQT_SLOT(addChild())); + TQToolTip::add(mAddChild, i18n("Create a new child item under the selected one")); - mRemoveSelf = new QPushButton(BarIconSet("filenew", KIcon::SizeSmall), "", buttons); + mRemoveSelf = new TQPushButton(BarIconSet("filenew", KIcon::SizeSmall), "", buttons); mRemoveSelf->setFixedWidth(mRemoveSelf->height()); - connect(mRemoveSelf, SIGNAL(clicked()), SLOT(removeSelf())); - QToolTip::add(mRemoveSelf, i18n("Remove the selected item")); + connect(mRemoveSelf, TQT_SIGNAL(clicked()), TQT_SLOT(removeSelf())); + TQToolTip::add(mRemoveSelf, i18n("Remove the selected item")); - new QWidget(buttons); + new TQWidget(buttons); } { - QVBox *side = new QVBox(this); + TQVBox *side = new TQVBox(this); side->setSpacing(7); // the controllers { - QWidget *topSide = new QWidget(side); - QGridLayout *grid = new QGridLayout(topSide); + TQWidget *topSide = new TQWidget(side); + TQGridLayout *grid = new TQGridLayout(topSide); - QLabel *label; + TQLabel *label; - label = new QLabel(i18n("&Property:"), topSide); + label = new TQLabel(i18n("&Property:"), topSide); mPropertyEdit = new KLineEdit(topSide); label->setBuddy(mPropertyEdit); grid->addWidget(label, 0, 0); grid->addMultiCellWidget(mPropertyEdit, 0, 0, 1, 2); - connect(mPropertyEdit, SIGNAL(textChanged(const QString&)), SLOT(updateCurrent())); + connect(mPropertyEdit, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(updateCurrent())); - label = new QLabel(i18n("&Value:"), topSide); + label = new TQLabel(i18n("&Value:"), topSide); mValueEdit = new KLineEdit(topSide); label->setBuddy(mPropertyEdit); grid->addWidget(label, 1, 0); grid->addMultiCellWidget(mValueEdit, 1, 1, 1, 1); - connect(mValueEdit, SIGNAL(textChanged(const QString&)), SLOT(updateCurrent())); + connect(mValueEdit, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(updateCurrent())); - QPushButton *editRe = new QPushButton(i18n("&Edit..."), topSide); + TQPushButton *editRe = new TQPushButton(i18n("&Edit..."), topSide); grid->addWidget(editRe, 1, 2); - connect(editRe, SIGNAL(clicked()), SLOT(editValueRegexp())); + connect(editRe, TQT_SIGNAL(clicked()), TQT_SLOT(editValueRegexp())); - label = new QLabel(i18n("Pre&sentation:"), topSide); + label = new TQLabel(i18n("Pre&sentation:"), topSide); mPresentationEdit = new KLineEdit(topSide); label->setBuddy(mPropertyEdit); grid->addWidget(label, 2, 0); grid->addMultiCellWidget(mPresentationEdit, 2, 2, 1, 2); - connect(mPresentationEdit, SIGNAL(textChanged(const QString&)), SLOT(updateCurrent())); + connect(mPresentationEdit, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(updateCurrent())); } { - QGroupBox *groupbox = new QGroupBox( + TQGroupBox *groupbox = new TQGroupBox( 3, Qt::Horizontal, i18n("Options"), side ); - mOptionPlayable = new QCheckBox(i18n("Play&able"), groupbox); - QWhatsThis::add(mOptionPlayable, i18n("This branch represents an individual file. If two items' presentation match, two items are created.")); - connect(mOptionPlayable, SIGNAL(toggled(bool)), SLOT(updateCurrent())); + mOptionPlayable = new TQCheckBox(i18n("Play&able"), groupbox); + TQWhatsThis::add(mOptionPlayable, i18n("This branch represents an individual file. If two items' presentation match, two items are created.")); + connect(mOptionPlayable, TQT_SIGNAL(toggled(bool)), TQT_SLOT(updateCurrent())); - mOptionChildrenVisible = new QCheckBox(i18n("&Children visible"), groupbox); - QWhatsThis::add(mOptionChildrenVisible, i18n("Don't create this node, this nodes children become direct children of this node's parent")); - connect(mOptionChildrenVisible, SIGNAL(toggled(bool)), SLOT(updateCurrent())); + mOptionChildrenVisible = new TQCheckBox(i18n("&Children visible"), groupbox); + TQWhatsThis::add(mOptionChildrenVisible, i18n("Don't create this node, this nodes children become direct children of this node's parent")); + connect(mOptionChildrenVisible, TQT_SIGNAL(toggled(bool)), TQT_SLOT(updateCurrent())); - mOptionAutoOpen = new QCheckBox(i18n("Auto &open"), groupbox); - QWhatsThis::add(mOptionAutoOpen, i18n("This branch is marked as open immediately.")); - connect(mOptionAutoOpen, SIGNAL(toggled(bool)), SLOT(updateCurrent())); + mOptionAutoOpen = new TQCheckBox(i18n("Auto &open"), groupbox); + TQWhatsThis::add(mOptionAutoOpen, i18n("This branch is marked as open immediately.")); + connect(mOptionAutoOpen, TQT_SIGNAL(toggled(bool)), TQT_SLOT(updateCurrent())); } } @@ -236,10 +236,10 @@ void SchemaConfig::reopen() mQueries.clear(); mSchemaTree->clear(); - QStringList names = oblique()->schemaNames(); - QString firstTitle; + TQStringList names = oblique()->schemaNames(); + TQString firstTitle; - for (QStringList::Iterator i(names.begin()); i != names.end(); ++i) + for (TQStringList::Iterator i(names.begin()); i != names.end(); ++i) { QueryItem qi; qi.title = oblique()->loadSchema(qi.query, *i); @@ -256,10 +256,10 @@ void SchemaConfig::reopen() void SchemaConfig::save() { - for (QMap::Iterator i(mQueries.begin()); i != mQueries.end(); ++i) + for (TQMap::Iterator i(mQueries.begin()); i != mQueries.end(); ++i) { - QString name = i.key(); - name = QFileInfo(name).fileName(); + TQString name = i.key(); + name = TQFileInfo(name).fileName(); if (i.data().changed) { oblique()->saveSchema(i.data().query, name, i.data().title); @@ -269,24 +269,24 @@ void SchemaConfig::save() } -QString SchemaConfig::nameToFilename(const QString &_name) +TQString SchemaConfig::nameToFilename(const TQString &_name) { - QString name = _name; - name = name.replace(QRegExp("[^a-zA-Z0-9]"), "_"); + TQString name = _name; + name = name.replace(TQRegExp("[^a-zA-Z0-9]"), "_"); return name; } void SchemaConfig::newSchema() { bool ok; - QString str=KInputDialog::getText( + TQString str=KInputDialog::getText( i18n("Name of Schema"), i18n("Please enter the name of the new schema:"), "", &ok, this ); if (!ok) return; - QString filename = nameToFilename(str); + TQString filename = nameToFilename(str); if (mQueries.contains(nameToFilename(filename))) return; @@ -303,14 +303,14 @@ void SchemaConfig::newSchema() void SchemaConfig::copySchema() { bool ok; - QString str=KInputDialog::getText( + TQString str=KInputDialog::getText( i18n("Name of Schema"), i18n("Please enter the name of the new schema:"), "", &ok, this ); if (!ok) return; - QString filename = nameToFilename(str); + TQString filename = nameToFilename(str); if (mQueries.contains(nameToFilename(filename))) return; @@ -332,7 +332,7 @@ void SchemaConfig::removeSchema() selectSchema(mSchemaList->currentText()); } -void SchemaConfig::selectSchema(const QString &title) +void SchemaConfig::selectSchema(const TQString &title) { mSchemaTree->clear(); mSchemaList->setCurrentText(title); @@ -354,8 +354,8 @@ void SchemaConfig::editValueRegexp() unless (mRegexpEditor) { mRegexpEditor = - KParts::ComponentFactory::createInstanceFromQuery( - "KRegExpEditor/KRegExpEditor", QString::null, this + KParts::ComponentFactory::createInstanceFromQuery( + "KRegExpEditor/KRegExpEditor", TQString::null, this ); } @@ -367,12 +367,12 @@ void SchemaConfig::editValueRegexp() ); iface->setRegExp(mValueEdit->text()); - if (mRegexpEditor->exec() == QDialog::Accepted) + if (mRegexpEditor->exec() == TQDialog::Accepted) mValueEdit->setText(iface->regExp()); } } -void SchemaConfig::setCurrent(QListViewItem *_item) +void SchemaConfig::setCurrent(TQListViewItem *_item) { if (!_item) return; QueryGroupItem *item = static_cast(_item); @@ -398,7 +398,7 @@ void SchemaConfig::updateCurrent() mod->setPropertyName(mPropertyEdit->text()); mod->setPresentation(mPresentationEdit->text()); - mod->setValue(QRegExp(mValueEdit->text())); + mod->setValue(TQRegExp(mValueEdit->text())); mod->setOption(QueryGroup::AutoOpen, mOptionAutoOpen->isChecked()); mod->setOption(QueryGroup::Playable, mOptionPlayable->isChecked()); @@ -406,7 +406,7 @@ void SchemaConfig::updateCurrent() item->redisplay(); } -void SchemaConfig::move(QListViewItem *_item, QListViewItem *, QListViewItem *_afterNow) +void SchemaConfig::move(TQListViewItem *_item, TQListViewItem *, TQListViewItem *_afterNow) { setCurrentModified(); QueryGroupItem *item = static_cast(_item); @@ -490,8 +490,8 @@ void SchemaConfig::setCurrentModified() SchemaConfig::QueryItem *SchemaConfig::currentQuery() { - QString title = mSchemaList->currentText(); - for (QMap::Iterator i(mQueries.begin()); i != mQueries.end(); ++i) + TQString title = mSchemaList->currentText(); + for (TQMap::Iterator i(mQueries.begin()); i != mQueries.end(); ++i) { if (i.data().title != title) continue; return &i.data(); @@ -500,37 +500,37 @@ SchemaConfig::QueryItem *SchemaConfig::currentQuery() } -SliceConfig::SliceConfig(QWidget *parent, Oblique *oblique) - : QWidget(parent) +SliceConfig::SliceConfig(TQWidget *parent, Oblique *oblique) + : TQWidget(parent) { mOblique = oblique; - (new QVBoxLayout(this, 11, 7))->setAutoAdd(true); + (new TQVBoxLayout(this, 11, 7))->setAutoAdd(true); { - QHBox *middle = new QHBox(this); + TQHBox *middle = new TQHBox(this); middle->setSpacing(7); mSliceList = new KListView(middle); - QWhatsThis::add(mSliceList, i18n("The list of slices. A Slice is part of the full collection. This allows you to categorize your playlist. You can add an item to the list by right clicking on it and selecting the Slice you want it in.")); + TQWhatsThis::add(mSliceList, i18n("The list of slices. A Slice is part of the full collection. This allows you to categorize your playlist. You can add an item to the list by right clicking on it and selecting the Slice you want it in.")); mSliceList->addColumn(""); mSliceList->header()->hide(); mSliceList->setSorting(0); mSliceList->setItemsRenameable(true); - QVBox *buttons = new QVBox(middle); + TQVBox *buttons = new TQVBox(middle); - mAdd = new QPushButton(BarIconSet("1rightarrow", KIcon::SizeSmall), "",buttons); + mAdd = new TQPushButton(BarIconSet("1rightarrow", KIcon::SizeSmall), "",buttons); mAdd->setFixedWidth(mAdd->height()); - connect(mAdd, SIGNAL(clicked()), SLOT(addSibling())); - QToolTip::add(mAdd, i18n("Create a new item")); + connect(mAdd, TQT_SIGNAL(clicked()), TQT_SLOT(addSibling())); + TQToolTip::add(mAdd, i18n("Create a new item")); - mRemove = new QPushButton(BarIconSet("filenew", KIcon::SizeSmall), "", buttons); + mRemove = new TQPushButton(BarIconSet("filenew", KIcon::SizeSmall), "", buttons); mRemove->setFixedWidth(mRemove->height()); - connect(mRemove, SIGNAL(clicked()), SLOT(removeSelf())); - QToolTip::add(mRemove, i18n("Remove the selected item")); + connect(mRemove, TQT_SIGNAL(clicked()), TQT_SLOT(removeSelf())); + TQToolTip::add(mRemove, i18n("Remove the selected item")); - new QWidget(buttons); + new TQWidget(buttons); } } @@ -557,7 +557,7 @@ public: SliceListItem *SliceConfig::currentItem() { - QListViewItem *c = mSliceList->currentItem(); + TQListViewItem *c = mSliceList->currentItem(); return static_cast(c); } @@ -568,9 +568,9 @@ void SliceConfig::reopen() mRemovedItems.clear(); mAddedItems.clear(); - QPtrList slices = oblique()->base()->slices(); + TQPtrList slices = oblique()->base()->slices(); - for (QPtrListIterator i(slices); *i; ++i) + for (TQPtrListIterator i(slices); *i; ++i) { Slice *slice = *i; new SliceListItem(mSliceList, slice); @@ -580,7 +580,7 @@ void SliceConfig::reopen() void SliceConfig::save() { for ( - QValueList::Iterator i(mRemovedItems.begin()); + TQValueList::Iterator i(mRemovedItems.begin()); i != mRemovedItems.end(); ++i ) @@ -590,7 +590,7 @@ void SliceConfig::save() } for ( - QValueList::Iterator i(mAddedItems.begin()); + TQValueList::Iterator i(mAddedItems.begin()); i != mAddedItems.end(); ++i ) @@ -598,7 +598,7 @@ void SliceConfig::save() oblique()->base()->addSlice((*i)->text(0)); } - for (QListViewItem *i = mSliceList->firstChild(); i; i = i->nextSibling()) + for (TQListViewItem *i = mSliceList->firstChild(); i; i = i->nextSibling()) { SliceListItem *si = static_cast(i); @@ -639,8 +639,8 @@ void SliceConfig::removeSelf() Configure::Configure(Oblique *oblique) : CModule(i18n("Oblique"), i18n("Configure Oblique Playlist"), "", oblique) { - (new QVBoxLayout(this))->setAutoAdd(true); - tabs = new QTabWidget(this); + (new TQVBoxLayout(this))->setAutoAdd(true); + tabs = new TQTabWidget(this); tabs->addTab(slice = new SliceConfig(tabs, oblique), i18n("Slices")); tabs->addTab(schema = new SchemaConfig(tabs, oblique), i18n("Schemas")); diff --git a/noatun-plugins/oblique/cmodule.h b/noatun-plugins/oblique/cmodule.h index f60c6c3..41af7f1 100644 --- a/noatun-plugins/oblique/cmodule.h +++ b/noatun-plugins/oblique/cmodule.h @@ -23,43 +23,43 @@ Q_OBJECT KListView *mSchemaTree; KLineEdit *mPropertyEdit, *mValueEdit, *mPresentationEdit; - QComboBox *mSchemaList; + TQComboBox *mSchemaList; - QCheckBox *mOptionPlayable, *mOptionChildrenVisible, *mOptionAutoOpen; + TQCheckBox *mOptionPlayable, *mOptionChildrenVisible, *mOptionAutoOpen; - QPushButton *mAdd, *mRemove, *mCopy; + TQPushButton *mAdd, *mRemove, *mCopy; - QPushButton *mAddSibling, *mAddChild, *mRemoveSelf; + TQPushButton *mAddSibling, *mAddChild, *mRemoveSelf; - QDialog *mRegexpEditor; + TQDialog *mRegexpEditor; bool mIgnore; struct QueryItem { Query query; - QString title; + TQString title; bool changed; }; - QMap mQueries; + TQMap mQueries; public: - SchemaConfig(QWidget *parent, Oblique *oblique); + SchemaConfig(TQWidget *parent, Oblique *oblique); Oblique *oblique() { return mOblique; } void reopen(); void save(); - static QString nameToFilename(const QString &name); - static QString filenameToName(const QString &filename); + static TQString nameToFilename(const TQString &name); + static TQString filenameToName(const TQString &filename); public slots: void newSchema(); void copySchema(); void removeSchema(); - void selectSchema(const QString &title); + void selectSchema(const TQString &title); void addSibling(); void addChild(); @@ -70,10 +70,10 @@ public slots: private slots: void editValueRegexp(); - void setCurrent(QListViewItem *_item); + void setCurrent(TQListViewItem *_item); void updateCurrent(); - void move(QListViewItem *item, QListViewItem *afterFirst, QListViewItem *afterNow); + void move(TQListViewItem *item, TQListViewItem *afterFirst, TQListViewItem *afterNow); private: QueryItem *currentQuery(); @@ -86,12 +86,12 @@ class SliceConfig : public QWidget Q_OBJECT Oblique *mOblique; KListView *mSliceList; - QPushButton *mAdd, *mRemove; - QValueList mAddedItems; - QValueList mRemovedItems; + TQPushButton *mAdd, *mRemove; + TQValueList mAddedItems; + TQValueList mRemovedItems; public: - SliceConfig(QWidget *parent, Oblique *oblique); + SliceConfig(TQWidget *parent, Oblique *oblique); Oblique *oblique() { return mOblique; } void reopen(); @@ -108,7 +108,7 @@ private slots: class Configure : public CModule { Q_OBJECT - QTabWidget *tabs; + TQTabWidget *tabs; SchemaConfig *schema; SliceConfig *slice; diff --git a/noatun-plugins/oblique/file.cpp b/noatun-plugins/oblique/file.cpp index b478e0f..2946f23 100644 --- a/noatun-plugins/oblique/file.cpp +++ b/noatun-plugins/oblique/file.cpp @@ -38,7 +38,7 @@ File &File::operator=(const File &ref) return *this; } -QString File::file() const +TQString File::file() const { return property("file"); } @@ -68,13 +68,13 @@ static const Map propertyMap[] = { 0, 0 } }; -QString File::property(const QString &property) const +TQString File::property(const TQString &property) const { - QString str = base()->property(id(), property); + TQString str = base()->property(id(), property); if (!str) { - QString mangled = "ob::" + property + "_"; + TQString mangled = "ob::" + property + "_"; str = base()->property(id(), mangled); } @@ -89,10 +89,10 @@ void File::makeCache() for (int i=0; propertyMap[i].kfmi; i++) { - QString kname(propertyMap[i].kfmi); + TQString kname(propertyMap[i].kfmi); if (info.isValid() && kname.length()) { - QString val = info.item(kname).string(false); + TQString val = info.item(kname).string(false); if (val=="---" || !val.stripWhiteSpace().length()) { // grr val = ""; @@ -106,7 +106,7 @@ void File::makeCache() } -void File::setProperty(const QString &key, const QString &value) +void File::setProperty(const TQString &key, const TQString &value) { if (property(key) == value) return; base()->setProperty(id(), key, value); @@ -114,7 +114,7 @@ void File::setProperty(const QString &key, const QString &value) p.data()->modified(); } -void File::clearProperty(const QString &key) +void File::clearProperty(const TQString &key) { if (property(key).isNull()) return; base()->clearProperty(id(), key); @@ -122,9 +122,9 @@ void File::clearProperty(const QString &key) p.data()->modified(); } -QStringList File::properties() const +TQStringList File::properties() const { - QStringList l = base()->properties(id()); + TQStringList l = base()->properties(id()); for (int i=0; propertyMap[i].noatun; i++) { @@ -147,7 +147,7 @@ void File::setPosition(Query *query, const File &after) { setProperty( "Oblique:after_" + query->name() + '_', - QString::number(after.id()) + TQString::number(after.id()) ); } @@ -155,10 +155,10 @@ bool File::getPosition(const Query *query, File *after) const { assert(query); assert(after); - QString name = "Oblique:after_" + query->name() + '_'; + TQString name = "Oblique:after_" + query->name() + '_'; if (name.isEmpty()) return false; - QString val = property(name); + TQString val = property(name); if (val.isEmpty()) return false; *after = File(mBase, val.toUInt()); @@ -175,17 +175,17 @@ void File::remove() void File::addTo(Slice *slice) { - QString slices = property("Oblique:slices_"); - slices += "\n" + QString::number(slice->id(), 16); + TQString slices = property("Oblique:slices_"); + slices += "\n" + TQString::number(slice->id(), 16); setProperty("Oblique:slices_", slices); emit mBase->addedTo(slice, *this); } void File::removeFrom(Slice *slice) { - QString slices = property("Oblique:slices_"); - QStringList sliceList = QStringList::split('\n', slices); - QString sid = QString::number(slice->id(), 16); + TQString slices = property("Oblique:slices_"); + TQStringList sliceList = TQStringList::split('\n', slices); + TQString sid = TQString::number(slice->id(), 16); sliceList.remove(sid); slices = sliceList.join("\n"); @@ -198,9 +198,9 @@ bool File::isIn(const Slice *slice) const int id = slice->id(); if (id==0) return true; - QString slices = property("Oblique:slices_"); - QStringList sliceList = QStringList::split('\n', slices); - for (QStringList::Iterator i(sliceList.begin()); i!= sliceList.end(); ++i) + TQString slices = property("Oblique:slices_"); + TQStringList sliceList = TQStringList::split('\n', slices); + for (TQStringList::Iterator i(sliceList.begin()); i!= sliceList.end(); ++i) { if ((*i).toInt(0, 16) == id) return true; } @@ -209,20 +209,20 @@ bool File::isIn(const Slice *slice) const -Slice::Slice(Base *base, int id, const QString &name) +Slice::Slice(Base *base, int id, const TQString &name) { mId = id; mBase = base; mName = name; } -QString Slice::name() const +TQString Slice::name() const { if (mId == 0) return i18n("Complete Collection"); return mName; } -void Slice::setName(const QString &name) +void Slice::setName(const TQString &name) { if (mId == 0) return; mName = name; diff --git a/noatun-plugins/oblique/file.h b/noatun-plugins/oblique/file.h index 21d3be9..d2a43f0 100644 --- a/noatun-plugins/oblique/file.h +++ b/noatun-plugins/oblique/file.h @@ -42,12 +42,12 @@ public: inline operator bool() const { return mId; } - QString file() const; + TQString file() const; KURL url() const; - QString property(const QString &property) const; - void setProperty(const QString &key, const QString &value); - void clearProperty(const QString &key); - QStringList properties() const; + TQString property(const TQString &property) const; + void setProperty(const TQString &key, const TQString &value); + void clearProperty(const TQString &key); + TQStringList properties() const; inline FileId id() const { return mId; } void setId(FileId id); @@ -87,7 +87,7 @@ public: class Slice { int mId; - QString mName; + TQString mName; Base *mBase; public: @@ -95,10 +95,10 @@ public: * @internal * create a slice based on its data **/ - Slice(Base *base, int id, const QString &name); + Slice(Base *base, int id, const TQString &name); - QString name() const; - void setName(const QString &name); + TQString name() const; + void setName(const TQString &name); /** * remove this slice from the list of slices diff --git a/noatun-plugins/oblique/kbuffer.h b/noatun-plugins/oblique/kbuffer.h index adc62ba..63e626b 100644 --- a/noatun-plugins/oblique/kbuffer.h +++ b/noatun-plugins/oblique/kbuffer.h @@ -5,7 +5,7 @@ #ifndef KBUFFER_H #define KBUFFER_H -#include +#include #include #include @@ -14,7 +14,7 @@ *@author Eray Ozkural (exa) */ -class KBuffer : public QIODevice { +class KBuffer : public TQIODevice { public: KBuffer(); ~KBuffer(); diff --git a/noatun-plugins/oblique/kdatacollection.cpp b/noatun-plugins/oblique/kdatacollection.cpp index 9e2ddac..ed57aea 100644 --- a/noatun-plugins/oblique/kdatacollection.cpp +++ b/noatun-plugins/oblique/kdatacollection.cpp @@ -23,46 +23,46 @@ #include #include -#include -#include +#include +#include KDataCollection::KDataCollection( - KConfig *config, const QString &group, const QString &entry, - const char *datadir, const QString &dir + KConfig *config, const TQString &group, const TQString &entry, + const char *datadir, const TQString &dir ) { init(config, group, entry, datadir, dir); } KDataCollection::KDataCollection( - KConfig *config, const QString &group, const QString &entry, - const QString &dir + KConfig *config, const TQString &group, const TQString &entry, + const TQString &dir ) { init(config, group, entry, "appdata", dir); } KDataCollection::KDataCollection( - KConfig *config, const QString &group, const QString &dir + KConfig *config, const TQString &group, const TQString &dir ) { init(config, group, dir, "appdata", dir); } -KDataCollection::KDataCollection(KConfig *config, const QString &dir) +KDataCollection::KDataCollection(KConfig *config, const TQString &dir) { init(config, "KDataCollection", dir, "appdata", dir); } -KDataCollection::KDataCollection(const QString &dir) +KDataCollection::KDataCollection(const TQString &dir) { init(KGlobal::config(), "KDataCollection", dir, "appdata", dir); } void KDataCollection::init( - KConfig *config, const QString &group, const QString &entry, - const char *datadir, const QString &dir + KConfig *config, const TQString &group, const TQString &entry, + const char *datadir, const TQString &dir ) { mConfig = config; @@ -72,19 +72,19 @@ void KDataCollection::init( mDatadir = datadir; } -QStringList KDataCollection::names() const +TQStringList KDataCollection::names() const { KConfigGroup g(mConfig, mGroup); // these are the entries I have - QStringList n = g.readListEntry(mEntry); - QStringList fs = KGlobal::dirs()->findAllResources(mDatadir, mDir+"/*", false, true); - QStringList total; + TQStringList n = g.readListEntry(mEntry); + TQStringList fs = KGlobal::dirs()->findAllResources(mDatadir, mDir+"/*", false, true); + TQStringList total; - for (QStringList::Iterator i(fs.begin()); i != fs.end(); ++i) + for (TQStringList::Iterator i(fs.begin()); i != fs.end(); ++i) { - QFileInfo fi(*i); - QString name = fi.fileName(); + TQFileInfo fi(*i); + TQString name = fi.fileName(); if (!n.contains(name)) { total.append(name); @@ -94,28 +94,28 @@ QStringList KDataCollection::names() const return total; } -void KDataCollection::remove(const QString &name) +void KDataCollection::remove(const TQString &name) { KConfigGroup g(mConfig, mGroup); - QString location = file(name); + TQString location = file(name); if (location.isEmpty()) return; if (location == saveFile(name, false)) { - QFile(location).remove(); + TQFile(location).remove(); // is there a system one too? location = file(name, false); if (location.isEmpty()) return; } - QStringList n = g.readListEntry(mEntry); + TQStringList n = g.readListEntry(mEntry); if (n.contains(name)) return; n.append(name); g.writeEntry(mEntry, n); } -QString KDataCollection::file(const QString &name, bool create) +TQString KDataCollection::file(const TQString &name, bool create) { - QString path = ::locate(mDatadir, mDir+"/"+name); + TQString path = ::locate(mDatadir, mDir+"/"+name); if (path.isEmpty() && create) { @@ -124,20 +124,20 @@ QString KDataCollection::file(const QString &name, bool create) return path; } -QString KDataCollection::saveFile(const QString &name, bool create) +TQString KDataCollection::saveFile(const TQString &name, bool create) { if (!KGlobal::dirs()->isRestrictedResource(mDatadir, mDir+"/"+name)) { - QString s = KGlobal::dirs()->saveLocation(mDatadir, mDir, create); + TQString s = KGlobal::dirs()->saveLocation(mDatadir, mDir, create); if (s.length() && create) { s += "/" + name; - QFile(s).open(IO_ReadWrite); // create it + TQFile(s).open(IO_ReadWrite); // create it } return s; } - return QString::null; + return TQString::null; } diff --git a/noatun-plugins/oblique/kdatacollection.h b/noatun-plugins/oblique/kdatacollection.h index e8820f3..a737e43 100644 --- a/noatun-plugins/oblique/kdatacollection.h +++ b/noatun-plugins/oblique/kdatacollection.h @@ -20,8 +20,8 @@ #ifndef KDATACOLLECTION_H #define KDATACOLLECTION_H -#include -#include +#include +#include class KConfig; @@ -36,9 +36,9 @@ class KConfig; * *
  * KDataCollection profiles("appname/ui_profiles");
- * QStringList letUserSelectOne = profiles.names();
- * QString fileToOpen = profiles.file(theOneUserSelected);
- * QString fileToWriteTo = profiles.saveFile(theOneUserSelected);
+ * TQStringList letUserSelectOne = profiles.names();
+ * TQString fileToOpen = profiles.file(theOneUserSelected);
+ * TQString fileToWriteTo = profiles.saveFile(theOneUserSelected);
  *
* * @author Charles Samuels @@ -46,7 +46,7 @@ class KConfig; class KDataCollection { KConfig *mConfig; - QString mGroup, mEntry, mDir; + TQString mGroup, mEntry, mDir; const char *mDatadir; struct Private; @@ -60,8 +60,8 @@ public: * @param datadir is what is passed to locate, this is "appdata" by default **/ KDataCollection( - KConfig *config, const QString &group, const QString &entry, - const char *datadir, const QString &dir + KConfig *config, const TQString &group, const TQString &entry, + const char *datadir, const TQString &dir ); /** @@ -69,8 +69,8 @@ public: * settings, @p dir is the second argument to locate("appdata", ...) **/ KDataCollection( - KConfig *config, const QString &group, const QString &entry, - const QString &dir + KConfig *config, const TQString &group, const TQString &entry, + const TQString &dir ); /** @@ -80,8 +80,8 @@ public: * otherwise the same as the previous function **/ KDataCollection( - KConfig *config, const QString &group, - const QString &dir + KConfig *config, const TQString &group, + const TQString &dir ); /** @@ -91,26 +91,26 @@ public: * * otherwise the same as the previous function **/ - KDataCollection(KConfig *config, const QString &dir); + KDataCollection(KConfig *config, const TQString &dir); /** * constructor. the KConfig is assumed to be KGlobal::config() * * otherwise the same as the previous function **/ - KDataCollection(const QString &dir); + KDataCollection(const TQString &dir); /** * returns a list of existant, non hidden files **/ - QStringList names() const; + TQStringList names() const; /** * deletes the file if it is in KDEHOME, or marks it as hidden if it's a * system file **/ - void remove(const QString &name); + void remove(const TQString &name); /** * @returns the filename for a file named @p name, if @p create @@ -119,7 +119,7 @@ public: * * if you want to modify this file, you should use saveFile instead **/ - QString file(const QString &name, bool create=true); + TQString file(const TQString &name, bool create=true); /** * @returns the filename for a file you can save into. If @p create is @@ -132,12 +132,12 @@ public: * It will not return a file if the Kiosk framework claims that it's * restricted **/ - QString saveFile(const QString &name, bool create=true); + TQString saveFile(const TQString &name, bool create=true); private: void init( - KConfig *config, const QString &group, const QString &entry, - const char *datadir, const QString &dir + KConfig *config, const TQString &group, const TQString &entry, + const char *datadir, const TQString &dir ); }; diff --git a/noatun-plugins/oblique/kdbt.h b/noatun-plugins/oblique/kdbt.h index acaae57..4ecc71a 100644 --- a/noatun-plugins/oblique/kdbt.h +++ b/noatun-plugins/oblique/kdbt.h @@ -7,8 +7,8 @@ #define KDbt_Interface #include -#include -#include +#include +#include #include "kbuffer.h" /**A generic wrapper for "database thang" class that abstracts binary streaming operations. @@ -19,8 +19,8 @@ template class KDbt : public Dbt { public: /* assume streaming operators on QDataStream - QDataStream & operator>> ( QDataStream& >>, T &); - QDataStream & operator<< ( QDataStream& >>, T &); + TQDataStream & operator>> ( TQDataStream& >>, T &); + TQDataStream & operator<< ( TQDataStream& >>, T &); */ KDbt() { } @@ -34,7 +34,7 @@ public: /** set "thang" to the contents of obj */ void set(const T& obj) { // KBuffer buffer(thang); - QDataStream ds(&thang); + TQDataStream ds(&thang); ds << obj; // std::cerr << "thang size " << thang.size() << endl; // buffer.close(); @@ -44,15 +44,15 @@ public: set_size(thang.size()); } void get(T& obj) { - QByteArray buffer; + TQByteArray buffer; buffer.setRawData((char*)get_data(),get_size()); - QDataStream ds(buffer,IO_ReadWrite); + TQDataStream ds(buffer,IO_ReadWrite); ds >> obj; buffer.resetRawData((char*)get_data(),get_size()); } private: /** Internal data */ -// QByteArray thang; +// TQByteArray thang; KBuffer thang; }; diff --git a/noatun-plugins/oblique/menu.cpp b/noatun-plugins/oblique/menu.cpp index 0556d88..3867f19 100644 --- a/noatun-plugins/oblique/menu.cpp +++ b/noatun-plugins/oblique/menu.cpp @@ -7,25 +7,25 @@ #include "tree.h" -FileMenu::FileMenu(QWidget *parent, Oblique *oblique, File file) +FileMenu::FileMenu(TQWidget *parent, Oblique *oblique, File file) : KPopupMenu(parent) { if (file) mFiles.append(file); insertItem( BarIconSet("delete"), i18n("&Remove From Playlist"), - this, SLOT(removeFromList()) + this, TQT_SLOT(removeFromList()) ); - insertItem(i18n("&Properties"), this, SLOT(properties())); + insertItem(i18n("&Properties"), this, TQT_SLOT(properties())); (new SliceListAction( i18n("&Slices"), oblique, - this, SLOT(toggleInSlice(Slice *)), + this, TQT_SLOT(toggleInSlice(Slice *)), mFiles, this ))->plug(this); } -static void addTo(QValueList &files, TreeItem *item) +static void addTo(TQValueList &files, TreeItem *item) { File f = item->file(); if (f) files.append(f); @@ -39,27 +39,27 @@ static void addTo(QValueList &files, TreeItem *item) } } -FileMenu::FileMenu(QWidget *parent, Oblique *oblique, TreeItem *items) +FileMenu::FileMenu(TQWidget *parent, Oblique *oblique, TreeItem *items) : KPopupMenu(parent) { addTo(mFiles, items); insertItem( BarIconSet("delete"), i18n("&Remove From Playlist"), - this, SLOT(removeFromList()) + this, TQT_SLOT(removeFromList()) ); - insertItem(i18n("&Properties"), this, SLOT(properties())); + insertItem(i18n("&Properties"), this, TQT_SLOT(properties())); (new SliceListAction( i18n("&Slices"), oblique, - this, SLOT(toggleInSlice(Slice *)), + this, TQT_SLOT(toggleInSlice(Slice *)), mFiles, this ))->plug(this); } void FileMenu::removeFromList() { - for (QValueList::Iterator i(mFiles.begin()); i != mFiles.end(); ++i) + for (TQValueList::Iterator i(mFiles.begin()); i != mFiles.end(); ++i) { (*i).remove(); } @@ -73,7 +73,7 @@ void FileMenu::properties() void FileMenu::toggleInSlice(Slice *slice) { void (File::*task)(Slice*)=0; - for (QValueList::Iterator i(mFiles.begin()); i != mFiles.end(); ++i) + for (TQValueList::Iterator i(mFiles.begin()); i != mFiles.end(); ++i) { if (!task) { // we check with the first one @@ -90,18 +90,18 @@ void FileMenu::toggleInSlice(Slice *slice) SliceListAction::SliceListAction( - const QString &text, Oblique *oblique, - QObject *reciever, const char *slot, - const QValueList &files, QObject *parent, const char *name + const TQString &text, Oblique *oblique, + TQObject *reciever, const char *slot, + const TQValueList &files, TQObject *parent, const char *name ) : KActionMenu(text, parent, name) { mFiles = files; mOblique = oblique; slicesModified(); if (reciever) - connect(this, SIGNAL(activated(Slice*)), reciever, slot); - connect(popupMenu(), SIGNAL(activated(int)), SLOT(hit(int))); - connect(oblique->base(), SIGNAL(slicesModified()), SLOT(slicesModified())); + connect(this, TQT_SIGNAL(activated(Slice*)), reciever, slot); + connect(popupMenu(), TQT_SIGNAL(activated(int)), TQT_SLOT(hit(int))); + connect(oblique->base(), TQT_SIGNAL(slicesModified()), TQT_SLOT(slicesModified())); } void SliceListAction::slicesModified() @@ -110,12 +110,12 @@ void SliceListAction::slicesModified() KPopupMenu *menu = popupMenu(); menu->clear(); - QPtrList slices = mOblique->base()->slices(); + TQPtrList slices = mOblique->base()->slices(); int id=1; - for (QPtrListIterator i(slices); *i; ++i) + for (TQPtrListIterator i(slices); *i; ++i) { Slice *s = *i; if (s->id()==0 && mFiles.count()) @@ -151,16 +151,16 @@ void SliceListAction::hit(int index) SchemaListAction::SchemaListAction( - const QString &text, - QObject *reciever, const char *slot, - QObject *parent, const char *name + const TQString &text, + TQObject *reciever, const char *slot, + TQObject *parent, const char *name ) : KActionMenu(text, parent, name) { mTree = 0; if (reciever) - connect(this, SIGNAL(activated(const QString&)), reciever, slot); - connect(popupMenu(), SIGNAL(aboutToShow()), SLOT(prepare())); - connect(popupMenu(), SIGNAL(activated(int)), SLOT(hit(int))); + connect(this, TQT_SIGNAL(activated(const TQString&)), reciever, slot); + connect(popupMenu(), TQT_SIGNAL(aboutToShow()), TQT_SLOT(prepare())); + connect(popupMenu(), TQT_SIGNAL(activated(int)), TQT_SLOT(hit(int))); } void SchemaListAction::prepare() @@ -174,12 +174,12 @@ void SchemaListAction::prepare() int id=1; - QStringList names = mTree->oblique()->schemaNames(); + TQStringList names = mTree->oblique()->schemaNames(); - for (QStringList::Iterator i(names.begin()); i != names.end(); ++i) + for (TQStringList::Iterator i(names.begin()); i != names.end(); ++i) { Query q; - QString title = mTree->oblique()->loadSchema(q, *i); + TQString title = mTree->oblique()->loadSchema(q, *i); menu->insertItem(title, id); @@ -197,11 +197,11 @@ void SchemaListAction::hit(int index) -ObliquePropertiesDialog::ObliquePropertiesDialog(const QValueList &files, QWidget *parent) +ObliquePropertiesDialog::ObliquePropertiesDialog(const TQValueList &files, TQWidget *parent) : KPropertiesDialog(makeItems(files), parent), mFiles(files) { - connect(this, SIGNAL(propertiesClosed()), SLOT(deleteLater())); - connect(this, SIGNAL(applied()), SLOT(modified())); + connect(this, TQT_SIGNAL(propertiesClosed()), TQT_SLOT(deleteLater())); + connect(this, TQT_SIGNAL(applied()), TQT_SLOT(modified())); show(); } @@ -209,17 +209,17 @@ ObliquePropertiesDialog::ObliquePropertiesDialog(const QValueList &files, void ObliquePropertiesDialog::modified() { // TODO reload the file's info - for (QValueList::Iterator i(mFiles.begin()); i != mFiles.end(); ++i) + for (TQValueList::Iterator i(mFiles.begin()); i != mFiles.end(); ++i) { (*i).makeCache(); (*i).base()->notifyChanged(*i); } } -KFileItemList ObliquePropertiesDialog::makeItems(const QValueList &files) +KFileItemList ObliquePropertiesDialog::makeItems(const TQValueList &files) { KFileItemList kl; - for (QValueList::ConstIterator i(files.begin()); i != files.end(); ++i) + for (TQValueList::ConstIterator i(files.begin()); i != files.end(); ++i) { File f = *i; kl.append(new KFileItem(f.url(), f.property("mimetype"), KFileItem::Unknown)); diff --git a/noatun-plugins/oblique/menu.h b/noatun-plugins/oblique/menu.h index 793180c..da464dc 100644 --- a/noatun-plugins/oblique/menu.h +++ b/noatun-plugins/oblique/menu.h @@ -17,14 +17,14 @@ class FileMenu : public KPopupMenu { Q_OBJECT - QValueList mFiles; + TQValueList mFiles; public: - FileMenu(QWidget *parent, Oblique *oblique, File file); + FileMenu(TQWidget *parent, Oblique *oblique, File file); /** * @recursively uses everything under @p files **/ - FileMenu(QWidget *parent, Oblique *oblique, TreeItem *files); + FileMenu(TQWidget *parent, Oblique *oblique, TreeItem *files); private slots: void removeFromList(); @@ -35,15 +35,15 @@ private slots: class SliceListAction : public KActionMenu { Q_OBJECT - QMap mIndexToSlices; - QValueList mFiles; + TQMap mIndexToSlices; + TQValueList mFiles; Oblique *mOblique; public: SliceListAction( - const QString &text, Oblique *oblique, - QObject *reciever, const char *slot, - const QValueList &files = QValueList(), QObject *parent=0, const char *name=0 + const TQString &text, Oblique *oblique, + TQObject *reciever, const char *slot, + const TQValueList &files = TQValueList(), TQObject *parent=0, const char *name=0 ); signals: @@ -58,20 +58,20 @@ private slots: class SchemaListAction : public KActionMenu { Q_OBJECT - QMap mIndexToSchemas; + TQMap mIndexToSchemas; Tree *mTree; public: SchemaListAction( - const QString &text, - QObject *reciever, const char *slot, - QObject *parent, const char *name + const TQString &text, + TQObject *reciever, const char *slot, + TQObject *parent, const char *name ); void setTree(Tree *tree) { mTree = tree; } signals: - void activated(const QString &); + void activated(const TQString &); private slots: void hit(int index); @@ -82,13 +82,13 @@ private slots: class ObliquePropertiesDialog : public KPropertiesDialog { Q_OBJECT - QValueList mFiles; + TQValueList mFiles; public: - ObliquePropertiesDialog(const QValueList &files, QWidget *parent); + ObliquePropertiesDialog(const TQValueList &files, TQWidget *parent); private: - static KFileItemList makeItems(const QValueList &files); + static KFileItemList makeItems(const TQValueList &files); private slots: void modified(); diff --git a/noatun-plugins/oblique/oblique.cpp b/noatun-plugins/oblique/oblique.cpp index 97e75be..234833a 100644 --- a/noatun-plugins/oblique/oblique.cpp +++ b/noatun-plugins/oblique/oblique.cpp @@ -15,7 +15,7 @@ #include #include -#include +#include extern "C" Plugin *create_plugin() { @@ -35,15 +35,15 @@ Oblique::Oblique() mBase = new Base(::locate("data", "noatun/")+"/oblique-list"); mView = new View(this); - connect(napp->player(), SIGNAL(loopTypeChange(int)), SLOT(loopTypeChange(int))); + connect(napp->player(), TQT_SIGNAL(loopTypeChange(int)), TQT_SLOT(loopTypeChange(int))); mSelector = new SequentialSelector(mView->tree()); new Configure(this); // psst, window's gone, pass it on! - connect(mView, SIGNAL(listHidden()), SIGNAL(listHidden())); - connect(mView, SIGNAL(listShown()), SIGNAL(listShown())); + connect(mView, TQT_SIGNAL(listHidden()), TQT_SIGNAL(listHidden())); + connect(mView, TQT_SIGNAL(listShown()), TQT_SIGNAL(listShown())); loopTypeChange(napp->player()->loopStyle()); } @@ -185,21 +185,21 @@ void Oblique::beginDirectoryAdd(const KURL &url) else { mAdder = new DirectoryAdder(url, this); - connect(mAdder, SIGNAL(done()), SLOT(adderDone())); + connect(mAdder, TQT_SIGNAL(done()), TQT_SLOT(adderDone())); } } Loader::Loader(Tree *tree) - : QObject(tree) + : TQObject(tree) { mTree = tree; mBase = mTree->oblique()->base(); mDeferredLoaderAt=1; - QTimer::singleShot(0, this, SLOT(loadItemsDeferred())); + TQTimer::singleShot(0, this, TQT_SLOT(loadItemsDeferred())); } void Loader::loadItemsDeferred() @@ -228,7 +228,7 @@ void Loader::loadItemsDeferred() mDeferredLoaderAt++; } - QTimer::singleShot(0, this, SLOT(loadItemsDeferred())); + TQTimer::singleShot(0, this, TQT_SLOT(loadItemsDeferred())); } @@ -265,16 +265,16 @@ void DirectoryAdder::addNextPending() currentJobURL= *pendingIt; listJob = KIO::listDir(currentJobURL, false, false); connect( - listJob, SIGNAL(entries(KIO::Job*, const KIO::UDSEntryList&)), - SLOT(slotEntries(KIO::Job*, const KIO::UDSEntryList&)) + listJob, TQT_SIGNAL(entries(KIO::Job*, const KIO::UDSEntryList&)), + TQT_SLOT(slotEntries(KIO::Job*, const KIO::UDSEntryList&)) ); connect( - listJob, SIGNAL(result(KIO::Job *)), - SLOT(slotResult(KIO::Job *)) + listJob, TQT_SIGNAL(result(KIO::Job *)), + TQT_SLOT(slotResult(KIO::Job *)) ); connect( - listJob, SIGNAL(redirection(KIO::Job *, const KURL &)), - SLOT(slotRedirection(KIO::Job *, const KURL &)) + listJob, TQT_SIGNAL(redirection(KIO::Job *, const KURL &)), + TQT_SLOT(slotRedirection(KIO::Job *, const KURL &)) ); pendingAddDirectories.remove(pendingIt); lastAddedSubDirectory = pendingAddDirectories.begin(); @@ -293,7 +293,7 @@ void DirectoryAdder::slotResult(KIO::Job *job) void DirectoryAdder::slotEntries(KIO::Job *, const KIO::UDSEntryList &entries) { - QMap __list; // temp list to sort entries + TQMap __list; // temp list to sort entries KIO::UDSEntryListConstIterator it = entries.begin(); KIO::UDSEntryListConstIterator end = entries.end(); @@ -309,7 +309,7 @@ void DirectoryAdder::slotEntries(KIO::Job *, const KIO::UDSEntryList &entries) // - copied over from old kdirlister hack __list.insert(file.url().path(), file.url()); } - QMap::Iterator __it; + TQMap::Iterator __it; for( __it = __list.begin(); __it != __list.end(); ++__it ) { oblique()->addFile(__it.data(), false); diff --git a/noatun-plugins/oblique/oblique.h b/noatun-plugins/oblique/oblique.h index 93d1e18..f7e6bc8 100644 --- a/noatun-plugins/oblique/oblique.h +++ b/noatun-plugins/oblique/oblique.h @@ -40,21 +40,21 @@ public: Base *base() { return mBase; } - QStringList schemaNames() const { return mSchemaCollection.names(); } - QString loadSchema(Query &q, const QString &name) + TQStringList schemaNames() const { return mSchemaCollection.names(); } + TQString loadSchema(Query &q, const TQString &name) { - QString t = q.load(mSchemaCollection.file(name)); + TQString t = q.load(mSchemaCollection.file(name)); if (t.length()) q.setName(name); return t; } - void saveSchema(Query &q, const QString &name, const QString &title) + void saveSchema(Query &q, const TQString &name, const TQString &title) { q.save(title, mSchemaCollection.saveFile(name)); } - void removeSchema(const QString &name) + void removeSchema(const TQString &name) { mSchemaCollection.remove(name); } diff --git a/noatun-plugins/oblique/query.cpp b/noatun-plugins/oblique/query.cpp index 292ff16..8c85b59 100644 --- a/noatun-plugins/oblique/query.cpp +++ b/noatun-plugins/oblique/query.cpp @@ -8,8 +8,8 @@ #include -#include -#include +#include +#include QueryGroup::QueryGroup() { @@ -136,23 +136,23 @@ void QueryGroup::setOption(Option option, bool on) bool QueryGroup::matches(const File &file) const { - QString prop = file.property(propertyName()); + TQString prop = file.property(propertyName()); prop = prop.simplifyWhiteSpace(); if (prop.isNull()) prop = ""; - QRegExp re(value()); + TQRegExp re(value()); return re.search(prop) != -1; } -QString QueryGroup::presentation(const File &file) const +TQString QueryGroup::presentation(const File &file) const { // "$(property)" - QString format=presentation(); + TQString format=presentation(); - QRegExp find("(?:(?:\\\\\\\\))*\\$\\((.*)"); + TQRegExp find("(?:(?:\\\\\\\\))*\\$\\((.*)"); int start=0; while (start != -1) @@ -166,7 +166,7 @@ QString QueryGroup::presentation(const File &file) 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; @@ -181,7 +181,7 @@ QString QueryGroup::presentation(const File &file) const if (format[start]=='\\') { // count how many there are first - QRegExp counter("([\\\\]+)"); + TQRegExp counter("([\\\\]+)"); counter.search(format, start); uint len=counter.cap(1).length(); @@ -191,8 +191,8 @@ QString QueryGroup::presentation(const File &file) 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] == '"') { @@ -231,7 +231,7 @@ QString QueryGroup::presentation(const File &file) const i++; - QString propval = file.property(propname); + TQString propval = file.property(propname); // the following code won't be enabled until the presentation is reloaded // at the best times @@ -318,27 +318,27 @@ void Query::clear() mGroupFirst=0; } -QString Query::load(const QString &filename) +TQString Query::load(const TQString &filename) { - QFile file(filename); - unless (file.open(IO_ReadOnly)) return QString::null; + TQFile file(filename); + unless (file.open(IO_ReadOnly)) return TQString::null; - QDomDocument doc; + TQDomDocument doc; doc.setContent(&file); return load(doc.documentElement()); } -QString Query::load(QDomElement element) +TQString Query::load(TQDomElement element) { clear(); if (element.tagName().lower() == "obliqueschema") { - QDomNode node = element.firstChild(); + TQDomNode node = element.firstChild(); while (!node.isNull()) { - QDomElement e = node.toElement(); + TQDomElement e = node.toElement(); if (e.tagName().lower() == "group") loadGroup(e); node = node.nextSibling(); @@ -346,20 +346,20 @@ QString Query::load(QDomElement element) } else { - return QString::null; + return TQString::null; } // for internationalization: // Add these if you create new schemas and release them with Oblique (void)I18N_NOOP("Standard"); - QString title = element.attribute("title"); + TQString title = element.attribute("title"); if (element.hasAttribute("standard")) title = i18n(title.utf8()); return title; } -void Query::save(const QString &name, QDomElement &element) +void Query::save(const TQString &name, TQDomElement &element) { element.setTagName("ObliqueSchema"); element.setAttribute("version", "1.0"); @@ -368,22 +368,22 @@ void Query::save(const QString &name, QDomElement &element) saveGroup(element, g); } -void Query::save(const QString &name, const QString &filename) +void Query::save(const TQString &name, const TQString &filename) { - QFile file(filename); + TQFile file(filename); unless (file.open(IO_Truncate|IO_ReadWrite )) return; - QDomDocument doc("ObliqueSchema"); - doc.setContent(QString("")); - QDomElement e = doc.documentElement(); + TQDomDocument doc("ObliqueSchema"); + doc.setContent(TQString("")); + TQDomElement e = doc.documentElement(); save(name, e); - QTextStream ts(&file); - ts.setEncoding(QTextStream::UnicodeUTF8); + TQTextStream ts(&file); + ts.setEncoding(TQTextStream::UnicodeUTF8); // scourge elimination - QString data = doc.toString(); - QString old = data; - while (data.replace(QRegExp("([\n\r]+)(\t*) "), "\\1\\2\t") != old) + TQString data = doc.toString(); + TQString old = data; + while (data.replace(TQRegExp("([\n\r]+)(\t*) "), "\\1\\2\t") != old) { old = data; } @@ -438,9 +438,9 @@ void Query::dump() -void Query::loadGroup(QDomElement element, QueryGroup *parent) +void Query::loadGroup(TQDomElement element, QueryGroup *parent) { - QDomNode node = element.firstChild(); + TQDomNode node = element.firstChild(); QueryGroup *group = new QueryGroup; if (parent) @@ -457,7 +457,7 @@ void Query::loadGroup(QDomElement element, QueryGroup *parent) while (!node.isNull()) { - QDomElement e = node.toElement(); + TQDomElement e = node.toElement(); if (e.tagName().lower() == "group") { loadGroup(e, group); @@ -468,7 +468,7 @@ void Query::loadGroup(QDomElement element, QueryGroup *parent) } else if (e.tagName().lower() == "value") { - group->setValue(QRegExp(e.text())); + group->setValue(TQRegExp(e.text())); } else if (e.tagName().lower() == "presentation") { @@ -476,10 +476,10 @@ void Query::loadGroup(QDomElement element, QueryGroup *parent) } else if (e.tagName().lower() == "options") { - QDomNode node = e.firstChild(); + TQDomNode node = e.firstChild(); while (!node.isNull()) { - QDomElement e = node.toElement(); + TQDomElement e = node.toElement(); if (e.tagName().lower() == "disabled") group->setOption(QueryGroup::Disabled, true); @@ -500,14 +500,14 @@ void Query::loadGroup(QDomElement element, QueryGroup *parent) } } -void Query::saveGroup(QDomElement &parent, QueryGroup *group) +void Query::saveGroup(TQDomElement &parent, QueryGroup *group) { - QDomDocument doc = parent.ownerDocument(); - QDomElement element = doc.createElement("group"); + TQDomDocument doc = parent.ownerDocument(); + TQDomElement element = doc.createElement("group"); parent.appendChild(element); - QDomElement childe; - QDomText childtext; + TQDomElement childe; + TQDomText childtext; { childe = doc.createElement("property"); element.appendChild(childe); diff --git a/noatun-plugins/oblique/query.h b/noatun-plugins/oblique/query.h index 60a19ff..d5835d6 100644 --- a/noatun-plugins/oblique/query.h +++ b/noatun-plugins/oblique/query.h @@ -6,8 +6,8 @@ #include "base.h" -#include -#include +#include +#include class Query; class QDomElement; @@ -22,9 +22,9 @@ class QueryGroup int mFuzzyness; int mOptions; - QString mPropertyName; - QString mPresentation; - QRegExp mValue; + TQString mPropertyName; + TQString mPresentation; + TQRegExp mValue; public: QueryGroup(); @@ -61,13 +61,13 @@ public: **/ void move(Query *query, QueryGroup *under, QueryGroup *after); - QString propertyName() const { return mPropertyName; } - QRegExp value() const { return mValue; } - QString presentation() const { return mPresentation; } + TQString propertyName() const { return mPropertyName; } + TQRegExp value() const { return mValue; } + TQString presentation() const { return mPresentation; } - void setPropertyName(const QString &v) { mPropertyName = v; } - void setPresentation(const QString &v) { mPresentation = v; } - void setValue(const QRegExp &v) { mValue = v; } + void setPropertyName(const TQString &v) { mPropertyName = v; } + void setPresentation(const TQString &v) { mPresentation = v; } + void setValue(const TQRegExp &v) { mValue = v; } enum Fuzzyness { @@ -90,14 +90,14 @@ public: **/ bool matches(const File &file) const; - QString presentation(const File &file) const; + TQString presentation(const File &file) const; private: /** * apply all the "normalizing" transformations according * to the fuzzyness **/ - QString fuzzify(const QString &str) const; + TQString fuzzify(const TQString &str) const; /** * @returns the previous or parent of this item (slow) **/ @@ -115,7 +115,7 @@ private: class Query { QueryGroup *mGroupFirst; - QString mName; + TQString mName; public: Query(); @@ -135,15 +135,15 @@ public: /** * @returns the name to be used internally **/ - QString name() const { return mName; } - void setName(const QString &name) { mName = name; } + TQString name() const { return mName; } + void setName(const TQString &name) { mName = name; } /** * @returns the name of the query **/ - QString load(const QString &filename); - void save(const QString &name, QDomElement &element); - void save(const QString &name, const QString &filename); + TQString load(const TQString &filename); + void save(const TQString &name, TQDomElement &element); + void save(const TQString &name, const TQString &filename); /** * remove any trace of this from the tree, but don't actually delete it @@ -157,18 +157,18 @@ public: * * Will give it a name in the db if necessary **/ - QString dbname(Base *base); + TQString dbname(Base *base); private: - void loadGroup(QDomElement element, QueryGroup *parent=0); - void saveGroup(QDomElement &parent, QueryGroup *group); + void loadGroup(TQDomElement element, QueryGroup *parent=0); + void saveGroup(TQDomElement &parent, QueryGroup *group); void deepCopy(const QueryGroup *from, QueryGroup *toParent); /** * @returns the name of the query **/ - QString load(QDomElement element); + TQString load(TQDomElement element); }; diff --git a/noatun-plugins/oblique/selector.cpp b/noatun-plugins/oblique/selector.cpp index 1c17650..f28c333 100644 --- a/noatun-plugins/oblique/selector.cpp +++ b/noatun-plugins/oblique/selector.cpp @@ -14,7 +14,7 @@ Item::Item(const File &file) } -QString Item::property(const QString &key, const QString &def) const +TQString Item::property(const TQString &key, const TQString &def) const { if (key == "url") { @@ -23,27 +23,27 @@ QString Item::property(const QString &key, const QString &def) const return url.url(); } - QString str = mFile.property(key); + TQString str = mFile.property(key); if (str.isNull()) return def; return str; } -void Item::setProperty(const QString &key, const QString &property) +void Item::setProperty(const TQString &key, const TQString &property) { mFile.setProperty(key, property); } -void Item::clearProperty(const QString &key) +void Item::clearProperty(const TQString &key) { mFile.clearProperty(key); } -QStringList Item::properties() const +TQStringList Item::properties() const { return mFile.properties(); } -bool Item::isProperty(const QString &key) const +bool Item::isProperty(const TQString &key) const { return !mFile.property(key).isNull(); } diff --git a/noatun-plugins/oblique/selector.h b/noatun-plugins/oblique/selector.h index 1447dec..6ce57dd 100644 --- a/noatun-plugins/oblique/selector.h +++ b/noatun-plugins/oblique/selector.h @@ -16,12 +16,12 @@ public: File itemFile() const { return mFile; } - virtual QString property(const QString &key, const QString &def=0) const; - virtual void setProperty(const QString &key, const QString &property); - virtual void clearProperty (const QString &key); - virtual QStringList properties() const; + virtual TQString property(const TQString &key, const TQString &def=0) const; + virtual void setProperty(const TQString &key, const TQString &property); + virtual void clearProperty (const TQString &key); + virtual TQStringList properties() const; - virtual bool isProperty(const QString &key) const; + virtual bool isProperty(const TQString &key) const; virtual bool operator==(const PlaylistItemData &d) const; virtual void remove(); diff --git a/noatun-plugins/oblique/tree.cpp b/noatun-plugins/oblique/tree.cpp index 4160650..0087b99 100644 --- a/noatun-plugins/oblique/tree.cpp +++ b/noatun-plugins/oblique/tree.cpp @@ -7,7 +7,7 @@ #include "menu.h" #include "oblique.h" -#include +#include #include #include @@ -105,7 +105,7 @@ static void treeItemSort(TreeItem *first) if (at > 1) treeItemSort(set, set+count-manually-1); - // grr, QListView sucks + // grr, TQListView sucks set[0]->moveItem(set[1]); TreeItem *previous = set[0]; @@ -149,7 +149,7 @@ inline static void sortify(T *item) } -TreeItem::TreeItem(Tree *parent, QueryGroup *group, const File &file, const QString &p) +TreeItem::TreeItem(Tree *parent, QueryGroup *group, const File &file, const TQString &p) : KListViewItem(parent, p), mGroup(group), mUserOpened(false), mHidden(false) { if (group->option(QueryGroup::Playable)) @@ -161,7 +161,7 @@ TreeItem::TreeItem(Tree *parent, QueryGroup *group, const File &file, const QStr sortify(parent); } -TreeItem::TreeItem(TreeItem *parent, QueryGroup *group, const File &file, const QString &p) +TreeItem::TreeItem(TreeItem *parent, QueryGroup *group, const File &file, const TQString &p) : KListViewItem(parent, p), mGroup(group), mUserOpened(false), mHidden(false) { if (group->option(QueryGroup::Playable)) @@ -196,7 +196,7 @@ void Tree::deleted(TreeItem *item) } } -static void pad(QString &str) +static void pad(TQString &str) { int len=str.length(); int at = 0; @@ -205,11 +205,11 @@ static void pad(QString &str) static const int paddingsize=12; // not static for reason - const QChar chars[paddingsize] = + const TQChar chars[paddingsize] = { - QChar('0'), QChar('0'), QChar('0'), QChar('0'), - QChar('0'), QChar('0'), QChar('0'), QChar('0'), - QChar('0'), QChar('0'), QChar('0'), QChar('0') + TQChar('0'), TQChar('0'), TQChar('0'), TQChar('0'), + TQChar('0'), TQChar('0'), TQChar('0'), TQChar('0'), + TQChar('0'), TQChar('0'), TQChar('0'), TQChar('0') }; for (int i=0; i < len; i++) @@ -237,10 +237,10 @@ static void pad(QString &str) } } -int TreeItem::compare(QListViewItem *i, int col, bool) const +int TreeItem::compare(TQListViewItem *i, int col, bool) const { - QString text1 = text(col); - QString text2 = i->text(col); + TQString text1 = text(col); + TQString text2 = i->text(col); pad(text1); pad(text2); @@ -253,7 +253,7 @@ Tree *TreeItem::tree() return static_cast(KListViewItem::listView()); } -QString TreeItem::presentation() const +TQString TreeItem::presentation() const { return text(0); } @@ -287,27 +287,27 @@ TreeItem *TreeItem::nextPlayable() return next; } -void TreeItem::paintCell(QPainter *p, const QColorGroup &cg, int column, int width, int align) +void TreeItem::paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int align) { - QFont font = p->font(); + TQFont font = p->font(); if (tree()->current() == this) { font.setUnderline(true); p->setFont(font); } - QColorGroup newcg(cg); + TQColorGroup newcg(cg); if (parent() && parent()->isOpen() && !parent()->mUserOpened) { // slow, but not often used - QColor text = newcg.text(); - QColor bg = newcg.background(); + TQColor text = newcg.text(); + TQColor bg = newcg.background(); int r = text.red() + bg.red(); int g = text.green() + bg.green(); int b = text.blue() + bg.blue(); text.setRgb(r/2,g/2,b/2); - newcg.setColor(QColorGroup::Text, text); + newcg.setColor(TQColorGroup::Text, text); } KListViewItem::paintCell(p, newcg, column, width, align); @@ -346,7 +346,7 @@ void TreeItem::forceAutoExpand() setOpen(true); } -bool TreeItem::hideIfNoMatch(const QString &match) +bool TreeItem::hideIfNoMatch(const TQString &match) { if (!firstChild()) { @@ -372,7 +372,7 @@ bool TreeItem::hideIfNoMatch(const QString &match) if (visible) { - QString empty; + TQString empty; for (TreeItem *ch = firstChild(); ch; ch = ch->nextSibling()) { ch->hideIfNoMatch(empty); @@ -395,7 +395,7 @@ bool TreeItem::hideIfNoMatch(const QString &match) void TreeItem::setup() { - QListViewItem::setup(); + TQListViewItem::setup(); if (mHidden) setHeight(0); } @@ -431,7 +431,7 @@ TreeItem *TreeItem::next() -Tree::Tree(Oblique *oblique, QWidget *parent) +Tree::Tree(Oblique *oblique, TQWidget *parent) : KListView(parent), mOblique(oblique), mAutoExpanding(0) { mCurrent = 0; @@ -449,32 +449,32 @@ Tree::Tree(Oblique *oblique, QWidget *parent) setDropVisualizer(true); setSorting(-1); - ((QWidget*)header())->hide(); + ((TQWidget*)header())->hide(); connect( - this, SIGNAL(moved(QPtrList&, QPtrList&, QPtrList&)), - SLOT(dropped(QPtrList&, QPtrList&, QPtrList&)) + this, TQT_SIGNAL(moved(TQPtrList&, TQPtrList&, TQPtrList&)), + TQT_SLOT(dropped(TQPtrList&, TQPtrList&, TQPtrList&)) ); connect( - this, SIGNAL(contextMenu(KListView*, QListViewItem*, const QPoint&)), - SLOT(contextMenu(KListView*, QListViewItem*, const QPoint&)) + this, TQT_SIGNAL(contextMenu(KListView*, TQListViewItem*, const TQPoint&)), + TQT_SLOT(contextMenu(KListView*, TQListViewItem*, const TQPoint&)) ); connect( - this, SIGNAL(executed(QListViewItem*)), - SLOT(play(QListViewItem*)) + this, TQT_SIGNAL(executed(TQListViewItem*)), + TQT_SLOT(play(TQListViewItem*)) ); Base *base = oblique->base(); - connect(base, SIGNAL(added(File)), SLOT(insert(File))); - connect(base, SIGNAL(removed(File)), SLOT(remove(File))); - connect(base, SIGNAL(modified(File)), SLOT(update(File))); + connect(base, TQT_SIGNAL(added(File)), TQT_SLOT(insert(File))); + connect(base, TQT_SIGNAL(removed(File)), TQT_SLOT(remove(File))); + connect(base, TQT_SIGNAL(modified(File)), TQT_SLOT(update(File))); - connect(base, SIGNAL(addedTo(Slice*, File)), SLOT(checkInsert(Slice*, File))); - connect(base, SIGNAL(removedFrom(Slice*, File)), SLOT(checkRemove(Slice*, File))); + connect(base, TQT_SIGNAL(addedTo(Slice*, File)), TQT_SLOT(checkInsert(Slice*, File))); + connect(base, TQT_SIGNAL(removedFrom(Slice*, File)), TQT_SLOT(checkRemove(Slice*, File))); - connect(this, SIGNAL(selected(TreeItem*)), oblique, SLOT(selected(TreeItem*))); + connect(this, TQT_SIGNAL(selected(TreeItem*)), oblique, TQT_SLOT(selected(TreeItem*))); mSlice = oblique->base()->defaultSlice(); @@ -503,10 +503,10 @@ void Tree::clear() KListView::clear(); } -void Tree::movableDropEvent (QListViewItem* parent, QListViewItem* afterme) +void Tree::movableDropEvent (TQListViewItem* parent, TQListViewItem* afterme) { - QPtrList items = selectedItems(true); - for (QPtrList::Iterator i(items.begin()); *i; ++i) + TQPtrList items = selectedItems(true); + for (TQPtrList::Iterator i(items.begin()); *i; ++i) { if ((*i)->parent() != parent) return; @@ -516,10 +516,10 @@ void Tree::movableDropEvent (QListViewItem* parent, QListViewItem* afterme) } -void Tree::dropped(QPtrList &items, QPtrList &, QPtrList &afterNow) +void Tree::dropped(TQPtrList &items, TQPtrList &, TQPtrList &afterNow) { - QPtrList::Iterator itemi = items.begin(); - QPtrList::Iterator afteri = afterNow.begin(); + TQPtrList::Iterator itemi = items.begin(); + TQPtrList::Iterator afteri = afterNow.begin(); while (*itemi) { TreeItem *item = static_cast(*itemi); @@ -622,21 +622,21 @@ void Tree::setCurrent(TreeItem *cur) // undo the old one TreeItem *old = mCurrent; mCurrent = cur; - QPtrList oldAutoExpanded = mAutoExpanded; + TQPtrList oldAutoExpanded = mAutoExpanded; mAutoExpanded.clear(); repaintItem(old); repaintItem(cur); if (cur) cur->autoExpand(); // do an anti-intersection on oldAutoUpdated and the new mAutoExpanded - for (QPtrListIterator i(mAutoExpanded); *i; ++i) + for (TQPtrListIterator i(mAutoExpanded); *i; ++i) { oldAutoExpanded.removeRef(*i); } bool user=false; - for (QPtrListIterator i(oldAutoExpanded); *i; ++i) + for (TQPtrListIterator i(oldAutoExpanded); *i; ++i) { if ((*i)->userOpened()) { @@ -646,7 +646,7 @@ void Tree::setCurrent(TreeItem *cur) } if (!user) { - for (QPtrListIterator i(oldAutoExpanded); *i; ++i) + for (TQPtrListIterator i(oldAutoExpanded); *i; ++i) { (*i)->setOpen(false); } @@ -660,7 +660,7 @@ void Tree::reload() delete mLoader; clear(); mLoader = new Loader(this); - connect(mLoader, SIGNAL(finished()), SLOT(destroyLoader())); + connect(mLoader, TQT_SIGNAL(finished()), TQT_SLOT(destroyLoader())); } void Tree::setSlice(Slice *slice) @@ -670,7 +670,7 @@ void Tree::setSlice(Slice *slice) reload(); } -bool Tree::setSchema(const QString &name) +bool Tree::setSchema(const TQString &name) { mFileOfQuery = name; if (!oblique()->loadSchema(mQuery, name)) @@ -679,7 +679,7 @@ bool Tree::setSchema(const QString &name) return true; } -QDragObject *Tree::dragObject() +TQDragObject *Tree::dragObject() { if (currentItem() && static_cast(currentItem())->file()) return KListView::dragObject(); @@ -692,7 +692,7 @@ void Tree::destroyLoader() mLoader = 0; } -void Tree::setLimit(const QString &text) +void Tree::setLimit(const TQString &text) { for (TreeItem *ch = firstChild(); ch; ch = ch->nextSibling()) { @@ -701,7 +701,7 @@ void Tree::setLimit(const QString &text) } -void Tree::contextMenu(KListView*, QListViewItem* i, const QPoint& p) +void Tree::contextMenu(KListView*, TQListViewItem* i, const TQPoint& p) { if (!i) return; delete lastMenu; @@ -709,7 +709,7 @@ void Tree::contextMenu(KListView*, QListViewItem* i, const QPoint& p) lastMenu->popup(p); } -void Tree::play(QListViewItem *_item) +void Tree::play(TQListViewItem *_item) { if (!_item) return; TreeItem *item = static_cast(_item); @@ -757,7 +757,7 @@ TreeItem *Tree::node(TreeItem *fix, QueryGroup *group, const File &file, TreeIte else children = firstChild(); - QString presentation = group->presentation(file); + TQString presentation = group->presentation(file); while (children) { // merging would be done here diff --git a/noatun-plugins/oblique/tree.h b/noatun-plugins/oblique/tree.h index 0d53732..f059931 100644 --- a/noatun-plugins/oblique/tree.h +++ b/noatun-plugins/oblique/tree.h @@ -4,7 +4,7 @@ #ifndef TREE_H #define TREE_H -#include +#include #include #include "base.h" @@ -23,8 +23,8 @@ class TreeItem : public KListViewItem bool mHidden:1; public: - TreeItem(Tree *parent, QueryGroup *group, const File &file, const QString &p=0); - TreeItem(TreeItem *parent, QueryGroup *group, const File &file, const QString &p=0); + TreeItem(Tree *parent, QueryGroup *group, const File &file, const TQString &p=0); + TreeItem(TreeItem *parent, QueryGroup *group, const File &file, const TQString &p=0); ~TreeItem(); QueryGroup *group() { return mGroup; } @@ -38,7 +38,7 @@ public: TreeItem *nextSibling() { return static_cast(KListViewItem::nextSibling()); } // for gdb, which sucks. - QString presentation() const; + TQString presentation() const; File file() { return mFile; } void setFile(File file) { mFile = file; } @@ -56,9 +56,9 @@ public: **/ TreeItem *nextPlayable(); - void paintCell(QPainter *p, const QColorGroup &cg, int column, int width, int align); + void paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int align); - virtual int compare(QListViewItem * i, int col, bool) const; + virtual int compare(TQListViewItem * i, int col, bool) const; /** * open my parents so that I'm visible, if I'm playing or @@ -67,7 +67,7 @@ public: **/ void autoExpand(); bool userOpened() const { return mUserOpened; } - bool hideIfNoMatch(const QString &match); + bool hideIfNoMatch(const TQString &match); void setHidden(bool on); @@ -92,18 +92,18 @@ Q_OBJECT TreeItem *mCurrent; FileMenu *lastMenu; Slice *mSlice; - QString mFileOfQuery; + TQString mFileOfQuery; friend class TreeItem; int mPlayableItemCount; // used by the friendship - QPtrList mAutoExpanded; + TQPtrList mAutoExpanded; unsigned int mAutoExpanding; Loader *mLoader; public: - Tree(Oblique *oblique, QWidget *parent=0); + Tree(Oblique *oblique, TQWidget *parent=0); ~Tree(); TreeItem *firstChild(); TreeItem *find(File item); @@ -111,7 +111,7 @@ public: Query *query() { return &mQuery; } Oblique *oblique() { return mOblique; } Slice *slice() { return mSlice; } - QString fileOfQuery() const { return mFileOfQuery; } + TQString fileOfQuery() const { return mFileOfQuery; } void clear(); @@ -125,11 +125,11 @@ public: bool autoExpanding() const { return mAutoExpanding; } void deleted(TreeItem *item); - bool setSchema(const QString &name); + bool setSchema(const TQString &name); protected: - virtual QDragObject *dragObject(); - void movableDropEvent(QListViewItem* parent, QListViewItem* afterme); + virtual TQDragObject *dragObject(); + void movableDropEvent(TQListViewItem* parent, TQListViewItem* afterme); public slots: void insert(TreeItem *replace, File file); @@ -147,15 +147,15 @@ public slots: * or it will not be displayed * (used for Jump) **/ - void setLimit(const QString &text); + void setLimit(const TQString &text); private slots: - void contextMenu(KListView* l, QListViewItem* i, const QPoint& p); - void play(QListViewItem *item); + void contextMenu(KListView* l, TQListViewItem* i, const TQPoint& p); + void play(TQListViewItem *item); void destroyLoader(); - void dropped(QPtrList &items, QPtrList &, QPtrList &afterNow); + void dropped(TQPtrList &items, TQPtrList &, TQPtrList &afterNow); signals: void selected(TreeItem *); @@ -185,7 +185,7 @@ private: **/ void remove(TreeItem *, const File &file); - void limitHide(TreeItem *i, const QString &text); + void limitHide(TreeItem *i, const TQString &text); void reload(); }; diff --git a/noatun-plugins/oblique/view.cpp b/noatun-plugins/oblique/view.cpp index 93b79ce..8c7f81d 100644 --- a/noatun-plugins/oblique/view.cpp +++ b/noatun-plugins/oblique/view.cpp @@ -11,21 +11,21 @@ #include #include #include -#include +#include #include #include #include -#include +#include class TabWidget : public KTabWidget { public: - TabWidget(QWidget *parent) + TabWidget(TQWidget *parent) : KTabWidget(parent) { } public: - QTabBar *tabBar() const { return KTabWidget::tabBar(); } + TQTabBar *tabBar() const { return KTabWidget::tabBar(); } }; @@ -37,45 +37,45 @@ View::View(Oblique *oblique) mTabs = new TabWidget(this); mTabs->tabBar()->hide(); - connect(mTabs, SIGNAL(currentChanged(QWidget*)), SLOT(currentTabChanged(QWidget*))); + connect(mTabs, TQT_SIGNAL(currentChanged(TQWidget*)), TQT_SLOT(currentTabChanged(TQWidget*))); setCentralWidget(mTabs); KAction *ac; - ac = new KAction(i18n("Add &Files..."), "queue", 0, this, SLOT(addFiles()), actionCollection(), "add_files"); + ac = new KAction(i18n("Add &Files..."), "queue", 0, this, TQT_SLOT(addFiles()), actionCollection(), "add_files"); ac->setWhatsThis(i18n("Add a reference to a media file on disk to this collection.")); - ac = new KAction(i18n("Add Fol&ders..."), "folder", 0, this, SLOT(addDirectory()), actionCollection(), "add_dir"); + ac = new KAction(i18n("Add Fol&ders..."), "folder", 0, this, TQT_SLOT(addDirectory()), actionCollection(), "add_dir"); -// ac = new KAction(i18n("&Reload"), "reload", 0, oblique, SLOT(reload()), actionCollection(), "reload"); +// ac = new KAction(i18n("&Reload"), "reload", 0, oblique, TQT_SLOT(reload()), actionCollection(), "reload"); // ac->setWhatsThis(i18n("Reread the collection and meta-information from its files.")); ac = new SliceListAction( i18n("&Slices"), oblique, - this, SLOT(use(Slice*)), QValueList(), actionCollection(), "slices" + this, TQT_SLOT(use(Slice*)), TQValueList(), actionCollection(), "slices" ); ac->setWhatsThis(i18n("Select a sub-collection to display")); mSchemaListAction = new SchemaListAction( - i18n("&Schemas"), this, SLOT(setSchema(const QString&)), actionCollection(), "schemas" + i18n("&Schemas"), this, TQT_SLOT(setSchema(const TQString&)), actionCollection(), "schemas" ); mSchemaListAction->setWhatsThis(i18n("Select a schema to use to collate the tree.")); ac = new KAction( - i18n("&New Tab"), "tab_new", "CTRL+SHIFT+N;CTRL+T", this, SLOT(addTab()), + i18n("&New Tab"), "tab_new", "CTRL+SHIFT+N;CTRL+T", this, TQT_SLOT(addTab()), actionCollection(), "newtab" ); mRemoveTabAction = new KAction( - i18n("&Close Current Tab"), "tab_remove", CTRL+Key_W, this, SLOT(removeTab()), + i18n("&Close Current Tab"), "tab_remove", CTRL+Key_W, this, TQT_SLOT(removeTab()), actionCollection(), "removecurrenttab" ); { - QLabel *l = new QLabel(i18n("&Jump:"), 0, "kde toolbar widget"); + TQLabel *l = new TQLabel(i18n("&Jump:"), 0, "kde toolbar widget"); l->setBackgroundMode( Qt::PaletteButton ); l->setAlignment( - (QApplication::reverseLayout() ? Qt::AlignRight : Qt::AlignLeft) | + (TQApplication::reverseLayout() ? Qt::AlignRight : Qt::AlignLeft) | Qt::AlignVCenter | Qt::ShowPrefix ); l->adjustSize(); @@ -84,22 +84,22 @@ View::View(Oblique *oblique) LineEditAction *jumpAction = new LineEditAction(i18n("Jump Bar"), 0, 0, actionCollection(), "jump_text"); jumpAction->setWhatsThis(i18n("Only display items which contain this string")); l->setBuddy(jumpAction->lineEdit()); - connect(jumpAction->lineEdit(), SIGNAL(textChanged(const QString&)), SLOT(jumpTextChanged(const QString&))); + connect(jumpAction->lineEdit(), TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(jumpTextChanged(const TQString&))); } - KStdAction::configureToolbars(this, SLOT(configureToolBars()), actionCollection()); + KStdAction::configureToolbars(this, TQT_SLOT(configureToolBars()), actionCollection()); applyMainWindowSettings(KGlobal::config(), "Oblique View"); createGUI("obliqueui.rc"); KConfigGroup g(KGlobal::config(), "oblique"); - QStringList tabids = g.readListEntry("tabids"); + TQStringList tabids = g.readListEntry("tabids"); - for (QStringList::Iterator i(tabids.begin()); i != tabids.end(); ++i) + for (TQStringList::Iterator i(tabids.begin()); i != tabids.end(); ++i) { - QString t = *i; + TQString t = *i; int sliceid = t.section(':', 0, 0).toInt(); - QString fileOfQuery = t.section(':', 1, 1); + TQString fileOfQuery = t.section(':', 1, 1); Slice *slice = oblique->base()->sliceById(sliceid); if (!slice) @@ -131,14 +131,14 @@ View::View(Oblique *oblique) View::~View() { - QStringList tabids; + TQStringList tabids; for (int i=0; i < mTabs->count(); i++) { Tree *tree = static_cast(mTabs->page(i)); int slice = tree->slice()->id(); - QString query = tree->fileOfQuery(); + TQString query = tree->fileOfQuery(); - QString t = QString("%1:%2").arg(slice).arg(query); + TQString t = TQString("%1:%2").arg(slice).arg(query); tabids.append(t); } @@ -151,7 +151,7 @@ void View::configureToolBars() { saveMainWindowSettings(KGlobal::config(), "Oblique View"); KEditToolbar dlg(actionCollection(), "obliqueui.rc"); - connect(&dlg, SIGNAL(newToolbarConfig()), SLOT(newToolBarConfig())); + connect(&dlg, TQT_SIGNAL(newToolbarConfig()), TQT_SLOT(newToolBarConfig())); dlg.exec(); } @@ -161,7 +161,7 @@ void View::newToolBarConfig() applyMainWindowSettings(KGlobal::config(), "Oblique View"); } -void View::closeEvent(QCloseEvent*) +void View::closeEvent(TQCloseEvent*) { hide(); } @@ -177,7 +177,7 @@ void View::addFiles() void View::addDirectory() { - QString folder = KFileDialog::getExistingDirectory(":mediadir:", this, + TQString folder = KFileDialog::getExistingDirectory(":mediadir:", this, i18n("Select Folder to Add")); if (!folder) @@ -213,20 +213,20 @@ void View::removeTab() mTabs->tabBar()->hide(); } -void View::currentTabChanged(QWidget *w) +void View::currentTabChanged(TQWidget *w) { mRemoveTabAction->setEnabled(w != mTree); mSchemaListAction->setTree(static_cast(w)); } -void View::setSchema(const QString &file) +void View::setSchema(const TQString &file) { Tree *current = static_cast(mTabs->currentPage()); current->setSchema(file); } -void View::jumpTextChanged(const QString &text) +void View::jumpTextChanged(const TQString &text) { Tree *current = static_cast(mTabs->currentPage()); current->setLimit(text); @@ -241,7 +241,7 @@ void View::use(Slice *s) -LineEditAction::LineEditAction(const QString &text, const QObject *reciever, const char *slot, KActionCollection *parent, const char *name) +LineEditAction::LineEditAction(const TQString &text, const TQObject *reciever, const char *slot, KActionCollection *parent, const char *name) : KWidgetAction(new KLineEdit(0), text, KShortcut(0), reciever, slot, parent, name) { setAutoSized(true); diff --git a/noatun-plugins/oblique/view.h b/noatun-plugins/oblique/view.h index 598c0cc..bf216ea 100644 --- a/noatun-plugins/oblique/view.h +++ b/noatun-plugins/oblique/view.h @@ -18,7 +18,7 @@ class View : public KMainWindow Q_OBJECT Oblique *mOblique; Tree *mTree; - QValueList mTrees; + TQValueList mTrees; TabWidget *mTabs; KAction *mRemoveTabAction; SchemaListAction *mSchemaListAction; @@ -44,15 +44,15 @@ signals: private slots: void configureToolBars(); void newToolBarConfig(); - void jumpTextChanged(const QString &text); + void jumpTextChanged(const TQString &text); void use(Slice*); - void currentTabChanged(QWidget *); - void setSchema(const QString &file); + void currentTabChanged(TQWidget *); + void setSchema(const TQString &file); protected: - virtual void showEvent(QShowEvent *) { emit listShown(); } - virtual void hideEvent(QHideEvent *) { emit listHidden(); } - void closeEvent(QCloseEvent*); + virtual void showEvent(TQShowEvent *) { emit listShown(); } + virtual void hideEvent(TQHideEvent *) { emit listHidden(); } + void closeEvent(TQCloseEvent*); }; @@ -60,7 +60,7 @@ class LineEditAction : public KWidgetAction { Q_OBJECT public: - LineEditAction(const QString &text, const QObject *reciever, const char *slot, KActionCollection *parent, const char *name); + LineEditAction(const TQString &text, const TQObject *reciever, const char *slot, KActionCollection *parent, const char *name); KLineEdit *widget() { return static_cast(KWidgetAction::widget()); } KLineEdit *lineEdit() { return widget(); } diff --git a/noatun-plugins/pitchablespeed/pitchablespeed.cpp b/noatun-plugins/pitchablespeed/pitchablespeed.cpp index f091c72..b59d6e5 100644 --- a/noatun-plugins/pitchablespeed/pitchablespeed.cpp +++ b/noatun-plugins/pitchablespeed/pitchablespeed.cpp @@ -17,9 +17,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include #include #include @@ -46,10 +46,10 @@ PitchableSpeed::PitchableSpeed() : Plugin(), offsetInput->setRange(-5,15,1,false); offsetInput->setValue(offset); setupSliderRange(); - connect(napp->player(), SIGNAL(changed()), - this, SLOT(newSong())); - connect(preserveFrequencies, SIGNAL(toggled(bool)), - this, SLOT(preserveFrequenciesChanged(bool))); + connect(napp->player(), TQT_SIGNAL(changed()), + this, TQT_SLOT(newSong())); + connect(preserveFrequencies, TQT_SIGNAL(toggled(bool)), + this, TQT_SLOT(preserveFrequenciesChanged(bool))); //show(); } @@ -93,7 +93,7 @@ void PitchableSpeed::setSpeed() pitchShift.speed(1.f/newSpeed); } - QString percentStr; + TQString percentStr; percentStr.setNum((newSpeed-1.f)*100.f,'f',1); if (newSpeed<=0) percentStr.prepend('+').append(' ').append('%'); currentValEdit->setText(percentStr); @@ -149,7 +149,7 @@ void PitchableSpeed::preserveFrequenciesChanged(bool preserveNow) void PitchableSpeed::init() { pluginMenuItem = napp->pluginMenuAdd(i18n("Toggle Speed Slider"), - this, SLOT(toggle(void))); + this, TQT_SLOT(toggle(void))); } void PitchableSpeed::toggle(void) @@ -158,7 +158,7 @@ void PitchableSpeed::toggle(void) raise(); } -void PitchableSpeed::closeEvent(QCloseEvent *) +void PitchableSpeed::closeEvent(TQCloseEvent *) { hide(); } diff --git a/noatun-plugins/pitchablespeed/pitchablespeed.h b/noatun-plugins/pitchablespeed/pitchablespeed.h index d11a7cc..3233817 100644 --- a/noatun-plugins/pitchablespeed/pitchablespeed.h +++ b/noatun-plugins/pitchablespeed/pitchablespeed.h @@ -34,7 +34,7 @@ public slots: void newSong(); protected: - virtual void closeEvent(QCloseEvent *); + virtual void closeEvent(TQCloseEvent *); void setupSliderRange(); void setSpeed(); diff --git a/noatun-plugins/synaescope/cmodule.cpp b/noatun-plugins/synaescope/cmodule.cpp index 4765eef..5b881fd 100644 --- a/noatun-plugins/synaescope/cmodule.cpp +++ b/noatun-plugins/synaescope/cmodule.cpp @@ -22,29 +22,29 @@ #include #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include "cmodule.h" #include "synaescope.h" -SynaePrefs::SynaePrefs(QObject *parent) +SynaePrefs::SynaePrefs(TQObject *parent) : CModule(i18n("Synaescope"), i18n("Noatun Visualization"), "synaescope", parent) { // kdDebug(66666) << k_funcinfo << endl; - xRes = new QSpinBox(320, 1024, 16, this); - yRes = new QSpinBox(240, 768, 12, this); + xRes = new TQSpinBox(320, 1024, 16, this); + yRes = new TQSpinBox(240, 768, 12, this); - QVBoxLayout *layout = new QVBoxLayout(this, 0, KDialog::spacingHint()); - QHBoxLayout *xResLayout = new QHBoxLayout(0, 0, KDialog::spacingHint()); - QHBoxLayout *yResLayout = new QHBoxLayout(0, 0, KDialog::spacingHint()); + TQVBoxLayout *layout = new TQVBoxLayout(this, 0, KDialog::spacingHint()); + TQHBoxLayout *xResLayout = new TQHBoxLayout(0, 0, KDialog::spacingHint()); + TQHBoxLayout *yResLayout = new TQHBoxLayout(0, 0, KDialog::spacingHint()); - xResLayout->addWidget(new QLabel(i18n("Display width:"), this)); + xResLayout->addWidget(new TQLabel(i18n("Display width:"), this)); xResLayout->addWidget(xRes); - yResLayout->addWidget(new QLabel(i18n("Display height:"), this)); + yResLayout->addWidget(new TQLabel(i18n("Display height:"), this)); yResLayout->addWidget(yRes); layout->addLayout(xResLayout); @@ -52,8 +52,8 @@ SynaePrefs::SynaePrefs(QObject *parent) layout->addStretch(); changed=false; - connect(xRes, SIGNAL(valueChanged(int)), this, SLOT(slotChanges())); - connect(yRes, SIGNAL(valueChanged(int)), this, SLOT(slotChanges())); + connect(xRes, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotChanges())); + connect(yRes, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotChanges())); } void SynaePrefs::save() diff --git a/noatun-plugins/synaescope/cmodule.h b/noatun-plugins/synaescope/cmodule.h index 0642e2e..f0269bb 100644 --- a/noatun-plugins/synaescope/cmodule.h +++ b/noatun-plugins/synaescope/cmodule.h @@ -29,7 +29,7 @@ class SynaePrefs : public CModule Q_OBJECT public: - SynaePrefs(QObject *parent); + SynaePrefs(TQObject *parent); virtual void save(); virtual void reopen(); @@ -41,8 +41,8 @@ class SynaePrefs : public CModule void slotChanges(); private: - QSpinBox *xRes; - QSpinBox *yRes; + TQSpinBox *xRes; + TQSpinBox *yRes; bool changed; }; diff --git a/noatun-plugins/synaescope/syna.h b/noatun-plugins/synaescope/syna.h index 0b58ae8..07c4e5e 100644 --- a/noatun-plugins/synaescope/syna.h +++ b/noatun-plugins/synaescope/syna.h @@ -21,7 +21,7 @@ #define SYNA_H #include "config.h" -#include +#include #include "polygon.h" #include @@ -241,7 +241,7 @@ protected: void changeState(int transitionSymbol); private: - QPtrList uiObjects; + TQPtrList uiObjects; Button *stateButton, *starsButton, *waveButton, *flameButton, *starButton, *diamondButton; int mouseButtons; diff --git a/noatun-plugins/synaescope/synaescope.cpp b/noatun-plugins/synaescope/synaescope.cpp index 7e4df1c..16a6a2e 100644 --- a/noatun-plugins/synaescope/synaescope.cpp +++ b/noatun-plugins/synaescope/synaescope.cpp @@ -26,12 +26,12 @@ SynaeScope::SynaeScope() : Plugin(), scopeExePath(0) { kdDebug(66666) << k_funcinfo << endl; restarting=false; - connect(&process, SIGNAL(processExited(KProcess *)), - this, SLOT(processExited(KProcess *))); - connect(&process, SIGNAL(receivedStdout(KProcess *,char *,int)), - this, SLOT(receivedStdout(KProcess *,char *,int))); - connect(&process, SIGNAL(receivedStderr(KProcess *,char *,int)), - this, SLOT(receivedStderr(KProcess *,char *,int))); + connect(&process, TQT_SIGNAL(processExited(KProcess *)), + this, TQT_SLOT(processExited(KProcess *))); + connect(&process, TQT_SIGNAL(receivedStdout(KProcess *,char *,int)), + this, TQT_SLOT(receivedStdout(KProcess *,char *,int))); + connect(&process, TQT_SIGNAL(receivedStderr(KProcess *,char *,int)), + this, TQT_SLOT(receivedStderr(KProcess *,char *,int))); } SynaeScope::~SynaeScope() @@ -46,7 +46,7 @@ void SynaeScope::init() mPrefs = new SynaePrefs(this); mPrefs->reopen(); mPrefs->save(); - connect(mPrefs, SIGNAL(configChanged()), this, SLOT(readConfig())); + connect(mPrefs, TQT_SIGNAL(configChanged()), this, TQT_SLOT(readConfig())); scopeExePath = KStandardDirs::findExe("noatunsynaescope.bin"); if (scopeExePath.isEmpty()) @@ -97,13 +97,13 @@ void SynaeScope::processExited(KProcess *) void SynaeScope::receivedStdout(KProcess *, char *buf, int len) { - QCString debugString(buf,len); + TQCString debugString(buf,len); kdDebug(66666) << k_funcinfo << debugString << endl; } void SynaeScope::receivedStderr(KProcess *, char *buf, int len) { - QCString debugString(buf,len); + TQCString debugString(buf,len); kdDebug(66666) << k_funcinfo << debugString << endl; } diff --git a/noatun-plugins/synaescope/synaescope.h b/noatun-plugins/synaescope/synaescope.h index 718c2b9..af1b6f5 100644 --- a/noatun-plugins/synaescope/synaescope.h +++ b/noatun-plugins/synaescope/synaescope.h @@ -14,7 +14,7 @@ class SynaePrefs; class KProcess; -class SynaeScope : public QObject, public Plugin +class SynaeScope : public TQObject, public Plugin { Q_OBJECT @@ -33,7 +33,7 @@ private slots: private: KProcess process; - QString scopeExePath; + TQString scopeExePath; bool restarting; SynaePrefs *mPrefs; }; diff --git a/noatun-plugins/synaescope/ui.cpp b/noatun-plugins/synaescope/ui.cpp index d02bfb7..2adc1f7 100644 --- a/noatun-plugins/synaescope/ui.cpp +++ b/noatun-plugins/synaescope/ui.cpp @@ -124,7 +124,7 @@ struct NoatunActionButton : public Button if (mouseOver && mouseClick && !passive) { - QCString action; + TQCString action; switch (icon) { case Play: @@ -148,17 +148,17 @@ struct NoatunActionButton : public Button action+="()"; DCOPClient c; c.attach(); - QCString appName("noatun"); + TQCString appName("noatun"); if (c.isApplicationRegistered(appName)) { - c.send(appName, "Noatun", action, QByteArray()); + c.send(appName, "Noatun", action, TQByteArray()); } else { appName.setNum(getppid()); appName.prepend("noatun"); if (c.isApplicationRegistered(appName)) - c.send(appName, "Noatun", action, QByteArray()); + c.send(appName, "Noatun", action, TQByteArray()); } } } diff --git a/noatun-plugins/tippercanoe/syna.h b/noatun-plugins/tippercanoe/syna.h index d4ea60e..0d36e1b 100644 --- a/noatun-plugins/tippercanoe/syna.h +++ b/noatun-plugins/tippercanoe/syna.h @@ -21,7 +21,7 @@ #define SYNA_H #include "config.h" -#include +#include #include "polygon.h" //************************************** @@ -233,7 +233,7 @@ protected: void changeState(int transitionSymbol); private: - QPtrList uiObjects; + TQPtrList uiObjects; Button *stateButton, *starsButton, *waveButton, *flameButton, *starButton, *diamondButton; int mouseButtons; diff --git a/noatun-plugins/tippercanoe/synaescope.cpp b/noatun-plugins/tippercanoe/synaescope.cpp index 8ccf6c3..cf5cbfc 100644 --- a/noatun-plugins/tippercanoe/synaescope.cpp +++ b/noatun-plugins/tippercanoe/synaescope.cpp @@ -13,8 +13,8 @@ #include #include #include -#include -#include +#include +#include #include #include "syna.h" #include "synaescope.h" @@ -26,7 +26,7 @@ extern "C" Plugin *create_plugin() } SynaeScope::SynaeScope() - : QWidget(0, 0, WType_TopLevel | WStyle_DialogBorder | WRepaintNoErase | WMouseNoMask) + : TQWidget(0, 0, WType_TopLevel | WStyle_DialogBorder | WRepaintNoErase | WMouseNoMask) , StereoScope(50) , Plugin() { @@ -45,14 +45,14 @@ SynaeScope::SynaeScope() SynaeScope::~SynaeScope() { - connect(&process, SIGNAL(processExited(KProcess *)), this, SLOT(processExited(KProcess *))); + connect(&process, TQT_SIGNAL(processExited(KProcess *)), this, TQT_SLOT(processExited(KProcess *))); napp->pluginMenuRemove(pluginMenuItem); } void SynaeScope::init() { - connect(&process, SIGNAL(receivedStdout(KProcess *, char *, int)), this, SLOT(read(KProcess *, char *, int))); - pluginMenuItem = napp->pluginMenuAdd(i18n("Toggle Tippecanoe"), this, SLOT(toggle(void))); + connect(&process, TQT_SIGNAL(receivedStdout(KProcess *, char *, int)), this, TQT_SLOT(read(KProcess *, char *, int))); + pluginMenuItem = napp->pluginMenuAdd(i18n("Toggle Tippecanoe"), this, TQT_SLOT(toggle(void))); process << KStandardDirs::findExe("noatuntippecanoe.bin"); @@ -81,8 +81,8 @@ void SynaeScope::scopeEvent(float *left, float *right, int size) void SynaeScope::read(KProcess *, char *buf, int) { - QString num = QString::fromLatin1(buf); - num = num.left(num.find(QRegExp("\\s"))); + TQString num = TQString::fromLatin1(buf); + num = num.left(num.find(TQRegExp("\\s"))); id = num.toInt(); embed->embed(id); } diff --git a/noatun-plugins/tippercanoe/synaescope.h b/noatun-plugins/tippercanoe/synaescope.h index da6855b..59daa93 100644 --- a/noatun-plugins/tippercanoe/synaescope.h +++ b/noatun-plugins/tippercanoe/synaescope.h @@ -13,10 +13,10 @@ #include "syna.h" #include #include -#include +#include #include -class SynaeScope : public QWidget, public StereoScope, public Plugin +class SynaeScope : public TQWidget, public StereoScope, public Plugin { Q_OBJECT diff --git a/noatun-plugins/tyler/file.cpp b/noatun-plugins/tyler/file.cpp index 58ddd79..c641bc0 100644 --- a/noatun-plugins/tyler/file.cpp +++ b/noatun-plugins/tyler/file.cpp @@ -22,18 +22,18 @@ extern "C" #include } -#include +#include #include #include -static QString getDataPath(void) +static TQString getDataPath(void) { KStandardDirs &dirs = *KGlobal::dirs(); return dirs.findResource("data", "noatun/tylerstates"); } -static QString getSavePath(void) +static TQString getSavePath(void) { KStandardDirs &dirs = *KGlobal::dirs(); return dirs.saveLocation("data", "noatun/") + "tylerstates"; @@ -41,7 +41,7 @@ static QString getSavePath(void) extern "C" void save_effect(t_effect *effect) { - QFile file(getSavePath()); + TQFile file(getSavePath()); if(!file.open(IO_WriteOnly)) return; @@ -54,7 +54,7 @@ int nb_effects=0; extern "C" void load_effects() { - QFile file(getDataPath()); + TQFile file(getDataPath()); if(!file.open(IO_ReadOnly)) exit(1); diff --git a/noatun-plugins/tyler/tyler.cpp b/noatun-plugins/tyler/tyler.cpp index 7990ae2..ad00cac 100644 --- a/noatun-plugins/tyler/tyler.cpp +++ b/noatun-plugins/tyler/tyler.cpp @@ -21,7 +21,7 @@ extern "C" Plugin *create_plugin() const int Tyler::bufferSize = 512; Tyler::Tyler() - : QObject() + : TQObject() , StereoScope(25) , Plugin() { @@ -37,7 +37,7 @@ Tyler::~Tyler() void Tyler::init() { process << KStandardDirs::findExe("noatuntyler.bin"); - connect(&process, SIGNAL(processExited(KProcess *)), this, SLOT(processExited(KProcess *))); + connect(&process, TQT_SIGNAL(processExited(KProcess *)), this, TQT_SLOT(processExited(KProcess *))); // Note that process.start() will fail if findExe fails, so there's no real need // for two separate checks. diff --git a/noatun-plugins/tyler/tyler.h b/noatun-plugins/tyler/tyler.h index ff72a80..e919316 100644 --- a/noatun-plugins/tyler/tyler.h +++ b/noatun-plugins/tyler/tyler.h @@ -7,9 +7,9 @@ #include #include #include -#include +#include -class Tyler : public QObject, public StereoScope, public Plugin +class Tyler : public TQObject, public StereoScope, public Plugin { Q_OBJECT diff --git a/noatun-plugins/wavecapture/wavecapture.cpp b/noatun-plugins/wavecapture/wavecapture.cpp index b95d3ce..0667951 100644 --- a/noatun-plugins/wavecapture/wavecapture.cpp +++ b/noatun-plugins/wavecapture/wavecapture.cpp @@ -34,9 +34,9 @@ #include #include -#include -#include -#include +#include +#include +#include #include @@ -49,14 +49,14 @@ extern "C" } } -WaveCapture::WaveCapture() : QObject(0,0), Plugin(), +WaveCapture::WaveCapture() : TQObject(0,0), Plugin(), _enabled( false ), _status( STOPPED ), _capture( Arts::DynamicCast( napp->player()->engine()->server()->createObject( "Arts::Effect_WAVECAPTURE" ) ) ), _count( 0 ), _id( 0 ), _filename( "" ), - _timer( new QTimer( this ) ), + _timer( new TQTimer( this ) ), m_job( 0 ) { NOATUNPLUGINC(WaveCapture); @@ -68,12 +68,12 @@ WaveCapture::WaveCapture() : QObject(0,0), Plugin(), newSong(); - connect( _timer, SIGNAL( timeout() ), SLOT( saveAs() ) ); + connect( _timer, TQT_SIGNAL( timeout() ), TQT_SLOT( saveAs() ) ); - connect(napp->player(), SIGNAL(changed()), SLOT(newSong())); - connect(napp->player(), SIGNAL(stopped()), SLOT(stopped())); - connect(napp->player(), SIGNAL(playing()), SLOT(playing())); - connect(napp->player(), SIGNAL( paused()), SLOT( paused())); + connect(napp->player(), TQT_SIGNAL(changed()), TQT_SLOT(newSong())); + connect(napp->player(), TQT_SIGNAL(stopped()), TQT_SLOT(stopped())); + connect(napp->player(), TQT_SIGNAL(playing()), TQT_SLOT(playing())); + connect(napp->player(), TQT_SIGNAL( paused()), TQT_SLOT( paused())); } WaveCapture::~WaveCapture() @@ -83,15 +83,15 @@ WaveCapture::~WaveCapture() { if( PLAYING == _status ) stop(); - QString filename = QFile::decodeName( (Arts::MCOPUtils::createFilePath( _filename ) + ".wav").c_str() ); - QFile::remove( filename ); + TQString filename = TQFile::decodeName( (Arts::MCOPUtils::createFilePath( _filename ) + ".wav").c_str() ); + TQFile::remove( filename ); } delete m_job; } void WaveCapture::init() { - pluginMenuItem = napp->pluginMenuAdd( i18n( "Wave Capture" ), this, SLOT( toggle() ) ); + pluginMenuItem = napp->pluginMenuAdd( i18n( "Wave Capture" ), this, TQT_SLOT( toggle() ) ); napp->pluginMenu()->setCheckable( true ); } @@ -105,8 +105,8 @@ void WaveCapture::toggle() else { stop(); - QString filename = QFile::decodeName( (Arts::MCOPUtils::createFilePath( _filename ) + ".wav").c_str() ); - QFile::remove( filename ); + TQString filename = TQFile::decodeName( (Arts::MCOPUtils::createFilePath( _filename ) + ".wav").c_str() ); + TQFile::remove( filename ); } } napp->pluginMenu()->setItemChecked( pluginMenuItem, _enabled ); @@ -116,8 +116,8 @@ void WaveCapture::newSong() { if( napp->player()->current() ) { - QString title = napp->player()->current().title(); - _capture.filename( std::string( QFile::encodeName( title ) ) ); + TQString title = napp->player()->current().title(); + _capture.filename( std::string( TQFile::encodeName( title ) ) ); } _timer->start( 0, true ); } @@ -132,9 +132,9 @@ void WaveCapture::saveAs() KFileDialog dlg( ":savedir", "*.wav", 0, "filedialog", true ); dlg.setCaption( i18n( "Save Last Wave File As" ) ); dlg.setOperationMode( KFileDialog::Saving ); - dlg.setSelection( QFile::decodeName( filename.c_str() ) + ".wav" ); + dlg.setSelection( TQFile::decodeName( filename.c_str() ) + ".wav" ); - QString filename2 = QFile::decodeName( (Arts::MCOPUtils::createFilePath( filename ) + ".wav").c_str() ); + TQString filename2 = TQFile::decodeName( (Arts::MCOPUtils::createFilePath( filename ) + ".wav").c_str() ); if( dlg.exec() ) { KURL url = dlg.selectedURL(); @@ -142,11 +142,11 @@ void WaveCapture::saveAs() KRecentDocument::add( url ); m_job = KIO::file_move( KURL( filename2 ), url, -1, true ); - connect( m_job, SIGNAL( result( KIO::Job* ) ), SLOT( copyFinished( KIO::Job* ) ) ); + connect( m_job, TQT_SIGNAL( result( KIO::Job* ) ), TQT_SLOT( copyFinished( KIO::Job* ) ) ); } else { - QFile::remove( filename2 ); + TQFile::remove( filename2 ); } } } diff --git a/noatun-plugins/wavecapture/wavecapture.h b/noatun-plugins/wavecapture/wavecapture.h index f5d894f..06adddb 100644 --- a/noatun-plugins/wavecapture/wavecapture.h +++ b/noatun-plugins/wavecapture/wavecapture.h @@ -28,7 +28,7 @@ class QTimer; namespace KIO { class Job; } -class WaveCapture : public QObject, public Plugin +class WaveCapture : public TQObject, public Plugin { Q_OBJECT NOATUNPLUGIND @@ -63,7 +63,7 @@ private: long _id; std::string _filename; - QTimer* _timer; + TQTimer* _timer; KIO::Job* m_job; }; -- cgit v1.2.1