diff options
Diffstat (limited to 'noatun')
178 files changed, 1469 insertions, 1388 deletions
diff --git a/noatun/library/Makefile.am b/noatun/library/Makefile.am index f3e1dfd9..951ba5a4 100644 --- a/noatun/library/Makefile.am +++ b/noatun/library/Makefile.am @@ -41,7 +41,7 @@ META_INCLUDES = $(srcdir)/noatun noinst_PROGRAMS = gentable gentable_SOURCES = gentable.cpp -gentable_LDFLAGS = $(KDE_EXTRA_RPATH) +gentable_LDFLAGS = $(KDE_EXTRA_RPATH) $(LIB_QT) magictable: gentable $(top_builddir)/noatun/library/gentable > magictable diff --git a/noatun/library/app.cpp b/noatun/library/app.cpp index cf340f68..aaa4b9e6 100644 --- a/noatun/library/app.cpp +++ b/noatun/library/app.cpp @@ -69,7 +69,7 @@ NoatunApp::NoatunApp() // set the default config data // TODO: Maybe a first time wizard instead? KConfig *config=KGlobal::config(); // + - config->setGroup(TQString::null); // 1 + config->setGroup(TQString()); // 1 if (!config->readEntry("Modules").length()) { TQStringList modules; @@ -88,9 +88,9 @@ NoatunApp::NoatunApp() mLibraryLoader->add("dcopiface.plugin"); - new General(this); // 25 - new Plugins(this); // 149 -// new Types(this); + new General(TQT_TQOBJECT(this)); // 25 + new Plugins(TQT_TQOBJECT(this)); // 149 +// new Types(TQT_TQOBJECT(this)); mPlayer=new Player; // 139 d->effects=new Effects; // 1 @@ -122,7 +122,7 @@ NoatunApp::NoatunApp() } else { - config->setGroup(TQString::null); // 0 + config->setGroup(TQString()); // 0 player()->setVolume(config->readNumEntry("Volume", 100)); // 10 player()->loop(config->readNumEntry("LoopStyle", (int)Player::None)); mPlayer->engine()->setInitialized(); // 0 @@ -147,7 +147,7 @@ NoatunApp::~NoatunApp() { saveEngineState(); KConfig *config = KGlobal::config(); - config->setGroup(TQString::null); + config->setGroup(TQString()); config->writeEntry("Volume", player()->volume()); config->writeEntry("LoopStyle", player()->loopStyle()); // for version continuity in the future @@ -212,14 +212,14 @@ bool NoatunApp::clearOnStart() const int NoatunApp::startupPlayMode() const { KConfig *config=KGlobal::config(); - config->setGroup(TQString::null); + config->setGroup(TQString()); return config->readNumEntry("StartupPlayMode", autoPlay() ? Play : Restore); } void NoatunApp::setStartupPlayMode(int mode) { KConfig *config=KGlobal::config(); - config->setGroup(TQString::null); + config->setGroup(TQString()); config->writeEntry("StartupPlayMode", mode); config->sync(); } @@ -227,7 +227,7 @@ void NoatunApp::setStartupPlayMode(int mode) void NoatunApp::setHackUpPlaylist(bool b) { KConfig *config=KGlobal::config(); - config->setGroup(TQString::null); + config->setGroup(TQString()); config->writeEntry("HackUpPlaylist", b); config->sync(); } @@ -238,7 +238,7 @@ void NoatunApp::setFastMixer(bool b) if (whatBefore!=b) { KConfig *config=KGlobal::config(); - config->setGroup(TQString::null); + config->setGroup(TQString()); config->writeEntry("FastMixer", b); config->sync(); player()->engine()->useHardwareMixer(b); @@ -256,7 +256,7 @@ void NoatunApp::setOneInstance(bool b) void NoatunApp::setLoopList(bool b) { KConfig *config=KGlobal::config(); - config->setGroup(TQString::null); + config->setGroup(TQString()); config->writeEntry("LoopList", b); KGlobal::config()->sync(); } @@ -264,7 +264,7 @@ void NoatunApp::setLoopList(bool b) void NoatunApp::setAutoPlay(bool b) { KConfig *config=KGlobal::config(); - config->setGroup(TQString::null); + config->setGroup(TQString()); config->writeEntry("AutoPlay", b); KGlobal::config()->sync(); } @@ -272,7 +272,7 @@ void NoatunApp::setAutoPlay(bool b) void NoatunApp::setRememberPositions(bool b) { KConfig *config=KGlobal::config(); - config->setGroup(TQString::null); + config->setGroup(TQString()); config->writeEntry("RememberPositions", b); KGlobal::config()->sync(); } @@ -280,7 +280,7 @@ void NoatunApp::setRememberPositions(bool b) void NoatunApp::setSaveDirectory(const TQString &s) { KConfig *config=KGlobal::config(); - config->setGroup(TQString::null); + config->setGroup(TQString()); config->writePathEntry("SaveDirectory", s); config->sync(); } @@ -288,21 +288,21 @@ void NoatunApp::setSaveDirectory(const TQString &s) TQString NoatunApp::saveDirectory() const { KConfig *c=KGlobal::config(); - c->setGroup(TQString::null); + c->setGroup(TQString()); return c->readPathEntry("SaveDirectory", TQString(getenv("HOME"))); } TQString NoatunApp::titleFormat() const { KConfig *c=KGlobal::config(); - c->setGroup(TQString::null); + c->setGroup(TQString()); return c->readEntry("TitleFormat", "$(\"[\"author\"] - \")$(title)$(\" (\"bitrate\"kbps)\")"); } void NoatunApp::setTitleFormat(const TQString &format) { KConfig *c=KGlobal::config(); - c->setGroup(TQString::null); + c->setGroup(TQString()); return c->writeEntry("TitleFormat", format); } @@ -314,7 +314,7 @@ void NoatunApp::setClearOnStart(bool b) void NoatunApp::setClearOnOpen(bool b) { KConfig *config=KGlobal::config(); - config->setGroup(TQString::null); + config->setGroup(TQString()); config->writeEntry("ClearOnOpen", b); config->sync(); } @@ -322,7 +322,7 @@ void NoatunApp::setClearOnOpen(bool b) void NoatunApp::setDisplayRemaining(bool b) { KConfig *config=KGlobal::config(); - config->setGroup(TQString::null); + config->setGroup(TQString()); config->writeEntry("DisplayRemaining", b); config->sync(); } @@ -363,7 +363,7 @@ void NoatunApp::pluginMenuRemove(int id) NoatunStdAction::PluginActionMenu *NoatunApp::pluginActionMenu() { if (!mPluginActionMenu) - mPluginActionMenu = new NoatunStdAction::PluginActionMenu(this, "menu_actions"); + mPluginActionMenu = new NoatunStdAction::PluginActionMenu(TQT_TQOBJECT(this), "menu_actions"); return mPluginActionMenu; } @@ -450,7 +450,7 @@ TQString NoatunApp::mimeTypes() continue; const char *m = (*istr).c_str(); - if ((KServiceType::serviceType(m)) && !mimeTypes.contains(m)) + if ((KServiceType::serviceType(m)) && !mimeTypes.tqcontains(m)) { mimeTypes += m; mimeTypes += ' '; @@ -478,11 +478,11 @@ Playlist *NoatunApp::playlist() const return mLibraryLoader->playlist(); } -void NoatunApp::commitData(QSessionManager &) +void NoatunApp::commitData(TQSessionManager &) { } -void NoatunApp::saveState(QSessionManager &sm) +void NoatunApp::saveState(TQSessionManager &sm) { TQStringList restartCommand = sm.restartCommand(); sm.setRestartCommand( restartCommand ); @@ -502,7 +502,7 @@ TQImage NoatunApp::readPNG(const TQString &filename) void NoatunApp::restoreEngineState() { KConfig* config = KGlobal::config(); - config->setGroup(TQString::null); + config->setGroup(TQString()); int state = config->readNumEntry("EngineState", Arts::posPlaying); switch (state) { @@ -522,7 +522,7 @@ void NoatunApp::restoreEngineState() void NoatunApp::saveEngineState() { KConfig* config=KGlobal::config(); - config->setGroup(TQString::null); + config->setGroup(TQString()); config->writeEntry("EngineState", player()->engine()->state()); // we don't sync here since it's done in the destructor afterwards anyway } diff --git a/noatun/library/cmodule.cpp b/noatun/library/cmodule.cpp index 27dbc686..226cc2d6 100644 --- a/noatun/library/cmodule.cpp +++ b/noatun/library/cmodule.cpp @@ -28,8 +28,8 @@ * General options *****************************************************************/ -General::General(TQObject *parent) - : CModule(i18n("General"), i18n("General Options"), "configure", parent) +General::General(TQObject *tqparent) + : CModule(i18n("General"), i18n("General Options"), "configure", tqparent) { mLoopList=new TQCheckBox(i18n("&Return to start of playlist on finish"), this); mLoopList->setChecked(napp->loopList()); @@ -58,7 +58,7 @@ General::General(TQObject *parent) TQWhatsThis::add(mTitleFormat, i18n( "Select a title to use for each file (in the playlist and user interface). " "Each element such as $(title) is replaced with the property with the name " - "as given in the parentheses. The properties include, but are not limited to: " + "as given in the tqparentheses. The properties include, but are not limited to: " "title, author, date, comments and album.")); TQLabel *dlsaver=new TQLabel(i18n("&Download folder:"), this); @@ -68,7 +68,7 @@ General::General(TQObject *parent) this, TQT_SLOT( slotRequesterClicked( KURLRequester * ))); TQWhatsThis::add(mDlSaver, i18n("When opening a non-local file, download it to the selected folder.")); - mPlayOnStartup = new TQButtonGroup(1, Horizontal, i18n("Play Behavior on Startup"), this); + mPlayOnStartup = new TQButtonGroup(1,Qt::Horizontal, i18n("Play Behavior on Startup"), this); mPlayOnStartup->setExclusive(true); mPlayOnStartup->insert( new TQRadioButton(i18n("Restore &play state"), mPlayOnStartup), @@ -83,29 +83,29 @@ General::General(TQObject *parent) NoatunApp::DontPlay ); - if (TQButton* b = mPlayOnStartup->find(napp->startupPlayMode())) + if (TQButton* b = mPlayOnStartup->tqfind(napp->startupPlayMode())) { b->toggle(); } - TQGridLayout *layout = new TQGridLayout(this, 0, KDialog::spacingHint()); - layout->setSpacing(KDialog::spacingHint()); + TQGridLayout *tqlayout = new TQGridLayout(this, 0, KDialog::spacingHint()); + tqlayout->setSpacing(KDialog::spacingHint()); - layout->addMultiCellWidget(mLoopList, 0, 0, 0, 1); - layout->addMultiCellWidget(mOneInstance, 2, 2, 0, 1); - layout->addMultiCellWidget(mClearOnOpen, 4, 4, 0, 1); - layout->addMultiCellWidget(mFastVolume, 5, 5, 0, 1); - layout->addMultiCellWidget(mRemaining, 6, 6, 0, 1); + tqlayout->addMultiCellWidget(mLoopList, 0, 0, 0, 1); + tqlayout->addMultiCellWidget(mOneInstance, 2, 2, 0, 1); + tqlayout->addMultiCellWidget(mClearOnOpen, 4, 4, 0, 1); + tqlayout->addMultiCellWidget(mFastVolume, 5, 5, 0, 1); + tqlayout->addMultiCellWidget(mRemaining, 6, 6, 0, 1); - layout->addWidget(titleLabel, 7, 0); - layout->addWidget(mTitleFormat, 7, 1); + tqlayout->addWidget(titleLabel, 7, 0); + tqlayout->addWidget(mTitleFormat, 7, 1); - layout->addWidget(dlsaver, 8, 0); - layout->addWidget(mDlSaver, 8, 1); + tqlayout->addWidget(dlsaver, 8, 0); + tqlayout->addWidget(mDlSaver, 8, 1); - layout->addMultiCellWidget(mPlayOnStartup, 9, 9, 0, 1); + tqlayout->addMultiCellWidget(mPlayOnStartup, 9, 9, 0, 1); - layout->setRowStretch(10, 1); + tqlayout->setRowStretch(10, 1); } diff --git a/noatun/library/cmodule.h b/noatun/library/cmodule.h index 89aa37f0..9a592075 100644 --- a/noatun/library/cmodule.h +++ b/noatun/library/cmodule.h @@ -22,8 +22,9 @@ class KURLRequester; class General : public CModule { Q_OBJECT + TQ_OBJECT public: - General(TQObject *parent=0); + General(TQObject *tqparent=0); virtual void save(); private slots: diff --git a/noatun/library/controls.cpp b/noatun/library/controls.cpp index dc67ffaa..1644f724 100644 --- a/noatun/library/controls.cpp +++ b/noatun/library/controls.cpp @@ -1,14 +1,14 @@ #include <noatun/controls.h> -L33tSlider::L33tSlider(TQWidget * parent, const char * name) : - TQSlider(parent,name), pressed(false) +L33tSlider::L33tSlider(TQWidget * tqparent, const char * name) : + TQSlider(tqparent,name), pressed(false) {} -L33tSlider::L33tSlider(Orientation o, TQWidget * parent, const char * name) : - TQSlider(o,parent,name), pressed(false) +L33tSlider::L33tSlider(Qt::Orientation o, TQWidget * tqparent, const char * name) : + TQSlider(o,tqparent,name), pressed(false) {} L33tSlider::L33tSlider(int minValue, int maxValue, int pageStep, int value, - Orientation o, TQWidget * parent, const char * name) : - TQSlider(minValue, maxValue, pageStep, value, o, parent,name), pressed(false) + Qt::Orientation o, TQWidget * tqparent, const char * name) : + TQSlider(minValue, maxValue, pageStep, value, o, tqparent,name), pressed(false) {} bool L33tSlider::currentlyPressed() const @@ -24,7 +24,7 @@ void L33tSlider::setValue(int i) void L33tSlider::mousePressEvent(TQMouseEvent*e) { - if (e->button()!=RightButton) + if (e->button()!=Qt::RightButton) { pressed=true; TQSlider::mousePressEvent(e); @@ -52,8 +52,8 @@ void L33tSlider::wheelEvent(TQWheelEvent *e) SliderAction::SliderAction(const TQString& text, int accel, const TQObject *receiver, - const char *member, TQObject* parent, const char* name ) - : KAction( text, accel, parent, name ) + const char *member, TQObject* tqparent, const char* name ) + : KAction( text, accel, tqparent, name ) { m_receiver = receiver; m_member = member; @@ -67,7 +67,7 @@ int SliderAction::plug( TQWidget *w, int index ) int id = KAction::getToolButtonID(); //Create it. - m_slider=new L33tSlider(0, 1000, 100, 0, Horizontal, toolBar); + m_slider=new L33tSlider(0, 1000, 100, 0,Qt::Horizontal, toolBar); m_slider->setMinimumWidth(10); toolBar->insertWidget(id, 10, m_slider, index ); @@ -91,12 +91,12 @@ return; /* if (pos == KToolBar::Left || pos == KToolBar::Right) { - m_slider->setOrientation(Vertical); + m_slider->setOrientationVertical); m_slider->setFixedWidth(m_slider->height()); } else { - m_slider->setOrientation(Horizontal); + m_slider->setOrientationHorizontal); m_slider->resize(m_slider->height(), m_slider->height()); } */ diff --git a/noatun/library/downloader.cpp b/noatun/library/downloader.cpp index cce6e4d9..d607ca6d 100644 --- a/noatun/library/downloader.cpp +++ b/noatun/library/downloader.cpp @@ -65,8 +65,8 @@ void DownloadItem::dequeue() -Downloader::Downloader(TQObject *parent) - : TQObject(parent), localfile(0), current(0), mJob(0), mTimeout(0) +Downloader::Downloader(TQObject *tqparent) + : TQObject(tqparent), localfile(0), current(0), mJob(0), mTimeout(0) { mStarted=false; mUnstartedQueue=new TQPtrList<Downloader::QueueItem>; @@ -105,7 +105,7 @@ static TQString nonExistantFile(const TQString &file) { i++; f=file; - f.insert(f.findRev('.'), '_'+TQString::number(i)); + f.insert(f.tqfindRev('.'), '_'+TQString::number(i)); } return f; } @@ -175,7 +175,7 @@ void Downloader::getNext() if (mQueue.isEmpty()) return; current=mQueue.take(0); - // open the QFile + // open the TQFile localfile=new TQFile(current->local); localfile->open(IO_ReadWrite | IO_Append); diff --git a/noatun/library/effects.cpp b/noatun/library/effects.cpp index a71e0b43..33a3b8ad 100644 --- a/noatun/library/effects.cpp +++ b/noatun/library/effects.cpp @@ -25,11 +25,11 @@ using namespace std; using namespace Arts; -class EffectConfigWidget : public QWidget +class EffectConfigWidget : public TQWidget { public: - EffectConfigWidget(Effect *e, TQWidget *parent=0) - : TQWidget(parent), mEf(e) + EffectConfigWidget(Effect *e, TQWidget *tqparent=0) + : TQWidget(tqparent), mEf(e) {} virtual ~EffectConfigWidget() @@ -102,7 +102,7 @@ TQString Effect::title() const TQString Effect::clean(const TQCString &name) { - int pos=name.findRev("::"); + int pos=name.tqfindRev("::"); if (pos>0) return name.right(name.length()-pos-2); return name; diff --git a/noatun/library/effectview.cpp b/noatun/library/effectview.cpp index 334781a1..807f0e71 100644 --- a/noatun/library/effectview.cpp +++ b/noatun/library/effectview.cpp @@ -41,11 +41,11 @@ #include <tqvgroupbox.h> #include <tqwhatsthis.h> -class EffectListItem : public QListViewItem +class EffectListItem : public TQListViewItem { public: - EffectListItem(TQListView *parent, TQListViewItem *after, Effect *e) - : TQListViewItem(parent, after, e->title()), mEffect(e) + EffectListItem(TQListView *tqparent, TQListViewItem *after, Effect *e) + : TQListViewItem(tqparent, after, e->title()), mEffect(e) { } @@ -55,8 +55,8 @@ private: Effect *mEffect; }; -EffectList::EffectList(TQWidget *parent) - : KListView(parent) +EffectList::EffectList(TQWidget *tqparent) + : KListView(tqparent) { } @@ -85,9 +85,9 @@ void EffectView::show() namespace { -TQToolButton *newButton(const TQIconSet &iconSet, const TQString &textLabel, TQObject *receiver, const char * slot, TQWidget *parent, const char *name = 0) +TQToolButton *newButton(const TQIconSet &iconSet, const TQString &textLabel, TQObject *receiver, const char * slot, TQWidget *tqparent, const char *name = 0) { - TQToolButton *button = new TQToolButton(parent, name); + TQToolButton *button = new TQToolButton(tqparent, name); button->setIconSet(iconSet); button->setTextLabel(textLabel, true); TQObject::connect(button, TQT_SIGNAL(clicked()), receiver, slot); @@ -104,7 +104,7 @@ void EffectView::init(void) setCaption(i18n("Effects - Noatun")); setIcon(SmallIcon("effect")); - // Create widgets and layouts + // Create widgets and tqlayouts TQFrame *box = makeMainWidget(); TQVBoxLayout *boxLayout = new TQVBoxLayout(box, 0, KDialog::spacingHint()); @@ -116,7 +116,7 @@ void EffectView::init(void) TQHBoxLayout *topTopLayout = new TQHBoxLayout(topTopFrame, 0, KDialog::spacingHint()); topTopLayout->setAutoAdd(true); available = new KComboBox(false, topTopFrame); - TQToolButton *add = newButton(BarIconSet("down", KIcon::SizeSmall), i18n("Add"), this, TQT_SLOT(addEffect()), topTopFrame); + TQToolButton *add = newButton(BarIconSet("down", KIcon::SizeSmall), i18n("Add"), TQT_TQOBJECT(this), TQT_SLOT(addEffect()), topTopFrame); // Active TQHGroupBox *bottomBox = new TQHGroupBox(i18n("Active Effects"), box); @@ -153,10 +153,10 @@ void EffectView::init(void) // the buttons TQFrame *bottomLeftFrame = new TQFrame(bottomBox); TQVBoxLayout *bottomLeftLayout = new TQVBoxLayout(bottomLeftFrame, 0, KDialog::spacingHint()); - up = newButton(BarIconSet("up", KIcon::SizeSmall), i18n("Up"), this, TQT_SLOT(moveUp()), bottomLeftFrame); - down = newButton(BarIconSet("down", KIcon::SizeSmall), i18n("Down"), this, TQT_SLOT(moveDown()), bottomLeftFrame); - configure = newButton(BarIconSet("configure", KIcon::SizeSmall), i18n("Configure"), this, TQT_SLOT(configureEffect()), bottomLeftFrame); - remove = newButton(BarIconSet("remove", KIcon::SizeSmall), i18n("Remove"), this, TQT_SLOT(removeEffect()), bottomLeftFrame); + up = newButton(BarIconSet("up", KIcon::SizeSmall), i18n("Up"), TQT_TQOBJECT(this), TQT_SLOT(moveUp()), bottomLeftFrame); + down = newButton(BarIconSet("down", KIcon::SizeSmall), i18n("Down"), TQT_TQOBJECT(this), TQT_SLOT(moveDown()), bottomLeftFrame); + configure = newButton(BarIconSet("configure", KIcon::SizeSmall), i18n("Configure"), TQT_TQOBJECT(this), TQT_SLOT(configureEffect()), bottomLeftFrame); + remove = newButton(BarIconSet("remove", KIcon::SizeSmall), i18n("Remove"), TQT_TQOBJECT(this), TQT_SLOT(removeEffect()), bottomLeftFrame); bottomLeftLayout->addWidget(up); bottomLeftLayout->addWidget(down); bottomLeftLayout->addWidget(configure); diff --git a/noatun/library/effectview.h b/noatun/library/effectview.h index 28b26c9f..c0946d89 100644 --- a/noatun/library/effectview.h +++ b/noatun/library/effectview.h @@ -36,6 +36,7 @@ class TQToolButton; class EffectView : public KDialogBase { Q_OBJECT + TQ_OBJECT public: EffectView(); @@ -74,8 +75,9 @@ private: class EffectList : public KListView { Q_OBJECT + TQ_OBJECT public: - EffectList(TQWidget *parent); + EffectList(TQWidget *tqparent); virtual bool acceptDrag(TQDropEvent *) const; virtual TQDragObject *dragObject() const; }; diff --git a/noatun/library/engine.cpp b/noatun/library/engine.cpp index 00f26022..06693797 100644 --- a/noatun/library/engine.cpp +++ b/noatun/library/engine.cpp @@ -79,13 +79,13 @@ namespace VolumeControls else { #define ERROR { fd=-1; return; } - int devmask, recmask, i_recsrc, stereodevs; + int devtqmask, rectqmask, i_recsrc, stereodevs; // Mixer is open. Now define properties - if (ioctl(fd, SOUND_MIXER_READ_DEVMASK, &devmask) == -1) ERROR - if (ioctl(fd, SOUND_MIXER_READ_RECMASK, &recmask) == -1) ERROR + if (ioctl(fd, SOUND_MIXER_READ_DEVMASK, &devtqmask) == -1) ERROR + if (ioctl(fd, SOUND_MIXER_READ_RECMASK, &rectqmask) == -1) ERROR if (ioctl(fd, SOUND_MIXER_READ_RECSRC, &i_recsrc) == -1) ERROR if (ioctl(fd, SOUND_MIXER_READ_STEREODEVS, &stereodevs) == -1) ERROR - if (!devmask) ERROR + if (!devtqmask) ERROR #undef ERROR } @@ -248,7 +248,7 @@ Noatun::StereoEffectStack *Engine::globalEffectStack() const { return &d->globa Noatun::Equalizer *Engine::equalizer() const { return &d->equalizer; } Noatun::Session *Engine::session() const { return &d->session; } -Engine::Engine(TQObject *parent) : TQObject(parent, "Engine"), mPlay(false) +Engine::Engine(TQObject *tqparent) : TQObject(tqparent, "Engine"), mPlay(false) { d=new EnginePrivate; // Connect to aRts @@ -482,15 +482,15 @@ bool Engine::initArts() X11CommConfig.sync(); } - cmdline = TQFile::encodeName(KStandardDirs::findExe(TQString::fromLatin1("kdeinit_wrapper"))); + cmdline = TQFile::encodeName(KStandardDirs::findExe(TQString::tqfromLatin1("kdeinit_wrapper"))); cmdline += " "; if (rt) cmdline += TQFile::encodeName(KStandardDirs::findExe( - TQString::fromLatin1("artswrapper"))); + TQString::tqfromLatin1("artswrapper"))); else cmdline += TQFile::encodeName(KStandardDirs::findExe( - TQString::fromLatin1("artsd"))); + TQString::tqfromLatin1("artsd"))); cmdline += " "; cmdline += config.readEntry("Arguments","-F 10 -S 4096 -s 60 -m artsmessage -l 3 -f").utf8(); diff --git a/noatun/library/equalizer.cpp b/noatun/library/equalizer.cpp index 61b10d01..ae86d00f 100644 --- a/noatun/library/equalizer.cpp +++ b/noatun/library/equalizer.cpp @@ -333,7 +333,7 @@ void Equalizer::enableUpdates(bool) } #undef EQ -#undef EQBACK +#undef ETQBACK #include "equalizer.moc" diff --git a/noatun/library/equalizerview.cpp b/noatun/library/equalizerview.cpp index 098226a7..7758f35c 100644 --- a/noatun/library/equalizerview.cpp +++ b/noatun/library/equalizerview.cpp @@ -1,7 +1,7 @@ #include "vequalizer.h" -#define EQVIEW_CPP +#define ETQVIEW_CPP #include "equalizerview.h" -#undef EQVIEW_CPP +#undef ETQVIEW_CPP #include "equalizerwidget.h" #include "app.h" @@ -30,8 +30,8 @@ //////////////////////////////////////////////// // PresetList -PresetList::PresetList(TQWidget *parent, const char *name) - : KListView(parent, name) +PresetList::PresetList(TQWidget *tqparent, const char *name) + : KListView(tqparent, name) { setItemsRenameable(true); setRenameable(0, true); @@ -61,20 +61,20 @@ void PresetList::rename(TQListViewItem *item, int c) //////////////////////////////////////////////// // EqualizerLevel -EqualizerLevel::EqualizerLevel(TQWidget *parent, VBand band) - : TQWidget(parent), mBand(band) +EqualizerLevel::EqualizerLevel(TQWidget *tqparent, VBand band) + : TQWidget(tqparent), mBand(band) { - TQVBoxLayout *layout = new TQVBoxLayout(this, - 0, 0, "EqualizerLevel::layout"); + TQVBoxLayout *tqlayout = new TQVBoxLayout(this, + 0, 0, "EqualizerLevel::tqlayout"); mSlider = new TQSlider(-200, 200, 25, 0, Qt::Vertical, this, "EqualizerLevel::mSlider"); mSlider->setTickmarks(TQSlider::Left); mSlider->setTickInterval(25); - layout->addWidget(mSlider); + tqlayout->addWidget(mSlider); connect(mSlider, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changed(int))); mLabel = new TQLabel("", this, "EqualizerLevel::mLabel"); - mLabel->setAlignment(AlignHCenter | AlignVCenter); - layout->addWidget(mLabel); + mLabel->tqsetAlignment(AlignHCenter | AlignVCenter); + tqlayout->addWidget(mLabel); setMinimumHeight(200); // setMinimumWidth(kapp->fontMetrics().width("158kHz")); diff --git a/noatun/library/equalizerview.h b/noatun/library/equalizerview.h index 8c29aadb..d902f49b 100644 --- a/noatun/library/equalizerview.h +++ b/noatun/library/equalizerview.h @@ -1,5 +1,5 @@ -#ifndef EQUALIZERVIEW_H -#define EQUALIZERVIEW_H +#ifndef ETQUALIZERVIEW_H +#define ETQUALIZERVIEW_H #include <tqwidget.h> #include <kdialogbase.h> @@ -14,11 +14,12 @@ class TQHBoxLayout; class EqualizerWidget; -class EqualizerLevel : public QWidget +class EqualizerLevel : public TQWidget { Q_OBJECT + TQ_OBJECT public: - EqualizerLevel(TQWidget *parent, VBand band); + EqualizerLevel(TQWidget *tqparent, VBand band); public slots: void changed(); @@ -36,8 +37,9 @@ private: class PresetList : public KListView { Q_OBJECT + TQ_OBJECT public: - PresetList(TQWidget *parent, const char *name=0); + PresetList(TQWidget *tqparent, const char *name=0); public: void rename(TQListViewItem *item, int c); @@ -47,6 +49,7 @@ public: class EqualizerView : public KDialogBase { Q_OBJECT + TQ_OBJECT TQPtrList<EqualizerLevel> mBands; public: diff --git a/noatun/library/equalizerwidget.ui b/noatun/library/equalizerwidget.ui index 1432f59a..b68b2ff6 100644 --- a/noatun/library/equalizerwidget.ui +++ b/noatun/library/equalizerwidget.ui @@ -1,10 +1,10 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>EqualizerWidget</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>EqualizerWidget</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -22,22 +22,22 @@ <property name="margin"> <number>0</number> </property> - <widget class="QLayoutWidget" row="1" column="0"> + <widget class="TQLayoutWidget" row="1" column="0"> <property name="name"> - <cstring>layout5</cstring> + <cstring>tqlayout5</cstring> </property> <grid> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0" rowspan="1" colspan="3"> + <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>textLabel1_2</cstring> </property> <property name="text"> <string>Pre&amp:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignCenter</set> </property> <property name="buddy" stdset="0"> @@ -54,7 +54,7 @@ <property name="sizeType"> <enum>Minimum</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>1</width> <height>8</height> @@ -71,22 +71,22 @@ <property name="sizeType"> <enum>Minimum</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>1</width> <height>8</height> </size> </property> </spacer> - <widget class="QLayoutWidget" row="1" column="1"> + <widget class="TQLayoutWidget" row="1" column="1"> <property name="name"> - <cstring>layout3</cstring> + <cstring>tqlayout3</cstring> </property> <vbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QSlider"> + <widget class="TQSlider"> <property name="name"> <cstring>preampSlider</cstring> </property> @@ -115,14 +115,14 @@ <number>25</number> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1</cstring> </property> <property name="text"> <string>+/-</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignCenter</set> </property> </widget> @@ -130,7 +130,7 @@ </widget> </grid> </widget> - <widget class="QGroupBox" row="1" column="1"> + <widget class="TQGroupBox" row="1" column="1"> <property name="name"> <cstring>bandsGroupBox</cstring> </property> @@ -141,7 +141,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QFrame"> + <widget class="TQFrame"> <property name="name"> <cstring>bandsFrame</cstring> </property> @@ -165,7 +165,7 @@ </widget> </vbox> </widget> - <widget class="QGroupBox" row="1" column="2"> + <widget class="TQGroupBox" row="1" column="2"> <property name="name"> <cstring>presetsGroupBox</cstring> </property> @@ -176,7 +176,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QFrame" row="0" column="0" rowspan="1" colspan="2"> + <widget class="TQFrame" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>presetFrame</cstring> </property> @@ -201,7 +201,7 @@ <number>0</number> </property> </widget> - <widget class="QPushButton" row="1" column="0"> + <widget class="TQPushButton" row="1" column="0"> <property name="name"> <cstring>removePresetButton</cstring> </property> @@ -209,7 +209,7 @@ <string>&Remove</string> </property> </widget> - <widget class="QPushButton" row="2" column="0"> + <widget class="TQPushButton" row="2" column="0"> <property name="name"> <cstring>addPresetButton</cstring> </property> @@ -227,7 +227,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>8</width> <height>16</height> @@ -236,15 +236,15 @@ </spacer> </grid> </widget> - <widget class="QLayoutWidget" row="0" column="0" rowspan="1" colspan="3"> + <widget class="TQLayoutWidget" row="0" column="0" rowspan="1" colspan="3"> <property name="name"> - <cstring>layout4</cstring> + <cstring>tqlayout4</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>enabledCheckBox</cstring> </property> @@ -262,14 +262,14 @@ <property name="sizeType"> <enum>Minimum</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>8</width> <height>16</height> </size> </property> </spacer> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1_3</cstring> </property> @@ -301,14 +301,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>8</width> <height>16</height> </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>resetEqButton</cstring> </property> @@ -330,7 +330,7 @@ <tabstop>removePresetButton</tabstop> <tabstop>addPresetButton</tabstop> </tabstops> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>knuminput.h</includehint> </includehints> diff --git a/noatun/library/globalvideo.h b/noatun/library/globalvideo.h index c070ab30..8203282d 100644 --- a/noatun/library/globalvideo.h +++ b/noatun/library/globalvideo.h @@ -4,9 +4,10 @@ #include "noatun/video.h" -class GlobalVideo : public QWidget +class GlobalVideo : public TQWidget { Q_OBJECT + TQ_OBJECT TQPopupMenu *menu; VideoFrame *video; diff --git a/noatun/library/ksaver.cpp b/noatun/library/ksaver.cpp index 40b3606c..fe2ed649 100644 --- a/noatun/library/ksaver.cpp +++ b/noatun/library/ksaver.cpp @@ -78,7 +78,7 @@ bool Noatun::KSaver::open(void) } else { - d->error = i18n("Could not write to %1.").arg(d->url.prettyURL()); + d->error = i18n("Could not write to %1.").tqarg(d->url.prettyURL()); return false; } } diff --git a/noatun/library/mimetypetree.cpp b/noatun/library/mimetypetree.cpp index 0370b048..a63b49f6 100644 --- a/noatun/library/mimetypetree.cpp +++ b/noatun/library/mimetypetree.cpp @@ -4,8 +4,8 @@ #include <tqheader.h> -MimeTypeTree::MimeTypeTree(TQWidget *parent) - : KListView(parent) +MimeTypeTree::MimeTypeTree(TQWidget *tqparent) + : KListView(tqparent) { KMimeType::List list=KMimeType::allMimeTypes(); TQDict<TQListViewItem> map; @@ -17,7 +17,7 @@ MimeTypeTree::MimeTypeTree(TQWidget *parent) for (; i != list.end(); ++i) { TQString mimetype = (*i)->name(); - int slash = mimetype.find("/"); + int slash = mimetype.tqfind("/"); TQString major = mimetype.left(slash); // hide all and inode majors @@ -38,7 +38,7 @@ MimeTypeTree::MimeTypeTree(TQWidget *parent) void MimeTypeTree::sel(TQListViewItem *item) { - TQListViewItem *p=item->parent(); + TQListViewItem *p=item->tqparent(); if (!p) return; TQString major=p->text(0); TQString minor=item->text(0); diff --git a/noatun/library/mimetypetree.h b/noatun/library/mimetypetree.h index 92af43ec..b3f7ccb7 100644 --- a/noatun/library/mimetypetree.h +++ b/noatun/library/mimetypetree.h @@ -6,7 +6,7 @@ * of Noatun linking to this, and to a GPL plugin, * where the GPL plugin does not use any code * in this class. However, it may link directly - * to the Qt Library, where Qt may be under any license. + * to the TQt Library, where TQt may be under any license. * * Debian, Gnome, and GNU must ALL DIE. * Especially GNU's stupid info pages. @@ -19,8 +19,9 @@ class MimeTypeTree : public KListView { Q_OBJECT + TQ_OBJECT public: - MimeTypeTree(TQWidget *parent); + MimeTypeTree(TQWidget *tqparent); private: TQListViewItem *addMajor(const TQString &name); diff --git a/noatun/library/noatun/app.h b/noatun/library/noatun/app.h index 0b8af3ee..8e8b0e1b 100644 --- a/noatun/library/noatun/app.h +++ b/noatun/library/noatun/app.h @@ -31,6 +31,7 @@ namespace NoatunStdAction class KDE_EXPORT NoatunApp : public KUniqueApplication { Q_OBJECT + TQ_OBJECT friend class Playlist; public: @@ -71,8 +72,8 @@ public: TQCString version() const; - virtual void commitData(QSessionManager &); - virtual void saveState(QSessionManager &); + virtual void commitData(TQSessionManager &); + virtual void saveState(TQSessionManager &); /** * The three startup modes how noatun should behave when it is diff --git a/noatun/library/noatun/controls.h b/noatun/library/noatun/controls.h index 4c11aac7..02564048 100644 --- a/noatun/library/noatun/controls.h +++ b/noatun/library/noatun/controls.h @@ -20,14 +20,15 @@ class TQLabel; * @author Charles Samuels * @version 2.3 **/ -class KDE_EXPORT L33tSlider : public QSlider +class KDE_EXPORT L33tSlider : public TQSlider { Q_OBJECT + TQ_OBJECT public: - L33tSlider(TQWidget * parent, const char * name=0); - L33tSlider(Orientation, TQWidget * parent, const char * name=0); + L33tSlider(TQWidget * tqparent, const char * name=0); + L33tSlider(Qt::Orientation, TQWidget * tqparent, const char * name=0); L33tSlider(int minValue, int maxValue, int pageStep, int value, - Orientation, TQWidget * parent, const char * name=0); + Qt::Orientation, TQWidget * tqparent, const char * name=0); bool currentlyPressed() const; signals: @@ -56,9 +57,10 @@ private: class SliderAction : public KAction { Q_OBJECT + TQ_OBJECT public: SliderAction(const TQString& text, int accel, const TQObject *receiver, - const char *member, TQObject* parent, const char* name ); + const char *member, TQObject* tqparent, const char* name ); virtual int plug( TQWidget *w, int index = -1 ); virtual void unplug( TQWidget *w ); TQSlider* slider() const { return m_slider; } diff --git a/noatun/library/noatun/downloader.h b/noatun/library/noatun/downloader.h index a4c08ad7..7d711c26 100644 --- a/noatun/library/noatun/downloader.h +++ b/noatun/library/noatun/downloader.h @@ -63,9 +63,10 @@ private: /** * download playlistitems, in a queue based fasion **/ -class Downloader : public QObject +class Downloader : public TQObject { Q_OBJECT + TQ_OBJECT struct QueueItem { DownloadItem *notifier; @@ -74,7 +75,7 @@ Q_OBJECT }; public: - Downloader(TQObject *parent=0); + Downloader(TQObject *tqparent=0); virtual ~Downloader(); public slots: diff --git a/noatun/library/noatun/effects.h b/noatun/library/noatun/effects.h index 4c014a93..0480729d 100644 --- a/noatun/library/noatun/effects.h +++ b/noatun/library/noatun/effects.h @@ -94,9 +94,10 @@ private: * Noatuns effect stack * @author Charles Samuels **/ -class Effects : public QObject +class Effects : public TQObject { Q_OBJECT + TQ_OBJECT friend class Effect; public: Effects(); diff --git a/noatun/library/noatun/engine.h b/noatun/library/noatun/engine.h index b47eb087..3108ae84 100644 --- a/noatun/library/noatun/engine.h +++ b/noatun/library/noatun/engine.h @@ -30,12 +30,13 @@ class NoatunApp; * Does almost everything related to multimedia. * Most interfacing should be done with Player **/ -class KDE_EXPORT Engine : public QObject +class KDE_EXPORT Engine : public TQObject { Q_OBJECT + TQ_OBJECT friend class NoatunApp; public: - Engine(TQObject *parent=0); + Engine(TQObject *tqparent=0); ~Engine(); void setInitialized(); bool initialized() const; diff --git a/noatun/library/noatun/equalizer.h b/noatun/library/noatun/equalizer.h index d048d21d..744958b3 100644 --- a/noatun/library/noatun/equalizer.h +++ b/noatun/library/noatun/equalizer.h @@ -99,13 +99,14 @@ private: * @author Charles Samuels * @version 2.3 **/ -class Equalizer : public QObject +class Equalizer : public TQObject { friend class Band; friend class Preset; friend class Engine; Q_OBJECT + TQ_OBJECT public: Equalizer(); ~Equalizer(); diff --git a/noatun/library/noatun/player.h b/noatun/library/noatun/player.h index a61c2335..406f4f1b 100644 --- a/noatun/library/noatun/player.h +++ b/noatun/library/noatun/player.h @@ -19,9 +19,10 @@ class KLibrary; * @author Charles Samuels * @version 2.4 **/ -class KDE_EXPORT Player : public QObject +class KDE_EXPORT Player : public TQObject { Q_OBJECT + TQ_OBJECT friend class Effects; friend class PlaylistItemData; friend class PlaylistNotifier; @@ -41,7 +42,7 @@ public: enum LoopType { None=0, Song, Playlist, Random }; public: - Player(TQObject *parent=0); + Player(TQObject *tqparent=0); ~Player(); /** diff --git a/noatun/library/noatun/playlist.h b/noatun/library/noatun/playlist.h index 013d63a4..d1baa25d 100644 --- a/noatun/library/noatun/playlist.h +++ b/noatun/library/noatun/playlist.h @@ -326,12 +326,13 @@ private: * when you can call a Player method, unless, of course, you * ARE the playlist. **/ -class Playlist : public QObject +class Playlist : public TQObject { Q_OBJECT + TQ_OBJECT friend class PlaylistItemData; public: - Playlist(TQObject *parent, const char *name); + Playlist(TQObject *tqparent, const char *name); /** * on playlist unload, your playlist must * have current()==0 and emit playCurrent diff --git a/noatun/library/noatun/plugin.h b/noatun/library/noatun/plugin.h index 2bd8c994..d127ab9f 100644 --- a/noatun/library/noatun/plugin.h +++ b/noatun/library/noatun/plugin.h @@ -402,13 +402,14 @@ class NoatunListenerNotif; * * So far only used for ExitNotifier. **/ -class NoatunListener : public QObject +class NoatunListener : public TQObject { Q_OBJECT + TQ_OBJECT friend class NoatunListenerNotif; public: - NoatunListener(TQObject *parent=0); + NoatunListener(TQObject *tqparent=0); virtual ~NoatunListener(); signals: @@ -432,7 +433,7 @@ protected: class ExitNotifier : public NoatunListener { public: - ExitNotifier(int pid, TQObject *parent=0); + ExitNotifier(int pid, TQObject *tqparent=0); virtual ~ExitNotifier(); private: @@ -450,11 +451,12 @@ private: * * When noatunOk is false, then noatun has exited somehow. **/ -class BoolNotifier : public QObject +class BoolNotifier : public TQObject { Q_OBJECT + TQ_OBJECT public: - BoolNotifier(bool *value, NoatunListener *listener, TQObject *parent=0); + BoolNotifier(bool *value, NoatunListener *listener, TQObject *tqparent=0); private slots: void event() {*mValue=false;} diff --git a/noatun/library/noatun/pref.h b/noatun/library/noatun/pref.h index 5a7d056e..a290e51c 100644 --- a/noatun/library/noatun/pref.h +++ b/noatun/library/noatun/pref.h @@ -13,6 +13,7 @@ class CModule; class NoatunPreferences : public KDialogBase { Q_OBJECT + TQ_OBJECT friend class CModule; public: @@ -53,19 +54,20 @@ private: * Create your GUI in constructor, reimplement reopen() and save() and * you're all set. **/ -class KDE_EXPORT CModule : public QWidget +class KDE_EXPORT CModule : public TQWidget { Q_OBJECT + TQ_OBJECT public: /** * arguments are short and long descriptions * for this module, respectively * - * parent is the object that is this modules virtual-parent. + * tqparent is the object that is this modules virtual-tqparent. * When that is deleted, this also will go away, automagically. **/ - CModule(const TQString &name, const TQString &description, const TQString &icon, TQObject *parent=0); + CModule(const TQString &name, const TQString &description, const TQString &icon, TQObject *tqparent=0); virtual ~CModule(); diff --git a/noatun/library/noatun/scrollinglabel.h b/noatun/library/noatun/scrollinglabel.h index 231d3158..94253d4a 100644 --- a/noatun/library/noatun/scrollinglabel.h +++ b/noatun/library/noatun/scrollinglabel.h @@ -28,12 +28,13 @@ * A clever label that scrolls its contents as soon as there is not enough * space to show everything at once. **/ -class ScrollingLabel : public QWidget +class ScrollingLabel : public TQWidget { Q_OBJECT + TQ_OBJECT public: - ScrollingLabel(const TQString &initialText,TQWidget *parent, + ScrollingLabel(const TQString &initialText,TQWidget *tqparent, const char * name = 0); virtual ~ScrollingLabel(); @@ -43,8 +44,8 @@ class ScrollingLabel : public QWidget **/ virtual void setText(const TQString &text, int time = -1); - virtual TQSize sizeHint() const; - virtual TQSize minimumSizeHint() const; + virtual TQSize tqsizeHint() const; + virtual TQSize tqminimumSizeHint() const; /** * @return the label's text. diff --git a/noatun/library/noatun/stdaction.h b/noatun/library/noatun/stdaction.h index bfa34164..f7413e70 100644 --- a/noatun/library/noatun/stdaction.h +++ b/noatun/library/noatun/stdaction.h @@ -20,8 +20,9 @@ namespace NoatunStdAction class PlayAction : public KAction { Q_OBJECT + TQ_OBJECT public: - PlayAction(TQObject *parent, const char *name); + PlayAction(TQObject *tqparent, const char *name); private slots: void playing(); void notplaying(); @@ -33,8 +34,9 @@ private slots: class PlaylistAction : public KToggleAction { Q_OBJECT + TQ_OBJECT public: - PlaylistAction(TQObject *parent, const char *name); + PlaylistAction(TQObject *tqparent, const char *name); private slots: void shown(); void hidden(); @@ -47,8 +49,9 @@ private slots: class PluginActionMenu : public KActionMenu { Q_OBJECT + TQ_OBJECT public: - PluginActionMenu(TQObject *parent, const char *name); + PluginActionMenu(TQObject *tqparent, const char *name); /** * inserts the given @p action into the action-menu * @param action the action to insert @@ -80,8 +83,9 @@ private: class VisActionMenu : public KActionMenu { Q_OBJECT + TQ_OBJECT public: - VisActionMenu(TQObject *parent, const char *name); + VisActionMenu(TQObject *tqparent, const char *name); private slots: void fillPopup(); void toggleVisPlugin(int); @@ -97,8 +101,9 @@ private: class LoopActionMenu : public KActionMenu { Q_OBJECT + TQ_OBJECT public: - LoopActionMenu(TQObject *parent, const char *name); + LoopActionMenu(TQObject *tqparent, const char *name); private slots: void updateLooping(int); void loopNoneSelected(); @@ -116,48 +121,48 @@ private: /** * @return pointer to a KAction which opens the effects dialog on activation */ -KDE_EXPORT KAction *effects(TQObject *parent = 0, const char *name = 0); +KDE_EXPORT KAction *effects(TQObject *tqparent = 0, const char *name = 0); /** * @return pointer to a KAction which opens the equalizer dialog on activation */ -KDE_EXPORT KAction *equalizer(TQObject *parent = 0, const char *name = 0); +KDE_EXPORT KAction *equalizer(TQObject *tqparent = 0, const char *name = 0); /** * @return pointer to a KAction which goes back one track on activation */ -KDE_EXPORT KAction *back(TQObject *parent = 0, const char *name = 0); +KDE_EXPORT KAction *back(TQObject *tqparent = 0, const char *name = 0); /** * @return pointer to a KAction which stops playback on activation */ -KDE_EXPORT KAction *stop(TQObject *parent = 0, const char *name = 0); +KDE_EXPORT KAction *stop(TQObject *tqparent = 0, const char *name = 0); /** * @return pointer to a KAction which starts/pauses playback on activation */ -KDE_EXPORT KAction *playpause(TQObject *parent = 0, const char *name = 0); +KDE_EXPORT KAction *playpause(TQObject *tqparent = 0, const char *name = 0); /** * @return pointer to a KAction which advances one track on activation */ -KDE_EXPORT KAction *forward(TQObject *parent = 0, const char *name = 0); +KDE_EXPORT KAction *forward(TQObject *tqparent = 0, const char *name = 0); /** * @return pointer to a KToggleAction which shows/hides the playlist */ -KDE_EXPORT KToggleAction *playlist(TQObject *parent = 0, const char *name = 0); +KDE_EXPORT KToggleAction *playlist(TQObject *tqparent = 0, const char *name = 0); /** * loop action **/ -KDE_EXPORT LoopActionMenu *loop(TQObject *parent, const char *name); +KDE_EXPORT LoopActionMenu *loop(TQObject *tqparent, const char *name); /** * play action */ -KDE_EXPORT KAction *play(TQObject *parent = 0, const char *name = 0); +KDE_EXPORT KAction *play(TQObject *tqparent = 0, const char *name = 0); /** * pause action */ -KDE_EXPORT KAction *pause(TQObject *parent = 0, const char *name = 0); +KDE_EXPORT KAction *pause(TQObject *tqparent = 0, const char *name = 0); /** * @return pointer to the global PluginActionMenu object (there is only one instance) @@ -167,7 +172,7 @@ KDE_EXPORT PluginActionMenu *actions(); /** * @return pointer to a VisActionMenu object */ -KDE_EXPORT VisActionMenu *visualizations(TQObject *parent = 0, const char *name = 0); +KDE_EXPORT VisActionMenu *visualizations(TQObject *tqparent = 0, const char *name = 0); /** * The global popupmenu of noatun, there's not two or three but only one of these :) diff --git a/noatun/library/noatun/stereobuttonaction.h b/noatun/library/noatun/stereobuttonaction.h index d6d6edb9..a364dba0 100644 --- a/noatun/library/noatun/stereobuttonaction.h +++ b/noatun/library/noatun/stereobuttonaction.h @@ -13,13 +13,14 @@ namespace NoatunStdAction class StereoButtonAction : public KAction { Q_OBJECT + TQ_OBJECT public: - StereoButtonAction(const TQString& text, int accel = 0, TQObject* parent = 0, const char* name = 0 ); - StereoButtonAction(const TQString& text, int accel, const TQObject* receiver, const char* slot, TQObject* parent, const char* name = 0 ); - StereoButtonAction(const TQString& text, const TQIconSet& pix, int accel = 0, TQObject* parent = 0, const char* name = 0 ); - StereoButtonAction(const TQString& text, const TQString& pix, int accel = 0, TQObject* parent = 0, const char* name = 0 ); - StereoButtonAction(const TQString& text, const TQIconSet& pix, int accel, const TQObject* receiver, const char* slot, TQObject* parent, const char* name = 0 ); - StereoButtonAction(const TQString& text, const TQString& pix, int accel, const TQObject* receiver, const char* slot, TQObject* parent, const char* name = 0 ); + StereoButtonAction(const TQString& text, int accel = 0, TQObject* tqparent = 0, const char* name = 0 ); + StereoButtonAction(const TQString& text, int accel, const TQObject* receiver, const char* slot, TQObject* tqparent, const char* name = 0 ); + StereoButtonAction(const TQString& text, const TQIconSet& pix, int accel = 0, TQObject* tqparent = 0, const char* name = 0 ); + StereoButtonAction(const TQString& text, const TQString& pix, int accel = 0, TQObject* tqparent = 0, const char* name = 0 ); + StereoButtonAction(const TQString& text, const TQIconSet& pix, int accel, const TQObject* receiver, const char* slot, TQObject* tqparent, const char* name = 0 ); + StereoButtonAction(const TQString& text, const TQString& pix, int accel, const TQObject* receiver, const char* slot, TQObject* tqparent, const char* name = 0 ); public slots: void disable(void); void enable(void); diff --git a/noatun/library/noatun/vequalizer.h b/noatun/library/noatun/vequalizer.h index d5ee7ecf..5e494472 100644 --- a/noatun/library/noatun/vequalizer.h +++ b/noatun/library/noatun/vequalizer.h @@ -4,7 +4,7 @@ * This file is hereby licensed under the GNU General Public License version * 2 or later at your option. * - * This file is licensed under the Qt Public License version 1 with the + * This file is licensed under the TQt Public License version 1 with the * condition that the licensed will be governed under the Laws of California * (USA) instead of Norway. Disputes will be settled in Santa Clara county * courts. @@ -36,8 +36,8 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef NOATUN_VEQUALIZER_H -#define NOATUN_VEQUALIZER_H +#ifndef NOATUN_VETQUALIZER_H +#define NOATUN_VETQUALIZER_H #include <tqptrlist.h> #include <tqobject.h> @@ -137,6 +137,7 @@ public: class KDE_EXPORT VInterpolation : public TQObject, public VBandsInterface { Q_OBJECT + TQ_OBJECT struct Private; Private *d; friend class VBand; @@ -176,6 +177,7 @@ class VPreset; class KDE_EXPORT VEqualizer : public TQObject, public VBandsInterface { Q_OBJECT + TQ_OBJECT friend class VBand; friend class VPreset; friend class Engine; diff --git a/noatun/library/noatun/video.h b/noatun/library/noatun/video.h index a659401e..217a8640 100644 --- a/noatun/library/noatun/video.h +++ b/noatun/library/noatun/video.h @@ -12,6 +12,7 @@ class TQPopupMenu; class VideoFrame : public KVideoWidget { Q_OBJECT + TQ_OBJECT struct Private; VideoFrame::Private *d; @@ -19,8 +20,8 @@ Q_OBJECT static VideoFrame *whose; public: - VideoFrame(KXMLGUIClient *clientParent, TQWidget *parent=0, const char *name=0, WFlags f=0); - VideoFrame(TQWidget *parent = 0, const char *name=0, WFlags f=0); + VideoFrame(KXMLGUIClient *clientParent, TQWidget *tqparent=0, const char *name=0, WFlags f=0); + VideoFrame(TQWidget *tqparent = 0, const char *name=0, WFlags f=0); ~VideoFrame(); /** @@ -28,7 +29,7 @@ public: **/ static VideoFrame *playing(); - TQPopupMenu *popupMenu(TQWidget *parent); + TQPopupMenu *popupMenu(TQWidget *tqparent); TQPopupMenu *popupMenu() { return popupMenu(this); } public slots: diff --git a/noatun/library/noatunarts/Session_impl.cpp b/noatun/library/noatunarts/Session_impl.cpp index 63912801..edec216a 100644 --- a/noatun/library/noatunarts/Session_impl.cpp +++ b/noatun/library/noatunarts/Session_impl.cpp @@ -10,7 +10,7 @@ static bool compareArtsObjects(const Noatun::Listener &left, const Noatun::Liste return left._isEqual(right); } -list<Noatun::Listener>::iterator find(list<Noatun::Listener> &v, const Noatun::Listener &is, +list<Noatun::Listener>::iterator tqfind(list<Noatun::Listener> &v, const Noatun::Listener &is, bool (*compare)(const Noatun::Listener& left, const Noatun::Listener& right)) { for (list<Noatun::Listener>::iterator i=v.begin(); i!=v.end(); ++i) @@ -55,7 +55,7 @@ public: void removeListener(Noatun::Listener listener) { list<Listener>::iterator i= - find(listeners, listener, &compareArtsObjects); + tqfind(listeners, listener, &compareArtsObjects); if (i!=listeners.end()) listeners.erase(i); } diff --git a/noatun/library/noatunarts/StereoEffectStack_impl.cpp b/noatun/library/noatunarts/StereoEffectStack_impl.cpp index 684d9694..107f06e9 100644 --- a/noatun/library/noatunarts/StereoEffectStack_impl.cpp +++ b/noatun/library/noatunarts/StereoEffectStack_impl.cpp @@ -85,7 +85,7 @@ class StereoEffectStack_impl : public StereoEffectStack_skel, public StdSynthMod list<EffectEntry*>::iterator i = fx.begin(); bool found=false; - // seek through until we find 'after' + // seek through until we tqfind 'after' while(i != fx.end()) if((*i)->id == after) { diff --git a/noatun/library/noatunstdaction.cpp b/noatun/library/noatunstdaction.cpp index 99b69cb3..72c67d1c 100644 --- a/noatun/library/noatunstdaction.cpp +++ b/noatun/library/noatunstdaction.cpp @@ -21,8 +21,8 @@ namespace NoatunStdAction { ///////////////////////////////////////////////////// -PlayAction::PlayAction(TQObject *parent, const char *name) - : KAction(i18n("Play"), 0, napp->player(), TQT_SLOT(playpause()), parent, name) +PlayAction::PlayAction(TQObject *tqparent, const char *name) + : KAction(i18n("Play"), 0, napp->player(), TQT_SLOT(playpause()), tqparent, name) { connect(napp->player(), TQT_SIGNAL(playing()), TQT_SLOT(playing())); connect(napp->player(), TQT_SIGNAL(paused()), TQT_SLOT(notplaying())); @@ -46,8 +46,8 @@ void PlayAction::notplaying() } ///////////////////////////////////////////////////// -PlaylistAction::PlaylistAction(TQObject *parent, const char *name) - : KToggleAction(i18n("Show Playlist"), "playlist", 0, napp->player(), TQT_SLOT(toggleListView()), parent, name) +PlaylistAction::PlaylistAction(TQObject *tqparent, const char *name) + : KToggleAction(i18n("Show Playlist"), "playlist", 0, napp->player(), TQT_SLOT(toggleListView()), tqparent, name) { setCheckedState(i18n("Hide Playlist")); connect(napp->player(), TQT_SIGNAL(playlistShown()), TQT_SLOT(shown())); @@ -67,8 +67,8 @@ void PlaylistAction::hidden() //////////////////////////////////////////////////// -PluginActionMenu::PluginActionMenu(TQObject *parent, const char *name) - : KActionMenu(i18n("&Actions"), parent, name) +PluginActionMenu::PluginActionMenu(TQObject *tqparent, const char *name) + : KActionMenu(i18n("&Actions"), tqparent, name) { // kdDebug(66666) << k_funcinfo << "called" << endl; setEnabled(false); @@ -111,11 +111,11 @@ void PluginActionMenu::menuRemove(int id) //////////////////////////////////////////////////// -VisActionMenu::VisActionMenu(TQObject *parent, const char *name) - : KActionMenu(i18n("&Visualizations"), parent, name) +VisActionMenu::VisActionMenu(TQObject *tqparent, const char *name) + : KActionMenu(i18n("&Visualizations"), tqparent, name) { - connect(popupMenu(), TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(fillPopup())); - connect(popupMenu(), TQT_SIGNAL(activated(int)), this, TQT_SLOT(toggleVisPlugin(int))); + connect(popupMenu(), TQT_SIGNAL(aboutToShow()), TQT_TQOBJECT(this), TQT_SLOT(fillPopup())); + connect(popupMenu(), TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(toggleVisPlugin(int))); } void VisActionMenu::fillPopup() @@ -133,14 +133,14 @@ void VisActionMenu::fillPopup() { id = popupMenu()->insertItem((*i).name); mSpecMap[id] = (*i).specfile; - popupMenu()->setItemChecked(id, loaded.contains(*i)); + popupMenu()->setItemChecked(id, loaded.tqcontains(*i)); } } } void VisActionMenu::toggleVisPlugin(int id) { - if(!mSpecMap.contains(id)) + if(!mSpecMap.tqcontains(id)) return; TQString specfile = mSpecMap[id]; @@ -159,30 +159,30 @@ void VisActionMenu::toggleVisPlugin(int id) //////////////////////////////////////////////////// -LoopActionMenu::LoopActionMenu(TQObject *parent, const char *name) - : KActionMenu(i18n("&Loop"), parent, name) +LoopActionMenu::LoopActionMenu(TQObject *tqparent, const char *name) + : KActionMenu(i18n("&Loop"), tqparent, name) { mLoopNone = new KRadioAction(i18n("&None"), TQString::fromLocal8Bit("noatunloopnone"), - 0, this, TQT_SLOT(loopNoneSelected()), this, "loop_none"); + 0, TQT_TQOBJECT(this), TQT_SLOT(loopNoneSelected()), TQT_TQOBJECT(this), "loop_none"); mLoopNone->setExclusiveGroup("loopType"); insert(mLoopNone); mLoopSong = new KRadioAction(i18n("&Song"), TQString::fromLocal8Bit("noatunloopsong"), - 0, this, TQT_SLOT(loopSongSelected()), this, "loop_song"); + 0, TQT_TQOBJECT(this), TQT_SLOT(loopSongSelected()), TQT_TQOBJECT(this), "loop_song"); mLoopSong->setExclusiveGroup("loopType"); insert(mLoopSong); mLoopPlaylist = new KRadioAction(i18n("&Playlist"), TQString::fromLocal8Bit("noatunloopplaylist"), - 0, this, TQT_SLOT(loopPlaylistSelected()), this, "loop_playlist"); + 0, TQT_TQOBJECT(this), TQT_SLOT(loopPlaylistSelected()), TQT_TQOBJECT(this), "loop_playlist"); mLoopPlaylist->setExclusiveGroup("loopType"); insert(mLoopPlaylist); mLoopRandom = new KRadioAction(i18n("&Random"), TQString::fromLocal8Bit("noatunlooprandom"), - 0, this, TQT_SLOT(loopRandomSelected()), this, "loop_random"); + 0, TQT_TQOBJECT(this), TQT_SLOT(loopRandomSelected()), TQT_TQOBJECT(this), "loop_random"); mLoopRandom->setExclusiveGroup("loopType"); insert(mLoopRandom); - connect(napp->player(), TQT_SIGNAL(loopTypeChange(int)), this, TQT_SLOT(updateLooping(int))); + connect(napp->player(), TQT_SIGNAL(loopTypeChange(int)), TQT_TQOBJECT(this), TQT_SLOT(updateLooping(int))); updateLooping(static_cast<int>(napp->player()->loopStyle())); } @@ -232,29 +232,29 @@ void LoopActionMenu::loopRandomSelected() //////////////////////////////////////////////////// -KAction *playpause(TQObject *parent, const char *name) +KAction *playpause(TQObject *tqparent, const char *name) { - return new PlayAction(parent, name); + return new PlayAction(tqparent, name); } -KAction *effects(TQObject *parent, const char *name) +KAction *effects(TQObject *tqparent, const char *name) { - return new KAction(i18n("&Effects..."), "effect", 0, napp, TQT_SLOT(effectView()), parent, name); + return new KAction(i18n("&Effects..."), "effect", 0, TQT_TQOBJECT(napp), TQT_SLOT(effectView()), tqparent, name); } -KAction *equalizer(TQObject *parent, const char *name) +KAction *equalizer(TQObject *tqparent, const char *name) { - return new KAction(i18n("E&qualizer..."), "equalizer", 0, napp, TQT_SLOT(equalizerView()), parent, name); + return new KAction(i18n("E&qualizer..."), "equalizer", 0, TQT_TQOBJECT(napp), TQT_SLOT(equalizerView()), tqparent, name); } -KAction *back(TQObject *parent, const char *name) +KAction *back(TQObject *tqparent, const char *name) { - return new KAction(i18n("&Back"), "player_start", 0, napp->player(), TQT_SLOT(back()), parent, name); + return new KAction(i18n("&Back"), "player_start", 0, TQT_TQOBJECT(napp->player()), TQT_SLOT(back()), tqparent, name); } -KAction *stop(TQObject *parent, const char *name) +KAction *stop(TQObject *tqparent, const char *name) { - StereoButtonAction *action = new StereoButtonAction(i18n("Stop"), "player_stop", 0, napp->player(), TQT_SLOT(stop()), parent, name); + StereoButtonAction *action = new StereoButtonAction(i18n("Stop"), "player_stop", 0, napp->player(), TQT_SLOT(stop()), tqparent, name); TQObject::connect(napp->player(), TQT_SIGNAL(playing()), action, TQT_SLOT(enable())); TQObject::connect(napp->player(), TQT_SIGNAL(paused()), action, TQT_SLOT(enable())); TQObject::connect(napp->player(), TQT_SIGNAL(stopped()), action, TQT_SLOT(disable())); @@ -265,14 +265,14 @@ KAction *stop(TQObject *parent, const char *name) return action; } -KAction *forward(TQObject *parent, const char *name) +KAction *forward(TQObject *tqparent, const char *name) { - return new KAction(i18n("&Forward"), "player_end", 0, napp->player(), TQT_SLOT(forward()), parent, name); + return new KAction(i18n("&Forward"), "player_end", 0, napp->player(), TQT_SLOT(forward()), tqparent, name); } -KAction *play(TQObject *parent, const char *name) +KAction *play(TQObject *tqparent, const char *name) { - StereoButtonAction *action = new StereoButtonAction(i18n("&Play"), "player_play", 0, napp->player(), TQT_SLOT(playpause()), parent, name); + StereoButtonAction *action = new StereoButtonAction(i18n("&Play"), "player_play", 0, napp->player(), TQT_SLOT(playpause()), tqparent, name); TQObject::connect(napp->player(), TQT_SIGNAL(playing()), action, TQT_SLOT(disable())); TQObject::connect(napp->player(), TQT_SIGNAL(paused()), action, TQT_SLOT(enable())); TQObject::connect(napp->player(), TQT_SIGNAL(stopped()), action, TQT_SLOT(enable())); @@ -283,9 +283,9 @@ KAction *play(TQObject *parent, const char *name) return action; } -KAction *pause(TQObject *parent, const char *name) +KAction *pause(TQObject *tqparent, const char *name) { - StereoButtonAction *action = new StereoButtonAction(i18n("&Pause"), "player_pause", 0, napp->player(), TQT_SLOT(playpause()), parent, name); + StereoButtonAction *action = new StereoButtonAction(i18n("&Pause"), "player_pause", 0, napp->player(), TQT_SLOT(playpause()), tqparent, name); TQObject::connect(napp->player(), TQT_SIGNAL(playing()), action, TQT_SLOT(enable())); TQObject::connect(napp->player(), TQT_SIGNAL(paused()), action, TQT_SLOT(disable())); TQObject::connect(napp->player(), TQT_SIGNAL(stopped()), action, TQT_SLOT(disable())); @@ -296,9 +296,9 @@ KAction *pause(TQObject *parent, const char *name) return action; } -LoopActionMenu *loop(TQObject *parent, const char *name) +LoopActionMenu *loop(TQObject *tqparent, const char *name) { - return new LoopActionMenu(parent, name); + return new LoopActionMenu(tqparent, name); } PluginActionMenu *actions() @@ -307,14 +307,14 @@ PluginActionMenu *actions() return napp->pluginActionMenu(); } -VisActionMenu *visualizations(TQObject *parent, const char *name) +VisActionMenu *visualizations(TQObject *tqparent, const char *name) { - return new VisActionMenu(parent, name); + return new VisActionMenu(tqparent, name); } -KToggleAction *playlist(TQObject *parent, const char *name) +KToggleAction *playlist(TQObject *tqparent, const char *name) { - return new PlaylistAction(parent, name); + return new PlaylistAction(tqparent, name); } KPopupMenu *ContextMenu::mContextMenu = 0; @@ -333,15 +333,15 @@ KPopupMenu *ContextMenu::createContextMenu(TQWidget *p) KHelpMenu *helpmenu = new KHelpMenu(contextMenu, kapp->aboutData(), false); KActionCollection* actions = new KActionCollection(helpmenu); - KStdAction::open(napp, TQT_SLOT(fileOpen()), actions)->plug(contextMenu); - KStdAction::quit(napp, TQT_SLOT(quit()), actions)->plug(contextMenu); + KStdAction::open(TQT_TQOBJECT(napp), TQT_SLOT(fileOpen()), actions)->plug(contextMenu); + KStdAction::quit(TQT_TQOBJECT(napp), TQT_SLOT(quit()), actions)->plug(contextMenu); contextMenu->insertItem(SmallIcon("help"), KStdGuiItem::help().text(), helpmenu->menu()); contextMenu->insertSeparator(); - KStdAction::preferences(napp, TQT_SLOT(preferences()), actions)->plug(contextMenu); - NoatunStdAction::playlist(contextMenu)->plug(contextMenu); - NoatunStdAction::effects(contextMenu)->plug(contextMenu); - NoatunStdAction::equalizer(napp)->plug(contextMenu); - NoatunStdAction::visualizations(napp)->plug(contextMenu); + KStdAction::preferences(TQT_TQOBJECT(napp), TQT_SLOT(preferences()), actions)->plug(contextMenu); + NoatunStdAction::playlist(TQT_TQOBJECT(contextMenu))->plug(contextMenu); + NoatunStdAction::effects(TQT_TQOBJECT(contextMenu))->plug(contextMenu); + NoatunStdAction::equalizer(TQT_TQOBJECT(napp))->plug(contextMenu); + NoatunStdAction::visualizations(TQT_TQOBJECT(napp))->plug(contextMenu); napp->pluginActionMenu()->plug(contextMenu); return contextMenu; diff --git a/noatun/library/noatuntags/tags.cpp b/noatun/library/noatuntags/tags.cpp index 268f7bd9..47e2d92a 100644 --- a/noatun/library/noatuntags/tags.cpp +++ b/noatun/library/noatuntags/tags.cpp @@ -177,8 +177,8 @@ Tags::~Tags() } -Control::Control(TagsGetter *parent) - : CModule(i18n("Tagging"), i18n("Settings for Tag Loaders"), "edit", parent) +Control::Control(TagsGetter *tqparent) + : CModule(i18n("Tagging"), i18n("Settings for Tag Loaders"), "edit", tqparent) { // todo (void)I18N_NOOP("Rescan All Tags"); @@ -201,7 +201,7 @@ Control::Control(TagsGetter *parent) ", and updates tags (e.g., ID3)", "Interval:"), intervalLine); TQSlider *slider=new TQSlider( - 0, 2000, 100, 0, Horizontal, intervalLine + 0, 2000, 100, 0,Qt::Horizontal, intervalLine ); TQSpinBox *spin=new TQSpinBox( 0, 2000, 10, intervalLine @@ -212,14 +212,14 @@ Control::Control(TagsGetter *parent) connect(slider, TQT_SIGNAL(valueChanged(int)), spin, TQT_SLOT(setValue(int))); connect(spin, TQT_SIGNAL(valueChanged(int)), slider, TQT_SLOT(setValue(int))); - slider->setValue(parent->interval()); - connect(slider, TQT_SIGNAL(valueChanged(int)), parent, TQT_SLOT(setInterval(int))); + slider->setValue(tqparent->interval()); + connect(slider, TQT_SIGNAL(valueChanged(int)), tqparent, TQT_SLOT(setInterval(int))); connect(onPlay, TQT_SIGNAL(toggled(bool)), intervalLine, TQT_SLOT(setEnabled(bool))); } - connect(onPlay, TQT_SIGNAL(toggled(bool)), parent, TQT_SLOT(setLoadAuto(bool))); + connect(onPlay, TQT_SIGNAL(toggled(bool)), tqparent, TQT_SLOT(setLoadAuto(bool))); - onPlay->setChecked(parent->loadAuto()); + onPlay->setChecked(tqparent->loadAuto()); } diff --git a/noatun/library/noatuntags/tagsgetter.h b/noatun/library/noatuntags/tagsgetter.h index 8b6eddb9..bd66ab3f 100644 --- a/noatun/library/noatuntags/tagsgetter.h +++ b/noatun/library/noatuntags/tagsgetter.h @@ -10,6 +10,7 @@ class TagsGetter : public TQObject, public PlaylistNotifier { Q_OBJECT + TQ_OBJECT public: TagsGetter(); void associate(Tags *t); @@ -47,8 +48,9 @@ private: class Control : public CModule { Q_OBJECT + TQ_OBJECT public: - Control(TagsGetter* parent); + Control(TagsGetter* tqparent); }; diff --git a/noatun/library/player.cpp b/noatun/library/player.cpp index 0b90952c..accdfd47 100644 --- a/noatun/library/player.cpp +++ b/noatun/library/player.cpp @@ -14,7 +14,7 @@ enum ArtsPOS { posIdle=0, posPlaying, posPaused }; -Player::Player(TQObject *parent) : TQObject(parent, "Player"), +Player::Player(TQObject *tqparent) : TQObject(tqparent, "Player"), position(-1), mLoopStyle(None), firstTimeout(true) { mEngine=new Engine; diff --git a/noatun/library/playlist.cpp b/noatun/library/playlist.cpp index 7cc28337..a86be118 100644 --- a/noatun/library/playlist.cpp +++ b/noatun/library/playlist.cpp @@ -62,12 +62,12 @@ TQString PlaylistItemData::title() const // "$(property)" TQString format=napp->titleFormat(); - TQRegExp find("(?:(?:\\\\\\\\))*\\$\\((.*)"); + TQRegExp tqfind("(?:(?:\\\\\\\\))*\\$\\((.*)"); int start=0; while (start != -1) { - start = find.search(format, start); + start = tqfind.search(format, start); if (start == -1) break; // test if there's an odd amount of backslashes @@ -81,8 +81,8 @@ TQString PlaylistItemData::title() const uint len=counter.cap(1).length()-1; // and half them, and remove one more - format.replace(start-1, len/2+1, ""); - start=start-1+len/2+find.cap(1).length()+3; + format.tqreplace(start-1, len/2+1, ""); + start=start-1+len/2+tqfind.cap(1).length()+3; continue; } @@ -96,12 +96,12 @@ TQString PlaylistItemData::title() const uint len=counter.cap(1).length(); // and half them - format.replace(start, len/2, ""); + format.tqreplace(start, len/2, ""); start=start+len/2; } // "sth"foo"sth" - TQString cont(find.cap(1)); + TQString cont(tqfind.cap(1)); TQString prefix,suffix,propname; unsigned int i=0; if (cont[i] == '"') @@ -150,18 +150,18 @@ TQString PlaylistItemData::title() const { // comments can contain newlines // these are not wanted in a formatted title - propval.replace('\n', ' '); + propval.tqreplace('\n', ' '); } if (propval.length()) { propval = prefix+propval+suffix; - format.replace(start, i+2, propval); + format.tqreplace(start, i+2, propval); start += propval.length(); } else { - format.replace(start, i+2, ""); + format.tqreplace(start, i+2, ""); } } return format; @@ -278,7 +278,7 @@ bool PlaylistItemData::operator != (const PlaylistItemData &d) const -Playlist::Playlist(TQObject *parent, const char *name) : TQObject(parent, name) +Playlist::Playlist(TQObject *tqparent, const char *name) : TQObject(tqparent, name) { napp->player()->connect(this, TQT_SIGNAL(playCurrent()), TQT_SLOT(playCurrent())); napp->player()->connect(this, TQT_SIGNAL(listHidden()), TQT_SIGNAL(playlistHidden())); @@ -356,7 +356,7 @@ TQValueList<PlaylistItem> Playlist::select( } else { - if ((*val).find(v, 0, caseSensitive)!=-1) + if ((*val).tqfind(v, 0, caseSensitive)!=-1) { list.append(i); limit--; diff --git a/noatun/library/playlistsaver.cpp b/noatun/library/playlistsaver.cpp index 8b34deca..15fcad58 100644 --- a/noatun/library/playlistsaver.cpp +++ b/noatun/library/playlistsaver.cpp @@ -107,7 +107,7 @@ bool PlaylistSaver::metalist(const KURL &url) TQMap<TQString,TQString> map; map["playObject"]="Arts::StreamPlayObject"; - map["title"] = i18n("Stream from %1").arg(url.host()); + map["title"] = i18n("Stream from %1").tqarg(url.host()); KURL u(url); if (!u.hasPath()) @@ -144,7 +144,7 @@ bool PlaylistSaver::saveXML(const KURL &file, int ) else localFile = napp->tempSaveName(file.path()); - // QDom is a pain :) + // TQDom is a pain :) TQDomDocument doc("playlist"); doc.setContent(TQString("<!DOCTYPE XMLPlaylist><playlist version=\"1.0\" client=\"noatun\"/>")); @@ -186,7 +186,7 @@ bool PlaylistSaver::saveXML(const KURL &file, int ) return true; } -class NoatunXMLStructure : public QXmlDefaultHandler +class NoatunXMLStructure : public TQXmlDefaultHandler { public: PlaylistSaver *saver; @@ -231,7 +231,7 @@ public: }; -class MSASXStructure : public QXmlDefaultHandler +class MSASXStructure : public TQXmlDefaultHandler { public: PlaylistSaver *saver; @@ -291,7 +291,7 @@ public: if(a.qName(i).lower()=="href") { TQString filename=a.value(i); - if (filename.find(TQRegExp("^[a-zA-Z0-9]+:/"))==0) + if (filename.tqfind(TQRegExp("^[a-zA-Z0-9]+:/"))==0) { KURL url(filename); KMimeType::Ptr mimetype = KMimeType::findByURL(url); @@ -303,7 +303,7 @@ public: else { propMap["playObject"]="SplayPlayObject"; - propMap["title"] = i18n("Stream from %1").arg(url.host()); + propMap["title"] = i18n("Stream from %1").tqarg(url.host()); if (!url.hasPath()) url.setPath("/"); propMap["url"] = url.url(); @@ -316,7 +316,7 @@ public: { KURL u1; // we have to deal with a relative path - if (filename.find('/')) + if (filename.tqfind('/')) { u1.setPath(mAbsPath); //FIXME: how to get the path in this place? u1.setFileName(filename); @@ -448,8 +448,8 @@ bool PlaylistSaver::loadXML(const KURL &url, int opt) reset(); - // QXml is horribly documented - TQXmlInputSource source(&file); + // TQXml is horribly documented + TQXmlInputSource source(TQT_TQIODEVICE(&file)); TQXmlSimpleReader reader; if (opt == ASX || @@ -541,7 +541,7 @@ bool PlaylistSaver::loadM3U(const KURL &file, int /*opt*/) if (filename.isEmpty()) continue; - if (filename.find(TQRegExp("^[a-zA-Z0-9]+:/"))==0) + if (filename.tqfind(TQRegExp("^[a-zA-Z0-9]+:/"))==0) { //kdDebug(66666) << k_funcinfo << "url filename = " << filename << endl; @@ -556,7 +556,7 @@ bool PlaylistSaver::loadM3U(const KURL &file, int /*opt*/) { prop["playObject"]="SplayPlayObject"; // Default title, might be overwritten by #EXTINF later - prop["title"] = i18n("Stream from %1").arg(protourl.host()); + prop["title"] = i18n("Stream from %1").tqarg(protourl.host()); if (!protourl.hasPath()) protourl.setPath("/"); @@ -569,7 +569,7 @@ bool PlaylistSaver::loadM3U(const KURL &file, int /*opt*/) { KURL u1; // we have to deal with a relative path - if (filename.find('/')) + if (filename.tqfind('/')) { u1.setPath(file.path(0)); u1.setFileName(filename); @@ -587,7 +587,7 @@ bool PlaylistSaver::loadM3U(const KURL &file, int /*opt*/) { extinf.remove(0,8); // remove "#EXTINF:" //kdDebug(66666) << "EXTM3U extinf = '" << extinf << "'" << endl; - int timeTitleSep = extinf.find(',', 0); + int timeTitleSep = extinf.tqfind(',', 0); int length = (extinf.left(timeTitleSep)).toInt(); if (length>0) @@ -596,7 +596,7 @@ bool PlaylistSaver::loadM3U(const KURL &file, int /*opt*/) TQString displayTitle=extinf.mid(timeTitleSep+1); if (!displayTitle.isEmpty()) { - int artistTitleSep = displayTitle.find(" - ",0); + int artistTitleSep = displayTitle.tqfind(" - ",0); if (artistTitleSep == -1) // no "artist - title" like format, just set it as title { prop["title"] = displayTitle; @@ -718,7 +718,7 @@ bool PlaylistSaver::loadPLS(const KURL &file, int /*opt*/) // some stupid Windows lusers like to be case insensitive TQStringList groups = list.groupList().grep(TQRegExp("^playlist$", false)); /* - if (!groups.count()) // didn't find "[playlist]", it's not a .pls file + if (!groups.count()) // didn't tqfind "[playlist]", it's not a .pls file return false; */ @@ -748,9 +748,9 @@ bool PlaylistSaver::loadPLS(const KURL &file, int /*opt*/) map["playObject"]="SplayPlayObject"; if (title.isEmpty()) - map["title"] = i18n("Stream from %1 (port: %2)").arg( url.host() ).arg( url.port() ); + map["title"] = i18n("Stream from %1 (port: %2)").tqarg( url.host() ).tqarg( url.port() ); else - map["title"] = i18n("Stream from %1, (ip: %2, port: %3)").arg( title ).arg( url.host() ).arg(url.port() ); + map["title"] = i18n("Stream from %1, (ip: %2, port: %3)").tqarg( title ).tqarg( url.host() ).tqarg(url.port() ); map["url"] = map["stream_"]= url.url(); diff --git a/noatun/library/plugin.cpp b/noatun/library/plugin.cpp index 3c5b6f5d..36c1a2cf 100644 --- a/noatun/library/plugin.cpp +++ b/noatun/library/plugin.cpp @@ -85,16 +85,16 @@ Visualization::Visualization(int timeout, int pid) // if this is a fork, do a cutesy arts thingy to get a remote // stack, otherwise, get it from localhost :) { - int parent=pid ? pid : getppid(); + int tqparent=pid ? pid : getppid(); if (getenv("NOATUN_PID")) - parent = TQString::fromLatin1(getenv("NOATUN_PID")).toInt(); + tqparent = TQString::tqfromLatin1(getenv("NOATUN_PID")).toInt(); DCOPClient c; c.attach(); TQCString appids[2]; - appids[0]=TQString("noatun-%1").arg(parent).local8Bit(); + appids[0]=TQString("noatun-%1").tqarg(tqparent).local8Bit(); appids[1]="noatun"; TQCString &appid=appids[0]; @@ -120,7 +120,7 @@ Visualization::Visualization(int timeout, int pid) if (!c.call(appid, "Noatun", "visStack()", TQByteArray(), replyType, replyData)) { - kdDebug(66666) << "Error communicating to parent noatun" << endl; + kdDebug(66666) << "Error communicating to tqparent noatun" << endl; } else { @@ -187,7 +187,7 @@ int Visualization::noatunPid() { if ((*i).left(6) != "noatun") continue; - int pid=(*i).mid((*i).find('-')+1).toInt(); + int pid=(*i).mid((*i).tqfind('-')+1).toInt(); return pid; } return -1; @@ -473,7 +473,7 @@ void StereoScope::setSamples(int len) -NoatunListener::NoatunListener(TQObject *parent) : TQObject(parent) +NoatunListener::NoatunListener(TQObject *tqparent) : TQObject(tqparent) { } NoatunListener::~NoatunListener() @@ -495,7 +495,7 @@ void NoatunListenerNotif::message() } -ExitNotifier::ExitNotifier(int pid, TQObject *parent) : NoatunListener(parent) +ExitNotifier::ExitNotifier(int pid, TQObject *tqparent) : NoatunListener(tqparent) { mNotif=new NoatunListenerNotif(this); @@ -504,7 +504,7 @@ ExitNotifier::ExitNotifier(int pid, TQObject *parent) : NoatunListener(parent) TQCString appids[2]; - appids[0]=TQString("noatun-%1").arg(pid).local8Bit(); + appids[0]=TQString("noatun-%1").tqarg(pid).local8Bit(); appids[1]="noatun"; appid=appids[0]; @@ -528,7 +528,7 @@ ExitNotifier::ExitNotifier(int pid, TQObject *parent) : NoatunListener(parent) if (!c.call(appid, "Noatun", "session()", TQByteArray(), replyType, replyData)) { - kdDebug(66666) << "Error communicating to parent noatun" << endl; + kdDebug(66666) << "Error communicating to tqparent noatun" << endl; } else { @@ -563,8 +563,8 @@ ExitNotifier::~ExitNotifier() delete mNotif; } -BoolNotifier::BoolNotifier(bool *value, NoatunListener *listener, TQObject *parent) - : TQObject(parent) +BoolNotifier::BoolNotifier(bool *value, NoatunListener *listener, TQObject *tqparent) + : TQObject(tqparent) { connect(listener, TQT_SIGNAL(event()), TQT_SLOT(event())); mValue=value; diff --git a/noatun/library/plugin_deps.h b/noatun/library/plugin_deps.h index 330636e3..e52e73c1 100644 --- a/noatun/library/plugin_deps.h +++ b/noatun/library/plugin_deps.h @@ -9,9 +9,10 @@ class Visualization; class NoatunListener; -class TimerThingy : public QObject +class TimerThingy : public TQObject { Q_OBJECT + TQ_OBJECT public: TimerThingy(Visualization*); diff --git a/noatun/library/pluginloader.cpp b/noatun/library/pluginloader.cpp index 0897e76d..032761a0 100644 --- a/noatun/library/pluginloader.cpp +++ b/noatun/library/pluginloader.cpp @@ -81,7 +81,7 @@ bool LibraryLoader::loadAll(const TQStringList &modules) for(TQStringList::ConstIterator i=modules.begin(); i!=modules.end(); ++i) { NoatunLibraryInfo info=getInfo(*i); - if (!info.type.contains("sm")) + if (!info.type.tqcontains("sm")) continue; loadSO(*i); } @@ -90,7 +90,7 @@ bool LibraryLoader::loadAll(const TQStringList &modules) for(TQStringList::ConstIterator i=modules.begin(); i!=modules.end(); ++i) { NoatunLibraryInfo info=getInfo(*i); - if (!info.type.contains("playlist")) + if (!info.type.tqcontains("playlist")) continue; loadSO(*i); } @@ -106,7 +106,7 @@ bool LibraryLoader::loadAll(const TQStringList &modules) for(TQStringList::ConstIterator i=modules.begin(); i!=modules.end(); ++i) { NoatunLibraryInfo info=getInfo(*i); - if (!info.type.contains("userinterface")) + if (!info.type.tqcontains("userinterface")) continue; loadSO(*i); } @@ -121,9 +121,9 @@ bool LibraryLoader::loadAll(const TQStringList &modules) for(TQStringList::ConstIterator i=modules.begin(); i!=modules.end(); ++i) { NoatunLibraryInfo info=getInfo(*i); - if((!info.type.contains("playlist")) - && (!info.type.contains("userinterface")) - && (!info.type.contains("sm"))) + if((!info.type.tqcontains("playlist")) + && (!info.type.tqcontains("userinterface")) + && (!info.type.tqcontains("sm"))) { loadSO(*i); } @@ -139,7 +139,7 @@ NoatunLibraryInfo LibraryLoader::getInfo(const TQString &spec) const if (!TQFile::exists(specPath)) return info; KSimpleConfig file(specPath); - if (spec.find('/')>=0) + if (spec.tqfind('/')>=0) info.specfile=KURL(spec).fileName(); else info.specfile=spec; @@ -197,7 +197,7 @@ bool LibraryLoader::loadSO(const TQString &spec) plugInStart=(Plugin* (*)()) create; listitem->plugin=plugInStart(); - if (info.type.contains("playlist")) + if (info.type.tqcontains("playlist")) { //kdDebug(66666) << k_funcinfo << "Assigning mPlaylist to " << info.name << endl; mPlaylist=listitem->plugin->playlist(); @@ -329,7 +329,7 @@ TQValueList<NoatunLibraryInfo> LibraryLoader::loadedByType(const TQString &type) if (isLoaded(i.currentKey())) { NoatunLibraryInfo info = getInfo(i.currentKey()); - if (info.type.contains(type)) + if (info.type.tqcontains(type)) items.append(info); } } diff --git a/noatun/library/pluginmodule.cpp b/noatun/library/pluginmodule.cpp index 77047471..0cd47d6d 100644 --- a/noatun/library/pluginmodule.cpp +++ b/noatun/library/pluginmodule.cpp @@ -203,34 +203,34 @@ void Plugins::reopen() for(TQValueList<NoatunLibraryInfo>::Iterator i = available.begin(); i != available.end(); ++i) { - PluginListView *parent; + PluginListView *tqparent; bool exclusive = false; if((*i).type == "userinterface") { - parent = interfaceList; + tqparent = interfaceList; } else if((*i).type == "playlist") { - parent = playlistList; + tqparent = playlistList; exclusive = true; } else if((*i).type == "sm" || (*i).type=="hidden") { - parent = 0; + tqparent = 0; } else if ((*i).type == "visualization") { - parent = visList; + tqparent = visList; } else { - parent = otherList; + tqparent = otherList; } - if(parent) + if(tqparent) { - PluginListItem *item = new PluginListItem(exclusive, loaded.contains(*i), *i, parent); + PluginListItem *item = new PluginListItem(exclusive, loaded.tqcontains(*i), *i, tqparent); item->setText(0, (*i).name); item->setText(1, (*i).comment); item->setText(2, (*i).author); @@ -257,9 +257,9 @@ void Plugins::addPlugin(const NoatunLibraryInfo &info) if(item) item->setOn(true); } - if(mDeleted.contains(info.specfile)) + if(mDeleted.tqcontains(info.specfile)) mDeleted.remove(info.specfile); - else if(!mAdded.contains(info.specfile)) + else if(!mAdded.tqcontains(info.specfile)) mAdded.append(info.specfile); } @@ -291,9 +291,9 @@ void Plugins::removePlugin(const NoatunLibraryInfo &info) } } - if (mAdded.contains(info.specfile)) + if (mAdded.tqcontains(info.specfile)) mAdded.remove(info.specfile); - else if(!mDeleted.contains(info.specfile)) + else if(!mDeleted.tqcontains(info.specfile)) mDeleted.append(info.specfile); } @@ -382,7 +382,7 @@ void Plugins::save() TQValueList<NoatunLibraryInfo> loaded = loader.loaded(); for(TQValueList<NoatunLibraryInfo>::Iterator i = loaded.begin(); i != loaded.end(); ++i) { - if(!specList.contains((*i).specfile) && loader.isLoaded((*i).specfile)) + if(!specList.tqcontains((*i).specfile) && loader.isLoaded((*i).specfile)) specList += (*i).specfile; } @@ -398,7 +398,7 @@ void Plugins::showEvent(TQShowEvent *e) if(!shown) { shown = true; - KMessageBox::information(this, i18n("<qt>Changing your playlist plugin will stop playback. Different playlists may use different methods of storing information, so after changing playlists you may have to recreate your playlist.</qt>"), TQString::null, "Plugin warning"); + KMessageBox::information(this, i18n("<qt>Changing your playlist plugin will stop playback. Different playlists may use different methods of storing information, so after changing playlists you may have to recreate your playlist.</qt>"), TQString(), "Plugin warning"); } CModule::showEvent(e); } diff --git a/noatun/library/pluginmodule.h b/noatun/library/pluginmodule.h index 59ece235..c3818040 100644 --- a/noatun/library/pluginmodule.h +++ b/noatun/library/pluginmodule.h @@ -30,7 +30,7 @@ class KTabCtl; -class PluginListItem : public QCheckListItem +class PluginListItem : public TQCheckListItem { public: PluginListItem(const bool _exclusive, bool _checked, const NoatunLibraryInfo &_info, TQListView *_parent); @@ -51,6 +51,7 @@ private: class PluginListView : public KListView { Q_OBJECT + TQ_OBJECT friend class PluginListItem; @@ -75,6 +76,7 @@ private: class Plugins : public CModule { Q_OBJECT + TQ_OBJECT public: Plugins(TQObject *_parent = 0); virtual void save(); diff --git a/noatun/library/pref.cpp b/noatun/library/pref.cpp index 658e7951..04e301ff 100644 --- a/noatun/library/pref.cpp +++ b/noatun/library/pref.cpp @@ -8,9 +8,9 @@ //#include <tqlabel.h> #include "cmodule.h" -NoatunPreferences::NoatunPreferences(TQWidget *parent) +NoatunPreferences::NoatunPreferences(TQWidget *tqparent) : KDialogBase(TreeList, i18n("Preferences - Noatun"), - Ok|Apply|Cancel|Help, Ok, parent, "NoatunPreferences", false, true) + Ok|Apply|Cancel|Help, Ok, tqparent, "NoatunPreferences", false, true) { resize(640, 480); // KDE is required to support 800x600 min. setShowIconsInTreeList(true); @@ -32,7 +32,7 @@ void NoatunPreferences::show() void NoatunPreferences::show(CModule *page) { - int index = pageIndex( static_cast<TQWidget *>(page->parent()) ); + int index = pageIndex( static_cast<TQWidget *>(TQT_TQWIDGET(page->tqparent())) ); if (index != -1) showPage(index); show(); @@ -65,29 +65,20 @@ CModule::CModule(const TQString &name, const TQString &description, const TQStri napp->preferencesBox()->add(this); - TQFrame *page=static_cast<TQFrame*>(parent()); + TQFrame *page=static_cast<TQFrame*>(TQT_TQWIDGET(tqparent())); (new TQHBoxLayout(page))->addWidget(this); } CModule::~CModule() { //kdDebug(66666) << k_funcinfo << endl; -#if QT_VERSION < 0x030102 && KDE_VERSION < KDE_MAKE_VERSION( 3, 1, 90 ) - // Due to a bug in Qt 3.1 and 3.1.1 no close events are sent to hidden - // widgets, causing the KJanusWidget to crash. This workaround is - // rather intrusive and should be used only in the affected versions - // to avoid hard to track bugs in the future. KDE HEAD (to become 3.2) - // has a workaround for this problem, and additionally it's fixed in - // Qt 3.1.2. - napp->sendPostedEvents(); -#endif napp->preferencesBox()->remove(this); } void CModule::ownerDeleted() { - TQObject *p=parent(); + TQObject *p=tqparent(); delete this; p->deleteLater(); } diff --git a/noatun/library/scrollinglabel.cpp b/noatun/library/scrollinglabel.cpp index 09d64678..682c4f6a 100644 --- a/noatun/library/scrollinglabel.cpp +++ b/noatun/library/scrollinglabel.cpp @@ -40,11 +40,11 @@ class ScrollingLabel::Private } // Order dependency. - QString text; - QString originalText; - QPixmap buf; - QTimer scrollTimer; - QTimer resetTimer; + TQString text; + TQString originalText; + TQPixmap buf; + TQTimer scrollTimer; + TQTimer resetTimer; int scrollSize; int pos; bool add; @@ -54,11 +54,11 @@ class ScrollingLabel::Private ScrollingLabel::ScrollingLabel ( - const QString & initialText, - QWidget * parent, + const TQString & initialText, + TQWidget * tqparent, const char * name ) - : TQWidget(parent, name) + : TQWidget(tqparent, name) { d = new Private; @@ -116,10 +116,10 @@ ScrollingLabel::_update() setFixedHeight(h); - d->scrollSize = QMAX(0, w - width()); + d->scrollSize = TQMAX(0, w - width()); d->buf.resize(w, h); - d->buf.fill(colorGroup().background()); + d->buf.fill(tqcolorGroup().background()); TQPainter p(&d->buf); p.setFont(font()); @@ -128,14 +128,14 @@ ScrollingLabel::_update() if (d->scroll && (d->scrollSize > 0)) d->scrollTimer.start(100, true); - repaint(false); + tqrepaint(false); } void ScrollingLabel::paintEvent(TQPaintEvent *) { bitBlt - (this, 0, 0, &d->buf, d->pos, 0, d->pos + width(), height(), Qt::CopyROP); + (this, 0, 0, &d->buf, d->pos, 0, d->pos + width(), height(), TQt::CopyROP); } void @@ -149,7 +149,7 @@ ScrollingLabel::scroll() { d->scrollTimer.stop(); - repaint(false); + tqrepaint(false); int scrollTime = 100; @@ -165,19 +165,19 @@ ScrollingLabel::scroll() d->scrollTimer.start(scrollTime, true); } - QSize -ScrollingLabel::sizeHint() const + TQSize +ScrollingLabel::tqsizeHint() const { return fontMetrics().boundingRect(d->text).size(); } - QSize -ScrollingLabel::minimumSizeHint() const + TQSize +ScrollingLabel::tqminimumSizeHint() const { return TQSize(0, fontMetrics().height()); } - QString + TQString ScrollingLabel::text() const { return d->text; diff --git a/noatun/library/stereobuttonaction.cpp b/noatun/library/stereobuttonaction.cpp index e8df0046..7d5d3936 100644 --- a/noatun/library/stereobuttonaction.cpp +++ b/noatun/library/stereobuttonaction.cpp @@ -3,28 +3,28 @@ namespace NoatunStdAction { -StereoButtonAction::StereoButtonAction(const TQString& text, int accel, TQObject* parent, const char* name ) - : KAction(text, accel, parent, name) +StereoButtonAction::StereoButtonAction(const TQString& text, int accel, TQObject* tqparent, const char* name ) + : KAction(text, accel, tqparent, name) {} -StereoButtonAction::StereoButtonAction(const TQString& text, int accel, const TQObject* receiver, const char* slot, TQObject* parent, const char* name ) - : KAction(text, accel, receiver, slot, parent, name) +StereoButtonAction::StereoButtonAction(const TQString& text, int accel, const TQObject* receiver, const char* slot, TQObject* tqparent, const char* name ) + : KAction(text, accel, receiver, slot, tqparent, name) {} -StereoButtonAction::StereoButtonAction(const TQString& text, const TQIconSet& pix, int accel, TQObject* parent, const char* name ) - : KAction(text, pix, accel, parent, name) +StereoButtonAction::StereoButtonAction(const TQString& text, const TQIconSet& pix, int accel, TQObject* tqparent, const char* name ) + : KAction(text, pix, accel, tqparent, name) {} -StereoButtonAction::StereoButtonAction(const TQString& text, const TQString& pix, int accel, TQObject* parent, const char* name ) - : KAction(text, pix, accel, parent, name) +StereoButtonAction::StereoButtonAction(const TQString& text, const TQString& pix, int accel, TQObject* tqparent, const char* name ) + : KAction(text, pix, accel, tqparent, name) {} -StereoButtonAction::StereoButtonAction(const TQString& text, const TQIconSet& pix, int accel, const TQObject* receiver, const char* slot, TQObject* parent, const char* name ) - : KAction(text, pix, accel, receiver, slot, parent, name) +StereoButtonAction::StereoButtonAction(const TQString& text, const TQIconSet& pix, int accel, const TQObject* receiver, const char* slot, TQObject* tqparent, const char* name ) + : KAction(text, pix, accel, receiver, slot, tqparent, name) {} -StereoButtonAction::StereoButtonAction(const TQString& text, const TQString& pix, int accel, const TQObject* receiver, const char* slot, TQObject* parent, const char* name ) - : KAction(text, pix, accel, receiver, slot, parent, name) +StereoButtonAction::StereoButtonAction(const TQString& text, const TQString& pix, int accel, const TQObject* receiver, const char* slot, TQObject* tqparent, const char* name ) + : KAction(text, pix, accel, receiver, slot, tqparent, name) {} void StereoButtonAction::disable(void) diff --git a/noatun/library/titleproxy.cpp b/noatun/library/titleproxy.cpp index ee62863c..bda84b18 100644 --- a/noatun/library/titleproxy.cpp +++ b/noatun/library/titleproxy.cpp @@ -157,11 +157,11 @@ void Proxy::sendRequest() //SLOT "%3" "%4" "\r\n" ) - .arg( m_url.path( -1 ).isEmpty() ? "/" : m_url.path( -1 ) ) - .arg( m_url.host() ) - .arg( m_icyMode ? TQString( "Icy-MetaData:1\r\n" ) : TQString::null ) - .arg( auth ? TQString( "Authorization: Basic " ).append( authString ) : TQString::null ) - .arg( NOATUN_VERSION ); + .tqarg( m_url.path( -1 ).isEmpty() ? "/" : m_url.path( -1 ) ) + .tqarg( m_url.host() ) + .tqarg( m_icyMode ? TQString( "Icy-MetaData:1\r\n" ) : TQString() ) + .tqarg( auth ? TQString( "Authorization: Basic " ).append( authString ) : TQString() ) + .tqarg( NOATUN_VERSION ); m_sockRemote.writeBlock( request.latin1(), request.length() ); @@ -172,9 +172,9 @@ void Proxy::sendRequest() //SLOT void Proxy::readRemote() //SLOT { m_connectSuccess = true; - Q_LONG index = 0; - Q_LONG bytesWrite = 0; - Q_LONG bytesRead = m_sockRemote.readBlock( m_pBuf, BUFSIZE ); + TQ_LONG index = 0; + TQ_LONG bytesWrite = 0; + TQ_LONG bytesRead = m_sockRemote.readBlock( m_pBuf, BUFSIZE ); if ( bytesRead == -1 ) { kdDebug(66666) << k_funcinfo << "Could not read remote data from socket, aborting" << endl; @@ -246,7 +246,7 @@ void Proxy::connectError() //SLOT // PRIVATE ////////////////////////////////////////////////////////////////////////////////////////// -bool Proxy::processHeader( Q_LONG &index, Q_LONG bytesRead ) +bool Proxy::processHeader( TQ_LONG &index, TQ_LONG bytesRead ) { while ( index < bytesRead ) { @@ -258,11 +258,11 @@ bool Proxy::processHeader( Q_LONG &index, Q_LONG bytesRead ) // Handle redirection TQString loc( "Location: " ); - int index = m_headerStr.find( loc ); + int index = m_headerStr.tqfind( loc ); if ( index >= 0 ) { int start = index + loc.length(); - int end = m_headerStr.find( "\n", index ); + int end = m_headerStr.tqfind( "\n", index ); m_url = m_headerStr.mid( start, end - start - 1 ); kdDebug(66666) << k_funcinfo << @@ -304,7 +304,7 @@ bool Proxy::processHeader( Q_LONG &index, Q_LONG bytesRead ) } } - if ( m_streamUrl.startsWith( "www.", true ) ) + if ( m_streamUrl.tqstartsWith( "www.", true ) ) m_streamUrl.prepend( "http://" ); m_sockProxy.writeBlock( m_headerStr.latin1(), m_headerStr.length() ); @@ -339,8 +339,8 @@ void Proxy::transmitData( const TQString &data ) emit metaData( m_streamName, m_streamGenre, m_streamUrl, m_bitRate, - extractStr(data, TQString::fromLatin1("StreamTitle")), - extractStr(data, TQString::fromLatin1("StreamUrl"))); + extractStr(data, TQString::tqfromLatin1("StreamTitle")), + extractStr(data, TQString::tqfromLatin1("StreamUrl"))); } @@ -360,15 +360,15 @@ void Proxy::error() TQString Proxy::extractStr( const TQString &str, const TQString &key ) { - int index = str.find( key, 0, true ); + int index = str.tqfind( key, 0, true ); if ( index == -1 ) { - return TQString::null; + return TQString(); } else { - index = str.find( "'", index ) + 1; - int indexEnd = str.find( "'", index ); + index = str.tqfind( "'", index ) + 1; + int indexEnd = str.tqfind( "'", index ); return str.mid( index, indexEnd - index ); } } diff --git a/noatun/library/titleproxy.h b/noatun/library/titleproxy.h index 7bbb3143..947ccff5 100644 --- a/noatun/library/titleproxy.h +++ b/noatun/library/titleproxy.h @@ -46,9 +46,10 @@ namespace TitleProxy * @short A proxy server for extracting metadata from Shoutcast streams. */ - class Proxy : public QObject + class Proxy : public TQObject { Q_OBJECT + TQ_OBJECT public: Proxy( KURL url ); ~Proxy(); @@ -74,7 +75,7 @@ namespace TitleProxy void connectError(); private: - bool processHeader( Q_LONG &index, Q_LONG bytesRead ); + bool processHeader( TQ_LONG &index, TQ_LONG bytesRead ); void transmitData( const TQString &data ); void error(); TQString extractStr( const TQString &str, const TQString &key ); @@ -108,13 +109,14 @@ namespace TitleProxy }; - class Server : public QServerSocket + class Server : public TQServerSocket { Q_OBJECT + TQ_OBJECT public: - Server( Q_UINT16 port, TQObject* parent ) - : TQServerSocket( port, 1, parent, "TitleProxyServer" ) {}; + Server( TQ_UINT16 port, TQObject* tqparent ) + : TQServerSocket( port, 1, tqparent, "TitleProxyServer" ) {}; signals: void connected( int socket ); diff --git a/noatun/library/vequalizer.cpp b/noatun/library/vequalizer.cpp index c081d84b..a61e3eec 100644 --- a/noatun/library/vequalizer.cpp +++ b/noatun/library/vequalizer.cpp @@ -4,7 +4,7 @@ * This file is hereby licensed under the GNU General Public License version * 2 or later at your option. * - * This file is licensed under the Qt Public License version 1 with the + * This file is licensed under the TQt Public License version 1 with the * condition that the licensed will be governed under the Laws of California * (USA) instead of Norway. Disputes will be settled in Santa Clara county * courts. @@ -63,7 +63,7 @@ #include <math.h> #define EQ (napp->vequalizer()) -#define EQBACK (napp->player()->engine()->equalizer()) +#define ETQBACK (napp->player()->engine()->equalizer()) using std::vector; @@ -440,7 +440,7 @@ void VEqualizer::setBands(int num, bool interpolate) void VEqualizer::setPreamp(int preamp) { d->preamp = preamp; - EQBACK->preamp(pow(2,float(preamp)/100.0)); + ETQBACK->preamp(pow(2,float(preamp)/100.0)); emit changed(); emit preampChanged(); emit preampChanged(preamp); @@ -483,7 +483,7 @@ int VEqualizer::bands() const bool VEqualizer::isEnabled() const { - return bool(EQBACK->enabled()); + return bool(ETQBACK->enabled()); } int VEqualizer::preamp() const @@ -534,7 +534,7 @@ void VEqualizer::setLevels(const TQValueList<int> &levels) void VEqualizer::setEnabled(bool e) { update(true); // just in case - EQBACK->enabled((long)e); + ETQBACK->enabled((long)e); KConfig *config=kapp->config(); config->setGroup("Equalizer"); config->writeEntry("enabled", e); @@ -565,9 +565,9 @@ void VEqualizer::update(bool full) } } if (full) - EQBACK->set(levels, mids, widths); + ETQBACK->set(levels, mids, widths); else - EQBACK->levels(levels); + ETQBACK->levels(levels); } @@ -609,7 +609,7 @@ TQString VEqualizer::toString(const TQString &name) const { docElem.setAttribute("level", preamp()); docElem.setAttribute("name", name); - docElem.setAttribute("version", napp->version()); + docElem.setAttribute("version", TQString(napp->version())); } int bandc = bands(); @@ -764,7 +764,7 @@ VPreset VEqualizer::presetByFile(const TQString &file) KConfig *conf=KGlobal::config(); conf->setGroup("Equalizer"); TQStringList list=kapp->config()->readListEntry("presets"); - if (list.contains(file)) + if (list.tqcontains(file)) return VPreset(file); return VPreset(); } @@ -920,7 +920,7 @@ void VPreset::remove() emit EQ->removed(*this); - if (file().find(kapp->dirs()->localkdedir())==0) + if (file().tqfind(kapp->dirs()->localkdedir())==0) { TQFile f(file()); f.remove(); @@ -930,7 +930,7 @@ void VPreset::remove() #undef EQ -#undef EQBACK +#undef ETQBACK #include "vequalizer.moc" diff --git a/noatun/library/video.cpp b/noatun/library/video.cpp index 94646315..e009b044 100644 --- a/noatun/library/video.cpp +++ b/noatun/library/video.cpp @@ -24,8 +24,8 @@ struct VideoFrame::Private }; -VideoFrame::VideoFrame(KXMLGUIClient *clientParent, TQWidget *parent, const char*name, WFlags f) - : KVideoWidget(clientParent, parent, name, f) +VideoFrame::VideoFrame(KXMLGUIClient *clientParent, TQWidget *tqparent, const char*name, WFlags f) + : KVideoWidget(clientParent, tqparent, name, f) { d = new Private; connect(napp->player(), TQT_SIGNAL(newSong()), TQT_SLOT(changed())); @@ -33,8 +33,8 @@ VideoFrame::VideoFrame(KXMLGUIClient *clientParent, TQWidget *parent, const char frames.append(this); } -VideoFrame::VideoFrame(TQWidget *parent, const char *name, WFlags f) - : KVideoWidget(parent, name, f) +VideoFrame::VideoFrame(TQWidget *tqparent, const char *name, WFlags f) + : KVideoWidget(tqparent, name, f) { d = new Private; connect(napp->player(), TQT_SIGNAL(newSong()), TQT_SLOT(changed())); @@ -62,9 +62,9 @@ VideoFrame *VideoFrame::playing() return whose; } -TQPopupMenu *VideoFrame::popupMenu(TQWidget *parent) +TQPopupMenu *VideoFrame::popupMenu(TQWidget *tqparent) { - TQPopupMenu *view = new TQPopupMenu(parent); + TQPopupMenu *view = new TQPopupMenu(tqparent); action( "half_size" )->plug( view ); action( "normal_size" )->plug( view ); action( "double_size" )->plug( view ); @@ -122,7 +122,7 @@ GlobalVideo::GlobalVideo() menu = video->popupMenu(this); // FIXME: How to obtain minimum size for top-level widgets? -// video->setMinimumSize(minimumSizeHint()); +// video->setMinimumSize(tqminimumSizeHint()); // video->setMinimumSize(101,35); video->setMinimumSize(128,96); @@ -151,7 +151,7 @@ void GlobalVideo::hide() void GlobalVideo::mouseReleaseEvent(TQMouseEvent *e) { - if (e->button() == RightButton) + if (e->button() == Qt::RightButton) { menu->exec(mapToGlobal(e->pos())); } diff --git a/noatun/modules/artseffects/extrastereo_impl.cc b/noatun/modules/artseffects/extrastereo_impl.cc index 3dc92705..28b02d8e 100644 --- a/noatun/modules/artseffects/extrastereo_impl.cc +++ b/noatun/modules/artseffects/extrastereo_impl.cc @@ -134,7 +134,7 @@ public: intense.min(0); intense.max(5); intense.value(e.intensity()); - intense.parent(hbox); + intense.tqparent(hbox); intense.show(); connect(intense,"value_changed", e, "intensity"); diff --git a/noatun/modules/artseffects/extrastereogui_impl.cc b/noatun/modules/artseffects/extrastereogui_impl.cc index b5a19bf0..92148ba0 100644 --- a/noatun/modules/artseffects/extrastereogui_impl.cc +++ b/noatun/modules/artseffects/extrastereogui_impl.cc @@ -7,7 +7,7 @@ namespace Arts { ExtraStereoGUI_impl::ExtraStereoGUI_impl() : TQWidget(0) { (new TQHBoxLayout(this))->setAutoAdd(true); - mSlider=new TQSlider(0,100,10, 0, Horizontal, this); + mSlider=new TQSlider(0,100,10, 0,Qt::Horizontal, this); mSlider->show(); show(); } diff --git a/noatun/modules/excellent/userinterface.cpp b/noatun/modules/excellent/userinterface.cpp index dac6fbb3..86c4f500 100644 --- a/noatun/modules/excellent/userinterface.cpp +++ b/noatun/modules/excellent/userinterface.cpp @@ -67,12 +67,12 @@ Excellent::Excellent() { setAcceptDrops(true); - KStdAction::quit(napp, TQT_SLOT(quit()), actionCollection()); - KStdAction::open(napp, TQT_SLOT(fileOpen()), actionCollection()); + KStdAction::quit(TQT_TQOBJECT(napp), TQT_SLOT(quit()), actionCollection()); + KStdAction::open(TQT_TQOBJECT(napp), TQT_SLOT(fileOpen()), actionCollection()); setStandardToolBarMenuEnabled(true); - menubarAction = KStdAction::showMenubar(this, TQT_SLOT(showMenubar()), actionCollection()); - KStdAction::preferences(napp, TQT_SLOT(preferences()), actionCollection()); + menubarAction = KStdAction::showMenubar(TQT_TQOBJECT(this), TQT_SLOT(showMenubar()), actionCollection()); + KStdAction::preferences(TQT_TQOBJECT(napp), TQT_SLOT(preferences()), actionCollection()); // buttons NoatunStdAction::back(actionCollection(), "back"); @@ -82,7 +82,7 @@ Excellent::Excellent() NoatunStdAction::forward(actionCollection(), "forward"); NoatunStdAction::playlist(actionCollection(), "show_playlist"); - volumeAction = new KToggleAction(i18n("Show &Volume Control"), 0, this, TQT_SLOT(showVolumeControl()), actionCollection(), "show_volumecontrol"); + volumeAction = new KToggleAction(i18n("Show &Volume Control"), 0, TQT_TQOBJECT(this), TQT_SLOT(showVolumeControl()), actionCollection(), "show_volumecontrol"); volumeAction->setCheckedState(i18n("Hide &Volume Control")); NoatunStdAction::effects(actionCollection(), "effects"); NoatunStdAction::equalizer(actionCollection(), "equalizer"); @@ -94,11 +94,11 @@ Excellent::Excellent() napp->pluginActionMenu()->plug(menuBar(),3); toolBar("mainToolBar")->hide(); - // Who needs Qt Designer? + // Who needs TQt Designer? mainFrame = new TQHBox(this); mainFrame->setSpacing(KDialog::spacingHint()); mainFrame->setMargin(0); - slider = new L33tSlider(0, 1000, 10, 0, L33tSlider::Horizontal, mainFrame); + slider = new L33tSlider(0, 1000, 10, 0, Qt::Horizontal, mainFrame); slider->setTickmarks(TQSlider::NoMarks); elapsed = new TQLabel(mainFrame); @@ -107,10 +107,10 @@ Excellent::Excellent() labelFont.setBold(true); TQFontMetrics labelFontMetrics = labelFont; elapsed->setFont(labelFont); - elapsed->setAlignment(AlignCenter | AlignVCenter | ExpandTabs); + elapsed->tqsetAlignment(AlignCenter | AlignVCenter | ExpandTabs); elapsed->setText("--:--"); elapsed->setFixedHeight(labelFontMetrics.height()); - elapsed->setMinimumWidth(elapsed->sizeHint().width()); + elapsed->setMinimumWidth(elapsed->tqsizeHint().width()); // Doing this makes the slider the same heigh as the font. This is just plain wrong... //slider->setFixedHeight(labelFontMetrics.height()); @@ -121,9 +121,9 @@ Excellent::Excellent() labelFont = total->font(); labelFont.setBold(true); total->setFont(labelFont); - total->setAlignment(AlignCenter | AlignVCenter | ExpandTabs); + total->tqsetAlignment(AlignCenter | AlignVCenter | ExpandTabs); total->setText("--:--"); - total->setMinimumWidth(total->sizeHint().width()); + total->setMinimumWidth(total->tqsizeHint().width()); total->setText(""); statusBar()->addWidget(total, 0, true); @@ -186,7 +186,7 @@ Excellent::Excellent() break; } - for (TQPtrListIterator<TQObject> i(*children()); i.current(); ++i) + for (TQPtrListIterator<TQObject> i(childrenListObject()); i.current(); ++i) (*i)->installEventFilter(this); } @@ -248,7 +248,7 @@ bool Excellent::eventFilter(TQObject *o, TQEvent *e) { if (e->type() == TQEvent::Wheel) { - wheelEvent(static_cast<TQWheelEvent*>(e)); + wheelEvent(TQT_TQWHEELEVENT(e)); return true; } return TQWidget::eventFilter(o, e); @@ -335,7 +335,7 @@ void Excellent::showMenubar(void) } else { - KMessageBox::information(this, i18n("<qt>Press %1 to show the menubar.</qt>").arg(menubarAction->shortcut().toString()), TQString::null, "Hide Menu warning"); + KMessageBox::information(this, i18n("<qt>Press %1 to show the menubar.</qt>").tqarg(menubarAction->shortcut().toString()), TQString(), "Hide Menu warning"); menuBar()->hide(); } } @@ -373,7 +373,7 @@ void Excellent::handleLengthString(const TQString &text) void Excellent::growVolumeControl(void) { - volumeSlider = new L33tSlider(0, 100, 10, 0, Vertical, mainFrame); + volumeSlider = new L33tSlider(0, 100, 10, 0,Qt::Vertical, mainFrame); volumeSlider->setValue(100 - napp->player()->volume()); volumeSlider->show(); connect(volumeSlider, TQT_SIGNAL(sliderMoved(int)), TQT_SLOT(changeVolume(int))); diff --git a/noatun/modules/excellent/userinterface.h b/noatun/modules/excellent/userinterface.h index c6a958de..72628430 100644 --- a/noatun/modules/excellent/userinterface.h +++ b/noatun/modules/excellent/userinterface.h @@ -50,6 +50,7 @@ class KToggleAction; class Excellent : public KMainWindow, public UserInterface { Q_OBJECT + TQ_OBJECT public: Excellent(); diff --git a/noatun/modules/htmlexport/htmlexport.cpp b/noatun/modules/htmlexport/htmlexport.cpp index 29d00935..d8a04537 100644 --- a/noatun/modules/htmlexport/htmlexport.cpp +++ b/noatun/modules/htmlexport/htmlexport.cpp @@ -36,7 +36,7 @@ void HTMLExport::slotExport() config->setGroup("HTMLExport"); // get output target - KURL url = KFileDialog::getSaveURL(TQString::null, + KURL url = KFileDialog::getSaveURL(TQString(), "text/html", 0, i18n("Export Playlist")); @@ -136,9 +136,9 @@ TQString HTMLExport::htmlEscape(const TQString &source) { // Escape characters that need to be escaped TQString temp = source; - temp.replace( TQRegExp("&"), "&" ); - temp.replace( TQRegExp("<"), "<" ); - temp.replace( TQRegExp(">"), ">" ); + temp.tqreplace( TQRegExp("&"), "&" ); + temp.tqreplace( TQRegExp("<"), "<" ); + temp.tqreplace( TQRegExp(">"), ">" ); return temp; } @@ -171,8 +171,8 @@ TQString HTMLExport::getColorByEntry(TQString s) } //////////////////////////////////// Settings //////////////////////////////////// -Prefs::Prefs(TQObject *parent) - : CModule(i18n("Playlist Export"), i18n("Colors & Settings for HTML Export"), "html", parent) +Prefs::Prefs(TQObject *tqparent) + : CModule(i18n("Playlist Export"), i18n("Colors & Settings for HTML Export"), "html", tqparent) { // Init Config @@ -213,19 +213,19 @@ Prefs::Prefs(TQObject *parent) txtColorLabel = new TQLabel( colorBox, "txtColorLabel" ); txtColorLabel->setText( i18n( "Text:" ) ); - txtColorLabel->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) ); + txtColorLabel->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) ); bgColorLabel = new TQLabel( colorBox, "bgColorLabel" ); bgColorLabel->setText( i18n( "Background:" ) ); - bgColorLabel->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) ); + bgColorLabel->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) ); headColorLabel = new TQLabel( colorBox, "headColorLabel" ); headColorLabel->setText( i18n( "Heading:" ) ); - headColorLabel->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) ); + headColorLabel->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) ); hoverColorLabel = new TQLabel( colorBox, "hoverColorLabel" ); hoverColorLabel->setText( i18n( "Link hover:" ) ); - hoverColorLabel->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) ); + hoverColorLabel->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) ); bgcolorLabel->setRowStretch(0, 1); diff --git a/noatun/modules/htmlexport/htmlexport.h b/noatun/modules/htmlexport/htmlexport.h index 81047d3d..65f5c5e9 100644 --- a/noatun/modules/htmlexport/htmlexport.h +++ b/noatun/modules/htmlexport/htmlexport.h @@ -34,6 +34,7 @@ class KAction; class HTMLExport : public TQObject, public Plugin { Q_OBJECT + TQ_OBJECT NOATUNPLUGIND public: HTMLExport(); @@ -54,8 +55,9 @@ private slots: class Prefs : public CModule { Q_OBJECT + TQ_OBJECT public: - Prefs(TQObject *parent); + Prefs(TQObject *tqparent); virtual void save(); virtual void reopen(); diff --git a/noatun/modules/infrared/infrared.cpp b/noatun/modules/infrared/infrared.cpp index c9b31230..1bfe0aae 100644 --- a/noatun/modules/infrared/infrared.cpp +++ b/noatun/modules/infrared/infrared.cpp @@ -93,11 +93,11 @@ void InfraRed::slotCommand(const TQString &remote, const TQString &button, int r break; case IRPrefs::SeekBackward: // - 3 seconds - napp->player()->skipTo( QMAX(0, napp->player()->getTime() - 3000) ); + napp->player()->skipTo( TQMAX(0, napp->player()->getTime() - 3000) ); break; case IRPrefs::SeekForward: // + 3 seconds - napp->player()->skipTo( QMIN(napp->player()->getLength(), + napp->player()->skipTo( TQMIN(napp->player()->getLength(), napp->player()->getTime() + 3000) ); break; case IRPrefs::ShowPlaylist: diff --git a/noatun/modules/infrared/infrared.h b/noatun/modules/infrared/infrared.h index 870efbd5..cb58ff82 100644 --- a/noatun/modules/infrared/infrared.h +++ b/noatun/modules/infrared/infrared.h @@ -11,6 +11,7 @@ class Lirc; class InfraRed : public TQObject, public Plugin { Q_OBJECT + TQ_OBJECT NOATUNPLUGIND public: InfraRed(); diff --git a/noatun/modules/infrared/infrared.plugin b/noatun/modules/infrared/infrared.plugin index dab20149..4074e6b0 100644 --- a/noatun/modules/infrared/infrared.plugin +++ b/noatun/modules/infrared/infrared.plugin @@ -101,7 +101,7 @@ Comment[nds]=Noatun mit Dien Infraroot-Feernbedenen stüern Comment[ne]=तपाईà¤à¤•à¥‹ IR टाढाकोसà¤à¤— नियनà¥à¤¤à¥à¤°à¤£ नोवटà¥à¤¨ Comment[nl]=Bedien Noatun met uw infrarood afstandbediening Comment[nn]=Styr Noatun med ein infraraud fjernkontroll -Comment[pl]=Sterowanie Noatun za pomocÄ… pilota podczerwieni +Comment[pl]=Sterowanie Noatun za potqmocÄ… pilota podczerwieni Comment[pt]=Controle o Noatun com um comando à distância Comment[pt_BR]=Controlar o Noatun com seu controle-remoto infravermelho Comment[ro]=Controlează Noatun cu telecomanda în infraroÅŸu diff --git a/noatun/modules/infrared/irprefs.cpp b/noatun/modules/infrared/irprefs.cpp index 548fd27d..52cae0ea 100644 --- a/noatun/modules/infrared/irprefs.cpp +++ b/noatun/modules/infrared/irprefs.cpp @@ -14,13 +14,13 @@ #include "irprefs.h" #include "lirc.h" -class CommandItem : public QListViewItem +class CommandItem : public TQListViewItem { public: CommandItem(TQListViewItem *remote, const TQString &name, IRPrefs::Action action, int interval) : TQListViewItem(remote, name, IRPrefs::actionName(action), - interval ? TQString().setNum(interval) : TQString::null), + interval ? TQString().setNum(interval) : TQString()), m_name(remote->text(0) + "::" + name), m_action(action), m_interval(interval) @@ -37,7 +37,7 @@ public: } void setInterval(int interval) { - setText(2, interval ? TQString().setNum(interval) : TQString::null); + setText(2, interval ? TQString().setNum(interval) : TQString()); m_interval = interval; } @@ -51,38 +51,38 @@ Lirc *IRPrefs::s_lirc = 0; bool IRPrefs::s_configRead = false; TQMap<TQString, IRPrefs::Command> IRPrefs::s_commands; -IRPrefs::IRPrefs(TQObject *parent) - : CModule(i18n("Infrared Control"), i18n("Configure Infrared Commands"), "remote", parent) +IRPrefs::IRPrefs(TQObject *tqparent) + : CModule(i18n("Infrared Control"), i18n("Configure Infrared Commands"), "remote", tqparent) { - TQGridLayout *layout = new TQGridLayout(this, 3, 5, KDialog::marginHint(), KDialog::spacingHint()); - layout->setColStretch(1, 1); + TQGridLayout *tqlayout = new TQGridLayout(this, 3, 5, KDialog::marginHint(), KDialog::spacingHint()); + tqlayout->setColStretch(1, 1); TQLabel *label = new TQLabel(i18n("Remote control &commands:"), this); - layout->addMultiCellWidget(label, 0, 0, 0, 4); + tqlayout->addMultiCellWidget(label, 0, 0, 0, 4); label->setBuddy(m_commands = new KListView(this)); - layout->addMultiCellWidget(m_commands, 1, 1, 0, 4); + tqlayout->addMultiCellWidget(m_commands, 1, 1, 0, 4); label = new TQLabel(i18n("&Action:"), this); - layout->addWidget(label, 2, 0); + tqlayout->addWidget(label, 2, 0); label->setBuddy(m_action = new KComboBox(this)); m_action->setEnabled(false); - layout->addWidget(m_action, 2, 1); + tqlayout->addWidget(m_action, 2, 1); m_repeat = new TQCheckBox(i18n("&Repeat"), this); m_repeat->setEnabled(false); - layout->addWidget(m_repeat, 2, 2); + tqlayout->addWidget(m_repeat, 2, 2); label = new TQLabel(i18n("&Interval:"), this); - layout->addWidget(label, 2, 3); + tqlayout->addWidget(label, 2, 3); label->setBuddy(m_interval = new KIntSpinBox(this)); m_interval->setMinValue(1); m_interval->setMaxValue(0xff); m_interval->setValue(10); m_interval->setEnabled(false); - layout->addWidget(m_interval, 2, 4); + tqlayout->addWidget(m_interval, 2, 4); connect(s_lirc, TQT_SIGNAL(remotesRead()), TQT_SLOT(reopen())); connect(m_commands, @@ -109,9 +109,9 @@ void IRPrefs::save() int i = 1; for (TQMap<TQString, Command>::ConstIterator it = s_commands.begin(); it != s_commands.end(); ++it) { - c->writePathEntry(TQString("Command_%1").arg(i), it.key()); - c->writeEntry(TQString("Action_%1").arg(i), (int)((*it).action)); - c->writeEntry(TQString("Interval_%1").arg(i), (*it).interval); + c->writePathEntry(TQString("Command_%1").tqarg(i), it.key()); + c->writeEntry(TQString("Action_%1").tqarg(i), (int)((*it).action)); + c->writeEntry(TQString("Interval_%1").tqarg(i), (*it).interval); ++i; } } @@ -152,7 +152,7 @@ void IRPrefs::reopen() for (TQStringList::ConstIterator btn = buttons.begin(); btn != buttons.end(); ++btn) { TQString key = *it + "::" + *btn; - if (s_commands.contains(key)) + if (s_commands.tqcontains(key)) new CommandItem(remote, *btn, s_commands[key].action, s_commands[key].interval); else new CommandItem(remote, *btn, None, 0); @@ -275,7 +275,7 @@ const TQString IRPrefs::actionName(Action action) case PreviousSection: return i18n("Previous Section"); } - return TQString::null; + return TQString(); } void IRPrefs::readConfig() @@ -288,9 +288,9 @@ void IRPrefs::readConfig() for (int i = 1; i <= count; ++i) { Command cmd; - cmd.action = (Action)(c->readNumEntry(TQString("Action_%1").arg(i))); - cmd.interval = c->readNumEntry(TQString("Interval_%1").arg(i)); - s_commands.insert(c->readPathEntry(TQString("Command_%1").arg(i)), cmd); + cmd.action = (Action)(c->readNumEntry(TQString("Action_%1").tqarg(i))); + cmd.interval = c->readNumEntry(TQString("Interval_%1").tqarg(i)); + s_commands.insert(c->readPathEntry(TQString("Command_%1").tqarg(i)), cmd); } s_configRead = true; } diff --git a/noatun/modules/infrared/irprefs.h b/noatun/modules/infrared/irprefs.h index 925acaa0..69d7f41f 100644 --- a/noatun/modules/infrared/irprefs.h +++ b/noatun/modules/infrared/irprefs.h @@ -15,6 +15,7 @@ class Lirc; class IRPrefs : public CModule { Q_OBJECT + TQ_OBJECT public: enum Action { @@ -24,7 +25,7 @@ public: NextSection, PreviousSection }; - IRPrefs(TQObject *parent); + IRPrefs(TQObject *tqparent); virtual void save(); diff --git a/noatun/modules/infrared/lirc.cpp b/noatun/modules/infrared/lirc.cpp index 363849c1..731bb5c1 100644 --- a/noatun/modules/infrared/lirc.cpp +++ b/noatun/modules/infrared/lirc.cpp @@ -12,8 +12,8 @@ #include "lirc.h" -Lirc::Lirc(TQObject *parent) - : TQObject(parent), +Lirc::Lirc(TQObject *tqparent) + : TQObject(tqparent), m_socket(0) { int sock = ::socket(PF_UNIX, SOCK_STREAM, 0); @@ -124,7 +124,7 @@ void Lirc::slotRead() { // <code> <repeat> <button name> <remote control name> line.remove(0, 17); // strip code - int pos = line.find(' '); + int pos = line.tqfind(' '); if (pos < 0) return; bool ok; @@ -133,7 +133,7 @@ void Lirc::slotRead() return; line.remove(0, pos + 1); - pos = line.find(' '); + pos = line.tqfind(' '); if (pos < 0) return; TQString btn = line.left(pos); @@ -153,11 +153,11 @@ void Lirc::update() const TQString Lirc::readLine() { if (!m_socket->bytesAvailable()) - return TQString::null; + return TQString(); TQString line = m_socket->readLine(); if (line.isEmpty()) - return TQString::null; + return TQString(); line.remove(line.length() - 1, 1); return line; diff --git a/noatun/modules/infrared/lirc.h b/noatun/modules/infrared/lirc.h index 8519bb8a..5f30d751 100644 --- a/noatun/modules/infrared/lirc.h +++ b/noatun/modules/infrared/lirc.h @@ -10,14 +10,15 @@ class TQSocket; typedef TQMap<TQString, TQStringList> Remotes; -class Lirc : public QObject +class Lirc : public TQObject { Q_OBJECT + TQ_OBJECT public: /** * Constructor */ - Lirc(TQObject *parent); + Lirc(TQObject *tqparent); /** * Destructor */ diff --git a/noatun/modules/kaiman/SKIN-SPECS b/noatun/modules/kaiman/SKIN-SPECS index bc3533ad..5d30b733 100644 --- a/noatun/modules/kaiman/SKIN-SPECS +++ b/noatun/modules/kaiman/SKIN-SPECS @@ -37,7 +37,7 @@ if the play button was 30 by 20, the resulting image file would be Note that images for buttons and numbers contain the items horizontally, the images for items contain the items vertically, the image for a font -contains 3 rows of 32 items, and the slider contains the background and +tqcontains 3 rows of 32 items, and the slider contains the background and handle horizontally or vertically (depending if a slider is horizontal or verticle, respectivley). @@ -56,7 +56,7 @@ options in the event that options are added to the skin spec in the future. PROPER TRANSPARENCY: The main background image uses a threshold of 1 (out of 256 levels) for the -window shape, the rest is used for partially overwiting the background when +window tqshape, the rest is used for partially overwiting the background when the Transparency option is true. Portions of items, buttons, sliders, numbers, and text that never change and @@ -80,7 +80,7 @@ Background: filename filename The background image file, the window will be the same size as this image. - Add transparency to this image for shaped skins, the cutoff threshold for + Add transparency to this image for tqshaped skins, the cutoff threshold for transparency is 1 on images with muli-level alpha (like in png). Transparency: flag @@ -95,8 +95,8 @@ Mask: filename (this is DEPRECATED!, for transparent skins just add transparency to the Background image, Mask remains merely for backwards compatibility) filename - The mask image file, only needed for skins which are shaped windows (not - rectangular). Contains a transparency mask for the main window. + The tqmask image file, only needed for skins which are tqshaped windows (not + rectangular). Contains a transparency tqmask for the main window. ========================== Text display @@ -125,7 +125,7 @@ Title/Album/Artist/Genre: filename length [extended] x y extended (optional, absence defaults to FALSE) - When TRUE, the image contains 3 additional lines for internation + When TRUE, the image tqcontains 3 additional lines for internation characters. The result is 6 lines of 32 characters each. ========================== @@ -151,9 +151,9 @@ Play/Pause/Stop/Shuffle/Repeat/ clip_filename (optional) When specified, defines an image with transparency to be used as the button's - draw clip mask. The clip mask is placed at location x, y The transparency is used to + draw clip tqmask. The clip tqmask is placed at location x, y The transparency is used to indicate the portions of the button that should be visible (drawn) and respond to - mouse clicks. If the image contains a multiple level alpha channel, the mask is reduced + mouse clicks. If the image contains a multiple level alpha channel, the tqmask is reduced such that levels above 50% are visible and those below 50% are not visible. ========================== @@ -175,9 +175,9 @@ Preset_1_/.../Preset_10_Button: filename prelight x y [clip_filename] clip_filename (optional) When specified, defines an image with transparency to be used as the button's - draw clip mask. The clip mask is placed at location x, y The transparency is used to + draw clip tqmask. The clip tqmask is placed at location x, y The transparency is used to indicate the portions of the button that should be visible (drawn) and respond to - mouse clicks. If the image contains a multiple level alpha channel, the mask is reduced + mouse clicks. If the image contains a multiple level alpha channel, the tqmask is reduced such that levels above 50% are visible and those below 50% are not visible. @@ -185,7 +185,7 @@ Preset_1_/.../Preset_10_Button: filename prelight x y [clip_filename] Items (with fixed number sections) ========================== -Stereo/Shuffle/Repeat/Mpegversion/Mpeglayer/Mpegmode/Status/ +Stereo/Shuffle/Repeat/Mpegversion/Mpeglayer/Mpegmode/tqStatus/ Minus/Total_Item: filename x y filename @@ -247,7 +247,7 @@ Digit_Large/Digit_Small_Default: filename Image file. Contains digits horizontally from 0 to 9, and a blank space. These two digits are a convenience function, if you want to use a digit more than - once it is quicker to load it into on of these two slots. Then when using the digit + once it is quicker to load it into on of these two Q_SLOTS. Then when using the digit in the number item type below, use the words 'Large' or 'Small' in place of the filename. @@ -354,15 +354,15 @@ Position/Volume/Balance_Dial: filename has_press_image has_prelight_image revers x, y, width, height: Marks the clipping region to draw the dial, basically the handle is not drawn - outside this region. (width and height will be ignored if a clip mask image + outside this region. (width and height will be ignored if a clip tqmask image is specified (see next option). clip_filename (optional) When specified, defines an image with transparency to be used as the dial's - draw clip mask. The clip mask is placed at x, y (above) and the image's dimensions + draw clip tqmask. The clip tqmask is placed at x, y (above) and the image's dimensions are used in place of width, height (above). The transparency is used to indicate the portions of the dial that should be visible (drawn) and respond to mouse clicks. - If the image contains a multiple level alpha channel, the mask is reduced such that + If the image contains a multiple level alpha channel, the tqmask is reduced such that levels above 50% are visible and those below 50% are not visible. ============================================================================== @@ -401,7 +401,7 @@ Option line: | # images | Normal | Pressed | Prelit | Items (all item images contained vertically) -------------------------- -Stereo/Shuffle/Repeat/Mpegversion/Mpeglayer/Mpegmode/Status/Minus/Total_Item: filename x y +Stereo/Shuffle/Repeat/Mpegversion/Mpeglayer/Mpegmode/tqStatus/Minus/Total_Item: filename x y Item: | # images | Image 1 | Image 2 | Image 3 | Image 4 | Image 5 | | total | | | | | | diff --git a/noatun/modules/kaiman/pref.cpp b/noatun/modules/kaiman/pref.cpp index 5f241bc0..a318dbb6 100644 --- a/noatun/modules/kaiman/pref.cpp +++ b/noatun/modules/kaiman/pref.cpp @@ -31,8 +31,8 @@ #include "userinterface.h" -KaimanPrefDlg::KaimanPrefDlg(TQObject *parent ) - : CModule(i18n("Kaiman Skins"), i18n("Skin Selection for the Kaiman Plugin"), "style", parent) +KaimanPrefDlg::KaimanPrefDlg(TQObject *tqparent ) + : CModule(i18n("Kaiman Skins"), i18n("Skin Selection for the Kaiman Plugin"), "style", tqparent) { // create widgets TQVBoxLayout *topLayout = new TQVBoxLayout( this, 6, 11 ); @@ -76,7 +76,7 @@ void KaimanPrefDlg::reopen() KConfig *config=KGlobal::config(); config->setGroup("Kaiman"); TQString skin = config->readEntry( "SkinResource", Kaiman::DEFAULT_SKIN ); - TQListBoxItem *item = _skinList->findItem( skin ); + TQListBoxItem *item = _skinList->tqfindItem( skin ); if ( item ) _skinList->setCurrentItem( item ); else @@ -86,7 +86,7 @@ void KaimanPrefDlg::reopen() void KaimanPrefDlg::setSkin( TQString skin ) { - _skinList->setCurrentItem( _skinList->findItem( skin ) ); + _skinList->setCurrentItem( _skinList->tqfindItem( skin ) ); } @@ -104,8 +104,8 @@ void KaimanPrefDlg::readSkinDir( const TQString &dir ) if (!directory.exists()) return; - const QFileInfoList *list = directory.entryInfoList(); - QFileInfoListIterator it(*list); + const TQFileInfoList *list = directory.entryInfoList(); + TQFileInfoListIterator it(*list); while ( it.current() ) { kdDebug() << it.current()->absFilePath() << endl; diff --git a/noatun/modules/kaiman/pref.h b/noatun/modules/kaiman/pref.h index d252e394..dbdf935b 100644 --- a/noatun/modules/kaiman/pref.h +++ b/noatun/modules/kaiman/pref.h @@ -27,8 +27,9 @@ class TQLabel; class KaimanPrefDlg : public CModule { Q_OBJECT + TQ_OBJECT public: - KaimanPrefDlg( TQObject *parent ); + KaimanPrefDlg( TQObject *tqparent ); virtual ~KaimanPrefDlg(); virtual void save(); diff --git a/noatun/modules/kaiman/skins/circle/README b/noatun/modules/kaiman/skins/circle/README index d80082af..f2071dca 100644 --- a/noatun/modules/kaiman/skins/circle/README +++ b/noatun/modules/kaiman/skins/circle/README @@ -3,8 +3,8 @@ Author: Johne Ellis <gqview@geocities.ocm> Released: November 25, 1998 Version: 1.0 URL: http://www.geocities.com/SiliconValley/Haven/5235 -Comments: Skin with a doughnut shape to test shaped windows. - (skins with a shape mask) +Comments: Skin with a doughnut tqshape to test tqshaped windows. + (skins with a tqshape tqmask) Note: For transparency to work, GQmpeg 0.4.2 is required. Previous versions will work, but will be _ugly_. diff --git a/noatun/modules/kaiman/skins/circle/skindata b/noatun/modules/kaiman/skins/circle/skindata index 25268d22..57c07cc6 100644 --- a/noatun/modules/kaiman/skins/circle/skindata +++ b/noatun/modules/kaiman/skins/circle/skindata @@ -6,16 +6,16 @@ #Released: November 25, 1998 #Author: John Ellis <gqview@geocities.com> #URL: http://www.geocities.com/SiliconValley/Haven/5235/ -#Comments: Skin with a doughnut shape to test shaped windows. -# (skins with a shape mask) +#Comments: Skin with a doughnut tqshape to test tqshaped windows. +# (skins with a tqshape tqmask) #run 'gqmpeg -skinhelp' for help with coordinates. #simply comment out items you do not want to display #only Background is required. Background: back.png -#Mask is an image with transparency used to define a shaped window -Mask: back_mask.png +#Mask is an image with transparency used to define a tqshaped window +Mask: back_tqmask.png #Title: filename length x y Title: letters.png 23 32 86 diff --git a/noatun/modules/kaiman/skins/circle/skindata_alt b/noatun/modules/kaiman/skins/circle/skindata_alt index fb3e97f5..0bfda442 100644 --- a/noatun/modules/kaiman/skins/circle/skindata_alt +++ b/noatun/modules/kaiman/skins/circle/skindata_alt @@ -6,16 +6,16 @@ #Released: November 25, 1998 #Author: John Ellis <gqview@geocities.com> #URL: http://www.geocities.com/SiliconValley/Haven/5235/ -#Comments: Skin with a doughnut shape to test shaped windows. -# (skins with a shape mask) +#Comments: Skin with a doughnut tqshape to test tqshaped windows. +# (skins with a tqshape tqmask) #run 'gqmpeg -skinhelp' for help with coordinates. #simply comment out items you do not want to display #only Background is required. Background: back_sm.png -#Mask is an image with transparency used to define a shaped window -Mask: back_sm_mask.png +#Mask is an image with transparency used to define a tqshaped window +Mask: back_sm_tqmask.png #Title: filename length x y Title: letters.png 21 8 4 diff --git a/noatun/modules/kaiman/skins/k9/skindata b/noatun/modules/kaiman/skins/k9/skindata index 1fdc4320..d7d25a56 100644 --- a/noatun/modules/kaiman/skins/k9/skindata +++ b/noatun/modules/kaiman/skins/k9/skindata @@ -10,7 +10,7 @@ ###################################################### Background: knine-normal2.jpg -Mask: mask.png +Mask: tqmask.png Play_Button: play.jpg FALSE FALSE 55 133 89 166 Stop_Button: stop.jpg FALSE FALSE 28 124 52 145 diff --git a/noatun/modules/kaiman/style.cpp b/noatun/modules/kaiman/style.cpp index 6b700230..621b0240 100644 --- a/noatun/modules/kaiman/style.cpp +++ b/noatun/modules/kaiman/style.cpp @@ -42,8 +42,8 @@ const bool KaimanStyleSlider::optionVertical = 1; const bool KaimanStyleSlider::optionReversed = 2; const bool KaimanStyleText::optionExtended = 1; -KaimanStyleElement::KaimanStyleElement(TQWidget *parent, const char *name) - : TQWidget(parent, name) +KaimanStyleElement::KaimanStyleElement(TQWidget *tqparent, const char *name) + : TQWidget(tqparent, name) { // Initialize everything to default values filename = ""; @@ -118,15 +118,15 @@ void KaimanStyleElement::loadPixmaps(TQString &val_s_filename) int w = (x==0) ? firstWidth : width; TQPixmap *part = new TQPixmap(w,h,pixmap.depth()); - part->fill(Qt::black); + part->fill(TQt::black); bitBlt(part,0,0,&pixmap,sourcex,sourcey,w,h); pixmaps.insert(i,part); - if(pixmap.mask()) + if(pixmap.tqmask()) { - TQBitmap maskpart(w,h); - bitBlt(&maskpart,0,0,pixmap.mask(),sourcex,sourcey,w,h); - part->setMask(maskpart); + TQBitmap tqmaskpart(w,h); + bitBlt(&tqmaskpart,0,0,pixmap.tqmask(),sourcex,sourcey,w,h); + part->setMask(tqmaskpart); } i++; @@ -142,7 +142,7 @@ void KaimanStyleElement::loadPixmaps(TQString &val_s_filename) for ( int i=0; i<pixmapNum; i++ ) { TQPixmap *pm = new TQPixmap(10, 10); - pm->fill(Qt::black); + pm->fill(TQt::black); pixmaps.insert( i, pm ); } } @@ -160,7 +160,7 @@ void KaimanStyleElement::setPixmap( int num ) if ( num<0 ) num = 0; _currentPixmap = num; - repaint( FALSE ); + tqrepaint( FALSE ); } } @@ -186,14 +186,14 @@ void KaimanStyleElement::dragEnterEvent( TQDragEnterEvent *event ) void KaimanStyleElement::dropEvent( TQDropEvent *event ) { - ((Kaiman*)(parentWidget()->parentWidget()))->doDropEvent(event); + ((Kaiman*)(tqparentWidget()->tqparentWidget()))->doDropEvent(event); } /***************************************************************************/ -KaimanStyleButton::KaimanStyleButton(TQWidget *parent, const char *name) - : KaimanStyleMasked(parent, name) +KaimanStyleButton::KaimanStyleButton(TQWidget *tqparent, const char *name) + : KaimanStyleMasked(tqparent, name) { i_b_lit = i_b_prelit = i_b_down = false; i_i_currentState = NormalUp; @@ -321,14 +321,14 @@ void KaimanStyleButton::updateButtonState() { } setPixmap( *I_pmIndex[i_i_currentState] ); - repaint(); + tqrepaint(); } /***********************************************************************/ -KaimanStyleSlider::KaimanStyleSlider(int min, int max, TQWidget *parent, const char *name) - : KaimanStyleMasked( parent, name ) +KaimanStyleSlider::KaimanStyleSlider(int min, int max, TQWidget *tqparent, const char *name) + : KaimanStyleMasked( tqparent, name ) { _min = min; _max = max; @@ -349,7 +349,7 @@ void KaimanStyleSlider::setValue( int value ) if (value>_max) value=_max; if (value<_min) value=_min; _value = value; - repaint(); + tqrepaint(); } @@ -359,7 +359,7 @@ void KaimanStyleSlider::setValue( int value, int min, int max ) _min = min; _max = max; setValue( value ); - repaint(); + tqrepaint(); } } @@ -413,7 +413,7 @@ void KaimanStyleSlider::mouseReleaseEvent(TQMouseEvent *qme) { _down = false; releaseMouse(); - repaint(); + tqrepaint(); setValue( pos2value(qme->x(), qme->y()) ); emit newValue( value() ); @@ -465,7 +465,7 @@ void KaimanStyleSlider::enterEvent ( TQEvent * e ) if ( !_lit && optionPrelight ) { _lit = true; - repaint(); + tqrepaint(); } KaimanStyleMasked::enterEvent( e ); @@ -476,7 +476,7 @@ void KaimanStyleSlider::leaveEvent ( TQEvent * e ) if ( _lit ) { _lit = false; - repaint(); + tqrepaint(); } KaimanStyleMasked::leaveEvent( e ); @@ -486,8 +486,8 @@ void KaimanStyleSlider::leaveEvent ( TQEvent * e ) /***********************************************************************/ -KaimanStyleBackground::KaimanStyleBackground(TQWidget *parent, const char *name) - : KaimanStyleMasked( parent, name ) +KaimanStyleBackground::KaimanStyleBackground(TQWidget *tqparent, const char *name) + : KaimanStyleMasked( tqparent, name ) { i_b_move = false; } @@ -511,8 +511,8 @@ void KaimanStyleBackground::mouseMoveEvent(TQMouseEvent *qme) } if ( i_b_move ) { - TQWidget *p = parentWidget()->parentWidget(); - if ( !p ) p = parentWidget(); + TQWidget *p = tqparentWidget()->tqparentWidget(); + if ( !p ) p = tqparentWidget(); p->move( qme->globalPos() - i_point_dragStart ); } @@ -522,7 +522,7 @@ void KaimanStyleBackground::mouseMoveEvent(TQMouseEvent *qme) void KaimanStyleBackground::mousePressEvent(TQMouseEvent *qme) { - // On the background we move the shaped toplevel around + // On the background we move the tqshaped toplevel around if (!i_b_move) { i_point_dragStart = qme->pos(); i_point_lastPos = qme->globalPos(); @@ -533,8 +533,8 @@ void KaimanStyleBackground::mousePressEvent(TQMouseEvent *qme) /***********************************************************************/ -KaimanStyleValue::KaimanStyleValue(int min, int max, TQWidget *parent, const char *name) - : KaimanStyleMasked( parent, name ) +KaimanStyleValue::KaimanStyleValue(int min, int max, TQWidget *tqparent, const char *name) + : KaimanStyleMasked( tqparent, name ) { _min = min; _max = max; @@ -571,8 +571,8 @@ void KaimanStyleValue::setValue( int value, int min, int max ) /***********************************************************************/ -KaimanStyleNumber::KaimanStyleNumber(TQWidget *parent, const char *name) - : KaimanStyleElement( parent, name ) +KaimanStyleNumber::KaimanStyleNumber(TQWidget *tqparent, const char *name) + : KaimanStyleElement( tqparent, name ) { //kdDebug(66666) << k_funcinfo << "name = '" << name << "'" << endl; _value = 0; @@ -599,7 +599,7 @@ void KaimanStyleNumber::setValue( int value ) if ( _value!=value ) { _value = value; - repaint(); + tqrepaint(); } } @@ -640,8 +640,8 @@ void KaimanStyleNumber::paintEvent(TQPaintEvent */*qpe*/) /***********************************************************************/ -KaimanStyleText::KaimanStyleText(TQWidget *parent, const char *name) - : KaimanStyleElement( parent, name ) +KaimanStyleText::KaimanStyleText(TQWidget *tqparent, const char *name) + : KaimanStyleElement( tqparent, name ) { _pos = 0; _timer = new TQTimer( this ); @@ -667,7 +667,7 @@ void KaimanStyleText::setValue( TQString value ) _pos = 0; _direction = 1; _value = value; - repaint(); + tqrepaint(); } } @@ -698,7 +698,7 @@ void KaimanStyleText::timeout() // check new position if ( _pos+_direction>=0 && (int)_value.length()-(_pos+_direction)>=digits ) { _pos += _direction; - repaint(); + tqrepaint(); } _timer->start( _delay, TRUE ); @@ -735,8 +735,8 @@ void KaimanStyleText::paintEvent(TQPaintEvent */*qpe*/) /***********************************************************************/ -KaimanStyleAnimation::KaimanStyleAnimation(int delay, TQWidget *parent, const char *name) - : KaimanStyleMasked( parent, name ) +KaimanStyleAnimation::KaimanStyleAnimation(int delay, TQWidget *tqparent, const char *name) + : KaimanStyleMasked( tqparent, name ) { _delay = delay; _frame = 0; @@ -774,8 +774,8 @@ void KaimanStyleAnimation::timeout() /***********************************************************************/ -KaimanStyleState::KaimanStyleState(TQWidget *parent, const char *name) - : KaimanStyleMasked( parent, name ) +KaimanStyleState::KaimanStyleState(TQWidget *tqparent, const char *name) + : KaimanStyleMasked( tqparent, name ) { _value = 0; } @@ -799,10 +799,10 @@ void KaimanStyleState::mousePressEvent(TQMouseEvent *qme) /***********************************************************************/ -KaimanStyle::KaimanStyle( TQWidget *parent, const char *name ) - : TQWidget( parent, name ) +KaimanStyle::KaimanStyle( TQWidget *tqparent, const char *name ) + : TQWidget( tqparent, name ) { - i_qw_parent = parent; + i_qw_parent = tqparent; i_eventSemaphore = false; } @@ -1098,7 +1098,7 @@ void KaimanStyle::interpretTokens(TQStringList& ref_s_tokens) l_kse_elem->element = l_s_elem; if ( l_s_tokenTypes.left(1) == "V" ) { - // Vertical flag + //Qt::Vertical flag l_vertPixmaps = true; l_s_tokenTypes = l_s_tokenTypes.mid(1); } @@ -1332,7 +1332,7 @@ TQString KaimanStyle::getToken(TQString &val_s_string, char val_c_separator) TQString l_s_token; // Find the first occurrence of the separator - l_i_pos = val_s_string.find(val_c_separator, 0, false); + l_i_pos = val_s_string.tqfind(val_c_separator, 0, false); if ( l_i_pos == -1 ) { // No sparator! Then the whole string is the token l_s_token = val_s_string; @@ -1400,20 +1400,20 @@ bool KaimanStyle::eventFilter( TQObject *o, TQEvent *e ) TQMouseEvent *m = (TQMouseEvent*)e; // handle noatun context menu - if (m->button()==RightButton) { + if (m->button()==Qt::RightButton) { NoatunStdAction::ContextMenu::showContextMenu(); return true; } - TQPoint mousePos( m->x()+static_cast<TQWidget *>(o)->x(), - m->y()+static_cast<TQWidget *>(o)->y() ); + TQPoint mousePos( m->x()+TQT_TQWIDGET(o)->x(), + m->y()+TQT_TQWIDGET(o)->y() ); TQWidget *slider = 0; /* find slider that is under the mouse position */ for ( TQWidget *s = i_sliders.first(); s!=0; s=i_sliders.next() ) { TQRect sliderRect( s->pos(), s->size() ); - if ( sliderRect.contains(mousePos) ) slider = s; + if ( sliderRect.tqcontains(mousePos) ) slider = s; } /* the slider the mouse events instead of the visible widget */ @@ -1445,18 +1445,18 @@ bool KaimanStyle::loadPixmaps() l_kse_elem->loadPixmaps(l_s_tmpName); } - l_kse_elem = this->find("Background"); + l_kse_elem = this->tqfind("Background"); if ( l_kse_elem != 0 ) { l_pixmap_Background = l_kse_elem->pixmaps[0]; } - l_kse_elem = this->find("Mask"); + l_kse_elem = this->tqfind("Mask"); if ( l_kse_elem != 0 ) { l_pixmap_Mask = l_kse_elem->pixmaps[0]; } if ( (l_pixmap_Background != 0) && (l_pixmap_Mask != 0) ) { - // OK, background and mask are defined. So now I can calculate the shape + // OK, background and tqmask are defined. So now I can calculate the tqshape int l_i_width_Mask = l_pixmap_Mask->width(); int l_i_height_Mask = l_pixmap_Mask->height(); @@ -1468,11 +1468,11 @@ bool KaimanStyle::loadPixmaps() l_image_Mask.fill( 0xff ); uchar *l_c_pixel; - uint l_qcol_white = qRgb(255,255,255); + uint l_qcol_white = tqRgb(255,255,255); for (int l_i_x=0; l_i_x<l_i_width_Mask; l_i_x++) { for (int l_i_y=0; l_i_y < l_i_height_Mask; l_i_y++) { - if ( ((*((QRgb*) l_image_MaskOrig.scanLine(l_i_y)+l_i_x) & 0x00ffffff)) != (l_qcol_white & 0x00ffffff) ) { + if ( ((*((TQRgb*) l_image_MaskOrig.scanLine(l_i_y)+l_i_x) & 0x00ffffff)) != (l_qcol_white & 0x00ffffff) ) { l_c_pixel = (uchar *)l_image_Mask.scanLine(l_i_y); *(l_c_pixel + (l_i_x>>3) ) &= ~(1 << (l_i_x & 7)); } @@ -1492,7 +1492,7 @@ TQBitmap* KaimanStyle::Mask() return &i_bitmap_Mask; } -KaimanStyleElement* KaimanStyle::find(const char *val_s_elemName) +KaimanStyleElement* KaimanStyle::tqfind(const char *val_s_elemName) { for (uint i=0; i< I_styleElem.count(); i++) { if ( I_styleElem[i]->element == TQString(val_s_elemName)) { diff --git a/noatun/modules/kaiman/style.h b/noatun/modules/kaiman/style.h index 1f2bc788..6dd1fd3e 100644 --- a/noatun/modules/kaiman/style.h +++ b/noatun/modules/kaiman/style.h @@ -29,11 +29,12 @@ #include <tqevent.h> #include <tqptrvector.h> -class KaimanStyleElement : public QWidget +class KaimanStyleElement : public TQWidget { Q_OBJECT + TQ_OBJECT public: - KaimanStyleElement(TQWidget *parent, const char *name=0); + KaimanStyleElement(TQWidget *tqparent, const char *name=0); ~KaimanStyleElement(); virtual void loadPixmaps(TQString &val_s_filename); @@ -72,15 +73,16 @@ private: class KaimanStyleMasked : public KaimanStyleElement { Q_OBJECT + TQ_OBJECT public: - KaimanStyleMasked(TQWidget *parent, const char *name=0) - : KaimanStyleElement( parent, name ) {}; + KaimanStyleMasked(TQWidget *tqparent, const char *name=0) + : KaimanStyleElement( tqparent, name ) {}; virtual void loadPixmaps(TQString &val_s_filename) { KaimanStyleElement::loadPixmaps( val_s_filename ); - if(pixmaps[0]->mask()) - setMask(*pixmaps[0]->mask()); + if(pixmaps[0]->tqmask()) + setMask(*pixmaps[0]->tqmask()); }; }; @@ -88,8 +90,9 @@ public: class KaimanStyleButton : public KaimanStyleMasked { Q_OBJECT + TQ_OBJECT public: - KaimanStyleButton(TQWidget *parent, const char *name=0); + KaimanStyleButton(TQWidget *tqparent, const char *name=0); ~KaimanStyleButton(); // Button states. @@ -125,8 +128,9 @@ private: class KaimanStyleSlider : public KaimanStyleMasked { Q_OBJECT + TQ_OBJECT public: - KaimanStyleSlider(int min, int max, TQWidget *parent, const char *name=0); + KaimanStyleSlider(int min, int max, TQWidget *tqparent, const char *name=0); ~KaimanStyleSlider(); int value() { return _value; }; @@ -163,8 +167,9 @@ protected: class KaimanStyleBackground : public KaimanStyleMasked { Q_OBJECT + TQ_OBJECT public: - KaimanStyleBackground(TQWidget *parent, const char *name=0); + KaimanStyleBackground(TQWidget *tqparent, const char *name=0); ~KaimanStyleBackground(); protected: @@ -182,8 +187,9 @@ private: class KaimanStyleValue : public KaimanStyleMasked { Q_OBJECT + TQ_OBJECT public: - KaimanStyleValue(int min, int max, TQWidget *parent, const char *name=0); + KaimanStyleValue(int min, int max, TQWidget *tqparent, const char *name=0); ~KaimanStyleValue(); int value() { return _value; }; @@ -200,8 +206,9 @@ private: class KaimanStyleState : public KaimanStyleMasked { Q_OBJECT + TQ_OBJECT public: - KaimanStyleState(TQWidget *parent, const char *name=0); + KaimanStyleState(TQWidget *tqparent, const char *name=0); ~KaimanStyleState(); int value() { return _value; }; @@ -223,8 +230,9 @@ private: class KaimanStyleNumber : public KaimanStyleElement { Q_OBJECT + TQ_OBJECT public: - KaimanStyleNumber(TQWidget *parent, const char *name=0); + KaimanStyleNumber(TQWidget *tqparent, const char *name=0); ~KaimanStyleNumber(); virtual void loadPixmaps(TQString &val_s_filename); @@ -247,8 +255,9 @@ private: class KaimanStyleText : public KaimanStyleElement { Q_OBJECT + TQ_OBJECT public: - KaimanStyleText(TQWidget *parent, const char *name=0); + KaimanStyleText(TQWidget *tqparent, const char *name=0); ~KaimanStyleText(); virtual void loadPixmaps(TQString &val_s_filename); @@ -281,8 +290,9 @@ private: class KaimanStyleAnimation : public KaimanStyleMasked { Q_OBJECT + TQ_OBJECT public: - KaimanStyleAnimation(int delay, TQWidget *parent, const char *name=0); + KaimanStyleAnimation(int delay, TQWidget *tqparent, const char *name=0); ~KaimanStyleAnimation(); public slots: @@ -298,25 +308,26 @@ private: TQTimer *_timer; }; -class KaimanStyle : public QWidget +class KaimanStyle : public TQWidget { Q_OBJECT + TQ_OBJECT public: - KaimanStyle(TQWidget *parent, const char *name=0); + KaimanStyle(TQWidget *tqparent, const char *name=0); ~KaimanStyle(); - enum { background, mask, play_Button, stop_Button, pause_Button, prev_Button, next_Button, repeat_Button, shuffle_Button, playlist_Button, mixer_Button, exit_Button, Iconify_Button, Config_Button, Alt_Skin_Button, Minute_Number, Second_Number, in_Rate_Number, in_Hz_Number, song_Number, status_Item, cPU_Number, digit_Large, digit_Small_Default, title, volume_Item, volume_Slider, position_Item, position_Slider }; + enum { background, tqmask, play_Button, stop_Button, pause_Button, prev_Button, next_Button, repeat_Button, shuffle_Button, playlist_Button, mixer_Button, exit_Button, Iconify_Button, Config_Button, Alt_Skin_Button, Minute_Number, Second_Number, in_Rate_Number, in_Hz_Number, song_Number, status_Item, cPU_Number, digit_Large, digit_Small_Default, title, volume_Item, volume_Slider, position_Item, position_Slider }; enum { ParsingError=1, FileNotFound }; /// Finds a style element, according to it's name. Returns 0 when element is not available. - KaimanStyleElement* find(const char* val_s_elemName); + KaimanStyleElement* tqfind(const char* val_s_elemName); /// Tries to load the given style and returns success (true) or failure (false) bool loadStyle(const TQString &styleName, const TQString &descFile="skindata" ); TQString skinName() { return i_skinName; }; - /// Returns the mask + /// Returns the tqmask TQBitmap* Mask(); virtual bool eventFilter( TQObject *o, TQEvent *e ); @@ -335,13 +346,13 @@ private: TQString i_s_styleBase; - // The mask of the complete style. Used for doing shaped windows + // The tqmask of the complete style. Used for doing tqshaped windows TQBitmap i_bitmap_Mask; /// All style elements are stored here. TQPtrVector<KaimanStyleElement> I_styleElem; - // The parent window. In other words: The container that holds all the KaimanStyleElement's + // The tqparent window. In other words: The container that holds all the KaimanStyleElement's TQWidget* i_qw_parent; TQPtrList<TQWidget> i_sliders; diff --git a/noatun/modules/kaiman/userinterface.cpp b/noatun/modules/kaiman/userinterface.cpp index b1ae2570..4c3d4e28 100644 --- a/noatun/modules/kaiman/userinterface.cpp +++ b/noatun/modules/kaiman/userinterface.cpp @@ -88,10 +88,10 @@ Kaiman::Kaiman() if ( !changeStyle(skinName, "skindata") ) { - KMessageBox::sorry( this, i18n("Cannot load skin %1. Switching to default skin.").arg(skinName) ); + KMessageBox::sorry( this, i18n("Cannot load skin %1. Switching to default skin.").tqarg(skinName) ); if ( !changeStyle( DEFAULT_SKIN, "skindata" ) ) { - KMessageBox::error( this, i18n("Cannot load default skin %1.").arg(DEFAULT_SKIN) ); + KMessageBox::error( this, i18n("Cannot load default skin %1.").tqarg(DEFAULT_SKIN) ); TQTimer::singleShot( 0, this, TQT_SLOT(close()) ); return; } @@ -112,7 +112,7 @@ Kaiman::Kaiman() if( napp->player()->isPlaying() ) newSong(); - new KaimanPrefDlg(this); + new KaimanPrefDlg(TQT_TQOBJECT(this)); show(); } @@ -159,12 +159,12 @@ bool Kaiman::loadStyle( const TQString &style, const TQString &desc ) if ( _style->Mask() != 0 ) { - // Set the shaped window form + // Set the tqshaped window form XShapeCombineMask( qt_xdisplay(), winId(), ShapeBounding, 0,0, _style->Mask()->handle(), ShapeSet ); } - KaimanStyleElement* item = _style->find("Background"); + KaimanStyleElement* item = _style->tqfind("Background"); setBackgroundMode(TQWidget::NoBackground); if ( item!=0 ) { @@ -173,53 +173,53 @@ bool Kaiman::loadStyle( const TQString &style, const TQString &desc ) setFixedSize( item->width(), item->height()); } - item = _style->find("Playlist_Button"); + item = _style->tqfind("Playlist_Button"); if( item!=0 ) connect( item, TQT_SIGNAL(clicked()), napp->player(), TQT_SLOT(toggleListView()) ); - item = _style->find("Play_Button"); + item = _style->tqfind("Play_Button"); if( item!=0 ) connect( item, TQT_SIGNAL(clicked()), napp->player(), TQT_SLOT(playpause()) ); - item = _style->find("Pause_Button"); + item = _style->tqfind("Pause_Button"); if( item!=0 ) connect( item, TQT_SIGNAL(clicked()), napp->player(), TQT_SLOT(playpause()) ); - item = _style->find("Stop_Button"); + item = _style->tqfind("Stop_Button"); if( item!=0 ) connect( item, TQT_SIGNAL(clicked()), napp->player(), TQT_SLOT(stop()) ); - item = _style->find("Next_Button"); + item = _style->tqfind("Next_Button"); if( item!=0 ) connect( item, TQT_SIGNAL(clicked()), napp->player(), TQT_SLOT(forward()) ); - item = _style->find("Prev_Button"); + item = _style->tqfind("Prev_Button"); if( item!=0 ) connect( item, TQT_SIGNAL(clicked()), napp->player(), TQT_SLOT(back()) ); - item = _style->find("Exit_Button"); + item = _style->tqfind("Exit_Button"); if( item!=0 ) connect( item, TQT_SIGNAL(clicked()), this, TQT_SLOT(close()) ); - item = _style->find("Mixer_Button"); + item = _style->tqfind("Mixer_Button"); if( item!=0 ) connect( item, TQT_SIGNAL(clicked()), this, TQT_SLOT(execMixer()) ); - item = _style->find("Iconify_Button"); + item = _style->tqfind("Iconify_Button"); if( item!=0 ) connect( item, TQT_SIGNAL(clicked()), this, TQT_SLOT(showMinimized()) ); - item = _style->find("Alt_Skin_Button"); + item = _style->tqfind("Alt_Skin_Button"); if( item!=0 ) connect( item, TQT_SIGNAL(clicked()), this, TQT_SLOT(toggleSkin()) ); - item = _style->find("Repeat_Button"); + item = _style->tqfind("Repeat_Button"); if( item!=0 ) connect( item, TQT_SIGNAL(clicked()), this, TQT_SLOT(toggleLoop()) ); - item = _style->find("Shuffle_Button"); + item = _style->tqfind("Shuffle_Button"); if( item!=0 ) connect( item, TQT_SIGNAL(clicked()), this, TQT_SLOT(toggleShuffle()) ); - item = _style->find("Config_Button"); + item = _style->tqfind("Config_Button"); if( item!=0 ) connect( item, TQT_SIGNAL(clicked()), napp, TQT_SLOT(preferences()) ); - item = _style->find("Volume_Up_Button"); + item = _style->tqfind("Volume_Up_Button"); if( item!=0 ) connect( item, TQT_SIGNAL(clicked()), this,TQT_SLOT(volumeUp())); - item = _style->find("Volume_Down_Button"); + item = _style->tqfind("Volume_Down_Button"); if( item!=0 ) connect( item, TQT_SIGNAL(clicked()), this,TQT_SLOT(volumeDown())); KaimanStyleSlider* slider = - static_cast<KaimanStyleSlider*>(_style->find("Position_Slider")); + static_cast<KaimanStyleSlider*>(_style->tqfind("Position_Slider")); if( slider!=0 ) { connect( slider, TQT_SIGNAL(newValueDrag(int)), this, TQT_SLOT(seekStart(int)) ); @@ -228,18 +228,18 @@ bool Kaiman::loadStyle( const TQString &style, const TQString &desc ) slider->setValue( 0, 0, 1000 ); } - slider = static_cast<KaimanStyleSlider*>(_style->find("Volume_Slider")); + slider = static_cast<KaimanStyleSlider*>(_style->tqfind("Volume_Slider")); if ( slider!=0 ) { connect(slider, TQT_SIGNAL(newValue(int)), this, TQT_SLOT(setVolume(int))); slider->setValue( napp->player()->volume(), 0, 100 ); } - KaimanStyleValue* volItem = static_cast<KaimanStyleValue*>(_style->find("Volume_Item")); + KaimanStyleValue* volItem = static_cast<KaimanStyleValue*>(_style->tqfind("Volume_Item")); if ( volItem ) volItem->setValue( napp->player()->volume(), 0, 100 ); - KaimanStyleText* titleItem = static_cast<KaimanStyleText*>(_style->find("Title")); + KaimanStyleText* titleItem = static_cast<KaimanStyleText*>(_style->tqfind("Title")); if ( titleItem ) titleItem->startAnimation( 300 ); @@ -291,23 +291,23 @@ void Kaiman::seekDrag( int value ) if ( !_style ) return; KaimanStyleValue* posItem = - static_cast<KaimanStyleValue*>(_style->find("Position_Item")); + static_cast<KaimanStyleValue*>(_style->tqfind("Position_Item")); if ( posItem ) posItem->setValue( value, 0, length ); KaimanStyleSlider* posSlider = - static_cast<KaimanStyleSlider*>(_style->find("Position_Slider")); + static_cast<KaimanStyleSlider*>(_style->tqfind("Position_Slider")); if ( posSlider ) posSlider->setValue( value, 0, length ); // update time KaimanStyleNumber* numItem = - static_cast<KaimanStyleNumber*>(_style->find("Minute_Number")); + static_cast<KaimanStyleNumber*>(_style->tqfind("Minute_Number")); if ( numItem ) numItem->setValue( value/60%60 ); - numItem = static_cast<KaimanStyleNumber*>(_style->find("Second_Number")); + numItem = static_cast<KaimanStyleNumber*>(_style->tqfind("Second_Number")); if ( numItem ) numItem->setValue( value % 60 ); } @@ -335,13 +335,13 @@ void Kaiman::toggleSkin() TQString oldDesc, newDesc; if ( _altSkin ) { - oldDesc = TQString::fromLatin1("skindata"); - newDesc = TQString::fromLatin1("alt_skindata"); + oldDesc = TQString::tqfromLatin1("skindata"); + newDesc = TQString::tqfromLatin1("alt_skindata"); } else { - newDesc = TQString::fromLatin1("skindata"); - oldDesc = TQString::fromLatin1("alt_skindata"); + newDesc = TQString::tqfromLatin1("skindata"); + oldDesc = TQString::tqfromLatin1("alt_skindata"); } if ( !changeStyle(skinName, newDesc) ) @@ -372,7 +372,7 @@ void Kaiman::volumeDown() void Kaiman::execMixer() { - kapp->startServiceByDesktopName ( TQString::fromLatin1("kmix"), TQString::null ); + kapp->startServiceByDesktopName ( TQString::tqfromLatin1("kmix"), TQString() ); } @@ -384,8 +384,8 @@ void Kaiman::timeout() return; // update volume - KaimanStyleSlider* l_elem_volslider = static_cast<KaimanStyleSlider*>(_style->find("Volume_Slider")); - KaimanStyleValue* l_elem_volitem = static_cast<KaimanStyleValue*>(_style->find("Volume_Item")); + KaimanStyleSlider* l_elem_volslider = static_cast<KaimanStyleSlider*>(_style->tqfind("Volume_Slider")); + KaimanStyleValue* l_elem_volitem = static_cast<KaimanStyleValue*>(_style->tqfind("Volume_Item")); if ( l_elem_volslider!=0 ) l_elem_volslider->setValue( napp->player()->volume(), 0, 100 ); if ( l_elem_volitem!=0 ) @@ -399,20 +399,20 @@ void Kaiman::timeout() sec = 0; KaimanStyleValue* posItem = - static_cast<KaimanStyleValue*>(_style->find("Position_Item")); + static_cast<KaimanStyleValue*>(_style->tqfind("Position_Item")); if ( posItem ) posItem->setValue( sec, 0, napp->player()->getLength()/1000 ); KaimanStyleSlider* posSlider = - static_cast<KaimanStyleSlider*>(_style->find("Position_Slider")); + static_cast<KaimanStyleSlider*>(_style->tqfind("Position_Slider")); if ( posSlider ) posSlider->setValue( sec, 0, napp->player()->getLength()/1000 ); // update time KaimanStyleNumber* numItem = - static_cast<KaimanStyleNumber*>(_style->find("Minute_Number")); + static_cast<KaimanStyleNumber*>(_style->tqfind("Minute_Number")); if ( numItem ) numItem->setValue( sec/60%60 ); - numItem = static_cast<KaimanStyleNumber*>(_style->find("Second_Number")); + numItem = static_cast<KaimanStyleNumber*>(_style->tqfind("Second_Number")); if ( numItem ) numItem->setValue( sec%60 ); } @@ -420,14 +420,14 @@ void Kaiman::timeout() const PlaylistItem &item = napp->playlist()->current(); KaimanStyleNumber* numItem = 0; - numItem = static_cast<KaimanStyleNumber*>(_style->find("In_Rate_Number")); + numItem = static_cast<KaimanStyleNumber*>(_style->tqfind("In_Rate_Number")); if ( numItem ) numItem->setValue(item.property("bitrate").toInt()); TQString hzString = item.property("samplerate"); hzString.truncate(2); - numItem = static_cast<KaimanStyleNumber*>(_style->find("In_Hz_Number")); + numItem = static_cast<KaimanStyleNumber*>(_style->tqfind("In_Hz_Number")); if ( numItem ) numItem->setValue(hzString.toInt()); } @@ -438,11 +438,11 @@ void Kaiman::updateMode() if ( !_style ) return; KaimanStyleButton* pause = - static_cast<KaimanStyleButton*>(_style->find("Pause_Button")); + static_cast<KaimanStyleButton*>(_style->tqfind("Pause_Button")); KaimanStyleButton* play = - static_cast<KaimanStyleButton*>(_style->find("Play_Button")); + static_cast<KaimanStyleButton*>(_style->tqfind("Play_Button")); KaimanStyleState* status = - static_cast<KaimanStyleState*>(_style->find("Status_Item")); + static_cast<KaimanStyleState*>(_style->tqfind("Status_Item")); if (napp->player()->isStopped() ) { @@ -469,7 +469,7 @@ void Kaiman::loopTypeChange( int ) { if ( !_style ) return; - KaimanStyleState* rep = static_cast<KaimanStyleState*>(_style->find("Repeat_Item")); + KaimanStyleState* rep = static_cast<KaimanStyleState*>(_style->tqfind("Repeat_Item")); if ( rep ) rep->setValue( napp->player()->loopStyle() ); } @@ -486,19 +486,19 @@ void Kaiman::newSongLen( int, int ) // update time KaimanStyleNumber* numItem = - static_cast<KaimanStyleNumber*>(_style->find("Minute_Total_Number")); + static_cast<KaimanStyleNumber*>(_style->tqfind("Minute_Total_Number")); if ( numItem ) numItem->setValue( len/60%60 ); - numItem = static_cast<KaimanStyleNumber*>(_style->find("Second_Total_Number")); + numItem = static_cast<KaimanStyleNumber*>(_style->tqfind("Second_Total_Number")); if ( numItem ) numItem->setValue( len%60 ); - numItem = static_cast<KaimanStyleNumber*>(_style->find("Song_Minute_Number")); + numItem = static_cast<KaimanStyleNumber*>(_style->tqfind("Song_Minute_Number")); if ( numItem ) numItem->setValue( len/60%60 ); - numItem = static_cast<KaimanStyleNumber*>(_style->find("Second_Minute_Number")); + numItem = static_cast<KaimanStyleNumber*>(_style->tqfind("Second_Minute_Number")); if ( numItem ) numItem->setValue( len%60 ); @@ -510,7 +510,7 @@ void Kaiman::newSong() { if ( !_style ) return; - KaimanStyleText* titleItem = static_cast<KaimanStyleText*>(_style->find("Title")); + KaimanStyleText* titleItem = static_cast<KaimanStyleText*>(_style->tqfind("Title")); if ( titleItem ) { TQString title = i18n("Noatun"); @@ -520,7 +520,7 @@ void Kaiman::newSong() if ( title.isEmpty() ) title = napp->player()->current().file(); - title = i18n("TITLE (LENGTH)", "%1 (%2)").arg(title, + title = i18n("TITLE (LENGTH)", "%1 (%2)").tqarg(title, napp->player()->current().lengthString()); } titleItem->setValue( title ); diff --git a/noatun/modules/kaiman/userinterface.h b/noatun/modules/kaiman/userinterface.h index 63b4133e..e1e2f8c6 100644 --- a/noatun/modules/kaiman/userinterface.h +++ b/noatun/modules/kaiman/userinterface.h @@ -35,11 +35,12 @@ class Player; class Kaiman : public KMainWindow, public UserInterface { Q_OBJECT + TQ_OBJECT public: Kaiman(); virtual ~Kaiman(); - bool changeStyle( const TQString &style, const TQString &desc=TQString::null ); + bool changeStyle( const TQString &style, const TQString &desc=TQString() ); public slots: void dropEvent( TQDropEvent * ); void doDropEvent( TQDropEvent * ); diff --git a/noatun/modules/keyz/keyz.cpp b/noatun/modules/keyz/keyz.cpp index f35fddc7..877e5846 100644 --- a/noatun/modules/keyz/keyz.cpp +++ b/noatun/modules/keyz/keyz.cpp @@ -30,58 +30,58 @@ Keyz::Keyz() : TQObject( 0L, "Keyz" ), Plugin(), preMuteVol(0) if ( !s_accel ) { s_accel = new KGlobalAccel( this, "noatunglobalaccel" ); - s_accel->insert( "PlayPause", i18n("Play/Pause"), TQString::null, + s_accel->insert( "PlayPause", i18n("Play/Pause"), TQString(), CTRL+ALT+Key_P, KKey::QtWIN+CTRL+Key_P, player, TQT_SLOT( playpause() )); - s_accel->insert( "Stop", i18n("Stop Playing"), TQString::null, + s_accel->insert( "Stop", i18n("Stop Playing"), TQString(), CTRL+ALT+Key_S, KKey::QtWIN+CTRL+Key_S, player, TQT_SLOT( stop() )); - s_accel->insert( "Back", i18n("Back"), TQString::null, + s_accel->insert( "Back", i18n("Back"), TQString(), CTRL+ALT+Key_Left, KKey::QtWIN+CTRL+Key_Left, player, TQT_SLOT( back() )); - s_accel->insert( "Forward", i18n("Forward"), TQString::null, + s_accel->insert( "Forward", i18n("Forward"), TQString(), CTRL+ALT+Key_Right, KKey::QtWIN+CTRL+Key_Right, player, TQT_SLOT( forward() )); - s_accel->insert( "Playlist", i18n("Show/Hide Playlist"), TQString::null, + s_accel->insert( "Playlist", i18n("Show/Hide Playlist"), TQString(), CTRL+ALT+Key_L, KKey::QtWIN+CTRL+Key_L, player, TQT_SLOT( toggleListView() )); - s_accel->insert( "OpenFile", i18n("Open File to Play"), TQString::null, + s_accel->insert( "OpenFile", i18n("Open File to Play"), TQString(), CTRL+ALT+Key_O, KKey::QtWIN+CTRL+Key_O, - napp, TQT_SLOT( fileOpen() )); - s_accel->insert( "Effects", i18n("Effects Configuration"), TQString::null, + TQT_TQOBJECT(napp), TQT_SLOT( fileOpen() )); + s_accel->insert( "Effects", i18n("Effects Configuration"), TQString(), CTRL+ALT+Key_E, KKey::QtWIN+CTRL+Key_E, - napp, TQT_SLOT( effectView() )); - s_accel->insert( "Preferences", i18n("Preferences"), TQString::null, + TQT_TQOBJECT(napp), TQT_SLOT( effectView() )); + s_accel->insert( "Preferences", i18n("Preferences"), TQString(), CTRL+ALT+Key_F, KKey::QtWIN+CTRL+Key_F, - napp, TQT_SLOT( preferences() )); - s_accel->insert( "VolumeUp", i18n("Volume Up"), TQString::null, + TQT_TQOBJECT(napp), TQT_SLOT( preferences() )); + s_accel->insert( "VolumeUp", i18n("Volume Up"), TQString(), CTRL+ALT+SHIFT+Key_Up, KKey::QtWIN+CTRL+SHIFT+Key_Up, this, TQT_SLOT( slotVolumeUp() )); - s_accel->insert( "VolumeDown", i18n("Volume Down"), TQString::null, + s_accel->insert( "VolumeDown", i18n("Volume Down"), TQString(), CTRL+ALT+SHIFT+Key_Down, KKey::QtWIN+CTRL+SHIFT+Key_Down, this, TQT_SLOT( slotVolumeDown() )); - s_accel->insert( "Mute", i18n("Mute"), TQString::null, + s_accel->insert( "Mute", i18n("Mute"), TQString(), CTRL+ALT+Key_M, KKey::QtWIN+CTRL+Key_M, this, TQT_SLOT( slotMute() )); - s_accel->insert( "SeekForward", i18n("Seek Forward"), TQString::null, + s_accel->insert( "SeekForward", i18n("Seek Forward"), TQString(), CTRL+ALT+SHIFT+Key_Right, KKey::QtWIN+CTRL+SHIFT+Key_Right, this, TQT_SLOT( slotForward() )); - s_accel->insert( "SeekBackward", i18n("Seek Backward"), TQString::null, + s_accel->insert( "SeekBackward", i18n("Seek Backward"), TQString(), CTRL+ALT+SHIFT+Key_Left, KKey::QtWIN+CTRL+SHIFT+Key_Left, this, TQT_SLOT( slotBackward() )); - s_accel->insert( "NextSection", i18n("Next Section"), TQString::null, + s_accel->insert( "NextSection", i18n("Next Section"), TQString(), 0, 0, this, TQT_SLOT( slotNextSection() )); - s_accel->insert( "PrevSection", i18n("Previous Section"), TQString::null, + s_accel->insert( "PrevSection", i18n("Previous Section"), TQString(), 0, 0, this, TQT_SLOT( slotPrevSection() )); - s_accel->insert( "CopyTitle", i18n("Copy Song Title to Clipboard"), TQString::null, + s_accel->insert( "CopyTitle", i18n("Copy Song Title to Clipboard"), TQString(), CTRL+ALT+Key_C, KKey::QtWIN+CTRL+Key_C, this, TQT_SLOT( slotCopyTitle() )); - s_accel->insert( "ToggleGUI", i18n("Show/Hide Main Window"), TQString::null, + s_accel->insert( "ToggleGUI", i18n("Show/Hide Main Window"), TQString(), CTRL+ALT+Key_W, KKey::QtWIN+CTRL+Key_W, - napp, TQT_SLOT( toggleInterfaces() )); + TQT_TQOBJECT(napp), TQT_SLOT( toggleInterfaces() )); s_accel->readSettings(); s_accel->updateConnections(); @@ -116,12 +116,12 @@ void Keyz::slotVolumeDown() void Keyz::slotForward() { - napp->player()->skipTo( QMIN(napp->player()->getLength(), napp->player()->getTime() + 3000) ); // + 3 seconds + napp->player()->skipTo( TQMIN(napp->player()->getLength(), napp->player()->getTime() + 3000) ); // + 3 seconds } void Keyz::slotBackward() { - napp->player()->skipTo( QMAX( 0, napp->player()->getTime() - 3000 )); // - 3 seconds + napp->player()->skipTo( TQMAX( 0, napp->player()->getTime() - 3000 )); // - 3 seconds } void Keyz::slotNextSection() @@ -170,13 +170,13 @@ void Keyz::slotMute() /////////////////////////////////////////////////////////////////// -KeyzPrefs::KeyzPrefs( TQObject *parent ) : +KeyzPrefs::KeyzPrefs( TQObject *tqparent ) : CModule( i18n("Keyz"), i18n("Shortcut Configuration"), "key_bindings", - parent ) + tqparent ) { - TQVBoxLayout *layout = new TQVBoxLayout( this ); + TQVBoxLayout *tqlayout = new TQVBoxLayout( this ); m_chooser = new KKeyChooser( Keyz::accel(), this ); - layout->addWidget( m_chooser ); + tqlayout->addWidget( m_chooser ); } void KeyzPrefs::save() diff --git a/noatun/modules/keyz/keyz.h b/noatun/modules/keyz/keyz.h index e6682531..b21e44f8 100644 --- a/noatun/modules/keyz/keyz.h +++ b/noatun/modules/keyz/keyz.h @@ -7,6 +7,7 @@ class Keyz : public TQObject, public Plugin { Q_OBJECT + TQ_OBJECT NOATUNPLUGIND public: @@ -35,9 +36,10 @@ private: class KeyzPrefs : public CModule { Q_OBJECT + TQ_OBJECT public: - KeyzPrefs( TQObject *parent ); + KeyzPrefs( TQObject *tqparent ); virtual void save(); private: diff --git a/noatun/modules/kjofol-skin/ChangeLog b/noatun/modules/kjofol-skin/ChangeLog index 537de012..b93bb4ee 100644 --- a/noatun/modules/kjofol-skin/ChangeLog +++ b/noatun/modules/kjofol-skin/ChangeLog @@ -46,12 +46,12 @@ ChangeLog (only lists MY changes) 2001-10-04 Stefan Gehn <sgehn@gmx.net> * Still fighting with analyzer and osci visualizations, now both are buffered and flicker-free -* fixed stupid bug in isGray(qRgb), now RGB(0,0,0) is treated as gray again :) +* fixed stupid bug in isGray(tqRgb), now RGB(0,0,0) is treated as gray again :) * commented out (hopefully) unneded debug-messages * added splash-screen for skins supporting it (only skin I know of: K-Nine) 2001-09-30 Stefan Gehn <sgehn@gmx.net> -* ignore alpha-channel of loaded files, they break applying masks to QPixmaps, +* ignore alpha-channel of loaded files, they break applying tqmasks to QPixmaps, result of this is text without transparency (this happened for two skins: adagio and xbs) @@ -62,7 +62,7 @@ ChangeLog (only lists MY changes) most fileformats in a proper way?) 2001-09-22 Stefan Gehn <sgehn@gmx.net> -* isGray(qRgb) is more tolerant, colors like rgb(162,163,162) are treated as gray too +* isGray(tqRgb) is more tolerant, colors like rgb(162,163,162) are treated as gray too This fixes some volume/pitch-sliders and makes using them a lot easier * made titletext move again (works with and without transparent text) @@ -72,7 +72,7 @@ ChangeLog (only lists MY changes) 2001-09-04 Stefan Gehn <sgehn@gmx.net> * added support for transparent fonts (a skin named steelforged still got problems though) for the moment this disables moving of titletext, - I have to find a new way to move it (bitblt on a masked QPixmap is tricky) + I have to find a new way to move it (bitblt on a tqmasked QPixmap is tricky) 2001-09-03 Stefan Gehn <sgehn@gmx.net> * added support for pitch-slider and its textlabel diff --git a/noatun/modules/kjofol-skin/helpers.cpp b/noatun/modules/kjofol-skin/helpers.cpp index 0a2a9e67..473c0e80 100644 --- a/noatun/modules/kjofol-skin/helpers.cpp +++ b/noatun/modules/kjofol-skin/helpers.cpp @@ -9,22 +9,22 @@ #ifndef KJHELPERS_CPP #define KJHELPERS_CPP -static int grayRgb(QRgb r) +static int grayRgb(TQRgb r) { - return qGray(qRed(r), qGreen(r), qBlue(r)); + return tqGray(tqRed(r), tqGreen(r), tqBlue(r)); } -static int isGray(QRgb r) +static int isGray(TQRgb r) { // this is more tolerant than the old version // i.e. RGB 162 163 162 is treated as gray too // too many broken skins around having such colors -// cerr << "r("<<qRed(r)<<","<<qGreen(r)<<","<<qBlue(r)<<")"<<endl; +// cerr << "r("<<tqRed(r)<<","<<tqGreen(r)<<","<<tqBlue(r)<<")"<<endl; - if ( (qRed(r)==qGreen(r)) || (qRed(r)+1==qGreen(r)) || (qRed(r)-1==qGreen(r))) + if ( (tqRed(r)==tqGreen(r)) || (tqRed(r)+1==tqGreen(r)) || (tqRed(r)-1==tqGreen(r))) { - if ( (qRed(r)==qBlue(r)) || (qRed(r)+1==qBlue(r)) || (qRed(r)-1==qBlue(r))) + if ( (tqRed(r)==tqBlue(r)) || (tqRed(r)+1==tqBlue(r)) || (tqRed(r)-1==tqBlue(r))) { // looks a bit like gray, so return true return (1); @@ -35,7 +35,7 @@ static int isGray(QRgb r) /* // mETz: wrong braces in the code below ?? - return (qRed(r)==qGreen(r)) && (qRed(r) == qBlue(r)); + return (tqRed(r)==tqGreen(r)) && (tqRed(r) == tqBlue(r)); */ } diff --git a/noatun/modules/kjofol-skin/kjbackground.cpp b/noatun/modules/kjofol-skin/kjbackground.cpp index 1c99b6ff..543d92cc 100644 --- a/noatun/modules/kjofol-skin/kjbackground.cpp +++ b/noatun/modules/kjofol-skin/kjbackground.cpp @@ -9,21 +9,21 @@ #include "kjbackground.h" -KJBackground::KJBackground(KJLoader *parent) - : KJWidget(parent) +KJBackground::KJBackground(KJLoader *tqparent) + : KJWidget(tqparent) { TQImage ibackground; - mBackground = parent->pixmap(parser()["backgroundimage"][1]); - ibackground = parent->image(parser()["backgroundimage"][1]); + mBackground = tqparent->pixmap(parser()["backgroundimage"][1]); + ibackground = tqparent->image(parser()["backgroundimage"][1]); - parent->setMask( getMask(ibackground) ); - parent->setFixedSize ( TQSize(mBackground.width(), mBackground.height()) ); + tqparent->setMask( getMask(ibackground) ); + tqparent->setFixedSize ( TQSize(mBackground.width(), mBackground.height()) ); - setRect(0,0,parent->width(),parent->height()); + setRect(0,0,tqparent->width(),tqparent->height()); } void KJBackground::paint(TQPainter *painter, const TQRect &rect) { - bitBlt(painter->device(), rect.topLeft(), &mBackground, rect, Qt::CopyROP); + bitBlt(painter->device(), rect.topLeft(), &mBackground, rect, TQt::CopyROP); } diff --git a/noatun/modules/kjofol-skin/kjbutton.cpp b/noatun/modules/kjofol-skin/kjbutton.cpp index d051777e..7dbd9d99 100644 --- a/noatun/modules/kjofol-skin/kjbutton.cpp +++ b/noatun/modules/kjofol-skin/kjbutton.cpp @@ -30,8 +30,8 @@ * KJButton *******************************************/ -KJButton::KJButton(const TQStringList &i, KJLoader *parent) - : TQObject(0), KJWidget(parent), mTitle(i[0]), mShowPressed(false) +KJButton::KJButton(const TQStringList &i, KJLoader *tqparent) + : TQObject(0), KJWidget(tqparent), mTitle(i[0]), mShowPressed(false) { // kdDebug(66666) << k_funcinfo << "new button: " << i[0].latin1() << endl; mPushedPixmap = (i.count() >= 7); @@ -53,12 +53,12 @@ KJButton::KJButton(const TQStringList &i, KJLoader *parent) bool gotBack = false; // in case any of these keys is duplicated for(TQStringList::Iterator it = temp.begin(); it != temp.end(); ++it) { - if((*it).contains("bmp")) + if((*it).tqcontains("bmp")) { TQString pressedTmp = backgroundPressed((*it)); if(!pressedTmp.isEmpty()) { - mPressed = parent->pixmap(pressedTmp); + mPressed = tqparent->pixmap(pressedTmp); gotBack = true; } } @@ -67,7 +67,7 @@ KJButton::KJButton(const TQStringList &i, KJLoader *parent) // take background and darken the buttons rectangle // FIXME: what KPixmapEffect causes the desired effect? // intensity is the wrong one - KPixmap temp = parent->pixmap(parser()["backgroundimage"][1]); + KPixmap temp = tqparent->pixmap(parser()["backgroundimage"][1]); mPressed = (TQPixmap)KPixmapEffect::intensity ( temp, 1.2f ); gotBack = true; } @@ -79,7 +79,7 @@ KJButton::KJButton(const TQStringList &i, KJLoader *parent) { kdDebug(66666) << k_funcinfo << "Couldn't find valid background for button '" << mTitle << "', dafulting to backgroundimage" << endl; - mPressed = parent->pixmap(parser()["backgroundimage"][1]); + mPressed = tqparent->pixmap(parser()["backgroundimage"][1]); } // playlistbutton has to show if playlistwindow is open @@ -152,12 +152,12 @@ TQString KJButton::tip() void KJButton::paint(TQPainter *, const TQRect &) { if (mShowPressed) - bitBlt(KJWidget::parent(), rect().topLeft(), &mPressed, rect(), Qt::CopyROP); + bitBlt(KJWidget::tqparent(), rect().topLeft(), &mPressed, rect(), TQt::CopyROP); } bool KJButton::mousePress(const TQPoint &) { - bitBlt(KJWidget::parent(), rect().topLeft(), &mPressed, rect(), Qt::CopyROP); + bitBlt(KJWidget::tqparent(), rect().topLeft(), &mPressed, rect(), TQt::CopyROP); return true; } @@ -165,9 +165,9 @@ void KJButton::showPressed(bool b) { mShowPressed = b; if ( mShowPressed ) - repaint(true); // repaint with selected image + tqrepaint(true); // tqrepaint with selected image else - repaint(false); // repaint with default image (player-background) + tqrepaint(false); // tqrepaint with default image (player-background) } void KJButton::slotPlaylistShown(void) @@ -193,19 +193,19 @@ void KJButton::slotEqEnabled(bool on) void KJButton::mouseRelease(const TQPoint &, bool in) { - // repaint with default image (player-background) - repaint(false); + // tqrepaint with default image (player-background) + tqrepaint(false); if (!in) // only do something if users is still inside the button return; // now, find what widget I am and do the proper action if (mTitle=="closebutton") - KJWidget::parent()->close(); + KJWidget::tqparent()->close(); else if (mTitle=="minimizebutton") - KJWidget::parent()->minimize(); + KJWidget::tqparent()->minimize(); else if (mTitle=="aboutbutton") - KJWidget::parent()->helpMenu()->aboutApplication(); + KJWidget::tqparent()->helpMenu()->aboutApplication(); else if (mTitle=="stopbutton") napp->player()->stop(); else if (mTitle=="playbutton") @@ -214,7 +214,7 @@ void KJButton::mouseRelease(const TQPoint &, bool in) napp->player()->playpause(); else if (mTitle=="openfilebutton") { - KURL file(KFileDialog::getOpenURL(0, napp->mimeTypes(), KJWidget::parent(), i18n("Select File to Play"))); + KURL file(KFileDialog::getOpenURL(0, napp->mimeTypes(), KJWidget::tqparent(), i18n("Select File to Play"))); if (file.isValid()) napp->player()->openFile(file); } @@ -222,7 +222,7 @@ void KJButton::mouseRelease(const TQPoint &, bool in) napp->player()->toggleListView(); else if (mTitle=="repeatbutton") { - KPopupMenu *loopMenu = new KPopupMenu(KJWidget::parent(),"loopMenu"); + KPopupMenu *loopMenu = new KPopupMenu(KJWidget::tqparent(),"loopMenu"); int selectedItem = 0; loopMenu->setCheckable(true); @@ -291,11 +291,11 @@ void KJButton::mouseRelease(const TQPoint &, bool in) else if (mTitle=="rewindbutton") napp->player()->skipTo(napp->player()->getTime()-10000); else if (mTitle=="preferencesbutton") - napp->preferencesBox()->show(static_cast<CModule *>(KJWidget::parent()->prefs())); + napp->preferencesBox()->show(static_cast<CModule *>(KJWidget::tqparent()->prefs())); else if (mTitle=="dockmodebutton") - KJWidget::parent()->switchToDockmode(); + KJWidget::tqparent()->switchToDockmode(); else if (mTitle=="undockmodebutton") - KJWidget::parent()->returnFromDockmode(); + KJWidget::tqparent()->returnFromDockmode(); else kdDebug(66666) << "unknown buttontype: " << mTitle.latin1() << endl; } diff --git a/noatun/modules/kjofol-skin/kjbutton.h b/noatun/modules/kjofol-skin/kjbutton.h index e995c533..c0eba625 100644 --- a/noatun/modules/kjofol-skin/kjbutton.h +++ b/noatun/modules/kjofol-skin/kjbutton.h @@ -8,6 +8,7 @@ class KJLoader; class KJButton : public TQObject, public KJWidget { Q_OBJECT + TQ_OBJECT public: KJButton(const TQStringList&, KJLoader *); diff --git a/noatun/modules/kjofol-skin/kjequalizer.cpp b/noatun/modules/kjofol-skin/kjequalizer.cpp index 51d50e97..4b260f6f 100644 --- a/noatun/modules/kjofol-skin/kjequalizer.cpp +++ b/noatun/modules/kjofol-skin/kjequalizer.cpp @@ -34,7 +34,7 @@ KJEqualizer::KJEqualizer(const TQStringList &l, KJLoader *p) // needed to only blit onto screen ONCE and not for every band TQPixmap tmp = p->pixmap(p->item("backgroundimage")[1]); mBack = new KPixmap ( TQSize(xs,ys) ); - bitBlt( mBack, 0, 0, &tmp, x, y, xs, ys, Qt::CopyROP ); + bitBlt( mBack, 0, 0, &tmp, x, y, xs, ys, TQt::CopyROP ); // buffer for view mView = new TQPixmap ( xs, ys ); @@ -76,19 +76,19 @@ void KJEqualizer::paint(TQPainter *p, const TQRect &) { TQPixmap temp(rect().width(), rect().height()); // draw background into buffer - bitBlt ( &temp, 0, 0, mBack, 0, 0, -1, -1, Qt::CopyROP ); + bitBlt ( &temp, 0, 0, mBack, 0, 0, -1, -1, TQt::CopyROP ); // draw band sliders into buffer - bitBlt( &temp, 0, 0, mView, 0, 0, rect().width(), rect().height(), Qt::CopyROP); + bitBlt( &temp, 0, 0, mView, 0, 0, rect().width(), rect().height(), TQt::CopyROP); // and draw it on screen - bitBlt(p->device(), rect().topLeft(), &temp, TQRect(0,0,-1,-1), Qt::CopyROP); + bitBlt(p->device(), rect().topLeft(), &temp, TQRect(0,0,-1,-1), TQt::CopyROP); } void KJEqualizer::slotUpdateBuffer() { // kdDebug(66666) << "[KJEqualizer] slotUpdateBuffer() called." << endl; - TQBitmap regionMask( rect().width(), rect().height(), true); // fully transparent mask - TQPainter mask( ®ionMask ); + TQBitmap regionMask( rect().width(), rect().height(), true); // fully transparent tqmask + TQPainter tqmask( ®ionMask ); TQPoint destX = TQPoint(0, 0); @@ -102,15 +102,15 @@ void KJEqualizer::slotUpdateBuffer() // kdDebug(66666) << "[KJEqualizer] band=" << band << ", level=" << level << ", picNum=" << picNum << " @ xpos=" << xPos << "." << endl; - bitBlt(mView, destX, &mBars, TQRect(xPos,0,mBandWidth,rect().height()), Qt::CopyROP); - // make slider opaque in mask so you see something on screen - mask.fillRect ( destX.x(), 0, mBandWidth, rect().height(), Qt::color1 ); + bitBlt(mView, destX, &mBars, TQRect(xPos,0,mBandWidth,rect().height()), TQt::CopyROP); + // make slider opaque in tqmask so you see something on screen + tqmask.fillRect ( destX.x(), 0, mBandWidth, rect().height(), TQt::color1 ); destX += TQPoint(mXSpace,0); } // for() - // whole thingy has been drawn, now set the mask + // whole thingy has been drawn, now set the tqmask mView->setMask( regionMask ); - repaint(); + tqrepaint(); } void KJEqualizer::mouseMove(const TQPoint &p, bool in) diff --git a/noatun/modules/kjofol-skin/kjequalizer.h b/noatun/modules/kjofol-skin/kjequalizer.h index be5535eb..f2e85678 100644 --- a/noatun/modules/kjofol-skin/kjequalizer.h +++ b/noatun/modules/kjofol-skin/kjequalizer.h @@ -1,5 +1,5 @@ -#ifndef KJEQUALIZER_H -#define KJEQUALIZER_H +#ifndef KJETQUALIZER_H +#define KJETQUALIZER_H #include "kjwidget.h" //#include "kjloader.h" @@ -11,8 +11,9 @@ class VInterpolation; class KJEqualizer : public TQObject, public KJWidget { Q_OBJECT + TQ_OBJECT public: - KJEqualizer(const TQStringList &, KJLoader *parent); + KJEqualizer(const TQStringList &, KJLoader *tqparent); ~KJEqualizer(void); virtual void mouseMove(const TQPoint &pos, bool); @@ -31,7 +32,7 @@ private: int mBandWidth; int mBandHalfHeight; TQPixmap mBars; // holds all slider images - TQPixmap *mBack; // holds background of EQ for easy repaint + TQPixmap *mBack; // holds background of EQ for easy tqrepaint TQPixmap *mView; // holds prepared img of all sliders VInterpolation *mInterpEq; }; diff --git a/noatun/modules/kjofol-skin/kjfont.cpp b/noatun/modules/kjofol-skin/kjfont.cpp index c6b16b77..cf82fa43 100644 --- a/noatun/modules/kjofol-skin/kjfont.cpp +++ b/noatun/modules/kjofol-skin/kjfont.cpp @@ -23,9 +23,9 @@ * KJFont *******************************************/ -KJFont::KJFont(const TQString &prefix, KJLoader *parent) : mTextMask(0), mTransparentRGB(0) +KJFont::KJFont(const TQString &prefix, KJLoader *tqparent) : mTextMask(0), mTransparentRGB(0) { -// kdDebug(66666) << "KJFont::KJFont(const TQString &prefix, KJLoader *parent)" << prefix.latin1() << endl; +// kdDebug(66666) << "KJFont::KJFont(const TQString &prefix, KJLoader *tqparent)" << prefix.latin1() << endl; if (prefix=="timefont") { @@ -47,12 +47,12 @@ KJFont::KJFont(const TQString &prefix, KJLoader *parent) : mTextMask(0), mTransp mNullChar=' '; } - mText = parent->pixmap(parent->item(prefix+"image")[1]); + mText = tqparent->pixmap(tqparent->item(prefix+"image")[1]); - if ( parent->exist(prefix+"size") ) + if ( tqparent->exist(prefix+"size") ) { - mWidth = parent->item(prefix+"size")[1].toInt(); - mHeight = parent->item(prefix+"size")[2].toInt(); + mWidth = tqparent->item(prefix+"size")[1].toInt(); + mHeight = tqparent->item(prefix+"size")[2].toInt(); } else // try to load the font even we are missing important settings { // this still can cause crashes! @@ -73,13 +73,13 @@ KJFont::KJFont(const TQString &prefix, KJLoader *parent) : mTextMask(0), mTransp mHeight = mText.height(); // Stupid Skin authors tend to forget keys :/ - if ( parent->exist(prefix+"spacing") ) - mSpacing = parent->item(prefix+"spacing")[1].toInt(); + if ( tqparent->exist(prefix+"spacing") ) + mSpacing = tqparent->item(prefix+"spacing")[1].toInt(); else mSpacing = 0; // FIXME: What's default for this in kjöfol??? - if ( parent->exist(prefix+"transparent") ) - mTransparent = (bool)parent->item(prefix+"transparent")[1].toInt(); + if ( tqparent->exist(prefix+"transparent") ) + mTransparent = (bool)tqparent->item(prefix+"transparent")[1].toInt(); else mTransparent = true; // transparency seems to be default in kjöfol @@ -88,7 +88,7 @@ KJFont::KJFont(const TQString &prefix, KJLoader *parent) : mTextMask(0), mTransp { TQImage ibackground = mText.convertToImage(); mTransparentRGB = ibackground.pixel( ibackground.width()-1, ibackground.height()-1 ); -// kdDebug(66666) << "color (" << qRed(mTransparentRGB) << "," << qGreen(mTransparentRGB) << "," << qBlue(mTransparentRGB) << ") will be transparent for " << prefix.latin1() << endl; +// kdDebug(66666) << "color (" << tqRed(mTransparentRGB) << "," << tqGreen(mTransparentRGB) << "," << tqBlue(mTransparentRGB) << ") will be transparent for " << prefix.latin1() << endl; mTextMask = KJWidget::getMask(ibackground,mTransparentRGB); } @@ -153,8 +153,8 @@ TQPixmap KJFont::drawSysFont(const TQCString &s, int wide, const TQPoint &pos) c TQBitmap regionMask( (stringWidth > wide ? stringWidth : wide), - mHeight, true); // fully transparent mask - TQPainter mp(®ionMask); // mask painter + mHeight, true); // fully transparent tqmask + TQPainter mp(®ionMask); // tqmask painter // kdDebug(66666) << "region; w=" << region.width() << ", h=" << region.height() << endl; @@ -163,25 +163,25 @@ TQPixmap KJFont::drawSysFont(const TQCString &s, int wide, const TQPoint &pos) c if ( stringWidth < wide ) { freeSpace = wide - stringWidth; - mp.fillRect ( to.x(), 0, (freeSpace/2), mHeight, Qt::color0 ); + mp.fillRect ( to.x(), 0, (freeSpace/2), mHeight, TQt::color0 ); to += TQPoint ( (freeSpace/2), 0 ); // kdDebug(66666) << "centering text, freeSpace=" << freeSpace << endl; } rp.setFont(sysFont); rp.setPen(sysFontColor); - rp.drawText(to.x(), to.y(), region.width()-freeSpace, mHeight, Qt::AlignLeft|Qt::AlignTop, string); + rp.drawText(to.x(), to.y(), region.width()-freeSpace, mHeight, TQt::AlignLeft|TQt::AlignTop, string); mp.setFont(sysFont); - mp.setPen(Qt::color1); - mp.drawText(to.x(), to.y(), region.width()-freeSpace, mHeight, Qt::AlignLeft|Qt::AlignTop, string); + mp.setPen(TQt::color1); + mp.drawText(to.x(), to.y(), region.width()-freeSpace, mHeight, TQt::AlignLeft|TQt::AlignTop, string); to += TQPoint(region.width()-freeSpace,0); // kdDebug(66666) << "text width=" << region.width()-freeSpace << endl; if (freeSpace > 0) { - mp.fillRect ( to.x(), 0, (freeSpace/2), mHeight, Qt::color0 ); + mp.fillRect ( to.x(), 0, (freeSpace/2), mHeight, TQt::color0 ); to += TQPoint ( (freeSpace/2), 0 ); // kdDebug(66666) << "centering text, freeSpace=" << freeSpace << endl; } @@ -206,8 +206,8 @@ TQPixmap KJFont::drawPixmapFont(const TQCString &str, int wide, const TQPoint &p TQBitmap regionMask( (string.length()*mWidth+string.length()*mSpacing > (unsigned int)wide ? string.length()*mWidth+string.length()*mSpacing : wide), - mHeight, true); // fully transparent mask - TQPainter mask( ®ionMask ); + mHeight, true); // fully transparent tqmask + TQPainter tqmask( ®ionMask ); // kdDebug(66666) << "draw: {" << str << "}" << endl; @@ -216,7 +216,7 @@ TQPixmap KJFont::drawPixmapFont(const TQCString &str, int wide, const TQPoint &p if ( string.length()*mWidth+string.length()*mSpacing < (unsigned int)wide ) { freeSpace = wide - string.length()*mWidth+string.length()*mSpacing; - mask.fillRect ( to.x(), 0, (freeSpace/2), mHeight, Qt::color0 ); + tqmask.fillRect ( to.x(), 0, (freeSpace/2), mHeight, TQt::color0 ); to += TQPoint ( (freeSpace/2), 0 ); } @@ -234,14 +234,14 @@ TQPixmap KJFont::drawPixmapFont(const TQCString &str, int wide, const TQPoint &p // draw according to "spacing" if ( (charPos < string.length()-1) && mSpacing > 0 ) { // make the spacing-area transparent - mask.fillRect ( to.x(), 0, mSpacing, mHeight, Qt::color0 ); + tqmask.fillRect ( to.x(), 0, mSpacing, mHeight, TQt::color0 ); to += TQPoint ( mSpacing, 0 ); } } if (freeSpace > 0) { - mask.fillRect ( to.x(), 0, (freeSpace/2), mHeight, Qt::color0 ); + tqmask.fillRect ( to.x(), 0, (freeSpace/2), mHeight, TQt::color0 ); to += TQPoint ( (freeSpace/2), 0 ); } @@ -258,17 +258,17 @@ void KJFont::drawCharacter(TQPixmap *dev, TQBitmap *devMask, const TQPoint &to, int xs=mWidth; int ys=mHeight; - bitBlt(dev, to, &mText, TQRect(x,y,xs,ys), Qt::CopyROP); + bitBlt(dev, to, &mText, TQRect(x,y,xs,ys), TQt::CopyROP); - // bitBlt mask for transparency + // bitBlt tqmask for transparency if ( mTransparent ) { - bitBlt(devMask, to, &mTextMask, TQRect(x,y,xs,ys), Qt::OrROP); + bitBlt(devMask, to, &mTextMask, TQRect(x,y,xs,ys), TQt::OrROP); } - else // fill mask + else // fill tqmask { TQPainter tempPainter (devMask); - tempPainter.fillRect ( to.x(), 0, xs,ys, Qt::color1 ); + tempPainter.fillRect ( to.x(), 0, xs,ys, TQt::color1 ); } } diff --git a/noatun/modules/kjofol-skin/kjfont.h b/noatun/modules/kjofol-skin/kjfont.h index a40e7854..626ed027 100644 --- a/noatun/modules/kjofol-skin/kjfont.h +++ b/noatun/modules/kjofol-skin/kjfont.h @@ -11,7 +11,7 @@ class KJLoader; class KJFont { public: - KJFont(const TQString &prefix, KJLoader *parent); + KJFont(const TQString &prefix, KJLoader *tqparent); // draw the string str to dev at position pos, within rectangle limit in relation to pos TQPixmap draw(const TQCString &str, int wide, const TQPoint &pt=TQPoint(0,0)) const; TQPixmap draw(const TQString &str, int wide, const TQPoint &pt=TQPoint(0,0)) const @@ -35,7 +35,7 @@ protected: private: TQPixmap mText; TQBitmap mTextMask; - QRgb mTransparentRGB; // this color will be transparent + TQRgb mTransparentRGB; // this color will be transparent int mSpacing; int mWidth, mHeight; bool mTransparent; // indicates wether there's transparency diff --git a/noatun/modules/kjofol-skin/kjguisettingswidget.ui b/noatun/modules/kjofol-skin/kjguisettingswidget.ui index e2b4f784..ab787975 100644 --- a/noatun/modules/kjofol-skin/kjguisettingswidget.ui +++ b/noatun/modules/kjofol-skin/kjguisettingswidget.ui @@ -1,10 +1,10 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>KJGuiSettings</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>KJGuiSettings</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -16,7 +16,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget" row="0" column="0" rowspan="1" colspan="2"> + <widget class="TQLayoutWidget" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>Layout7</cstring> </property> @@ -30,7 +30,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QButtonGroup"> + <widget class="TQButtonGroup"> <property name="name"> <cstring>ButtonGroup1</cstring> </property> @@ -47,7 +47,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>visScope</cstring> </property> @@ -55,7 +55,7 @@ <string>Oscillo&scope</string> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>visAnalyzer</cstring> </property> @@ -63,7 +63,7 @@ <string>&Analyzer</string> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>visNone</cstring> </property> @@ -71,7 +71,7 @@ <string>&None</string> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout5</cstring> </property> @@ -85,7 +85,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel1_3</cstring> </property> @@ -125,7 +125,7 @@ </widget> </vbox> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>GroupBox1</cstring> </property> @@ -142,7 +142,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout4</cstring> </property> @@ -156,7 +156,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel1_2</cstring> </property> @@ -194,7 +194,7 @@ </widget> </hbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout3</cstring> </property> @@ -208,7 +208,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel1_2_2</cstring> </property> @@ -250,7 +250,7 @@ </widget> </hbox> </widget> - <widget class="QCheckBox" row="1" column="0" rowspan="1" colspan="2"> + <widget class="TQCheckBox" row="1" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>displayTooltips</cstring> </property> @@ -258,7 +258,7 @@ <string>Display &tooltips</string> </property> </widget> - <widget class="QCheckBox" row="2" column="0" rowspan="1" colspan="2"> + <widget class="TQCheckBox" row="2" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>displaySplash</cstring> </property> @@ -276,14 +276,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>60</height> </size> </property> </spacer> - <widget class="QLayoutWidget" row="4" column="0" rowspan="1" colspan="2"> + <widget class="TQLayoutWidget" row="4" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>Layout2</cstring> </property> @@ -297,7 +297,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel1</cstring> </property> @@ -308,7 +308,7 @@ <cstring>titleScrollSpeed</cstring> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel2</cstring> </property> @@ -316,11 +316,11 @@ <string>Slow</string> </property> </widget> - <widget class="QSlider"> + <widget class="TQSlider"> <property name="name"> <cstring>titleScrollSpeed</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>80</width> <height>0</height> @@ -348,7 +348,7 @@ <number>1</number> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel3</cstring> </property> @@ -358,7 +358,7 @@ </widget> </hbox> </widget> - <widget class="QGroupBox" row="3" column="0"> + <widget class="TQGroupBox" row="3" column="0"> <property name="name"> <cstring>groupBox2</cstring> </property> @@ -381,7 +381,7 @@ </color> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>txtFontColor</cstring> </property> @@ -389,7 +389,7 @@ <string>Color:</string> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>txtFont</cstring> </property> @@ -408,7 +408,7 @@ <bool>false</bool> </property> </widget> - <widget class="QCheckBox" row="0" column="0" rowspan="1" colspan="2"> + <widget class="TQCheckBox" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>useSysFont</cstring> </property> @@ -428,7 +428,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>140</width> <height>21</height> @@ -453,7 +453,7 @@ <tabstop>cmbSysFontColor</tabstop> <tabstop>titleScrollSpeed</tabstop> </tabstops> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>knuminput.h</includehint> <includehint>knuminput.h</includehint> diff --git a/noatun/modules/kjofol-skin/kjloader.cpp b/noatun/modules/kjofol-skin/kjloader.cpp index 7a9d70c4..fca8b6bb 100644 --- a/noatun/modules/kjofol-skin/kjloader.cpp +++ b/noatun/modules/kjofol-skin/kjloader.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - kjloader.cpp - The KJöfol-GUI itself + kjloader.cpp - The KJ�fol-GUI itself -------------------------------------- Maintainer: Stefan Gehn <sgehn@gmx.net> @@ -69,11 +69,11 @@ #include <kwin.h> #include <kiconloader.h> -class KJToolTip : public QToolTip +class KJToolTip : public TQToolTip { public: - KJToolTip(KJLoader *parent) - : TQToolTip(parent), mParent(parent) + KJToolTip(KJLoader *tqparent) + : TQToolTip(tqparent), mParent(tqparent) {} protected: @@ -131,7 +131,7 @@ KJLoader::KJLoader() subwidgets.setAutoDelete(true); - mPrefs = new KJPrefs(this); + mPrefs = new KJPrefs(TQT_TQOBJECT(this)); connect ( mPrefs, TQT_SIGNAL(configChanged()), this, TQT_SLOT(readConfig()) ); TQString skin = mPrefs->skin(); @@ -142,7 +142,7 @@ KJLoader::KJLoader() else { KNotifyClient::event(winId(), "warning", - i18n("There was trouble loading skin %1. Please select another skin file.").arg(skin)); + i18n("There was trouble loading skin %1. Please select another skin file.").tqarg(skin)); napp->preferences(); } @@ -163,7 +163,7 @@ TQPtrList<KJWidget> KJLoader::widgetsAt(const TQPoint &pt) const { TQPtrList<KJWidget> things; for ( TQPtrListIterator<KJWidget> i(subwidgets); i.current(); ++i ) - if ( (*i)->rect().contains(pt) ) + if ( (*i)->rect().tqcontains(pt) ) things.append((*i)); return things; @@ -173,7 +173,7 @@ void KJLoader::removeChild(KJWidget *c) { if ( mClickedIn == c ) mClickedIn = 0; - if (subwidgets.findRef(c) != -1) + if (subwidgets.tqfindRef(c) != -1) subwidgets.take(); } @@ -219,7 +219,7 @@ void KJLoader::loadSkin(const TQString &file) if ( exist("dockmodercfile") ) { // set path to dockmode rc-file (its not always skinname.dck) - mCurrentDockModeSkin = file.left(file.findRev("/")+1) + (item("dockmodercfile")[1]); + mCurrentDockModeSkin = file.left(file.tqfindRev("/")+1) + (item("dockmodercfile")[1]); mDockPosition = item("dockmodeposition")[1].toInt(); mDockPositionX = item("dockmodepositionxy")[1].toInt(); mDockPositionY = item("dockmodepositionxy")[2].toInt(); @@ -228,7 +228,7 @@ void KJLoader::loadSkin(const TQString &file) mCurrentDockModeSkin=""; if ( exist("winshademodercfile") ) - mCurrentWinshadeModeSkin = file.left(file.findRev("/")+1) + (item("winshademodercfile")[1]); + mCurrentWinshadeModeSkin = file.left(file.tqfindRev("/")+1) + (item("winshademodercfile")[1]); else // no WinshadeMode mCurrentWinshadeModeSkin=""; } @@ -377,7 +377,7 @@ void KJLoader::loadSkin(const TQString &file) for (TQDictIterator<TQStringList> i(*this); i.current(); ++i) { TQString d=i.currentKey(); - if(d.contains("button") && + if(d.tqcontains("button") && !d.startsWith("playlistwindow") && // don't add buttons that belong to the playlistwindow d != "pitchcontrolbutton" && // both already handled above as they aren't buttons but sliders d != "volumecontrolbutton" && @@ -392,7 +392,7 @@ void KJLoader::loadSkin(const TQString &file) show(); conserveMemory(); - repaint(); + tqrepaint(); // update displays if we are already playing // This happens while changing skins @@ -728,11 +728,11 @@ void KJLoader::mouseMoveEvent(TQMouseEvent *e) // TQWidget::mouseMoveEvent(e); // not on background but on a widget: pass event to subwidget - if ( !moving && mClickedIn && subwidgets.findRef(mClickedIn) != -1 ) + if ( !moving && mClickedIn && subwidgets.tqfindRef(mClickedIn) != -1 ) { mClickedIn->mouseMove ( e->pos()-mClickedIn->rect().topLeft(), - mClickedIn->rect().contains(mapFromGlobal(TQCursor::pos())) ); + mClickedIn->rect().tqcontains(mapFromGlobal(TQCursor::pos())) ); } } @@ -742,14 +742,14 @@ void KJLoader::mousePressEvent(TQMouseEvent *e) // TQWidget::mousePressEvent(e); - if ( e->button()==RightButton ) + if ( e->button()==Qt::RightButton ) NoatunStdAction::ContextMenu::showContextMenu(); else /* if ( e->button()==LeftButton ) */ { mMousePoint = mapFromGlobal(TQCursor::pos()); // try to find a KJWidget that is here for (KJWidget* i=subwidgets.first(); i!=0; i=subwidgets.next()) - if (i->rect().contains(mMousePoint)) + if (i->rect().tqcontains(mMousePoint)) { if (i->mousePress(mMousePoint-i->rect().topLeft())) { @@ -769,11 +769,11 @@ void KJLoader::mouseReleaseEvent(TQMouseEvent */*e*/) // TQWidget::mouseReleaseEvent(e); - if (!moving && mClickedIn && subwidgets.findRef(mClickedIn)!=-1) + if (!moving && mClickedIn && subwidgets.tqfindRef(mClickedIn)!=-1) { mClickedIn->mouseRelease(mapFromGlobal(TQCursor::pos())- mClickedIn->rect().topLeft(), - mClickedIn->rect().contains( + mClickedIn->rect().tqcontains( mapFromGlobal(TQCursor::pos()))); mClickedIn=0; } @@ -812,7 +812,7 @@ void KJLoader::showSplash() splashScreen->setBackgroundMode ( NoBackground ); splashScreen->setMask( KJWidget::getMask(image(item("splashscreen")[1])) ); - TQSize sh = splashScreen->sizeHint(); + TQSize sh = splashScreen->tqsizeHint(); TQRect desk = KGlobalSettings::splashScreenDesktopGeometry(); splashScreen->move (desk.x() + (desk.width() - sh.width())/2, diff --git a/noatun/modules/kjofol-skin/kjloader.h b/noatun/modules/kjofol-skin/kjloader.h index 6fec9f05..94ab729a 100644 --- a/noatun/modules/kjofol-skin/kjloader.h +++ b/noatun/modules/kjofol-skin/kjloader.h @@ -33,6 +33,7 @@ class KJPrefs; class KJLoader : public TQWidget, public UserInterface, public Parser { Q_OBJECT + TQ_OBJECT NOATUNPLUGIND friend class KJWidget; @@ -43,7 +44,7 @@ public: public: void minimize(); KHelpMenu *helpMenu() const { return mHelpMenu; } - TQStringList &item(const TQString &key) { return *Parser::find(key); } + TQStringList &item(const TQString &key) { return *Parser::tqfind(key); } // returns path to currently loaded configfile // can be either a newly loaded one or one of the three below diff --git a/noatun/modules/kjofol-skin/kjprefs.cpp b/noatun/modules/kjofol-skin/kjprefs.cpp index 4231d0ff..b8e6e4bf 100644 --- a/noatun/modules/kjofol-skin/kjprefs.cpp +++ b/noatun/modules/kjofol-skin/kjprefs.cpp @@ -45,8 +45,8 @@ static TQString expand(TQString s); -KJPrefs::KJPrefs(TQObject* parent) - : CModule(i18n("K-Jöfol Skins"), i18n("Skin Selection For the K-Jöfol Plugin"), "style", parent) +KJPrefs::KJPrefs(TQObject* tqparent) + : CModule(i18n("K-Jöfol Skins"), i18n("Skin Selection For the K-Jöfol Plugin"), "style", tqparent) { cfg = KGlobal::config(); @@ -151,7 +151,7 @@ void KJPrefs::reopen() // reload config and set stuff in dialog skins.sort(); TQString loaded = cfg->readEntry("SkinResource", locate("data", "noatun/skins/kjofol/kjofol/kjofol.rc") ); - loaded = loaded.mid(loaded.findRev("/")+1); // remove path + loaded = loaded.mid(loaded.tqfindRev("/")+1); // remove path loaded = loaded.left( loaded.length() - 3 ); // remove ".rc" mSkinselectorWidget->mSkins->clear(); @@ -454,7 +454,7 @@ void KJPrefs::installNewSkin( void ) { // skindir is named like the archive without extension (FIXME: extension is not stripped from name) - int dotPos = srcFile.fileName().findRev('.'); + int dotPos = srcFile.fileName().tqfindRev('.'); if ( dotPos > 0 ) // found a dot -> (hopefully) strip the extension { dst.addPath( srcFile.fileName().left(dotPos) ); diff --git a/noatun/modules/kjofol-skin/kjprefs.h b/noatun/modules/kjofol-skin/kjprefs.h index a8f52e29..a0849d17 100644 --- a/noatun/modules/kjofol-skin/kjprefs.h +++ b/noatun/modules/kjofol-skin/kjprefs.h @@ -25,8 +25,9 @@ class KJLoader; class KJPrefs : public CModule { Q_OBJECT + TQ_OBJECT public: - KJPrefs(TQObject* parent); + KJPrefs(TQObject* tqparent); // Save which Skin is currently selected virtual void save(); diff --git a/noatun/modules/kjofol-skin/kjseeker.cpp b/noatun/modules/kjofol-skin/kjseeker.cpp index b9b441b1..0d30e506 100644 --- a/noatun/modules/kjofol-skin/kjseeker.cpp +++ b/noatun/modules/kjofol-skin/kjseeker.cpp @@ -22,62 +22,57 @@ KJSeeker::KJSeeker(const TQStringList &i, KJLoader *l) : KJWidget(l), g(0) { kdDebug(66666) << k_funcinfo << "No pressed background found for seeker," << " using default background!" << endl; - parent()->image(parser()["backgroundimage"][1]); + tqparent()->image(parser()["backgroundimage"][1]); } else - mActive = parent()->image(activeBg); + mActive = tqparent()->image(activeBg); - mScale = parent()->image(parser()["seekimage"][1]); - TQImage pixmapNoPress = parent()->image(parser()["backgroundimage"][1]); + mScale = tqparent()->image(parser()["seekimage"][1]); + TQImage pixmapNoPress = tqparent()->image(parser()["backgroundimage"][1]); - // generate transparent mask + // generate transparent tqmask int x, y, xs, ys; x=i[1].toInt(); y=i[2].toInt(); xs=i[3].toInt()-x; ys=i[4].toInt()-y; setRect(x,y,xs,ys); - TQImage transmask(xs, ys, 1, 2, TQImage::LittleEndian); -#if QT_VERSION < 0x030300 - transmask.setColor(0, qRgb(0,0,0)); - transmask.setColor(1, qRgb(255,255,255)); -#else - transmask.setColor(1, qRgb(0,0,0)); - transmask.setColor(0, qRgb(255,255,255)); -#endif + TQImage transtqmask(xs, ys, 1, 2, TQImage::LittleEndian); + transtqmask.setColor(1, tqRgb(0,0,0)); + transtqmask.setColor(0, tqRgb(255,255,255)); // clear the pointers memset(barmodeImages, 0, 256*sizeof(TQImage*)); memset(barmode, 0, 256*sizeof(TQPixmap*)); - // Now do the pixel føking + // Now do the pixel f�king // kdDebug(66666) << "creating Pixmaps for Seeker" << endl; for (int iy=y;iy<y+ys; iy++) { for (int ix=x;ix<x+xs; ix++) { - QRgb checkmScale = mScale.pixel(ix, iy); + TQRgb checkmScale = mScale.pixel(ix, iy); // am I transparent? if (!isGray(checkmScale)) { - setPixel1BPP(transmask, ix-x, iy-y, 0); + setPixel1BPP(transtqmask, ix-x, iy-y, 0); continue; } - setPixel1BPP(transmask, ix-x, iy-y, 1); + setPixel1BPP(transtqmask, ix-x, iy-y, 1); // what is the level int level=grayRgb(checkmScale)+1; if (level>255) level=255; // allocate the pixmap of the level proper // copy the color to the surface proper - QRgb activeColor=mActive.pixel(ix,iy); - QRgb inactiveColor=pixmapNoPress.pixel(ix,iy); + TQRgb activeColor=mActive.pixel(ix,iy); + TQRgb inactiveColor=pixmapNoPress.pixel(ix,iy); // set this pixel and everything before it for(int i=0; i<level; i++) { if (!barmodeImages[i]) barmodeImages[i]=new TQImage(xs,ys, 32); - QRgb *l=(QRgb*)barmodeImages[i]->scanLine(iy-y); + TQRgb *l=(TQRgb*)barmodeImages[i]->scanLine(iy-y); l[ix-x]=inactiveColor; } @@ -85,7 +80,7 @@ KJSeeker::KJSeeker(const TQStringList &i, KJLoader *l) : KJWidget(l), g(0) { if (!barmodeImages[level]) barmodeImages[level]=new TQImage(xs,ys, 32); - QRgb *l=(QRgb*)barmodeImages[level]->scanLine(iy-y); + TQRgb *l=(TQRgb*)barmodeImages[level]->scanLine(iy-y); l[ix-x]=activeColor; } while (level++<255); } @@ -94,10 +89,10 @@ KJSeeker::KJSeeker(const TQStringList &i, KJLoader *l) : KJWidget(l), g(0) // create the blank one barmode[0]=new TQPixmap(xs, ys); - TQPixmap px=parent()->pixmap(parser()["backgroundimage"][1]); - bitBlt(barmode[0], 0, 0, &px, x, y, xs, ys, Qt::CopyROP); - px.convertFromImage(transmask); - barModeMask=px; + TQPixmap px=tqparent()->pixmap(parser()["backgroundimage"][1]); + bitBlt(barmode[0], 0, 0, &px, x, y, xs, ys, TQt::CopyROP); + px.convertFromImage(transtqmask); + barModeMask=TQBitmap(px); // kdDebug(66666) << "END KJSeeker constructor" << endl; } @@ -135,7 +130,7 @@ void KJSeeker::paint(TQPainter *p, const TQRect &) TQPixmap *pixmap = toPixmap(g); pixmap->setMask(barModeMask); bitBlt(p->device(), rect().topLeft().x(), rect().topLeft().y(), - pixmap, 0, 0, rect().width(), rect().height(), Qt::CopyROP); + pixmap, 0, 0, rect().width(), rect().height(), TQt::CopyROP); } bool KJSeeker::mousePress(const TQPoint &pos) @@ -154,14 +149,14 @@ void KJSeeker::mouseRelease(const TQPoint &pos, bool in) if(!mScale.valid(x, y)) return; - QRgb color=mScale.pixel(x, y); + TQRgb color=mScale.pixel(x, y); // user released mousebutton outside of the seeker-area (which is gray) if ( (!isGray(color)) || (!in) ) return; g = grayRgb(color); - repaint(); + tqrepaint(); // kdDebug(66666) << "length : " << napp->player()->getLength() << endl; // kdDebug(66666) << "skip to: " << ((long long)g*(long long)napp->player()->getLength())/255 << endl; @@ -185,7 +180,7 @@ void KJSeeker::timeUpdate(int sec) g = sec * 255 / length; //kdDebug(66666) << "sec: " << sec << " len: " << length << " g: " << g << endl; - TQPainter p(parent()); + TQPainter p(tqparent()); paint(&p, rect()); } diff --git a/noatun/modules/kjofol-skin/kjskinselectorwidget.ui b/noatun/modules/kjofol-skin/kjskinselectorwidget.ui index 1540ad5e..66f3462a 100644 --- a/noatun/modules/kjofol-skin/kjskinselectorwidget.ui +++ b/noatun/modules/kjofol-skin/kjskinselectorwidget.ui @@ -1,10 +1,10 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>KJSkinselector</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>KJSkinselector</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -22,7 +22,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QComboBox"> + <widget class="TQComboBox"> <property name="name"> <cstring>mSkins</cstring> </property> @@ -35,7 +35,7 @@ </sizepolicy> </property> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>previewGroup</cstring> </property> @@ -70,7 +70,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>31</height> @@ -87,7 +87,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>51</width> <height>21</height> @@ -104,7 +104,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>41</height> @@ -121,21 +121,21 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>31</width> <height>21</height> </size> </property> </spacer> - <widget class="QLabel" row="1" column="1" rowspan="2" colspan="1"> + <widget class="TQLabel" row="1" column="1" rowspan="2" colspan="1"> <property name="name"> <cstring>mPreview</cstring> </property> <property name="scaledContents"> <bool>false</bool> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignCenter</set> </property> <property name="hAlign" stdset="0"> @@ -145,7 +145,7 @@ </widget> </grid> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -153,7 +153,7 @@ <string>About skin:</string> </property> </widget> - <widget class="QTextBrowser"> + <widget class="TQTextBrowser"> <property name="name"> <cstring>mAboutText</cstring> </property> @@ -170,7 +170,7 @@ It can be several lines and usually does not contain anything interesting but still this will be shown.</string> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout3</cstring> </property> @@ -197,7 +197,7 @@ It can be several lines and usually does not contain anything interesting but st </sizepolicy> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>installButton</cstring> </property> @@ -205,7 +205,7 @@ It can be several lines and usually does not contain anything interesting but st <string>Install Skin</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>mRemoveButton</cstring> </property> @@ -219,7 +219,7 @@ It can be several lines and usually does not contain anything interesting but st </widget> <customwidgets> </customwidgets> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klineedit.h</includehint> <includehint>kpushbutton.h</includehint> diff --git a/noatun/modules/kjofol-skin/kjsliders.cpp b/noatun/modules/kjofol-skin/kjsliders.cpp index 7b884853..b1e03b7a 100644 --- a/noatun/modules/kjofol-skin/kjsliders.cpp +++ b/noatun/modules/kjofol-skin/kjsliders.cpp @@ -44,8 +44,8 @@ KJVolumeBar::KJVolumeBar(const TQStringList &i, KJLoader *p) // kdDebug(66666) << "x: " << x << " y: " << y << " w: " << xs << " h: " << ys << endl; - mBack = parent()->pixmap(parser()["backgroundimage"][1]); - mSlider = parent()->pixmap(parser()["volumecontrolimage"][1]); + mBack = tqparent()->pixmap(parser()["backgroundimage"][1]); + mSlider = tqparent()->pixmap(parser()["volumecontrolimage"][1]); } TQString KJVolumeBar::tip() @@ -71,7 +71,7 @@ void KJVolumeBar::paint(TQPainter *p, const TQRect &) rect().y() /*- hotSpot.y()*/, rect().width() /*+ (2*hotSpot.x())*/, rect().height() /*+ (2*hotSpot.y())*/, - Qt::CopyROP); + TQt::CopyROP); // draw our slider bitBlt( @@ -83,17 +83,17 @@ void KJVolumeBar::paint(TQPainter *p, const TQRect &) 0, mSlider.width(), mSlider.height(), - Qt::CopyROP); + TQt::CopyROP); if (mText) - mText->repaint(); + mText->tqrepaint(); } bool KJVolumeBar::mousePress(const TQPoint &pos) { mVolume = (pos.x()*100) / rect().width(); // kdDebug(66666) << "volume: " << mVolume << endl; - repaint(); + tqrepaint(); napp->player()->setVolume(mVolume); return true; } @@ -112,7 +112,7 @@ void KJVolumeBar::mouseMove(const TQPoint &pos, bool in) void KJVolumeBar::timeUpdate(int) { mVolume = napp->player()->volume(); - repaint(); + tqrepaint(); } @@ -133,8 +133,8 @@ KJVolumeBMP::KJVolumeBMP(const TQStringList &i, KJLoader *p) mWidth = parser()["volumecontrolimagexsize"][1].toInt(); mCount = parser()["volumecontrolimagenb"][1].toInt()-1; - mImages = parent()->pixmap(parser()["volumecontrolimage"][1]); - mPos = parent()->image(parser()["volumecontrolimageposition"][1]); + mImages = tqparent()->pixmap(parser()["volumecontrolimage"][1]); + mPos = tqparent()->image(parser()["volumecontrolimageposition"][1]); timeUpdate(0); } @@ -146,14 +146,14 @@ TQString KJVolumeBMP::tip() void KJVolumeBMP::paint(TQPainter *p, const TQRect &) { TQRect from(mVolume*mCount/100*mWidth, 0, mWidth, mImages.height()); - bitBlt(p->device(), rect().topLeft(), &mImages, from, Qt::CopyROP); + bitBlt(p->device(), rect().topLeft(), &mImages, from, TQt::CopyROP); if (mText) - mText->repaint(); + mText->tqrepaint(); } bool KJVolumeBMP::mousePress(const TQPoint &pos) { - QRgb color = mPos.pixel ( rect().topLeft().x()+pos.x(), rect().topLeft().y()+pos.y() ); + TQRgb color = mPos.pixel ( rect().topLeft().x()+pos.x(), rect().topLeft().y()+pos.y() ); if (!isGray(color)) return false; @@ -162,7 +162,7 @@ bool KJVolumeBMP::mousePress(const TQPoint &pos) // kdDebug(66666) << "gray : " << grayRgb(color) << endl; // kdDebug(66666) << "volume: " << mVolume << endl; - repaint(); + tqrepaint(); napp->player()->setVolume(mVolume); @@ -187,7 +187,7 @@ void KJVolumeBMP::timeUpdate(int) mOldVolume = mVolume; - repaint(); + tqrepaint(); } @@ -208,12 +208,12 @@ KJPitchBMP::KJPitchBMP(const TQStringList &i, KJLoader *p) mWidth = parser()["pitchcontrolimagexsize"][1].toInt(); mCount = parser()["pitchcontrolimagenb"][1].toInt()-1; - mImages = parent()->pixmap(parser()["pitchcontrolimage"][1]); - mPos = parent()->image(parser()["pitchcontrolimageposition"][1]); + mImages = tqparent()->pixmap(parser()["pitchcontrolimage"][1]); + mPos = tqparent()->image(parser()["pitchcontrolimageposition"][1]); // makes all pixels with rgb(255,0,255) transparent TQImage ibackground; - ibackground = parent()->image(parser()["pitchcontrolimage"][1]); + ibackground = tqparent()->image(parser()["pitchcontrolimage"][1]); mImages.setMask( getMask(ibackground) ); Arts::PlayObject playobject = napp->player()->engine()->playObject(); @@ -236,7 +236,7 @@ KJPitchBMP::KJPitchBMP(const TQStringList &i, KJLoader *p) readConfig(); if (mText) - mText->repaint(); + mText->tqrepaint(); } TQString KJPitchBMP::tip() @@ -250,15 +250,15 @@ void KJPitchBMP::paint(TQPainter *p, const TQRect &) TQRect from( (int)xPos, 0, mWidth, mImages.height()); - bitBlt(p->device(), rect().topLeft(), &mImages, from, Qt::CopyROP); + bitBlt(p->device(), rect().topLeft(), &mImages, from, TQt::CopyROP); if (mText) - mText->repaint(); + mText->tqrepaint(); } bool KJPitchBMP::mousePress(const TQPoint &pos) { - QRgb color = mPos.pixel ( rect().topLeft().x()+pos.x(), rect().topLeft().y()+pos.y() ); + TQRgb color = mPos.pixel ( rect().topLeft().x()+pos.x(), rect().topLeft().y()+pos.y() ); if (!isGray(color)) return false; @@ -266,7 +266,7 @@ bool KJPitchBMP::mousePress(const TQPoint &pos) mCurrentPitch = mMinPitch + ( (grayRgb(color)*(mMaxPitch-mMinPitch)) / 255 ); // kdDebug(66666) << "[KJPitchBMP] mousePress() mCurrentPitch: " << mCurrentPitch << endl; - repaint(); + tqrepaint(); newFile(); // wrong naming, in fact it just sets pitch @@ -300,7 +300,7 @@ void KJPitchBMP::timeUpdate(int) mOldPitch = mCurrentPitch; - repaint(); + tqrepaint(); } void KJPitchBMP::newFile() diff --git a/noatun/modules/kjofol-skin/kjsliders.h b/noatun/modules/kjofol-skin/kjsliders.h index bd3c3324..131261c7 100644 --- a/noatun/modules/kjofol-skin/kjsliders.h +++ b/noatun/modules/kjofol-skin/kjsliders.h @@ -12,7 +12,7 @@ class KJVolumeText; class KJVolumeBMP : public KJWidget { public: - KJVolumeBMP(const TQStringList &, KJLoader *parent); + KJVolumeBMP(const TQStringList &, KJLoader *tqparent); virtual void paint(TQPainter *, const TQRect &rect); virtual bool mousePress(const TQPoint &pos); @@ -36,7 +36,7 @@ private: class KJVolumeBar : public KJWidget { public: - KJVolumeBar(const TQStringList &, KJLoader *parent); + KJVolumeBar(const TQStringList &, KJLoader *tqparent); virtual void paint(TQPainter *, const TQRect &rect); virtual bool mousePress(const TQPoint &pos); @@ -59,7 +59,7 @@ private: class KJPitchBMP : public KJWidget { public: - KJPitchBMP(const TQStringList &, KJLoader *parent); + KJPitchBMP(const TQStringList &, KJLoader *tqparent); virtual void paint(TQPainter *, const TQRect &rect); virtual bool mousePress(const TQPoint &pos); diff --git a/noatun/modules/kjofol-skin/kjtextdisplay.cpp b/noatun/modules/kjofol-skin/kjtextdisplay.cpp index c1a17139..42d546a0 100644 --- a/noatun/modules/kjofol-skin/kjtextdisplay.cpp +++ b/noatun/modules/kjofol-skin/kjtextdisplay.cpp @@ -52,7 +52,7 @@ KJFilename::KJFilename(const TQStringList &l, KJLoader *p) // background under filename-scroller TQPixmap tmp = p->pixmap(p->item("backgroundimage")[1]); mBack = new KPixmap ( TQSize(xs,ys) ); - bitBlt( mBack, 0, 0, &tmp, x, y, xs, ys, Qt::CopyROP ); + bitBlt( mBack, 0, 0, &tmp, x, y, xs, ys, TQt::CopyROP ); setRect(x,y,xs,ys); @@ -77,12 +77,12 @@ void KJFilename::paint(TQPainter *p, const TQRect &) TQPixmap temp ( rect().width(), rect().height() ); // draw background into buffer - bitBlt ( &temp, 0, 0, mBack, 0, 0, -1, -1, Qt::CopyROP ); + bitBlt ( &temp, 0, 0, mBack, 0, 0, -1, -1, TQt::CopyROP ); // draw font into buffer - bitBlt( &temp, 0, 0, &mView, 0, 0, rect().width(), rect().height(), Qt::CopyROP); + bitBlt( &temp, 0, 0, &mView, 0, 0, rect().width(), rect().height(), TQt::CopyROP); // and draw it on screen bitBlt(p->device(), rect().topLeft(), &temp, - TQRect(0,0,-1,-1), Qt::CopyROP); + TQRect(0,0,-1,-1), TQt::CopyROP); } void KJFilename::timerEvent(TQTimerEvent *) @@ -90,25 +90,25 @@ void KJFilename::timerEvent(TQTimerEvent *) int height = mView.height(); int width = mView.width(); - TQBitmap cycleMask ( mDistance, height ); // temporary-space for moving parts of the mask + TQBitmap cycleMask ( mDistance, height ); // temporary-space for moving parts of the tqmask TQPixmap cycle ( mDistance, height ); // temporary-space for moving parts of the pixmap - TQBitmap newMask ( *mView.mask() ); // save old mask + TQBitmap newMask ( *mView.tqmask() ); // save old tqmask - // copy mask like the same way we're doing it with the pixmap - // a mask does not get copied on a bitblt automatically, we have to do + // copy tqmask like the same way we're doing it with the pixmap + // a tqmask does not get copied on a bitblt automatically, we have to do // it "by hand" - bitBlt(&cycleMask, 0,0, &newMask, 0,0, mDistance, height, Qt::CopyROP); - bitBlt(&newMask, 0,0, &newMask, mDistance, 0, width-mDistance, height, Qt::CopyROP); - bitBlt(&newMask, width-mDistance, 0, &cycleMask, 0,0, mDistance, height, Qt::CopyROP); + bitBlt(&cycleMask, 0,0, &newMask, 0,0, mDistance, height, TQt::CopyROP); + bitBlt(&newMask, 0,0, &newMask, mDistance, 0, width-mDistance, height, TQt::CopyROP); + bitBlt(&newMask, width-mDistance, 0, &cycleMask, 0,0, mDistance, height, TQt::CopyROP); - bitBlt(&cycle, 0,0, &mView, 0,0, mDistance, height, Qt::CopyROP); - bitBlt(&mView, 0,0, &mView, mDistance, 0, width-mDistance, height, Qt::CopyROP); - bitBlt(&mView, width-mDistance, 0, &cycle, 0,0, mDistance, height, Qt::CopyROP); + bitBlt(&cycle, 0,0, &mView, 0,0, mDistance, height, TQt::CopyROP); + bitBlt(&mView, 0,0, &mView, mDistance, 0, width-mDistance, height, TQt::CopyROP); + bitBlt(&mView, width-mDistance, 0, &cycle, 0,0, mDistance, height, TQt::CopyROP); - // apply the newly created mask + // apply the newly created tqmask mView.setMask(newMask); - repaint(); + tqrepaint(); } bool KJFilename::mousePress(const TQPoint &) @@ -142,7 +142,7 @@ void KJFilename::readConfig() mDistance = 1; mTimerUpdates = KJLoader::kjofol->prefs()->titleMovingUpdates(); textFont().recalcSysFont(); - mLastTitle=""; // invalidate title so it gets repainted on next timeUpdate() + mLastTitle=""; // tqinvalidate title so it gets tqrepainted on next timeUpdate() } void KJFilename::prepareString(const TQCString &str) @@ -167,7 +167,7 @@ void KJFilename::timeUpdate(int) mLastTitle = title; TQCString timestring = napp->player()->lengthString().local8Bit(); - timestring = timestring.mid(timestring.find('/')+1); + timestring = timestring.mid(timestring.tqfind('/')+1); prepareString ( title + " (" + timestring + ") "); } @@ -206,7 +206,7 @@ KJTime::KJTime(const TQStringList &l, KJLoader *p) // background under time-display TQPixmap tmp = p->pixmap(p->item("backgroundimage")[1]); mBack = new KPixmap ( TQSize(xs,ys) ); - bitBlt( mBack, 0, 0, &tmp, x, y, xs, ys, Qt::CopyROP ); + bitBlt( mBack, 0, 0, &tmp, x, y, xs, ys, TQt::CopyROP ); setRect(x,y,xs,ys); @@ -226,13 +226,13 @@ void KJTime::paint(TQPainter *p, const TQRect &) TQPixmap temp ( rect().width(), rect().height() ); // draw background into buffer - bitBlt ( &temp, 0, 0, mBack, 0, 0, -1, -1, Qt::CopyROP ); - // draw time-display into buffer (that's a pixmap with a mask applied) - bitBlt( &temp, 0, 0, &mTime, 0, 0, rect().width(), rect().height(), Qt::CopyROP); + bitBlt ( &temp, 0, 0, mBack, 0, 0, -1, -1, TQt::CopyROP ); + // draw time-display into buffer (that's a pixmap with a tqmask applied) + bitBlt( &temp, 0, 0, &mTime, 0, 0, rect().width(), rect().height(), TQt::CopyROP); // and draw it on screen bitBlt(p->device(), rect().topLeft(), &temp, - TQRect(0,0, rect().width(), rect().height()), Qt::CopyROP); + TQRect(0,0, rect().width(), rect().height()), TQt::CopyROP); } bool KJTime::mousePress(const TQPoint &) @@ -255,7 +255,7 @@ void KJTime::readConfig() // kdDebug(66666) << "KJTime::readConfig()" << endl; countDown = napp->displayRemaining(); timeFont().recalcSysFont(); - mLastTime=""; // invalidate time so it gets repainted on next timeUpdate() + mLastTime=""; // tqinvalidate time so it gets tqrepainted on next timeUpdate() } TQString KJTime::lengthString ( void ) @@ -325,7 +325,7 @@ void KJTime::prepareString(const TQCString &str) mLastTime = str; mTime = timeFont().draw(str, rect().width()); - repaint(); + tqrepaint(); // kdDebug(66666) << "END KJTime::prepareString(const TQCString &str)" << endl; } @@ -364,7 +364,7 @@ KJVolumeText::KJVolumeText(const TQStringList &l, KJLoader *p) // background under volumetext-display TQPixmap tmp = p->pixmap(p->item("backgroundimage")[1]); mBack = new KPixmap ( TQSize(xs,ys) ); - bitBlt( mBack, 0, 0, &tmp, x, y, xs, ys, Qt::CopyROP ); + bitBlt( mBack, 0, 0, &tmp, x, y, xs, ys, TQt::CopyROP ); setRect(x,y,xs,ys); @@ -381,13 +381,13 @@ void KJVolumeText::paint(TQPainter *p, const TQRect &) TQPixmap temp ( rect().width(), rect().height() ); // draw background into buffer - bitBlt ( &temp, 0, 0, mBack, 0, 0, -1, -1, Qt::CopyROP ); + bitBlt ( &temp, 0, 0, mBack, 0, 0, -1, -1, TQt::CopyROP ); // draw time-display into buffer - bitBlt( &temp, 0, 0, &mVolume, 0, 0, rect().width(), rect().height(), Qt::CopyROP); + bitBlt( &temp, 0, 0, &mVolume, 0, 0, rect().width(), rect().height(), TQt::CopyROP); // and draw it on screen bitBlt(p->device(), rect().topLeft(), &temp, - TQRect(0,0,-1,-1), Qt::CopyROP); + TQRect(0,0,-1,-1), TQt::CopyROP); } bool KJVolumeText::mousePress(const TQPoint &) @@ -398,7 +398,7 @@ bool KJVolumeText::mousePress(const TQPoint &) void KJVolumeText::readConfig() { volumeFont().recalcSysFont(); - mLastVolume=""; // invalidate value so it gets repainted on next timeUpdate() + mLastVolume=""; // tqinvalidate value so it gets tqrepainted on next timeUpdate() } void KJVolumeText::timeUpdate(int) @@ -421,7 +421,7 @@ void KJVolumeText::prepareString(const TQCString &str) mLastVolume = str; mVolume = volumeFont().draw(str, rect().width()); - repaint(); + tqrepaint(); } TQString KJVolumeText::tip() @@ -454,7 +454,7 @@ KJPitchText::KJPitchText(const TQStringList &l, KJLoader *p) // background under time-display TQPixmap tmp = p->pixmap(p->item("backgroundimage")[1]); mBack = new KPixmap ( TQSize(xs,ys) ); - bitBlt( mBack, 0, 0, &tmp, x, y, xs, ys, Qt::CopyROP ); + bitBlt( mBack, 0, 0, &tmp, x, y, xs, ys, TQt::CopyROP ); setRect(x,y,xs,ys); @@ -472,11 +472,11 @@ void KJPitchText::paint(TQPainter *p, const TQRect &) TQPixmap temp ( rect().width(), rect().height() ); // draw background into buffer - bitBlt ( &temp, 0, 0, mBack, 0, 0, -1, -1, Qt::CopyROP ); + bitBlt ( &temp, 0, 0, mBack, 0, 0, -1, -1, TQt::CopyROP ); // draw time-display into buffer - bitBlt( &temp, 0, 0, &mSpeed, 0, 0, rect().width(), rect().height(), Qt::CopyROP); + bitBlt( &temp, 0, 0, &mSpeed, 0, 0, rect().width(), rect().height(), TQt::CopyROP); // and draw it on screen - bitBlt(p->device(), rect().topLeft(), &temp, TQRect(0,0,-1,-1), Qt::CopyROP); + bitBlt(p->device(), rect().topLeft(), &temp, TQRect(0,0,-1,-1), TQt::CopyROP); } bool KJPitchText::mousePress(const TQPoint &) @@ -501,7 +501,7 @@ void KJPitchText::mouseRelease(const TQPoint &, bool in) void KJPitchText::readConfig() { pitchFont().recalcSysFont(); - mLastPitch=""; // invalidate value so it gets repainted on next timeUpdate() + mLastPitch=""; // tqinvalidate value so it gets tqrepainted on next timeUpdate() } void KJPitchText::timeUpdate(int) @@ -529,7 +529,7 @@ void KJPitchText::prepareString(const TQCString &str) mLastPitch = str; mSpeed = pitchFont().draw(str, rect().width()); - repaint(); + tqrepaint(); } TQString KJPitchText::tip() @@ -566,7 +566,7 @@ KJFileInfo::KJFileInfo(const TQStringList &l, KJLoader *p) // background under info-display TQPixmap tmp = p->pixmap(p->item("backgroundimage")[1]); mBack = new KPixmap ( TQSize(xs,ys) ); - bitBlt( mBack, 0, 0, &tmp, x, y, xs, ys, Qt::CopyROP ); + bitBlt( mBack, 0, 0, &tmp, x, y, xs, ys, TQt::CopyROP ); setRect(x,y,xs,ys); @@ -583,13 +583,13 @@ void KJFileInfo::paint(TQPainter *p, const TQRect &) TQPixmap temp ( rect().width(), rect().height() ); // draw background into buffer - bitBlt ( &temp, 0, 0, mBack, 0, 0, -1, -1, Qt::CopyROP ); - // draw time-display into buffer (that's a pixmap with a mask applied) - bitBlt( &temp, 0, 0, &mTime, 0, 0, rect().width(), rect().height(), Qt::CopyROP); + bitBlt ( &temp, 0, 0, mBack, 0, 0, -1, -1, TQt::CopyROP ); + // draw time-display into buffer (that's a pixmap with a tqmask applied) + bitBlt( &temp, 0, 0, &mTime, 0, 0, rect().width(), rect().height(), TQt::CopyROP); // and draw it on screen bitBlt(p->device(), rect().topLeft(), &temp, - TQRect(0,0, rect().width(), rect().height()), Qt::CopyROP); + TQRect(0,0, rect().width(), rect().height()), TQt::CopyROP); } bool KJFileInfo::mousePress(const TQPoint &) @@ -600,7 +600,7 @@ bool KJFileInfo::mousePress(const TQPoint &) void KJFileInfo::readConfig() { textFont().recalcSysFont(); - mLastTime=""; // invalidate value so it gets repainted on next timeUpdate() + mLastTime=""; // tqinvalidate value so it gets tqrepainted on next timeUpdate() } void KJFileInfo::timeUpdate(int) @@ -634,7 +634,7 @@ void KJFileInfo::prepareString(const TQCString &str) return; mLastTime = str; mTime = textFont().draw(str, rect().width()); - repaint(); + tqrepaint(); } TQString KJFileInfo::tip() diff --git a/noatun/modules/kjofol-skin/kjtextdisplay.h b/noatun/modules/kjofol-skin/kjtextdisplay.h index 893efac0..0a5caa0a 100644 --- a/noatun/modules/kjofol-skin/kjtextdisplay.h +++ b/noatun/modules/kjofol-skin/kjtextdisplay.h @@ -12,8 +12,9 @@ class KPixmap; class KJFilename : public TQObject, public KJWidget { Q_OBJECT + TQ_OBJECT public: - KJFilename(const TQStringList &, KJLoader *parent); + KJFilename(const TQStringList &, KJLoader *tqparent); ~KJFilename(); virtual void paint(TQPainter *, const TQRect &rect); @@ -42,7 +43,7 @@ private: class KJTime : public KJWidget { public: - KJTime(const TQStringList &, KJLoader *parent); + KJTime(const TQStringList &, KJLoader *tqparent); ~KJTime(); virtual void paint(TQPainter *, const TQRect &rect); @@ -72,7 +73,7 @@ private: class KJVolumeText : public KJWidget { public: - KJVolumeText(const TQStringList &, KJLoader *parent); + KJVolumeText(const TQStringList &, KJLoader *tqparent); ~KJVolumeText(); virtual void paint(TQPainter *, const TQRect &rect); @@ -94,7 +95,7 @@ private: class KJPitchText : public KJWidget { public: - KJPitchText(const TQStringList &, KJLoader *parent); + KJPitchText(const TQStringList &, KJLoader *tqparent); ~KJPitchText(); virtual void paint(TQPainter *, const TQRect &rect); @@ -117,7 +118,7 @@ private: class KJFileInfo : public KJWidget { public: - KJFileInfo(const TQStringList &, KJLoader *parent); + KJFileInfo(const TQStringList &, KJLoader *tqparent); ~KJFileInfo(); virtual void paint(TQPainter *, const TQRect &rect); diff --git a/noatun/modules/kjofol-skin/kjvis.cpp b/noatun/modules/kjofol-skin/kjvis.cpp index 3bd40f00..8915e434 100644 --- a/noatun/modules/kjofol-skin/kjvis.cpp +++ b/noatun/modules/kjofol-skin/kjvis.cpp @@ -35,8 +35,8 @@ void KJVisScope::swapScope(Visuals newOne) { //kdDebug(66666) << k_funcinfo << endl; - TQStringList line = parent()->item("analyzerwindow"); - KJLoader *p=parent(); + TQStringList line = tqparent()->item("analyzerwindow"); + KJLoader *p=tqparent(); p->removeChild(this); delete this; @@ -66,8 +66,8 @@ void KJVisScope::swapScope(Visuals newOne) * KJNullScope *******************************************/ -KJNullScope::KJNullScope(const TQStringList &l, KJLoader *parent) - : KJVisScope(parent) +KJNullScope::KJNullScope(const TQStringList &l, KJLoader *tqparent) + : KJVisScope(tqparent) { int x = l[1].toInt(); int y = l[2].toInt(); @@ -75,17 +75,17 @@ KJNullScope::KJNullScope(const TQStringList &l, KJLoader *parent) int ys = l[4].toInt() - y; // background under vis - TQPixmap tmp = parent->pixmap(parent->item("backgroundimage")[1]); + TQPixmap tmp = tqparent->pixmap(tqparent->item("backgroundimage")[1]); mBack = new KPixmap ( TQSize(xs,ys) ); - bitBlt( mBack, 0, 0, &tmp, x, y, xs, ys, Qt::CopyROP ); + bitBlt( mBack, 0, 0, &tmp, x, y, xs, ys, TQt::CopyROP ); setRect ( x, y, xs, ys ); - repaint(); + tqrepaint(); } void KJNullScope::paint(TQPainter *p, const TQRect &) { // just redraw the background - bitBlt ( p->device(), rect().topLeft(), mBack, TQRect(0,0,-1,-1), Qt::CopyROP ); + bitBlt ( p->device(), rect().topLeft(), mBack, TQRect(0,0,-1,-1), TQt::CopyROP ); } bool KJNullScope::mousePress(const TQPoint &) @@ -98,7 +98,7 @@ void KJNullScope::mouseRelease(const TQPoint &, bool in) if (!in) // only do something if users is still inside the button return; - parent()->repaint(rect(), false); + tqparent()->tqrepaint(rect(), false); swapScope(FFT); } @@ -108,7 +108,7 @@ void KJNullScope::readConfig() Visuals v = (Visuals) KJLoader::kjofol->prefs()->visType(); if ( v != Null ) { - parent()->repaint(rect(), false); + tqparent()->tqrepaint(rect(), false); swapScope ( v ); } } @@ -118,8 +118,8 @@ void KJNullScope::readConfig() * KJFFT - Analyzer like visualization, mono *************************************************/ -KJFFT::KJFFT(const TQStringList &l, KJLoader *parent) - : KJVisScope(parent), MonoFFTScope(50), mGradient(0) +KJFFT::KJFFT(const TQStringList &l, KJLoader *tqparent) + : KJVisScope(tqparent), MonoFFTScope(50), mGradient(0) { int x = l[1].toInt(); int y = l[2].toInt(); @@ -129,7 +129,7 @@ KJFFT::KJFFT(const TQStringList &l, KJLoader *parent) // each bar will be 1px wide mMultiples=1; - if ( parent->exist("analyzercolor") ) + if ( tqparent->exist("analyzercolor") ) { TQStringList &col = parser()["analyzercolor"]; mColor.setRgb ( col[1].toInt(), col[2].toInt(), col[3].toInt() ); @@ -140,12 +140,12 @@ KJFFT::KJFFT(const TQStringList &l, KJLoader *parent) } // background under vis - TQPixmap tmp = parent->pixmap(parent->item("backgroundimage")[1]); + TQPixmap tmp = tqparent->pixmap(tqparent->item("backgroundimage")[1]); mBack = new KPixmap ( TQSize(xs,ys) ); - bitBlt( mBack, 0, 0, &tmp, x, y, xs, ys, Qt::CopyROP ); + bitBlt( mBack, 0, 0, &tmp, x, y, xs, ys, TQt::CopyROP ); mAnalyzer = new KPixmap ( TQSize(xs,ys) ); - bitBlt( mAnalyzer, 0, 0, &tmp, x, y, xs, ys, Qt::CopyROP ); + bitBlt( mAnalyzer, 0, 0, &tmp, x, y, xs, ys, TQt::CopyROP ); // create a gradient for the bars going from 30% lighter to 30% darker than mColor mGradient = new KPixmap ( TQSize(xs,ys) ); @@ -163,7 +163,7 @@ void KJFFT::scopeEvent(float *d, int size) if ( !napp->player()->isPlaying() ) // don't draw if we aren't playing (either paused or stopped) { if ( napp->player()->isStopped() ) // clear vis-window if playing has been stopped - parent()->repaint(rect(), false); + tqparent()->tqrepaint(rect(), false); return; } @@ -171,12 +171,12 @@ void KJFFT::scopeEvent(float *d, int size) int h = rect().height(); TQBitmap mGradientMask ( rect().width(), h, true ); - TQPainter mask( &mGradientMask ); + TQPainter tqmask( &mGradientMask ); float *start = d ; float *end = d + size /*- 1*/; - // loop creating the mask for vis-gradient + // loop creating the tqmask for vis-gradient for ( ; start < end; ++start ) { // 5 has been 8 before and I have no idea how this scaling works :/ @@ -191,26 +191,26 @@ void KJFFT::scopeEvent(float *d, int size) else if ( amp > h ) amp = h; // make a part of the analyzer-gradient visible - mask.fillRect ( x, (h-amp), mMultiples, amp, Qt::color1 ); + tqmask.fillRect ( x, (h-amp), mMultiples, amp, TQt::color1 ); x += mMultiples; } - // done creating our mask + // done creating our tqmask // draw background of vis into it - bitBlt ( mAnalyzer, 0, 0, mBack, 0, 0, -1, -1, Qt::CopyROP ); + bitBlt ( mAnalyzer, 0, 0, mBack, 0, 0, -1, -1, TQt::CopyROP ); // draw the analyzer mGradient->setMask(mGradientMask); - bitBlt ( mAnalyzer, 0, 0, mGradient, 0, 0, -1, -1, Qt::CopyROP ); + bitBlt ( mAnalyzer, 0, 0, mGradient, 0, 0, -1, -1, TQt::CopyROP ); - repaint(); + tqrepaint(); } void KJFFT::paint(TQPainter *p, const TQRect &) { // put that thing on screen if ( !napp->player()->isStopped() ) - bitBlt ( p->device(), rect().topLeft(), mAnalyzer, TQRect(0,0,-1,-1), Qt::CopyROP ); + bitBlt ( p->device(), rect().topLeft(), mAnalyzer, TQRect(0,0,-1,-1), TQt::CopyROP ); } @@ -225,7 +225,7 @@ void KJFFT::mouseRelease(const TQPoint &, bool in) return; stop(); - parent()->repaint(rect(), false); + tqparent()->tqrepaint(rect(), false); swapScope(Mono); } @@ -236,7 +236,7 @@ void KJFFT::readConfig() if ( v != FFT ) { stop(); - parent()->repaint(rect(), false); + tqparent()->tqrepaint(rect(), false); swapScope ( v ); return; } @@ -250,8 +250,8 @@ void KJFFT::readConfig() * KJStereoFFT - Analyzer like visualization, stereo *************************************************/ -KJStereoFFT::KJStereoFFT(const TQStringList &l, KJLoader *parent) - : KJVisScope(parent), StereoFFTScope(50), mGradient(0) +KJStereoFFT::KJStereoFFT(const TQStringList &l, KJLoader *tqparent) + : KJVisScope(tqparent), StereoFFTScope(50), mGradient(0) { //kdDebug(66666) << k_funcinfo << endl; @@ -263,7 +263,7 @@ KJStereoFFT::KJStereoFFT(const TQStringList &l, KJLoader *parent) // each bar will be 1px wide mMultiples=1; - if ( parent->exist("analyzercolor") ) + if ( tqparent->exist("analyzercolor") ) { TQStringList &col = parser()["analyzercolor"]; mColor.setRgb ( col[1].toInt(), col[2].toInt(), col[3].toInt() ); @@ -274,12 +274,12 @@ KJStereoFFT::KJStereoFFT(const TQStringList &l, KJLoader *parent) } // background under vis - TQPixmap tmp = parent->pixmap(parent->item("backgroundimage")[1]); + TQPixmap tmp = tqparent->pixmap(tqparent->item("backgroundimage")[1]); mBack = new KPixmap ( TQSize(xs,ys) ); - bitBlt( mBack, 0, 0, &tmp, x, y, xs, ys, Qt::CopyROP ); + bitBlt( mBack, 0, 0, &tmp, x, y, xs, ys, TQt::CopyROP ); mAnalyzer = new KPixmap ( TQSize(xs,ys) ); - bitBlt( mAnalyzer, 0, 0, &tmp, x, y, xs, ys, Qt::CopyROP ); + bitBlt( mAnalyzer, 0, 0, &tmp, x, y, xs, ys, TQt::CopyROP ); // create a gradient for the bars going from 30% lighter to 30% darker than mColor mGradient = new KPixmap ( TQSize(xs,ys) ); @@ -297,7 +297,7 @@ void KJStereoFFT::scopeEvent(float *left, float *right, int len) if ( !napp->player()->isPlaying() ) // don't draw if we aren't playing (either paused or stopped) { if ( napp->player()->isStopped() ) // clear vis-window if playing has been stopped - parent()->repaint(rect(), false); + tqparent()->tqrepaint(rect(), false); return; } @@ -305,7 +305,7 @@ void KJStereoFFT::scopeEvent(float *left, float *right, int len) int hh = (int)(rect().height()/2); TQBitmap mGradientMask ( rect().width(), h, true ); - TQPainter mask( &mGradientMask ); + TQPainter tqmask( &mGradientMask ); float *start = left; float *end = left + len; @@ -313,7 +313,7 @@ void KJStereoFFT::scopeEvent(float *left, float *right, int len) int amp = 0; int x = 0; - // loop creating the mask for vis-gradient + // loop creating the tqmask for vis-gradient for ( ; start < end; ++start ) { n = log((*start)+1) * (float)hh * 5; @@ -324,16 +324,16 @@ void KJStereoFFT::scopeEvent(float *left, float *right, int len) else if ( amp > hh ) amp = hh; // make a part of the analyzer-gradient visible - mask.fillRect ( x, (h-amp), mMultiples, amp, Qt::color1 ); + tqmask.fillRect ( x, (h-amp), mMultiples, amp, TQt::color1 ); x += mMultiples; } - // done creating our mask + // done creating our tqmask start = right; end = right + len; x = 0; - // loop creating the mask for vis-gradient + // loop creating the tqmask for vis-gradient for ( ; start < end; ++start ) { n = log((*start)+1) * (float)hh * 5; @@ -344,26 +344,26 @@ void KJStereoFFT::scopeEvent(float *left, float *right, int len) else if ( amp > hh ) amp = hh; // make a part of the analyzer-gradient visible - mask.fillRect ( x, 0, mMultiples, amp, Qt::color1 ); + tqmask.fillRect ( x, 0, mMultiples, amp, TQt::color1 ); x += mMultiples; } // draw background of vis into it - bitBlt ( mAnalyzer, 0, 0, mBack, 0, 0, -1, -1, Qt::CopyROP ); + bitBlt ( mAnalyzer, 0, 0, mBack, 0, 0, -1, -1, TQt::CopyROP ); // draw the analyzer mGradient->setMask(mGradientMask); - bitBlt ( mAnalyzer, 0, 0, mGradient, 0, 0, -1, -1, Qt::CopyROP ); + bitBlt ( mAnalyzer, 0, 0, mGradient, 0, 0, -1, -1, TQt::CopyROP ); - repaint(); + tqrepaint(); } void KJStereoFFT::paint(TQPainter *p, const TQRect &) { // put that thing on screen if ( !napp->player()->isStopped() ) - bitBlt ( p->device(), rect().topLeft(), mAnalyzer, TQRect(0,0,-1,-1), Qt::CopyROP ); + bitBlt ( p->device(), rect().topLeft(), mAnalyzer, TQRect(0,0,-1,-1), TQt::CopyROP ); } bool KJStereoFFT::mousePress(const TQPoint &) @@ -376,7 +376,7 @@ void KJStereoFFT::mouseRelease(const TQPoint &, bool in) if (!in) // only do something if users is still inside the button return; stop(); - parent()->repaint(rect(), false); + tqparent()->tqrepaint(rect(), false); swapScope(Null); } @@ -387,7 +387,7 @@ void KJStereoFFT::readConfig() if ( v != StereoFFT ) { stop(); - parent()->repaint(rect(), false); + tqparent()->tqrepaint(rect(), false); swapScope ( v ); return; } @@ -399,8 +399,8 @@ void KJStereoFFT::readConfig() * KJScope - oscilloscope like visualization *************************************************/ -KJScope::KJScope(const TQStringList &l, KJLoader *parent) - : KJVisScope(parent), MonoScope(50)/*, blurnum(0), mOsci(0)*/ +KJScope::KJScope(const TQStringList &l, KJLoader *tqparent) + : KJVisScope(tqparent), MonoScope(50)/*, blurnum(0), mOsci(0)*/ { int x=l[1].toInt(); int y=l[2].toInt(); @@ -411,7 +411,7 @@ KJScope::KJScope(const TQStringList &l, KJLoader *parent) // kdDebug(66666) << "Analyzer Window " << x << "," << y << " " << mWidth << "," << mHeight << endl; - if ( parent->exist("analyzercolor") ) + if ( tqparent->exist("analyzercolor") ) { TQStringList &col = parser()["analyzercolor"]; mColor.setRgb ( col[1].toInt(), col[2].toInt(), col[3].toInt() ); @@ -420,12 +420,12 @@ KJScope::KJScope(const TQStringList &l, KJLoader *parent) mColor.setRgb ( 255, 255, 255 ); // background under vis - TQPixmap tmp = parent->pixmap(parent->item("backgroundimage")[1]); + TQPixmap tmp = tqparent->pixmap(tqparent->item("backgroundimage")[1]); mBack = new KPixmap ( TQSize(xs,ys) ); - bitBlt( mBack, 0, 0, &tmp, x, y, xs, ys, Qt::CopyROP ); + bitBlt( mBack, 0, 0, &tmp, x, y, xs, ys, TQt::CopyROP ); mOsci = new KPixmap ( TQSize(xs,ys) ); - bitBlt( mOsci, 0, 0, &tmp, x, y, xs, ys, Qt::CopyROP ); + bitBlt( mOsci, 0, 0, &tmp, x, y, xs, ys, TQt::CopyROP ); // create a gradient mGradient = new KPixmap ( TQSize(xs,ys) ); @@ -447,8 +447,8 @@ void KJScope::scopeEvent(float *d, int size) { if ( napp->player()->isStopped() ) { - bitBlt ( mOsci, 0, 0, mBack, 0, 0, -1, -1, Qt::CopyROP ); - repaint(); + bitBlt ( mOsci, 0, 0, mBack, 0, 0, -1, -1, TQt::CopyROP ); + tqrepaint(); } return; } @@ -463,7 +463,7 @@ void KJScope::scopeEvent(float *d, int size) if ( blurnum == 3 ) { // clear whole Vis - bitBlt ( mOsci, 0, 0, mBack, 0, 0, -1, -1, Qt::CopyROP ); + bitBlt ( mOsci, 0, 0, mBack, 0, 0, -1, -1, TQt::CopyROP ); tempP.setPen( mColor.light(110) ); // 10% lighter than mColor blurnum=0; } @@ -487,23 +487,23 @@ void KJScope::scopeEvent(float *d, int size) // tempP.drawLine(x, heightHalf, x, heightHalf+amp); if ( amp > 0 ) { - bitBlt ( tempP.device(), TQPoint(x,heightHalf), mGradient, TQRect(x,heightHalf,1,amp), Qt::CopyROP ); + bitBlt ( tempP.device(), TQPoint(x,heightHalf), mGradient, TQRect(x,heightHalf,1,amp), TQt::CopyROP ); } else { amp = -amp; - bitBlt ( tempP.device(), TQPoint(x,heightHalf-amp), mGradient, TQRect(x,(heightHalf-amp),1,amp), Qt::CopyROP ); + bitBlt ( tempP.device(), TQPoint(x,heightHalf-amp), mGradient, TQRect(x,(heightHalf-amp),1,amp), TQt::CopyROP ); } x++; } - repaint(); + tqrepaint(); } void KJScope::paint(TQPainter *p, const TQRect &) { // put that thing on screen - bitBlt ( p->device(), rect().topLeft(), mOsci, TQRect(0,0,-1,-1), Qt::CopyROP ); + bitBlt ( p->device(), rect().topLeft(), mOsci, TQRect(0,0,-1,-1), TQt::CopyROP ); } bool KJScope::mousePress(const TQPoint &) @@ -517,7 +517,7 @@ void KJScope::mouseRelease(const TQPoint &, bool in) return; stop(); - parent()->repaint(rect(), false); + tqparent()->tqrepaint(rect(), false); swapScope(/*Null*/ StereoFFT); } @@ -528,7 +528,7 @@ void KJScope::readConfig() if ( v != Mono ) { stop(); - parent()->repaint(rect(), false); + tqparent()->tqrepaint(rect(), false); swapScope ( v ); return; } diff --git a/noatun/modules/kjofol-skin/kjvis.h b/noatun/modules/kjofol-skin/kjvis.h index a05103d8..9f8bec4d 100644 --- a/noatun/modules/kjofol-skin/kjvis.h +++ b/noatun/modules/kjofol-skin/kjvis.h @@ -8,7 +8,7 @@ class KPixmap; class KJVisScope : public KJWidget { public: - KJVisScope(KJLoader *parent) : KJWidget(parent) {}; + KJVisScope(KJLoader *tqparent) : KJWidget(tqparent) {}; enum Visuals { Null=0, FFT, Mono, StereoFFT }; void swapScope(Visuals newOne); // virtual void readConfig(); @@ -19,7 +19,7 @@ public: class KJNullScope : public KJVisScope { public: - KJNullScope(const TQStringList &, KJLoader *parent); + KJNullScope(const TQStringList &, KJLoader *tqparent); virtual void paint(TQPainter *p, const TQRect &); virtual bool mousePress(const TQPoint&); virtual void mouseRelease(const TQPoint &, bool in); @@ -35,7 +35,7 @@ private: class KJFFT : public KJVisScope, public MonoFFTScope { public: - KJFFT(const TQStringList &, KJLoader *parent); + KJFFT(const TQStringList &, KJLoader *tqparent); virtual void paint(TQPainter *p, const TQRect &); virtual void scopeEvent(float *d, int size); @@ -57,7 +57,7 @@ private: class KJStereoFFT : public KJVisScope, public StereoFFTScope { public: - KJStereoFFT(const TQStringList &, KJLoader *parent); + KJStereoFFT(const TQStringList &, KJLoader *tqparent); virtual void paint(TQPainter *p, const TQRect &); virtual void scopeEvent(float *left, float *right, int len); @@ -79,7 +79,7 @@ private: class KJScope : public KJVisScope, public MonoScope { public: - KJScope ( const TQStringList &, KJLoader *parent); + KJScope ( const TQStringList &, KJLoader *tqparent); virtual void paint(TQPainter *p, const TQRect &); virtual void scopeEvent(float *d, int size); diff --git a/noatun/modules/kjofol-skin/kjwidget.cpp b/noatun/modules/kjofol-skin/kjwidget.cpp index b46fb651..d292637a 100644 --- a/noatun/modules/kjofol-skin/kjwidget.cpp +++ b/noatun/modules/kjofol-skin/kjwidget.cpp @@ -18,16 +18,11 @@ KJWidget::KJWidget(KJLoader *p) : mParent(p) { } -TQBitmap KJWidget::getMask(const TQImage &_rect, register QRgb transparent) +TQBitmap KJWidget::getMask(const TQImage &_rect, register TQRgb transparent) { TQImage result(_rect.width(), _rect.height(), 1,2, TQImage::LittleEndian); -#if QT_VERSION < 0x030300 - result.setColor(0, qRgb(0,0,0)); //TODO: maybe use Qt::color0 and Qt::color1 - result.setColor(1, qRgb(255,255,255)); -#else - result.setColor(1, qRgb(0,0,0)); - result.setColor(0, qRgb(255,255,255)); -#endif + result.setColor(1, tqRgb(0,0,0)); + result.setColor(0, tqRgb(255,255,255)); for(int height=0;height<_rect.height(); height++) { @@ -39,21 +34,21 @@ TQBitmap KJWidget::getMask(const TQImage &_rect, register QRgb transparent) return bm; } -void KJWidget::repaint(bool me, const TQRect &r, bool clear) +void KJWidget::tqrepaint(bool me, const TQRect &r, bool clear) { - TQPainter p(parent()); + TQPainter p(tqparent()); if (me) paint(&p, r.isValid() ? r : rect()); else - parent()->repaint(r.isValid() ? r : rect(), clear); + tqparent()->tqrepaint(r.isValid() ? r : rect(), clear); } const TQString &KJWidget::backgroundPressed(const TQString &bmp) const { if(bmp.isEmpty()) // play safe { -// kdDebug(66666) << k_funcinfo << "empty argument 'bmp', returning TQString::null!" << endl; - return TQString::null; +// kdDebug(66666) << k_funcinfo << "empty argument 'bmp', returning TQString()!" << endl; + return TQString(); } // kdDebug(66666) << k_funcinfo << "Returning pressed pixmap for '" << bmp.latin1() << "'" << endl; @@ -63,7 +58,7 @@ const TQString &KJWidget::backgroundPressed(const TQString &bmp) const if(item.count() < 2) { // kdDebug(66666) << k_funcinfo << "backgroundimagepressed doesn't have enough keys in its line!" << endl; - return TQString::null; + return TQString(); } else return item[1]; diff --git a/noatun/modules/kjofol-skin/kjwidget.h b/noatun/modules/kjofol-skin/kjwidget.h index 3f63671b..693d4eaa 100644 --- a/noatun/modules/kjofol-skin/kjwidget.h +++ b/noatun/modules/kjofol-skin/kjwidget.h @@ -25,17 +25,17 @@ public: virtual void readConfig() {} // called when the mouse is moved while clicked in this widget - // repaint myself - virtual void repaint(bool me=true, const TQRect &rect=TQRect(), bool clear=false); + // tqrepaint myself + virtual void tqrepaint(bool me=true, const TQRect &rect=TQRect(), bool clear=false); virtual TQString tip() { return 0; } public: - static TQBitmap getMask(const TQImage &color, register QRgb=qRgb(255,0,255)); + static TQBitmap getMask(const TQImage &color, register TQRgb=tqRgb(255,0,255)); protected: const TQString &backgroundPressed(const TQString &bmp) const; - KJLoader *parent() const {return mParent;} + KJLoader *tqparent() const {return mParent;} KJLoader &parser() const {return *mParent;} KJFont &textFont() const {return *mParent->mText;} diff --git a/noatun/modules/kjofol-skin/parser.cpp b/noatun/modules/kjofol-skin/parser.cpp index aae5b12e..7b6be03a 100644 --- a/noatun/modules/kjofol-skin/parser.cpp +++ b/noatun/modules/kjofol-skin/parser.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - parser.cpp - Reads *.rc files in kjöfol-config-format into a QDict + parser.cpp - Reads *.rc files in kjöfol-config-format into a TQDict -------------------------------------- Maintainer: Stefan Gehn <sgehn@gmx.net> @@ -82,7 +82,7 @@ Parser::ImagePixmap* Parser::getPair(const TQString &filenameOld) const // is it in there? ImagePixmap *pair; { - pair=mImageCache.find(filenameOld); + pair=mImageCache.tqfind(filenameOld); if (pair) return pair; } @@ -128,5 +128,5 @@ Parser::ImagePixmap* Parser::getPair(const TQString &filenameOld) const bool Parser::exist(const TQString &i) const { - return (bool)find(i); + return (bool)tqfind(i); } diff --git a/noatun/modules/kjofol-skin/parser.h b/noatun/modules/kjofol-skin/parser.h index 3f691253..5c838726 100644 --- a/noatun/modules/kjofol-skin/parser.h +++ b/noatun/modules/kjofol-skin/parser.h @@ -36,7 +36,7 @@ class Parser : public TQDict<TQStringList> bool exist(const TQString &i) const; public: - TQStringList& operator[](const TQString &l) { return *find(l);} + TQStringList& operator[](const TQString &l) { return *tqfind(l);} private: ImagePixmap *getPair(const TQString &i) const; diff --git a/noatun/modules/marquis/marquis.cpp b/noatun/modules/marquis/marquis.cpp index 15a298c3..0a55e8c8 100644 --- a/noatun/modules/marquis/marquis.cpp +++ b/noatun/modules/marquis/marquis.cpp @@ -37,7 +37,7 @@ #include <noatun/engine.h> #include <kaction.h> -static int getPlayStatus( Player *player ) +static int getPlaytqStatus( Player *player ) { if ( player->isPlaying() ) return 1; @@ -46,7 +46,7 @@ static int getPlayStatus( Player *player ) return 0; } -static void setPlayStatus( Player *player, int status ) +static void setPlaytqStatus( Player *player, int status ) { switch( status ) { @@ -107,14 +107,14 @@ void Marquis::saveSessionConfig(KConfig *c) if ( !player->current().isNull() ) { KURL songURL = player->current().url(); - songURL.setPass( TQString::null ); // don't save passwords + songURL.setPass( TQString() ); // don't save passwords c->writePathEntry("Current Song", songURL.url()); } else - c->writePathEntry("Current Song", TQString::null); + c->writePathEntry("Current Song", TQString()); c->writeEntry("Current Position", player->getTime()); - c->writeEntry("PlayStatus", getPlayStatus( player )); + c->writeEntry("PlaytqStatus", getPlaytqStatus( player )); // borrowed from Plugin config dialog TQStringList specList; @@ -122,7 +122,7 @@ void Marquis::saveSessionConfig(KConfig *c) TQValueList<NoatunLibraryInfo> loaded = napp->libraryLoader()->loaded(); for( TQValueList<NoatunLibraryInfo>::Iterator i = loaded.begin(); i != loaded.end(); ++i) { - if(!specList.contains((*i).specfile) + if(!specList.tqcontains((*i).specfile) && napp->libraryLoader()->isLoaded((*i).specfile) && (*i).specfile != "marquis.plugin") { @@ -139,7 +139,7 @@ void Marquis::readSessionConfig(KConfig *c) { Player *player = napp->player(); - c->setGroup(TQString::null); + c->setGroup(TQString()); // First set volume, then load modules, some module could start // playback and that would be with 100% volume! diff --git a/noatun/modules/marquis/marquis.h b/noatun/modules/marquis/marquis.h index 5b166d57..e1d91f7d 100644 --- a/noatun/modules/marquis/marquis.h +++ b/noatun/modules/marquis/marquis.h @@ -23,8 +23,8 @@ // used in advertising or otherwise to promote the sale, use or other dealings // in this Software without prior written authorization from the author(s). -#ifndef MARQUIS_H -#define MARQUIS_H +#ifndef MARTQUIS_H +#define MARTQUIS_H #include <noatun/plugin.h> #include <noatun/app.h> @@ -35,6 +35,7 @@ class Player; class Marquis : public KMainWindow, public SessionManagement { Q_OBJECT + TQ_OBJECT NOATUNPLUGIND public: Marquis(); diff --git a/noatun/modules/metatag/edit.cpp b/noatun/modules/metatag/edit.cpp index 83c53c1f..dd4390db 100644 --- a/noatun/modules/metatag/edit.cpp +++ b/noatun/modules/metatag/edit.cpp @@ -37,9 +37,9 @@ Editor::Editor() TQHBox *heading = new TQHBox(mMainWidget, "Editor::heading"); heading->setSpacing(4); mFileIcon = new TQLabel(heading); - mFileIcon->setAlignment(AlignVCenter | AlignLeft); + mFileIcon->tqsetAlignment(AlignVCenter | AlignLeft); mFile = new TQLabel(heading); - mFile->setAlignment(AlignVCenter | AlignLeft); + mFile->tqsetAlignment(AlignVCenter | AlignLeft); heading->setStretchFactor(mFile, 2); mGrid->addMultiCellWidget(heading, 0, 0, 0, 2); @@ -53,7 +53,7 @@ Editor::Editor() connect(this, TQT_SIGNAL(okClicked()), TQT_SLOT(save())); enableButtonSeparator(true); - setFixedHeight(sizeHint().height()); + setFixedHeight(tqsizeHint().height()); } void Editor::open(const PlaylistItem & file) @@ -158,7 +158,7 @@ void Editor::saveControl(KFileMetaInfo& meta_info, const MetaWidget &meta_widget kdWarning() << "Cannot save " << meta_widget.key << " as required type." << endl; } -MetaWidget* Editor::createControl(KFileMetaInfo& meta_info, const TQString &label, const TQString &key, TQVariant::Type default_type, bool optional, TQWidget *parent) { +MetaWidget* Editor::createControl(KFileMetaInfo& meta_info, const TQString &label, const TQString &key, TQVariant::Type default_type, bool optional, TQWidget *tqparent) { TQLabel *tmp_label = 0L; KFileMetaInfoItem info_item = meta_info.item(key); TQVariant::Type type; @@ -182,7 +182,7 @@ MetaWidget* Editor::createControl(KFileMetaInfo& meta_info, const TQString &labe // Get the correct validator if ( info && !groupName.isNull() ) - validator = info->createValidator( groupName, key, parent ); + validator = info->createValidator( groupName, key, TQT_TQOBJECT(tqparent) ); // meta_widget is used for book-keeping internally meta_widget = new MetaWidget; @@ -190,7 +190,7 @@ MetaWidget* Editor::createControl(KFileMetaInfo& meta_info, const TQString &labe if ((type == TQVariant::Int) || (type == TQVariant::UInt)) { // We're an int, make a spin box - TQSpinBox *box = new TQSpinBox(parent); + TQSpinBox *box = new TQSpinBox(tqparent); // Well, normally metatag doesn't care that much about suffixes // and prefixes, but this is just too easy. @@ -226,7 +226,7 @@ MetaWidget* Editor::createControl(KFileMetaInfo& meta_info, const TQString &labe combo_box = validator->isA("KStringListValidator"); if (combo_box) { - TQComboBox *combo = new TQComboBox(parent); + TQComboBox *combo = new TQComboBox(tqparent); combo->clear(); combo->insertStringList(static_cast< @@ -241,7 +241,7 @@ MetaWidget* Editor::createControl(KFileMetaInfo& meta_info, const TQString &labe else { KLineEdit *edit; - edit = new KLineEdit(parent); + edit = new KLineEdit(tqparent); edit->setText(info_item.value().toString()); edit->setValidator(validator); connect(edit, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(modified())); @@ -258,7 +258,7 @@ MetaWidget* Editor::createControl(KFileMetaInfo& meta_info, const TQString &labe mGrid->addMultiCellWidget(meta_widget->widget, mNextRow, mNextRow, 1, 2); // Add our label. This is the easy part - tmp_label = new TQLabel(meta_widget->widget, label + ":", parent); + tmp_label = new TQLabel(meta_widget->widget, label + ":", tqparent); mGrid->addWidget(tmp_label, mNextRow, 0); @@ -277,7 +277,7 @@ TQString Editor::keyGroup(const KFileMetaInfo& i, TQString key) { } } - return TQString::null; + return TQString(); } bool Editor::keyAddable(const KFileMetaInfo &i, TQString key) { diff --git a/noatun/modules/metatag/edit.h b/noatun/modules/metatag/edit.h index e2d53f89..f0e94778 100644 --- a/noatun/modules/metatag/edit.h +++ b/noatun/modules/metatag/edit.h @@ -17,6 +17,7 @@ struct MetaWidget { class Editor:public KDialogBase { Q_OBJECT + TQ_OBJECT public: Editor(); @@ -35,7 +36,7 @@ class Editor:public KDialogBase { TQString keyGroup(const KFileMetaInfo &, TQString); void saveControl(KFileMetaInfo& meta_info, const MetaWidget&); - MetaWidget *createControl(KFileMetaInfo& meta_info, const TQString &label, const TQString &key, TQVariant::Type default_type, bool optional, TQWidget *parent); + MetaWidget *createControl(KFileMetaInfo& meta_info, const TQString &label, const TQString &key, TQVariant::Type default_type, bool optional, TQWidget *tqparent); TQPtrList<MetaWidget> mControls; diff --git a/noatun/modules/metatag/metatag.h b/noatun/modules/metatag/metatag.h index 4559edaf..05dbd5b5 100644 --- a/noatun/modules/metatag/metatag.h +++ b/noatun/modules/metatag/metatag.h @@ -13,6 +13,7 @@ class KAction; class MetaTagLoader:public TQObject, public Tags, public Plugin { Q_OBJECT + TQ_OBJECT public: MetaTagLoader(); ~MetaTagLoader(); diff --git a/noatun/modules/monoscope/monoscope.cpp b/noatun/modules/monoscope/monoscope.cpp index 758d3950..1fa07fdd 100644 --- a/noatun/modules/monoscope/monoscope.cpp +++ b/noatun/modules/monoscope/monoscope.cpp @@ -20,14 +20,14 @@ Monoscope::Monoscope() : TQWidget(0,0,WRepaintNoErase), MonoScope(30), Plugin() NOATUNPLUGINC(Monoscope); mAction=0L; - mLowColor=qRgb(0,0,0); - mHighColor=qRgb(238,238,238); + mLowColor=tqRgb(0,0,0); + mHighColor=tqRgb(238,238,238); resize(320, 240); MonoScope::start(); setCaption(i18n("Monoscope")); show(); resizeEvent(0); - repaint(0,0, TQWidget::width(), height(), false); + tqrepaint(0,0, TQWidget::width(), height(), false); resizeEvent(0); setBackgroundColor(mLowColor); } @@ -41,7 +41,7 @@ Monoscope::~Monoscope() void Monoscope::init() { mAction = new KToggleAction(i18n("Toggle Monoscope"), 0, 0, - this, TQT_SLOT(toggle()), this, "togglemonoscope"); + TQT_TQOBJECT(this), TQT_SLOT(toggle()), TQT_TQOBJECT(this), "togglemonoscope"); mAction->setChecked(!isHidden()); napp->pluginActionMenu()->insert(mAction); } @@ -83,7 +83,7 @@ void Monoscope::scopeEvent(float *d, int size) buffer.fill(mLowColor); TQPainter p(&buffer); p.setPen(mHighColor); - repaint(rect()); + tqrepaint(rect()); if (line) p.moveTo(0, y); @@ -105,7 +105,7 @@ void Monoscope::scopeEvent(float *d, int size) } if (line) p.drawLine(0, y, size, y); - bitBlt(this, 0, 0, &buffer, 0, 0, viewWidth, viewHeight, Qt::CopyROP); + bitBlt(this, 0, 0, &buffer, 0, 0, viewWidth, viewHeight, TQt::CopyROP); } #include "monoscope.moc" diff --git a/noatun/modules/monoscope/monoscope.h b/noatun/modules/monoscope/monoscope.h index 0f9ddcff..59ae7500 100644 --- a/noatun/modules/monoscope/monoscope.h +++ b/noatun/modules/monoscope/monoscope.h @@ -8,6 +8,7 @@ class KToggleAction; class Monoscope : public TQWidget, public MonoScope, public Plugin { Q_OBJECT + TQ_OBJECT NOATUNPLUGIND public: @@ -26,7 +27,7 @@ protected: virtual void resizeEvent(TQResizeEvent *); private: - QRgb mHighColor, mLowColor; + TQRgb mHighColor, mLowColor; KToggleAction *mAction; }; diff --git a/noatun/modules/net/net.h b/noatun/modules/net/net.h index 41c07438..5e6c509d 100644 --- a/noatun/modules/net/net.h +++ b/noatun/modules/net/net.h @@ -10,6 +10,7 @@ class Net : public TQServerSocket, public Plugin { Q_OBJECT + TQ_OBJECT public: Net(); diff --git a/noatun/modules/noatunui/userinterface.cpp b/noatun/modules/noatunui/userinterface.cpp index 0302efe6..3afd3698 100644 --- a/noatun/modules/noatunui/userinterface.cpp +++ b/noatun/modules/noatunui/userinterface.cpp @@ -80,9 +80,9 @@ MilkChocolate::MilkChocolate() : TQWidget(0,"NoatunUI"), UserInterface() } - mVolume=new L33tSlider(0,100,10,0, Horizontal, this); + mVolume=new L33tSlider(0,100,10,0,Qt::Horizontal, this); mVolume->setValue(napp->player()->volume()); - mSeeker=new L33tSlider(0,1000,10,0, Horizontal, this); + mSeeker=new L33tSlider(0,1000,10,0,Qt::Horizontal, this); mStatusBar=new KStatusBar(this); @@ -92,7 +92,7 @@ MilkChocolate::MilkChocolate() : TQWidget(0,"NoatunUI"), UserInterface() l->addWidget(mStop,0,1); l->addWidget(mPlay,0,2); l->addWidget(mForward,0,3); - l->addWidget(mPlaylist,0,4, Qt::AlignLeft); + l->addWidget(mPlaylist,0,4, TQt::AlignLeft); l->addWidget(mLoop,0,5); l->addWidget(mPopup,0,6); l->addColSpacing(4, buttonSize+8); @@ -132,7 +132,7 @@ MilkChocolate::MilkChocolate() : TQWidget(0,"NoatunUI"), UserInterface() connect(napp->player(), TQT_SIGNAL(playlistHidden()), TQT_SLOT(playlistHidden())); // Event Filter for the RMB - for (TQPtrListIterator<TQObject> i(*children()); i.current(); ++i) + for (TQPtrListIterator<TQObject> i(childrenListObject()); i.current(); ++i) (*i)->installEventFilter(this); setCaption("Noatun"); @@ -140,7 +140,7 @@ MilkChocolate::MilkChocolate() : TQWidget(0,"NoatunUI"), UserInterface() show(); // What it is now, stay, stay.. roll over, good boy! - setFixedSize(minimumSize()); + setFixedSize(tqminimumSize()); } MilkChocolate::~MilkChocolate() @@ -179,7 +179,7 @@ void MilkChocolate::dropEvent(TQDropEvent *event) void MilkChocolate::mouseReleaseEvent(TQMouseEvent *e) { TQWidget::mouseReleaseEvent(e); - if (e->button()!=RightButton) return; + if (e->button()!=Qt::RightButton) return; NoatunStdAction::ContextMenu::showContextMenu(); } @@ -199,13 +199,13 @@ void MilkChocolate::changeCaption(const TQString& text) void MilkChocolate::popup() { NoatunStdAction::ContextMenu::showContextMenu( - mapToGlobal(mPopup->geometry().bottomLeft()) + mapToGlobal(mPopup->tqgeometry().bottomLeft()) ); } void MilkChocolate::slotPlaying() { -// connect(kwinmodule, TQT_SIGNAL(windowAdded(WId)), view, TQT_SLOT(attemptReparent(WId))); +// connect(kwinmodule, TQT_SIGNAL(windowAdded(WId)), view, TQT_SLOT(attemptRetqparent(WId))); changeStatusbar(napp->player()->current().title(), napp->player()->lengthString()); mPlay->setOn(true); mStop->setEnabled(true); @@ -281,15 +281,15 @@ void MilkChocolate::changeLoopType(int t) bool MilkChocolate::eventFilter(TQObject *o, TQEvent *e) { if ((e->type() == TQEvent::MouseButtonRelease) - && ((static_cast<TQMouseEvent*>(e))->button()==RightButton)) + && ((TQT_TQMOUSEEVENT(e))->button()==Qt::RightButton)) { - mouseReleaseEvent(static_cast<TQMouseEvent*>(e)); + mouseReleaseEvent(TQT_TQMOUSEEVENT(e)); return true; } if (e->type() == TQEvent::Wheel) { - wheelEvent(static_cast<TQWheelEvent*>(e)); + wheelEvent(TQT_TQWHEELEVENT(e)); return true; } return TQWidget::eventFilter(o, e); diff --git a/noatun/modules/noatunui/userinterface.h b/noatun/modules/noatunui/userinterface.h index d20b2536..77bf2222 100644 --- a/noatun/modules/noatunui/userinterface.h +++ b/noatun/modules/noatunui/userinterface.h @@ -24,6 +24,7 @@ class KStatusBar; class MilkChocolate : public TQWidget, public UserInterface { Q_OBJECT + TQ_OBJECT public: MilkChocolate(); virtual ~MilkChocolate(); diff --git a/noatun/modules/simple/propertiesdialog.ui b/noatun/modules/simple/propertiesdialog.ui index 08f4f71c..875baa10 100644 --- a/noatun/modules/simple/propertiesdialog.ui +++ b/noatun/modules/simple/propertiesdialog.ui @@ -1,11 +1,11 @@ <!DOCTYPE UI><UI version="3.0" stdsetdef="1"> <class>PropertiesDialog</class> <author>Ewald Snel</author> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>PropertiesDialog</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -26,11 +26,11 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QTabWidget"> + <widget class="TQTabWidget"> <property name="name"> <cstring>TabWidget2</cstring> </property> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>details</cstring> </property> @@ -47,11 +47,11 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLineEdit" row="0" column="2"> + <widget class="TQLineEdit" row="0" column="2"> <property name="name"> <cstring>nameField</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>180</width> <height>0</height> @@ -78,15 +78,15 @@ <enum>Horizontal</enum> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>iconLabel</cstring> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignLeft</set> </property> </widget> - <widget class="QLabel" row="2" column="2"> + <widget class="TQLabel" row="2" column="2"> <property name="name"> <cstring>typeLabel</cstring> </property> @@ -109,7 +109,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -130,7 +130,7 @@ <enum>Horizontal</enum> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>TextLabel7_2</cstring> </property> @@ -138,24 +138,24 @@ <string>Type:</string> </property> </widget> - <widget class="QLabel" row="2" column="1" rowspan="4" colspan="1"> + <widget class="TQLabel" row="2" column="1" rowspan="4" colspan="1"> <property name="name"> <cstring>TextLabel2_2</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>25</width> <height>0</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>25</width> <height>32767</height> </size> </property> </widget> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>TextLabel5</cstring> </property> @@ -163,7 +163,7 @@ <string>Length:</string> </property> </widget> - <widget class="QLabel" row="3" column="2"> + <widget class="TQLabel" row="3" column="2"> <property name="name"> <cstring>lengthLabel</cstring> </property> @@ -176,7 +176,7 @@ </sizepolicy> </property> </widget> - <widget class="QLabel" row="4" column="0"> + <widget class="TQLabel" row="4" column="0"> <property name="name"> <cstring>TextLabel6</cstring> </property> @@ -184,7 +184,7 @@ <string>Audio:</string> </property> </widget> - <widget class="QLabel" row="4" column="2"> + <widget class="TQLabel" row="4" column="2"> <property name="name"> <cstring>audioLabel</cstring> </property> @@ -197,7 +197,7 @@ </sizepolicy> </property> </widget> - <widget class="QLabel" row="5" column="0"> + <widget class="TQLabel" row="5" column="0"> <property name="name"> <cstring>TextLabel7</cstring> </property> @@ -205,7 +205,7 @@ <string>Video:</string> </property> </widget> - <widget class="QLabel" row="5" column="2"> + <widget class="TQLabel" row="5" column="2"> <property name="name"> <cstring>videoLabel</cstring> </property> @@ -220,7 +220,7 @@ </widget> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>playobject</cstring> </property> @@ -237,17 +237,17 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>TextLabel2</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>80</width> <height>0</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>80</width> <height>32767</height> @@ -257,12 +257,12 @@ <string>Description:</string> </property> </widget> - <widget class="QLabel" row="0" column="1"> + <widget class="TQLabel" row="0" column="1"> <property name="name"> <cstring>descriptionLabel</cstring> </property> </widget> - <widget class="QListView" row="1" column="0" rowspan="1" colspan="2"> + <widget class="TQListView" row="1" column="0" rowspan="1" colspan="2"> <column> <property name="text"> <string>Capabilities</string> @@ -281,7 +281,7 @@ </grid> </widget> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>buttonLayout</cstring> </property> @@ -305,14 +305,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>okButton</cstring> </property> @@ -341,8 +341,8 @@ <include location="global" impldecl="in declaration">kmimetype.h</include> <include location="local" impldecl="in implementation">propertiesdialog.ui.h</include> </includes> -<slots> +<Q_SLOTS> <slot specifier="non virtual">setPlayObject( PlaylistItem pi, Arts::PlayObject po )</slot> -</slots> -<layoutdefaults spacing="6" margin="11"/> +</Q_SLOTS> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/noatun/modules/simple/propertiesdialog.ui.h b/noatun/modules/simple/propertiesdialog.ui.h index ef6f14f9..bf106f24 100644 --- a/noatun/modules/simple/propertiesdialog.ui.h +++ b/noatun/modules/simple/propertiesdialog.ui.h @@ -21,14 +21,14 @@ void PropertiesDialog::setPlayObject( PlaylistItem pi, Arts::PlayObject po ) descriptionLabel->setText( po.description().c_str() ); // Determine capabilities - if (!(item = (TQCheckListItem *)capsList->findItem( "capSeek", 0 ))) + if (!(item = (TQCheckListItem *)capsList->tqfindItem( "capSeek", 0 ))) { item = new TQCheckListItem( capsList, "capSeek", TQCheckListItem::CheckBox ); } item->setOn( (ncaps & Arts::capSeek) ); - if (!(item = (TQCheckListItem *)capsList->findItem( "capPause", 0 ))) + if (!(item = (TQCheckListItem *)capsList->tqfindItem( "capPause", 0 ))) { item = new TQCheckListItem( capsList, "capPause", TQCheckListItem::CheckBox ); @@ -46,7 +46,7 @@ void PropertiesDialog::setPlayObject( PlaylistItem pi, Arts::PlayObject po ) // PlaylistItem properties (name and mimetype) if (!pi.isNull()) { - setCaption( i18n("Properties for %1").arg(pi.url().fileName()) ); + setCaption( i18n("Properties for %1").tqarg(pi.url().fileName()) ); KSharedPtr<KMimeType> mime = KMimeType::mimeType( pi.mimetype() ); iconLabel->setPixmap( mime->pixmap( KIcon::Desktop, KIcon::SizeMedium ) ); diff --git a/noatun/modules/simple/userinterface.cpp b/noatun/modules/simple/userinterface.cpp index 685b2467..591335f9 100644 --- a/noatun/modules/simple/userinterface.cpp +++ b/noatun/modules/simple/userinterface.cpp @@ -74,7 +74,7 @@ SimpleUI::SimpleUI() napp->player()->handleButtons(); - resize( minimumSize() ); + resize( tqminimumSize() ); // Show UI and calculate video widget frame show(); @@ -126,10 +126,10 @@ SimpleUI::~SimpleUI() void SimpleUI::setupActions() { - KStdAction::open( napp, TQT_SLOT(fileOpen()), actionCollection(), "_file_open" ); - new KAction( i18n("&Properties"), 0, propertiesDialog, TQT_SLOT(show()), + KStdAction::open( TQT_TQOBJECT(napp), TQT_SLOT(fileOpen()), actionCollection(), "_file_open" ); + new KAction( i18n("&Properties"), 0, TQT_TQOBJECT(propertiesDialog), TQT_SLOT(show()), actionCollection(), "_file_properties" ); - KStdAction::quit( napp, TQT_SLOT(quit()), actionCollection(), "_file_quit"); + KStdAction::quit( TQT_TQOBJECT(napp), TQT_SLOT(quit()), actionCollection(), "_file_quit"); NoatunStdAction::playlist( actionCollection(), "view_playlist" ); actionCollection()->insert(video->action( "half_size" )); @@ -139,14 +139,14 @@ void SimpleUI::setupActions() actionCollection()->insert(napp->pluginActionMenu()); - menubarAction = KStdAction::showMenubar(this, TQT_SLOT(showMenubar()), + menubarAction = KStdAction::showMenubar(TQT_TQOBJECT(this), TQT_SLOT(showMenubar()), actionCollection()); - statusbarAction = KStdAction::showStatusbar(this, TQT_SLOT(showStatusbar()), + statusbarAction = KStdAction::showStatusbar(TQT_TQOBJECT(this), TQT_SLOT(showStatusbar()), actionCollection()); NoatunStdAction::effects( actionCollection(), "effects" ); NoatunStdAction::equalizer( actionCollection(), "equalizer" ); NoatunStdAction::loop( actionCollection(), "loop_style" ); - KStdAction::preferences( napp, TQT_SLOT(preferences()), actionCollection() ); + KStdAction::preferences( TQT_TQOBJECT(napp), TQT_SLOT(preferences()), actionCollection() ); } void SimpleUI::showMenubar() @@ -173,7 +173,7 @@ void SimpleUI::setupCentralWidget() npWidget->setSpacing( 0 ); positionLabel = new TQLabel( statusBar() ); - positionLabel->setAlignment( AlignVCenter | AlignCenter ); + positionLabel->tqsetAlignment( AlignVCenter | AlignCenter ); positionLabel->setFixedSize( fontMetrics().size( 0, " 00:00/00:00 " ) ); statusBar()->addWidget( positionLabel, 0, true ); @@ -214,7 +214,7 @@ void SimpleUI::setupCentralWidget() TQToolTip::add( forwButton, i18n("Forward") ); connect( forwButton, TQT_SIGNAL(clicked()), napp->player(), TQT_SLOT(forward()) ); - slider = new L33tSlider( 0, 1000, 10, 0, L33tSlider::Horizontal, ctlFrame ); + slider = new L33tSlider( 0, 1000, 10, 0, Qt::Horizontal, ctlFrame ); slider->setFixedHeight( 24 ); slider->setMinimumWidth( 100 ); slider->setTickmarks( TQSlider::NoMarks ); @@ -238,15 +238,15 @@ void SimpleUI::setupCentralWidget() volumeLabel = new TQLabel( volumeFrame ); volumeLabel->setText( "100%" ); - volumeLabel->setAlignment( AlignCenter ); - volumeLabel->setFixedSize( volumeLabel->sizeHint() ); + volumeLabel->tqsetAlignment( AlignCenter ); + volumeLabel->setFixedSize( volumeLabel->tqsizeHint() ); TQHBox *volumeSubFrame = new TQHBox( volumeFrame ); - volumeSlider = new L33tSlider( 0, 100, 10, 0, Vertical, volumeSubFrame ); + volumeSlider = new L33tSlider( 0, 100, 10, 0,Qt::Vertical, volumeSubFrame ); volumeSlider->setValue( 100 - napp->player()->volume() ); - volumeSlider->setFixedSize( volumeSlider->sizeHint() ); + volumeSlider->setFixedSize( volumeSlider->tqsizeHint() ); - volumeFrame->resize( volumeFrame->sizeHint() ); + volumeFrame->resize( volumeFrame->tqsizeHint() ); connect( volumeSlider, TQT_SIGNAL(sliderMoved(int)), TQT_SLOT(slotVolumeSliderMoved(int)) ); connect( volumeSlider, TQT_SIGNAL(userChanged(int)), TQT_SLOT(slotVolumeSliderMoved(int)) ); @@ -254,7 +254,7 @@ void SimpleUI::setupCentralWidget() setCentralWidget( npWidget ); - video->setMinimumSize( minimumSizeHint().width(), 1 ); + video->setMinimumSize( tqminimumSizeHint().width(), 1 ); // Create properties dialog propertiesDialog = new PropertiesDialog( this ); diff --git a/noatun/modules/simple/userinterface.h b/noatun/modules/simple/userinterface.h index e3a84f84..251471ee 100644 --- a/noatun/modules/simple/userinterface.h +++ b/noatun/modules/simple/userinterface.h @@ -28,6 +28,7 @@ class SimpleUI : public KMainWindow, public UserInterface { Q_OBJECT + TQ_OBJECT public: SimpleUI(); diff --git a/noatun/modules/splitplaylist/find.cpp b/noatun/modules/splitplaylist/find.cpp index 5d378a79..99eaa8ed 100644 --- a/noatun/modules/splitplaylist/find.cpp +++ b/noatun/modules/splitplaylist/find.cpp @@ -5,14 +5,14 @@ #include <tqcheckbox.h> #include <klocale.h> -Finder::Finder(TQWidget *parent) : KDialogBase(parent, 0, false, i18n("Find"), Close | User1, User1, false, KGuiItem(i18n("&Find"),"find")) +Finder::Finder(TQWidget *tqparent) : KDialogBase(tqparent, 0, false, i18n("Find"), Close | User1, User1, false, KGuiItem(i18n("&Find"),"tqfind")) { TQWidget *mainWidget = new TQWidget(this); mainWidget->setMinimumWidth(320); setMainWidget(mainWidget); - TQGridLayout *layout=new TQGridLayout(mainWidget); - layout->setSpacing(KDialog::spacingHint()); + TQGridLayout *tqlayout=new TQGridLayout(mainWidget); + tqlayout->setSpacing(KDialog::spacingHint()); mText=new KHistoryCombo(mainWidget); mText->setMaxCount(10); @@ -22,9 +22,9 @@ Finder::Finder(TQWidget *parent) : KDialogBase(parent, 0, false, i18n("Find"), C mRegexp=new TQCheckBox(i18n("&Regular expression"), mainWidget); mBackwards=new TQCheckBox(i18n("Find &backwards"), mainWidget); - layout->addMultiCellWidget(mText, 0, 0, 0, 1); - layout->addWidget(mRegexp, 1, 0); - layout->addWidget(mBackwards, 1, 1); + tqlayout->addMultiCellWidget(mText, 0, 0, 0, 1); + tqlayout->addWidget(mRegexp, 1, 0); + tqlayout->addWidget(mBackwards, 1, 1); connect(this, TQT_SIGNAL(user1Clicked()), TQT_SLOT(clicked())); diff --git a/noatun/modules/splitplaylist/find.h b/noatun/modules/splitplaylist/find.h index 8c0d461e..47a53f99 100644 --- a/noatun/modules/splitplaylist/find.h +++ b/noatun/modules/splitplaylist/find.h @@ -10,8 +10,9 @@ class TQPushButton; class Finder : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - Finder(TQWidget *parent); + Finder(TQWidget *tqparent); bool regexp() const; bool isForward() const; diff --git a/noatun/modules/splitplaylist/playlist.cpp b/noatun/modules/splitplaylist/playlist.cpp index d0ded140..d7ddd1bf 100644 --- a/noatun/modules/splitplaylist/playlist.cpp +++ b/noatun/modules/splitplaylist/playlist.cpp @@ -217,14 +217,14 @@ void SplitPlaylist::setCurrent(const PlaylistItem &i, bool emitC) if (now) now->setPixmap(0, TQPixmap()); - TQRect rect(view->listView()->itemRect(static_cast<SafeListViewItem*>(current().data()))); + TQRect rect(view->listView()->tqitemRect(static_cast<SafeListViewItem*>(current().data()))); rect.setWidth(view->listView()->viewport()->width()); currentItem=i; - view->listView()->viewport()->repaint(rect,true); + view->listView()->viewport()->tqrepaint(rect,true); view->listView()->ensureItemVisible(static_cast<SafeListViewItem*>(current().data())); - TQRect currentRect= view->listView()->itemRect(static_cast<SafeListViewItem*>(current().data())); - view->listView()->viewport()->repaint(currentRect); + TQRect currentRect= view->listView()->tqitemRect(static_cast<SafeListViewItem*>(current().data())); + view->listView()->viewport()->tqrepaint(currentRect); now=static_cast<SafeListViewItem*>(current().data()); if(now) diff --git a/noatun/modules/splitplaylist/playlist.h b/noatun/modules/splitplaylist/playlist.h index 6f9b5ae6..13a309bf 100644 --- a/noatun/modules/splitplaylist/playlist.h +++ b/noatun/modules/splitplaylist/playlist.h @@ -28,6 +28,7 @@ class TQListViewItem; class SplitPlaylist : public Playlist, public Plugin { Q_OBJECT + TQ_OBJECT friend class SafeListViewItem; friend class List; public: diff --git a/noatun/modules/splitplaylist/view.cpp b/noatun/modules/splitplaylist/view.cpp index 8df38afd..f1874f3a 100644 --- a/noatun/modules/splitplaylist/view.cpp +++ b/noatun/modules/splitplaylist/view.cpp @@ -43,13 +43,13 @@ #define SPL SplitPlaylist::SPL() -SafeListViewItem::SafeListViewItem(TQListView *parent, TQListViewItem *after, const KURL &text) - : TQCheckListItem(parent,0, TQCheckListItem::CheckBox), PlaylistItemData(), removed(false) +SafeListViewItem::SafeListViewItem(TQListView *tqparent, TQListViewItem *after, const KURL &text) + : TQCheckListItem(tqparent,0, TQCheckListItem::CheckBox), PlaylistItemData(), removed(false) { addRef(); setUrl(text); - static_cast<KListView*>(parent)->moveItem(this, 0, after); + static_cast<KListView*>(TQT_TQWIDGET(tqparent))->moveItem(this, 0, after); setOn(true); // is this really needed, it makes the listview too wide for me :( @@ -65,8 +65,8 @@ SafeListViewItem::SafeListViewItem(TQListView *parent, TQListViewItem *after, co PlaylistItemData::added(); } -SafeListViewItem::SafeListViewItem(TQListView *parent, TQListViewItem *after, const TQMap<TQString,TQString> &props) - : TQCheckListItem(parent, 0, TQCheckListItem::CheckBox), removed(false) +SafeListViewItem::SafeListViewItem(TQListView *tqparent, TQListViewItem *after, const TQMap<TQString,TQString> &props) + : TQCheckListItem(tqparent, 0, TQCheckListItem::CheckBox), removed(false) { addRef(); @@ -91,7 +91,7 @@ SafeListViewItem::SafeListViewItem(TQListView *parent, TQListViewItem *after, co } } - static_cast<KListView*>(parent)->moveItem(this, 0, after); + static_cast<KListView*>(TQT_TQWIDGET(tqparent))->moveItem(this, 0, after); modified(); if (!streamable() && enqueue(url())) @@ -288,7 +288,7 @@ void SafeListViewItem::stateChange(bool s) TQPtrList<TQListViewItem> list=SPL->view->listView()->selectedItems(); // but not if I'm not selected - if (list.containsRef(this)) + if (list.tqcontainsRef(this)) for (TQListViewItem *i=list.first(); i != 0; i=list.next()) static_cast<TQCheckListItem*>(i)->setOn(s); else @@ -344,8 +344,8 @@ void SafeListViewItem::remove() PlaylistItemData::removed(); } -List::List(View *parent) - : KListView(parent), recursiveAddAfter(0), listJob(0) +List::List(View *tqparent) + : KListView(tqparent), recursiveAddAfter(0), listJob(0) { addColumn(i18n("File")); addColumn(i18n("Time")); @@ -355,10 +355,10 @@ List::List(View *parent) setDragEnabled(true); setItemsMovable(true); setSelectionMode(TQListView::Extended); - connect(this, TQT_SIGNAL(dropped(TQDropEvent*, TQListViewItem*)), TQT_SLOT(dropEvent(TQDropEvent*, TQListViewItem*))); - connect(this, TQT_SIGNAL(moved()), TQT_SLOT(move())); - connect(this, TQT_SIGNAL(aboutToMove()), parent, TQT_SLOT(setNoSorting())); - connect(this, TQT_SIGNAL(deleteCurrentItem()), parent, TQT_SLOT(deleteSelected())); + connect(TQT_TQOBJECT(this), TQT_SIGNAL(dropped(TQDropEvent*, TQListViewItem*)), TQT_SLOT(dropEvent(TQDropEvent*, TQListViewItem*))); + connect(TQT_TQOBJECT(this), TQT_SIGNAL(moved()), TQT_SLOT(move())); + connect(TQT_TQOBJECT(this), TQT_SIGNAL(aboutToMove()), tqparent, TQT_SLOT(setNoSorting())); + connect(TQT_TQOBJECT(this), TQT_SIGNAL(deleteCurrentItem()), tqparent, TQT_SLOT(deleteSelected())); } List::~List() @@ -377,7 +377,7 @@ bool List::acceptDrag(TQDropEvent *event) const void List::dropEvent(TQDropEvent *event, TQListViewItem *after) { - static_cast<View*>(parent())->setNoSorting(); + static_cast<View*>(TQT_TQWIDGET(tqparent()))->setNoSorting(); KURL::List textlist; if (!KURLDrag::decode(event, textlist)) return; event->acceptAction(); @@ -467,7 +467,7 @@ bool View::saveToURL(const KURL &url) } else { - KMessageBox::error( this, i18n("Could not write to %1.").arg(url.prettyURL()) ); + KMessageBox::error( this, i18n("Could not write to %1.").tqarg(url.prettyURL()) ); return false; } } @@ -638,25 +638,25 @@ View::View(SplitPlaylist *) { list=new List(this); setCentralWidget(list); - connect(list, TQT_SIGNAL(modified(void)), this, TQT_SLOT(setModified(void)) ); + connect(list, TQT_SIGNAL(modified(void)), TQT_TQOBJECT(this), TQT_SLOT(setModified(void)) ); // connect the click on the header with sorting connect(list->header(),TQT_SIGNAL(clicked(int)),this,TQT_SLOT(headerClicked(int)) ); - mOpen=new KAction(i18n("Add &Files..."), "queue", 0, this, TQT_SLOT(addFiles()), actionCollection(), "add_files"); - (void) new KAction(i18n("Add Fol&ders..."), "folder", 0, this, TQT_SLOT(addDirectory()), actionCollection(), "add_dir"); - mDelete=new KAction(i18n("Delete"), "editdelete", Key_Delete, this, TQT_SLOT(deleteSelected()), actionCollection(), "delete"); + mOpen=new KAction(i18n("Add &Files..."), "queue", 0, TQT_TQOBJECT(this), TQT_SLOT(addFiles()), actionCollection(), "add_files"); + (void) new KAction(i18n("Add Fol&ders..."), "folder", 0, TQT_TQOBJECT(this), TQT_SLOT(addDirectory()), actionCollection(), "add_dir"); + mDelete=new KAction(i18n("Delete"), "editdelete", Key_Delete, TQT_TQOBJECT(this), TQT_SLOT(deleteSelected()), actionCollection(), "delete"); - mClose=KStdAction::close(this, TQT_SLOT(close()), actionCollection()); - mFind=KStdAction::find(this, TQT_SLOT(find()), actionCollection()); + mClose=KStdAction::close(TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection()); + mFind=KStdAction::find(TQT_TQOBJECT(this), TQT_SLOT(tqfind()), actionCollection()); - (void) KStdAction::configureToolbars(this, TQT_SLOT(configureToolBars()), actionCollection()); - mOpenNew=KStdAction::openNew(this, TQT_SLOT(openNew()), actionCollection()); - mOpenpl=KStdAction::open(this, TQT_SLOT(open()), actionCollection()); - mSave=KStdAction::save(this, TQT_SLOT(save()), actionCollection()); - mSaveAs=KStdAction::saveAs(this, TQT_SLOT(saveAs()), actionCollection()); + (void) KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(configureToolBars()), actionCollection()); + mOpenNew=KStdAction::openNew(TQT_TQOBJECT(this), TQT_SLOT(openNew()), actionCollection()); + mOpenpl=KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(open()), actionCollection()); + mSave=KStdAction::save(TQT_TQOBJECT(this), TQT_SLOT(save()), actionCollection()); + mSaveAs=KStdAction::saveAs(TQT_TQOBJECT(this), TQT_SLOT(saveAs()), actionCollection()); - (void) new KAction(i18n("Shuffle"), "misc", 0, SPL, TQT_SLOT( randomize() ), actionCollection(), "shuffle"); - (void) new KAction(i18n("Clear"), "editclear", 0, list, TQT_SLOT( clear() ), actionCollection(), "clear"); + (void) new KAction(i18n("Shuffle"), "misc", 0, TQT_TQOBJECT(SPL), TQT_SLOT( randomize() ), actionCollection(), "shuffle"); + (void) new KAction(i18n("Clear"), "editclear", 0, TQT_TQOBJECT(list), TQT_SLOT( clear() ), actionCollection(), "clear"); createGUI("splui.rc"); @@ -666,7 +666,7 @@ View::View(SplitPlaylist *) list->setFocus(); } -void View::find() +void View::tqfind() { mFinder->show(); connect(mFinder, TQT_SIGNAL(search(Finder*)), TQT_SLOT(findIt(Finder*))); @@ -675,15 +675,15 @@ void View::find() static bool testWord(TQListViewItem *i, const TQString &finder) { PlaylistItemData *item=static_cast<SafeListViewItem*>(i); - if (item->title().find(finder, 0, false) >=0) + if (item->title().tqfind(finder, 0, false) >=0) return true; - if (item->file().find(finder, 0, false) >=0) + if (item->file().tqfind(finder, 0, false) >=0) return true; - if (item->url().path().find(finder.local8Bit(), 0, false) >=0) + if (item->url().path().tqfind(finder.local8Bit().data(), 0, false) >=0) return true; - if (item->lengthString().find(finder, 0, false) >=0) + if (item->lengthString().tqfind(finder, 0, false) >=0) return true; - if (item->mimetype().find(finder.local8Bit(), 0, false) >=0) + if (item->mimetype().tqfind(finder.local8Bit().data(), 0, false) >=0) return true; return false; } @@ -691,15 +691,15 @@ static bool testWord(TQListViewItem *i, const TQString &finder) static bool testWord(TQListViewItem *i, const TQRegExp &finder) { PlaylistItemData *item=static_cast<SafeListViewItem*>(i); - if (item->title().find(finder) >=0) + if (item->title().tqfind(finder) >=0) return true; - if (item->file().find(finder) >=0) + if (item->file().tqfind(finder) >=0) return true; - if (item->url().path().find(finder) >=0) + if (item->url().path().tqfind(finder) >=0) return true; - if (item->lengthString().find(finder) >=0) + if (item->lengthString().tqfind(finder) >=0) return true; - if (item->mimetype().find(finder) >=0) + if (item->mimetype().tqfind(finder) >=0) return true; return false; } @@ -746,12 +746,12 @@ void View::findIt(Finder *f) { if (f->isForward()) { - if (KMessageBox::questionYesNo(this, i18n("End of playlist reached. Continue searching from beginning?"),TQString::null,KStdGuiItem::cont(),KStdGuiItem::cancel()) == KMessageBox::Yes) + if (KMessageBox::questionYesNo(this, i18n("End of playlist reached. Continue searching from beginning?"),TQString(),KStdGuiItem::cont(),KStdGuiItem::cancel()) == KMessageBox::Yes) search=list->firstChild(); } else { - if (KMessageBox::questionYesNo(this, i18n("Beginning of playlist reached. Continue searching from end?"),TQString::null,KStdGuiItem::cont(),KStdGuiItem::cancel()) == KMessageBox::Yes) + if (KMessageBox::questionYesNo(this, i18n("Beginning of playlist reached. Continue searching from end?"),TQString(),KStdGuiItem::cont(),KStdGuiItem::cancel()) == KMessageBox::Yes) search=list->lastChild(); } } diff --git a/noatun/modules/splitplaylist/view.h b/noatun/modules/splitplaylist/view.h index 785608fd..293276ca 100644 --- a/noatun/modules/splitplaylist/view.h +++ b/noatun/modules/splitplaylist/view.h @@ -16,13 +16,13 @@ namespace KIO { class ListJob; } class SafeListViewItem - : public QCheckListItem + : public TQCheckListItem , public PlaylistItemData , public DownloadItem { public: - SafeListViewItem(TQListView *parent, TQListViewItem *after, const KURL &text); - SafeListViewItem(TQListView *parent, TQListViewItem *after, const TQMap<TQString,TQString> &properties); + SafeListViewItem(TQListView *tqparent, TQListViewItem *after, const KURL &text); + SafeListViewItem(TQListView *tqparent, TQListViewItem *after, const TQMap<TQString,TQString> &properties); virtual ~SafeListViewItem(); virtual TQString property(const TQString &, const TQString & = 0) const; @@ -58,9 +58,10 @@ private: class List : public KListView { Q_OBJECT + TQ_OBJECT friend class View; public: - List(View *parent); + List(View *tqparent); virtual ~List(); TQListViewItem *openGlobal(const KURL&, TQListViewItem * =0); TQListViewItem *importGlobal(const KURL&, TQListViewItem * =0); @@ -105,6 +106,7 @@ class KToolBar; class View : public KMainWindow { Q_OBJECT + TQ_OBJECT public: View(SplitPlaylist *mother); // load the SM playlist @@ -125,7 +127,7 @@ public slots: void openNew(); void setSorting(bool on, int column = 0); void setNoSorting() { setSorting(false); } - void headerClicked(int column);void find(); + void headerClicked(int column);void tqfind(); void findIt(Finder *); diff --git a/noatun/modules/systray/cmodule.h b/noatun/modules/systray/cmodule.h index fd9cae2c..ddf52ada 100644 --- a/noatun/modules/systray/cmodule.h +++ b/noatun/modules/systray/cmodule.h @@ -34,6 +34,7 @@ class YHConfigWidget; class YHModule : public CModule { Q_OBJECT + TQ_OBJECT public: YHModule(TQObject *_parent); virtual void save(); diff --git a/noatun/modules/systray/kitsystemtray.cpp b/noatun/modules/systray/kitsystemtray.cpp index 8e42a3ed..61c0f035 100644 --- a/noatun/modules/systray/kitsystemtray.cpp +++ b/noatun/modules/systray/kitsystemtray.cpp @@ -44,12 +44,12 @@ #include <fixx11h.h> -KitSystemTray::KitSystemTray(const TQString &contextMenu, KMainWindow *parent, const char *name) - : KSystemTray(parent, name) +KitSystemTray::KitSystemTray(const TQString &contextMenu, KMainWindow *tqparent, const char *name) + : KSystemTray(tqparent, name) { - setAlignment(AlignHCenter | AlignVCenter); - menu = (KPopupMenu *)parent->guiFactory()->container(contextMenu, parent); - menu->insertTitle(SmallIcon("noatun"), TQString::null, 0, 0); + tqsetAlignment(AlignHCenter | AlignVCenter); + menu = (KPopupMenu *)tqparent->guiFactory()->container(contextMenu, tqparent); + menu->insertTitle(SmallIcon("noatun"), TQString(), 0, 0); setAcceptDrops(true); } @@ -67,10 +67,10 @@ void KitSystemTray::mousePressEvent(TQMouseEvent *event) { switch(event->button()) { - case LeftButton: + case Qt::LeftButton: napp->toggleInterfaces(); break; - case MidButton: + case Qt::MidButton: if (YHConfig::self()->middleMouseAction() == YHConfig::HideShowPlaylist) napp->playlist()->toggleList(); else // play or pause @@ -103,11 +103,11 @@ void KitSystemTray::wheelEvent(TQWheelEvent *event) YHConfig *c = YHConfig::self(); int action = 0; - if (event->state() & Qt::ShiftButton) + if (event->state() & TQt::ShiftButton) action = c->mouseWheelAction(YHConfig::Shift); - else if (event->state() & Qt::ControlButton) + else if (event->state() & TQt::ControlButton) action = c->mouseWheelAction(YHConfig::Ctrl); - else if (event->state() & Qt::AltButton) + else if (event->state() & TQt::AltButton) action = c->mouseWheelAction(YHConfig::Alt); else action = c->mouseWheelAction(YHConfig::None); diff --git a/noatun/modules/systray/kitsystemtray.h b/noatun/modules/systray/kitsystemtray.h index 6d5a2908..d933a19e 100644 --- a/noatun/modules/systray/kitsystemtray.h +++ b/noatun/modules/systray/kitsystemtray.h @@ -37,9 +37,10 @@ class TQPixmap; class KitSystemTray : public KSystemTray { Q_OBJECT + TQ_OBJECT public: - KitSystemTray(const TQString &contextMenu, KMainWindow *parent, const char *name = 0); + KitSystemTray(const TQString &contextMenu, KMainWindow *tqparent, const char *name = 0); void changeTitle(const TQPixmap &, const TQString &); protected: virtual void showEvent(TQShowEvent *); diff --git a/noatun/modules/systray/systray.cpp b/noatun/modules/systray/systray.cpp index 2493bdbc..57ce2105 100644 --- a/noatun/modules/systray/systray.cpp +++ b/noatun/modules/systray/systray.cpp @@ -72,7 +72,7 @@ const int COVER_MAXH = 128; class PassivePopup : public KPassivePopup { public: - PassivePopup(TQWidget *parent = 0, const char *name = 0) : KPassivePopup(parent, name) {} + PassivePopup(TQWidget *tqparent = 0, const char *name = 0) : KPassivePopup(tqparent, name) {} protected: virtual void enterEvent(TQEvent *) @@ -91,7 +91,7 @@ protected: NoatunSystray::NoatunSystray() : KMainWindow(0, "NoatunSystray"), Plugin(), - mTray(0), trayStatus(0), trayBase(0), mPassivePopup(0L) + mTray(0), traytqStatus(0), trayBase(0), mPassivePopup(0L) { //self = this; hide(); @@ -100,9 +100,9 @@ NoatunSystray::NoatunSystray() : KMainWindow(0, "NoatunSystray"), Plugin(), removeCover(); // make sure any old temp cover is gone - KStdAction::quit(napp, TQT_SLOT(quit()), actionCollection()); - KStdAction::open(napp, TQT_SLOT(fileOpen()), actionCollection()); - KStdAction::preferences(napp, TQT_SLOT(preferences()), actionCollection()); + KStdAction::quit(TQT_TQOBJECT(napp), TQT_SLOT(quit()), actionCollection()); + KStdAction::open(TQT_TQOBJECT(napp), TQT_SLOT(fileOpen()), actionCollection()); + KStdAction::preferences(TQT_TQOBJECT(napp), TQT_SLOT(preferences()), actionCollection()); NoatunStdAction::back(actionCollection(), "back"); NoatunStdAction::stop(actionCollection(), "stop"); NoatunStdAction::playpause(actionCollection(), "play"); @@ -117,11 +117,11 @@ NoatunSystray::NoatunSystray() : KMainWindow(0, "NoatunSystray"), Plugin(), mTray = new KitSystemTray("tray", this); mTray->show(); - trayBase = renderIcon(BASEICON, TQString::null); - trayStatus = renderIcon(BASEICON, "player_stop"); + trayBase = renderIcon(BASEICON, TQString()); + traytqStatus = renderIcon(BASEICON, "player_stop"); mTray->changeTitle(*trayBase, i18n("Noatun")); - showingTrayStatus = false; + showingTraytqStatus = false; mBlinkTimer = new TQTimer(this); connect(mBlinkTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotBlinkTimer())); @@ -138,14 +138,14 @@ NoatunSystray::~NoatunSystray() //kdDebug(66666) << k_funcinfo << "Called." << endl; removeCover(); delete trayBase; - delete trayStatus; + delete traytqStatus; napp->showInterfaces(); } void NoatunSystray::init() { - YHModule *cmod = new YHModule(this); + YHModule *cmod = new YHModule(TQT_TQOBJECT(this)); connect(cmod, TQT_SIGNAL(saved()), this, TQT_SLOT(slotLoadSettings())); slotLoadSettings(); } @@ -213,21 +213,21 @@ void NoatunSystray::slotPlayPause() if(!item.isProperty("title")) { // No metadata - s = TQString("<nobr>%1</nobr>").arg(item.title()); + s = TQString("<nobr>%1</nobr>").tqarg(item.title()); } else { - s = TQString("<h2><nobr>%1</nobr></h2>").arg(item.property("title")); + s = TQString("<h2><nobr>%1</nobr></h2>").tqarg(item.property("title")); if(item.isProperty("author")) - s += TQString("<nobr>%1</nobr><br>").arg(item.property("author")); + s += TQString("<nobr>%1</nobr><br>").tqarg(item.property("author")); if(item.isProperty("album")) { if(item.isProperty("date")) - s += TQString("<nobr>%1 (%2)</nobr><br>").arg(item.property("album")).arg(item.property("date")); + s += TQString("<nobr>%1 (%2)</nobr><br>").tqarg(item.property("album")).tqarg(item.property("date")); else - s += TQString("<nobr>%1</nobr><br>").arg(item.property("album")); + s += TQString("<nobr>%1</nobr><br>").tqarg(item.property("album")); } } @@ -242,11 +242,11 @@ void NoatunSystray::slotPlayPause() setTipText(TQString("<qt><br><table cellspacing=0 cellpadding=0><tr>" \ "<td align=center valign=center><h4><nobr>%1</nobr></h4>%2</td>" \ "<td valign=center><img src='%3'></td>" \ - "</qt></tr></table>").arg(status).arg(s).arg(tmpCoverPath)); + "</qt></tr></table>").tqarg(status).tqarg(s).tqarg(tmpCoverPath)); } else { - setTipText(TQString("<qt><center><h4><nobr>%1</nobr></h4>%2</center></qt>").arg(status).arg(s)); + setTipText(TQString("<qt><center><h4><nobr>%1</nobr></h4>%2</center></qt>").tqarg(status).tqarg(s)); } } @@ -256,16 +256,16 @@ void NoatunSystray::slotStopped() if(!napp->player()->current()) return; changeTray("player_stop"); - setTipText(TQString("<qt><nobr><h4>%1</h4></nobr></qt>").arg(i18n("Noatun - Stopped"))); + setTipText(TQString("<qt><nobr><h4>%1</h4></nobr></qt>").tqarg(i18n("Noatun - Stopped"))); } void NoatunSystray::changeTray(const TQString &pm) { - delete trayStatus; - trayStatus = renderIcon(BASEICON, pm); - if(showingTrayStatus) + delete traytqStatus; + traytqStatus = renderIcon(BASEICON, pm); + if(showingTraytqStatus) slotBlinkTimer(); } @@ -275,18 +275,18 @@ void NoatunSystray::slotBlinkTimer() switch(YHConfig::self()->stateIconDisplay()) { case (YHConfig::FlashingIcon): - showingTrayStatus ^= true; + showingTraytqStatus ^= true; break; case (YHConfig::StaticIcon): - showingTrayStatus = true; + showingTraytqStatus = true; break; case (YHConfig::NoIcon): - showingTrayStatus = false; + showingTraytqStatus = false; break; } - if(showingTrayStatus) - mTray->setPixmap(*trayStatus); + if(showingTraytqStatus) + mTray->setPixmap(*traytqStatus); else mTray->setPixmap(*trayBase); } @@ -334,7 +334,7 @@ void NoatunSystray::updateCover() if(src.load(cover)) { if(src.width() >= COVER_MAXW || src.height() >= COVER_MAXH) - tmpimg = src.scale(COVER_MAXW, COVER_MAXH, TQImage::ScaleMin); + tmpimg = src.scale(COVER_MAXW, COVER_MAXH, TQ_ScaleMin); else tmpimg = src; @@ -383,7 +383,7 @@ void NoatunSystray::showPassivePopup() if (YHConfig::self()->passivePopupButtons() && !napp->player()->isStopped()) { - TQVBox *widget = mPassivePopup->standardView(TQString::null, tipText, TQPixmap()); + TQVBox *widget = mPassivePopup->standardView(TQString(), tipText, TQPixmap()); TQHBox *box = new TQHBox(mPassivePopup, "popupbox"); box->setSpacing(8); @@ -439,7 +439,7 @@ void NoatunSystray::showPassivePopup() } else { - mPassivePopup->setView(TQString::null, tipText); + mPassivePopup->setView(TQString(), tipText); } mPassivePopup->setTimeout(YHConfig::self()->passivePopupTimeout()*1000); diff --git a/noatun/modules/systray/systray.h b/noatun/modules/systray/systray.h index 1865479b..11743a22 100644 --- a/noatun/modules/systray/systray.h +++ b/noatun/modules/systray/systray.h @@ -41,6 +41,7 @@ class PassivePopup; class NoatunSystray : public KMainWindow, public Plugin { Q_OBJECT + TQ_OBJECT public: NoatunSystray(); virtual ~NoatunSystray(); @@ -68,11 +69,11 @@ private: private: KitSystemTray *mTray; TQTimer *mBlinkTimer; - TQPixmap *trayStatus; + TQPixmap *traytqStatus; TQPixmap *trayBase; PassivePopup *mPassivePopup; - bool showingTrayStatus; + bool showingTraytqStatus; TQString tipText; TQString tmpCoverPath; }; diff --git a/noatun/modules/systray/yhconfigwidget.ui b/noatun/modules/systray/yhconfigwidget.ui index 48267c28..5556c2c1 100644 --- a/noatun/modules/systray/yhconfigwidget.ui +++ b/noatun/modules/systray/yhconfigwidget.ui @@ -1,10 +1,10 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>YHConfigWidget</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>YHConfigWidget</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -19,11 +19,11 @@ <property name="margin"> <number>0</number> </property> - <widget class="QTabWidget"> + <widget class="TQTabWidget"> <property name="name"> <cstring>tabWidget2</cstring> </property> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -34,7 +34,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>chkUseTooltip</cstring> </property> @@ -42,7 +42,7 @@ <string>Show a &tooltip for the current track</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>chkUseCovers</cstring> </property> @@ -50,7 +50,7 @@ <string>Show &covers in popup window and tooltip</string> </property> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox1</cstring> </property> @@ -61,7 +61,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>lblPopupTimeout</cstring> </property> @@ -72,7 +72,7 @@ <cstring>spinPopupTimeout</cstring> </property> </widget> - <widget class="QCheckBox" row="2" column="0" rowspan="1" colspan="2"> + <widget class="TQCheckBox" row="2" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>chkPopupButtons</cstring> </property> @@ -80,7 +80,7 @@ <string>Show &buttons in popup window</string> </property> </widget> - <widget class="QSpinBox" row="1" column="1"> + <widget class="TQSpinBox" row="1" column="1"> <property name="name"> <cstring>spinPopupTimeout</cstring> </property> @@ -98,7 +98,7 @@ <number>5</number> </property> </widget> - <widget class="QCheckBox" row="0" column="0" rowspan="1" colspan="2"> + <widget class="TQCheckBox" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>chkUsePopup</cstring> </property> @@ -108,7 +108,7 @@ </widget> </grid> </widget> - <widget class="QButtonGroup"> + <widget class="TQButtonGroup"> <property name="name"> <cstring>buttonGroup1</cstring> </property> @@ -119,7 +119,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QRadioButton" row="0" column="0"> + <widget class="TQRadioButton" row="0" column="0"> <property name="name"> <cstring>rbStateAnim</cstring> </property> @@ -130,7 +130,7 @@ <string>&Animated</string> </property> </widget> - <widget class="QRadioButton" row="0" column="1"> + <widget class="TQRadioButton" row="0" column="1"> <property name="name"> <cstring>rbStateFlashing</cstring> </property> @@ -138,7 +138,7 @@ <string>&Flashing</string> </property> </widget> - <widget class="QRadioButton" row="1" column="0"> + <widget class="TQRadioButton" row="1" column="0"> <property name="name"> <cstring>rbStateStatic</cstring> </property> @@ -149,7 +149,7 @@ <bool>false</bool> </property> </widget> - <widget class="QRadioButton" row="1" column="1"> + <widget class="TQRadioButton" row="1" column="1"> <property name="name"> <cstring>rbStateNone</cstring> </property> @@ -169,7 +169,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>81</height> @@ -178,7 +178,7 @@ </spacer> </vbox> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -189,7 +189,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QButtonGroup"> + <widget class="TQButtonGroup"> <property name="name"> <cstring>grpMiddleMouse</cstring> </property> @@ -200,7 +200,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>rbHideShowPlaylist</cstring> </property> @@ -208,7 +208,7 @@ <string>Hide / Show play&list</string> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>rbPlayPause</cstring> </property> @@ -218,7 +218,7 @@ </widget> </vbox> </widget> - <widget class="QButtonGroup"> + <widget class="TQButtonGroup"> <property name="name"> <cstring>grpMwheel</cstring> </property> @@ -229,15 +229,15 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout1</cstring> + <cstring>tqlayout1</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>lblModifier</cstring> </property> @@ -248,14 +248,14 @@ <cstring>cmbModifier</cstring> </property> </widget> - <widget class="QComboBox"> + <widget class="TQComboBox"> <property name="name"> <cstring>cmbModifier</cstring> </property> </widget> </hbox> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>lblAction</cstring> </property> @@ -263,7 +263,7 @@ <string>Action:</string> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>rbActNothing</cstring> </property> @@ -271,7 +271,7 @@ <string>&Nothing</string> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>rbActVolume</cstring> </property> @@ -279,7 +279,7 @@ <string>Change v&olume</string> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>rbActTrack</cstring> </property> @@ -299,7 +299,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>21</height> @@ -329,5 +329,5 @@ <tabstop>rbActVolume</tabstop> <tabstop>rbActTrack</tabstop> </tabstops> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/noatun/modules/voiceprint/prefs.cpp b/noatun/modules/voiceprint/prefs.cpp index 230c542f..a50db7ff 100644 --- a/noatun/modules/voiceprint/prefs.cpp +++ b/noatun/modules/voiceprint/prefs.cpp @@ -8,10 +8,10 @@ #include <kcolorbutton.h> #include <kconfig.h> -Prefs::Prefs(TQObject* parent) - : CModule(i18n("Voiceprint"), i18n("Options for the Voiceprint Visualization"), "xapp", parent) +Prefs::Prefs(TQObject* tqparent) + : CModule(i18n("Voiceprint"), i18n("Options for the Voiceprint Visualization"), "xapp", tqparent) { - QVBoxLayout *king=new TQVBoxLayout(this); + TQVBoxLayout *king=new TQVBoxLayout(this); TQHBoxLayout *minor; TQLabel *label; diff --git a/noatun/modules/voiceprint/prefs.h b/noatun/modules/voiceprint/prefs.h index 65f4cf3d..1803fe9b 100644 --- a/noatun/modules/voiceprint/prefs.h +++ b/noatun/modules/voiceprint/prefs.h @@ -9,8 +9,9 @@ class KColorButton; class Prefs : public CModule { Q_OBJECT + TQ_OBJECT public: - Prefs(TQObject* parent); + Prefs(TQObject* tqparent); virtual void save(); virtual void reopen(); diff --git a/noatun/modules/voiceprint/voiceprint.cpp b/noatun/modules/voiceprint/voiceprint.cpp index 0a82a1ab..234aafd0 100644 --- a/noatun/modules/voiceprint/voiceprint.cpp +++ b/noatun/modules/voiceprint/voiceprint.cpp @@ -35,7 +35,7 @@ VoicePrint::~VoicePrint() void VoicePrint::init() { - Prefs *p=new Prefs(this); + Prefs *p=new Prefs(TQT_TQOBJECT(this)); p->reopen(); p->save(); resizeEvent(0); @@ -66,13 +66,13 @@ void VoicePrint::resizeEvent(TQResizeEvent *) #define COLOR(color, bgcolor, fgcolor, foctet) \ (int)( color(bgcolor) + (foctet) * (color(fgcolor) - color(bgcolor)) ) -inline static QRgb averageByIntensity(QRgb bgcolor, QRgb fgcolor, int octet) +inline static TQRgb averageByIntensity(TQRgb bgcolor, TQRgb fgcolor, int octet) { float foctet = octet / 255.0; - return qRgb(COLOR(qRed, bgcolor, fgcolor, foctet), - COLOR(qGreen, bgcolor, fgcolor, foctet), - COLOR(qBlue, bgcolor, fgcolor, foctet) + return tqRgb(COLOR(tqRed, bgcolor, fgcolor, foctet), + COLOR(tqGreen, bgcolor, fgcolor, foctet), + COLOR(tqBlue, bgcolor, fgcolor, foctet) ); } @@ -80,7 +80,7 @@ inline static QRgb averageByIntensity(QRgb bgcolor, QRgb fgcolor, int octet) void VoicePrint::paintEvent(TQPaintEvent *e) { - bitBlt(this, e->rect().topLeft(), &mBuffer, e->rect(), Qt::CopyROP); + bitBlt(this, e->rect().topLeft(), &mBuffer, e->rect(), TQt::CopyROP); } void VoicePrint::scopeEvent(float *data, int bands) @@ -113,12 +113,12 @@ void VoicePrint::scopeEvent(float *data, int bands) // redraw changes with the minimum amount of work if(newOffset != 0) { - repaint(mOffset,0,mSegmentWidth*2,height(),false); + tqrepaint(mOffset,0,mSegmentWidth*2,height(),false); } else { - repaint(mOffset,0,mSegmentWidth,height(),false); - repaint(newOffset,0,mSegmentWidth,height(),false); + tqrepaint(mOffset,0,mSegmentWidth,height(),false); + tqrepaint(newOffset,0,mSegmentWidth,height(),false); } mOffset = newOffset; } diff --git a/noatun/modules/voiceprint/voiceprint.h b/noatun/modules/voiceprint/voiceprint.h index 4d78909a..1d02bae6 100644 --- a/noatun/modules/voiceprint/voiceprint.h +++ b/noatun/modules/voiceprint/voiceprint.h @@ -6,6 +6,7 @@ class VoicePrint : public TQWidget, public MonoFFTScope, public Plugin { Q_OBJECT + TQ_OBJECT public: VoicePrint(); @@ -26,7 +27,7 @@ public: private: TQColor mProgress; TQPixmap mBuffer; - QRgb mLowColor, mHighColor; + TQRgb mLowColor, mHighColor; int mOffset, mSegmentWidth; }; #endif diff --git a/noatun/modules/winskin/guiSpectrumAnalyser.cpp b/noatun/modules/winskin/guiSpectrumAnalyser.cpp index 583266e0..cab5be35 100644 --- a/noatun/modules/winskin/guiSpectrumAnalyser.cpp +++ b/noatun/modules/winskin/guiSpectrumAnalyser.cpp @@ -72,13 +72,13 @@ GuiSpectrumAnalyser::~GuiSpectrumAnalyser() void GuiSpectrumAnalyser::mousePressEvent ( TQMouseEvent *e ) { - if (e->button() == LeftButton) { + if (e->button() == Qt::LeftButton) { if (visualization_mode == MODE_DISABLED) setVisualizationMode(MODE_ANALYSER); else setVisualizationMode(MODE_DISABLED); } - else if (e->button() == RightButton) { + else if (e->button() == Qt::RightButton) { contextMenu->popup(mapToGlobal(TQPoint(e->x(), e->y()))); } } @@ -138,7 +138,7 @@ void GuiSpectrumAnalyser::setVisualizationMode(int mode) { if (!winSkinVis) { - winSkinVis=new WinSkinVis(this,"WinSkinVis"); + winSkinVis=new WinSkinVis(TQT_TQOBJECT(this),"WinSkinVis"); connect(winSkinVis,TQT_SIGNAL(doRepaint()),this,TQT_SLOT(updatePeaks())); } } diff --git a/noatun/modules/winskin/guiSpectrumAnalyser.h b/noatun/modules/winskin/guiSpectrumAnalyser.h index e2dd3431..8cffa3d6 100644 --- a/noatun/modules/winskin/guiSpectrumAnalyser.h +++ b/noatun/modules/winskin/guiSpectrumAnalyser.h @@ -29,6 +29,7 @@ enum analyserMode {MODE_NORMAL = 0, MODE_FIRE = 1, MODE_VERTICAL_LINES = 2}; class GuiSpectrumAnalyser : public WaWidget { Q_OBJECT + TQ_OBJECT public: GuiSpectrumAnalyser(); diff --git a/noatun/modules/winskin/vis/realFFT.cpp b/noatun/modules/winskin/vis/realFFT.cpp index 330280ea..383831b7 100644 --- a/noatun/modules/winskin/vis/realFFT.cpp +++ b/noatun/modules/winskin/vis/realFFT.cpp @@ -20,7 +20,7 @@ RealFFT::RealFFT(int fftlen) { int i; int temp; - int mask; + int tqmask; /* * FFT size is only half the number of data points @@ -43,8 +43,8 @@ RealFFT::RealFFT(int fftlen) { for(i=0;i<Points/2;i++) { temp=0; - for(mask=Points/4;mask>0;mask >>= 1) - temp=(temp >> 1) + (i&mask ? Points/2 : 0); + for(tqmask=Points/4;tqmask>0;tqmask >>= 1) + temp=(temp >> 1) + (i&tqmask ? Points/2 : 0); BitReversed[i]=temp; } diff --git a/noatun/modules/winskin/vis/visQueue.h b/noatun/modules/winskin/vis/visQueue.h index 2f737fd1..9360805a 100644 --- a/noatun/modules/winskin/vis/visQueue.h +++ b/noatun/modules/winskin/vis/visQueue.h @@ -11,8 +11,8 @@ */ -#ifndef __VISQUEUE_H -#define __VISQUEUE_H +#ifndef __VISTQUEUE_H +#define __VISTQUEUE_H #include <vector> diff --git a/noatun/modules/winskin/waBalanceSlider.h b/noatun/modules/winskin/waBalanceSlider.h index d120bcc7..cd10aa96 100644 --- a/noatun/modules/winskin/waBalanceSlider.h +++ b/noatun/modules/winskin/waBalanceSlider.h @@ -20,7 +20,8 @@ #include "waWidget.h" class WaBalanceSlider : public WaWidget { - Q_OBJECT + Q_OBJECT + TQ_OBJECT public: WaBalanceSlider(); diff --git a/noatun/modules/winskin/waButton.cpp b/noatun/modules/winskin/waButton.cpp index da113c87..4946d548 100644 --- a/noatun/modules/winskin/waButton.cpp +++ b/noatun/modules/winskin/waButton.cpp @@ -50,7 +50,7 @@ void WaButton::paintEvent(TQPaintEvent *) { void WaButton::mousePressEvent(TQMouseEvent* e) { - if (e->button() != LeftButton) { + if (e->button() != Qt::LeftButton) { // We can't deal with it, but maybe the widget can do something clever WaWidget::mousePressEvent(e); } @@ -68,7 +68,7 @@ void WaButton::mouseReleaseEvent(TQMouseEvent* e) { else { pressed = false; - if (this->rect().contains(e->pos())){ + if (TQT_TQRECT_OBJECT(this->rect()).tqcontains(e->pos())){ if (_togglable) { _toggled = !_toggled; emit(toggleEvent(_toggled)); diff --git a/noatun/modules/winskin/waButton.h b/noatun/modules/winskin/waButton.h index bfaf43ff..a6e67548 100644 --- a/noatun/modules/winskin/waButton.h +++ b/noatun/modules/winskin/waButton.h @@ -21,6 +21,7 @@ class WaButton : public WaWidget { Q_OBJECT + TQ_OBJECT public: WaButton(int mapId); ~WaButton(); diff --git a/noatun/modules/winskin/waClutterbar.h b/noatun/modules/winskin/waClutterbar.h index 5a96993a..b7560039 100644 --- a/noatun/modules/winskin/waClutterbar.h +++ b/noatun/modules/winskin/waClutterbar.h @@ -6,6 +6,7 @@ class WaClutterbar : public WaWidget { Q_OBJECT + TQ_OBJECT public: WaClutterbar(); diff --git a/noatun/modules/winskin/waDigit.cpp b/noatun/modules/winskin/waDigit.cpp index 15a3ae46..b81a0da2 100644 --- a/noatun/modules/winskin/waDigit.cpp +++ b/noatun/modules/winskin/waDigit.cpp @@ -57,28 +57,28 @@ void WaDigit::paintEvent(TQPaintEvent *) // continue parsing mapRect = waSkinModel->getMapGeometry(_WA_MAPPING_MINUS); if (len == 6) { - waSkinModel->getDigit('-', this, mapRect.x() - x, mapRect.y() - y); + waSkinModel->getDigit('-', TQT_TQPAINTDEVICE(this), mapRect.x() - x, mapRect.y() - y); time++; } else { - waSkinModel->getDigit(' ', this, mapRect.x() - x, mapRect.y() - y); + waSkinModel->getDigit(' ', TQT_TQPAINTDEVICE(this), mapRect.x() - x, mapRect.y() - y); } mapRect = waSkinModel->getMapGeometry(_WA_MAPPING_DIGIT_1); - waSkinModel->getDigit(time[0], this, mapRect.x() - x, mapRect.y() - y); + waSkinModel->getDigit(time[0], TQT_TQPAINTDEVICE(this), mapRect.x() - x, mapRect.y() - y); mapRect = waSkinModel->getMapGeometry(_WA_MAPPING_DIGIT_2); - waSkinModel->getDigit(time[1], this, mapRect.x() - x, mapRect.y() - y); + waSkinModel->getDigit(time[1], TQT_TQPAINTDEVICE(this), mapRect.x() - x, mapRect.y() - y); mapRect = waSkinModel->getMapGeometry(_WA_MAPPING_DIGIT_3); - waSkinModel->getDigit(time[3], this, mapRect.x() - x, mapRect.y() - y); + waSkinModel->getDigit(time[3], TQT_TQPAINTDEVICE(this), mapRect.x() - x, mapRect.y() - y); mapRect = waSkinModel->getMapGeometry(_WA_MAPPING_DIGIT_4); - waSkinModel->getDigit(time[4], this, mapRect.x() - x, mapRect.y() - y); + waSkinModel->getDigit(time[4], TQT_TQPAINTDEVICE(this), mapRect.x() - x, mapRect.y() - y); } void WaDigit::mousePressEvent(TQMouseEvent* e) { - if (e->button() == LeftButton) { + if (e->button() == Qt::LeftButton) { reverse_time = !reverse_time; emit digitsClicked(); } diff --git a/noatun/modules/winskin/waDigit.h b/noatun/modules/winskin/waDigit.h index cee5da1d..905431bd 100644 --- a/noatun/modules/winskin/waDigit.h +++ b/noatun/modules/winskin/waDigit.h @@ -22,6 +22,7 @@ class WaDigit : public WaWidget { Q_OBJECT + TQ_OBJECT public: WaDigit(); diff --git a/noatun/modules/winskin/waIndicator.h b/noatun/modules/winskin/waIndicator.h index b4d37482..1c26da6b 100644 --- a/noatun/modules/winskin/waIndicator.h +++ b/noatun/modules/winskin/waIndicator.h @@ -22,6 +22,7 @@ class WaIndicator : public WaWidget { Q_OBJECT + TQ_OBJECT public: WaIndicator(int widget_mapping, int enabled_mapping, int disabled_mapping); diff --git a/noatun/modules/winskin/waInfo.cpp b/noatun/modules/winskin/waInfo.cpp index d64191da..fb923994 100644 --- a/noatun/modules/winskin/waInfo.cpp +++ b/noatun/modules/winskin/waInfo.cpp @@ -30,7 +30,7 @@ WaInfo::WaInfo() : WaWidget(_WA_MAPPING_INFO) completePixmap = new TQPixmap(); - TQSize size = sizeHint(); + TQSize size = tqsizeHint(); completePixmap->resize(size.width(), size.height()); xGrabbedPos = -1; @@ -55,7 +55,7 @@ void WaInfo::timeEvent() } if (isVisible()) - repaint(false); + tqrepaint(false); } } @@ -65,7 +65,7 @@ void WaInfo::scrollerSetup() xScrollPos = 0; xScrollDirection = 0; timer->stop(); - TQSize size = sizeHint(); + TQSize size = tqsizeHint(); if (completePixmap->width() > size.width()) { xScrollDirection = 1; @@ -79,7 +79,7 @@ void WaInfo::scrollerSetup() void WaInfo::paintEvent(TQPaintEvent *) { - TQSize size = sizeHint(); + TQSize size = tqsizeHint(); if (completePixmap->width() <= size.width()) { bitBlt(this, 0, 0, completePixmap); @@ -127,12 +127,12 @@ void WaInfo::pixmapChange() int x = 0; int n=infoString ? strlen(infoString) : 0; - TQSize size = sizeHint(); + TQSize size = tqsizeHint(); - completePixmap->resize(QMAX(n * _WA_TEXT_WIDTH, size.width()), _WA_TEXT_HEIGHT); + completePixmap->resize(TQMAX(n * _WA_TEXT_WIDTH, size.width()), _WA_TEXT_HEIGHT); for (i = 0; i < n; i++) { - WaSkinModel::instance()->getText(infoString[i], completePixmap, x, 0); + WaSkinModel::instance()->getText(infoString[i], TQT_TQPAINTDEVICE(completePixmap), x, 0); x += _WA_TEXT_WIDTH; } @@ -140,7 +140,7 @@ void WaInfo::pixmapChange() // fill the pixmap with spaces if (x < size.width()) { while (x < size.width()) { - WaSkinModel::instance()->getText(' ', completePixmap, x, 0); + WaSkinModel::instance()->getText(' ', TQT_TQPAINTDEVICE(completePixmap), x, 0); x += _WA_TEXT_WIDTH; } } @@ -150,7 +150,7 @@ void WaInfo::pixmapChange() } void WaInfo::mousePressEvent (TQMouseEvent *e) { - if (e->button() == LeftButton) + if (e->button() == Qt::LeftButton) xGrabbedPos = (e->x() + xScrollPos) % completePixmap->width(); } diff --git a/noatun/modules/winskin/waInfo.h b/noatun/modules/winskin/waInfo.h index 32d310e4..3a6dfe29 100644 --- a/noatun/modules/winskin/waInfo.h +++ b/noatun/modules/winskin/waInfo.h @@ -23,6 +23,7 @@ class WaInfo : public WaWidget { Q_OBJECT + TQ_OBJECT public: WaInfo(); diff --git a/noatun/modules/winskin/waJumpSlider.h b/noatun/modules/winskin/waJumpSlider.h index e8a48b1f..56d37d05 100644 --- a/noatun/modules/winskin/waJumpSlider.h +++ b/noatun/modules/winskin/waJumpSlider.h @@ -20,6 +20,7 @@ class WaJumpSlider : public WaWidget { Q_OBJECT + TQ_OBJECT public: WaJumpSlider(); diff --git a/noatun/modules/winskin/waLabel.cpp b/noatun/modules/winskin/waLabel.cpp index 54b7513b..bb16d118 100644 --- a/noatun/modules/winskin/waLabel.cpp +++ b/noatun/modules/winskin/waLabel.cpp @@ -24,7 +24,7 @@ WaLabel::WaLabel(int mapping) : WaWidget(mapping) completePixmap = new TQPixmap(); - TQSize size = sizeHint(); + TQSize size = tqsizeHint(); completePixmap->resize(size.width(), size.height()); } @@ -58,7 +58,7 @@ void WaLabel::pixmapChange() int n = label_text ? strlen(label_text) : 0; for (int i = 0; i < n; i++) - WaSkinModel::instance()->getText(label_text[i], completePixmap, + WaSkinModel::instance()->getText(label_text[i], TQT_TQPAINTDEVICE(completePixmap), i * _WA_TEXT_WIDTH, 0); } diff --git a/noatun/modules/winskin/waLabel.h b/noatun/modules/winskin/waLabel.h index ce7ad771..7303e4a0 100644 --- a/noatun/modules/winskin/waLabel.h +++ b/noatun/modules/winskin/waLabel.h @@ -17,7 +17,8 @@ #include "waWidget.h" class WaLabel : public WaWidget { - Q_OBJECT + Q_OBJECT + TQ_OBJECT public: WaLabel(int mapping); diff --git a/noatun/modules/winskin/waMain.h b/noatun/modules/winskin/waMain.h index fbc47a64..94ae5e83 100644 --- a/noatun/modules/winskin/waMain.h +++ b/noatun/modules/winskin/waMain.h @@ -5,6 +5,7 @@ class WaMain : WaWidget { Q_OBJECT + TQ_OBJECT public: WaMain(); ~WaMain(); diff --git a/noatun/modules/winskin/waRegion.cpp b/noatun/modules/winskin/waRegion.cpp index 06f6851e..5f968b00 100644 --- a/noatun/modules/winskin/waRegion.cpp +++ b/noatun/modules/winskin/waRegion.cpp @@ -31,14 +31,14 @@ WaRegion::WaRegion(TQString filename) { KSimpleConfig regionFile(filename, true); // Clear our variables by default - window_mask = 0; - shade_mask = 0; + window_tqmask = 0; + shade_tqmask = 0; // Make the new bitmaps, default window size - window_mask = new TQBitmap(WaSkinModel::instance()->getMapGeometry(_WA_MAPPING_MAIN).size(), true); - shade_mask = new TQBitmap(WaSkinModel::instance()->getMapGeometry(_WA_MAPPING_TITLE).size(), true); + window_tqmask = new TQBitmap(WaSkinModel::instance()->getMapGeometry(_WA_MAPPING_MAIN).size(), true); + shade_tqmask = new TQBitmap(WaSkinModel::instance()->getMapGeometry(_WA_MAPPING_TITLE).size(), true); - // Load the normal window mask data + // Load the normal window tqmask data regionFile.setGroup("Normal"); TQValueList<int> num_points; @@ -53,27 +53,27 @@ WaRegion::WaRegion(TQString filename) { point_list = parseList(regionFile.readEntry(pointListNames[x])); } - // Now build the mask - buildPixmap(num_points, point_list, window_mask); + // Now build the tqmask + buildPixmap(num_points, point_list, window_tqmask); - // Load the windowshade mask data + // Load the windowshade tqmask data regionFile.setGroup("WindowShade"); num_points = parseList(regionFile.readEntry("NumPoints")); point_list = parseList(regionFile.readEntry("PointList")); - // Now build the mask - buildPixmap(num_points, point_list, shade_mask); + // Now build the tqmask + buildPixmap(num_points, point_list, shade_tqmask); } WaRegion::~WaRegion() { - delete window_mask; - delete shade_mask; + delete window_tqmask; + delete shade_tqmask; } void WaRegion::buildPixmap(const TQValueList<int> &num_points_list, const TQValueList<int> &points_list, TQBitmap *dest) { if (!num_points_list.count()) { - dest->fill(Qt::color1); + dest->fill(TQt::color1); return; } @@ -85,8 +85,8 @@ void WaRegion::buildPixmap(const TQValueList<int> &num_points_list, const TQValu TQBitmap bm(dest->width()+1,dest->height()+1,true); TQPainter bmp(&bm); - bmp.setBrush(Qt::color1); - bmp.setPen(Qt::NoPen); // The polygon border itself should not be part of the visible window + bmp.setBrush(TQt::color1); + bmp.setPen(TQt::NoPen); // The polygon border itself should not be part of the visible window // Go over each "region" in the file for (TQValueList<int>::const_iterator num_points = num_points_list.begin();num_points != num_points_list.end();num_points++) { @@ -101,7 +101,7 @@ void WaRegion::buildPixmap(const TQValueList<int> &num_points_list, const TQValu point_array.setPoint(i, x, y); } - // Now draw it as a filled polygon on the mask + // Now draw it as a filled polygon on the tqmask bmp.drawPolygon(point_array); } diff --git a/noatun/modules/winskin/waRegion.h b/noatun/modules/winskin/waRegion.h index 66c7c811..737ebdb9 100644 --- a/noatun/modules/winskin/waRegion.h +++ b/noatun/modules/winskin/waRegion.h @@ -9,15 +9,15 @@ public: WaRegion(TQString filename); ~WaRegion(); - const TQBitmap *mainWindowMask() const { return window_mask; } - const TQBitmap *mainWindowShadeMask() const { return shade_mask; } + const TQBitmap *mainWindowMask() const { return window_tqmask; } + const TQBitmap *mainWindowShadeMask() const { return shade_tqmask; } private: TQValueList<int> parseList(const TQString &list) const; void buildPixmap(const TQValueList<int> &num_points, const TQValueList<int> &point_list, TQBitmap *dest); - TQBitmap *window_mask; - TQBitmap *shade_mask; + TQBitmap *window_tqmask; + TQBitmap *shade_tqmask; }; extern WaRegion *windowRegion; diff --git a/noatun/modules/winskin/waShadeMapping.h b/noatun/modules/winskin/waShadeMapping.h index d28d4ca8..a20fcf6d 100644 --- a/noatun/modules/winskin/waShadeMapping.h +++ b/noatun/modules/winskin/waShadeMapping.h @@ -107,10 +107,10 @@ static const SkinDesc shadeMapFromFile[] = { {_WA_FILE_SHUFREP, 69, 61, 23, 12}, // _WA_SKIN_SHUFREP_PLAYLIST_NOT_SET_PRES {_WA_FILE_SHUFREP, 23, 73, 23, 12}, // _WA_SKIN_SHUFREP_PLAYLIST_SET_NORM {_WA_FILE_SHUFREP, 73, 23, 12}, // _WA_SKIN_SHUFREP_PLAYLIST_SET_PRES - {_WA_FILE_SHUFREP, 0, 61, 23, 12}, // _WA_SKIN_SHUFREP_EQ_NOT_SET_NORM - {_WA_FILE_SHUFREP, 46, 61, 23, 12}, // _WA_SKIN_SHUFREP_EQ_NOT_SET_PRES - {_WA_FILE_SHUFREP, 0, 73, 23, 12}, // _WA_SKIN_SHUFREP_EQ_SET_NORM - {_WA_FILE_SHUFREP, 46, 73, 23, 12}, // _WA_SKIN_SHUFREP_EQ_SET_PRES + {_WA_FILE_SHUFREP, 0, 61, 23, 12}, // _WA_SKIN_SHUFREP_ETQ_NOT_SET_NORM + {_WA_FILE_SHUFREP, 46, 61, 23, 12}, // _WA_SKIN_SHUFREP_ETQ_NOT_SET_PRES + {_WA_FILE_SHUFREP, 0, 73, 23, 12}, // _WA_SKIN_SHUFREP_ETQ_SET_NORM + {_WA_FILE_SHUFREP, 46, 73, 23, 12}, // _WA_SKIN_SHUFREP_ETQ_SET_PRES {_WA_FILE_TEXT, 0, 0, 155, 18}, // _WA_SKIN_TEXT {_WA_FILE_VOLUME, 0, 0, 68, 421}, // _WA_SKIN_VOLUME_BAR_ALL_BARS {_WA_FILE_VOLUME, 0, 0, 68, 13}, // _WA_SKIN_VOLUME_BAR diff --git a/noatun/modules/winskin/waSkin.cpp b/noatun/modules/winskin/waSkin.cpp index d7b443ee..aae49bf9 100644 --- a/noatun/modules/winskin/waSkin.cpp +++ b/noatun/modules/winskin/waSkin.cpp @@ -72,8 +72,8 @@ WaSkin::WaSkin() : TQWidget(0, "NoatunWinampSkin"), UserInterface() createHighLevelElements(); createButtons(); - setMinimumSize(sizeHint()); - setMaximumSize(sizeHint()); + setMinimumSize(tqsizeHint()); + setMaximumSize(tqsizeHint()); KWin::setType(this->winId(), NET::Override); setBackgroundMode(NoBackground); @@ -126,7 +126,7 @@ WaSkin::WaSkin() : TQWidget(0, "NoatunWinampSkin"), UserInterface() newSong(); // HACK: We won't get focus events otherwise - setFocusPolicy(TQWidget::ClickFocus); + setFocusPolicy(TQ_ClickFocus); show(); } @@ -142,7 +142,7 @@ void WaSkin::loadSkin(TQString newSkinDir) { waSkinManager->loadSkin(newSkinDir); - setMinimumSize(sizeHint()); + setMinimumSize(tqsizeHint()); if (title_shaded) { // waSkinModel::load() resets our skin model :( @@ -154,7 +154,7 @@ void WaSkin::loadSkin(TQString newSkinDir) } } -TQSize WaSkin::sizeHint() const +TQSize WaSkin::tqsizeHint() const { TQRect temp_rect; @@ -254,8 +254,8 @@ void WaSkin::createButtons() repeat->setPixmapDownSelected(_WA_SKIN_SHUFREP_REPEAT_SET_PRES); - eq->setPixmapUp(_WA_SKIN_SHUFREP_EQ_NOT_SET_NORM); - eq->setPixmapDown(_WA_SKIN_SHUFREP_EQ_NOT_SET_PRES); + eq->setPixmapUp(_WA_SKIN_SHUFREP_ETQ_NOT_SET_NORM); + eq->setPixmapDown(_WA_SKIN_SHUFREP_ETQ_NOT_SET_PRES); playlist->setPixmapUp(_WA_SKIN_SHUFREP_PLAYLIST_NOT_SET_NORM); playlist->setPixmapDown( _WA_SKIN_SHUFREP_PLAYLIST_NOT_SET_PRES); @@ -305,7 +305,7 @@ void WaSkin::createHighLevelElements() waInfo = new WaInfo(); - waStatus = new WaStatus(); + watqStatus = new WatqStatus(); waStereo = new WaIndicator(_WA_MAPPING_MONOSTER_STEREO, _WA_SKIN_MONOSTER_STEREO_TRUE, _WA_SKIN_MONOSTER_STEREO_FALSE); waMono = new WaIndicator(_WA_MAPPING_MONOSTER_MONO, _WA_SKIN_MONOSTER_MONO_TRUE, _WA_SKIN_MONOSTER_MONO_FALSE); @@ -337,7 +337,7 @@ void WaSkin::setChannels(int val) void WaSkin::shade() { waSkinModel->setSkinModel(WA_MODEL_WINDOWSHADE); - setMinimumSize(sizeHint()); + setMinimumSize(tqsizeHint()); setMask(*windowRegion->mainWindowShadeMask()); title_shaded = true; @@ -346,7 +346,7 @@ void WaSkin::shade() { void WaSkin::unshade() { waSkinModel->setSkinModel(WA_MODEL_NORMAL); - setMinimumSize(sizeHint()); + setMinimumSize(tqsizeHint()); setMask(*windowRegion->mainWindowMask()); title_shaded = false; @@ -558,9 +558,9 @@ void WaSkin::balanceSetValue(int val) waInfo->setText(i18n("Balance: Center")); } else if (val < 0) { - waInfo->setText(i18n("Balance: %1% Left").arg(-val)); + waInfo->setText(i18n("Balance: %1% Left").tqarg(-val)); } else { - waInfo->setText(i18n("Balance: %1% Right").arg(val)); + waInfo->setText(i18n("Balance: %1% Right").tqarg(val)); } } @@ -672,14 +672,14 @@ void WaSkin::volumeSliderReleased() void WaSkin::volumeSetValue(int val) { if (mVolumePressed) - waInfo->setText(i18n("Volume: %1%").arg(val)); + waInfo->setText(i18n("Volume: %1%").tqarg(val)); napp->player()->setVolume(val); } void WaSkin::slotPlaying() { - waStatus->setStatus(STATUS_PLAYING); + watqStatus->settqStatus(STATUS_PLAYING); if (!napp->playlist()->current()) { return; @@ -710,7 +710,7 @@ void WaSkin::slotPlaying() void WaSkin::slotStopped() { - waStatus->setStatus(STATUS_STOPPED); + watqStatus->settqStatus(STATUS_STOPPED); waDigit->setTime(""); @@ -733,7 +733,7 @@ void WaSkin::slotStopped() void WaSkin::slotPaused() { - waStatus->setStatus(STATUS_PAUSED); + watqStatus->settqStatus(STATUS_PAUSED); } void WaSkin::keyPressEvent(TQKeyEvent *e) { diff --git a/noatun/modules/winskin/waSkin.h b/noatun/modules/winskin/waSkin.h index 947ce81e..5c363428 100644 --- a/noatun/modules/winskin/waSkin.h +++ b/noatun/modules/winskin/waSkin.h @@ -33,7 +33,7 @@ class WaMain; class WaIndicator; class WaTitleBar; class WaClutterbar; -class WaStatus; +class WatqStatus; class WaJumpSlider; class WaVolumeSlider; @@ -45,7 +45,8 @@ class WaSkin; extern WaSkin *_waskin_instance; class WaSkin : public TQWidget, public UserInterface { - Q_OBJECT + Q_OBJECT + TQ_OBJECT NOATUNPLUGIND WaSkinModel *waSkinModel; WaSkinManager *waSkinManager; @@ -59,7 +60,7 @@ class WaSkin : public TQWidget, public UserInterface { void loadSkin(TQString skinDir); void setChannels(int val); - TQSize sizeHint() const; + TQSize tqsizeHint() const; static TQString defaultSkin(); static WaSkin *instance() { return _waskin_instance; } @@ -158,7 +159,7 @@ class WaSkin : public TQWidget, public UserInterface { WaLabel *waFreq; WaInfo *waInfo; - WaStatus *waStatus; + WatqStatus *watqStatus; WaIndicator *waStereo; WaIndicator *waMono; diff --git a/noatun/modules/winskin/waSkinManager.cpp b/noatun/modules/winskin/waSkinManager.cpp index cb5b0e2a..de7a4d0f 100644 --- a/noatun/modules/winskin/waSkinManager.cpp +++ b/noatun/modules/winskin/waSkinManager.cpp @@ -25,20 +25,20 @@ TQStringList WaSkinManager::availableSkins() { // This loop adds them all to our skin list for(unsigned int x = 0;x < skinDirs.count();x++) { - TQDir skinQDir(skinDirs[x]); + TQDir skinTQDir(skinDirs[x]); // We only want directories, although there shouldn't be anything else - skinQDir.setFilter( TQDir::Dirs ); + skinTQDir.setFilter( TQDir::Dirs ); // I guess name is as good as any - skinQDir.setSorting( TQDir::Name ); + skinTQDir.setSorting( TQDir::Name ); - for (unsigned int y = 0;y < skinQDir.count();y++) { - TQStringList skins = skinQDir.entryList(TQDir::Dirs, TQDir::Name); + for (unsigned int y = 0;y < skinTQDir.count();y++) { + TQStringList skins = skinTQDir.entryList(TQDir::Dirs, TQDir::Name); // We really don't care for '.' and '..' - if (skinQDir[y][0] != (char)'.') { + if (skinTQDir[y][0] != (char)'.') { // Add ourselves to the list, using our directory name - skin_list += skinQDir[y]; + skin_list += skinTQDir[y]; } } } @@ -82,7 +82,7 @@ bool WaSkinManager::installSkin(TQString _url) { return false; TQString base_path; - base_path = location + "/" + TQFileInfo(url.path()).baseName().replace(TQRegExp("_"), " "); + base_path = location + "/" + TQFileInfo(url.path()).baseName().tqreplace(TQRegExp("_"), " "); KIO::Job *job = KIO::copy("zip:" + url.path(), base_path); connect(job, TQT_SIGNAL(result(KIO::Job *)), this, TQT_SIGNAL(updateSkinList())); diff --git a/noatun/modules/winskin/waSkinManager.h b/noatun/modules/winskin/waSkinManager.h index 360826b1..bc04d89c 100644 --- a/noatun/modules/winskin/waSkinManager.h +++ b/noatun/modules/winskin/waSkinManager.h @@ -9,6 +9,7 @@ class WaSkinManager : public TQObject, public DCOPObject { Q_OBJECT +//TQ_OBJECT K_DCOP public: diff --git a/noatun/modules/winskin/waSkinMapping.h b/noatun/modules/winskin/waSkinMapping.h index a3dfc9c5..37d56c08 100644 --- a/noatun/modules/winskin/waSkinMapping.h +++ b/noatun/modules/winskin/waSkinMapping.h @@ -107,10 +107,10 @@ static const SkinDesc normalMapFromFile[] = { {_WA_FILE_SHUFREP, 69, 61, 23, 12}, // _WA_SKIN_SHUFREP_PLAYLIST_NOT_SET_PRES {_WA_FILE_SHUFREP, 23, 73, 23, 12}, // _WA_SKIN_SHUFREP_PLAYLIST_SET_NORM {_WA_FILE_SHUFREP, 73, 23, 12}, // _WA_SKIN_SHUFREP_PLAYLIST_SET_PRES - {_WA_FILE_SHUFREP, 0, 61, 23, 12}, // _WA_SKIN_SHUFREP_EQ_NOT_SET_NORM - {_WA_FILE_SHUFREP, 46, 61, 23, 12}, // _WA_SKIN_SHUFREP_EQ_NOT_SET_PRES - {_WA_FILE_SHUFREP, 0, 73, 23, 12}, // _WA_SKIN_SHUFREP_EQ_SET_NORM - {_WA_FILE_SHUFREP, 46, 73, 23, 12}, // _WA_SKIN_SHUFREP_EQ_SET_PRES + {_WA_FILE_SHUFREP, 0, 61, 23, 12}, // _WA_SKIN_SHUFREP_ETQ_NOT_SET_NORM + {_WA_FILE_SHUFREP, 46, 61, 23, 12}, // _WA_SKIN_SHUFREP_ETQ_NOT_SET_PRES + {_WA_FILE_SHUFREP, 0, 73, 23, 12}, // _WA_SKIN_SHUFREP_ETQ_SET_NORM + {_WA_FILE_SHUFREP, 46, 73, 23, 12}, // _WA_SKIN_SHUFREP_ETQ_SET_PRES {_WA_FILE_TEXT, 0, 0, 155, 18}, // _WA_SKIN_TEXT {_WA_FILE_VOLUME, 0, 0, 68, 421}, // _WA_SKIN_VOLUME_BAR_ALL_BARS {_WA_FILE_VOLUME, 0, 0, 68, 13}, // _WA_SKIN_VOLUME_BAR diff --git a/noatun/modules/winskin/waSkinModel.cpp b/noatun/modules/winskin/waSkinModel.cpp index e7562c04..b2cdb0c2 100644 --- a/noatun/modules/winskin/waSkinModel.cpp +++ b/noatun/modules/winskin/waSkinModel.cpp @@ -419,37 +419,37 @@ void WaSkinModel::resetSkinModel() { TQChar WaSkinModel::deaccent(TQChar input) { - if (TQString("Á").contains(input)) + if (TQString("Á").tqcontains(input)) return 'A'; - if (TQString("ÉË").contains(input)) + if (TQString("ÉË").tqcontains(input)) return 'E'; - if (TQString("ÍÎ").contains(input)) + if (TQString("ÍÎ").tqcontains(input)) return 'I'; - if (TQString("ÔÓ").contains(input)) + if (TQString("ÔÓ").tqcontains(input)) return 'O'; - if (TQString("ÚÜ").contains(input)) + if (TQString("ÚÜ").tqcontains(input)) return 'U'; if (input == 'Ý') return 'Y'; - if (TQString("áâ").contains(input)) + if (TQString("áâ").tqcontains(input)) return 'a'; - if (TQString("éë").contains(input)) + if (TQString("éë").tqcontains(input)) return 'e'; - if (TQString("îí").contains(input)) + if (TQString("îí").tqcontains(input)) return 'i'; - if (TQString("ôó").contains(input)) + if (TQString("ôó").tqcontains(input)) return 'o'; - if (TQString("úü").contains(input)) + if (TQString("úü").tqcontains(input)) return 'u'; return input; diff --git a/noatun/modules/winskin/waSkinModel.h b/noatun/modules/winskin/waSkinModel.h index f200bf83..75f485d5 100644 --- a/noatun/modules/winskin/waSkinModel.h +++ b/noatun/modules/winskin/waSkinModel.h @@ -26,7 +26,8 @@ class WaSkinModel; extern WaSkinModel *_waskinmodel_instance; class WaSkinModel : public TQObject { - Q_OBJECT + Q_OBJECT + TQ_OBJECT public: WaSkinModel(); diff --git a/noatun/modules/winskin/waSkins.h b/noatun/modules/winskin/waSkins.h index f8d5f623..8e778525 100644 --- a/noatun/modules/winskin/waSkins.h +++ b/noatun/modules/winskin/waSkins.h @@ -58,10 +58,10 @@ #define _WA_SKIN_SHUFREP_PLAYLIST_NOT_SET_PRES 29 #define _WA_SKIN_SHUFREP_PLAYLIST_SET_NORM 30 #define _WA_SKIN_SHUFREP_PLAYLIST_SET_PRES 31 -#define _WA_SKIN_SHUFREP_EQ_NOT_SET_NORM 32 -#define _WA_SKIN_SHUFREP_EQ_NOT_SET_PRES 33 -#define _WA_SKIN_SHUFREP_EQ_SET_NORM 34 -#define _WA_SKIN_SHUFREP_EQ_SET_PRES 35 +#define _WA_SKIN_SHUFREP_ETQ_NOT_SET_NORM 32 +#define _WA_SKIN_SHUFREP_ETQ_NOT_SET_PRES 33 +#define _WA_SKIN_SHUFREP_ETQ_SET_NORM 34 +#define _WA_SKIN_SHUFREP_ETQ_SET_PRES 35 #define _WA_SKIN_TEXT 36 diff --git a/noatun/modules/winskin/waSlider.cpp b/noatun/modules/winskin/waSlider.cpp index 99e52402..3323e7ee 100644 --- a/noatun/modules/winskin/waSlider.cpp +++ b/noatun/modules/winskin/waSlider.cpp @@ -70,7 +70,7 @@ void WaSlider::mouseMoveEvent(TQMouseEvent * e) if (newX < 0) newX = 0; - TQSize size = sizeHint(); + TQSize size = tqsizeHint(); int maxX = size.width() - slider_width; @@ -102,7 +102,7 @@ void WaSlider::updateSliderPos(int value) } void WaSlider::mousePressEvent(TQMouseEvent *e) { - if (e->button() != LeftButton && e->button() != MidButton) { + if (e->button() != Qt::LeftButton && e->button() != Qt::MidButton) { WaWidget::mousePressEvent(e); return; } @@ -143,7 +143,7 @@ void WaSlider::mouseReleaseEvent(TQMouseEvent *e) int WaSlider::pixel2Value(int xpos) { - TQSize size = sizeHint(); + TQSize size = tqsizeHint(); int min = abs(minValue); int max = abs(maxValue); @@ -158,7 +158,7 @@ int WaSlider::pixel2Value(int xpos) int WaSlider::value2Pixel(int value) { - TQSize size = sizeHint(); + TQSize size = tqsizeHint(); float min = (float) minValue; float max = (float) maxValue; float fmin = min; diff --git a/noatun/modules/winskin/waSlider.h b/noatun/modules/winskin/waSlider.h index 47630a6c..0515a3c7 100644 --- a/noatun/modules/winskin/waSlider.h +++ b/noatun/modules/winskin/waSlider.h @@ -23,6 +23,7 @@ class WaSlider : public WaWidget { Q_OBJECT + TQ_OBJECT public: WaSlider(int sliderBarMapId, int sliderId, bool is_volume = false); diff --git a/noatun/modules/winskin/waStatus.cpp b/noatun/modules/winskin/waStatus.cpp index 861e8677..20f95d92 100644 --- a/noatun/modules/winskin/waStatus.cpp +++ b/noatun/modules/winskin/waStatus.cpp @@ -14,16 +14,16 @@ #include "waStatus.h" #include "waSkinModel.h" -WaStatus::WaStatus() : WaWidget(_WA_MAPPING_PLAYPAUS) +WatqStatus::WatqStatus() : WaWidget(_WA_MAPPING_PLAYPAUS) { _status = STATUS_STOPPED; } -WaStatus::~WaStatus() +WatqStatus::~WatqStatus() { } -void WaStatus::paintEvent(TQPaintEvent *) +void WatqStatus::paintEvent(TQPaintEvent *) { if (_status == STATUS_PLAYING) { paintPixmap(_WA_SKIN_PLAYPAUS_WORK_INDICATOR); diff --git a/noatun/modules/winskin/waStatus.h b/noatun/modules/winskin/waStatus.h index e67054df..e028f318 100644 --- a/noatun/modules/winskin/waStatus.h +++ b/noatun/modules/winskin/waStatus.h @@ -22,14 +22,15 @@ enum status_enum {STATUS_PLAYING, STATUS_STOPPED, STATUS_PAUSED}; -class WaStatus : public WaWidget { +class WatqStatus : public WaWidget { Q_OBJECT + TQ_OBJECT public: - WaStatus(); - ~WaStatus(); + WatqStatus(); + ~WatqStatus(); - void setStatus(status_enum status) { _status = status; update(); } + void settqStatus(status_enum status) { _status = status; update(); } status_enum status() const { return _status; } private: diff --git a/noatun/modules/winskin/waTitleBar.cpp b/noatun/modules/winskin/waTitleBar.cpp index bba7386e..b3b4917c 100644 --- a/noatun/modules/winskin/waTitleBar.cpp +++ b/noatun/modules/winskin/waTitleBar.cpp @@ -25,7 +25,7 @@ WaTitleBar::WaTitleBar() : WaIndicator(_WA_MAPPING_TITLE, _WA_SKIN_TITLE_ACTIVE, _WA_SKIN_TITLE_INACTIVE) { moving = false; - setState(parentWidget()->isActiveWindow()); + setState(tqparentWidget()->isActiveWindow()); } WaTitleBar::~WaTitleBar() @@ -34,7 +34,7 @@ WaTitleBar::~WaTitleBar() void WaTitleBar::mousePressEvent(TQMouseEvent * e) { - if (e->button() != RightButton) { + if (e->button() != Qt::RightButton) { if (!moving) { moving = true; mDragStart = e->pos(); @@ -55,7 +55,7 @@ void WaTitleBar::mouseDoubleClickEvent(TQMouseEvent *) { void WaTitleBar::mouseReleaseEvent(TQMouseEvent * e) { - if (e->button() != RightButton) { + if (e->button() != Qt::RightButton) { moving = false; update(); return; @@ -73,7 +73,7 @@ void WaTitleBar::mouseMoveEvent(TQMouseEvent * e) } if (moving) - parentWidget()->move(e->globalPos() - mDragStart); + tqparentWidget()->move(e->globalPos() - mDragStart); } #include <waTitleBar.moc> diff --git a/noatun/modules/winskin/waTitleBar.h b/noatun/modules/winskin/waTitleBar.h index 30bfe29a..ad181389 100644 --- a/noatun/modules/winskin/waTitleBar.h +++ b/noatun/modules/winskin/waTitleBar.h @@ -29,6 +29,7 @@ class WaTitleBar : public WaIndicator { Q_OBJECT + TQ_OBJECT public: WaTitleBar(); diff --git a/noatun/modules/winskin/waVolumeSlider.h b/noatun/modules/winskin/waVolumeSlider.h index 29030c65..0f4d6ebf 100644 --- a/noatun/modules/winskin/waVolumeSlider.h +++ b/noatun/modules/winskin/waVolumeSlider.h @@ -19,7 +19,8 @@ #include "waWidget.h" class WaVolumeSlider:public WaWidget { - Q_OBJECT + Q_OBJECT + TQ_OBJECT public: WaVolumeSlider(); diff --git a/noatun/modules/winskin/waWidget.cpp b/noatun/modules/winskin/waWidget.cpp index a93537b9..0b792c7c 100644 --- a/noatun/modules/winskin/waWidget.cpp +++ b/noatun/modules/winskin/waWidget.cpp @@ -14,39 +14,39 @@ WaWidget::~WaWidget() { void WaWidget::paintPixmap(int pixmap_mapping) { if (pixmap_mapping != -1) - WaSkinModel::instance()->bltTo(pixmap_mapping, this, 0, 0); + WaSkinModel::instance()->bltTo(pixmap_mapping, TQT_TQPAINTDEVICE(this), 0, 0); else - WaSkinModel::instance()->paintBackgroundTo(mapping, this, 0, 0); + WaSkinModel::instance()->paintBackgroundTo(mapping, TQT_TQPAINTDEVICE(this), 0, 0); } void WaWidget::paintPixmap(int pixmap_mapping, int x, int y) { if (pixmap_mapping != -1) - WaSkinModel::instance()->bltTo(pixmap_mapping, this, x, y); + WaSkinModel::instance()->bltTo(pixmap_mapping, TQT_TQPAINTDEVICE(this), x, y); else - WaSkinModel::instance()->paintBackgroundTo(mapping, this, x, y); + WaSkinModel::instance()->paintBackgroundTo(mapping, TQT_TQPAINTDEVICE(this), x, y); } void WaWidget::paintPixmap(int pixmap_mapping, int argument) { if (pixmap_mapping != -1) - WaSkinModel::instance()->bltTo(pixmap_mapping, this, 0, 0, argument); + WaSkinModel::instance()->bltTo(pixmap_mapping, TQT_TQPAINTDEVICE(this), 0, 0, argument); else - WaSkinModel::instance()->paintBackgroundTo(mapping, this, 0, 0); + WaSkinModel::instance()->paintBackgroundTo(mapping, TQT_TQPAINTDEVICE(this), 0, 0); } void WaWidget::paintPixmap(int pixmap_mapping, int argument, int x, int y) { if (pixmap_mapping != -1) - WaSkinModel::instance()->bltTo(pixmap_mapping, this, x, y, argument); + WaSkinModel::instance()->bltTo(pixmap_mapping, TQT_TQPAINTDEVICE(this), x, y, argument); else - WaSkinModel::instance()->paintBackgroundTo(mapping, this, x, y); + WaSkinModel::instance()->paintBackgroundTo(mapping, TQT_TQPAINTDEVICE(this), x, y); } -TQSize WaWidget::sizeHint() { +TQSize WaWidget::tqsizeHint() { return WaSkinModel::instance()->getMapGeometry(mapping).size(); } void WaWidget::mousePressEvent(TQMouseEvent *e) { - if (e->button() == RightButton) + if (e->button() == Qt::RightButton) NoatunStdAction::ContextMenu::showContextMenu(); } diff --git a/noatun/modules/winskin/waWidget.h b/noatun/modules/winskin/waWidget.h index 076d0a5c..d1fb1d9c 100644 --- a/noatun/modules/winskin/waWidget.h +++ b/noatun/modules/winskin/waWidget.h @@ -6,11 +6,12 @@ class WaWidget : public TQWidget { Q_OBJECT + TQ_OBJECT public: WaWidget(int mapping); virtual ~WaWidget(); - TQSize sizeHint(); + TQSize tqsizeHint(); void paintPixmap(int wa_mapping); void paintPixmap(int wa_mapping, int number); @@ -18,7 +19,7 @@ public: void paintPixmap(int wa_mapping, int x, int y); void paintPixmap(int wa_mapping, int number, int x, int y); - void paintBackground() { WaSkinModel::instance()->paintBackgroundTo(mapping, this, 0, 0); } + void paintBackground() { WaSkinModel::instance()->paintBackgroundTo(mapping, TQT_TQPAINTDEVICE(this), 0, 0); } protected: void mousePressEvent(TQMouseEvent *); diff --git a/noatun/modules/winskin/winSkinConfig.cpp b/noatun/modules/winskin/winSkinConfig.cpp index 07352c7b..0f2067de 100644 --- a/noatun/modules/winskin/winSkinConfig.cpp +++ b/noatun/modules/winskin/winSkinConfig.cpp @@ -23,13 +23,13 @@ #include "waSkinManager.h" #include "winSkinConfig.h" -WinSkinConfig::WinSkinConfig(TQWidget * parent, WaSkinManager *waSkinManager) : +WinSkinConfig::WinSkinConfig(TQWidget * tqparent, WaSkinManager *waSkinManager) : CModule(i18n("Winskin"), i18n("Skin Selection for the Winskin Plugin"), "style", - parent) + TQT_TQOBJECT(tqparent)) { - // Make a token horizontal layout box + // Make a token horizontal tqlayout box vbox = new TQVBoxLayout(this); vbox->setSpacing( 6 ); vbox->setMargin( 0 ); @@ -55,7 +55,7 @@ WinSkinConfig::WinSkinConfig(TQWidget * parent, WaSkinManager *waSkinManager) : mWaSkinManager = waSkinManager; - TQGroupBox *settingsBox = new TQGroupBox( 1, Vertical, i18n("Settings"), this ); + TQGroupBox *settingsBox = new TQGroupBox( 1,Qt::Vertical, i18n("Settings"), this ); vbox->addWidget(settingsBox); TQHBox *box = new TQHBox(settingsBox); @@ -68,7 +68,7 @@ WinSkinConfig::WinSkinConfig(TQWidget * parent, WaSkinManager *waSkinManager) : scrollSpeed->setMinValue( 0 ); scrollSpeed->setMaxValue( 50 ); scrollSpeed->setPageStep( 1 ); - scrollSpeed->setOrientation( TQSlider::Horizontal ); + scrollSpeed->setOrientation( Qt::Horizontal ); scrollSpeed->setTickmarks( TQSlider::NoMarks ); label = new TQLabel(i18n("Fast"), box); @@ -111,7 +111,7 @@ void WinSkinConfig::reopen() { TQString orig_skin = mWaSkinManager->currentSkin(); // Where is that skin in our big-list-o-skins? - TQListBoxItem *item = skin_list->findItem(orig_skin); + TQListBoxItem *item = skin_list->tqfindItem(orig_skin); if (item) { // Aha, found it... make it the currently selected skin @@ -138,7 +138,7 @@ void WinSkinConfig::install() TQString url; // Ask the user for directory containing a skin - KURLRequesterDlg* udlg = new KURLRequesterDlg( TQString::null, this, "udlg", true ); + KURLRequesterDlg* udlg = new KURLRequesterDlg( TQString(), this, "udlg", true ); udlg->urlRequester()->setFilter(mWaSkinManager->skinMimeTypes().join(" ")); udlg->urlRequester()->setMode( KFile::File | KFile::Directory | KFile::ExistingOnly ); @@ -163,7 +163,7 @@ void WinSkinConfig::remove() // Ask the user first if( KMessageBox::warningContinueCancel( this, - i18n("<qt>Are you sure you want to remove the <b>%1</b> skin?</qt>").arg( skin_list->currentText() ), TQString::null, KStdGuiItem::del() ) + i18n("<qt>Are you sure you want to remove the <b>%1</b> skin?</qt>").tqarg( skin_list->currentText() ), TQString(), KStdGuiItem::del() ) == KMessageBox::Continue ) { mWaSkinManager->removeSkin( skin_list->currentText() ); diff --git a/noatun/modules/winskin/winSkinConfig.h b/noatun/modules/winskin/winSkinConfig.h index 3ba04cad..047f0805 100644 --- a/noatun/modules/winskin/winSkinConfig.h +++ b/noatun/modules/winskin/winSkinConfig.h @@ -10,8 +10,9 @@ class TQSlider; class WinSkinConfig:public CModule { Q_OBJECT + TQ_OBJECT public: - WinSkinConfig(TQWidget * parent, WaSkinManager *waManager); + WinSkinConfig(TQWidget * tqparent, WaSkinManager *waManager); void save(); diff --git a/noatun/modules/winskin/winSkinVis.cpp b/noatun/modules/winskin/winSkinVis.cpp index 8ec025d2..f760fac3 100644 --- a/noatun/modules/winskin/winSkinVis.cpp +++ b/noatun/modules/winskin/winSkinVis.cpp @@ -17,8 +17,8 @@ #define __BANDS 75 #define __SPAHEIGHT 15 -WinSkinVis::WinSkinVis(TQObject *parent, const char *name): - TQObject(parent,name),Visualization(50) { +WinSkinVis::WinSkinVis(TQObject *tqparent, const char *name): + TQObject(tqparent,name),Visualization(50) { m_currentPeaks=new float[__BANDS]; diff --git a/noatun/modules/winskin/winSkinVis.h b/noatun/modules/winskin/winSkinVis.h index 51c33205..3f941c6f 100644 --- a/noatun/modules/winskin/winSkinVis.h +++ b/noatun/modules/winskin/winSkinVis.h @@ -25,9 +25,10 @@ class WinSkinVis : public TQObject, public Visualization { Q_OBJECT + TQ_OBJECT public: - WinSkinVis(TQObject* parent,const char* name); + WinSkinVis(TQObject* tqparent,const char* name); ~WinSkinVis(); /** diff --git a/noatun/noatun.api b/noatun/noatun.api index abf3bf87..2e0b8806 100644 --- a/noatun/noatun.api +++ b/noatun/noatun.api @@ -59,8 +59,8 @@ WARN_LOGFILE = INPUT = library/noatun FILE_PATTERNS = *.h RECURSIVE = NO -EXCLUDE_PATTERNS = *.moc.* \ - moc* \ +EXCLUDE_PATTERNS = *.tqmoc.* \ + tqmoc* \ *.all_cpp.* \ *unload.* \ EXAMPLE_PATH = diff --git a/noatun/noatun20update.cpp b/noatun/noatun20update.cpp index 8ab0bbdb..dbf21f3d 100644 --- a/noatun/noatun20update.cpp +++ b/noatun/noatun20update.cpp @@ -21,19 +21,19 @@ int main(int, char **) TQString text = qin.readAll(); // tag loaders - bool tagloaders = text.contains("id3tag.plugin") || - text.contains("oggtag.plugin") || - text.contains("luckytag.plugin"); + bool tagloaders = text.tqcontains("id3tag.plugin") || + text.tqcontains("oggtag.plugin") || + text.tqcontains("luckytag.plugin"); - text.replace(TQRegExp("id3tag\\.plugin"), ""); - text.replace(TQRegExp("oggtag\\.plugin"), ""); - text.replace(TQRegExp("luckytag\\.plugin"), ""); + text.tqreplace(TQRegExp("id3tag\\.plugin"), ""); + text.tqreplace(TQRegExp("oggtag\\.plugin"), ""); + text.tqreplace(TQRegExp("luckytag\\.plugin"), ""); - if(tagloaders) text.replace(TQRegExp("Modules="), "Modules=metatag.plugin,"); + if(tagloaders) text.tqreplace(TQRegExp("Modules="), "Modules=metatag.plugin,"); // playlists - text.replace(TQRegExp("tron\\.plugin"), "splitplaylist.plugin"); - text.replace(TQRegExp("liszt\\.plugin"), "splitplaylist.plugin"); + text.tqreplace(TQRegExp("tron\\.plugin"), "splitplaylist.plugin"); + text.tqreplace(TQRegExp("liszt\\.plugin"), "splitplaylist.plugin"); qout.writeBlock(text.local8Bit()); |