From e654398e46e37abf457b2b1122ab898d2c51c49f Mon Sep 17 00:00:00 2001 From: tpearson Date: Sat, 31 Jul 2010 19:43:15 +0000 Subject: Trinity Qt initial conversion git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdemultimedia@1157644 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- noatun/modules/artseffects/extrastereogui_impl.cc | 10 +- noatun/modules/artseffects/extrastereogui_impl.h | 6 +- noatun/modules/dcopiface/dcopiface.cpp | 52 +++--- noatun/modules/dcopiface/dcopiface.h | 32 ++-- noatun/modules/excellent/userinterface.cpp | 92 +++++----- noatun/modules/excellent/userinterface.h | 22 +-- noatun/modules/htmlexport/htmlexport.cpp | 80 ++++----- noatun/modules/htmlexport/htmlexport.h | 46 ++--- noatun/modules/infrared/infrared.cpp | 12 +- noatun/modules/infrared/infrared.h | 4 +- noatun/modules/infrared/irprefs.cpp | 96 +++++----- noatun/modules/infrared/irprefs.h | 14 +- noatun/modules/infrared/lirc.cpp | 38 ++-- noatun/modules/infrared/lirc.h | 22 +-- noatun/modules/kaiman/pref.cpp | 32 ++-- noatun/modules/kaiman/pref.h | 8 +- noatun/modules/kaiman/style.cpp | 190 ++++++++++---------- noatun/modules/kaiman/style.h | 140 +++++++-------- noatun/modules/kaiman/userinterface.cpp | 110 ++++++------ noatun/modules/kaiman/userinterface.h | 12 +- noatun/modules/keyz/keyz.cpp | 78 ++++---- noatun/modules/keyz/keyz.h | 4 +- noatun/modules/kjofol-skin/helpers.cpp | 4 +- noatun/modules/kjofol-skin/kjbackground.cpp | 6 +- noatun/modules/kjofol-skin/kjbackground.h | 10 +- noatun/modules/kjofol-skin/kjbutton.cpp | 34 ++-- noatun/modules/kjofol-skin/kjbutton.h | 20 +-- noatun/modules/kjofol-skin/kjequalizer.cpp | 40 ++--- noatun/modules/kjofol-skin/kjequalizer.h | 22 +-- noatun/modules/kjofol-skin/kjfont.cpp | 72 ++++---- noatun/modules/kjofol-skin/kjfont.h | 34 ++-- noatun/modules/kjofol-skin/kjloader.cpp | 132 +++++++------- noatun/modules/kjofol-skin/kjloader.h | 56 +++--- noatun/modules/kjofol-skin/kjprefs.cpp | 142 +++++++-------- noatun/modules/kjofol-skin/kjprefs.h | 22 +-- noatun/modules/kjofol-skin/kjseeker.cpp | 34 ++-- noatun/modules/kjofol-skin/kjseeker.h | 22 +-- noatun/modules/kjofol-skin/kjsliders.cpp | 44 ++--- noatun/modules/kjofol-skin/kjsliders.h | 50 +++--- noatun/modules/kjofol-skin/kjtextdisplay.cpp | 128 ++++++------- noatun/modules/kjofol-skin/kjtextdisplay.h | 88 ++++----- noatun/modules/kjofol-skin/kjvis.cpp | 94 +++++----- noatun/modules/kjofol-skin/kjvis.h | 38 ++-- noatun/modules/kjofol-skin/kjwidget.cpp | 22 +-- noatun/modules/kjofol-skin/kjwidget.h | 24 +-- noatun/modules/kjofol-skin/parser.cpp | 40 ++--- noatun/modules/kjofol-skin/parser.h | 38 ++-- noatun/modules/marquis/marquis.cpp | 24 +-- noatun/modules/metatag/edit.cpp | 116 ++++++------ noatun/modules/metatag/edit.h | 24 +-- noatun/modules/metatag/metatag.cpp | 16 +- noatun/modules/metatag/metatag.h | 6 +- noatun/modules/monoscope/monoscope.cpp | 16 +- noatun/modules/monoscope/monoscope.h | 6 +- noatun/modules/net/net.cpp | 12 +- noatun/modules/net/net.h | 8 +- noatun/modules/noatunui/userinterface.cpp | 124 ++++++------- noatun/modules/noatunui/userinterface.h | 28 +-- noatun/modules/simple/propertiesdialog.ui.h | 14 +- noatun/modules/simple/userinterface.cpp | 152 ++++++++-------- noatun/modules/simple/userinterface.h | 32 ++-- noatun/modules/splitplaylist/find.cpp | 26 +-- noatun/modules/splitplaylist/find.h | 8 +- noatun/modules/splitplaylist/playlist.cpp | 20 +-- noatun/modules/splitplaylist/playlist.h | 8 +- noatun/modules/splitplaylist/view.cpp | 210 +++++++++++----------- noatun/modules/splitplaylist/view.h | 58 +++--- noatun/modules/systray/cmodule.cpp | 26 +-- noatun/modules/systray/cmodule.h | 6 +- noatun/modules/systray/kitsystemtray.cpp | 18 +- noatun/modules/systray/kitsystemtray.h | 14 +- noatun/modules/systray/systray.cpp | 156 ++++++++-------- noatun/modules/systray/systray.h | 20 +-- noatun/modules/voiceprint/prefs.cpp | 28 +-- noatun/modules/voiceprint/prefs.h | 4 +- noatun/modules/voiceprint/voiceprint.cpp | 22 +-- noatun/modules/voiceprint/voiceprint.h | 14 +- noatun/modules/winskin/fileInfo.cpp | 4 +- noatun/modules/winskin/guiSpectrumAnalyser.cpp | 42 ++--- noatun/modules/winskin/guiSpectrumAnalyser.h | 12 +- noatun/modules/winskin/skinMap.h | 2 +- noatun/modules/winskin/waBalanceSlider.cpp | 8 +- noatun/modules/winskin/waButton.cpp | 8 +- noatun/modules/winskin/waButton.h | 10 +- noatun/modules/winskin/waClutterbar.cpp | 2 +- noatun/modules/winskin/waClutterbar.h | 4 +- noatun/modules/winskin/waColor.cpp | 6 +- noatun/modules/winskin/waColor.h | 8 +- noatun/modules/winskin/waDigit.cpp | 6 +- noatun/modules/winskin/waDigit.h | 12 +- noatun/modules/winskin/waIndicator.cpp | 2 +- noatun/modules/winskin/waIndicator.h | 4 +- noatun/modules/winskin/waInfo.cpp | 34 ++-- noatun/modules/winskin/waInfo.h | 22 +-- noatun/modules/winskin/waJumpSlider.cpp | 10 +- noatun/modules/winskin/waJumpSlider.h | 4 +- noatun/modules/winskin/waLabel.cpp | 16 +- noatun/modules/winskin/waLabel.h | 12 +- noatun/modules/winskin/waMain.cpp | 2 +- noatun/modules/winskin/waMain.h | 2 +- noatun/modules/winskin/waRegion.cpp | 38 ++-- noatun/modules/winskin/waRegion.h | 18 +- noatun/modules/winskin/waSkin.cpp | 162 ++++++++--------- noatun/modules/winskin/waSkin.h | 26 +-- noatun/modules/winskin/waSkinManager.cpp | 58 +++--- noatun/modules/winskin/waSkinManager.h | 28 +-- noatun/modules/winskin/waSkinModel.cpp | 106 +++++------ noatun/modules/winskin/waSkinModel.h | 34 ++-- noatun/modules/winskin/waSlider.cpp | 14 +- noatun/modules/winskin/waSlider.h | 12 +- noatun/modules/winskin/waStatus.cpp | 2 +- noatun/modules/winskin/waStatus.h | 4 +- noatun/modules/winskin/waTitleBar.cpp | 14 +- noatun/modules/winskin/waTitleBar.h | 14 +- noatun/modules/winskin/waVolumeSlider.cpp | 8 +- noatun/modules/winskin/waWidget.cpp | 8 +- noatun/modules/winskin/waWidget.h | 8 +- noatun/modules/winskin/winSkinConfig.cpp | 68 +++---- noatun/modules/winskin/winSkinConfig.h | 14 +- noatun/modules/winskin/winSkinVis.cpp | 4 +- noatun/modules/winskin/winSkinVis.h | 6 +- 121 files changed, 2205 insertions(+), 2205 deletions(-) (limited to 'noatun/modules') diff --git a/noatun/modules/artseffects/extrastereogui_impl.cc b/noatun/modules/artseffects/extrastereogui_impl.cc index 5952c80e..b5a19bf0 100644 --- a/noatun/modules/artseffects/extrastereogui_impl.cc +++ b/noatun/modules/artseffects/extrastereogui_impl.cc @@ -1,13 +1,13 @@ -#include -#include +#include +#include #include "extrastereogui_impl.h" namespace Arts { -ExtraStereoGUI_impl::ExtraStereoGUI_impl() : QWidget(0) +ExtraStereoGUI_impl::ExtraStereoGUI_impl() : TQWidget(0) { - (new QHBoxLayout(this))->setAutoAdd(true); - mSlider=new QSlider(0,100,10, 0, Horizontal, this); + (new TQHBoxLayout(this))->setAutoAdd(true); + mSlider=new TQSlider(0,100,10, 0, Horizontal, this); mSlider->show(); show(); } diff --git a/noatun/modules/artseffects/extrastereogui_impl.h b/noatun/modules/artseffects/extrastereogui_impl.h index 56104ae8..d807644a 100644 --- a/noatun/modules/artseffects/extrastereogui_impl.h +++ b/noatun/modules/artseffects/extrastereogui_impl.h @@ -1,12 +1,12 @@ #include "artseffects.h" #include "stdsynthmodule.h" -#include +#include class QSlider; namespace Arts { -class ExtraStereoGUI_impl : public QWidget, virtual public ExtraStereoGUI_skel +class ExtraStereoGUI_impl : public TQWidget, virtual public ExtraStereoGUI_skel { public: ExtraStereo effect; @@ -19,7 +19,7 @@ public slots: void changeSlider(int); private: - QSlider *mSlider; + TQSlider *mSlider; }; diff --git a/noatun/modules/dcopiface/dcopiface.cpp b/noatun/modules/dcopiface/dcopiface.cpp index 93ef6160..aef6c58f 100644 --- a/noatun/modules/dcopiface/dcopiface.cpp +++ b/noatun/modules/dcopiface/dcopiface.cpp @@ -19,12 +19,12 @@ extern "C" NIF::NIF() : Plugin(), DCOPObject("Noatun") { mLastVolume = 0; -// connect(napp->player(), SIGNAL(newSong()), SLOT(newSongPlaying())); +// connect(napp->player(), TQT_SIGNAL(newSong()), TQT_SLOT(newSongPlaying())); } NIF::~NIF() { - kapp->dcopClient()->emitDCOPSignal("exiting()", QByteArray()); + kapp->dcopClient()->emitDCOPSignal("exiting()", TQByteArray()); } void NIF::toggleListView() @@ -131,36 +131,36 @@ int NIF::state() return 0; // default to stopped } -QString NIF::lengthString() +TQString NIF::lengthString() { return napp->player()->current() ? napp->player()->current().lengthString() : ""; } -QString NIF::timeString() +TQString NIF::timeString() { return napp->player()->lengthString(); } -QString NIF::title() +TQString NIF::title() { return napp->player()->current() ? napp->player()->current().title() : ""; } -void NIF::setCurrentProperty(const QString &key, const QString &value) +void NIF::setCurrentProperty(const TQString &key, const TQString &value) { if (!napp->player()->current()) return; napp->player()->current().setProperty(key, value); } -QString NIF::currentProperty(const QString &key) +TQString NIF::currentProperty(const TQString &key) { if (!napp->player()->current()) return ""; return napp->player()->current().property(key); } -void NIF::clearCurrentProperty(const QString &key) +void NIF::clearCurrentProperty(const TQString &key) { if (!napp->player()->current()) return; @@ -168,41 +168,41 @@ void NIF::clearCurrentProperty(const QString &key) } -QCString NIF::visStack() +TQCString NIF::visStack() { return napp->player()->engine()->visualizationStack()->toString().c_str(); } -QCString NIF::session() +TQCString NIF::session() { return napp->player()->engine()->session()->toString().c_str(); } // adds one file to the playlist -void NIF::addFile(const QString& f, bool autoplay) +void NIF::addFile(const TQString& f, bool autoplay) { napp->player()->openFile(f, false, autoplay); } // Adds a bunch of files to the playlist -void NIF::addFile(const QStringList &f, bool autoplay) +void NIF::addFile(const TQStringList &f, bool autoplay) { - for (QStringList::ConstIterator it = f.begin(); it != f.end(); ++it ) + for (TQStringList::ConstIterator it = f.begin(); it != f.end(); ++it ) napp->player()->openFile(*it, false, autoplay); } -void NIF::loadPlugin(const QString &spec) +void NIF::loadPlugin(const TQString &spec) { napp->libraryLoader()->add(spec); } -QStringList NIF::availablePlugins() { - QStringList available_spec_files; - QValueList available; +TQStringList NIF::availablePlugins() { + TQStringList available_spec_files; + TQValueList available; available = napp->libraryLoader()->available(); - QValueList::iterator it; + TQValueList::iterator it; for (it = available.begin();it != available.end();it++) { available_spec_files += (*it).specfile; } @@ -210,13 +210,13 @@ QStringList NIF::availablePlugins() { return available_spec_files; } -QStringList NIF::loadedPlugins() { - QStringList loaded_spec_files; - QValueList loaded; +TQStringList NIF::loadedPlugins() { + TQStringList loaded_spec_files; + TQValueList loaded; loaded = napp->libraryLoader()->loaded(); - QValueList::iterator it; + TQValueList::iterator it; for (it = loaded.begin();it != loaded.end();it++) { loaded_spec_files += (*it).specfile; } @@ -224,24 +224,24 @@ QStringList NIF::loadedPlugins() { return loaded_spec_files; } -bool NIF::unloadPlugin(const QString &spec) +bool NIF::unloadPlugin(const TQString &spec) { return napp->libraryLoader()->remove(spec); } -QStringList NIF::mimeTypes() +TQStringList NIF::mimeTypes() { return napp->mimeTypes(); } -QCString NIF::version() +TQCString NIF::version() { return napp->version(); } void NIF::newSongPlaying() { - kapp->dcopClient()->emitDCOPSignal("newFile()", QByteArray()); + kapp->dcopClient()->emitDCOPSignal("newFile()", TQByteArray()); } void NIF::clear() diff --git a/noatun/modules/dcopiface/dcopiface.h b/noatun/modules/dcopiface/dcopiface.h index 4b9fe5e7..cd58a228 100644 --- a/noatun/modules/dcopiface/dcopiface.h +++ b/noatun/modules/dcopiface/dcopiface.h @@ -53,37 +53,37 @@ k_dcop: **/ int state(); - QString lengthString(); - QString timeString(); + TQString lengthString(); + TQString timeString(); - QString title(); + TQString title(); /** * set a property for the current song **/ - void setCurrentProperty(const QString &key, const QString &value); + void setCurrentProperty(const TQString &key, const TQString &value); /** * get a property from the current song **/ - QString currentProperty(const QString &key); + TQString currentProperty(const TQString &key); /** * clear a property from the current song **/ - void clearCurrentProperty(const QString &key); + void clearCurrentProperty(const TQString &key); - QCString visStack(); - QCString session(); + TQCString visStack(); + TQCString session(); - void addFile(const QString& f, bool autoplay); - void addFile(const QStringList &f, bool autoplay); + void addFile(const TQString& f, bool autoplay); + void addFile(const TQStringList &f, bool autoplay); - void loadPlugin(const QString &specFile); - QStringList availablePlugins(); - QStringList loadedPlugins(); - bool unloadPlugin(const QString &specFile); + void loadPlugin(const TQString &specFile); + TQStringList availablePlugins(); + TQStringList loadedPlugins(); + bool unloadPlugin(const TQString &specFile); - QStringList mimeTypes(); - QCString version(); + TQStringList mimeTypes(); + TQCString version(); /** * clear the playlist diff --git a/noatun/modules/excellent/userinterface.cpp b/noatun/modules/excellent/userinterface.cpp index 7f218e98..dac6fbb3 100644 --- a/noatun/modules/excellent/userinterface.cpp +++ b/noatun/modules/excellent/userinterface.cpp @@ -51,15 +51,15 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include Excellent::Excellent() : KMainWindow(0, "NoatunExcellent") @@ -67,12 +67,12 @@ Excellent::Excellent() { setAcceptDrops(true); - KStdAction::quit(napp, SLOT(quit()), actionCollection()); - KStdAction::open(napp, SLOT(fileOpen()), actionCollection()); + KStdAction::quit(napp, TQT_SLOT(quit()), actionCollection()); + KStdAction::open(napp, TQT_SLOT(fileOpen()), actionCollection()); setStandardToolBarMenuEnabled(true); - menubarAction = KStdAction::showMenubar(this, SLOT(showMenubar()), actionCollection()); - KStdAction::preferences(napp, SLOT(preferences()), actionCollection()); + menubarAction = KStdAction::showMenubar(this, TQT_SLOT(showMenubar()), actionCollection()); + KStdAction::preferences(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, SLOT(showVolumeControl()), actionCollection(), "show_volumecontrol"); + volumeAction = new KToggleAction(i18n("Show &Volume Control"), 0, this, TQT_SLOT(showVolumeControl()), actionCollection(), "show_volumecontrol"); volumeAction->setCheckedState(i18n("Hide &Volume Control")); NoatunStdAction::effects(actionCollection(), "effects"); NoatunStdAction::equalizer(actionCollection(), "equalizer"); @@ -95,17 +95,17 @@ Excellent::Excellent() toolBar("mainToolBar")->hide(); // Who needs Qt Designer? - mainFrame = new QHBox(this); + mainFrame = new TQHBox(this); mainFrame->setSpacing(KDialog::spacingHint()); mainFrame->setMargin(0); slider = new L33tSlider(0, 1000, 10, 0, L33tSlider::Horizontal, mainFrame); - slider->setTickmarks(QSlider::NoMarks); + slider->setTickmarks(TQSlider::NoMarks); - elapsed = new QLabel(mainFrame); - QFont labelFont = elapsed->font(); + elapsed = new TQLabel(mainFrame); + TQFont labelFont = elapsed->font(); labelFont.setPointSize(24); labelFont.setBold(true); - QFontMetrics labelFontMetrics = labelFont; + TQFontMetrics labelFontMetrics = labelFont; elapsed->setFont(labelFont); elapsed->setAlignment(AlignCenter | AlignVCenter | ExpandTabs); elapsed->setText("--:--"); @@ -117,7 +117,7 @@ Excellent::Excellent() setCentralWidget(mainFrame); - total = new QLabel(statusBar()); + total = new TQLabel(statusBar()); labelFont = total->font(); labelFont.setBold(true); total->setFont(labelFont); @@ -129,24 +129,24 @@ Excellent::Excellent() statusBar()->addWidget(total, 0, true); statusBar()->show(); - connect( napp, SIGNAL(hideYourself()), this, SLOT(hide()) ); - connect( napp, SIGNAL(showYourself()), this, SLOT(show()) ); + connect( napp, TQT_SIGNAL(hideYourself()), this, TQT_SLOT(hide()) ); + connect( napp, TQT_SIGNAL(showYourself()), this, TQT_SLOT(show()) ); - connect(napp->player(), SIGNAL(playing()), this, SLOT(slotPlaying())); - connect(napp->player(), SIGNAL(stopped()), this, SLOT(slotStopped())); - connect(napp->player(), SIGNAL(paused()), this, SLOT(slotPaused())); + connect(napp->player(), TQT_SIGNAL(playing()), this, TQT_SLOT(slotPlaying())); + connect(napp->player(), TQT_SIGNAL(stopped()), this, TQT_SLOT(slotStopped())); + connect(napp->player(), TQT_SIGNAL(paused()), this, TQT_SLOT(slotPaused())); napp->player()->handleButtons(); - connect(napp->player(), SIGNAL(timeout()), this, SLOT(slotTimeout())); - connect(napp->player(), SIGNAL(loopTypeChange(int)), this, SLOT(slotLoopTypeChanged(int))); + connect(napp->player(), TQT_SIGNAL(timeout()), this, TQT_SLOT(slotTimeout())); + connect(napp->player(), TQT_SIGNAL(loopTypeChange(int)), this, TQT_SLOT(slotLoopTypeChanged(int))); /* This skipToWrapper is needed to pass milliseconds to Player() as everybody * below the GUI is based on milliseconds instead of some unprecise thingy * like seconds or mille */ - connect(slider, SIGNAL(userChanged(int)), this, SLOT(skipToWrapper(int))); - connect(this, SIGNAL(skipTo(int)), napp->player(), SLOT(skipTo(int))); + connect(slider, TQT_SIGNAL(userChanged(int)), this, TQT_SLOT(skipToWrapper(int))); + connect(this, TQT_SIGNAL(skipTo(int)), napp->player(), TQT_SLOT(skipTo(int))); - connect(slider, SIGNAL(sliderMoved(int)), SLOT(sliderMoved(int))); + connect(slider, TQT_SIGNAL(sliderMoved(int)), TQT_SLOT(sliderMoved(int))); setCaption("Noatun"); setIcon(SmallIcon("noatun")); @@ -186,7 +186,7 @@ Excellent::Excellent() break; } - for (QPtrListIterator i(*children()); i.current(); ++i) + for (TQPtrListIterator i(*children()); i.current(); ++i) (*i)->installEventFilter(this); } @@ -203,7 +203,7 @@ Excellent::~Excellent() config.sync(); } -void Excellent::showEvent(QShowEvent *e) +void Excellent::showEvent(TQShowEvent *e) { KConfig *config = KGlobal::config(); config->setGroup("excellent"); @@ -213,7 +213,7 @@ void Excellent::showEvent(QShowEvent *e) KMainWindow::showEvent(e); } -void Excellent::hideEvent(QHideEvent *e) +void Excellent::hideEvent(TQHideEvent *e) { KConfig *config = KGlobal::config(); config->setGroup("excellent"); @@ -223,18 +223,18 @@ void Excellent::hideEvent(QHideEvent *e) KMainWindow::hideEvent(e); } -void Excellent::closeEvent(QCloseEvent *) +void Excellent::closeEvent(TQCloseEvent *) { unload(); } -void Excellent::dragEnterEvent(QDragEnterEvent *event) +void Excellent::dragEnterEvent(TQDragEnterEvent *event) { // accept uri drops only event->accept(KURLDrag::canDecode(event)); } -void Excellent::dropEvent(QDropEvent *event) +void Excellent::dropEvent(TQDropEvent *event) { KURL::List uri; if (KURLDrag::decode(event, uri)) @@ -244,17 +244,17 @@ void Excellent::dropEvent(QDropEvent *event) } } -bool Excellent::eventFilter(QObject *o, QEvent *e) +bool Excellent::eventFilter(TQObject *o, TQEvent *e) { - if (e->type() == QEvent::Wheel) + if (e->type() == TQEvent::Wheel) { - wheelEvent(static_cast(e)); + wheelEvent(static_cast(e)); return true; } - return QWidget::eventFilter(o, e); + return TQWidget::eventFilter(o, e); } -void Excellent::wheelEvent(QWheelEvent *e) +void Excellent::wheelEvent(TQWheelEvent *e) { int delta=e->delta(); napp->player()->setVolume(napp->player()->volume() + delta/120*2); @@ -335,7 +335,7 @@ void Excellent::showMenubar(void) } else { - KMessageBox::information(this, i18n("Press %1 to show the menubar.").arg(menubarAction->shortcut().toString()), QString::null, "Hide Menu warning"); + KMessageBox::information(this, i18n("Press %1 to show the menubar.").arg(menubarAction->shortcut().toString()), TQString::null, "Hide Menu warning"); menuBar()->hide(); } } @@ -354,7 +354,7 @@ void Excellent::changeStatusbar(void) statusBar()->message(napp->player()->current().title()); } -void Excellent::handleLengthString(const QString &text) +void Excellent::handleLengthString(const TQString &text) { if(text.right(5) == "00:00" && text.left(5) == "00:00") { @@ -364,7 +364,7 @@ void Excellent::handleLengthString(const QString &text) else { // Split the length string in to "current" and "elapsed" - QStringList tokens = QStringList::split("/", text); + TQStringList tokens = TQStringList::split("/", text); elapsed->setText(tokens[0]); total->setText(tokens[1]); @@ -376,8 +376,8 @@ void Excellent::growVolumeControl(void) volumeSlider = new L33tSlider(0, 100, 10, 0, Vertical, mainFrame); volumeSlider->setValue(100 - napp->player()->volume()); volumeSlider->show(); - connect(volumeSlider, SIGNAL(sliderMoved(int)), SLOT(changeVolume(int))); - connect(volumeSlider, SIGNAL(userChanged(int)), SLOT(changeVolume(int))); + connect(volumeSlider, TQT_SIGNAL(sliderMoved(int)), TQT_SLOT(changeVolume(int))); + connect(volumeSlider, TQT_SIGNAL(userChanged(int)), TQT_SLOT(changeVolume(int))); } void Excellent::shrinkVolumeControl(void) diff --git a/noatun/modules/excellent/userinterface.h b/noatun/modules/excellent/userinterface.h index 588db6e4..7b30bd93 100644 --- a/noatun/modules/excellent/userinterface.h +++ b/noatun/modules/excellent/userinterface.h @@ -54,16 +54,16 @@ Q_OBJECT public: Excellent(); virtual ~Excellent(); - void load(const QString& url); + void load(const TQString& url); protected: - virtual void showEvent(QShowEvent *); - virtual void hideEvent(QHideEvent *); - virtual void closeEvent(QCloseEvent *); - virtual void dragEnterEvent(QDragEnterEvent *); - virtual void dropEvent(QDropEvent *); - void wheelEvent(QWheelEvent *e); - bool eventFilter(QObject *o, QEvent *e); + virtual void showEvent(TQShowEvent *); + virtual void hideEvent(TQHideEvent *); + virtual void closeEvent(TQCloseEvent *); + virtual void dragEnterEvent(TQDragEnterEvent *); + virtual void dropEvent(TQDropEvent *); + void wheelEvent(TQWheelEvent *e); + bool eventFilter(TQObject *o, TQEvent *e); public slots: void slotPlaying(); @@ -85,17 +85,17 @@ private slots: void changeStatusbar(void); void changeVolume(int); - void handleLengthString(const QString &text); + void handleLengthString(const TQString &text); private: void growVolumeControl(void); void shrinkVolumeControl(void); - QHBox *mainFrame; + TQHBox *mainFrame; KToggleAction *volumeAction, *menubarAction; L33tSlider *volumeSlider, *slider; - QLabel *elapsed, *total; + TQLabel *elapsed, *total; }; #endif diff --git a/noatun/modules/htmlexport/htmlexport.cpp b/noatun/modules/htmlexport/htmlexport.cpp index dc48fd8f..29d00935 100644 --- a/noatun/modules/htmlexport/htmlexport.cpp +++ b/noatun/modules/htmlexport/htmlexport.cpp @@ -1,6 +1,6 @@ #include -#include -#include +#include +#include #include #include #include "htmlexport.h" @@ -13,12 +13,12 @@ extern "C" } } -HTMLExport::HTMLExport(): QObject(0, "HTMLExport"), Plugin() +HTMLExport::HTMLExport(): TQObject(0, "HTMLExport"), Plugin() { NOATUNPLUGINC(HTMLExport); mAction = new KAction(i18n("&Export Playlist..."), "filesaveas", 0, - this, SLOT(slotExport()), this, "exportlist"); + this, TQT_SLOT(slotExport()), this, "exportlist"); napp->pluginActionMenu()->insert(mAction); new Prefs(this); @@ -36,7 +36,7 @@ void HTMLExport::slotExport() config->setGroup("HTMLExport"); // get output target - KURL url = KFileDialog::getSaveURL(QString::null, + KURL url = KFileDialog::getSaveURL(TQString::null, "text/html", 0, i18n("Export Playlist")); @@ -44,10 +44,10 @@ void HTMLExport::slotExport() // write into tempfile KTempFile temp; temp.setAutoDelete(true); - QFile file(temp.name()); + TQFile file(temp.name()); file.open(IO_WriteOnly); - QTextStream str(&file); - str.setCodec(QTextCodec::codecForName("utf8")); + TQTextStream str(&file); + str.setCodec(TQTextCodec::codecForName("utf8")); str << "" << endl; str << "" << endl; @@ -132,37 +132,37 @@ void HTMLExport::slotExport() KIO::NetAccess::upload(temp.name(), url, 0); } -QString HTMLExport::htmlEscape(const QString &source) { +TQString HTMLExport::htmlEscape(const TQString &source) { // Escape characters that need to be escaped - QString temp = source; + TQString temp = source; - temp.replace( QRegExp("&"), "&" ); - temp.replace( QRegExp("<"), "<" ); - temp.replace( QRegExp(">"), ">" ); + temp.replace( TQRegExp("&"), "&" ); + temp.replace( TQRegExp("<"), "<" ); + temp.replace( TQRegExp(">"), ">" ); return temp; } -QString HTMLExport::getColorByEntry(QString s) +TQString HTMLExport::getColorByEntry(TQString s) { - QString res; - QString tmp; - QColor c; + TQString res; + TQString tmp; + TQColor c; // init readConfig config->setGroup("HTMLExport"); c = config->readColorEntry( s ); - tmp = QString::number( c.red(), 16); + tmp = TQString::number( c.red(), 16); if (tmp.length()==1) tmp="0"+tmp; res = tmp; - tmp = QString::number( c.green(), 16); + tmp = TQString::number( c.green(), 16); if (tmp.length()==1) tmp="0"+tmp; res += tmp; - tmp = QString::number( c.blue(), 16); + tmp = TQString::number( c.blue(), 16); if (tmp.length()==1) tmp="0"+tmp; res += tmp; @@ -171,7 +171,7 @@ QString HTMLExport::getColorByEntry(QString s) } //////////////////////////////////// Settings //////////////////////////////////// -Prefs::Prefs(QObject *parent) +Prefs::Prefs(TQObject *parent) : CModule(i18n("Playlist Export"), i18n("Colors & Settings for HTML Export"), "html", parent) { @@ -181,26 +181,26 @@ Prefs::Prefs(QObject *parent) // Set default values if ( !config->hasKey( "headColor" ) ) - config->writeEntry( "headColor", QColor( black ) ) ; + config->writeEntry( "headColor", TQColor( black ) ) ; if ( !config->hasKey( "hoverColor" ) ) - config->writeEntry( "hoverColor", QColor( black ) ); + config->writeEntry( "hoverColor", TQColor( black ) ); if ( !config->hasKey( "bgColor" ) ) - config->writeEntry( "bgColor", QColor( white ) ) ; + config->writeEntry( "bgColor", TQColor( white ) ) ; if ( !config->hasKey( "txtColor" ) ) - config->writeEntry( "txtColor", QColor( black ) ); + config->writeEntry( "txtColor", TQColor( black ) ); config->sync(); // Draw Stuff and insert Settings - QVBoxLayout *top = new QVBoxLayout(this, KDialog::marginHint(), + TQVBoxLayout *top = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint() ); - colorBox = new QGroupBox( i18n( "HTML Color Settings" ), this, "colorBox" ); + colorBox = new TQGroupBox( i18n( "HTML Color Settings" ), this, "colorBox" ); - bgcolorLabel = new QGridLayout( colorBox, 2, 5, + bgcolorLabel = new TQGridLayout( colorBox, 2, 5, KDialog::marginHint(), KDialog::spacingHint() ); headColorSelect = new KColorButton( colorBox, "headColorSelect" ); @@ -211,21 +211,21 @@ Prefs::Prefs(QObject *parent) txtColorSelect = new KColorButton( colorBox, "txtColorSelect" ); - txtColorLabel = new QLabel( colorBox, "txtColorLabel" ); + txtColorLabel = new TQLabel( colorBox, "txtColorLabel" ); txtColorLabel->setText( i18n( "Text:" ) ); - txtColorLabel->setAlignment( int( QLabel::AlignVCenter | QLabel::AlignRight ) ); + txtColorLabel->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) ); - bgColorLabel = new QLabel( colorBox, "bgColorLabel" ); + bgColorLabel = new TQLabel( colorBox, "bgColorLabel" ); bgColorLabel->setText( i18n( "Background:" ) ); - bgColorLabel->setAlignment( int( QLabel::AlignVCenter | QLabel::AlignRight ) ); + bgColorLabel->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) ); - headColorLabel = new QLabel( colorBox, "headColorLabel" ); + headColorLabel = new TQLabel( colorBox, "headColorLabel" ); headColorLabel->setText( i18n( "Heading:" ) ); - headColorLabel->setAlignment( int( QLabel::AlignVCenter | QLabel::AlignRight ) ); + headColorLabel->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) ); - hoverColorLabel = new QLabel( colorBox, "hoverColorLabel" ); + hoverColorLabel = new TQLabel( colorBox, "hoverColorLabel" ); hoverColorLabel->setText( i18n( "Link hover:" ) ); - hoverColorLabel->setAlignment( int( QLabel::AlignVCenter | QLabel::AlignRight ) ); + hoverColorLabel->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) ); bgcolorLabel->setRowStretch(0, 1); @@ -245,7 +245,7 @@ Prefs::Prefs(QObject *parent) // Set up the Background Image frame - bgPicBox = new QHGroupBox( i18n( "Background Image"), this, "bgPicBox" ); + bgPicBox = new TQHGroupBox( i18n( "Background Image"), this, "bgPicBox" ); // Set up the URL requestor bgPicPath = new KURLRequester ( bgPicBox, "bgPicPath" ); @@ -255,11 +255,11 @@ Prefs::Prefs(QObject *parent) bgPicPath->setMode(KFile::File | KFile::ExistingOnly); bgPicPath->setFilter("image/gif image/jpeg image/gif image/png image/svg+xml image/tiff"); - linkEntries = new QCheckBox( this, "linkEntries" ); + linkEntries = new TQCheckBox( this, "linkEntries" ); linkEntries->setText( i18n( "Hyper&link playlist entries to their URL" ) ); linkEntries->setTristate( false ); - numberEntries = new QCheckBox( this, "numberEntries" ); + numberEntries = new TQCheckBox( this, "numberEntries" ); numberEntries->setText( i18n( "&Number playlist entries" ) ); numberEntries->setTristate( false ); @@ -277,7 +277,7 @@ void Prefs::save() { KConfig *config = KGlobal::config(); - QString bgRealURL = bgPicPath->url(); + TQString bgRealURL = bgPicPath->url(); if (bgRealURL[0] == '/') bgRealURL = "file:" + bgRealURL; diff --git a/noatun/modules/htmlexport/htmlexport.h b/noatun/modules/htmlexport/htmlexport.h index a909a5cb..81047d3d 100644 --- a/noatun/modules/htmlexport/htmlexport.h +++ b/noatun/modules/htmlexport/htmlexport.h @@ -2,16 +2,16 @@ #ifndef _HTMLEXPORT_H_ #define _HTMLEXPORT_H_ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include @@ -31,7 +31,7 @@ class KAction; -class HTMLExport : public QObject, public Plugin +class HTMLExport : public TQObject, public Plugin { Q_OBJECT NOATUNPLUGIND @@ -41,8 +41,8 @@ public: private: - QString htmlEscape(const QString &source); - QString getColorByEntry(QString s); + TQString htmlEscape(const TQString &source); + TQString getColorByEntry(TQString s); KConfig *config; KAction *mAction; @@ -55,30 +55,30 @@ class Prefs : public CModule { Q_OBJECT public: - Prefs(QObject *parent); + Prefs(TQObject *parent); virtual void save(); virtual void reopen(); - QGroupBox* colorBox; + TQGroupBox* colorBox; KColorButton* headColorSelect; KColorButton* hoverColorSelect; KColorButton* bgColorSelect; KColorButton* txtColorSelect; - QLabel* bgColorLabel; - QLabel* txtColorLabel; - QLabel* headColorLabel; - QLabel* hoverColorLabel; + TQLabel* bgColorLabel; + TQLabel* txtColorLabel; + TQLabel* headColorLabel; + TQLabel* hoverColorLabel; - QCheckBox* linkEntries; - QCheckBox* numberEntries; + TQCheckBox* linkEntries; + TQCheckBox* numberEntries; - QGroupBox* bgPicBox; + TQGroupBox* bgPicBox; KURLRequester* bgPicPath; protected: - QGridLayout* bgcolorLabel; + TQGridLayout* bgcolorLabel; signals: diff --git a/noatun/modules/infrared/infrared.cpp b/noatun/modules/infrared/infrared.cpp index 60ea145c..c9b31230 100644 --- a/noatun/modules/infrared/infrared.cpp +++ b/noatun/modules/infrared/infrared.cpp @@ -6,7 +6,7 @@ #include #include -#include +#include #include "infrared.h" #include "lirc.h" @@ -22,18 +22,18 @@ extern "C" InfraRed::InfraRed() - : QObject(), + : TQObject(), Plugin() { NOATUNPLUGINC(InfraRed); m_lirc = new Lirc(this); connect(m_lirc, - SIGNAL(commandReceived(const QString &, const QString &, int)), - SLOT(slotCommand(const QString &, const QString &, int))); + TQT_SIGNAL(commandReceived(const TQString &, const TQString &, int)), + TQT_SLOT(slotCommand(const TQString &, const TQString &, int))); IRPrefs::s_lirc = m_lirc; volume=0; - QTimer::singleShot(0, this, SLOT(start())); + TQTimer::singleShot(0, this, TQT_SLOT(start())); } InfraRed::~InfraRed() @@ -45,7 +45,7 @@ void InfraRed::start() new IRPrefs(this); } -void InfraRed::slotCommand(const QString &remote, const QString &button, int repeat) +void InfraRed::slotCommand(const TQString &remote, const TQString &button, int repeat) { switch (IRPrefs::actionFor(remote, button, repeat)) { diff --git a/noatun/modules/infrared/infrared.h b/noatun/modules/infrared/infrared.h index 37e97735..870efbd5 100644 --- a/noatun/modules/infrared/infrared.h +++ b/noatun/modules/infrared/infrared.h @@ -8,7 +8,7 @@ class NoatunPreferences; class Lirc; -class InfraRed : public QObject, public Plugin +class InfraRed : public TQObject, public Plugin { Q_OBJECT NOATUNPLUGIND @@ -17,7 +17,7 @@ public: ~InfraRed(); private slots: - void slotCommand(const QString &, const QString &, int); + void slotCommand(const TQString &, const TQString &, int); void start(); diff --git a/noatun/modules/infrared/irprefs.cpp b/noatun/modules/infrared/irprefs.cpp index 409fa94e..548fd27d 100644 --- a/noatun/modules/infrared/irprefs.cpp +++ b/noatun/modules/infrared/irprefs.cpp @@ -1,7 +1,7 @@ -#include -#include -#include +#include +#include +#include #include #include @@ -17,17 +17,17 @@ class CommandItem : public QListViewItem { public: - CommandItem(QListViewItem *remote, const QString &name, + CommandItem(TQListViewItem *remote, const TQString &name, IRPrefs::Action action, int interval) - : QListViewItem(remote, name, IRPrefs::actionName(action), - interval ? QString().setNum(interval) : QString::null), + : TQListViewItem(remote, name, IRPrefs::actionName(action), + interval ? TQString().setNum(interval) : TQString::null), m_name(remote->text(0) + "::" + name), m_action(action), m_interval(interval) { } - const QString &name() const { return m_name; } + const TQString &name() const { return m_name; } IRPrefs::Action action() const { return m_action; } int interval() const { return m_interval; } void setAction(IRPrefs::Action action) @@ -37,44 +37,44 @@ public: } void setInterval(int interval) { - setText(2, interval ? QString().setNum(interval) : QString::null); + setText(2, interval ? TQString().setNum(interval) : TQString::null); m_interval = interval; } private: - QString m_name; + TQString m_name; IRPrefs::Action m_action; int m_interval; }; Lirc *IRPrefs::s_lirc = 0; bool IRPrefs::s_configRead = false; -QMap IRPrefs::s_commands; +TQMap IRPrefs::s_commands; -IRPrefs::IRPrefs(QObject *parent) +IRPrefs::IRPrefs(TQObject *parent) : CModule(i18n("Infrared Control"), i18n("Configure Infrared Commands"), "remote", parent) { - QGridLayout *layout = new QGridLayout(this, 3, 5, KDialog::marginHint(), KDialog::spacingHint()); + TQGridLayout *layout = new TQGridLayout(this, 3, 5, KDialog::marginHint(), KDialog::spacingHint()); layout->setColStretch(1, 1); - QLabel *label = new QLabel(i18n("Remote control &commands:"), this); + TQLabel *label = new TQLabel(i18n("Remote control &commands:"), this); layout->addMultiCellWidget(label, 0, 0, 0, 4); label->setBuddy(m_commands = new KListView(this)); layout->addMultiCellWidget(m_commands, 1, 1, 0, 4); - label = new QLabel(i18n("&Action:"), this); + label = new TQLabel(i18n("&Action:"), this); layout->addWidget(label, 2, 0); label->setBuddy(m_action = new KComboBox(this)); m_action->setEnabled(false); layout->addWidget(m_action, 2, 1); - m_repeat = new QCheckBox(i18n("&Repeat"), this); + m_repeat = new TQCheckBox(i18n("&Repeat"), this); m_repeat->setEnabled(false); layout->addWidget(m_repeat, 2, 2); - label = new QLabel(i18n("&Interval:"), this); + label = new TQLabel(i18n("&Interval:"), this); layout->addWidget(label, 2, 3); label->setBuddy(m_interval = new KIntSpinBox(this)); @@ -84,19 +84,19 @@ IRPrefs::IRPrefs(QObject *parent) m_interval->setEnabled(false); layout->addWidget(m_interval, 2, 4); - connect(s_lirc, SIGNAL(remotesRead()), SLOT(reopen())); + connect(s_lirc, TQT_SIGNAL(remotesRead()), TQT_SLOT(reopen())); connect(m_commands, - SIGNAL(selectionChanged(QListViewItem *)), - SLOT(slotCommandSelected(QListViewItem *))); + TQT_SIGNAL(selectionChanged(TQListViewItem *)), + TQT_SLOT(slotCommandSelected(TQListViewItem *))); connect(m_action, - SIGNAL(activated(int)), - SLOT(slotActionActivated(int))); + TQT_SIGNAL(activated(int)), + TQT_SLOT(slotActionActivated(int))); connect(m_repeat, - SIGNAL(toggled(bool)), - SLOT(slotRepeatToggled(bool))); + TQT_SIGNAL(toggled(bool)), + TQT_SLOT(slotRepeatToggled(bool))); connect(m_interval, - SIGNAL(valueChanged(int)), - SLOT(slotIntervalChanged(int))); + TQT_SIGNAL(valueChanged(int)), + TQT_SLOT(slotIntervalChanged(int))); reopen(); } @@ -107,11 +107,11 @@ void IRPrefs::save() KConfigGroupSaver groupSaver(c, "Infrared"); c->writeEntry("CommandCount", s_commands.count()); int i = 1; - for (QMap::ConstIterator it = s_commands.begin(); it != s_commands.end(); ++it) + for (TQMap::ConstIterator it = s_commands.begin(); it != s_commands.end(); ++it) { - c->writePathEntry(QString("Command_%1").arg(i), it.key()); - c->writeEntry(QString("Action_%1").arg(i), (int)((*it).action)); - c->writeEntry(QString("Interval_%1").arg(i), (*it).interval); + 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); ++i; } } @@ -120,7 +120,7 @@ void IRPrefs::reopen() { readConfig(); - QStringList remotes = s_lirc->remotes(); + TQStringList remotes = s_lirc->remotes(); m_commands->clear(); while (m_commands->columns()) m_commands->removeColumn(0); if (!remotes.count()) @@ -129,13 +129,13 @@ void IRPrefs::reopen() m_commands->setSorting(-1); if (s_lirc->isConnected()) { - new QListViewItem(m_commands, i18n("You do not have any remote control configured.")); - new QListViewItem(m_commands, i18n("Please make sure lirc is setup correctly.")); + new TQListViewItem(m_commands, i18n("You do not have any remote control configured.")); + new TQListViewItem(m_commands, i18n("Please make sure lirc is setup correctly.")); } else { - new QListViewItem(m_commands, i18n("Connection could not be established.")); - new QListViewItem(m_commands, i18n("Please make sure lirc is setup correctly and lircd is running.")); + new TQListViewItem(m_commands, i18n("Connection could not be established.")); + new TQListViewItem(m_commands, i18n("Please make sure lirc is setup correctly and lircd is running.")); } m_commands->setEnabled(false); return; @@ -145,13 +145,13 @@ void IRPrefs::reopen() m_commands->addColumn(i18n("Action")); m_commands->addColumn(i18n("Interval")); m_commands->setSorting(0); - for (QStringList::ConstIterator it = remotes.begin(); it != remotes.end(); ++it) + for (TQStringList::ConstIterator it = remotes.begin(); it != remotes.end(); ++it) { - QListViewItem *remote = new QListViewItem(m_commands, *it); - const QStringList &buttons = s_lirc->buttons(*it); - for (QStringList::ConstIterator btn = buttons.begin(); btn != buttons.end(); ++btn) + TQListViewItem *remote = new TQListViewItem(m_commands, *it); + const TQStringList &buttons = s_lirc->buttons(*it); + for (TQStringList::ConstIterator btn = buttons.begin(); btn != buttons.end(); ++btn) { - QString key = *it + "::" + *btn; + TQString key = *it + "::" + *btn; if (s_commands.contains(key)) new CommandItem(remote, *btn, s_commands[key].action, s_commands[key].interval); else @@ -163,7 +163,7 @@ void IRPrefs::reopen() m_action->clear(); for (int i = 0; ; ++i) { - QString action = actionName((Action)i); + TQString action = actionName((Action)i); if (action.isNull()) break; if (action.isEmpty()) @@ -175,7 +175,7 @@ void IRPrefs::reopen() } -void IRPrefs::slotCommandSelected(QListViewItem *item) +void IRPrefs::slotCommandSelected(TQListViewItem *item) { CommandItem *cmd = dynamic_cast(item); if (cmd) @@ -242,12 +242,12 @@ void IRPrefs::slotIntervalChanged(int value) s_commands[cmd->name()].interval = cmd->interval(); } -const QString IRPrefs::actionName(Action action) +const TQString IRPrefs::actionName(Action action) { switch (action) { case None: - return QString(""); + return TQString(""); case Play: return i18n("Play"); case Stop: @@ -275,7 +275,7 @@ const QString IRPrefs::actionName(Action action) case PreviousSection: return i18n("Previous Section"); } - return QString::null; + return TQString::null; } void IRPrefs::readConfig() @@ -288,14 +288,14 @@ void IRPrefs::readConfig() for (int i = 1; i <= count; ++i) { Command cmd; - cmd.action = (Action)(c->readNumEntry(QString("Action_%1").arg(i))); - cmd.interval = c->readNumEntry(QString("Interval_%1").arg(i)); - s_commands.insert(c->readPathEntry(QString("Command_%1").arg(i)), 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); } s_configRead = true; } -IRPrefs::Action IRPrefs::actionFor(const QString &remote, const QString &button, int repeat) +IRPrefs::Action IRPrefs::actionFor(const TQString &remote, const TQString &button, int repeat) { readConfig(); Command cmd = s_commands[remote + "::" + button]; diff --git a/noatun/modules/infrared/irprefs.h b/noatun/modules/infrared/irprefs.h index 7f813ac8..1d7196a9 100644 --- a/noatun/modules/infrared/irprefs.h +++ b/noatun/modules/infrared/irprefs.h @@ -2,7 +2,7 @@ #ifndef _IRPREFS_H_ #define _IRPREFS_H_ -#include +#include #include class QCheckBox; @@ -24,19 +24,19 @@ public: NextSection, PreviousSection }; - IRPrefs(QObject *parent); + IRPrefs(TQObject *parent); virtual void save(); - static const QString actionName(Action); - static Action actionFor(const QString &, const QString &, int); + static const TQString actionName(Action); + static Action actionFor(const TQString &, const TQString &, int); public slots: static Lirc *s_lirc; private slots: virtual void reopen(); - void slotCommandSelected(QListViewItem *); + void slotCommandSelected(TQListViewItem *); void slotActionActivated(int); void slotRepeatToggled(bool); void slotIntervalChanged(int); @@ -46,7 +46,7 @@ private: KListView *m_commands; KComboBox *m_action; - QCheckBox *m_repeat; + TQCheckBox *m_repeat; KIntSpinBox *m_interval; struct Command @@ -55,7 +55,7 @@ private: int interval; }; static bool s_configRead; - static QMap s_commands; + static TQMap s_commands; }; #endif diff --git a/noatun/modules/infrared/lirc.cpp b/noatun/modules/infrared/lirc.cpp index 857c07e2..657172d5 100644 --- a/noatun/modules/infrared/lirc.cpp +++ b/noatun/modules/infrared/lirc.cpp @@ -4,7 +4,7 @@ #include #include -#include +#include #include #include @@ -12,8 +12,8 @@ #include "lirc.h" -Lirc::Lirc(QObject *parent) - : QObject(parent), +Lirc::Lirc(TQObject *parent) + : TQObject(parent), m_socket(0) { int sock = ::socket(PF_UNIX, SOCK_STREAM, 0); @@ -34,7 +34,7 @@ Lirc::Lirc(QObject *parent) m_socket = new QSocket; m_socket->setSocket(sock); - connect(m_socket, SIGNAL(readyRead()), SLOT(slotRead())); + connect(m_socket, TQT_SIGNAL(readyRead()), TQT_SLOT(slotRead())); update(); } @@ -43,9 +43,9 @@ Lirc::~Lirc() delete m_socket; } -const QStringList Lirc::remotes() const +const TQStringList Lirc::remotes() const { - QStringList result; + TQStringList result; for (Remotes::ConstIterator it = m_remotes.begin(); it != m_remotes.end(); ++it) result.append(it.key()); result.sort(); @@ -56,7 +56,7 @@ void Lirc::slotRead() { while (m_socket->bytesAvailable()) { - QString line = readLine(); + TQString line = readLine(); if (line == "BEGIN") { // BEGIN @@ -84,7 +84,7 @@ void Lirc::slotRead() while (!line.isEmpty() && line != "END"); return; } - QStringList remotes; + TQStringList remotes; int count = readLine().toInt(); for (int i = 0; i < count; ++i) remotes.append(readLine()); @@ -92,7 +92,7 @@ void Lirc::slotRead() while (!line.isEmpty() && line != "END"); if (line.isEmpty()) return; // abort on corrupt data - for (QStringList::ConstIterator it = remotes.begin(); it != remotes.end(); ++it) + for (TQStringList::ConstIterator it = remotes.begin(); it != remotes.end(); ++it) sendCommand("LIST " + *it); return; } @@ -105,13 +105,13 @@ void Lirc::slotRead() while (!line.isEmpty() && line != "END"); return; } - QString remote = line.mid(5); - QStringList buttons; + TQString remote = line.mid(5); + TQStringList buttons; int count = readLine().toInt(); for (int i = 0; i < count; ++i) { // - QString btn = readLine(); + TQString btn = readLine(); buttons.append(btn.mid(17)); } m_remotes.insert(remote, buttons); @@ -136,7 +136,7 @@ void Lirc::slotRead() pos = line.find(' '); if (pos < 0) return; - QString btn = line.left(pos); + TQString btn = line.left(pos); line.remove(0, pos + 1); emit commandReceived(line, btn, repeat); @@ -150,22 +150,22 @@ void Lirc::update() sendCommand("LIST"); } -const QString Lirc::readLine() +const TQString Lirc::readLine() { if (!m_socket->bytesAvailable()) - return QString::null; + return TQString::null; - QString line = m_socket->readLine(); + TQString line = m_socket->readLine(); if (line.isEmpty()) - return QString::null; + return TQString::null; line.remove(line.length() - 1, 1); return line; } -void Lirc::sendCommand(const QString &command) +void Lirc::sendCommand(const TQString &command) { - QString cmd = command + "\n"; + TQString cmd = command + "\n"; m_socket->writeBlock(cmd.latin1(), cmd.length()); } diff --git a/noatun/modules/infrared/lirc.h b/noatun/modules/infrared/lirc.h index e5380c5c..de9665fd 100644 --- a/noatun/modules/infrared/lirc.h +++ b/noatun/modules/infrared/lirc.h @@ -2,13 +2,13 @@ #ifndef _LIRC_H_ #define _LIRC_H_ -#include -#include -#include +#include +#include +#include class QSocket; -typedef QMap Remotes; +typedef TQMap Remotes; class Lirc : public QObject { @@ -17,7 +17,7 @@ public: /** * Constructor */ - Lirc(QObject *parent); + Lirc(TQObject *parent); /** * Destructor */ @@ -30,12 +30,12 @@ public: /** * The names of the remote configured controls */ - const QStringList remotes() const; + const TQStringList remotes() const; /** * The names of the buttons for the specified * remote control */ - const QStringList buttons(const QString &remote) const + const TQStringList buttons(const TQString &remote) const { return m_remotes[remote]; } @@ -56,18 +56,18 @@ signals: * The repeat counter starts with 0 and increases * every time this signal is emitted. */ - void commandReceived(const QString &, const QString &, int); + void commandReceived(const TQString &, const TQString &, int); private slots: void slotRead(); private: void update(); - const QString readLine(); - void sendCommand(const QString &); + const TQString readLine(); + void sendCommand(const TQString &); private: - QSocket *m_socket; + TQSocket *m_socket; Remotes m_remotes; }; diff --git a/noatun/modules/kaiman/pref.cpp b/noatun/modules/kaiman/pref.cpp index 29ef30d9..5f241bc0 100644 --- a/noatun/modules/kaiman/pref.cpp +++ b/noatun/modules/kaiman/pref.cpp @@ -17,11 +17,11 @@ */ #include -#include -#include +#include +#include #include -#include -#include +#include +#include #include #include #include @@ -31,12 +31,12 @@ #include "userinterface.h" -KaimanPrefDlg::KaimanPrefDlg(QObject *parent ) +KaimanPrefDlg::KaimanPrefDlg(TQObject *parent ) : CModule(i18n("Kaiman Skins"), i18n("Skin Selection for the Kaiman Plugin"), "style", parent) { // create widgets - QVBoxLayout *topLayout = new QVBoxLayout( this, 6, 11 ); - QLabel *label = new QLabel( i18n("Kaiman Skins"), this, "label" ); + TQVBoxLayout *topLayout = new TQVBoxLayout( this, 6, 11 ); + TQLabel *label = new TQLabel( i18n("Kaiman Skins"), this, "label" ); topLayout->addWidget( label ); _skinList = new KListBox( this, "skinList" ); @@ -68,15 +68,15 @@ void KaimanPrefDlg::reopen() _skinList->clear(); // fill with available skins KGlobal::dirs()->addResourceType("skins", KStandardDirs::kde_default("data") + "noatun/skins/kaiman/"); - QStringList list = KGlobal::dirs()->resourceDirs("skins"); - for (QStringList::ConstIterator it = list.begin(); it != list.end(); it++) + TQStringList list = KGlobal::dirs()->resourceDirs("skins"); + for (TQStringList::ConstIterator it = list.begin(); it != list.end(); it++) readSkinDir(*it); // load current config KConfig *config=KGlobal::config(); config->setGroup("Kaiman"); - QString skin = config->readEntry( "SkinResource", Kaiman::DEFAULT_SKIN ); - QListBoxItem *item = _skinList->findItem( skin ); + TQString skin = config->readEntry( "SkinResource", Kaiman::DEFAULT_SKIN ); + TQListBoxItem *item = _skinList->findItem( skin ); if ( item ) _skinList->setCurrentItem( item ); else @@ -84,23 +84,23 @@ void KaimanPrefDlg::reopen() } -void KaimanPrefDlg::setSkin( QString skin ) +void KaimanPrefDlg::setSkin( TQString skin ) { _skinList->setCurrentItem( _skinList->findItem( skin ) ); } -QString KaimanPrefDlg::skin() +TQString KaimanPrefDlg::skin() { return _skinList->currentText(); } -void KaimanPrefDlg::readSkinDir( const QString &dir ) +void KaimanPrefDlg::readSkinDir( const TQString &dir ) { kdDebug() << "readSkinDir " << dir << endl; - QDir directory( dir ); + TQDir directory( dir ); if (!directory.exists()) return; @@ -109,7 +109,7 @@ void KaimanPrefDlg::readSkinDir( const QString &dir ) while ( it.current() ) { kdDebug() << it.current()->absFilePath() << endl; - QFileInfo skindata( it.current()->absFilePath()+"/skindata" ); + TQFileInfo skindata( it.current()->absFilePath()+"/skindata" ); if ( skindata.exists() ) { _skinList->insertItem( it.current()->baseName() ); diff --git a/noatun/modules/kaiman/pref.h b/noatun/modules/kaiman/pref.h index d18200fa..4f473859 100644 --- a/noatun/modules/kaiman/pref.h +++ b/noatun/modules/kaiman/pref.h @@ -28,18 +28,18 @@ class KaimanPrefDlg : public CModule { Q_OBJECT public: - KaimanPrefDlg( QObject *parent ); + KaimanPrefDlg( TQObject *parent ); virtual ~KaimanPrefDlg(); virtual void save(); virtual void reopen(); public slots: - void setSkin( QString skin ); - QString skin(); + void setSkin( TQString skin ); + TQString skin(); private: - void readSkinDir( const QString &dir ); + void readSkinDir( const TQString &dir ); KListBox *_skinList; }; diff --git a/noatun/modules/kaiman/style.cpp b/noatun/modules/kaiman/style.cpp index 0cce6b96..6b700230 100644 --- a/noatun/modules/kaiman/style.cpp +++ b/noatun/modules/kaiman/style.cpp @@ -21,14 +21,14 @@ #include #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include #include -#include +#include #include #include @@ -42,8 +42,8 @@ const bool KaimanStyleSlider::optionVertical = 1; const bool KaimanStyleSlider::optionReversed = 2; const bool KaimanStyleText::optionExtended = 1; -KaimanStyleElement::KaimanStyleElement(QWidget *parent, const char *name) - : QWidget(parent, name) +KaimanStyleElement::KaimanStyleElement(TQWidget *parent, const char *name) + : TQWidget(parent, name) { // Initialize everything to default values filename = ""; @@ -71,9 +71,9 @@ KaimanStyleElement::~KaimanStyleElement() } -void KaimanStyleElement::loadPixmaps(QString &val_s_filename) +void KaimanStyleElement::loadPixmaps(TQString &val_s_filename) { - QPixmap pixmap; + TQPixmap pixmap; bool i_b_ret = pixmap.load(val_s_filename); pixmapNum = pixmapLines*pixmapColumns; @@ -117,14 +117,14 @@ void KaimanStyleElement::loadPixmaps(QString &val_s_filename) { int w = (x==0) ? firstWidth : width; - QPixmap *part = new QPixmap(w,h,pixmap.depth()); + TQPixmap *part = new TQPixmap(w,h,pixmap.depth()); part->fill(Qt::black); bitBlt(part,0,0,&pixmap,sourcex,sourcey,w,h); pixmaps.insert(i,part); if(pixmap.mask()) { - QBitmap maskpart(w,h); + TQBitmap maskpart(w,h); bitBlt(&maskpart,0,0,pixmap.mask(),sourcex,sourcey,w,h); part->setMask(maskpart); } @@ -141,7 +141,7 @@ void KaimanStyleElement::loadPixmaps(QString &val_s_filename) for ( int i=0; ifill(Qt::black); pixmaps.insert( i, pm ); } @@ -149,7 +149,7 @@ void KaimanStyleElement::loadPixmaps(QString &val_s_filename) if ( dimension.width()==0 ) dimension.setWidth( pixmaps[0]->width() ); if ( dimension.height()==0 ) dimension.setHeight( pixmaps[0]->height() ); - setGeometry( QRect(upperLeft, dimension) ); + setGeometry( TQRect(upperLeft, dimension) ); } void KaimanStyleElement::setPixmap( int num ) @@ -164,27 +164,27 @@ void KaimanStyleElement::setPixmap( int num ) } } -void KaimanStyleElement::paintEvent ( QPaintEvent */*qpe*/ ) +void KaimanStyleElement::paintEvent ( TQPaintEvent */*qpe*/ ) { - QPixmap *pm = pixmaps[_currentPixmap]; + TQPixmap *pm = pixmaps[_currentPixmap]; if ( pm ) bitBlt(this, 0, 0, pm ); else kdDebug() << "Invalid pixmap" << endl; -/* QPainter p( this ); +/* TQPainter p( this ); p.setBrush( NoBrush ); - p.setPen( QColor(255,255,255) ); + p.setPen( TQColor(255,255,255) ); p.drawRect( 0, 0, width(), height() ); p.drawText( 2, 16, name() ); */ } -void KaimanStyleElement::dragEnterEvent( QDragEnterEvent *event ) +void KaimanStyleElement::dragEnterEvent( TQDragEnterEvent *event ) { event->accept( KURLDrag::canDecode(event) ); } -void KaimanStyleElement::dropEvent( QDropEvent *event ) +void KaimanStyleElement::dropEvent( TQDropEvent *event ) { ((Kaiman*)(parentWidget()->parentWidget()))->doDropEvent(event); } @@ -192,7 +192,7 @@ void KaimanStyleElement::dropEvent( QDropEvent *event ) /***************************************************************************/ -KaimanStyleButton::KaimanStyleButton(QWidget *parent, const char *name) +KaimanStyleButton::KaimanStyleButton(TQWidget *parent, const char *name) : KaimanStyleMasked(parent, name) { i_b_lit = i_b_prelit = i_b_down = false; @@ -210,7 +210,7 @@ KaimanStyleButton::~KaimanStyleButton() { } -void KaimanStyleButton::mousePressEvent(QMouseEvent *qme) +void KaimanStyleButton::mousePressEvent(TQMouseEvent *qme) { // We deactivate prelight, because the user presses the button. // So it is now down, but there is no PrelitDown icon (BTW: would @@ -222,7 +222,7 @@ void KaimanStyleButton::mousePressEvent(QMouseEvent *qme) KaimanStyleMasked::mousePressEvent( qme ); } -void KaimanStyleButton::mouseReleaseEvent(QMouseEvent *qme) +void KaimanStyleButton::mouseReleaseEvent(TQMouseEvent *qme) { releaseMouse (); @@ -237,7 +237,7 @@ void KaimanStyleButton::mouseReleaseEvent(QMouseEvent *qme) /* paint prelight */ -void KaimanStyleButton::enterEvent ( QEvent * e ) +void KaimanStyleButton::enterEvent ( TQEvent * e ) { if ( !down() ) setPrelight(true); @@ -246,7 +246,7 @@ void KaimanStyleButton::enterEvent ( QEvent * e ) } /* unpaint prelight */ -void KaimanStyleButton::leaveEvent ( QEvent * e ) +void KaimanStyleButton::leaveEvent ( TQEvent * e ) { if (!down()) setPrelight(false); @@ -327,7 +327,7 @@ void KaimanStyleButton::updateButtonState() { /***********************************************************************/ -KaimanStyleSlider::KaimanStyleSlider(int min, int max, QWidget *parent, const char *name) +KaimanStyleSlider::KaimanStyleSlider(int min, int max, TQWidget *parent, const char *name) : KaimanStyleMasked( parent, name ) { _min = min; @@ -380,7 +380,7 @@ int KaimanStyleSlider::pos2value( int x, int y ) } -void KaimanStyleSlider::mouseMoveEvent(QMouseEvent *qme) +void KaimanStyleSlider::mouseMoveEvent(TQMouseEvent *qme) { KaimanStyleMasked::mouseMoveEvent( qme ); @@ -391,7 +391,7 @@ void KaimanStyleSlider::mouseMoveEvent(QMouseEvent *qme) } } -void KaimanStyleSlider::mousePressEvent(QMouseEvent *qme) +void KaimanStyleSlider::mousePressEvent(TQMouseEvent *qme) { if ( !_down ) { @@ -407,7 +407,7 @@ void KaimanStyleSlider::mousePressEvent(QMouseEvent *qme) } -void KaimanStyleSlider::mouseReleaseEvent(QMouseEvent *qme) +void KaimanStyleSlider::mouseReleaseEvent(TQMouseEvent *qme) { if ( _down ) { @@ -424,13 +424,13 @@ void KaimanStyleSlider::mouseReleaseEvent(QMouseEvent *qme) } -void KaimanStyleSlider::paintEvent(QPaintEvent */*qpe*/) +void KaimanStyleSlider::paintEvent(TQPaintEvent */*qpe*/) { // draw background bitBlt( this, 0, 0, pixmaps[0] ); // draw optional handle - QPixmap *handle; + TQPixmap *handle; if ( _down ) handle = pixmaps[2]; else @@ -460,7 +460,7 @@ void KaimanStyleSlider::paintEvent(QPaintEvent */*qpe*/) } } -void KaimanStyleSlider::enterEvent ( QEvent * e ) +void KaimanStyleSlider::enterEvent ( TQEvent * e ) { if ( !_lit && optionPrelight ) { @@ -471,7 +471,7 @@ void KaimanStyleSlider::enterEvent ( QEvent * e ) KaimanStyleMasked::enterEvent( e ); } -void KaimanStyleSlider::leaveEvent ( QEvent * e ) +void KaimanStyleSlider::leaveEvent ( TQEvent * e ) { if ( _lit ) { @@ -486,7 +486,7 @@ void KaimanStyleSlider::leaveEvent ( QEvent * e ) /***********************************************************************/ -KaimanStyleBackground::KaimanStyleBackground(QWidget *parent, const char *name) +KaimanStyleBackground::KaimanStyleBackground(TQWidget *parent, const char *name) : KaimanStyleMasked( parent, name ) { i_b_move = false; @@ -496,22 +496,22 @@ KaimanStyleBackground::~KaimanStyleBackground() { } -void KaimanStyleBackground::mouseReleaseEvent(QMouseEvent *qme) +void KaimanStyleBackground::mouseReleaseEvent(TQMouseEvent *qme) { i_b_move = false; KaimanStyleMasked::mouseReleaseEvent( qme ); } -void KaimanStyleBackground::mouseMoveEvent(QMouseEvent *qme) +void KaimanStyleBackground::mouseMoveEvent(TQMouseEvent *qme) { - QPoint diff = qme->globalPos() - i_point_lastPos; + TQPoint diff = qme->globalPos() - i_point_lastPos; if ( abs(diff.x()) > 10 || abs(diff.y()) > 10) { // Moving starts only, when passing a drag border i_b_move = true; } if ( i_b_move ) { - QWidget *p = parentWidget()->parentWidget(); + TQWidget *p = parentWidget()->parentWidget(); if ( !p ) p = parentWidget(); p->move( qme->globalPos() - i_point_dragStart ); @@ -520,7 +520,7 @@ void KaimanStyleBackground::mouseMoveEvent(QMouseEvent *qme) KaimanStyleMasked::mouseMoveEvent( qme ); } -void KaimanStyleBackground::mousePressEvent(QMouseEvent *qme) +void KaimanStyleBackground::mousePressEvent(TQMouseEvent *qme) { // On the background we move the shaped toplevel around if (!i_b_move) { @@ -533,7 +533,7 @@ void KaimanStyleBackground::mousePressEvent(QMouseEvent *qme) /***********************************************************************/ -KaimanStyleValue::KaimanStyleValue(int min, int max, QWidget *parent, const char *name) +KaimanStyleValue::KaimanStyleValue(int min, int max, TQWidget *parent, const char *name) : KaimanStyleMasked( parent, name ) { _min = min; @@ -571,12 +571,12 @@ void KaimanStyleValue::setValue( int value, int min, int max ) /***********************************************************************/ -KaimanStyleNumber::KaimanStyleNumber(QWidget *parent, const char *name) +KaimanStyleNumber::KaimanStyleNumber(TQWidget *parent, const char *name) : KaimanStyleElement( parent, name ) { //kdDebug(66666) << k_funcinfo << "name = '" << name << "'" << endl; _value = 0; - if (QCString(name) == "In_Rate_Number") + if (TQCString(name) == "In_Rate_Number") digits = 3; else digits = 2; @@ -587,7 +587,7 @@ KaimanStyleNumber::~KaimanStyleNumber() } -void KaimanStyleNumber::loadPixmaps(QString &val_s_filename) +void KaimanStyleNumber::loadPixmaps(TQString &val_s_filename) { KaimanStyleElement::loadPixmaps( val_s_filename ); resize( digits*pixmaps[0]->width(),pixmaps[0]->height() ); @@ -603,7 +603,7 @@ void KaimanStyleNumber::setValue( int value ) } } -void KaimanStyleNumber::paintEvent(QPaintEvent */*qpe*/) +void KaimanStyleNumber::paintEvent(TQPaintEvent */*qpe*/) { // check for overflow int v = _value; @@ -631,22 +631,22 @@ void KaimanStyleNumber::paintEvent(QPaintEvent */*qpe*/) bitBlt(this, x, 0, pixmaps[0] ); } /* - QPainter p( this ); + TQPainter p( this ); p.setBrush( NoBrush ); - p.setPen( QColor(255,255,255) ); + p.setPen( TQColor(255,255,255) ); p.drawRect( 0, 0, width(), height() ); p.drawText( 2, 16, name() );*/ } /***********************************************************************/ -KaimanStyleText::KaimanStyleText(QWidget *parent, const char *name) +KaimanStyleText::KaimanStyleText(TQWidget *parent, const char *name) : KaimanStyleElement( parent, name ) { _pos = 0; - _timer = new QTimer( this ); + _timer = new TQTimer( this ); _delay = 500; - connect( _timer, SIGNAL(timeout()), this, SLOT(timeout()) ); + connect( _timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(timeout()) ); } KaimanStyleText::~KaimanStyleText() @@ -654,14 +654,14 @@ KaimanStyleText::~KaimanStyleText() } -void KaimanStyleText::loadPixmaps(QString &val_s_filename) +void KaimanStyleText::loadPixmaps(TQString &val_s_filename) { KaimanStyleElement::loadPixmaps( val_s_filename ); resize( digits*pixmaps[0]->width(), pixmaps[0]->height() ); } -void KaimanStyleText::setValue( QString value ) +void KaimanStyleText::setValue( TQString value ) { if ( value!=_value ) { _pos = 0; @@ -708,7 +708,7 @@ void KaimanStyleText::timeout() } -void KaimanStyleText::paintEvent(QPaintEvent */*qpe*/) +void KaimanStyleText::paintEvent(TQPaintEvent */*qpe*/) { // draw number int p; @@ -718,30 +718,30 @@ void KaimanStyleText::paintEvent(QPaintEvent */*qpe*/) if ( pmNum>=96 ) pmNum = '?' - ' '; if ( pmNum<0 ) pmNum = '?' - ' '; - QPixmap *pm = pixmaps[pmNum]; + TQPixmap *pm = pixmaps[pmNum]; if ( pm ) bitBlt(this, p*pixmaps[0]->width(), 0, pm ); } - QPixmap *pm = pixmaps[0]; + TQPixmap *pm = pixmaps[0]; for ( ; pwidth(), 0, pm ); -/* QPainter pnt( this ); +/* TQPainter pnt( this ); pnt.setBrush( NoBrush ); - pnt.setPen( QColor(255,255,255) ); + pnt.setPen( TQColor(255,255,255) ); pnt.drawRect( 0, 0, width(), height() ); pnt.drawText( 2, 16, name() );*/ } /***********************************************************************/ -KaimanStyleAnimation::KaimanStyleAnimation(int delay, QWidget *parent, const char *name) +KaimanStyleAnimation::KaimanStyleAnimation(int delay, TQWidget *parent, const char *name) : KaimanStyleMasked( parent, name ) { _delay = delay; _frame = 0; - _timer = new QTimer( this ); - connect( _timer, SIGNAL(timeout()), this, SLOT(timeout()) ); + _timer = new TQTimer( this ); + connect( _timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(timeout()) ); } KaimanStyleAnimation::~KaimanStyleAnimation() @@ -774,7 +774,7 @@ void KaimanStyleAnimation::timeout() /***********************************************************************/ -KaimanStyleState::KaimanStyleState(QWidget *parent, const char *name) +KaimanStyleState::KaimanStyleState(TQWidget *parent, const char *name) : KaimanStyleMasked( parent, name ) { _value = 0; @@ -790,7 +790,7 @@ void KaimanStyleState::setValue( int value ) setPixmap( _value ); } -void KaimanStyleState::mousePressEvent(QMouseEvent *qme) +void KaimanStyleState::mousePressEvent(TQMouseEvent *qme) { emit clicked(); KaimanStyleMasked::mouseReleaseEvent( qme ); @@ -799,8 +799,8 @@ void KaimanStyleState::mousePressEvent(QMouseEvent *qme) /***********************************************************************/ -KaimanStyle::KaimanStyle( QWidget *parent, const char *name ) - : QWidget( parent, name ) +KaimanStyle::KaimanStyle( TQWidget *parent, const char *name ) + : TQWidget( parent, name ) { i_qw_parent = parent; i_eventSemaphore = false; @@ -812,17 +812,17 @@ KaimanStyle::~KaimanStyle() } -int KaimanStyle::parseStyleFile(QString &l_s_tmpName) +int KaimanStyle::parseStyleFile(TQString &l_s_tmpName) { int l_i_ret = false; - QStringList l_s_tokens; + TQStringList l_s_tokens; - QFile l_fd(l_s_tmpName); + TQFile l_fd(l_s_tmpName); if ( l_fd.open(IO_ReadOnly) ) { // file opened successfully - QTextStream l_ts_line( &l_fd ); - QString l_s_textLine, l_s_token; + TQTextStream l_ts_line( &l_fd ); + TQString l_s_textLine, l_s_token; while ( !l_ts_line.eof() ) { // Clear list of tokens (we are going to fill them now) l_s_tokens.clear(); @@ -865,15 +865,15 @@ int KaimanStyle::parseStyleFile(QString &l_s_tmpName) /* This function gets a list of tokens and inserts a new KaimanStyleElement in I_styleElem. */ -void KaimanStyle::interpretTokens(QStringList& ref_s_tokens) +void KaimanStyle::interpretTokens(TQStringList& ref_s_tokens) { if ( ref_s_tokens.count() < 1 ) { // A list with less than 1 item is useless to us return; } - QString l_s_tokenTypes; - const QString &l_s_elem = ref_s_tokens.first(); + TQString l_s_tokenTypes; + const TQString &l_s_elem = ref_s_tokens.first(); bool l_vertPixmaps = false; int l_i_pmIndex[KaimanStyleButton::StateListEND]; for (int i=0; ii_s_styleName = styleName; - i_s_styleBase = QString("skins/kaiman/") + i_s_styleName + QString("/"); + i_s_styleBase = TQString("skins/kaiman/") + i_s_styleName + TQString("/"); l_s_tmpName = locate("appdata", i_s_styleBase + descFile ); if ( l_s_tmpName.isNull() ) { @@ -1390,14 +1390,14 @@ bool KaimanStyle::loadStyle(const QString &styleName, const QString &descFile) return l_b_ret; } -bool KaimanStyle::eventFilter( QObject *o, QEvent *e ) +bool KaimanStyle::eventFilter( TQObject *o, TQEvent *e ) { /* HACK! HACK! HACK! */ if ( !i_eventSemaphore ) - if ( e->type()==QEvent::MouseMove || e->type()==QEvent::MouseButtonPress || - e->type()==QEvent::MouseButtonRelease ) + if ( e->type()==TQEvent::MouseMove || e->type()==TQEvent::MouseButtonPress || + e->type()==TQEvent::MouseButtonRelease ) { - QMouseEvent *m = (QMouseEvent*)e; + TQMouseEvent *m = (TQMouseEvent*)e; // handle noatun context menu if (m->button()==RightButton) { @@ -1405,37 +1405,37 @@ bool KaimanStyle::eventFilter( QObject *o, QEvent *e ) return true; } - QPoint mousePos( m->x()+static_cast(o)->x(), - m->y()+static_cast(o)->y() ); - QWidget *slider = 0; + TQPoint mousePos( m->x()+static_cast(o)->x(), + m->y()+static_cast(o)->y() ); + TQWidget *slider = 0; /* find slider that is under the mouse position */ - for ( QWidget *s = i_sliders.first(); s!=0; s=i_sliders.next() ) + for ( TQWidget *s = i_sliders.first(); s!=0; s=i_sliders.next() ) { - QRect sliderRect( s->pos(), s->size() ); + TQRect sliderRect( s->pos(), s->size() ); if ( sliderRect.contains(mousePos) ) slider = s; } /* the slider the mouse events instead of the visible widget */ if ( slider ) { - QMouseEvent newMouseEvent( m->type(), mousePos-slider->pos(), + TQMouseEvent newMouseEvent( m->type(), mousePos-slider->pos(), m->globalPos(), m->button(), m->state() ); i_eventSemaphore = true; - bool ret = QApplication::sendEvent( slider, &newMouseEvent ); + bool ret = TQApplication::sendEvent( slider, &newMouseEvent ); i_eventSemaphore = false; return ret; } } - return QWidget::eventFilter( o, e ); // standard event processing + return TQWidget::eventFilter( o, e ); // standard event processing } bool KaimanStyle::loadPixmaps() { - QString l_s_tmpName; - QPixmap *l_pixmap_Background = 0, *l_pixmap_Mask = 0; + TQString l_s_tmpName; + TQPixmap *l_pixmap_Background = 0, *l_pixmap_Mask = 0; KaimanStyleElement *l_kse_elem; for ( uint l_i_elem = 0; l_i_elemwidth(); int l_i_height_Mask = l_pixmap_Mask->height(); - QImage l_image_MaskOrig = l_pixmap_Mask->convertToImage(); + TQImage l_image_MaskOrig = l_pixmap_Mask->convertToImage(); - QImage l_image_Mask(l_i_width_Mask,l_i_height_Mask, 1, 2, QImage::LittleEndian); + TQImage l_image_Mask(l_i_width_Mask,l_i_height_Mask, 1, 2, TQImage::LittleEndian); l_image_Mask.setColor( 0, 0x00ffffff ); l_image_Mask.setColor( 1, 0 ); l_image_Mask.fill( 0xff ); @@ -1487,7 +1487,7 @@ bool KaimanStyle::loadPixmaps() } -QBitmap* KaimanStyle::Mask() +TQBitmap* KaimanStyle::Mask() { return &i_bitmap_Mask; } @@ -1495,7 +1495,7 @@ QBitmap* KaimanStyle::Mask() KaimanStyleElement* KaimanStyle::find(const char *val_s_elemName) { for (uint i=0; i< I_styleElem.count(); i++) { - if ( I_styleElem[i]->element == QString(val_s_elemName)) { + if ( I_styleElem[i]->element == TQString(val_s_elemName)) { return I_styleElem[i]; } } diff --git a/noatun/modules/kaiman/style.h b/noatun/modules/kaiman/style.h index 4266bc42..1f2bc788 100644 --- a/noatun/modules/kaiman/style.h +++ b/noatun/modules/kaiman/style.h @@ -21,27 +21,27 @@ #ifndef KaimanStyle_H #define KaimanStyle_H -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include class KaimanStyleElement : public QWidget { Q_OBJECT public: - KaimanStyleElement(QWidget *parent, const char *name=0); + KaimanStyleElement(TQWidget *parent, const char *name=0); ~KaimanStyleElement(); - virtual void loadPixmaps(QString &val_s_filename); + virtual void loadPixmaps(TQString &val_s_filename); - QString element; - QString filename; - QPoint upperLeft; - QSize dimension; + TQString element; + TQString filename; + TQPoint upperLeft; + TQSize dimension; bool options[3]; int digits; @@ -52,15 +52,15 @@ public: int pixmapLines; int pixmapColumns; - QPtrVector pixmaps; + TQPtrVector pixmaps; public slots: void setPixmap( int num ); protected: - void paintEvent(QPaintEvent *qpe); - void dropEvent( QDropEvent *event ); - void dragEnterEvent( QDragEnterEvent *event ); + void paintEvent(TQPaintEvent *qpe); + void dropEvent( TQDropEvent *event ); + void dragEnterEvent( TQDragEnterEvent *event ); int pixmapNum; @@ -73,10 +73,10 @@ class KaimanStyleMasked : public KaimanStyleElement { Q_OBJECT public: - KaimanStyleMasked(QWidget *parent, const char *name=0) + KaimanStyleMasked(TQWidget *parent, const char *name=0) : KaimanStyleElement( parent, name ) {}; - virtual void loadPixmaps(QString &val_s_filename) + virtual void loadPixmaps(TQString &val_s_filename) { KaimanStyleElement::loadPixmaps( val_s_filename ); if(pixmaps[0]->mask()) @@ -89,13 +89,13 @@ class KaimanStyleButton : public KaimanStyleMasked { Q_OBJECT public: - KaimanStyleButton(QWidget *parent, const char *name=0); + KaimanStyleButton(TQWidget *parent, const char *name=0); ~KaimanStyleButton(); // Button states. enum { NormalUp=0, NormalDown, LitUp, LitDown, PrelightUp, PrelightLitUp, StateListEND }; - QPtrVector I_pmIndex; + TQPtrVector I_pmIndex; void setLit(bool); void setPrelight(bool); @@ -109,10 +109,10 @@ signals: void clicked(); protected: - void mousePressEvent(QMouseEvent *qme); - void mouseReleaseEvent(QMouseEvent *qme); - void enterEvent(QEvent * ); - void leaveEvent ( QEvent * ); + void mousePressEvent(TQMouseEvent *qme); + void mouseReleaseEvent(TQMouseEvent *qme); + void enterEvent(TQEvent * ); + void leaveEvent ( TQEvent * ); private: int i_i_currentState; @@ -126,7 +126,7 @@ class KaimanStyleSlider : public KaimanStyleMasked { Q_OBJECT public: - KaimanStyleSlider(int min, int max, QWidget *parent, const char *name=0); + KaimanStyleSlider(int min, int max, TQWidget *parent, const char *name=0); ~KaimanStyleSlider(); int value() { return _value; }; @@ -144,12 +144,12 @@ signals: void newValueDrop( int value ); protected: - void mouseMoveEvent(QMouseEvent *qme); - void mousePressEvent(QMouseEvent *qme); - void mouseReleaseEvent(QMouseEvent *qme); - void paintEvent(QPaintEvent *qpe); - void enterEvent(QEvent * ); - void leaveEvent ( QEvent * ); + void mouseMoveEvent(TQMouseEvent *qme); + void mousePressEvent(TQMouseEvent *qme); + void mouseReleaseEvent(TQMouseEvent *qme); + void paintEvent(TQPaintEvent *qpe); + void enterEvent(TQEvent * ); + void leaveEvent ( TQEvent * ); int pos2value( int x, int y ); @@ -164,18 +164,18 @@ class KaimanStyleBackground : public KaimanStyleMasked { Q_OBJECT public: - KaimanStyleBackground(QWidget *parent, const char *name=0); + KaimanStyleBackground(TQWidget *parent, const char *name=0); ~KaimanStyleBackground(); protected: - void mousePressEvent(QMouseEvent *qme); - void mouseReleaseEvent(QMouseEvent *qme); - void mouseMoveEvent(QMouseEvent *qme); + void mousePressEvent(TQMouseEvent *qme); + void mouseReleaseEvent(TQMouseEvent *qme); + void mouseMoveEvent(TQMouseEvent *qme); private: bool i_b_move; - QPoint i_point_dragStart; - QPoint i_point_lastPos; + TQPoint i_point_dragStart; + TQPoint i_point_lastPos; }; @@ -183,7 +183,7 @@ class KaimanStyleValue : public KaimanStyleMasked { Q_OBJECT public: - KaimanStyleValue(int min, int max, QWidget *parent, const char *name=0); + KaimanStyleValue(int min, int max, TQWidget *parent, const char *name=0); ~KaimanStyleValue(); int value() { return _value; }; @@ -201,7 +201,7 @@ class KaimanStyleState : public KaimanStyleMasked { Q_OBJECT public: - KaimanStyleState(QWidget *parent, const char *name=0); + KaimanStyleState(TQWidget *parent, const char *name=0); ~KaimanStyleState(); int value() { return _value; }; @@ -213,7 +213,7 @@ signals: void clicked(); protected: - void mousePressEvent(QMouseEvent *qme); + void mousePressEvent(TQMouseEvent *qme); private: int _value; @@ -224,10 +224,10 @@ class KaimanStyleNumber : public KaimanStyleElement { Q_OBJECT public: - KaimanStyleNumber(QWidget *parent, const char *name=0); + KaimanStyleNumber(TQWidget *parent, const char *name=0); ~KaimanStyleNumber(); - virtual void loadPixmaps(QString &val_s_filename); + virtual void loadPixmaps(TQString &val_s_filename); static const bool optionCentered = 1; @@ -237,7 +237,7 @@ public slots: void setValue( int value ); protected: - void paintEvent(QPaintEvent *qpe); + void paintEvent(TQPaintEvent *qpe); private: int _value; @@ -248,33 +248,33 @@ class KaimanStyleText : public KaimanStyleElement { Q_OBJECT public: - KaimanStyleText(QWidget *parent, const char *name=0); + KaimanStyleText(TQWidget *parent, const char *name=0); ~KaimanStyleText(); - virtual void loadPixmaps(QString &val_s_filename); + virtual void loadPixmaps(TQString &val_s_filename); static const bool optionExtended; - QString value() { return _value; }; + TQString value() { return _value; }; void startAnimation( int delay ); void stopAnimation(); public slots: - void setValue( QString value ); + void setValue( TQString value ); protected: - void paintEvent(QPaintEvent *qpe); + void paintEvent(TQPaintEvent *qpe); protected slots: void timeout(); private: - QString _value; + TQString _value; int _pos; int _direction; int _delay; - QTimer *_timer; + TQTimer *_timer; }; @@ -282,7 +282,7 @@ class KaimanStyleAnimation : public KaimanStyleMasked { Q_OBJECT public: - KaimanStyleAnimation(int delay, QWidget *parent, const char *name=0); + KaimanStyleAnimation(int delay, TQWidget *parent, const char *name=0); ~KaimanStyleAnimation(); public slots: @@ -295,14 +295,14 @@ protected: private: int _delay,_frame; - QTimer *_timer; + TQTimer *_timer; }; class KaimanStyle : public QWidget { Q_OBJECT public: - KaimanStyle(QWidget *parent, const char *name=0); + KaimanStyle(TQWidget *parent, 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 }; @@ -313,43 +313,43 @@ public: KaimanStyleElement* find(const char* val_s_elemName); /// Tries to load the given style and returns success (true) or failure (false) - bool loadStyle(const QString &styleName, const QString &descFile="skindata" ); - QString skinName() { return i_skinName; }; + bool loadStyle(const TQString &styleName, const TQString &descFile="skindata" ); + TQString skinName() { return i_skinName; }; /// Returns the mask - QBitmap* Mask(); + TQBitmap* Mask(); - virtual bool eventFilter( QObject *o, QEvent *e ); + virtual bool eventFilter( TQObject *o, TQEvent *e ); private: // Parses the "skindata" file and returns success (true) or failure (false) - int parseStyleFile(QString &l_s_tmpName); - QString getToken(QString &val_s_string, char val_c_separator); - void interpretTokens(QStringList& ref_s_tokens); + int parseStyleFile(TQString &l_s_tmpName); + TQString getToken(TQString &val_s_string, char val_c_separator); + void interpretTokens(TQStringList& ref_s_tokens); bool loadPixmaps(); /// The name of the style, e.g. "k9" - QString i_s_styleName; + TQString i_s_styleName; /// The base directory, where the style is found. For example /// "/opt/kde/share/apps/kaiman/Skins/k9/" or "/opt/kde/share/apps/kaiman/Skins/k9.tgz" - QString i_s_styleBase; + TQString i_s_styleBase; // The mask of the complete style. Used for doing shaped windows - QBitmap i_bitmap_Mask; + TQBitmap i_bitmap_Mask; /// All style elements are stored here. - QPtrVector I_styleElem; + TQPtrVector I_styleElem; // The parent window. In other words: The container that holds all the KaimanStyleElement's - QWidget* i_qw_parent; + TQWidget* i_qw_parent; - QPtrList i_sliders; + TQPtrList i_sliders; bool i_eventSemaphore; - QString i_smallFont; - QString i_largeFont; - QString i_skinName; + TQString i_smallFont; + TQString i_largeFont; + TQString i_skinName; }; diff --git a/noatun/modules/kaiman/userinterface.cpp b/noatun/modules/kaiman/userinterface.cpp index 08036a59..b1ae2570 100644 --- a/noatun/modules/kaiman/userinterface.cpp +++ b/noatun/modules/kaiman/userinterface.cpp @@ -30,13 +30,13 @@ #include "userinterface.h" #include "pref.h" -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include #include @@ -84,7 +84,7 @@ Kaiman::Kaiman() config->setGroup("Kaiman"); // load skin - QString skinName = config->readEntry( "SkinResource", DEFAULT_SKIN ); + TQString skinName = config->readEntry( "SkinResource", DEFAULT_SKIN ); if ( !changeStyle(skinName, "skindata") ) { @@ -92,22 +92,22 @@ Kaiman::Kaiman() if ( !changeStyle( DEFAULT_SKIN, "skindata" ) ) { KMessageBox::error( this, i18n("Cannot load default skin %1.").arg(DEFAULT_SKIN) ); - QTimer::singleShot( 0, this, SLOT(close()) ); + TQTimer::singleShot( 0, this, TQT_SLOT(close()) ); return; } } // global connects - connect( napp, SIGNAL(hideYourself()), this, SLOT(hide()) ); - connect( napp, SIGNAL(showYourself()), this, SLOT(show()) ); + connect( napp, TQT_SIGNAL(hideYourself()), this, TQT_SLOT(hide()) ); + connect( napp, TQT_SIGNAL(showYourself()), this, TQT_SLOT(show()) ); - connect( napp->player(), SIGNAL(playing()), this, SLOT(updateMode())); - connect( napp->player(), SIGNAL(stopped()), this, SLOT(updateMode())); - connect( napp->player(), SIGNAL(paused()), this, SLOT(updateMode())); - connect( napp->player(), SIGNAL(timeout()), this, SLOT(timeout())); - connect( napp->player(), SIGNAL(loopTypeChange(int)), this, SLOT(loopTypeChange(int))); - connect( napp->player(), SIGNAL(newSongLen(int,int)), this, SLOT(newSongLen(int,int))); - connect( napp->player(), SIGNAL(newSong()), this, SLOT(newSong())); + connect( napp->player(), TQT_SIGNAL(playing()), this, TQT_SLOT(updateMode())); + connect( napp->player(), TQT_SIGNAL(stopped()), this, TQT_SLOT(updateMode())); + connect( napp->player(), TQT_SIGNAL(paused()), this, TQT_SLOT(updateMode())); + connect( napp->player(), TQT_SIGNAL(timeout()), this, TQT_SLOT(timeout())); + connect( napp->player(), TQT_SIGNAL(loopTypeChange(int)), this, TQT_SLOT(loopTypeChange(int))); + connect( napp->player(), TQT_SIGNAL(newSongLen(int,int)), this, TQT_SLOT(newSongLen(int,int))); + connect( napp->player(), TQT_SIGNAL(newSong()), this, TQT_SLOT(newSong())); if( napp->player()->isPlaying() ) newSong(); @@ -123,9 +123,9 @@ Kaiman::~Kaiman() } -bool Kaiman::changeStyle( const QString &style, const QString &desc ) +bool Kaiman::changeStyle( const TQString &style, const TQString &desc ) { - QString ldesc = desc; + TQString ldesc = desc; if ( ldesc.isEmpty() ) ldesc = _altSkin ? "alt_skindata" : "skindata"; @@ -146,7 +146,7 @@ bool Kaiman::changeStyle( const QString &style, const QString &desc ) } -bool Kaiman::loadStyle( const QString &style, const QString &desc ) +bool Kaiman::loadStyle( const TQString &style, const TQString &desc ) { if ( _style ) delete _style; _style = new KaimanStyle(this); @@ -165,7 +165,7 @@ bool Kaiman::loadStyle( const QString &style, const QString &desc ) } KaimanStyleElement* item = _style->find("Background"); - setBackgroundMode(QWidget::NoBackground); + setBackgroundMode(TQWidget::NoBackground); if ( item!=0 ) { _style->resize( item->width(), item->height()); @@ -174,64 +174,64 @@ bool Kaiman::loadStyle( const QString &style, const QString &desc ) } item = _style->find("Playlist_Button"); - if( item!=0 ) connect( item, SIGNAL(clicked()), napp->player(), SLOT(toggleListView()) ); + if( item!=0 ) connect( item, TQT_SIGNAL(clicked()), napp->player(), TQT_SLOT(toggleListView()) ); item = _style->find("Play_Button"); - if( item!=0 ) connect( item, SIGNAL(clicked()), napp->player(), SLOT(playpause()) ); + if( item!=0 ) connect( item, TQT_SIGNAL(clicked()), napp->player(), TQT_SLOT(playpause()) ); item = _style->find("Pause_Button"); - if( item!=0 ) connect( item, SIGNAL(clicked()), napp->player(), SLOT(playpause()) ); + if( item!=0 ) connect( item, TQT_SIGNAL(clicked()), napp->player(), TQT_SLOT(playpause()) ); item = _style->find("Stop_Button"); - if( item!=0 ) connect( item, SIGNAL(clicked()), napp->player(), SLOT(stop()) ); + if( item!=0 ) connect( item, TQT_SIGNAL(clicked()), napp->player(), TQT_SLOT(stop()) ); item = _style->find("Next_Button"); - if( item!=0 ) connect( item, SIGNAL(clicked()), napp->player(), SLOT(forward()) ); + if( item!=0 ) connect( item, TQT_SIGNAL(clicked()), napp->player(), TQT_SLOT(forward()) ); item = _style->find("Prev_Button"); - if( item!=0 ) connect( item, SIGNAL(clicked()), napp->player(), SLOT(back()) ); + if( item!=0 ) connect( item, TQT_SIGNAL(clicked()), napp->player(), TQT_SLOT(back()) ); item = _style->find("Exit_Button"); - if( item!=0 ) connect( item, SIGNAL(clicked()), this, SLOT(close()) ); + if( item!=0 ) connect( item, TQT_SIGNAL(clicked()), this, TQT_SLOT(close()) ); item = _style->find("Mixer_Button"); - if( item!=0 ) connect( item, SIGNAL(clicked()), this, SLOT(execMixer()) ); + if( item!=0 ) connect( item, TQT_SIGNAL(clicked()), this, TQT_SLOT(execMixer()) ); item = _style->find("Iconify_Button"); - if( item!=0 ) connect( item, SIGNAL(clicked()), this, SLOT(showMinimized()) ); + if( item!=0 ) connect( item, TQT_SIGNAL(clicked()), this, TQT_SLOT(showMinimized()) ); item = _style->find("Alt_Skin_Button"); - if( item!=0 ) connect( item, SIGNAL(clicked()), this, SLOT(toggleSkin()) ); + if( item!=0 ) connect( item, TQT_SIGNAL(clicked()), this, TQT_SLOT(toggleSkin()) ); item = _style->find("Repeat_Button"); - if( item!=0 ) connect( item, SIGNAL(clicked()), this, SLOT(toggleLoop()) ); + if( item!=0 ) connect( item, TQT_SIGNAL(clicked()), this, TQT_SLOT(toggleLoop()) ); item = _style->find("Shuffle_Button"); - if( item!=0 ) connect( item, SIGNAL(clicked()), this, SLOT(toggleShuffle()) ); + if( item!=0 ) connect( item, TQT_SIGNAL(clicked()), this, TQT_SLOT(toggleShuffle()) ); item = _style->find("Config_Button"); - if( item!=0 ) connect( item, SIGNAL(clicked()), napp, SLOT(preferences()) ); + if( item!=0 ) connect( item, TQT_SIGNAL(clicked()), napp, TQT_SLOT(preferences()) ); item = _style->find("Volume_Up_Button"); - if( item!=0 ) connect( item, SIGNAL(clicked()), this,SLOT(volumeUp())); + if( item!=0 ) connect( item, TQT_SIGNAL(clicked()), this,TQT_SLOT(volumeUp())); item = _style->find("Volume_Down_Button"); - if( item!=0 ) connect( item, SIGNAL(clicked()), this,SLOT(volumeDown())); + if( item!=0 ) connect( item, TQT_SIGNAL(clicked()), this,TQT_SLOT(volumeDown())); KaimanStyleSlider* slider = static_cast(_style->find("Position_Slider")); if( slider!=0 ) { - connect( slider, SIGNAL(newValueDrag(int)), this, SLOT(seekStart(int)) ); - connect( slider, SIGNAL(newValue(int)), this, SLOT(seekDrag(int)) ); - connect( slider, SIGNAL(newValueDrop(int)), this, SLOT(seekStop(int)) ); + connect( slider, TQT_SIGNAL(newValueDrag(int)), this, TQT_SLOT(seekStart(int)) ); + connect( slider, TQT_SIGNAL(newValue(int)), this, TQT_SLOT(seekDrag(int)) ); + connect( slider, TQT_SIGNAL(newValueDrop(int)), this, TQT_SLOT(seekStop(int)) ); slider->setValue( 0, 0, 1000 ); } slider = static_cast(_style->find("Volume_Slider")); if ( slider!=0 ) { - connect(slider, SIGNAL(newValue(int)), this, SLOT(setVolume(int))); + connect(slider, TQT_SIGNAL(newValue(int)), this, TQT_SLOT(setVolume(int))); slider->setValue( napp->player()->volume(), 0, 100 ); } @@ -247,25 +247,25 @@ bool Kaiman::loadStyle( const QString &style, const QString &desc ) } -void Kaiman::closeEvent(QCloseEvent*) +void Kaiman::closeEvent(TQCloseEvent*) { unload(); } -void Kaiman::dragEnterEvent( QDragEnterEvent *event ) +void Kaiman::dragEnterEvent( TQDragEnterEvent *event ) { event->accept( KURLDrag::canDecode(event) ); } -void Kaiman::dropEvent( QDropEvent *event ) +void Kaiman::dropEvent( TQDropEvent *event ) { doDropEvent(event); } -void Kaiman::doDropEvent(QDropEvent *event) +void Kaiman::doDropEvent(TQDropEvent *event) { KURL::List uri; if (KURLDrag::decode(event, uri)) @@ -330,18 +330,18 @@ void Kaiman::toggleSkin() { _altSkin = !_altSkin; - QString skinName = _style->skinName(); + TQString skinName = _style->skinName(); - QString oldDesc, newDesc; + TQString oldDesc, newDesc; if ( _altSkin ) { - oldDesc = QString::fromLatin1("skindata"); - newDesc = QString::fromLatin1("alt_skindata"); + oldDesc = TQString::fromLatin1("skindata"); + newDesc = TQString::fromLatin1("alt_skindata"); } else { - newDesc = QString::fromLatin1("skindata"); - oldDesc = QString::fromLatin1("alt_skindata"); + newDesc = TQString::fromLatin1("skindata"); + oldDesc = TQString::fromLatin1("alt_skindata"); } if ( !changeStyle(skinName, newDesc) ) @@ -372,7 +372,7 @@ void Kaiman::volumeDown() void Kaiman::execMixer() { - kapp->startServiceByDesktopName ( QString::fromLatin1("kmix"), QString::null ); + kapp->startServiceByDesktopName ( TQString::fromLatin1("kmix"), TQString::null ); } @@ -424,7 +424,7 @@ void Kaiman::timeout() if ( numItem ) numItem->setValue(item.property("bitrate").toInt()); - QString hzString = item.property("samplerate"); + TQString hzString = item.property("samplerate"); hzString.truncate(2); numItem = static_cast(_style->find("In_Hz_Number")); @@ -513,7 +513,7 @@ void Kaiman::newSong() KaimanStyleText* titleItem = static_cast(_style->find("Title")); if ( titleItem ) { - QString title = i18n("Noatun"); + TQString title = i18n("Noatun"); if ( napp->player()->current() ) { title = napp->player()->current().title(); @@ -546,7 +546,7 @@ void Kaiman::toggleLoop() (int)(Player::Random)); loopMenu->setItemChecked((int)napp->player()->loopStyle(), true); // select current loopstyle in menu - selectedItem = loopMenu->exec(QCursor::pos()); + selectedItem = loopMenu->exec(TQCursor::pos()); if (selectedItem != -1) napp->player()->loop(selectedItem); // set new loopstyle diff --git a/noatun/modules/kaiman/userinterface.h b/noatun/modules/kaiman/userinterface.h index 9df9cb3c..63b4133e 100644 --- a/noatun/modules/kaiman/userinterface.h +++ b/noatun/modules/kaiman/userinterface.h @@ -39,12 +39,12 @@ Q_OBJECT Kaiman(); virtual ~Kaiman(); - bool changeStyle( const QString &style, const QString &desc=QString::null ); + bool changeStyle( const TQString &style, const TQString &desc=TQString::null ); public slots: - void dropEvent( QDropEvent * ); - void doDropEvent( QDropEvent * ); - void dragEnterEvent( QDragEnterEvent * ); - void closeEvent(QCloseEvent*); + void dropEvent( TQDropEvent * ); + void doDropEvent( TQDropEvent * ); + void dragEnterEvent( TQDragEnterEvent * ); + void closeEvent(TQCloseEvent*); protected slots: void seekStart( int ); @@ -73,7 +73,7 @@ Q_OBJECT static Kaiman *kaiman; protected: - bool loadStyle( const QString &style, const QString &desc ); + bool loadStyle( const TQString &style, const TQString &desc ); bool _seeking; diff --git a/noatun/modules/keyz/keyz.cpp b/noatun/modules/keyz/keyz.cpp index 7b32cf98..f35fddc7 100644 --- a/noatun/modules/keyz/keyz.cpp +++ b/noatun/modules/keyz/keyz.cpp @@ -3,12 +3,12 @@ #include #include -#include +#include #include #include #include -#include +#include #include "keyz.h" @@ -22,7 +22,7 @@ extern "C" KGlobalAccel * Keyz::s_accel = 0L; -Keyz::Keyz() : QObject( 0L, "Keyz" ), Plugin(), preMuteVol(0) +Keyz::Keyz() : TQObject( 0L, "Keyz" ), Plugin(), preMuteVol(0) { NOATUNPLUGINC(Keyz); Player *player = napp->player(); @@ -30,58 +30,58 @@ Keyz::Keyz() : QObject( 0L, "Keyz" ), Plugin(), preMuteVol(0) if ( !s_accel ) { s_accel = new KGlobalAccel( this, "noatunglobalaccel" ); - s_accel->insert( "PlayPause", i18n("Play/Pause"), QString::null, + s_accel->insert( "PlayPause", i18n("Play/Pause"), TQString::null, CTRL+ALT+Key_P, KKey::QtWIN+CTRL+Key_P, - player, SLOT( playpause() )); - s_accel->insert( "Stop", i18n("Stop Playing"), QString::null, + player, TQT_SLOT( playpause() )); + s_accel->insert( "Stop", i18n("Stop Playing"), TQString::null, CTRL+ALT+Key_S, KKey::QtWIN+CTRL+Key_S, - player, SLOT( stop() )); - s_accel->insert( "Back", i18n("Back"), QString::null, + player, TQT_SLOT( stop() )); + s_accel->insert( "Back", i18n("Back"), TQString::null, CTRL+ALT+Key_Left, KKey::QtWIN+CTRL+Key_Left, - player, SLOT( back() )); - s_accel->insert( "Forward", i18n("Forward"), QString::null, + player, TQT_SLOT( back() )); + s_accel->insert( "Forward", i18n("Forward"), TQString::null, CTRL+ALT+Key_Right, KKey::QtWIN+CTRL+Key_Right, - player, SLOT( forward() )); - s_accel->insert( "Playlist", i18n("Show/Hide Playlist"), QString::null, + player, TQT_SLOT( forward() )); + s_accel->insert( "Playlist", i18n("Show/Hide Playlist"), TQString::null, CTRL+ALT+Key_L, KKey::QtWIN+CTRL+Key_L, - player, SLOT( toggleListView() )); - s_accel->insert( "OpenFile", i18n("Open File to Play"), QString::null, + player, TQT_SLOT( toggleListView() )); + s_accel->insert( "OpenFile", i18n("Open File to Play"), TQString::null, CTRL+ALT+Key_O, KKey::QtWIN+CTRL+Key_O, - napp, SLOT( fileOpen() )); - s_accel->insert( "Effects", i18n("Effects Configuration"), QString::null, + napp, TQT_SLOT( fileOpen() )); + s_accel->insert( "Effects", i18n("Effects Configuration"), TQString::null, CTRL+ALT+Key_E, KKey::QtWIN+CTRL+Key_E, - napp, SLOT( effectView() )); - s_accel->insert( "Preferences", i18n("Preferences"), QString::null, + napp, TQT_SLOT( effectView() )); + s_accel->insert( "Preferences", i18n("Preferences"), TQString::null, CTRL+ALT+Key_F, KKey::QtWIN+CTRL+Key_F, - napp, SLOT( preferences() )); - s_accel->insert( "VolumeUp", i18n("Volume Up"), QString::null, + napp, TQT_SLOT( preferences() )); + s_accel->insert( "VolumeUp", i18n("Volume Up"), TQString::null, CTRL+ALT+SHIFT+Key_Up, KKey::QtWIN+CTRL+SHIFT+Key_Up, - this, SLOT( slotVolumeUp() )); - s_accel->insert( "VolumeDown", i18n("Volume Down"), QString::null, + this, TQT_SLOT( slotVolumeUp() )); + s_accel->insert( "VolumeDown", i18n("Volume Down"), TQString::null, CTRL+ALT+SHIFT+Key_Down, KKey::QtWIN+CTRL+SHIFT+Key_Down, - this, SLOT( slotVolumeDown() )); - s_accel->insert( "Mute", i18n("Mute"), QString::null, + this, TQT_SLOT( slotVolumeDown() )); + s_accel->insert( "Mute", i18n("Mute"), TQString::null, CTRL+ALT+Key_M, KKey::QtWIN+CTRL+Key_M, - this, SLOT( slotMute() )); - s_accel->insert( "SeekForward", i18n("Seek Forward"), QString::null, + this, TQT_SLOT( slotMute() )); + s_accel->insert( "SeekForward", i18n("Seek Forward"), TQString::null, CTRL+ALT+SHIFT+Key_Right, KKey::QtWIN+CTRL+SHIFT+Key_Right, - this, SLOT( slotForward() )); - s_accel->insert( "SeekBackward", i18n("Seek Backward"), QString::null, + this, TQT_SLOT( slotForward() )); + s_accel->insert( "SeekBackward", i18n("Seek Backward"), TQString::null, CTRL+ALT+SHIFT+Key_Left, KKey::QtWIN+CTRL+SHIFT+Key_Left, - this, SLOT( slotBackward() )); - s_accel->insert( "NextSection", i18n("Next Section"), QString::null, + this, TQT_SLOT( slotBackward() )); + s_accel->insert( "NextSection", i18n("Next Section"), TQString::null, 0, 0, - this, SLOT( slotNextSection() )); - s_accel->insert( "PrevSection", i18n("Previous Section"), QString::null, + this, TQT_SLOT( slotNextSection() )); + s_accel->insert( "PrevSection", i18n("Previous Section"), TQString::null, 0, 0, - this, SLOT( slotPrevSection() )); - s_accel->insert( "CopyTitle", i18n("Copy Song Title to Clipboard"), QString::null, + this, TQT_SLOT( slotPrevSection() )); + s_accel->insert( "CopyTitle", i18n("Copy Song Title to Clipboard"), TQString::null, CTRL+ALT+Key_C, KKey::QtWIN+CTRL+Key_C, - this, SLOT( slotCopyTitle() )); + this, TQT_SLOT( slotCopyTitle() )); - s_accel->insert( "ToggleGUI", i18n("Show/Hide Main Window"), QString::null, + s_accel->insert( "ToggleGUI", i18n("Show/Hide Main Window"), TQString::null, CTRL+ALT+Key_W, KKey::QtWIN+CTRL+Key_W, - napp, SLOT( toggleInterfaces() )); + napp, TQT_SLOT( toggleInterfaces() )); s_accel->readSettings(); s_accel->updateConnections(); @@ -170,11 +170,11 @@ void Keyz::slotMute() /////////////////////////////////////////////////////////////////// -KeyzPrefs::KeyzPrefs( QObject *parent ) : +KeyzPrefs::KeyzPrefs( TQObject *parent ) : CModule( i18n("Keyz"), i18n("Shortcut Configuration"), "key_bindings", parent ) { - QVBoxLayout *layout = new QVBoxLayout( this ); + TQVBoxLayout *layout = new TQVBoxLayout( this ); m_chooser = new KKeyChooser( Keyz::accel(), this ); layout->addWidget( m_chooser ); } diff --git a/noatun/modules/keyz/keyz.h b/noatun/modules/keyz/keyz.h index 929e6c67..e6682531 100644 --- a/noatun/modules/keyz/keyz.h +++ b/noatun/modules/keyz/keyz.h @@ -4,7 +4,7 @@ #include #include -class Keyz : public QObject, public Plugin +class Keyz : public TQObject, public Plugin { Q_OBJECT NOATUNPLUGIND @@ -37,7 +37,7 @@ class KeyzPrefs : public CModule Q_OBJECT public: - KeyzPrefs( QObject *parent ); + KeyzPrefs( TQObject *parent ); virtual void save(); private: diff --git a/noatun/modules/kjofol-skin/helpers.cpp b/noatun/modules/kjofol-skin/helpers.cpp index b38822a6..0a2a9e67 100644 --- a/noatun/modules/kjofol-skin/helpers.cpp +++ b/noatun/modules/kjofol-skin/helpers.cpp @@ -43,9 +43,9 @@ static int isGray(QRgb r) // UPDATE: should work on both little and big endian now (haven't tested that!) // this code is taken from the QT-docu and I hope that this example // is one of the working ones ;) -inline void setPixel1BPP(QImage &image, int x, int y, bool value) +inline void setPixel1BPP(TQImage &image, int x, int y, bool value) { - if ( image.bitOrder() == QImage::LittleEndian ) + if ( image.bitOrder() == TQImage::LittleEndian ) { if (value) *(image.scanLine(y) + (x >> 3)) |= 1 << (x & 7); diff --git a/noatun/modules/kjofol-skin/kjbackground.cpp b/noatun/modules/kjofol-skin/kjbackground.cpp index 83c19ace..1c99b6ff 100644 --- a/noatun/modules/kjofol-skin/kjbackground.cpp +++ b/noatun/modules/kjofol-skin/kjbackground.cpp @@ -12,18 +12,18 @@ KJBackground::KJBackground(KJLoader *parent) : KJWidget(parent) { - QImage ibackground; + TQImage ibackground; mBackground = parent->pixmap(parser()["backgroundimage"][1]); ibackground = parent->image(parser()["backgroundimage"][1]); parent->setMask( getMask(ibackground) ); - parent->setFixedSize ( QSize(mBackground.width(), mBackground.height()) ); + parent->setFixedSize ( TQSize(mBackground.width(), mBackground.height()) ); setRect(0,0,parent->width(),parent->height()); } -void KJBackground::paint(QPainter *painter, const QRect &rect) +void KJBackground::paint(TQPainter *painter, const TQRect &rect) { bitBlt(painter->device(), rect.topLeft(), &mBackground, rect, Qt::CopyROP); } diff --git a/noatun/modules/kjofol-skin/kjbackground.h b/noatun/modules/kjofol-skin/kjbackground.h index 502611c5..d09d22c5 100644 --- a/noatun/modules/kjofol-skin/kjbackground.h +++ b/noatun/modules/kjofol-skin/kjbackground.h @@ -5,17 +5,17 @@ //#include "kjloader.h" class KJLoader; -#include +#include class KJBackground : public KJWidget { public: KJBackground(KJLoader *); - virtual void paint(QPainter *, const QRect &rect); - virtual bool mousePress(const QPoint &) {return false;} - virtual void mouseRelease(const QPoint &, bool) {} + virtual void paint(TQPainter *, const TQRect &rect); + virtual bool mousePress(const TQPoint &) {return false;} + virtual void mouseRelease(const TQPoint &, bool) {} private: - QPixmap mBackground; + TQPixmap mBackground; }; #endif diff --git a/noatun/modules/kjofol-skin/kjbutton.cpp b/noatun/modules/kjofol-skin/kjbutton.cpp index 403ea61e..d051777e 100644 --- a/noatun/modules/kjofol-skin/kjbutton.cpp +++ b/noatun/modules/kjofol-skin/kjbutton.cpp @@ -16,7 +16,7 @@ #include #include -#include +#include #include #include #include @@ -30,8 +30,8 @@ * KJButton *******************************************/ -KJButton::KJButton(const QStringList &i, KJLoader *parent) - : QObject(0), KJWidget(parent), mTitle(i[0]), mShowPressed(false) +KJButton::KJButton(const TQStringList &i, KJLoader *parent) + : TQObject(0), KJWidget(parent), mTitle(i[0]), mShowPressed(false) { // kdDebug(66666) << k_funcinfo << "new button: " << i[0].latin1() << endl; mPushedPixmap = (i.count() >= 7); @@ -44,18 +44,18 @@ KJButton::KJButton(const QStringList &i, KJLoader *parent) ys=i[4].toInt()-y; // height setRect ( x, y, xs, ys ); - QStringList temp = i; + TQStringList temp = i; // search for selected button-type // can be either BMPx where x is a number representing one // of the background-images // or darken which means just darken the button on click bool gotBack = false; // in case any of these keys is duplicated - for(QStringList::Iterator it = temp.begin(); it != temp.end(); ++it) + for(TQStringList::Iterator it = temp.begin(); it != temp.end(); ++it) { if((*it).contains("bmp")) { - QString pressedTmp = backgroundPressed((*it)); + TQString pressedTmp = backgroundPressed((*it)); if(!pressedTmp.isEmpty()) { mPressed = parent->pixmap(pressedTmp); @@ -68,7 +68,7 @@ KJButton::KJButton(const QStringList &i, KJLoader *parent) // FIXME: what KPixmapEffect causes the desired effect? // intensity is the wrong one KPixmap temp = parent->pixmap(parser()["backgroundimage"][1]); - mPressed = (QPixmap)KPixmapEffect::intensity ( temp, 1.2f ); + mPressed = (TQPixmap)KPixmapEffect::intensity ( temp, 1.2f ); gotBack = true; } if(gotBack) @@ -87,24 +87,24 @@ KJButton::KJButton(const QStringList &i, KJLoader *parent) if (mTitle=="playlistbutton") { mShowPressed = napp->playlist()->listVisible(); - connect( napp->player(), SIGNAL(playlistShown()), this, SLOT(slotPlaylistShown()) ); - connect( napp->player(), SIGNAL(playlistHidden()), this, SLOT(slotPlaylistHidden()) ); + connect( napp->player(), TQT_SIGNAL(playlistShown()), this, TQT_SLOT(slotPlaylistShown()) ); + connect( napp->player(), TQT_SIGNAL(playlistHidden()), this, TQT_SLOT(slotPlaylistHidden()) ); } else if ( mTitle=="equalizeroffbutton") // same goes for EQ buttons { mShowPressed = (!napp->vequalizer()->isEnabled()); - connect( napp->vequalizer(), SIGNAL(enabled(bool)), SLOT(slotEqEnabled(bool))); + connect( napp->vequalizer(), TQT_SIGNAL(enabled(bool)), TQT_SLOT(slotEqEnabled(bool))); } else if (mTitle=="equalizeronbutton") { mShowPressed = napp->vequalizer()->isEnabled(); - connect( napp->vequalizer(), SIGNAL(enabled(bool)), SLOT(slotEqEnabled(bool))); + connect( napp->vequalizer(), TQT_SIGNAL(enabled(bool)), TQT_SLOT(slotEqEnabled(bool))); } } -QString KJButton::tip() +TQString KJButton::tip() { - QString str; + TQString str; if (mTitle=="closebutton") str=i18n("Close"); else if (mTitle=="minimizebutton") @@ -149,13 +149,13 @@ QString KJButton::tip() return str; } -void KJButton::paint(QPainter *, const QRect &) +void KJButton::paint(TQPainter *, const TQRect &) { if (mShowPressed) bitBlt(KJWidget::parent(), rect().topLeft(), &mPressed, rect(), Qt::CopyROP); } -bool KJButton::mousePress(const QPoint &) +bool KJButton::mousePress(const TQPoint &) { bitBlt(KJWidget::parent(), rect().topLeft(), &mPressed, rect(), Qt::CopyROP); return true; @@ -191,7 +191,7 @@ void KJButton::slotEqEnabled(bool on) showPressed(!on); } -void KJButton::mouseRelease(const QPoint &, bool in) +void KJButton::mouseRelease(const TQPoint &, bool in) { // repaint with default image (player-background) repaint(false); @@ -233,7 +233,7 @@ void KJButton::mouseRelease(const QPoint &, bool in) loopMenu->insertItem(i18n("&Random"), static_cast(Player::Random)); loopMenu->setItemChecked(static_cast(napp->player()->loopStyle()), true); // select current loopstyle in menu - selectedItem = loopMenu->exec(QCursor::pos()); + selectedItem = loopMenu->exec(TQCursor::pos()); if (selectedItem != -1) napp->player()->loop(selectedItem); // set new loopstyle diff --git a/noatun/modules/kjofol-skin/kjbutton.h b/noatun/modules/kjofol-skin/kjbutton.h index 4af4fcb0..e995c533 100644 --- a/noatun/modules/kjofol-skin/kjbutton.h +++ b/noatun/modules/kjofol-skin/kjbutton.h @@ -2,21 +2,21 @@ #define KJBUTTON_H #include "kjwidget.h" -#include +#include class KJLoader; -class KJButton : public QObject, public KJWidget +class KJButton : public TQObject, public KJWidget { Q_OBJECT public: - KJButton(const QStringList&, KJLoader *); + KJButton(const TQStringList&, KJLoader *); - virtual void paint(QPainter *, const QRect &rect); - virtual bool mousePress(const QPoint &pos); - virtual void mouseRelease(const QPoint &pos, bool); + virtual void paint(TQPainter *, const TQRect &rect); + virtual bool mousePress(const TQPoint &pos); + virtual void mouseRelease(const TQPoint &pos, bool); virtual void showPressed(bool b=true); - virtual QString tip(); + virtual TQString tip(); private slots: void slotPlaylistShown(void); @@ -24,10 +24,10 @@ private slots: void slotEqEnabled(bool on); private: - QPixmap mBackground; + TQPixmap mBackground; bool mPushedPixmap; - QPixmap mPressed; - QString mTitle; + TQPixmap mPressed; + TQString mTitle; bool mShowPressed; }; diff --git a/noatun/modules/kjofol-skin/kjequalizer.cpp b/noatun/modules/kjofol-skin/kjequalizer.cpp index 3f0716e4..51d50e97 100644 --- a/noatun/modules/kjofol-skin/kjequalizer.cpp +++ b/noatun/modules/kjofol-skin/kjequalizer.cpp @@ -8,16 +8,16 @@ #include "kjequalizer.h" #include "kjequalizer.moc" -#include -#include +#include +#include #include #include #include -KJEqualizer::KJEqualizer(const QStringList &l, KJLoader *p) - : QObject(0), KJWidget(p), mBack(0), mView(0), mInterpEq(0) +KJEqualizer::KJEqualizer(const TQStringList &l, KJLoader *p) + : TQObject(0), KJWidget(p), mBack(0), mView(0), mInterpEq(0) { int x=l[1].toInt(); int y=l[2].toInt(); @@ -32,12 +32,12 @@ KJEqualizer::KJEqualizer(const QStringList &l, KJLoader *p) // background under equalizer // needed to only blit onto screen ONCE and not for every band - QPixmap tmp = p->pixmap(p->item("backgroundimage")[1]); - mBack = new KPixmap ( QSize(xs,ys) ); + 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 ); // buffer for view - mView = new QPixmap ( xs, ys ); + mView = new TQPixmap ( xs, ys ); mBandWidth=parser()["EqualizerBmp"][1].toInt(); mBandHalfHeight=parser()["EqualizerBmp"][2].toInt(); @@ -47,7 +47,7 @@ KJEqualizer::KJEqualizer(const QStringList &l, KJLoader *p) kdDebug(66666) << "[KJEqualizer] creating VInterpolation for " << mBands << " bands..." << endl; mInterpEq = new VInterpolation(mBands); // napp->vequalizer()->setBands(mBands); // FIXME: hack because spline sucks :P - connect(napp->vequalizer(), SIGNAL(changed()), this, SLOT(slotUpdateBuffer())); + connect(napp->vequalizer(), TQT_SIGNAL(changed()), this, TQT_SLOT(slotUpdateBuffer())); slotUpdateBuffer(); // fill mView pixmap with valid data } @@ -59,38 +59,38 @@ KJEqualizer::~KJEqualizer(void) delete mBack; } -int KJEqualizer::barNum(const QPoint &pos) const +int KJEqualizer::barNum(const TQPoint &pos) const { int x = pos.x(); x = x / mXSpace; return mInterpEq->bands() * x / mBands; } -int KJEqualizer::level(const QPoint &pos) const +int KJEqualizer::level(const TQPoint &pos) const { int y = ((-pos.y()) + mBandHalfHeight+1) * (200/mBandHalfHeight); return y; } -void KJEqualizer::paint(QPainter *p, const QRect &) +void KJEqualizer::paint(TQPainter *p, const TQRect &) { - QPixmap temp(rect().width(), rect().height()); + TQPixmap temp(rect().width(), rect().height()); // draw background into buffer bitBlt ( &temp, 0, 0, mBack, 0, 0, -1, -1, Qt::CopyROP ); // draw band sliders into buffer bitBlt( &temp, 0, 0, mView, 0, 0, rect().width(), rect().height(), Qt::CopyROP); // and draw it on screen - bitBlt(p->device(), rect().topLeft(), &temp, QRect(0,0,-1,-1), Qt::CopyROP); + bitBlt(p->device(), rect().topLeft(), &temp, TQRect(0,0,-1,-1), Qt::CopyROP); } void KJEqualizer::slotUpdateBuffer() { // kdDebug(66666) << "[KJEqualizer] slotUpdateBuffer() called." << endl; - QBitmap regionMask( rect().width(), rect().height(), true); // fully transparent mask - QPainter mask( ®ionMask ); + TQBitmap regionMask( rect().width(), rect().height(), true); // fully transparent mask + TQPainter mask( ®ionMask ); - QPoint destX = QPoint(0, 0); + TQPoint destX = TQPoint(0, 0); for (int band=0; bandband( barNum(p) ); diff --git a/noatun/modules/kjofol-skin/kjequalizer.h b/noatun/modules/kjofol-skin/kjequalizer.h index f3f13bd5..be5535eb 100644 --- a/noatun/modules/kjofol-skin/kjequalizer.h +++ b/noatun/modules/kjofol-skin/kjequalizer.h @@ -6,20 +6,20 @@ class KJLoader; class VInterpolation; -#include +#include -class KJEqualizer : public QObject, public KJWidget +class KJEqualizer : public TQObject, public KJWidget { Q_OBJECT public: - KJEqualizer(const QStringList &, KJLoader *parent); + KJEqualizer(const TQStringList &, KJLoader *parent); ~KJEqualizer(void); - virtual void mouseMove(const QPoint &pos, bool); - virtual bool mousePress(const QPoint&); - virtual void paint(QPainter *p, const QRect &rect); - int barNum(const QPoint &pos) const; - int level(const QPoint &pos) const; + virtual void mouseMove(const TQPoint &pos, bool); + virtual bool mousePress(const TQPoint&); + virtual void paint(TQPainter *p, const TQRect &rect); + int barNum(const TQPoint &pos) const; + int level(const TQPoint &pos) const; public slots: void slotUpdateBuffer(); @@ -30,9 +30,9 @@ private: int mBandWidth; int mBandHalfHeight; - QPixmap mBars; // holds all slider images - QPixmap *mBack; // holds background of EQ for easy repaint - QPixmap *mView; // holds prepared img of all sliders + TQPixmap mBars; // holds all slider images + TQPixmap *mBack; // holds background of EQ for easy repaint + 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 df2abed3..c6b16b77 100644 --- a/noatun/modules/kjofol-skin/kjfont.cpp +++ b/noatun/modules/kjofol-skin/kjfont.cpp @@ -16,16 +16,16 @@ #include #include -#include -#include +#include +#include /******************************************* * KJFont *******************************************/ -KJFont::KJFont(const QString &prefix, KJLoader *parent) : mTextMask(0), mTransparentRGB(0) +KJFont::KJFont(const TQString &prefix, KJLoader *parent) : mTextMask(0), mTransparentRGB(0) { -// kdDebug(66666) << "KJFont::KJFont(const QString &prefix, KJLoader *parent)" << prefix.latin1() << endl; +// kdDebug(66666) << "KJFont::KJFont(const TQString &prefix, KJLoader *parent)" << prefix.latin1() << endl; if (prefix=="timefont") { @@ -86,7 +86,7 @@ KJFont::KJFont(const QString &prefix, KJLoader *parent) : mTextMask(0), mTranspa // define color in font that will be transparent later on if ( mTransparent ) { - QImage ibackground = mText.convertToImage(); + 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; mTextMask = KJWidget::getMask(ibackground,mTransparentRGB); @@ -105,8 +105,8 @@ void KJFont::recalcSysFont(void) mUseSysFont = KJLoader::kjofol->prefs()->useSysFont(); if (!mUseSysFont) return; - sysFont = QFont(KJLoader::kjofol->prefs()->sysFont()); - sysFont.setStyleStrategy( QFont::NoAntialias ); + sysFont = TQFont(KJLoader::kjofol->prefs()->sysFont()); + sysFont.setStyleStrategy( TQFont::NoAntialias ); if ( sysFontMetrics ) delete sysFontMetrics; sysFontColor = KJLoader::kjofol->prefs()->sysFontColor(); @@ -117,7 +117,7 @@ void KJFont::recalcSysFont(void) for(fSize = mHeight; fSize>=4; fSize--) { sysFont.setPixelSize ( fSize ); - sysFontMetrics = new QFontMetrics(sysFont); + sysFontMetrics = new TQFontMetrics(sysFont); // kdDebug(66666) << "wanted fSize=" << fSize << ", metric h=" << sysFontMetrics->height() << endl; // either found a small enough font or found no proper font at all if ( sysFontMetrics->height() <= mHeight || fSize==4 ) @@ -129,7 +129,7 @@ void KJFont::recalcSysFont(void) } } -QPixmap KJFont::draw(const QCString &str, int wide, const QPoint &pos) const +TQPixmap KJFont::draw(const TQCString &str, int wide, const TQPoint &pos) const { if ( mUseSysFont ) return drawSysFont(str,wide,pos); @@ -137,24 +137,24 @@ QPixmap KJFont::draw(const QCString &str, int wide, const QPoint &pos) const return drawPixmapFont(str,wide,pos); } -QPixmap KJFont::drawSysFont(const QCString &s, int wide, const QPoint &pos) const +TQPixmap KJFont::drawSysFont(const TQCString &s, int wide, const TQPoint &pos) const { // kdDebug(66666) << k_funcinfo << "BEGIN, s='" << s << "'" << endl; - QPoint to(pos); - QString string(s); + TQPoint to(pos); + TQString string(s); int stringWidth = sysFontMetrics->width( string ); // kdDebug(66666) << "final metrics; w=" << stringWidth << ", h=" << sysFontMetrics->height() << endl; - QPixmap region( + TQPixmap region( (stringWidth > wide ? stringWidth : wide), mHeight); - QPainter rp(®ion); // region painter + TQPainter rp(®ion); // region painter - QBitmap regionMask( + TQBitmap regionMask( (stringWidth > wide ? stringWidth : wide), mHeight, true); // fully transparent mask - QPainter mp(®ionMask); // mask painter + TQPainter mp(®ionMask); // mask painter // kdDebug(66666) << "region; w=" << region.width() << ", h=" << region.height() << endl; @@ -164,7 +164,7 @@ QPixmap KJFont::drawSysFont(const QCString &s, int wide, const QPoint &pos) cons { freeSpace = wide - stringWidth; mp.fillRect ( to.x(), 0, (freeSpace/2), mHeight, Qt::color0 ); - to += QPoint ( (freeSpace/2), 0 ); + to += TQPoint ( (freeSpace/2), 0 ); // kdDebug(66666) << "centering text, freeSpace=" << freeSpace << endl; } @@ -176,13 +176,13 @@ QPixmap KJFont::drawSysFont(const QCString &s, int wide, const QPoint &pos) cons mp.setPen(Qt::color1); mp.drawText(to.x(), to.y(), region.width()-freeSpace, mHeight, Qt::AlignLeft|Qt::AlignTop, string); - to += QPoint(region.width()-freeSpace,0); + 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 ); - to += QPoint ( (freeSpace/2), 0 ); + to += TQPoint ( (freeSpace/2), 0 ); // kdDebug(66666) << "centering text, freeSpace=" << freeSpace << endl; } @@ -192,22 +192,22 @@ QPixmap KJFont::drawSysFont(const QCString &s, int wide, const QPoint &pos) cons return region; } -QPixmap KJFont::drawPixmapFont(const QCString &str, int wide, const QPoint &pos) const +TQPixmap KJFont::drawPixmapFont(const TQCString &str, int wide, const TQPoint &pos) const { // kdDebug(66666) << k_funcinfo << "BEGIN" << endl; - QPoint to(pos); + TQPoint to(pos); - QCString string = str.lower(); - QPixmap region( + TQCString string = str.lower(); + TQPixmap region( (string.length()*mWidth+string.length()*mSpacing > (unsigned int)wide ? string.length()*mWidth+string.length()*mSpacing : wide), mHeight); - QBitmap regionMask( + TQBitmap regionMask( (string.length()*mWidth+string.length()*mSpacing > (unsigned int)wide ? string.length()*mWidth+string.length()*mSpacing : wide), mHeight, true); // fully transparent mask - QPainter mask( ®ionMask ); + TQPainter mask( ®ionMask ); // kdDebug(66666) << "draw: {" << str << "}" << endl; @@ -217,7 +217,7 @@ QPixmap KJFont::drawPixmapFont(const QCString &str, int wide, const QPoint &pos) { freeSpace = wide - string.length()*mWidth+string.length()*mSpacing; mask.fillRect ( to.x(), 0, (freeSpace/2), mHeight, Qt::color0 ); - to += QPoint ( (freeSpace/2), 0 ); + to += TQPoint ( (freeSpace/2), 0 ); } // kdDebug(66666) << k_funcinfo << "pixmap width=" << region.width() << endl; @@ -229,20 +229,20 @@ QPixmap KJFont::drawPixmapFont(const QCString &str, int wide, const QPoint &pos) char c = string[charPos]; // the character to be drawn next drawCharacter(®ion, ®ionMask, to, c); - to += QPoint(mWidth, 0); + to += TQPoint(mWidth, 0); // 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 ); - to += QPoint ( mSpacing, 0 ); + to += TQPoint ( mSpacing, 0 ); } } if (freeSpace > 0) { mask.fillRect ( to.x(), 0, (freeSpace/2), mHeight, Qt::color0 ); - to += QPoint ( (freeSpace/2), 0 ); + to += TQPoint ( (freeSpace/2), 0 ); } region.setMask( regionMask ); @@ -250,24 +250,24 @@ QPixmap KJFont::drawPixmapFont(const QCString &str, int wide, const QPoint &pos) return region; } -void KJFont::drawCharacter(QPixmap *dev, QBitmap *devMask, const QPoint &to, char c) const +void KJFont::drawCharacter(TQPixmap *dev, TQBitmap *devMask, const TQPoint &to, char c) const { - QPoint src=charSource(c); + TQPoint src=charSource(c); int x=src.x(); int y=src.y(); int xs=mWidth; int ys=mHeight; - bitBlt(dev, to, &mText, QRect(x,y,xs,ys), Qt::CopyROP); + bitBlt(dev, to, &mText, TQRect(x,y,xs,ys), Qt::CopyROP); // bitBlt mask for transparency if ( mTransparent ) { - bitBlt(devMask, to, &mTextMask, QRect(x,y,xs,ys), Qt::OrROP); + bitBlt(devMask, to, &mTextMask, TQRect(x,y,xs,ys), Qt::OrROP); } else // fill mask { - QPainter tempPainter (devMask); + TQPainter tempPainter (devMask); tempPainter.fillRect ( to.x(), 0, xs,ys, Qt::color1 ); } } @@ -276,14 +276,14 @@ void KJFont::drawCharacter(QPixmap *dev, QBitmap *devMask, const QPoint &to, cha #include // searches for top/left coordinate of a given character inside the font-pixmap -QPoint KJFont::charSource(char c) const +TQPoint KJFont::charSource(char c) const { for (int i=0; i<3; i++) { const char *pos = strchr(mString[i], c); if (!pos) continue; - return QPoint(mWidth*((int)(pos-mString[i])), mHeight*i); + return TQPoint(mWidth*((int)(pos-mString[i])), mHeight*i); } return charSource(mNullChar); diff --git a/noatun/modules/kjofol-skin/kjfont.h b/noatun/modules/kjofol-skin/kjfont.h index 4ea5319b..a40e7854 100644 --- a/noatun/modules/kjofol-skin/kjfont.h +++ b/noatun/modules/kjofol-skin/kjfont.h @@ -1,21 +1,21 @@ #ifndef KJFONT_H #define KJFONT_H -#include -#include -#include -#include +#include +#include +#include +#include class KJLoader; class KJFont { public: - KJFont(const QString &prefix, KJLoader *parent); + KJFont(const TQString &prefix, KJLoader *parent); // draw the string str to dev at position pos, within rectangle limit in relation to pos - QPixmap draw(const QCString &str, int wide, const QPoint &pt=QPoint(0,0)) const; - QPixmap draw(const QString &str, int wide, const QPoint &pt=QPoint(0,0)) const - { return draw(QCString(str.latin1()), wide, pt); } + 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 + { return draw(TQCString(str.latin1()), wide, pt); } int fontHeight() const {return mHeight;} int fontWidth() const {return mWidth;} @@ -26,24 +26,24 @@ public: void recalcSysFont(void); protected: - QPixmap drawSysFont(const QCString &s, int wide, const QPoint &pos=QPoint(0,0)) const; - QPixmap drawPixmapFont(const QCString &, int, const QPoint &pos=QPoint(0,0)) const; + TQPixmap drawSysFont(const TQCString &s, int wide, const TQPoint &pos=TQPoint(0,0)) const; + TQPixmap drawPixmapFont(const TQCString &, int, const TQPoint &pos=TQPoint(0,0)) const; - void drawCharacter(QPixmap *dev, QBitmap *devMask, const QPoint &to, char c) const; - QPoint charSource(char c) const; + void drawCharacter(TQPixmap *dev, TQBitmap *devMask, const TQPoint &to, char c) const; + TQPoint charSource(char c) const; private: - QPixmap mText; - QBitmap mTextMask; + TQPixmap mText; + TQBitmap mTextMask; QRgb mTransparentRGB; // this color will be transparent int mSpacing; int mWidth, mHeight; bool mTransparent; // indicates wether there's transparency const char *mString[3]; char mNullChar; - QFontMetrics *sysFontMetrics; - QFont sysFont; - QColor sysFontColor; + TQFontMetrics *sysFontMetrics; + TQFont sysFont; + TQColor sysFontColor; bool mUseSysFont; }; diff --git a/noatun/modules/kjofol-skin/kjloader.cpp b/noatun/modules/kjofol-skin/kjloader.cpp index 11f96b7a..7a9d70c4 100644 --- a/noatun/modules/kjofol-skin/kjloader.cpp +++ b/noatun/modules/kjofol-skin/kjloader.cpp @@ -41,16 +41,16 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include @@ -73,19 +73,19 @@ class KJToolTip : public QToolTip { public: KJToolTip(KJLoader *parent) - : QToolTip(parent), mParent(parent) + : TQToolTip(parent), mParent(parent) {} protected: - virtual void maybeTip(const QPoint &p) + virtual void maybeTip(const TQPoint &p) { if ( !mParent->prefs()->displayTooltips() ) return; - QPtrList things=mParent->widgetsAt(p); + TQPtrList things=mParent->widgetsAt(p); for (KJWidget *i=things.first(); i!=0; i=things.next()) { - QString string=i->tip(); + TQString string=i->tip(); if (string.length()) { tip(i->rect(), string); @@ -103,7 +103,7 @@ KJLoader *KJLoader::kjofol=0; KJLoader::KJLoader() - : QWidget(0, "NoatunKJLoader", + : TQWidget(0, "NoatunKJLoader", WType_TopLevel | WStyle_NoBorder | WRepaintNoErase ), UserInterface(), moving(false), @@ -132,10 +132,10 @@ KJLoader::KJLoader() subwidgets.setAutoDelete(true); mPrefs = new KJPrefs(this); - connect ( mPrefs, SIGNAL(configChanged()), this, SLOT(readConfig()) ); + connect ( mPrefs, TQT_SIGNAL(configChanged()), this, TQT_SLOT(readConfig()) ); - QString skin = mPrefs->skin(); - if ( QFile(skin).exists() ) + TQString skin = mPrefs->skin(); + if ( TQFile(skin).exists() ) { loadSkin(skin); } @@ -147,22 +147,22 @@ KJLoader::KJLoader() } mHelpMenu = new KHelpMenu(this, kapp->aboutData()); - connect(napp->player(), SIGNAL(timeout()), SLOT(timeUpdate())); - connect(napp->player(), SIGNAL(stopped()), SLOT(timeUpdate())); - connect(napp->player(), SIGNAL(newSong()), SLOT(newSong())); + connect(napp->player(), TQT_SIGNAL(timeout()), TQT_SLOT(timeUpdate())); + connect(napp->player(), TQT_SIGNAL(stopped()), TQT_SLOT(timeUpdate())); + connect(napp->player(), TQT_SIGNAL(newSong()), TQT_SLOT(newSong())); - connect(napp, SIGNAL(hideYourself()), SLOT(hide())); - connect(napp, SIGNAL(showYourself()), SLOT(show())); -// KStdAction::quit(napp, SLOT(quit()), actionCollection()); + connect(napp, TQT_SIGNAL(hideYourself()), TQT_SLOT(hide())); + connect(napp, TQT_SIGNAL(showYourself()), TQT_SLOT(show())); +// KStdAction::quit(napp, TQT_SLOT(quit()), actionCollection()); - QApplication::restoreOverrideCursor(); + TQApplication::restoreOverrideCursor(); // newSong(); } -QPtrList KJLoader::widgetsAt(const QPoint &pt) const +TQPtrList KJLoader::widgetsAt(const TQPoint &pt) const { - QPtrList things; - for ( QPtrListIterator i(subwidgets); i.current(); ++i ) + TQPtrList things; + for ( TQPtrListIterator i(subwidgets); i.current(); ++i ) if ( (*i)->rect().contains(pt) ) things.append((*i)); @@ -184,9 +184,9 @@ void KJLoader::addChild(KJWidget *c) // The BIG one ;) // this methode does all the hard work on loading these weird skins -void KJLoader::loadSkin(const QString &file) +void KJLoader::loadSkin(const TQString &file) { -// kdDebug(66666) << "" << endl; +// kdDebug(66666) << "" << endl; // kdDebug(66666) << " file = " << file.latin1() << endl; if ( file == mCurrentSkin ) // we don't load the same skin again @@ -371,12 +371,12 @@ void KJLoader::loadSkin(const QString &file) // I cant believe it, there are skins without a seeker, now THATS stupid :) if (exist("seekregion")) - QTimer::singleShot(0, this, SLOT(loadSeeker())); + TQTimer::singleShot(0, this, TQT_SLOT(loadSeeker())); // all the regular buttons - for (QDictIterator i(*this); i.current(); ++i) + for (TQDictIterator i(*this); i.current(); ++i) { - QString d=i.currentKey(); + TQString d=i.currentKey(); if(d.contains("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 @@ -399,7 +399,7 @@ void KJLoader::loadSkin(const QString &file) if (napp->player()->isPlaying()) newSong(); -// kdDebug(66666) << "" << endl; +// kdDebug(66666) << "" << endl; } void KJLoader::loadSeeker() @@ -451,19 +451,19 @@ void KJLoader::minimize() showMinimized(); } -void KJLoader::closeEvent(QCloseEvent*) +void KJLoader::closeEvent(TQCloseEvent*) { -// kdDebug(66666) << "KJLoader::closeEvent(QCloseEvent*)" << endl; +// kdDebug(66666) << "KJLoader::closeEvent(TQCloseEvent*)" << endl; unload(); } -void KJLoader::dragEnterEvent(QDragEnterEvent *event) +void KJLoader::dragEnterEvent(TQDragEnterEvent *event) { // accept uri drops only event->accept(KURLDrag::canDecode(event)); } -void KJLoader::dropEvent(QDropEvent *event) +void KJLoader::dropEvent(TQDropEvent *event) { KURL::List urls; if ( KURLDrag::decode(event,urls) ) @@ -473,7 +473,7 @@ void KJLoader::dropEvent(QDropEvent *event) } } -void KJLoader::wheelEvent(QWheelEvent *e) +void KJLoader::wheelEvent(TQWheelEvent *e) { // from QT-Docu: delta() is 120 for one step if (e->state() & ControlButton) napp->player()->setVolume ( napp->player()->volume() + (e->delta()/8) ); // 15% volumechange @@ -487,11 +487,11 @@ void KJLoader::switchToDockmode() // kdDebug(66666) << "KJLoader::switchToDockmode()" << endl; loadSkin( mCurrentDockModeSkin ); - connect(mWin, SIGNAL(activeWindowChanged(WId)), this, SLOT(slotWindowActivate(WId))); - connect(mWin, SIGNAL(windowRemoved(WId)), this, SLOT(slotWindowRemove(WId))); - connect(mWin, SIGNAL(stackingOrderChanged()), this, SLOT(slotStackingChanged())); - connect(mWin, SIGNAL(windowChanged(WId)), this, SLOT(slotWindowChange(WId))); - connect(mWin, SIGNAL(currentDesktopChanged(int)), this, SLOT(slotDesktopChange(int))); + connect(mWin, TQT_SIGNAL(activeWindowChanged(WId)), this, TQT_SLOT(slotWindowActivate(WId))); + connect(mWin, TQT_SIGNAL(windowRemoved(WId)), this, TQT_SLOT(slotWindowRemove(WId))); + connect(mWin, TQT_SIGNAL(stackingOrderChanged()), this, TQT_SLOT(slotStackingChanged())); + connect(mWin, TQT_SIGNAL(windowChanged(WId)), this, TQT_SLOT(slotWindowChange(WId))); + connect(mWin, TQT_SIGNAL(currentDesktopChanged(int)), this, TQT_SLOT(slotDesktopChange(int))); WId activeWin = mWin->activeWindow(); if (activeWin && (activeWin != winId())) @@ -676,7 +676,7 @@ void KJLoader::slotStackingChanged() // We seem to get this signal before the window has been restacked, // so we just schedule a restack. - QTimer::singleShot ( 10, this, SLOT(restack()) ); + TQTimer::singleShot ( 10, this, TQT_SLOT(restack()) ); // kdDebug(66666) << "END slotStackingChanged()" << endl; } @@ -708,45 +708,45 @@ KJLoader::~KJLoader() delete mWin; } -void KJLoader::paintEvent(QPaintEvent *e) +void KJLoader::paintEvent(TQPaintEvent *e) { - QPainter p(this); + TQPainter p(this); for (KJWidget* i=subwidgets.first(); i!=0; i=subwidgets.next()) if (i->rect().intersects(e->rect())) i->paint(&p, e->rect().intersect(i->rect())); -// QWidget::paintEvent(e); +// TQWidget::paintEvent(e); } -void KJLoader::mouseMoveEvent(QMouseEvent *e) +void KJLoader::mouseMoveEvent(TQMouseEvent *e) { if (moving) { - move ( QCursor::pos()-mMousePoint ); + move ( TQCursor::pos()-mMousePoint ); return; } -// QWidget::mouseMoveEvent(e); +// TQWidget::mouseMoveEvent(e); // not on background but on a widget: pass event to subwidget if ( !moving && mClickedIn && subwidgets.findRef(mClickedIn) != -1 ) { mClickedIn->mouseMove ( e->pos()-mClickedIn->rect().topLeft(), - mClickedIn->rect().contains(mapFromGlobal(QCursor::pos())) ); + mClickedIn->rect().contains(mapFromGlobal(TQCursor::pos())) ); } } -void KJLoader::mousePressEvent(QMouseEvent *e) +void KJLoader::mousePressEvent(TQMouseEvent *e) { -// kdDebug(66666) << "KJLoader::mousePressEvent(QMouseEvent *e)" << endl; +// kdDebug(66666) << "KJLoader::mousePressEvent(TQMouseEvent *e)" << endl; -// QWidget::mousePressEvent(e); +// TQWidget::mousePressEvent(e); if ( e->button()==RightButton ) NoatunStdAction::ContextMenu::showContextMenu(); else /* if ( e->button()==LeftButton ) */ { - mMousePoint = mapFromGlobal(QCursor::pos()); + 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)) @@ -763,18 +763,18 @@ void KJLoader::mousePressEvent(QMouseEvent *e) } } -void KJLoader::mouseReleaseEvent(QMouseEvent */*e*/) +void KJLoader::mouseReleaseEvent(TQMouseEvent */*e*/) { -// kdDebug(66666) << "KJLoader::mouseReleaseEvent(QMouseEvent *e)" << endl; +// kdDebug(66666) << "KJLoader::mouseReleaseEvent(TQMouseEvent *e)" << endl; -// QWidget::mouseReleaseEvent(e); +// TQWidget::mouseReleaseEvent(e); if (!moving && mClickedIn && subwidgets.findRef(mClickedIn)!=-1) { - mClickedIn->mouseRelease(mapFromGlobal(QCursor::pos())- + mClickedIn->mouseRelease(mapFromGlobal(TQCursor::pos())- mClickedIn->rect().topLeft(), mClickedIn->rect().contains( - mapFromGlobal(QCursor::pos()))); + mapFromGlobal(TQCursor::pos()))); mClickedIn=0; } @@ -804,17 +804,17 @@ void KJLoader::readConfig() void KJLoader::showSplash() { - splashScreen = new QLabel( 0L, "SplashScreen", + splashScreen = new TQLabel( 0L, "SplashScreen", WType_TopLevel | WStyle_NoBorder | WRepaintNoErase | WX11BypassWM ); - QPixmap splashPix = pixmap(item("splashscreen")[1]); + TQPixmap splashPix = pixmap(item("splashscreen")[1]); splashScreen->setPixmap( splashPix ); splashScreen->setBackgroundMode ( NoBackground ); splashScreen->setMask( KJWidget::getMask(image(item("splashscreen")[1])) ); - QSize sh = splashScreen->sizeHint(); + TQSize sh = splashScreen->sizeHint(); - QRect desk = KGlobalSettings::splashScreenDesktopGeometry(); + TQRect desk = KGlobalSettings::splashScreenDesktopGeometry(); splashScreen->move (desk.x() + (desk.width() - sh.width())/2, desk.y() + (desk.height() - sh.height())/2 ); @@ -822,7 +822,7 @@ void KJLoader::showSplash() splashScreen->show(); napp->processEvents(); // we want this one time to get the splash actually displayed ASAP - QTimer::singleShot(3000, this, SLOT(hideSplash()) ); + TQTimer::singleShot(3000, this, TQT_SLOT(hideSplash()) ); } void KJLoader::hideSplash() diff --git a/noatun/modules/kjofol-skin/kjloader.h b/noatun/modules/kjofol-skin/kjloader.h index 44b507d6..2510b14d 100644 --- a/noatun/modules/kjofol-skin/kjloader.h +++ b/noatun/modules/kjofol-skin/kjloader.h @@ -13,10 +13,10 @@ #include // system includes -#include -#include -#include -#include +#include +#include +#include +#include #include @@ -30,7 +30,7 @@ class KJFont; class KJPrefs; -class KJLoader : public QWidget, public UserInterface, public Parser +class KJLoader : public TQWidget, public UserInterface, public Parser { Q_OBJECT NOATUNPLUGIND @@ -43,30 +43,30 @@ public: public: void minimize(); KHelpMenu *helpMenu() const { return mHelpMenu; } - QStringList &item(const QString &key) { return *Parser::find(key); } + TQStringList &item(const TQString &key) { return *Parser::find(key); } // returns path to currently loaded configfile // can be either a newly loaded one or one of the three below - QString currentSkin() { return mCurrentSkin; } + TQString currentSkin() { return mCurrentSkin; } // returns path to mainskin-configfile - QString currentDefaultSkin() { return mCurrentDefaultSkin; } + TQString currentDefaultSkin() { return mCurrentDefaultSkin; } //returns path to dockmode-configfile if present - QString currentDockModeSkin() { return mCurrentDockModeSkin; } + TQString currentDockModeSkin() { return mCurrentDockModeSkin; } //returns path to winshademode-configfile if present (not supported yet) - QString currentWinshadeModeSkin() { return mCurrentWinshadeModeSkin; } + TQString currentWinshadeModeSkin() { return mCurrentWinshadeModeSkin; } KJPrefs *prefs() const { return mPrefs; } - QPtrList widgetsAt(const QPoint &pt) const; + TQPtrList widgetsAt(const TQPoint &pt) const; void removeChild(KJWidget *c); void addChild(KJWidget *c); public slots: - void loadSkin(const QString &file); + void loadSkin(const TQString &file); void readConfig(); void switchToDockmode(); void returnFromDockmode(); @@ -90,15 +90,15 @@ private slots: void hideSplash(); protected: - virtual void mouseMoveEvent(QMouseEvent *e); - virtual void mousePressEvent(QMouseEvent *e); - virtual void mouseReleaseEvent(QMouseEvent *e); - virtual void paintEvent(QPaintEvent *e); - virtual void closeEvent(QCloseEvent*e); - virtual void wheelEvent(QWheelEvent *e); + virtual void mouseMoveEvent(TQMouseEvent *e); + virtual void mousePressEvent(TQMouseEvent *e); + virtual void mouseReleaseEvent(TQMouseEvent *e); + virtual void paintEvent(TQPaintEvent *e); + virtual void closeEvent(TQCloseEvent*e); + virtual void wheelEvent(TQWheelEvent *e); - virtual void dragEnterEvent(QDragEnterEvent *event); - virtual void dropEvent(QDropEvent *event); + virtual void dragEnterEvent(TQDragEnterEvent *event); + virtual void dropEvent(TQDropEvent *event); public: static KJLoader* kjofol; @@ -108,20 +108,20 @@ private: KWinModule *mWin; WId mDockToWin; int mDockPositionX, mDockPositionY, mDockPosition; - QRect mDockWindowRect; + TQRect mDockWindowRect; // ==== end of docking stuff ==== bool moving; - QPoint mMousePoint; - QPtrList subwidgets; + TQPoint mMousePoint; + TQPtrList subwidgets; KJWidget *mClickedIn; KHelpMenu *mHelpMenu; KJFont *mText, *mNumbers, *mVolumeFont, *mPitchFont; - QLabel *splashScreen; + TQLabel *splashScreen; KJToolTip *mTooltips; - QString mCurrentSkin; - QString mCurrentDefaultSkin; - QString mCurrentDockModeSkin; - QString mCurrentWinshadeModeSkin; + TQString mCurrentSkin; + TQString mCurrentDefaultSkin; + TQString mCurrentDockModeSkin; + TQString mCurrentWinshadeModeSkin; KJPrefs *mPrefs; }; diff --git a/noatun/modules/kjofol-skin/kjprefs.cpp b/noatun/modules/kjofol-skin/kjprefs.cpp index 0cadc5ac..4231d0ff 100644 --- a/noatun/modules/kjofol-skin/kjprefs.cpp +++ b/noatun/modules/kjofol-skin/kjprefs.cpp @@ -14,19 +14,19 @@ #include "parser.h" // system includes -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include @@ -43,19 +43,19 @@ #include #include -static QString expand(QString s); +static TQString expand(TQString s); -KJPrefs::KJPrefs(QObject* parent) +KJPrefs::KJPrefs(TQObject* parent) : CModule(i18n("K-Jöfol Skins"), i18n("Skin Selection For the K-Jöfol Plugin"), "style", parent) { cfg = KGlobal::config(); - QVBoxLayout *vbox = new QVBoxLayout(this); + TQVBoxLayout *vbox = new TQVBoxLayout(this); vbox->setAutoAdd(true); vbox->setSpacing( 0 ); vbox->setMargin( 0 ); - mTabWidget = new QTabWidget( this, "mTabWidget" ); + mTabWidget = new TQTabWidget( this, "mTabWidget" ); mSkinselectorWidget = new KJSkinselector ( mTabWidget, "mSkinselectorWidget" ); mGuiSettingsWidget = new KJGuiSettings ( mTabWidget, "mGuiSettingsWidget" ); @@ -63,9 +63,9 @@ KJPrefs::KJPrefs(QObject* parent) mTabWidget->insertTab( mSkinselectorWidget, i18n("&Skin Selector") ); mTabWidget->insertTab( mGuiSettingsWidget, i18n("O&ther Settings") ); - connect ( mSkinselectorWidget->mSkins, SIGNAL(activated(const QString&)), SLOT(showPreview(const QString&)) ); - connect ( mSkinselectorWidget->installButton, SIGNAL(clicked()), this, SLOT(installNewSkin()) ); - connect ( mSkinselectorWidget->mRemoveButton, SIGNAL(clicked()), this, SLOT(removeSelectedSkin()) ); + connect ( mSkinselectorWidget->mSkins, TQT_SIGNAL(activated(const TQString&)), TQT_SLOT(showPreview(const TQString&)) ); + connect ( mSkinselectorWidget->installButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(installNewSkin()) ); + connect ( mSkinselectorWidget->mRemoveButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(removeSelectedSkin()) ); reopen(); // fill the skinlist and draw a preview } @@ -88,7 +88,7 @@ void KJPrefs::reopen() // reload config and set stuff in dialog mGuiSettingsWidget->useSysFont->setChecked( cfg->readBoolEntry("Use SysFont", false) ); mGuiSettingsWidget->cmbSysFont->setCurrentFont( cfg->readEntry("SysFont Family", KGlobalSettings::generalFont().family()) ); - QColor tmpColor = QColor(255,255,255); + TQColor tmpColor = TQColor(255,255,255); mGuiSettingsWidget->cmbSysFontColor->setColor( cfg->readColorEntry("SysFont Color", &tmpColor)); @@ -127,18 +127,18 @@ void KJPrefs::reopen() // reload config and set stuff in dialog break; } - QStringList skins; - QStringList skinLocations = KGlobal::dirs()->findDirs("data", "noatun/skins/kjofol"); + TQStringList skins; + TQStringList skinLocations = KGlobal::dirs()->findDirs("data", "noatun/skins/kjofol"); // iterate through all paths where Noatun is searching for kjofol-skins for (uint i = 0; i < skinLocations.count(); ++i ) { - QStringList skinDirs = QDir(skinLocations[i]).entryList(); + TQStringList skinDirs = TQDir(skinLocations[i]).entryList(); // iterate trough all dirs (normally, users can fsck every dir-struct *g*) containing a skin for (uint k = 2; k < skinDirs.count(); ++k ) { - QDir skinDirCnt = QDir ( skinLocations[i]+skinDirs[k], "*.rc", QDir::Name|QDir::IgnoreCase, QDir::Files ); + TQDir skinDirCnt = TQDir ( skinLocations[i]+skinDirs[k], "*.rc", TQDir::Name|TQDir::IgnoreCase, TQDir::Files ); // make a list of all .rc-files in a skindir - QStringList rcFiles = skinDirCnt.entryList(); + TQStringList rcFiles = skinDirCnt.entryList(); // iterate trough all those rc.-files in a skindir for (uint j = 0; j < rcFiles.count(); j++ ) { @@ -150,14 +150,14 @@ void KJPrefs::reopen() // reload config and set stuff in dialog skins.sort(); - QString loaded = cfg->readEntry("SkinResource", locate("data", "noatun/skins/kjofol/kjofol/kjofol.rc") ); + TQString loaded = cfg->readEntry("SkinResource", locate("data", "noatun/skins/kjofol/kjofol/kjofol.rc") ); loaded = loaded.mid(loaded.findRev("/")+1); // remove path loaded = loaded.left( loaded.length() - 3 ); // remove ".rc" mSkinselectorWidget->mSkins->clear(); int index = 0; - for (QStringList::Iterator i=skins.begin(); i!=skins.end(); ++i) + for (TQStringList::Iterator i=skins.begin(); i!=skins.end(); ++i) { *i = (*i).left( (*i).length() - 3 ); mSkinselectorWidget->mSkins->insertItem(*i); @@ -174,7 +174,7 @@ void KJPrefs::reopen() // reload config and set stuff in dialog void KJPrefs::save() { // kdDebug(66666) << k_funcinfo << "called." << endl; - QString skin=::expand ( mSkinselectorWidget->mSkins->currentText() ); + TQString skin=::expand ( mSkinselectorWidget->mSkins->currentText() ); // first load skin and then save config to prevent // reloading a broken skin after a crash @@ -206,7 +206,7 @@ void KJPrefs::save() emit configChanged(); } -QString KJPrefs::skin( void ) const +TQString KJPrefs::skin( void ) const { // return full path to currently loaded skin return ::expand( mSkinselectorWidget->mSkins->currentText() ); @@ -312,24 +312,24 @@ void KJPrefs::setUseSysFont( bool mode ) save(); // not sure if that's a good idea or doing saving by hand in here } -QFont KJPrefs::sysFont(void) const +TQFont KJPrefs::sysFont(void) const { - QString family = mGuiSettingsWidget->cmbSysFont->currentFont(); + TQString family = mGuiSettingsWidget->cmbSysFont->currentFont(); // kdDebug(66666) << k_funcinfo << "family=" << family << endl; - return QFont( family ); + return TQFont( family ); } -void KJPrefs::setSysFont(QFont &fnt) +void KJPrefs::setSysFont(TQFont &fnt) { mGuiSettingsWidget->cmbSysFont->setCurrentFont( fnt.family() ); } -QColor KJPrefs::sysFontColor(void) const +TQColor KJPrefs::sysFontColor(void) const { return mGuiSettingsWidget->cmbSysFontColor->color(); } -void KJPrefs::sysFontColor(QColor &c) +void KJPrefs::sysFontColor(TQColor &c) { mGuiSettingsWidget->cmbSysFontColor->setColor( c ); } @@ -345,19 +345,19 @@ bool KJPrefs::displaySplash( void ) const } -void KJPrefs::showPreview(const QString &_skin) +void KJPrefs::showPreview(const TQString &_skin) { Parser p; p.open( ::expand(_skin) ); - QImage image = p.image(p["BackgroundImage"][1]); + TQImage image = p.image(p["BackgroundImage"][1]); if (!image.isNull()) { mPixmap.convertFromImage(image); mPixmap.setMask( KJWidget::getMask(image) ); } else - mPixmap=QPixmap(); + mPixmap=TQPixmap(); mSkinselectorWidget->mPreview->setPixmap(mPixmap); mSkinselectorWidget->mAboutText->setText(p.about()); @@ -406,7 +406,7 @@ void KJPrefs::installNewSkin( void ) // create a dir with name of the skinarchive // path to unpack to: pathToTmp/filename.ext/ - QString tmpUnpackPath = locateLocal("tmp", srcFile.fileName()+"/" ); + TQString tmpUnpackPath = locateLocal("tmp", srcFile.fileName()+"/" ); kdDebug(66666) << "tmpUnpackPath: " << tmpUnpackPath.latin1() << endl; // Our extract-process, TODO: wanna have kio_(un)zip instead :) @@ -429,10 +429,10 @@ void KJPrefs::installNewSkin( void ) return; } - QDir tmpCnt = QDir ( tmpUnpackPath ); - tmpCnt.setFilter ( QDir::Dirs ); + TQDir tmpCnt = TQDir ( tmpUnpackPath ); + tmpCnt.setFilter ( TQDir::Dirs ); - QStringList dirList = tmpCnt.entryList(); + TQStringList dirList = tmpCnt.entryList(); // Iterate trough all subdirs of tmpUnpackPath (including "."!) for ( unsigned int i = 0; i < dirList.count(); i++ ) { @@ -440,8 +440,8 @@ void KJPrefs::installNewSkin( void ) if ( dirList[i] == ".." ) continue; - QDir tmpSubCnt = QDir( tmpUnpackPath + dirList[i], "*.rc;*.RC;*.Rc;*.rC", QDir::Name|QDir::IgnoreCase, QDir::Files ); - kdDebug(66666) << "Searching for *.rc in " << QString(tmpUnpackPath+dirList[i]).latin1() << endl; + TQDir tmpSubCnt = TQDir( tmpUnpackPath + dirList[i], "*.rc;*.RC;*.Rc;*.rC", TQDir::Name|TQDir::IgnoreCase, TQDir::Files ); + kdDebug(66666) << "Searching for *.rc in " << TQString(tmpUnpackPath+dirList[i]).latin1() << endl; // oh, no .rc file in current dir, let's go to next dir in list if ( tmpSubCnt.count() == 0 ) @@ -488,7 +488,7 @@ void KJPrefs::installNewSkin( void ) kdDebug(66666) << "src: " << src.path().latin1() << endl; kdDebug(66666) << "dst: " << dst.path().latin1() << endl; KIO::Job *job = KIO::copy(src,dst); - connect ( job, SIGNAL(result(KIO::Job*)), this, SLOT(slotResult(KIO::Job*)) ); + connect ( job, TQT_SIGNAL(result(KIO::Job*)), this, TQT_SLOT(slotResult(KIO::Job*)) ); skinInstalled = true; } } // END iterate trough dirList @@ -508,43 +508,43 @@ void KJPrefs::installNewSkin( void ) void KJPrefs::removeSelectedSkin( void ) { - QString question = i18n("Are you sure you want to remove %1?\n" + TQString question = i18n("Are you sure you want to remove %1?\n" "This will delete the files installed by this skin "). arg ( mSkinselectorWidget->mSkins->currentText() ); cfg->setGroup("KJofol-Skins"); - QString loadedSkin = cfg->readEntry("SkinResource", "kjofol"); -// kdDebug(66666) << "loaded Skin Name: " << QFileInfo(loadedSkin).baseName().latin1() << endl; + TQString loadedSkin = cfg->readEntry("SkinResource", "kjofol"); +// kdDebug(66666) << "loaded Skin Name: " << TQFileInfo(loadedSkin).baseName().latin1() << endl; int r = KMessageBox::warningContinueCancel ( this, question, i18n("Confirmation"), KStdGuiItem::del() ); if ( r != KMessageBox::Continue ) return; - bool deletingCurrentSkin = ( mSkinselectorWidget->mSkins->currentText() == QFileInfo(loadedSkin).baseName() ); + bool deletingCurrentSkin = ( mSkinselectorWidget->mSkins->currentText() == TQFileInfo(loadedSkin).baseName() ); // Now find the dir to delete !!! - QString dirToDelete = QString (""); - QStringList skinLocations = KGlobal::dirs()->findDirs("data", "noatun/skins/kjofol"); + TQString dirToDelete = TQString (""); + TQStringList skinLocations = KGlobal::dirs()->findDirs("data", "noatun/skins/kjofol"); // iterate through all paths where Noatun is searching for kjofol-skins for (uint i = 0; i < skinLocations.count(); ++i ) { - QStringList skinDirs = QDir(skinLocations[i]).entryList(); + TQStringList skinDirs = TQDir(skinLocations[i]).entryList(); // iterate trough all dirs containing a skin for (uint k = 0; k < skinDirs.count(); ++k ) { - QDir skinDirCnt = QDir ( skinLocations[i]+skinDirs[k], "*.rc", QDir::Name|QDir::IgnoreCase, QDir::Files ); + TQDir skinDirCnt = TQDir ( skinLocations[i]+skinDirs[k], "*.rc", TQDir::Name|TQDir::IgnoreCase, TQDir::Files ); // make a list of all .rc-files in a skindir - QStringList rcFiles = skinDirCnt.entryList(); + TQStringList rcFiles = skinDirCnt.entryList(); // iterate trough all those rc.-files in a skindir for (uint j = 0; j < rcFiles.count(); j++ ) { if ( rcFiles[j].left(rcFiles[j].length()-3) == mSkinselectorWidget->mSkins->currentText() ) // found skinname.rc :) { - dirToDelete = QString ( skinLocations[i]+skinDirs[k] ); + dirToDelete = TQString ( skinLocations[i]+skinDirs[k] ); kdDebug(66666) << "FOUND SKIN @ " << dirToDelete.latin1() << endl; } } @@ -555,7 +555,7 @@ void KJPrefs::removeSelectedSkin( void ) { kdDebug(66666) << "Deleting Skindir: " << dirToDelete.latin1() << endl; KIO::Job *job = KIO::del( dirToDelete, false, true ); - connect ( job, SIGNAL(result(KIO::Job*)), this, SLOT(slotResult(KIO::Job*)) ); + connect ( job, TQT_SIGNAL(result(KIO::Job*)), this, TQT_SLOT(slotResult(KIO::Job*)) ); } int item = -1; @@ -597,51 +597,51 @@ void KJPrefs::slotResult(KIO::Job *job ) // takes name of rc-file without .rc at the end and returns full path to rc-file -static QString expand(QString s) +static TQString expand(TQString s) { // kdDebug(66666) << "expand( "<< s.latin1() << " )" << endl; - QStringList skinLocations = KGlobal::dirs()->findDirs("data", "noatun/skins/kjofol"); + TQStringList skinLocations = KGlobal::dirs()->findDirs("data", "noatun/skins/kjofol"); // iterate through all paths where Noatun is searching for kjofol-skins for (uint i = 0; i < skinLocations.count(); ++i ) { - QStringList skinDirs = QDir(skinLocations[i]).entryList(); + TQStringList skinDirs = TQDir(skinLocations[i]).entryList(); // iterate trough all dirs containing a skin for (uint k = 0; k < skinDirs.count(); ++k ) { - QDir skinDirCnt = QDir ( skinLocations[i]+skinDirs[k], "*.rc", QDir::Name|QDir::IgnoreCase, QDir::Files ); + TQDir skinDirCnt = TQDir ( skinLocations[i]+skinDirs[k], "*.rc", TQDir::Name|TQDir::IgnoreCase, TQDir::Files ); // make a list of all .rc-files in a skindir - QStringList rcFiles = skinDirCnt.entryList(); + TQStringList rcFiles = skinDirCnt.entryList(); // iterate trough all those rc.-files in a skindir for (uint j = 0; j < rcFiles.count(); j++ ) { if ( rcFiles[j].left(rcFiles[j].length()-3) == s ) // found $s.rc :) { -// kdDebug(66666) << "expand() found: " << QString(skinLocations[i]+skinDirs[k]+"/"+rcFiles[j]).latin1() << endl; +// kdDebug(66666) << "expand() found: " << TQString(skinLocations[i]+skinDirs[k]+"/"+rcFiles[j]).latin1() << endl; return (skinLocations[i]+skinDirs[k]+"/"+rcFiles[j]); } } } } - return QString(); + return TQString(); } -QString filenameNoCase(const QString &filename, int badNodes) +TQString filenameNoCase(const TQString &filename, int badNodes) { - QStringList names=QStringList::split('/', filename); - QString full; + TQStringList names=TQStringList::split('/', filename); + TQString full; int number=(int)names.count(); - for (QStringList::Iterator i=names.begin(); i!=names.end(); ++i) + for (TQStringList::Iterator i=names.begin(); i!=names.end(); ++i) { full+="/"; if (number<=badNodes) { - QDir d(full); - QStringList files=d.entryList(); - files=files.grep(QRegExp("^"+ (*i) + "$", false)); + TQDir d(full); + TQStringList files=d.entryList(); + files=files.grep(TQRegExp("^"+ (*i) + "$", false)); if (!files.count()) return ""; *i=files.grep(*i, false)[0]; diff --git a/noatun/modules/kjofol-skin/kjprefs.h b/noatun/modules/kjofol-skin/kjprefs.h index ce1725d5..fcd6dc98 100644 --- a/noatun/modules/kjofol-skin/kjprefs.h +++ b/noatun/modules/kjofol-skin/kjprefs.h @@ -6,7 +6,7 @@ #include "kjguisettingswidget.h" // system includes -#include +#include #include #include @@ -26,7 +26,7 @@ class KJPrefs : public CModule { Q_OBJECT public: - KJPrefs(QObject* parent); + KJPrefs(TQObject* parent); // Save which Skin is currently selected virtual void save(); @@ -34,7 +34,7 @@ public: // Rebuild the Skinlist virtual void reopen(); - QString skin( void ) const; + TQString skin( void ) const; int minimumPitch( void ) const; int maximumPitch( void ) const; @@ -50,11 +50,11 @@ public: bool useSysFont( void ) const; void setUseSysFont( bool ); - QFont sysFont(void) const; - void setSysFont(QFont&); + TQFont sysFont(void) const; + void setSysFont(TQFont&); - QColor sysFontColor(void) const; - void sysFontColor(QColor &); + TQColor sysFontColor(void) const; + void sysFontColor(TQColor &); bool displayTooltips( void ) const; bool displaySplash( void ) const; @@ -67,7 +67,7 @@ public slots: void removeSelectedSkin ( void ); // Show a preview of "skin" in mPixmap - void showPreview(const QString &skin); + void showPreview(const TQString &skin); // gets called after a KIO-action has finished // KIO is used for installing/removing skins @@ -77,11 +77,11 @@ signals: void configChanged(); private: - QPixmap mPixmap; // preview Pixmap + TQPixmap mPixmap; // preview Pixmap KConfig *cfg; // Dialog-Widgets - QTabWidget *mTabWidget; + TQTabWidget *mTabWidget; KJSkinselector *mSkinselectorWidget; KJGuiSettings *mGuiSettingsWidget; }; @@ -91,6 +91,6 @@ private: * badNodes is the amount of directories/files (at the end) * that aren't known) **/ -QString filenameNoCase(const QString &filename, int badNodes=1); +TQString filenameNoCase(const TQString &filename, int badNodes=1); #endif // KJPREFS_H diff --git a/noatun/modules/kjofol-skin/kjseeker.cpp b/noatun/modules/kjofol-skin/kjseeker.cpp index 41e4db13..b9b441b1 100644 --- a/noatun/modules/kjofol-skin/kjseeker.cpp +++ b/noatun/modules/kjofol-skin/kjseeker.cpp @@ -15,9 +15,9 @@ #include -KJSeeker::KJSeeker(const QStringList &i, KJLoader *l) : KJWidget(l), g(0) +KJSeeker::KJSeeker(const TQStringList &i, KJLoader *l) : KJWidget(l), g(0) { - QString activeBg = backgroundPressed("bmp1"); + TQString activeBg = backgroundPressed("bmp1"); if(activeBg.isEmpty()) { kdDebug(66666) << k_funcinfo << "No pressed background found for seeker," << @@ -28,7 +28,7 @@ KJSeeker::KJSeeker(const QStringList &i, KJLoader *l) : KJWidget(l), g(0) mActive = parent()->image(activeBg); mScale = parent()->image(parser()["seekimage"][1]); - QImage pixmapNoPress = parent()->image(parser()["backgroundimage"][1]); + TQImage pixmapNoPress = parent()->image(parser()["backgroundimage"][1]); // generate transparent mask int x, y, xs, ys; @@ -37,7 +37,7 @@ KJSeeker::KJSeeker(const QStringList &i, KJLoader *l) : KJWidget(l), g(0) xs=i[3].toInt()-x; ys=i[4].toInt()-y; setRect(x,y,xs,ys); - QImage transmask(xs, ys, 1, 2, QImage::LittleEndian); + 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)); @@ -47,8 +47,8 @@ KJSeeker::KJSeeker(const QStringList &i, KJLoader *l) : KJWidget(l), g(0) #endif // clear the pointers - memset(barmodeImages, 0, 256*sizeof(QImage*)); - memset(barmode, 0, 256*sizeof(QPixmap*)); + memset(barmodeImages, 0, 256*sizeof(TQImage*)); + memset(barmode, 0, 256*sizeof(TQPixmap*)); // Now do the pixel føking // kdDebug(66666) << "creating Pixmaps for Seeker" << endl; @@ -76,7 +76,7 @@ KJSeeker::KJSeeker(const QStringList &i, KJLoader *l) : KJWidget(l), g(0) for(int i=0; iscanLine(iy-y); l[ix-x]=inactiveColor; } @@ -84,7 +84,7 @@ KJSeeker::KJSeeker(const QStringList &i, KJLoader *l) : KJWidget(l), g(0) do { if (!barmodeImages[level]) - barmodeImages[level]=new QImage(xs,ys, 32); + barmodeImages[level]=new TQImage(xs,ys, 32); QRgb *l=(QRgb*)barmodeImages[level]->scanLine(iy-y); l[ix-x]=activeColor; } while (level++<255); @@ -93,8 +93,8 @@ KJSeeker::KJSeeker(const QStringList &i, KJLoader *l) : KJWidget(l), g(0) // kdDebug(66666) << "finished creating Pixmaps" << endl; // create the blank one - barmode[0]=new QPixmap(xs, ys); - QPixmap px=parent()->pixmap(parser()["backgroundimage"][1]); + 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; @@ -102,11 +102,11 @@ KJSeeker::KJSeeker(const QStringList &i, KJLoader *l) : KJWidget(l), g(0) // kdDebug(66666) << "END KJSeeker constructor" << endl; } -QPixmap *KJSeeker::toPixmap(int n) +TQPixmap *KJSeeker::toPixmap(int n) { if (!barmodeImages[n]) return barmode[n]; - barmode[n]=new QPixmap( + barmode[n]=new TQPixmap( barmodeImages[n]->width(), barmodeImages[n]->height() ); @@ -129,21 +129,21 @@ KJSeeker::~KJSeeker() } } -void KJSeeker::paint(QPainter *p, const QRect &) +void KJSeeker::paint(TQPainter *p, const TQRect &) { closest(); - QPixmap *pixmap = toPixmap(g); + 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); } -bool KJSeeker::mousePress(const QPoint &pos) +bool KJSeeker::mousePress(const TQPoint &pos) { return (isGray(mScale.pixel(rect().topLeft().x()+pos.x(), rect().topLeft().y()+pos.y()))); } -void KJSeeker::mouseRelease(const QPoint &pos, bool in) +void KJSeeker::mouseRelease(const TQPoint &pos, bool in) { int x = rect().topLeft().x()+pos.x(); int y = rect().topLeft().y()+pos.y(); @@ -185,7 +185,7 @@ void KJSeeker::timeUpdate(int sec) g = sec * 255 / length; //kdDebug(66666) << "sec: " << sec << " len: " << length << " g: " << g << endl; - QPainter p(parent()); + TQPainter p(parent()); paint(&p, rect()); } diff --git a/noatun/modules/kjofol-skin/kjseeker.h b/noatun/modules/kjofol-skin/kjseeker.h index 78fea6fb..048d5127 100644 --- a/noatun/modules/kjofol-skin/kjseeker.h +++ b/noatun/modules/kjofol-skin/kjseeker.h @@ -5,32 +5,32 @@ //#include "kjloader.h" class KJLoader; -#include +#include class KJSeeker : public KJWidget { public: - KJSeeker(const QStringList &i, KJLoader *); + KJSeeker(const TQStringList &i, KJLoader *); ~KJSeeker(); - virtual void paint(QPainter *, const QRect &rect); - virtual bool mousePress(const QPoint &pos); - virtual void mouseRelease(const QPoint &pos, bool); + virtual void paint(TQPainter *, const TQRect &rect); + virtual bool mousePress(const TQPoint &pos); + virtual void mouseRelease(const TQPoint &pos, bool); void timeUpdate(int mille); void closest(); private: - QPixmap *toPixmap(int n); + TQPixmap *toPixmap(int n); private: - QImage mScale; - QImage mActive; - QPixmap *barmode[256]; - QImage *barmodeImages[256]; - QBitmap barModeMask; + TQImage mScale; + TQImage mActive; + TQPixmap *barmode[256]; + TQImage *barmodeImages[256]; + TQBitmap barModeMask; int g; }; diff --git a/noatun/modules/kjofol-skin/kjsliders.cpp b/noatun/modules/kjofol-skin/kjsliders.cpp index 8cadd04f..7b884853 100644 --- a/noatun/modules/kjofol-skin/kjsliders.cpp +++ b/noatun/modules/kjofol-skin/kjsliders.cpp @@ -32,7 +32,7 @@ * KJVolumeBar *******************************************/ -KJVolumeBar::KJVolumeBar(const QStringList &i, KJLoader *p) +KJVolumeBar::KJVolumeBar(const TQStringList &i, KJLoader *p) : KJWidget(p), mVolume(0), mText(0) { int x, y, xs, ys; @@ -48,18 +48,18 @@ KJVolumeBar::KJVolumeBar(const QStringList &i, KJLoader *p) mSlider = parent()->pixmap(parser()["volumecontrolimage"][1]); } -QString KJVolumeBar::tip() +TQString KJVolumeBar::tip() { return i18n("Volume"); } -void KJVolumeBar::paint(QPainter *p, const QRect &) +void KJVolumeBar::paint(TQPainter *p, const TQRect &) { // kdDebug(66666) << "x: " << rect().x() << " y: " << rect().y() << endl; // kdDebug(66666) << "vol x: " << rect().x()+(mVolume*rect().width())/100 << endl; // center of that slider-pixmap -// QPoint hotSpot = QPoint( mSlider.width()/2, mSlider.height()/2 ); +// TQPoint hotSpot = TQPoint( mSlider.width()/2, mSlider.height()/2 ); // draw our background bitBlt( @@ -89,7 +89,7 @@ void KJVolumeBar::paint(QPainter *p, const QRect &) mText->repaint(); } -bool KJVolumeBar::mousePress(const QPoint &pos) +bool KJVolumeBar::mousePress(const TQPoint &pos) { mVolume = (pos.x()*100) / rect().width(); // kdDebug(66666) << "volume: " << mVolume << endl; @@ -98,11 +98,11 @@ bool KJVolumeBar::mousePress(const QPoint &pos) return true; } -void KJVolumeBar::mouseRelease(const QPoint &, bool) +void KJVolumeBar::mouseRelease(const TQPoint &, bool) { } -void KJVolumeBar::mouseMove(const QPoint &pos, bool in) +void KJVolumeBar::mouseMove(const TQPoint &pos, bool in) { if (!in) return; @@ -120,7 +120,7 @@ void KJVolumeBar::timeUpdate(int) * KJVolumeBMP *******************************************/ -KJVolumeBMP::KJVolumeBMP(const QStringList &i, KJLoader *p) +KJVolumeBMP::KJVolumeBMP(const TQStringList &i, KJLoader *p) : KJWidget(p), mVolume(0), mOldVolume(0), mText(0) { int x, y, xs, ys; @@ -138,20 +138,20 @@ KJVolumeBMP::KJVolumeBMP(const QStringList &i, KJLoader *p) timeUpdate(0); } -QString KJVolumeBMP::tip() +TQString KJVolumeBMP::tip() { return i18n("Volume"); } -void KJVolumeBMP::paint(QPainter *p, const QRect &) +void KJVolumeBMP::paint(TQPainter *p, const TQRect &) { - QRect from(mVolume*mCount/100*mWidth, 0, mWidth, mImages.height()); + TQRect from(mVolume*mCount/100*mWidth, 0, mWidth, mImages.height()); bitBlt(p->device(), rect().topLeft(), &mImages, from, Qt::CopyROP); if (mText) mText->repaint(); } -bool KJVolumeBMP::mousePress(const QPoint &pos) +bool KJVolumeBMP::mousePress(const TQPoint &pos) { QRgb color = mPos.pixel ( rect().topLeft().x()+pos.x(), rect().topLeft().y()+pos.y() ); @@ -169,10 +169,10 @@ bool KJVolumeBMP::mousePress(const QPoint &pos) return true; } -void KJVolumeBMP::mouseRelease(const QPoint &, bool) +void KJVolumeBMP::mouseRelease(const TQPoint &, bool) {} -void KJVolumeBMP::mouseMove(const QPoint &pos, bool in) +void KJVolumeBMP::mouseMove(const TQPoint &pos, bool in) { if (!in) return; mousePress(pos); @@ -195,7 +195,7 @@ void KJVolumeBMP::timeUpdate(int) * KJPitchBMP *******************************************/ -KJPitchBMP::KJPitchBMP(const QStringList &i, KJLoader *p) +KJPitchBMP::KJPitchBMP(const TQStringList &i, KJLoader *p) : KJWidget(p), mText(0) { int x = i[1].toInt(); @@ -212,7 +212,7 @@ KJPitchBMP::KJPitchBMP(const QStringList &i, KJLoader *p) mPos = parent()->image(parser()["pitchcontrolimageposition"][1]); // makes all pixels with rgb(255,0,255) transparent - QImage ibackground; + TQImage ibackground; ibackground = parent()->image(parser()["pitchcontrolimage"][1]); mImages.setMask( getMask(ibackground) ); @@ -239,16 +239,16 @@ KJPitchBMP::KJPitchBMP(const QStringList &i, KJLoader *p) mText->repaint(); } -QString KJPitchBMP::tip() +TQString KJPitchBMP::tip() { return i18n("Pitch"); } -void KJPitchBMP::paint(QPainter *p, const QRect &) +void KJPitchBMP::paint(TQPainter *p, const TQRect &) { float xPos = (int)((mCurrentPitch-mMinPitch)*100.0) * mCount / (int)((mMaxPitch-mMinPitch)*100.0) * mWidth; - QRect from( (int)xPos, 0, mWidth, mImages.height()); + TQRect from( (int)xPos, 0, mWidth, mImages.height()); bitBlt(p->device(), rect().topLeft(), &mImages, from, Qt::CopyROP); @@ -256,7 +256,7 @@ void KJPitchBMP::paint(QPainter *p, const QRect &) mText->repaint(); } -bool KJPitchBMP::mousePress(const QPoint &pos) +bool KJPitchBMP::mousePress(const TQPoint &pos) { QRgb color = mPos.pixel ( rect().topLeft().x()+pos.x(), rect().topLeft().y()+pos.y() ); @@ -273,10 +273,10 @@ bool KJPitchBMP::mousePress(const QPoint &pos) return true; } -void KJPitchBMP::mouseRelease(const QPoint &, bool) +void KJPitchBMP::mouseRelease(const TQPoint &, bool) {} -void KJPitchBMP::mouseMove(const QPoint &pos, bool in) +void KJPitchBMP::mouseMove(const TQPoint &pos, bool in) { if (!in) return; mousePress(pos); diff --git a/noatun/modules/kjofol-skin/kjsliders.h b/noatun/modules/kjofol-skin/kjsliders.h index 94f10934..bd3c3324 100644 --- a/noatun/modules/kjofol-skin/kjsliders.h +++ b/noatun/modules/kjofol-skin/kjsliders.h @@ -2,7 +2,7 @@ #define KJSLIDERS_H #include "kjwidget.h" -#include +#include class KJLoader; class KJPitchText; @@ -12,21 +12,21 @@ class KJVolumeText; class KJVolumeBMP : public KJWidget { public: - KJVolumeBMP(const QStringList &, KJLoader *parent); + KJVolumeBMP(const TQStringList &, KJLoader *parent); - virtual void paint(QPainter *, const QRect &rect); - virtual bool mousePress(const QPoint &pos); - virtual void mouseRelease(const QPoint &pos, bool); + virtual void paint(TQPainter *, const TQRect &rect); + virtual bool mousePress(const TQPoint &pos); + virtual void mouseRelease(const TQPoint &pos, bool); virtual void timeUpdate(int); - virtual void mouseMove(const QPoint &pos, bool); + virtual void mouseMove(const TQPoint &pos, bool); - virtual QString tip(); + virtual TQString tip(); void setText(KJVolumeText *t) { mText=t; } private: - QPixmap mImages; - QImage mPos; + TQPixmap mImages; + TQImage mPos; int mVolume, mOldVolume; int mWidth, mCount; KJVolumeText *mText; @@ -36,21 +36,21 @@ private: class KJVolumeBar : public KJWidget { public: - KJVolumeBar(const QStringList &, KJLoader *parent); + KJVolumeBar(const TQStringList &, KJLoader *parent); - virtual void paint(QPainter *, const QRect &rect); - virtual bool mousePress(const QPoint &pos); - virtual void mouseRelease(const QPoint &pos, bool); + virtual void paint(TQPainter *, const TQRect &rect); + virtual bool mousePress(const TQPoint &pos); + virtual void mouseRelease(const TQPoint &pos, bool); virtual void timeUpdate(int); - virtual void mouseMove(const QPoint &pos, bool); + virtual void mouseMove(const TQPoint &pos, bool); - virtual QString tip(); + virtual TQString tip(); void setText(KJVolumeText *t) { mText=t; } private: - QPixmap mSlider; - QPixmap mBack; + TQPixmap mSlider; + TQPixmap mBack; int mVolume; KJVolumeText *mText; }; @@ -59,23 +59,23 @@ private: class KJPitchBMP : public KJWidget { public: - KJPitchBMP(const QStringList &, KJLoader *parent); + KJPitchBMP(const TQStringList &, KJLoader *parent); - virtual void paint(QPainter *, const QRect &rect); - virtual bool mousePress(const QPoint &pos); - virtual void mouseRelease(const QPoint &pos, bool); + virtual void paint(TQPainter *, const TQRect &rect); + virtual bool mousePress(const TQPoint &pos); + virtual void mouseRelease(const TQPoint &pos, bool); virtual void timeUpdate(int); virtual void newFile(); - virtual void mouseMove(const QPoint &pos, bool); + virtual void mouseMove(const TQPoint &pos, bool); virtual void readConfig(); - virtual QString tip(); + virtual TQString tip(); void setText(KJPitchText *t) { mText=t; } private: - QPixmap mImages; - QImage mPos; + TQPixmap mImages; + TQImage mPos; int mWidth, mCount; float mCurrentPitch; float mOldPitch; diff --git a/noatun/modules/kjofol-skin/kjtextdisplay.cpp b/noatun/modules/kjofol-skin/kjtextdisplay.cpp index 89f92526..c1a17139 100644 --- a/noatun/modules/kjofol-skin/kjtextdisplay.cpp +++ b/noatun/modules/kjofol-skin/kjtextdisplay.cpp @@ -35,8 +35,8 @@ * KJFilename *******************************************/ -KJFilename::KJFilename(const QStringList &l, KJLoader *p) - : QObject(0), KJWidget(p), mBack(0) +KJFilename::KJFilename(const TQStringList &l, KJLoader *p) + : TQObject(0), KJWidget(p), mBack(0) { int x = l[1].toInt(); int y = l[2].toInt(); @@ -50,8 +50,8 @@ KJFilename::KJFilename(const QStringList &l, KJLoader *p) ys = textFont().fontHeight(); // background under filename-scroller - QPixmap tmp = p->pixmap(p->item("backgroundimage")[1]); - mBack = new KPixmap ( QSize(xs,ys) ); + 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 ); setRect(x,y,xs,ys); @@ -72,9 +72,9 @@ KJFilename::~KJFilename() delete mBack; } -void KJFilename::paint(QPainter *p, const QRect &) +void KJFilename::paint(TQPainter *p, const TQRect &) { - QPixmap temp ( rect().width(), rect().height() ); + TQPixmap temp ( rect().width(), rect().height() ); // draw background into buffer bitBlt ( &temp, 0, 0, mBack, 0, 0, -1, -1, Qt::CopyROP ); @@ -82,17 +82,17 @@ void KJFilename::paint(QPainter *p, const QRect &) bitBlt( &temp, 0, 0, &mView, 0, 0, rect().width(), rect().height(), Qt::CopyROP); // and draw it on screen bitBlt(p->device(), rect().topLeft(), &temp, - QRect(0,0,-1,-1), Qt::CopyROP); + TQRect(0,0,-1,-1), Qt::CopyROP); } -void KJFilename::timerEvent(QTimerEvent *) +void KJFilename::timerEvent(TQTimerEvent *) { int height = mView.height(); int width = mView.width(); - QBitmap cycleMask ( mDistance, height ); // temporary-space for moving parts of the mask - QPixmap cycle ( mDistance, height ); // temporary-space for moving parts of the pixmap - QBitmap newMask ( *mView.mask() ); // save old mask + TQBitmap cycleMask ( mDistance, height ); // temporary-space for moving parts of the mask + TQPixmap cycle ( mDistance, height ); // temporary-space for moving parts of the pixmap + TQBitmap newMask ( *mView.mask() ); // save old mask // 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 @@ -111,12 +111,12 @@ void KJFilename::timerEvent(QTimerEvent *) repaint(); } -bool KJFilename::mousePress(const QPoint &) +bool KJFilename::mousePress(const TQPoint &) { return true; } -void KJFilename::mouseRelease(const QPoint &, bool in) +void KJFilename::mouseRelease(const TQPoint &, bool in) { if (!in) // only do something if users is still inside the button return; @@ -145,7 +145,7 @@ void KJFilename::readConfig() mLastTitle=""; // invalidate title so it gets repainted on next timeUpdate() } -void KJFilename::prepareString(const QCString &str) +void KJFilename::prepareString(const TQCString &str) { killTimers(); // i.e. stop timers @@ -159,19 +159,19 @@ void KJFilename::timeUpdate(int) if ( !napp->player()->current() ) // just for safety return; - QCString title = QCString( napp->player()->current().title().local8Bit() ); + TQCString title = TQCString( napp->player()->current().title().local8Bit() ); if ( title == mLastTitle ) return; mLastTitle = title; - QCString timestring = napp->player()->lengthString().local8Bit(); + TQCString timestring = napp->player()->lengthString().local8Bit(); timestring = timestring.mid(timestring.find('/')+1); prepareString ( title + " (" + timestring + ") "); } -QString KJFilename::tip() +TQString KJFilename::tip() { if ( !napp->player()->current() ) // just for safety return i18n("Filename"); @@ -184,7 +184,7 @@ QString KJFilename::tip() * KJTime *******************************************/ -KJTime::KJTime(const QStringList &l, KJLoader *p) +KJTime::KJTime(const TQStringList &l, KJLoader *p) : KJWidget(p), mBack(0) { int x = l[1].toInt(); @@ -204,8 +204,8 @@ KJTime::KJTime(const QStringList &l, KJLoader *p) xs = maxNeededWidth; // background under time-display - QPixmap tmp = p->pixmap(p->item("backgroundimage")[1]); - mBack = new KPixmap ( QSize(xs,ys) ); + 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 ); setRect(x,y,xs,ys); @@ -220,10 +220,10 @@ KJTime::~KJTime() delete mBack; } -void KJTime::paint(QPainter *p, const QRect &) +void KJTime::paint(TQPainter *p, const TQRect &) { -// kdDebug(66666) << "KJTime::paint(QPainter *p, const QRect &)" << endl; - QPixmap temp ( rect().width(), rect().height() ); +// kdDebug(66666) << "KJTime::paint(TQPainter *p, const TQRect &)" << endl; + TQPixmap temp ( rect().width(), rect().height() ); // draw background into buffer bitBlt ( &temp, 0, 0, mBack, 0, 0, -1, -1, Qt::CopyROP ); @@ -232,15 +232,15 @@ void KJTime::paint(QPainter *p, const QRect &) // and draw it on screen bitBlt(p->device(), rect().topLeft(), &temp, - QRect(0,0, rect().width(), rect().height()), Qt::CopyROP); + TQRect(0,0, rect().width(), rect().height()), Qt::CopyROP); } -bool KJTime::mousePress(const QPoint &) +bool KJTime::mousePress(const TQPoint &) { return true; } -void KJTime::mouseRelease(const QPoint &, bool in) +void KJTime::mouseRelease(const TQPoint &, bool in) { if (!in) // only do something if users is still inside the button return; @@ -258,10 +258,10 @@ void KJTime::readConfig() mLastTime=""; // invalidate time so it gets repainted on next timeUpdate() } -QString KJTime::lengthString ( void ) +TQString KJTime::lengthString ( void ) { int pos = 0; - QString posString; + TQString posString; int secs = 0, seconds = 0, minutes = 0, @@ -316,9 +316,9 @@ void KJTime::timeUpdate(int) // kdDebug(66666) << "END KJTime::timeUpdate(int)" << endl; } -void KJTime::prepareString(const QCString &str) +void KJTime::prepareString(const TQCString &str) { -// kdDebug(66666) << "START KJTime::prepareString(const QCString &str)" << endl; +// kdDebug(66666) << "START KJTime::prepareString(const TQCString &str)" << endl; if ( str == mLastTime ) return; @@ -326,10 +326,10 @@ void KJTime::prepareString(const QCString &str) mTime = timeFont().draw(str, rect().width()); repaint(); -// kdDebug(66666) << "END KJTime::prepareString(const QCString &str)" << endl; +// kdDebug(66666) << "END KJTime::prepareString(const TQCString &str)" << endl; } -QString KJTime::tip() +TQString KJTime::tip() { if ( countDown ) return i18n("Play time left"); @@ -342,7 +342,7 @@ QString KJTime::tip() * KJVolumeText *******************************************/ -KJVolumeText::KJVolumeText(const QStringList &l, KJLoader *p) +KJVolumeText::KJVolumeText(const TQStringList &l, KJLoader *p) : KJWidget(p), mBack(0) { int x=l[1].toInt(); @@ -362,8 +362,8 @@ KJVolumeText::KJVolumeText(const QStringList &l, KJLoader *p) xs = tempWidth; // background under volumetext-display - QPixmap tmp = p->pixmap(p->item("backgroundimage")[1]); - mBack = new KPixmap ( QSize(xs,ys) ); + 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 ); setRect(x,y,xs,ys); @@ -376,9 +376,9 @@ KJVolumeText::~KJVolumeText() delete mBack; } -void KJVolumeText::paint(QPainter *p, const QRect &) +void KJVolumeText::paint(TQPainter *p, const TQRect &) { - QPixmap temp ( rect().width(), rect().height() ); + TQPixmap temp ( rect().width(), rect().height() ); // draw background into buffer bitBlt ( &temp, 0, 0, mBack, 0, 0, -1, -1, Qt::CopyROP ); @@ -387,10 +387,10 @@ void KJVolumeText::paint(QPainter *p, const QRect &) // and draw it on screen bitBlt(p->device(), rect().topLeft(), &temp, - QRect(0,0,-1,-1), Qt::CopyROP); + TQRect(0,0,-1,-1), Qt::CopyROP); } -bool KJVolumeText::mousePress(const QPoint &) +bool KJVolumeText::mousePress(const TQPoint &) { return false; } @@ -403,7 +403,7 @@ void KJVolumeText::readConfig() void KJVolumeText::timeUpdate(int) { - QCString volume; + TQCString volume; if (!napp->player()->current()) return; @@ -413,7 +413,7 @@ void KJVolumeText::timeUpdate(int) prepareString(volume); } -void KJVolumeText::prepareString(const QCString &str) +void KJVolumeText::prepareString(const TQCString &str) { if ( str == mLastVolume ) return; @@ -424,7 +424,7 @@ void KJVolumeText::prepareString(const QCString &str) repaint(); } -QString KJVolumeText::tip() +TQString KJVolumeText::tip() { return i18n("Volume"); } @@ -434,7 +434,7 @@ QString KJVolumeText::tip() * KJPitchText *******************************************/ -KJPitchText::KJPitchText(const QStringList &l, KJLoader *p) +KJPitchText::KJPitchText(const TQStringList &l, KJLoader *p) : KJWidget(p), mBack(0) { int x = l[1].toInt(); @@ -452,8 +452,8 @@ KJPitchText::KJPitchText(const QStringList &l, KJLoader *p) xs = tempWidth; // background under time-display - QPixmap tmp = p->pixmap(p->item("backgroundimage")[1]); - mBack = new KPixmap ( QSize(xs,ys) ); + 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 ); setRect(x,y,xs,ys); @@ -467,24 +467,24 @@ KJPitchText::~KJPitchText() } -void KJPitchText::paint(QPainter *p, const QRect &) +void KJPitchText::paint(TQPainter *p, const TQRect &) { - QPixmap temp ( rect().width(), rect().height() ); + 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 bitBlt( &temp, 0, 0, &mSpeed, 0, 0, rect().width(), rect().height(), Qt::CopyROP); // and draw it on screen - bitBlt(p->device(), rect().topLeft(), &temp, QRect(0,0,-1,-1), Qt::CopyROP); + bitBlt(p->device(), rect().topLeft(), &temp, TQRect(0,0,-1,-1), Qt::CopyROP); } -bool KJPitchText::mousePress(const QPoint &) +bool KJPitchText::mousePress(const TQPoint &) { return true; } -void KJPitchText::mouseRelease(const QPoint &, bool in) +void KJPitchText::mouseRelease(const TQPoint &, bool in) { if (!in) return; @@ -506,7 +506,7 @@ void KJPitchText::readConfig() void KJPitchText::timeUpdate(int) { - QCString speed; + TQCString speed; if (!napp->player()->current()) return; @@ -521,7 +521,7 @@ void KJPitchText::timeUpdate(int) prepareString ( speed ); } -void KJPitchText::prepareString(const QCString &str) +void KJPitchText::prepareString(const TQCString &str) { if ( str == mLastPitch ) return; @@ -532,7 +532,7 @@ void KJPitchText::prepareString(const QCString &str) repaint(); } -QString KJPitchText::tip() +TQString KJPitchText::tip() { return i18n("Pitch"); } @@ -542,7 +542,7 @@ QString KJPitchText::tip() * KJFileInfo *******************************************/ -KJFileInfo::KJFileInfo(const QStringList &l, KJLoader *p) +KJFileInfo::KJFileInfo(const TQStringList &l, KJLoader *p) : KJWidget(p), mBack(0) { mInfoType = l[0]; // type of info-display @@ -564,8 +564,8 @@ KJFileInfo::KJFileInfo(const QStringList &l, KJLoader *p) xs = maxNeededWidth; // background under info-display - QPixmap tmp = p->pixmap(p->item("backgroundimage")[1]); - mBack = new KPixmap ( QSize(xs,ys) ); + 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 ); setRect(x,y,xs,ys); @@ -578,9 +578,9 @@ KJFileInfo::~KJFileInfo() delete mBack; } -void KJFileInfo::paint(QPainter *p, const QRect &) +void KJFileInfo::paint(TQPainter *p, const TQRect &) { - QPixmap temp ( rect().width(), rect().height() ); + TQPixmap temp ( rect().width(), rect().height() ); // draw background into buffer bitBlt ( &temp, 0, 0, mBack, 0, 0, -1, -1, Qt::CopyROP ); @@ -589,10 +589,10 @@ void KJFileInfo::paint(QPainter *p, const QRect &) // and draw it on screen bitBlt(p->device(), rect().topLeft(), &temp, - QRect(0,0, rect().width(), rect().height()), Qt::CopyROP); + TQRect(0,0, rect().width(), rect().height()), Qt::CopyROP); } -bool KJFileInfo::mousePress(const QPoint &) +bool KJFileInfo::mousePress(const TQPoint &) { return false; } @@ -609,7 +609,7 @@ void KJFileInfo::timeUpdate(int) return; const PlaylistItem &item = napp->player()->current(); - QString prop; + TQString prop; if ( mInfoType == "mp3khzwindow" ) { @@ -628,7 +628,7 @@ void KJFileInfo::timeUpdate(int) prepareString( prop.latin1() ); } -void KJFileInfo::prepareString(const QCString &str) +void KJFileInfo::prepareString(const TQCString &str) { if ( str == mLastTime ) return; @@ -637,14 +637,14 @@ void KJFileInfo::prepareString(const QCString &str) repaint(); } -QString KJFileInfo::tip() +TQString KJFileInfo::tip() { if ( mInfoType == "mp3khzwindow" ) return i18n("Sample rate in kHz"); else if ( mInfoType == "mp3kbpswindow" ) return i18n("Bitrate in kbps"); - return QString(); + return TQString(); } #include "kjtextdisplay.moc" diff --git a/noatun/modules/kjofol-skin/kjtextdisplay.h b/noatun/modules/kjofol-skin/kjtextdisplay.h index 11098b0c..893efac0 100644 --- a/noatun/modules/kjofol-skin/kjtextdisplay.h +++ b/noatun/modules/kjofol-skin/kjtextdisplay.h @@ -6,35 +6,35 @@ class KJLoader; class KPixmap; //#include "kjloader.h" -#include -#include +#include +#include -class KJFilename : public QObject, public KJWidget +class KJFilename : public TQObject, public KJWidget { Q_OBJECT public: - KJFilename(const QStringList &, KJLoader *parent); + KJFilename(const TQStringList &, KJLoader *parent); ~KJFilename(); - virtual void paint(QPainter *, const QRect &rect); - virtual bool mousePress(const QPoint &pos); - virtual void mouseRelease(const QPoint &, bool in); + virtual void paint(TQPainter *, const TQRect &rect); + virtual bool mousePress(const TQPoint &pos); + virtual void mouseRelease(const TQPoint &, bool in); // virtual void newFile(); virtual void timeUpdate(int); virtual void readConfig(); - void prepareString(const QCString &str); - virtual QString tip(); + void prepareString(const TQCString &str); + virtual TQString tip(); - virtual void timerEvent(QTimerEvent *); + virtual void timerEvent(TQTimerEvent *); private: - QCString mLastTitle; + TQCString mLastTitle; int mDistance; int mTimerUpdates; int mWidth; int mTickerPos; - QPixmap mView; + TQPixmap mView; KPixmap *mBack; }; @@ -42,29 +42,29 @@ private: class KJTime : public KJWidget { public: - KJTime(const QStringList &, KJLoader *parent); + KJTime(const TQStringList &, KJLoader *parent); ~KJTime(); - virtual void paint(QPainter *, const QRect &rect); - virtual bool mousePress(const QPoint &pos); - virtual void mouseRelease(const QPoint &, bool in); + virtual void paint(TQPainter *, const TQRect &rect); + virtual bool mousePress(const TQPoint &pos); + virtual void mouseRelease(const TQPoint &, bool in); virtual void timeUpdate(int); virtual void readConfig(); - void prepareString(const QCString &time); - virtual QString tip(); + void prepareString(const TQCString &time); + virtual TQString tip(); // enum countModes { Up=0, Down }; private: - QCString mLastTime; + TQCString mLastTime; int mWidth; bool countDown; - QPixmap mTime; + TQPixmap mTime; KPixmap *mBack; private: - QString lengthString ( void ); + TQString lengthString ( void ); }; @@ -72,21 +72,21 @@ private: class KJVolumeText : public KJWidget { public: - KJVolumeText(const QStringList &, KJLoader *parent); + KJVolumeText(const TQStringList &, KJLoader *parent); ~KJVolumeText(); - virtual void paint(QPainter *, const QRect &rect); - virtual bool mousePress(const QPoint &pos); + virtual void paint(TQPainter *, const TQRect &rect); + virtual bool mousePress(const TQPoint &pos); virtual void timeUpdate(int); virtual void readConfig(); - void prepareString(const QCString &time); - virtual QString tip(); + void prepareString(const TQCString &time); + virtual TQString tip(); private: - QCString mLastVolume; + TQCString mLastVolume; int mWidth; - QPixmap mVolume; + TQPixmap mVolume; KPixmap *mBack; }; @@ -94,22 +94,22 @@ private: class KJPitchText : public KJWidget { public: - KJPitchText(const QStringList &, KJLoader *parent); + KJPitchText(const TQStringList &, KJLoader *parent); ~KJPitchText(); - virtual void paint(QPainter *, const QRect &rect); - virtual bool mousePress(const QPoint &pos); - virtual void mouseRelease(const QPoint &, bool in); + virtual void paint(TQPainter *, const TQRect &rect); + virtual bool mousePress(const TQPoint &pos); + virtual void mouseRelease(const TQPoint &, bool in); virtual void timeUpdate(int); virtual void readConfig(); - void prepareString(const QCString &time); - virtual QString tip(); + void prepareString(const TQCString &time); + virtual TQString tip(); private: - QCString mLastPitch; + TQCString mLastPitch; int mWidth; - QPixmap mSpeed; + TQPixmap mSpeed; KPixmap *mBack; }; @@ -117,22 +117,22 @@ private: class KJFileInfo : public KJWidget { public: - KJFileInfo(const QStringList &, KJLoader *parent); + KJFileInfo(const TQStringList &, KJLoader *parent); ~KJFileInfo(); - virtual void paint(QPainter *, const QRect &rect); - virtual bool mousePress(const QPoint &pos); + virtual void paint(TQPainter *, const TQRect &rect); + virtual bool mousePress(const TQPoint &pos); virtual void timeUpdate(int); virtual void readConfig(); - void prepareString(const QCString &time); - virtual QString tip(); + void prepareString(const TQCString &time); + virtual TQString tip(); private: - QCString mLastTime; - QString mInfoType; + TQCString mLastTime; + TQString mInfoType; int mWidth; - QPixmap mTime; + TQPixmap mTime; KPixmap *mBack; }; diff --git a/noatun/modules/kjofol-skin/kjvis.cpp b/noatun/modules/kjofol-skin/kjvis.cpp index 71246089..3bd40f00 100644 --- a/noatun/modules/kjofol-skin/kjvis.cpp +++ b/noatun/modules/kjofol-skin/kjvis.cpp @@ -13,8 +13,8 @@ #include //qt includes -#include -#include +#include +#include //kde includes #include @@ -35,7 +35,7 @@ void KJVisScope::swapScope(Visuals newOne) { //kdDebug(66666) << k_funcinfo << endl; - QStringList line = parent()->item("analyzerwindow"); + TQStringList line = parent()->item("analyzerwindow"); KJLoader *p=parent(); p->removeChild(this); delete this; @@ -66,7 +66,7 @@ void KJVisScope::swapScope(Visuals newOne) * KJNullScope *******************************************/ -KJNullScope::KJNullScope(const QStringList &l, KJLoader *parent) +KJNullScope::KJNullScope(const TQStringList &l, KJLoader *parent) : KJVisScope(parent) { int x = l[1].toInt(); @@ -75,25 +75,25 @@ KJNullScope::KJNullScope(const QStringList &l, KJLoader *parent) int ys = l[4].toInt() - y; // background under vis - QPixmap tmp = parent->pixmap(parent->item("backgroundimage")[1]); - mBack = new KPixmap ( QSize(xs,ys) ); + TQPixmap tmp = parent->pixmap(parent->item("backgroundimage")[1]); + mBack = new KPixmap ( TQSize(xs,ys) ); bitBlt( mBack, 0, 0, &tmp, x, y, xs, ys, Qt::CopyROP ); setRect ( x, y, xs, ys ); repaint(); } -void KJNullScope::paint(QPainter *p, const QRect &) +void KJNullScope::paint(TQPainter *p, const TQRect &) { // just redraw the background - bitBlt ( p->device(), rect().topLeft(), mBack, QRect(0,0,-1,-1), Qt::CopyROP ); + bitBlt ( p->device(), rect().topLeft(), mBack, TQRect(0,0,-1,-1), Qt::CopyROP ); } -bool KJNullScope::mousePress(const QPoint &) +bool KJNullScope::mousePress(const TQPoint &) { return true; } -void KJNullScope::mouseRelease(const QPoint &, bool in) +void KJNullScope::mouseRelease(const TQPoint &, bool in) { if (!in) // only do something if users is still inside the button return; @@ -118,7 +118,7 @@ void KJNullScope::readConfig() * KJFFT - Analyzer like visualization, mono *************************************************/ -KJFFT::KJFFT(const QStringList &l, KJLoader *parent) +KJFFT::KJFFT(const TQStringList &l, KJLoader *parent) : KJVisScope(parent), MonoFFTScope(50), mGradient(0) { int x = l[1].toInt(); @@ -131,7 +131,7 @@ KJFFT::KJFFT(const QStringList &l, KJLoader *parent) if ( parent->exist("analyzercolor") ) { - QStringList &col = parser()["analyzercolor"]; + TQStringList &col = parser()["analyzercolor"]; mColor.setRgb ( col[1].toInt(), col[2].toInt(), col[3].toInt() ); } else // TODO: what should be default colors for Vis? @@ -140,15 +140,15 @@ KJFFT::KJFFT(const QStringList &l, KJLoader *parent) } // background under vis - QPixmap tmp = parent->pixmap(parent->item("backgroundimage")[1]); - mBack = new KPixmap ( QSize(xs,ys) ); + TQPixmap tmp = parent->pixmap(parent->item("backgroundimage")[1]); + mBack = new KPixmap ( TQSize(xs,ys) ); bitBlt( mBack, 0, 0, &tmp, x, y, xs, ys, Qt::CopyROP ); - mAnalyzer = new KPixmap ( QSize(xs,ys) ); + mAnalyzer = new KPixmap ( TQSize(xs,ys) ); bitBlt( mAnalyzer, 0, 0, &tmp, x, y, xs, ys, Qt::CopyROP ); // create a gradient for the bars going from 30% lighter to 30% darker than mColor - mGradient = new KPixmap ( QSize(xs,ys) ); + mGradient = new KPixmap ( TQSize(xs,ys) ); KPixmapEffect::gradient ( *mGradient, mColor.light(_KJ_GRADIENT_DIFF), mColor.dark(_KJ_GRADIENT_DIFF), KPixmapEffect::VerticalGradient ); @@ -170,8 +170,8 @@ void KJFFT::scopeEvent(float *d, int size) int x = 0; int h = rect().height(); - QBitmap mGradientMask ( rect().width(), h, true ); - QPainter mask( &mGradientMask ); + TQBitmap mGradientMask ( rect().width(), h, true ); + TQPainter mask( &mGradientMask ); float *start = d ; float *end = d + size /*- 1*/; @@ -206,20 +206,20 @@ void KJFFT::scopeEvent(float *d, int size) repaint(); } -void KJFFT::paint(QPainter *p, const QRect &) +void KJFFT::paint(TQPainter *p, const TQRect &) { // put that thing on screen if ( !napp->player()->isStopped() ) - bitBlt ( p->device(), rect().topLeft(), mAnalyzer, QRect(0,0,-1,-1), Qt::CopyROP ); + bitBlt ( p->device(), rect().topLeft(), mAnalyzer, TQRect(0,0,-1,-1), Qt::CopyROP ); } -bool KJFFT::mousePress(const QPoint &) +bool KJFFT::mousePress(const TQPoint &) { return true; } -void KJFFT::mouseRelease(const QPoint &, bool in) +void KJFFT::mouseRelease(const TQPoint &, bool in) { if (!in) // only do something if users is still inside the button return; @@ -250,7 +250,7 @@ void KJFFT::readConfig() * KJStereoFFT - Analyzer like visualization, stereo *************************************************/ -KJStereoFFT::KJStereoFFT(const QStringList &l, KJLoader *parent) +KJStereoFFT::KJStereoFFT(const TQStringList &l, KJLoader *parent) : KJVisScope(parent), StereoFFTScope(50), mGradient(0) { //kdDebug(66666) << k_funcinfo << endl; @@ -265,7 +265,7 @@ KJStereoFFT::KJStereoFFT(const QStringList &l, KJLoader *parent) if ( parent->exist("analyzercolor") ) { - QStringList &col = parser()["analyzercolor"]; + TQStringList &col = parser()["analyzercolor"]; mColor.setRgb ( col[1].toInt(), col[2].toInt(), col[3].toInt() ); } else // TODO: what should be default colors for Vis? @@ -274,15 +274,15 @@ KJStereoFFT::KJStereoFFT(const QStringList &l, KJLoader *parent) } // background under vis - QPixmap tmp = parent->pixmap(parent->item("backgroundimage")[1]); - mBack = new KPixmap ( QSize(xs,ys) ); + TQPixmap tmp = parent->pixmap(parent->item("backgroundimage")[1]); + mBack = new KPixmap ( TQSize(xs,ys) ); bitBlt( mBack, 0, 0, &tmp, x, y, xs, ys, Qt::CopyROP ); - mAnalyzer = new KPixmap ( QSize(xs,ys) ); + mAnalyzer = new KPixmap ( TQSize(xs,ys) ); bitBlt( mAnalyzer, 0, 0, &tmp, x, y, xs, ys, Qt::CopyROP ); // create a gradient for the bars going from 30% lighter to 30% darker than mColor - mGradient = new KPixmap ( QSize(xs,ys) ); + mGradient = new KPixmap ( TQSize(xs,ys) ); KPixmapEffect::gradient ( *mGradient, mColor.light(_KJ_GRADIENT_DIFF), mColor.dark(_KJ_GRADIENT_DIFF), KPixmapEffect::VerticalGradient ); @@ -304,8 +304,8 @@ void KJStereoFFT::scopeEvent(float *left, float *right, int len) unsigned int h = rect().height(); int hh = (int)(rect().height()/2); - QBitmap mGradientMask ( rect().width(), h, true ); - QPainter mask( &mGradientMask ); + TQBitmap mGradientMask ( rect().width(), h, true ); + TQPainter mask( &mGradientMask ); float *start = left; float *end = left + len; @@ -359,19 +359,19 @@ void KJStereoFFT::scopeEvent(float *left, float *right, int len) repaint(); } -void KJStereoFFT::paint(QPainter *p, const QRect &) +void KJStereoFFT::paint(TQPainter *p, const TQRect &) { // put that thing on screen if ( !napp->player()->isStopped() ) - bitBlt ( p->device(), rect().topLeft(), mAnalyzer, QRect(0,0,-1,-1), Qt::CopyROP ); + bitBlt ( p->device(), rect().topLeft(), mAnalyzer, TQRect(0,0,-1,-1), Qt::CopyROP ); } -bool KJStereoFFT::mousePress(const QPoint &) +bool KJStereoFFT::mousePress(const TQPoint &) { return true; } -void KJStereoFFT::mouseRelease(const QPoint &, bool in) +void KJStereoFFT::mouseRelease(const TQPoint &, bool in) { if (!in) // only do something if users is still inside the button return; @@ -399,7 +399,7 @@ void KJStereoFFT::readConfig() * KJScope - oscilloscope like visualization *************************************************/ -KJScope::KJScope(const QStringList &l, KJLoader *parent) +KJScope::KJScope(const TQStringList &l, KJLoader *parent) : KJVisScope(parent), MonoScope(50)/*, blurnum(0), mOsci(0)*/ { int x=l[1].toInt(); @@ -413,22 +413,22 @@ KJScope::KJScope(const QStringList &l, KJLoader *parent) if ( parent->exist("analyzercolor") ) { - QStringList &col = parser()["analyzercolor"]; + TQStringList &col = parser()["analyzercolor"]; mColor.setRgb ( col[1].toInt(), col[2].toInt(), col[3].toInt() ); } else // FIXME: what should be default colors for Vis? mColor.setRgb ( 255, 255, 255 ); // background under vis - QPixmap tmp = parent->pixmap(parent->item("backgroundimage")[1]); - mBack = new KPixmap ( QSize(xs,ys) ); + TQPixmap tmp = parent->pixmap(parent->item("backgroundimage")[1]); + mBack = new KPixmap ( TQSize(xs,ys) ); bitBlt( mBack, 0, 0, &tmp, x, y, xs, ys, Qt::CopyROP ); - mOsci = new KPixmap ( QSize(xs,ys) ); + mOsci = new KPixmap ( TQSize(xs,ys) ); bitBlt( mOsci, 0, 0, &tmp, x, y, xs, ys, Qt::CopyROP ); // create a gradient - mGradient = new KPixmap ( QSize(xs,ys) ); + mGradient = new KPixmap ( TQSize(xs,ys) ); KPixmapEffect::gradient ( *mGradient, mColor.light(_KJ_GRADIENT_DIFF), mColor.dark(_KJ_GRADIENT_DIFF), KPixmapEffect::VerticalGradient ); @@ -459,7 +459,7 @@ void KJScope::scopeEvent(float *d, int size) int heightHalf = rect().height()/2 /* -1 */; int x = 0; - QPainter tempP( mOsci ); + TQPainter tempP( mOsci ); if ( blurnum == 3 ) { // clear whole Vis @@ -487,12 +487,12 @@ void KJScope::scopeEvent(float *d, int size) // tempP.drawLine(x, heightHalf, x, heightHalf+amp); if ( amp > 0 ) { - bitBlt ( tempP.device(), QPoint(x,heightHalf), mGradient, QRect(x,heightHalf,1,amp), Qt::CopyROP ); + bitBlt ( tempP.device(), TQPoint(x,heightHalf), mGradient, TQRect(x,heightHalf,1,amp), Qt::CopyROP ); } else { amp = -amp; - bitBlt ( tempP.device(), QPoint(x,heightHalf-amp), mGradient, QRect(x,(heightHalf-amp),1,amp), Qt::CopyROP ); + bitBlt ( tempP.device(), TQPoint(x,heightHalf-amp), mGradient, TQRect(x,(heightHalf-amp),1,amp), Qt::CopyROP ); } x++; } @@ -500,18 +500,18 @@ void KJScope::scopeEvent(float *d, int size) repaint(); } -void KJScope::paint(QPainter *p, const QRect &) +void KJScope::paint(TQPainter *p, const TQRect &) { // put that thing on screen - bitBlt ( p->device(), rect().topLeft(), mOsci, QRect(0,0,-1,-1), Qt::CopyROP ); + bitBlt ( p->device(), rect().topLeft(), mOsci, TQRect(0,0,-1,-1), Qt::CopyROP ); } -bool KJScope::mousePress(const QPoint &) +bool KJScope::mousePress(const TQPoint &) { return true; } -void KJScope::mouseRelease(const QPoint &, bool in) +void KJScope::mouseRelease(const TQPoint &, bool in) { if (!in) // only do something if users is still inside the button return; diff --git a/noatun/modules/kjofol-skin/kjvis.h b/noatun/modules/kjofol-skin/kjvis.h index d2a43700..a05103d8 100644 --- a/noatun/modules/kjofol-skin/kjvis.h +++ b/noatun/modules/kjofol-skin/kjvis.h @@ -19,10 +19,10 @@ public: class KJNullScope : public KJVisScope { public: - KJNullScope(const QStringList &, KJLoader *parent); - virtual void paint(QPainter *p, const QRect &); - virtual bool mousePress(const QPoint&); - virtual void mouseRelease(const QPoint &, bool in); + KJNullScope(const TQStringList &, KJLoader *parent); + virtual void paint(TQPainter *p, const TQRect &); + virtual bool mousePress(const TQPoint&); + virtual void mouseRelease(const TQPoint &, bool in); virtual void readConfig(void); private: @@ -35,16 +35,16 @@ private: class KJFFT : public KJVisScope, public MonoFFTScope { public: - KJFFT(const QStringList &, KJLoader *parent); - virtual void paint(QPainter *p, const QRect &); + KJFFT(const TQStringList &, KJLoader *parent); + virtual void paint(TQPainter *p, const TQRect &); virtual void scopeEvent(float *d, int size); - virtual bool mousePress(const QPoint&); - virtual void mouseRelease(const QPoint &, bool in); + virtual bool mousePress(const TQPoint&); + virtual void mouseRelease(const TQPoint &, bool in); virtual void readConfig(void); private: - QColor mColor; + TQColor mColor; KPixmap *mGradient; KPixmap *mBack; KPixmap *mAnalyzer; @@ -57,16 +57,16 @@ private: class KJStereoFFT : public KJVisScope, public StereoFFTScope { public: - KJStereoFFT(const QStringList &, KJLoader *parent); - virtual void paint(QPainter *p, const QRect &); + KJStereoFFT(const TQStringList &, KJLoader *parent); + virtual void paint(TQPainter *p, const TQRect &); virtual void scopeEvent(float *left, float *right, int len); - virtual bool mousePress(const QPoint&); - virtual void mouseRelease(const QPoint &, bool in); + virtual bool mousePress(const TQPoint&); + virtual void mouseRelease(const TQPoint &, bool in); virtual void readConfig(void); private: - QColor mColor; + TQColor mColor; KPixmap *mGradient; KPixmap *mBack; KPixmap *mAnalyzer; @@ -79,16 +79,16 @@ private: class KJScope : public KJVisScope, public MonoScope { public: - KJScope ( const QStringList &, KJLoader *parent); - virtual void paint(QPainter *p, const QRect &); + KJScope ( const TQStringList &, KJLoader *parent); + virtual void paint(TQPainter *p, const TQRect &); virtual void scopeEvent(float *d, int size); - virtual bool mousePress(const QPoint&); - virtual void mouseRelease(const QPoint &, bool in); + virtual bool mousePress(const TQPoint&); + virtual void mouseRelease(const TQPoint &, bool in); virtual void readConfig(void); private: - QColor mColor; + TQColor mColor; KPixmap *mGradient; KPixmap *mBack; KPixmap *mOsci; diff --git a/noatun/modules/kjofol-skin/kjwidget.cpp b/noatun/modules/kjofol-skin/kjwidget.cpp index e7b6a4d1..b46fb651 100644 --- a/noatun/modules/kjofol-skin/kjwidget.cpp +++ b/noatun/modules/kjofol-skin/kjwidget.cpp @@ -12,15 +12,15 @@ // ugly static functions and stuff #include "helpers.cpp" -#include +#include KJWidget::KJWidget(KJLoader *p) : mParent(p) { } -QBitmap KJWidget::getMask(const QImage &_rect, register QRgb transparent) +TQBitmap KJWidget::getMask(const TQImage &_rect, register QRgb transparent) { - QImage result(_rect.width(), _rect.height(), 1,2, QImage::LittleEndian); + 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)); @@ -34,36 +34,36 @@ QBitmap KJWidget::getMask(const QImage &_rect, register QRgb transparent) for(int width=0; width<_rect.width(); width++) setPixel1BPP(result, width, height, _rect.pixel(width, height)!=transparent); } - QBitmap bm; + TQBitmap bm; bm.convertFromImage(result); return bm; } -void KJWidget::repaint(bool me, const QRect &r, bool clear) +void KJWidget::repaint(bool me, const TQRect &r, bool clear) { - QPainter p(parent()); + TQPainter p(parent()); if (me) paint(&p, r.isValid() ? r : rect()); else parent()->repaint(r.isValid() ? r : rect(), clear); } -const QString &KJWidget::backgroundPressed(const QString &bmp) const +const TQString &KJWidget::backgroundPressed(const TQString &bmp) const { if(bmp.isEmpty()) // play safe { -// kdDebug(66666) << k_funcinfo << "empty argument 'bmp', returning QString::null!" << endl; - return QString::null; +// kdDebug(66666) << k_funcinfo << "empty argument 'bmp', returning TQString::null!" << endl; + return TQString::null; } // kdDebug(66666) << k_funcinfo << "Returning pressed pixmap for '" << bmp.latin1() << "'" << endl; // make absolutely sure the wanted backgroundimagepressedX line is there - QStringList item = parser()["backgroundimagepressed"+QString::number(bmp.mid(3).toInt())]; + TQStringList item = parser()["backgroundimagepressed"+TQString::number(bmp.mid(3).toInt())]; if(item.count() < 2) { // kdDebug(66666) << k_funcinfo << "backgroundimagepressed doesn't have enough keys in its line!" << endl; - return QString::null; + return TQString::null; } else return item[1]; diff --git a/noatun/modules/kjofol-skin/kjwidget.h b/noatun/modules/kjofol-skin/kjwidget.h index cc7ddf53..3f63671b 100644 --- a/noatun/modules/kjofol-skin/kjwidget.h +++ b/noatun/modules/kjofol-skin/kjwidget.h @@ -9,14 +9,14 @@ public: KJWidget(KJLoader *); virtual ~KJWidget() {}; // called when the widget should paint - virtual void paint(QPainter *, const QRect &) {}; + virtual void paint(TQPainter *, const TQRect &) {}; // called to receive the rect this widget is in - virtual QRect rect() const { return mRect; } + virtual TQRect rect() const { return mRect; } // called when pressed in this widget - virtual bool mousePress(const QPoint &) {return false; } + virtual bool mousePress(const TQPoint &) {return false; } // called when the mouse is released after clicked in this widget - virtual void mouseRelease(const QPoint &, bool){} - virtual void mouseMove(const QPoint &, bool) {} + virtual void mouseRelease(const TQPoint &, bool){} + virtual void mouseMove(const TQPoint &, bool) {} // called with the current time (mille) virtual void timeUpdate(int) {} // called when a new song is playing, player() is ready with it too @@ -26,15 +26,15 @@ public: // called when the mouse is moved while clicked in this widget // repaint myself - virtual void repaint(bool me=true, const QRect &rect=QRect(), bool clear=false); + virtual void repaint(bool me=true, const TQRect &rect=TQRect(), bool clear=false); - virtual QString tip() { return 0; } + virtual TQString tip() { return 0; } public: - static QBitmap getMask(const QImage &color, register QRgb=qRgb(255,0,255)); + static TQBitmap getMask(const TQImage &color, register QRgb=qRgb(255,0,255)); protected: - const QString &backgroundPressed(const QString &bmp) const; + const TQString &backgroundPressed(const TQString &bmp) const; KJLoader *parent() const {return mParent;} KJLoader &parser() const {return *mParent;} @@ -43,11 +43,11 @@ protected: KJFont &volumeFont() const {return *mParent->mVolumeFont;} KJFont &pitchFont() const {return *mParent->mPitchFont;} - void setRect(const QRect& rect) {mRect=rect;} - void setRect(int x, int y, int xs, int ys) {mRect=QRect(x,y,xs,ys);} + void setRect(const TQRect& rect) {mRect=rect;} + void setRect(int x, int y, int xs, int ys) {mRect=TQRect(x,y,xs,ys);} private: KJLoader *mParent; - QRect mRect; + TQRect mRect; }; #endif diff --git a/noatun/modules/kjofol-skin/parser.cpp b/noatun/modules/kjofol-skin/parser.cpp index df5fdc40..aae5b12e 100644 --- a/noatun/modules/kjofol-skin/parser.cpp +++ b/noatun/modules/kjofol-skin/parser.cpp @@ -10,14 +10,14 @@ #include "kjprefs.h" // system includes -#include -#include -#include +#include +#include +#include #include #include #include -Parser::Parser() : QDict(17,false) +Parser::Parser() : TQDict(17,false) { mSkinAbout=""; mImageCache.setAutoDelete(true); @@ -29,27 +29,27 @@ void Parser::conserveMemory() mImageCache.clear(); } -void Parser::open(const QString &file) +void Parser::open(const TQString &file) { clear(); mImageCache.clear(); mSkinAbout=""; mDir=KURL(file).directory(); - QFile f(file); + TQFile f(file); if ( !f.exists() ) return; f.open(IO_ReadOnly); f.at(0); - QTextStream stream(&f); + TQTextStream stream(&f); while (!stream.eof()) { - QString line=stream.readLine(); + TQString line=stream.readLine(); line=line.simplifyWhiteSpace(); if ((!line.length()) || line[0]=='#') continue; - QStringList *l=new QStringList(QStringList::split(" ", (line.lower()))); - QString first=l->first(); + TQStringList *l=new TQStringList(TQStringList::split(" ", (line.lower()))); + TQString first=l->first(); // special handling for about-texts as the key "about" can appear multiple // times and thus does not fit into qdict. @@ -67,17 +67,17 @@ void Parser::open(const QString &file) } } -QString Parser::fileItem(const QString &i) const +TQString Parser::fileItem(const TQString &i) const { return dir()+'/'+i; } -QString Parser::dir() const +TQString Parser::dir() const { return mDir; } -Parser::ImagePixmap* Parser::getPair(const QString &filenameOld) const +Parser::ImagePixmap* Parser::getPair(const TQString &filenameOld) const { // is it in there? ImagePixmap *pair; @@ -87,9 +87,9 @@ Parser::ImagePixmap* Parser::getPair(const QString &filenameOld) const return pair; } - QString filename=fileItem(filenameOld); + TQString filename=fileItem(filenameOld); - QImage image; + TQImage image; // Determine file-format trough mimetype (no stupid .ext test) KMimeMagicResult * result = KMimeMagic::self()->findFileType( filename ); @@ -97,7 +97,7 @@ Parser::ImagePixmap* Parser::getPair(const QString &filenameOld) const if ( result->mimeType() == "image/png" ) { // image = NoatunApp::readPNG(filenameNoCase(filename)); - QImageIO iio; + TQImageIO iio; iio.setFileName( filenameNoCase(filename) ); // forget about gamma-value, fix for broken PNGs iio.setGamma( 0.00000001 ); @@ -113,12 +113,12 @@ Parser::ImagePixmap* Parser::getPair(const QString &filenameOld) const } else { - image = QImage(filenameNoCase(filename)); + image = TQImage(filenameNoCase(filename)); } //add to the cache - QPixmap pixmap; - pixmap.convertFromImage(image, QPixmap::AutoColor|QPixmap::ThresholdDither|QPixmap::AvoidDither); + TQPixmap pixmap; + pixmap.convertFromImage(image, TQPixmap::AutoColor|TQPixmap::ThresholdDither|TQPixmap::AvoidDither); pair = new Parser::ImagePixmap; pair->mImage = image; pair->mPixmap = pixmap; @@ -126,7 +126,7 @@ Parser::ImagePixmap* Parser::getPair(const QString &filenameOld) const return pair; } -bool Parser::exist(const QString &i) const +bool Parser::exist(const TQString &i) const { return (bool)find(i); } diff --git a/noatun/modules/kjofol-skin/parser.h b/noatun/modules/kjofol-skin/parser.h index 97e20d99..3f691253 100644 --- a/noatun/modules/kjofol-skin/parser.h +++ b/noatun/modules/kjofol-skin/parser.h @@ -2,48 +2,48 @@ #define PARSER_H // system includes -#include -#include -#include -#include +#include +#include +#include +#include -class Parser : public QDict +class Parser : public TQDict { class ImagePixmap { public: ImagePixmap() : mImage(0), mPixmap(0) {} ~ImagePixmap() {} - QImage mImage; - QPixmap mPixmap; + TQImage mImage; + TQPixmap mPixmap; }; public: Parser(); void conserveMemory(); - void open(const QString &file); + void open(const TQString &file); - QString dir() const; - QPixmap pixmap(const QString &pixmap) const + TQString dir() const; + TQPixmap pixmap(const TQString &pixmap) const { return getPair(pixmap)->mPixmap; } - QImage image(const QString &image) const + TQImage image(const TQString &image) const { return getPair(image)->mImage; } - QString about() const { return mSkinAbout; }; + TQString about() const { return mSkinAbout; }; - QString fileItem(const QString &file) const; + TQString fileItem(const TQString &file) const; - bool exist(const QString &i) const; + bool exist(const TQString &i) const; public: - QStringList& operator[](const QString &l) { return *find(l);} + TQStringList& operator[](const TQString &l) { return *find(l);} private: - ImagePixmap *getPair(const QString &i) const; + ImagePixmap *getPair(const TQString &i) const; private: - mutable QDict mImageCache; - QString mDir; - QString mSkinAbout; + mutable TQDict mImageCache; + TQString mDir; + TQString mSkinAbout; }; #endif // PARSER_H diff --git a/noatun/modules/marquis/marquis.cpp b/noatun/modules/marquis/marquis.cpp index 29ca7364..15a298c3 100644 --- a/noatun/modules/marquis/marquis.cpp +++ b/noatun/modules/marquis/marquis.cpp @@ -78,9 +78,9 @@ Marquis::Marquis() // for testing: uncomment this and use // dcop `dcop | grep noatun` Marquis activateAction dynamicRestore // and dynamicSave accordingly. -// (void) new KAction("Restore", 0, this, SLOT( dynamicRestore() ), actionCollection(), "dynamicRestore" ); -// (void) new KAction("Save", 0, this, SLOT( dynamicSave() ), actionCollection(), "dynamicSave" ); - connect( napp, SIGNAL( saveYourself() ), SLOT( dynamicSave() )); +// (void) new KAction("Restore", 0, this, TQT_SLOT( dynamicRestore() ), actionCollection(), "dynamicRestore" ); +// (void) new KAction("Save", 0, this, TQT_SLOT( dynamicSave() ), actionCollection(), "dynamicSave" ); + connect( napp, TQT_SIGNAL( saveYourself() ), TQT_SLOT( dynamicSave() )); } Marquis::~Marquis() @@ -93,7 +93,7 @@ void Marquis::restore(void) dynamicRestore(); } -// unload every window, and save the config as QStringList of those loaded +// unload every window, and save the config as TQStringList of those loaded void Marquis::saveSessionConfig(KConfig *c) { kdDebug(66666) << k_funcinfo << endl; @@ -107,20 +107,20 @@ void Marquis::saveSessionConfig(KConfig *c) if ( !player->current().isNull() ) { KURL songURL = player->current().url(); - songURL.setPass( QString::null ); // don't save passwords + songURL.setPass( TQString::null ); // don't save passwords c->writePathEntry("Current Song", songURL.url()); } else - c->writePathEntry("Current Song", QString::null); + c->writePathEntry("Current Song", TQString::null); c->writeEntry("Current Position", player->getTime()); c->writeEntry("PlayStatus", getPlayStatus( player )); // borrowed from Plugin config dialog - QStringList specList; + TQStringList specList; - QValueList loaded = napp->libraryLoader()->loaded(); - for( QValueList::Iterator i = loaded.begin(); i != loaded.end(); ++i) + TQValueList loaded = napp->libraryLoader()->loaded(); + for( TQValueList::Iterator i = loaded.begin(); i != loaded.end(); ++i) { if(!specList.contains((*i).specfile) && napp->libraryLoader()->isLoaded((*i).specfile) @@ -139,7 +139,7 @@ void Marquis::readSessionConfig(KConfig *c) { Player *player = napp->player(); - c->setGroup(QString::null); + c->setGroup(TQString::null); // First set volume, then load modules, some module could start // playback and that would be with 100% volume! @@ -147,10 +147,10 @@ void Marquis::readSessionConfig(KConfig *c) //player->setVolume( 0 ); player->loop( c->readNumEntry("Loop Style", (int) Player::None) ); - QStringList list = c->readListEntry("Loaded Plugins"); + TQStringList list = c->readListEntry("Loaded Plugins"); /* kdDebug(66666) << "Marquis::readSessionConfig()" << endl; - for(QStringList::ConstIterator i=list.begin(); i!=list.end(); ++i) + for(TQStringList::ConstIterator i=list.begin(); i!=list.end(); ++i) kdDebug(66666) << *i << endl; kdDebug(66666) << "Marquis::readSessionConfig() there we go" << endl; */ diff --git a/noatun/modules/metatag/edit.cpp b/noatun/modules/metatag/edit.cpp index d5ccb0c4..beb0fd0d 100644 --- a/noatun/modules/metatag/edit.cpp +++ b/noatun/modules/metatag/edit.cpp @@ -1,44 +1,44 @@ #include -#include +#include #include -#include -#include +#include +#include #include #include -#include +#include #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include #include #include #include -#include +#include #include "metatag.h" #include "edit.h" Editor::Editor() -: KDialogBase((QWidget*)0L, 0, false, i18n("Tag Editor"), Ok | Cancel) +: KDialogBase((TQWidget*)0L, 0, false, i18n("Tag Editor"), Ok | Cancel) { mMainWidget = makeMainWidget(); // mMainWidget->setMinimumWidth(325); - mGrid = new QGridLayout(mMainWidget, 1, 1, 0, spacingHint(), "Editor::mGrid"); + mGrid = new TQGridLayout(mMainWidget, 1, 1, 0, spacingHint(), "Editor::mGrid"); mGrid->setColStretch(1, 1); mGrid->setColStretch(2, 1); - QHBox *heading = new QHBox(mMainWidget, "Editor::heading"); + TQHBox *heading = new TQHBox(mMainWidget, "Editor::heading"); heading->setSpacing(4); - mFileIcon = new QLabel(heading); + mFileIcon = new TQLabel(heading); mFileIcon->setAlignment(AlignVCenter | AlignLeft); - mFile = new QLabel(heading); + mFile = new TQLabel(heading); mFile->setAlignment(AlignVCenter | AlignLeft); heading->setStretchFactor(mFile, 2); mGrid->addMultiCellWidget(heading, 0, 0, 0, 2); @@ -49,8 +49,8 @@ Editor::Editor() mControls.setAutoDelete(true); mNextRow = 2; - connect(this, SIGNAL(closeClicked()), SLOT(delayedDestruct())); - connect(this, SIGNAL(okClicked()), SLOT(save())); + connect(this, TQT_SIGNAL(closeClicked()), TQT_SLOT(delayedDestruct())); + connect(this, TQT_SIGNAL(okClicked()), TQT_SLOT(save())); enableButtonSeparator(true); setFixedHeight(sizeHint().height()); @@ -65,12 +65,12 @@ void Editor::open(const PlaylistItem & file) mDirty = false; mFile->setText("" + file.url().fileName(false) + ""); - QToolTip::add(mFile, file.url().prettyURL()); + TQToolTip::add(mFile, file.url().prettyURL()); mFileIcon-> setPixmap(KMimeType::pixmapForURL(file.url(), 0, KIcon::Small)); if (file.url().isLocalFile()) { - QFileInfo file_info(file.file()); + TQFileInfo file_info(file.file()); mFileWritable = file_info.isWritable(); } else { @@ -81,13 +81,13 @@ void Editor::open(const PlaylistItem & file) if ( !file_meta_info.isValid() ) // go ahead people, nothing to see here return; - mControls.append(createControl(file_meta_info, i18n("&Title"), "Title", QVariant::String, false, mMainWidget)); - mControls.append(createControl(file_meta_info, i18n("&Artist"), "Artist", QVariant::String, false, mMainWidget)); - mControls.append(createControl(file_meta_info, i18n("A&lbum"), "Album", QVariant::String, false, mMainWidget)); - mControls.append(createControl(file_meta_info, i18n("&Date"), "Date", QVariant::String, false, mMainWidget)); - mControls.append(createControl(file_meta_info, i18n("T&rack"), "Tracknumber", QVariant::UInt, false, mMainWidget)); - mControls.append(createControl(file_meta_info, i18n("&Genre"), "Genre", QVariant::String, false, mMainWidget)); - mControls.append(createControl(file_meta_info, i18n("Co&mment"), "Comment", QVariant::String, false, mMainWidget)); + mControls.append(createControl(file_meta_info, i18n("&Title"), "Title", TQVariant::String, false, mMainWidget)); + mControls.append(createControl(file_meta_info, i18n("&Artist"), "Artist", TQVariant::String, false, mMainWidget)); + mControls.append(createControl(file_meta_info, i18n("A&lbum"), "Album", TQVariant::String, false, mMainWidget)); + mControls.append(createControl(file_meta_info, i18n("&Date"), "Date", TQVariant::String, false, mMainWidget)); + mControls.append(createControl(file_meta_info, i18n("T&rack"), "Tracknumber", TQVariant::UInt, false, mMainWidget)); + mControls.append(createControl(file_meta_info, i18n("&Genre"), "Genre", TQVariant::String, false, mMainWidget)); + mControls.append(createControl(file_meta_info, i18n("Co&mment"), "Comment", TQVariant::String, false, mMainWidget)); } void Editor::save() @@ -116,20 +116,20 @@ void Editor::save() } void Editor::saveControl(KFileMetaInfo& meta_info, const MetaWidget &meta_widget) { - QVariant value; + TQVariant value; const KFileMimeTypeInfo *info = KFileMetaInfoProvider::self()->mimeTypeInfo( meta_info.mimeType() ); if (!meta_widget.widget->isEnabled()) return; - if (meta_widget.widget->inherits("QSpinBox")) - value = static_cast(meta_widget.widget)->value(); - else if (meta_widget.widget->inherits("QComboBox")) - value = static_cast(meta_widget.widget)->currentText(); - else if (meta_widget.widget->inherits("QLineEdit")) - value = static_cast(meta_widget.widget)->text(); + if (meta_widget.widget->inherits("TQSpinBox")) + value = static_cast(meta_widget.widget)->value(); + else if (meta_widget.widget->inherits("TQComboBox")) + value = static_cast(meta_widget.widget)->currentText(); + else if (meta_widget.widget->inherits("TQLineEdit")) + value = static_cast(meta_widget.widget)->text(); - QString group = keyGroup(meta_info, meta_widget.key); + TQString group = keyGroup(meta_info, meta_widget.key); if (group.isNull()) { kdWarning() << "Cannot find group for " << meta_widget.key << endl; @@ -158,13 +158,13 @@ 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 QString &label, const QString &key, QVariant::Type default_type, bool optional, QWidget *parent) { - QLabel *tmp_label = 0L; +MetaWidget* Editor::createControl(KFileMetaInfo& meta_info, const TQString &label, const TQString &key, TQVariant::Type default_type, bool optional, TQWidget *parent) { + TQLabel *tmp_label = 0L; KFileMetaInfoItem info_item = meta_info.item(key); - QVariant::Type type; + TQVariant::Type type; MetaWidget *meta_widget = 0L; - QValidator *validator = 0L; - QString groupName = keyGroup(meta_info, key); + TQValidator *validator = 0L; + TQString groupName = keyGroup(meta_info, key); bool known_key = ((!groupName.isNull()) && meta_info.group(groupName).contains(key)); bool addable = keyAddable(meta_info, key); const KFileMimeTypeInfo *info = KFileMetaInfoProvider::self()->mimeTypeInfo( meta_info.mimeType() ); @@ -188,9 +188,9 @@ MetaWidget* Editor::createControl(KFileMetaInfo& meta_info, const QString &label meta_widget = new MetaWidget; meta_widget->key = key; - if ((type == QVariant::Int) || (type == QVariant::UInt)) { + if ((type == TQVariant::Int) || (type == TQVariant::UInt)) { // We're an int, make a spin box - QSpinBox *box = new QSpinBox(parent); + TQSpinBox *box = new TQSpinBox(parent); // Well, normally metatag doesn't care that much about suffixes // and prefixes, but this is just too easy. @@ -204,10 +204,10 @@ MetaWidget* Editor::createControl(KFileMetaInfo& meta_info, const QString &label box->setValidator(validator); // Is it an integer validator - if (validator->inherits("QIntValidator")) { - QIntValidator *int_validator = static_cast(validator); + if (validator->inherits("TQIntValidator")) { + TQIntValidator *int_validator = static_cast(validator); - // FIXME: Why the -hell- doesn't QSpinBox::setValidator() do this?? + // FIXME: Why the -hell- doesn't TQSpinBox::setValidator() do this?? box->setMinValue(int_validator->bottom()); box->setMaxValue(int_validator->top()); } @@ -215,18 +215,18 @@ MetaWidget* Editor::createControl(KFileMetaInfo& meta_info, const QString &label box->setValue(info_item.value().toInt()); - connect(box, SIGNAL(valueChanged(int)), this, SLOT(modified())); + connect(box, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(modified())); meta_widget->widget = box; } else { - // We're not an int, make a KLineEdit/QComboBox, depending on our validator + // We're not an int, make a KLineEdit/TQComboBox, depending on our validator bool combo_box = false; if (validator) combo_box = validator->isA("KStringListValidator"); if (combo_box) { - QComboBox *combo = new QComboBox(parent); + TQComboBox *combo = new TQComboBox(parent); combo->clear(); combo->insertStringList(static_cast< @@ -234,7 +234,7 @@ MetaWidget* Editor::createControl(KFileMetaInfo& meta_info, const QString &label >(validator)->stringList()); combo->setCurrentText(info_item.value().toString()); - connect(combo, SIGNAL(activated(int)), this, SLOT(modified())); + connect(combo, TQT_SIGNAL(activated(int)), this, TQT_SLOT(modified())); meta_widget->widget = combo; } @@ -244,7 +244,7 @@ MetaWidget* Editor::createControl(KFileMetaInfo& meta_info, const QString &label edit = new KLineEdit(parent); edit->setText(info_item.value().toString()); edit->setValidator(validator); - connect(edit, SIGNAL(textChanged(const QString &)), this, SLOT(modified())); + connect(edit, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(modified())); meta_widget->widget = edit; } @@ -258,7 +258,7 @@ MetaWidget* Editor::createControl(KFileMetaInfo& meta_info, const QString &label mGrid->addMultiCellWidget(meta_widget->widget, mNextRow, mNextRow, 1, 2); // Add our label. This is the easy part - tmp_label = new QLabel(meta_widget->widget, label + ":", parent); + tmp_label = new TQLabel(meta_widget->widget, label + ":", parent); mGrid->addWidget(tmp_label, mNextRow, 0); @@ -267,25 +267,25 @@ MetaWidget* Editor::createControl(KFileMetaInfo& meta_info, const QString &label return meta_widget; } -QString Editor::keyGroup(const KFileMetaInfo& i, QString key) { +TQString Editor::keyGroup(const KFileMetaInfo& i, TQString key) { const KFileMimeTypeInfo *info = KFileMetaInfoProvider::self()->mimeTypeInfo( i.mimeType() ); - QStringList groups = info->supportedGroups(); + TQStringList groups = info->supportedGroups(); - for (QStringList::Iterator it = groups.begin();it != groups.end();++it) { + for (TQStringList::Iterator it = groups.begin();it != groups.end();++it) { if (info->groupInfo(*it)->itemInfo(key)) { return *it; } } - return QString::null; + return TQString::null; } -bool Editor::keyAddable(const KFileMetaInfo &i, QString key) { +bool Editor::keyAddable(const KFileMetaInfo &i, TQString key) { const KFileMimeTypeInfo *info = KFileMetaInfoProvider::self()->mimeTypeInfo( i.mimeType() ); - QStringList groups = info->supportedGroups(); + TQStringList groups = info->supportedGroups(); kdDebug(66666) << "Testing if " << key << " is addable" << endl; - for (QStringList::Iterator it = groups.begin();it != groups.end();++it) { + for (TQStringList::Iterator it = groups.begin();it != groups.end();++it) { if (info->groupInfo(*it)->supportsVariableKeys()) { kdDebug(66666) << "Group " << *it << " supports variable keys" << endl; return true; diff --git a/noatun/modules/metatag/edit.h b/noatun/modules/metatag/edit.h index d6b0ab9c..ad928ff0 100644 --- a/noatun/modules/metatag/edit.h +++ b/noatun/modules/metatag/edit.h @@ -3,16 +3,16 @@ #include #include -#include -#include +#include +#include class KFileMetaInfo; class KFileMetaInfoItem; class QGridLayout; struct MetaWidget { - QWidget *widget; - QString key; + TQWidget *widget; + TQString key; }; class Editor:public KDialogBase { @@ -31,23 +31,23 @@ class Editor:public KDialogBase { void modified(); protected: - bool keyAddable(const KFileMetaInfo &, QString); - QString keyGroup(const KFileMetaInfo &, QString); + bool keyAddable(const KFileMetaInfo &, TQString); + TQString keyGroup(const KFileMetaInfo &, TQString); void saveControl(KFileMetaInfo& meta_info, const MetaWidget&); - MetaWidget *createControl(KFileMetaInfo& meta_info, const QString &label, const QString &key, QVariant::Type default_type, bool optional, QWidget *parent); + MetaWidget *createControl(KFileMetaInfo& meta_info, const TQString &label, const TQString &key, TQVariant::Type default_type, bool optional, TQWidget *parent); - QPtrList mControls; + TQPtrList mControls; - QWidget *mMainWidget; - QGridLayout *mGrid; + TQWidget *mMainWidget; + TQGridLayout *mGrid; int mNextRow; bool mFileWritable; bool mDirty; - QLabel *mFile; - QLabel *mFileIcon; + TQLabel *mFile; + TQLabel *mFileIcon; const char *filename; PlaylistItem item; }; diff --git a/noatun/modules/metatag/metatag.cpp b/noatun/modules/metatag/metatag.cpp index d0531092..1ec54cbf 100644 --- a/noatun/modules/metatag/metatag.cpp +++ b/noatun/modules/metatag/metatag.cpp @@ -7,10 +7,10 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include @@ -32,7 +32,7 @@ extern "C" MetaTagLoader::MetaTagLoader():Plugin() { - mAction = new KAction(i18n("&Tag Editor..."), "edit", 0, this, SLOT(editTag()), this, "edittag"); + mAction = new KAction(i18n("&Tag Editor..."), "edit", 0, this, TQT_SLOT(editTag()), this, "edittag"); napp->pluginActionMenu()->insert(mAction); } @@ -52,8 +52,8 @@ void MetaTagLoader::editTag() e->open(i); e->show(); - connect(e, SIGNAL(saved(PlaylistItem &)), - SLOT(update(PlaylistItem &))); + connect(e, TQT_SIGNAL(saved(PlaylistItem &)), + TQT_SLOT(update(PlaylistItem &))); } bool MetaTagLoader::update(PlaylistItem & item) @@ -94,7 +94,7 @@ bool MetaTagLoader::update(PlaylistItem & item) return true; } -bool MetaTagLoader::setProperty(KFileMetaInfo &info, PlaylistItem &item, const QString &key, const QString &property) +bool MetaTagLoader::setProperty(KFileMetaInfo &info, PlaylistItem &item, const TQString &key, const TQString &property) { KFileMetaInfoItem info_item = info.item(key); diff --git a/noatun/modules/metatag/metatag.h b/noatun/modules/metatag/metatag.h index ff5c277f..4559edaf 100644 --- a/noatun/modules/metatag/metatag.h +++ b/noatun/modules/metatag/metatag.h @@ -6,12 +6,12 @@ #include #include -#include +#include class KFileMetaInfo; class KAction; -class MetaTagLoader:public QObject, public Tags, public Plugin { +class MetaTagLoader:public TQObject, public Tags, public Plugin { Q_OBJECT public: MetaTagLoader(); @@ -22,7 +22,7 @@ class MetaTagLoader:public QObject, public Tags, public Plugin { void editTag(); private: - bool setProperty(KFileMetaInfo &info, PlaylistItem &item, const QString &key, const QString &property); + bool setProperty(KFileMetaInfo &info, PlaylistItem &item, const TQString &key, const TQString &property); int menuID; KAction *mAction; }; diff --git a/noatun/modules/monoscope/monoscope.cpp b/noatun/modules/monoscope/monoscope.cpp index 5ab63ecc..758d3950 100644 --- a/noatun/modules/monoscope/monoscope.cpp +++ b/noatun/modules/monoscope/monoscope.cpp @@ -2,7 +2,7 @@ #include #include #include -#include +#include #include #include #include @@ -15,7 +15,7 @@ extern "C" } } -Monoscope::Monoscope() : QWidget(0,0,WRepaintNoErase), MonoScope(30), Plugin() +Monoscope::Monoscope() : TQWidget(0,0,WRepaintNoErase), MonoScope(30), Plugin() { NOATUNPLUGINC(Monoscope); @@ -27,7 +27,7 @@ Monoscope::Monoscope() : QWidget(0,0,WRepaintNoErase), MonoScope(30), Plugin() setCaption(i18n("Monoscope")); show(); resizeEvent(0); - repaint(0,0, QWidget::width(), height(), false); + repaint(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, SLOT(toggle()), this, "togglemonoscope"); + this, TQT_SLOT(toggle()), this, "togglemonoscope"); mAction->setChecked(!isHidden()); napp->pluginActionMenu()->insert(mAction); } @@ -54,12 +54,12 @@ void Monoscope::toggle(void) hide(); } -void Monoscope::closeEvent(QCloseEvent *) +void Monoscope::closeEvent(TQCloseEvent *) { hide(); } -void Monoscope::resizeEvent(QResizeEvent *) +void Monoscope::resizeEvent(TQResizeEvent *) { setSamples(width()); } @@ -79,9 +79,9 @@ void Monoscope::scopeEvent(float *d, int size) int heightHalf=viewHeight/4; int y=viewHeight/2; // reduce flicker - QPixmap buffer(viewWidth, viewHeight, -1, QPixmap::BestOptim); + TQPixmap buffer(viewWidth, viewHeight, -1, TQPixmap::BestOptim); buffer.fill(mLowColor); - QPainter p(&buffer); + TQPainter p(&buffer); p.setPen(mHighColor); repaint(rect()); diff --git a/noatun/modules/monoscope/monoscope.h b/noatun/modules/monoscope/monoscope.h index 37031a4b..0f9ddcff 100644 --- a/noatun/modules/monoscope/monoscope.h +++ b/noatun/modules/monoscope/monoscope.h @@ -5,7 +5,7 @@ class KToggleAction; -class Monoscope : public QWidget, public MonoScope, public Plugin +class Monoscope : public TQWidget, public MonoScope, public Plugin { Q_OBJECT NOATUNPLUGIND @@ -20,10 +20,10 @@ public slots: void toggle(void); protected: - virtual void closeEvent(QCloseEvent *); + virtual void closeEvent(TQCloseEvent *); virtual void scopeEvent(float *data, int bands); - virtual void resizeEvent(QResizeEvent *); + virtual void resizeEvent(TQResizeEvent *); private: QRgb mHighColor, mLowColor; diff --git a/noatun/modules/net/net.cpp b/noatun/modules/net/net.cpp index 5e3ba707..f5898c71 100644 --- a/noatun/modules/net/net.cpp +++ b/noatun/modules/net/net.cpp @@ -11,10 +11,10 @@ extern "C" } -Net::Net() : QServerSocket(7539, 10), Plugin() +Net::Net() : TQServerSocket(7539, 10), Plugin() { mFDs.setAutoDelete(true); - connect(napp->player(), SIGNAL(newSong()), SLOT(newSong())); + connect(napp->player(), TQT_SIGNAL(newSong()), TQT_SLOT(newSong())); } Net::~Net() @@ -24,7 +24,7 @@ Net::~Net() void Net::newConnection(int fd) { - QSocket *s=new QSocket; + TQSocket *s=new QSocket; s->setSocket(fd); mFDs.append(s); } @@ -34,9 +34,9 @@ void Net::newSong() if (!napp->player()->current()) return; - for (QSocket *i=mFDs.first(); i!=0; i=mFDs.next()) + for (TQSocket *i=mFDs.first(); i!=0; i=mFDs.next()) { - QCString line; + TQCString line; line=napp->player()->current().title().latin1(); line+='\n'; ::write(i->socket(), (const void*)line.data(), line.length()); @@ -45,7 +45,7 @@ void Net::newSong() void Net::closed() { - for (QSocket *i=mFDs.first(); i!=0; i=mFDs.next()) + for (TQSocket *i=mFDs.first(); i!=0; i=mFDs.next()) { if (sender()==i) mFDs.removeRef(i); diff --git a/noatun/modules/net/net.h b/noatun/modules/net/net.h index 7d0fcb11..41c07438 100644 --- a/noatun/modules/net/net.h +++ b/noatun/modules/net/net.h @@ -3,11 +3,11 @@ #include #include -#include -#include +#include +#include #include -class Net : public QServerSocket, public Plugin +class Net : public TQServerSocket, public Plugin { Q_OBJECT @@ -24,7 +24,7 @@ protected: virtual void newConnection(int socket); private: - QPtrList mFDs; + TQPtrList mFDs; }; #endif diff --git a/noatun/modules/noatunui/userinterface.cpp b/noatun/modules/noatunui/userinterface.cpp index c13d4d6d..0302efe6 100644 --- a/noatun/modules/noatunui/userinterface.cpp +++ b/noatun/modules/noatunui/userinterface.cpp @@ -12,12 +12,12 @@ #include #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include #include @@ -28,55 +28,55 @@ #include #include -MilkChocolate::MilkChocolate() : QWidget(0,"NoatunUI"), UserInterface() +MilkChocolate::MilkChocolate() : TQWidget(0,"NoatunUI"), UserInterface() { setAcceptDrops(true); static const int buttonSize=32; { // The buttons - mBack=new QPushButton(this); + mBack=new TQPushButton(this); mBack->setFixedSize(buttonSize,buttonSize); mBack->setPixmap(BarIcon("noatunback")); - connect(mBack, SIGNAL(clicked()), napp->player(), SLOT(back())); - QToolTip::add(mBack,i18n("Back")); + connect(mBack, TQT_SIGNAL(clicked()), napp->player(), TQT_SLOT(back())); + TQToolTip::add(mBack,i18n("Back")); - mStop=new QPushButton(this); + mStop=new TQPushButton(this); mStop->setFixedSize(buttonSize,buttonSize); mStop->setPixmap(BarIcon("noatunstop")); - connect(mStop, SIGNAL(clicked()), napp->player(), SLOT(stop())); - QToolTip::add(mStop, i18n("Stop")); + connect(mStop, TQT_SIGNAL(clicked()), napp->player(), TQT_SLOT(stop())); + TQToolTip::add(mStop, i18n("Stop")); - mPlay=new QPushButton(this); + mPlay=new TQPushButton(this); mPlay->setToggleButton(true); mPlay->setFixedSize(buttonSize,buttonSize); mPlay->setPixmap(BarIcon("noatunplay")); - connect(mPlay, SIGNAL(clicked()), napp->player(), SLOT(playpause())); - QToolTip::add(mPlay, i18n("Play")); + connect(mPlay, TQT_SIGNAL(clicked()), napp->player(), TQT_SLOT(playpause())); + TQToolTip::add(mPlay, i18n("Play")); - mForward=new QPushButton(this); + mForward=new TQPushButton(this); mForward->setFixedSize(buttonSize,buttonSize); mForward->setPixmap(BarIcon("noatunforward")); - connect(mForward, SIGNAL(clicked()), napp->player(), SLOT(forward())); - QToolTip::add(mForward, i18n("Forward")); + connect(mForward, TQT_SIGNAL(clicked()), napp->player(), TQT_SLOT(forward())); + TQToolTip::add(mForward, i18n("Forward")); - mPlaylist=new QPushButton(this); + mPlaylist=new TQPushButton(this); mPlaylist->setToggleButton(true); mPlaylist->setFixedSize(buttonSize,buttonSize); mPlaylist->setPixmap(BarIcon("noatunplaylist")); - connect(mPlaylist, SIGNAL(clicked()), napp->player(), SLOT(toggleListView())); - QToolTip::add(mPlaylist, i18n("Playlist")); + connect(mPlaylist, TQT_SIGNAL(clicked()), napp->player(), TQT_SLOT(toggleListView())); + TQToolTip::add(mPlaylist, i18n("Playlist")); - mLoop=new QPushButton(this); + mLoop=new TQPushButton(this); mLoop->setFixedSize(buttonSize,buttonSize); mLoop->setPixmap(BarIcon("noatunloopnone")); - connect(mLoop, SIGNAL(clicked()), napp->player(), SLOT(loop())); - QToolTip::add(mLoop, i18n("Change loop style")); + connect(mLoop, TQT_SIGNAL(clicked()), napp->player(), TQT_SLOT(loop())); + TQToolTip::add(mLoop, i18n("Change loop style")); - mPopup=new QPushButton(this); + mPopup=new TQPushButton(this); mPopup->setFixedSize(buttonSize,buttonSize); mPopup->setPixmap(BarIcon("noatun")); - connect(mPopup, SIGNAL(clicked()), SLOT(popup())); -// QToolTip::add(mRemoveCurrent, i18n("Remove current file from playlist")); + connect(mPopup, TQT_SIGNAL(clicked()), TQT_SLOT(popup())); +// TQToolTip::add(mRemoveCurrent, i18n("Remove current file from playlist")); } @@ -87,7 +87,7 @@ MilkChocolate::MilkChocolate() : QWidget(0,"NoatunUI"), UserInterface() mStatusBar=new KStatusBar(this); - QGridLayout *l=new QGridLayout(this); + TQGridLayout *l=new TQGridLayout(this); l->addWidget(mBack,0,0); l->addWidget(mStop,0,1); l->addWidget(mPlay,0,2); @@ -104,35 +104,35 @@ MilkChocolate::MilkChocolate() : QWidget(0,"NoatunUI"), UserInterface() statusBar()->message(i18n("No File Loaded")); statusBar()->insertItem("--:--/--:--", 1, 0, true); - connect(napp, SIGNAL(hideYourself()), this, SLOT(hide()) ); - connect(napp, SIGNAL(showYourself()), this, SLOT(show()) ); + connect(napp, TQT_SIGNAL(hideYourself()), this, TQT_SLOT(hide()) ); + connect(napp, TQT_SIGNAL(showYourself()), this, TQT_SLOT(show()) ); - connect(napp->player(), SIGNAL(playing()), this, SLOT(slotPlaying())); - connect(napp->player(), SIGNAL(stopped()), this, SLOT(slotStopped())); - connect(napp->player(), SIGNAL(paused()), this, SLOT(slotPaused())); + connect(napp->player(), TQT_SIGNAL(playing()), this, TQT_SLOT(slotPlaying())); + connect(napp->player(), TQT_SIGNAL(stopped()), this, TQT_SLOT(slotStopped())); + connect(napp->player(), TQT_SIGNAL(paused()), this, TQT_SLOT(slotPaused())); napp->player()->handleButtons(); - connect(napp->player(), SIGNAL(timeout()), this, SLOT(slotTimeout())); - connect(napp->player(), SIGNAL(loopTypeChange(int)), this, SLOT(changeLoopType(int))); + connect(napp->player(), TQT_SIGNAL(timeout()), this, TQT_SLOT(slotTimeout())); + connect(napp->player(), TQT_SIGNAL(loopTypeChange(int)), this, TQT_SLOT(changeLoopType(int))); // if(seeker()) { /* This skipToWrapper is needed to pass milliseconds to Player() as everybody * below the GUI is based on milliseconds instead of some unprecise thingy * like seconds or mille */ - connect(seeker(), SIGNAL(userChanged(int)), this, SLOT(skipToWrapper(int))); - connect(this, SIGNAL(skipTo(int)), napp->player(), SLOT(skipTo(int))); - connect(seeker(), SIGNAL(sliderMoved(int)), SLOT(sliderMoved(int))); + connect(seeker(), TQT_SIGNAL(userChanged(int)), this, TQT_SLOT(skipToWrapper(int))); + connect(this, TQT_SIGNAL(skipTo(int)), napp->player(), TQT_SLOT(skipTo(int))); + connect(seeker(), TQT_SIGNAL(sliderMoved(int)), TQT_SLOT(sliderMoved(int))); } - connect(mVolume, SIGNAL(sliderMoved(int)), napp->player(), SLOT(setVolume(int))); - connect(mVolume, SIGNAL(userChanged(int)), napp->player(), SLOT(setVolume(int))); + connect(mVolume, TQT_SIGNAL(sliderMoved(int)), napp->player(), TQT_SLOT(setVolume(int))); + connect(mVolume, TQT_SIGNAL(userChanged(int)), napp->player(), TQT_SLOT(setVolume(int))); - connect(napp->player(), SIGNAL(playlistShown()), SLOT(playlistShown())); - connect(napp->player(), SIGNAL(playlistHidden()), SLOT(playlistHidden())); + connect(napp->player(), TQT_SIGNAL(playlistShown()), TQT_SLOT(playlistShown())); + connect(napp->player(), TQT_SIGNAL(playlistHidden()), TQT_SLOT(playlistHidden())); // Event Filter for the RMB - for (QPtrListIterator i(*children()); i.current(); ++i) + for (TQPtrListIterator i(*children()); i.current(); ++i) (*i)->installEventFilter(this); setCaption("Noatun"); @@ -150,23 +150,23 @@ MilkChocolate::~MilkChocolate() // delete prefDlg; } -void MilkChocolate::closeEvent(QCloseEvent*) +void MilkChocolate::closeEvent(TQCloseEvent*) { unload(); } -void MilkChocolate::showEvent(QShowEvent*e) +void MilkChocolate::showEvent(TQShowEvent*e) { - QWidget::showEvent(e); + TQWidget::showEvent(e); } -void MilkChocolate::dragEnterEvent(QDragEnterEvent *event) +void MilkChocolate::dragEnterEvent(TQDragEnterEvent *event) { // accept uri drops only event->accept(KURLDrag::canDecode(event)); } -void MilkChocolate::dropEvent(QDropEvent *event) +void MilkChocolate::dropEvent(TQDropEvent *event) { KURL::List uri; if (KURLDrag::decode(event, uri)) @@ -176,14 +176,14 @@ void MilkChocolate::dropEvent(QDropEvent *event) } } -void MilkChocolate::mouseReleaseEvent(QMouseEvent *e) +void MilkChocolate::mouseReleaseEvent(TQMouseEvent *e) { - QWidget::mouseReleaseEvent(e); + TQWidget::mouseReleaseEvent(e); if (e->button()!=RightButton) return; NoatunStdAction::ContextMenu::showContextMenu(); } -void MilkChocolate::changeStatusbar(const QString& text, const QString &text2) +void MilkChocolate::changeStatusbar(const TQString& text, const TQString &text2) { if (!text2.isNull()) statusBar()->changeItem(text2, 1); @@ -191,7 +191,7 @@ void MilkChocolate::changeStatusbar(const QString& text, const QString &text2) statusBar()->message(!text.isNull() ? text : napp->player()->current().title()); } -void MilkChocolate::changeCaption(const QString& text) +void MilkChocolate::changeCaption(const TQString& text) { setCaption(text); } @@ -205,7 +205,7 @@ void MilkChocolate::popup() void MilkChocolate::slotPlaying() { -// connect(kwinmodule, SIGNAL(windowAdded(WId)), view, SLOT(attemptReparent(WId))); +// connect(kwinmodule, TQT_SIGNAL(windowAdded(WId)), view, TQT_SLOT(attemptReparent(WId))); changeStatusbar(napp->player()->current().title(), napp->player()->lengthString()); mPlay->setOn(true); mStop->setEnabled(true); @@ -278,21 +278,21 @@ void MilkChocolate::changeLoopType(int t) } -bool MilkChocolate::eventFilter(QObject *o, QEvent *e) +bool MilkChocolate::eventFilter(TQObject *o, TQEvent *e) { - if ((e->type() == QEvent::MouseButtonRelease) - && ((static_cast(e))->button()==RightButton)) + if ((e->type() == TQEvent::MouseButtonRelease) + && ((static_cast(e))->button()==RightButton)) { - mouseReleaseEvent(static_cast(e)); + mouseReleaseEvent(static_cast(e)); return true; } - if (e->type() == QEvent::Wheel) + if (e->type() == TQEvent::Wheel) { - wheelEvent(static_cast(e)); + wheelEvent(static_cast(e)); return true; } - return QWidget::eventFilter(o, e); + return TQWidget::eventFilter(o, e); } void MilkChocolate::playlistShown() @@ -305,7 +305,7 @@ void MilkChocolate::playlistHidden() mPlaylist->setOn(false); } -void MilkChocolate::wheelEvent(QWheelEvent *e) +void MilkChocolate::wheelEvent(TQWheelEvent *e) { int delta=e->delta(); mVolume->setValue(mVolume->value()+(delta/120)); diff --git a/noatun/modules/noatunui/userinterface.h b/noatun/modules/noatunui/userinterface.h index 94dc9c44..1df5b160 100644 --- a/noatun/modules/noatunui/userinterface.h +++ b/noatun/modules/noatunui/userinterface.h @@ -21,25 +21,25 @@ class KStatusBar; * @author Charles Samuels * @version 0.1 */ -class MilkChocolate : public QWidget, public UserInterface +class MilkChocolate : public TQWidget, public UserInterface { Q_OBJECT public: MilkChocolate(); virtual ~MilkChocolate(); - void load(const QString& url); + void load(const TQString& url); protected: - virtual void dragEnterEvent(QDragEnterEvent *event); - virtual void dropEvent(QDropEvent *event); - virtual void closeEvent(QCloseEvent*); - virtual void showEvent(QShowEvent*e); - virtual void mouseReleaseEvent(QMouseEvent *); - virtual bool eventFilter(QObject*, QEvent*); - virtual void wheelEvent(QWheelEvent *e); + virtual void dragEnterEvent(TQDragEnterEvent *event); + virtual void dropEvent(TQDropEvent *event); + virtual void closeEvent(TQCloseEvent*); + virtual void showEvent(TQShowEvent*e); + virtual void mouseReleaseEvent(TQMouseEvent *); + virtual bool eventFilter(TQObject*, TQEvent*); + virtual void wheelEvent(TQWheelEvent *e); protected: - QSlider *seeker() const { return mSeeker; } + TQSlider *seeker() const { return mSeeker; } KStatusBar *statusBar() const { return mStatusBar; } public slots: @@ -59,13 +59,13 @@ signals: void skipTo( int ); // emitted by skipToWrapper() private slots: - void changeStatusbar(const QString& text, const QString &text2=0); - void changeCaption(const QString& text); + void changeStatusbar(const TQString& text, const TQString &text2=0); + void changeCaption(const TQString& text); void popup(); private: - QPushButton *mBack, *mStop, *mPlay, *mForward, *mPlaylist, *mPopup, *mLoop; - QSlider *mSeeker, *mVolume; + TQPushButton *mBack, *mStop, *mPlay, *mForward, *mPlaylist, *mPopup, *mLoop; + TQSlider *mSeeker, *mVolume; KStatusBar *mStatusBar; }; diff --git a/noatun/modules/simple/propertiesdialog.ui.h b/noatun/modules/simple/propertiesdialog.ui.h index a712d776..ef6f14f9 100644 --- a/noatun/modules/simple/propertiesdialog.ui.h +++ b/noatun/modules/simple/propertiesdialog.ui.h @@ -16,22 +16,22 @@ void PropertiesDialog::setPlayObject( PlaylistItem pi, Arts::PlayObject po ) if (!po.isNull()) { Arts::poCapabilities ncaps = po.capabilities(); - QCheckListItem *item; + TQCheckListItem *item; descriptionLabel->setText( po.description().c_str() ); // Determine capabilities - if (!(item = (QCheckListItem *)capsList->findItem( "capSeek", 0 ))) + if (!(item = (TQCheckListItem *)capsList->findItem( "capSeek", 0 ))) { - item = new QCheckListItem( capsList, "capSeek", - QCheckListItem::CheckBox ); + item = new TQCheckListItem( capsList, "capSeek", + TQCheckListItem::CheckBox ); } item->setOn( (ncaps & Arts::capSeek) ); - if (!(item = (QCheckListItem *)capsList->findItem( "capPause", 0 ))) + if (!(item = (TQCheckListItem *)capsList->findItem( "capPause", 0 ))) { - item = new QCheckListItem( capsList, "capPause", - QCheckListItem::CheckBox ); + item = new TQCheckListItem( capsList, "capPause", + TQCheckListItem::CheckBox ); } item->setOn( (ncaps & Arts::capPause) ); diff --git a/noatun/modules/simple/userinterface.cpp b/noatun/modules/simple/userinterface.cpp index 6e7b486f..685b2467 100644 --- a/noatun/modules/simple/userinterface.cpp +++ b/noatun/modules/simple/userinterface.cpp @@ -30,14 +30,14 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #include "userinterface.h" @@ -63,14 +63,14 @@ SimpleUI::SimpleUI() setupGUI( StatusBar|Create, "simpleui.rc" ); - connect( napp->player(), SIGNAL(playing()), SLOT(slotPlaying()) ); - connect( napp->player(), SIGNAL(stopped()), SLOT(slotStopped()) ); - connect( napp->player(), SIGNAL(paused()), SLOT(slotPaused()) ); - connect( napp->player(), SIGNAL(timeout()), SLOT(slotTimeout()) ); - connect( napp->player(), SIGNAL(newSong()), SLOT(slotChanged()) ); - connect( napp->player(), SIGNAL(volumeChanged(int)), SLOT(slotVolumeChanged(int)) ); - connect( napp, SIGNAL(hideYourself()), SLOT(hide()) ); - connect( napp, SIGNAL(showYourself()), SLOT(show()) ); + connect( napp->player(), TQT_SIGNAL(playing()), TQT_SLOT(slotPlaying()) ); + connect( napp->player(), TQT_SIGNAL(stopped()), TQT_SLOT(slotStopped()) ); + connect( napp->player(), TQT_SIGNAL(paused()), TQT_SLOT(slotPaused()) ); + connect( napp->player(), TQT_SIGNAL(timeout()), TQT_SLOT(slotTimeout()) ); + connect( napp->player(), TQT_SIGNAL(newSong()), TQT_SLOT(slotChanged()) ); + connect( napp->player(), TQT_SIGNAL(volumeChanged(int)), TQT_SLOT(slotVolumeChanged(int)) ); + connect( napp, TQT_SIGNAL(hideYourself()), TQT_SLOT(hide()) ); + connect( napp, TQT_SIGNAL(showYourself()), TQT_SLOT(show()) ); napp->player()->handleButtons(); @@ -85,7 +85,7 @@ SimpleUI::SimpleUI() // Load configuration KConfig &config = *KGlobal::config(); config.setGroup( "Simple" ); - QString str = config.readEntry( "View", "NormalSize" ); + TQString str = config.readEntry( "View", "NormalSize" ); if (str == "HalfSize") video->setHalfSize(); @@ -107,7 +107,7 @@ SimpleUI::~SimpleUI() KConfig &config = *KGlobal::config(); saveMainWindowSettings( &config, "Simple" ); config.setGroup( "Simple" ); - QString str; + TQString str; if (video->isHalfSize()) str = "HalfSize"; @@ -126,10 +126,10 @@ SimpleUI::~SimpleUI() void SimpleUI::setupActions() { - KStdAction::open( napp, SLOT(fileOpen()), actionCollection(), "_file_open" ); - new KAction( i18n("&Properties"), 0, propertiesDialog, SLOT(show()), + KStdAction::open( napp, TQT_SLOT(fileOpen()), actionCollection(), "_file_open" ); + new KAction( i18n("&Properties"), 0, propertiesDialog, TQT_SLOT(show()), actionCollection(), "_file_properties" ); - KStdAction::quit( napp, SLOT(quit()), actionCollection(), "_file_quit"); + KStdAction::quit( 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, SLOT(showMenubar()), + menubarAction = KStdAction::showMenubar(this, TQT_SLOT(showMenubar()), actionCollection()); - statusbarAction = KStdAction::showStatusbar(this, SLOT(showStatusbar()), + statusbarAction = KStdAction::showStatusbar(this, TQT_SLOT(showStatusbar()), actionCollection()); NoatunStdAction::effects( actionCollection(), "effects" ); NoatunStdAction::equalizer( actionCollection(), "equalizer" ); NoatunStdAction::loop( actionCollection(), "loop_style" ); - KStdAction::preferences( napp, SLOT(preferences()), actionCollection() ); + KStdAction::preferences( napp, TQT_SLOT(preferences()), actionCollection() ); } void SimpleUI::showMenubar() @@ -168,89 +168,89 @@ void SimpleUI::showStatusbar() void SimpleUI::setupCentralWidget() { - QVBox *npWidget = new QVBox( this ); + TQVBox *npWidget = new TQVBox( this ); npWidget->setMargin( 0 ); npWidget->setSpacing( 0 ); - positionLabel = new QLabel( statusBar() ); + positionLabel = new TQLabel( statusBar() ); positionLabel->setAlignment( AlignVCenter | AlignCenter ); positionLabel->setFixedSize( fontMetrics().size( 0, " 00:00/00:00 " ) ); statusBar()->addWidget( positionLabel, 0, true ); video = new VideoFrame( npWidget ); - connect( video, SIGNAL(adaptSize(int,int)), - SLOT(slotAdaptSize(int,int)) ); - connect( video, SIGNAL(rightButtonPressed(const QPoint &)), - SLOT(slotContextMenu(const QPoint &)) ); + connect( video, TQT_SIGNAL(adaptSize(int,int)), + TQT_SLOT(slotAdaptSize(int,int)) ); + connect( video, TQT_SIGNAL(rightButtonPressed(const TQPoint &)), + TQT_SLOT(slotContextMenu(const TQPoint &)) ); - QHBox *ctlFrame = new QHBox( npWidget ); + TQHBox *ctlFrame = new TQHBox( npWidget ); ctlFrame->setFixedHeight( 38 ); - ctlFrame->setFrameShape( QFrame::StyledPanel ); - ctlFrame->setFrameShadow( QFrame::Raised ); + ctlFrame->setFrameShape( TQFrame::StyledPanel ); + ctlFrame->setFrameShadow( TQFrame::Raised ); ctlFrame->setMargin( 6 ); ctlFrame->setSpacing( 6 ); - QPushButton *backButton = new QPushButton( ctlFrame ); + TQPushButton *backButton = new TQPushButton( ctlFrame ); backButton->setFixedSize( 24, 24 ); - backButton->setPixmap( QPixmap( back_xpm ) ); - QToolTip::add( backButton, i18n("Back") ); - connect( backButton, SIGNAL(clicked()), napp->player(), SLOT(back()) ); + backButton->setPixmap( TQPixmap( back_xpm ) ); + TQToolTip::add( backButton, i18n("Back") ); + connect( backButton, TQT_SIGNAL(clicked()), napp->player(), TQT_SLOT(back()) ); - stopButton = new QPushButton( ctlFrame ); + stopButton = new TQPushButton( ctlFrame ); stopButton->setFixedSize( 24, 24 ); - stopButton->setPixmap( QPixmap( stop_xpm ) ); - QToolTip::add( stopButton, i18n("Stop") ); - connect( stopButton, SIGNAL(clicked()), napp->player(), SLOT(stop()) ); + stopButton->setPixmap( TQPixmap( stop_xpm ) ); + TQToolTip::add( stopButton, i18n("Stop") ); + connect( stopButton, TQT_SIGNAL(clicked()), napp->player(), TQT_SLOT(stop()) ); - playButton = new QPushButton( ctlFrame ); + playButton = new TQPushButton( ctlFrame ); playButton->setFixedSize( 24, 24 ); - playButton->setPixmap( QPixmap( play_xpm ) ); - QToolTip::add( playButton, i18n("Play / Pause") ); - connect( playButton, SIGNAL(clicked()), napp->player(), SLOT(playpause()) ); + playButton->setPixmap( TQPixmap( play_xpm ) ); + TQToolTip::add( playButton, i18n("Play / Pause") ); + connect( playButton, TQT_SIGNAL(clicked()), napp->player(), TQT_SLOT(playpause()) ); - QPushButton *forwButton = new QPushButton( ctlFrame ); + TQPushButton *forwButton = new TQPushButton( ctlFrame ); forwButton->setFixedSize( 24, 24 ); - forwButton->setPixmap( QPixmap( forward_xpm ) ); - QToolTip::add( forwButton, i18n("Forward") ); - connect( forwButton, SIGNAL(clicked()), napp->player(), SLOT(forward()) ); + forwButton->setPixmap( TQPixmap( forward_xpm ) ); + 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->setFixedHeight( 24 ); slider->setMinimumWidth( 100 ); - slider->setTickmarks( QSlider::NoMarks ); - connect( slider, SIGNAL(userChanged(int)), SLOT(slotSkipTo(int)) ); - connect( slider, SIGNAL(sliderMoved(int)), SLOT(slotSliderMoved(int)) ); + slider->setTickmarks( TQSlider::NoMarks ); + connect( slider, TQT_SIGNAL(userChanged(int)), TQT_SLOT(slotSkipTo(int)) ); + connect( slider, TQT_SIGNAL(sliderMoved(int)), TQT_SLOT(slotSliderMoved(int)) ); - QPushButton *playlistButton = new QPushButton( ctlFrame ); + TQPushButton *playlistButton = new TQPushButton( ctlFrame ); playlistButton->setFixedSize( 24, 24 ); - playlistButton->setPixmap( QPixmap( playlist_xpm ) ); - QToolTip::add( playlistButton, i18n("Playlist") ); - connect( playlistButton, SIGNAL(clicked()), napp->player(), SLOT(toggleListView()) ); + playlistButton->setPixmap( TQPixmap( playlist_xpm ) ); + TQToolTip::add( playlistButton, i18n("Playlist") ); + connect( playlistButton, TQT_SIGNAL(clicked()), napp->player(), TQT_SLOT(toggleListView()) ); - volumeButton = new QPushButton( ctlFrame ); + volumeButton = new TQPushButton( ctlFrame ); volumeButton->setFixedSize( 24, 24 ); - volumeButton->setPixmap( QPixmap( volume_xpm ) ); - QToolTip::add( volumeButton, i18n("Volume") ); + volumeButton->setPixmap( TQPixmap( volume_xpm ) ); + TQToolTip::add( volumeButton, i18n("Volume") ); - volumeFrame = new QVBox( this, "Volume", WStyle_Customize | WType_Popup ); - volumeFrame->setFrameStyle( QFrame::PopupPanel ); + volumeFrame = new TQVBox( this, "Volume", WStyle_Customize | WType_Popup ); + volumeFrame->setFrameStyle( TQFrame::PopupPanel ); volumeFrame->setMargin( 4 ); - volumeLabel = new QLabel( volumeFrame ); + volumeLabel = new TQLabel( volumeFrame ); volumeLabel->setText( "100%" ); volumeLabel->setAlignment( AlignCenter ); volumeLabel->setFixedSize( volumeLabel->sizeHint() ); - QHBox *volumeSubFrame = new QHBox( volumeFrame ); + TQHBox *volumeSubFrame = new TQHBox( volumeFrame ); volumeSlider = new L33tSlider( 0, 100, 10, 0, Vertical, volumeSubFrame ); volumeSlider->setValue( 100 - napp->player()->volume() ); volumeSlider->setFixedSize( volumeSlider->sizeHint() ); volumeFrame->resize( volumeFrame->sizeHint() ); - connect( volumeSlider, SIGNAL(sliderMoved(int)), SLOT(slotVolumeSliderMoved(int)) ); - connect( volumeSlider, SIGNAL(userChanged(int)), SLOT(slotVolumeSliderMoved(int)) ); - connect( volumeButton, SIGNAL(clicked()), SLOT(slotVolumeFrame()) ); + connect( volumeSlider, TQT_SIGNAL(sliderMoved(int)), TQT_SLOT(slotVolumeSliderMoved(int)) ); + connect( volumeSlider, TQT_SIGNAL(userChanged(int)), TQT_SLOT(slotVolumeSliderMoved(int)) ); + connect( volumeButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotVolumeFrame()) ); setCentralWidget( npWidget ); @@ -261,17 +261,17 @@ void SimpleUI::setupCentralWidget() propertiesDialog->resize( 375, 285 ); } -void SimpleUI::closeEvent( QCloseEvent * ) +void SimpleUI::closeEvent( TQCloseEvent * ) { unload(); } -void SimpleUI::dragEnterEvent( QDragEnterEvent *event ) +void SimpleUI::dragEnterEvent( TQDragEnterEvent *event ) { event->accept( KURLDrag::canDecode( event ) ); } -void SimpleUI::dropEvent( QDropEvent *event ) +void SimpleUI::dropEvent( TQDropEvent *event ) { KURL::List uri; if (KURLDrag::decode( event, uri )) @@ -285,7 +285,7 @@ void SimpleUI::slotAdaptSize( int width, int height ) void SimpleUI::slotPlaying() { - playButton->setPixmap( QPixmap( pause_xpm ) ); + playButton->setPixmap( TQPixmap( pause_xpm ) ); stopButton->setEnabled( true ); slider->setEnabled( true ); @@ -295,7 +295,7 @@ void SimpleUI::slotPlaying() void SimpleUI::slotStopped() { - playButton->setPixmap( QPixmap( play_xpm ) ); + playButton->setPixmap( TQPixmap( play_xpm ) ); stopButton->setEnabled( false ); slider->setEnabled( false ); slider->setValue( 0 ); @@ -305,7 +305,7 @@ void SimpleUI::slotStopped() void SimpleUI::slotPaused() { - playButton->setPixmap( QPixmap( play_xpm ) ); + playButton->setPixmap( TQPixmap( play_xpm ) ); slider->setEnabled( true ); } @@ -330,7 +330,7 @@ void SimpleUI::slotChanged() napp->player()->engine()->playObject() ); } -void SimpleUI::slotContextMenu( const QPoint &pos ) +void SimpleUI::slotContextMenu( const TQPoint &pos ) { contextMenu->exec( pos ); } @@ -343,7 +343,7 @@ void SimpleUI::slotSliderMoved( int sec ) void SimpleUI::slotVolumeChanged( int volume ) { - volumeLabel->setText( QString::number( volume ) + "%" ); + volumeLabel->setText( TQString::number( volume ) + "%" ); volumeSlider->setValue( 100 - volume ); } @@ -358,8 +358,8 @@ void SimpleUI::slotVolumeFrame() int x = (volumeButton->width() - volumeFrame->width()) / 2; int y = -(volumeFrame->height() + 5); - QPoint point( volumeButton->mapToGlobal( QPoint( x, y ) ) ); - QRect deskRect = KGlobalSettings::desktopGeometry( point ); + TQPoint point( volumeButton->mapToGlobal( TQPoint( x, y ) ) ); + TQRect deskRect = KGlobalSettings::desktopGeometry( point ); bool bottom = (point.y() + volumeFrame->height()) > (deskRect.y() + deskRect.height()); bool right = (point.x() + volumeFrame->width()) > (deskRect.x() + deskRect.width()); diff --git a/noatun/modules/simple/userinterface.h b/noatun/modules/simple/userinterface.h index c545fd2c..e3a84f84 100644 --- a/noatun/modules/simple/userinterface.h +++ b/noatun/modules/simple/userinterface.h @@ -17,11 +17,11 @@ #include #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include "propertiesdialog.h" @@ -37,9 +37,9 @@ protected: void setupActions(); void setupCentralWidget(); - virtual void closeEvent( QCloseEvent * ); - virtual void dragEnterEvent( QDragEnterEvent *event ); - virtual void dropEvent( QDropEvent *event ); + virtual void closeEvent( TQCloseEvent * ); + virtual void dragEnterEvent( TQDragEnterEvent *event ); + virtual void dropEvent( TQDropEvent *event ); public slots: void slotAdaptSize( int width, int height ); @@ -49,7 +49,7 @@ public slots: void slotTimeout(); void slotSkipTo( int sec ); void slotChanged(); - void slotContextMenu( const QPoint &pos ); + void slotContextMenu( const TQPoint &pos ); private slots: void slotSliderMoved( int sec ); @@ -61,13 +61,13 @@ private slots: private: PropertiesDialog *propertiesDialog; - QPopupMenu *contextMenu; - QPushButton *stopButton; - QPushButton *playButton; - QPushButton *volumeButton; - QVBox *volumeFrame; - QLabel *volumeLabel; - QLabel *positionLabel; + TQPopupMenu *contextMenu; + TQPushButton *stopButton; + TQPushButton *playButton; + TQPushButton *volumeButton; + TQVBox *volumeFrame; + TQLabel *volumeLabel; + TQLabel *positionLabel; VideoFrame *video; L33tSlider *volumeSlider; L33tSlider *slider; diff --git a/noatun/modules/splitplaylist/find.cpp b/noatun/modules/splitplaylist/find.cpp index b6e196d9..5d378a79 100644 --- a/noatun/modules/splitplaylist/find.cpp +++ b/noatun/modules/splitplaylist/find.cpp @@ -1,17 +1,17 @@ #include "find.h" -#include +#include #include -#include -#include +#include +#include #include -Finder::Finder(QWidget *parent) : KDialogBase(parent, 0, false, i18n("Find"), Close | User1, User1, false, KGuiItem(i18n("&Find"),"find")) +Finder::Finder(TQWidget *parent) : KDialogBase(parent, 0, false, i18n("Find"), Close | User1, User1, false, KGuiItem(i18n("&Find"),"find")) { - QWidget *mainWidget = new QWidget(this); + TQWidget *mainWidget = new TQWidget(this); mainWidget->setMinimumWidth(320); setMainWidget(mainWidget); - QGridLayout *layout=new QGridLayout(mainWidget); + TQGridLayout *layout=new TQGridLayout(mainWidget); layout->setSpacing(KDialog::spacingHint()); mText=new KHistoryCombo(mainWidget); @@ -19,22 +19,22 @@ Finder::Finder(QWidget *parent) : KDialogBase(parent, 0, false, i18n("Find"), Cl mText->setFocus(); - mRegexp=new QCheckBox(i18n("&Regular expression"), mainWidget); - mBackwards=new QCheckBox(i18n("Find &backwards"), mainWidget); + 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); - connect(this, SIGNAL(user1Clicked()), SLOT(clicked())); + connect(this, TQT_SIGNAL(user1Clicked()), TQT_SLOT(clicked())); - connect(mText, SIGNAL(activated(int)), SLOT(clicked())); - connect(mText, SIGNAL(textChanged(const QString &)), SLOT(textChanged(const QString &))); + connect(mText, TQT_SIGNAL(activated(int)), TQT_SLOT(clicked())); + connect(mText, TQT_SIGNAL(textChanged(const TQString &)), TQT_SLOT(textChanged(const TQString &))); enableButton(User1, false); } -void Finder::textChanged(const QString &text) { +void Finder::textChanged(const TQString &text) { enableButton(User1, !text.isEmpty()); } @@ -54,7 +54,7 @@ void Finder::clicked() emit search(this); } -QString Finder::string() const +TQString Finder::string() const { return mText->currentText(); } diff --git a/noatun/modules/splitplaylist/find.h b/noatun/modules/splitplaylist/find.h index a4791339..752bc8dd 100644 --- a/noatun/modules/splitplaylist/find.h +++ b/noatun/modules/splitplaylist/find.h @@ -11,22 +11,22 @@ class Finder : public KDialogBase { Q_OBJECT public: - Finder(QWidget *parent); + Finder(TQWidget *parent); bool regexp() const; bool isForward() const; - QString string() const; + TQString string() const; signals: void search(Finder *); public slots: - void textChanged(const QString &); + void textChanged(const TQString &); void clicked(); private: KHistoryCombo *mText; - QCheckBox *mRegexp, *mBackwards; + TQCheckBox *mRegexp, *mBackwards; }; #endif diff --git a/noatun/modules/splitplaylist/playlist.cpp b/noatun/modules/splitplaylist/playlist.cpp index 57d6fb48..d0ded140 100644 --- a/noatun/modules/splitplaylist/playlist.cpp +++ b/noatun/modules/splitplaylist/playlist.cpp @@ -20,9 +20,9 @@ SplitPlaylist::SplitPlaylist() void SplitPlaylist::init() { view=new View(this); // 195 - connect(view->listView(), SIGNAL(executed(QListViewItem*)), SLOT(listItemSelected(QListViewItem*))); - connect(view, SIGNAL(shown()), SIGNAL(listShown())); - connect(view, SIGNAL(hidden()), SIGNAL(listHidden())); + connect(view->listView(), TQT_SIGNAL(executed(TQListViewItem*)), TQT_SLOT(listItemSelected(TQListViewItem*))); + connect(view, TQT_SIGNAL(shown()), TQT_SIGNAL(listShown())); + connect(view, TQT_SIGNAL(hidden()), TQT_SIGNAL(listHidden())); view->init(); // 1000 } @@ -112,7 +112,7 @@ PlaylistItem SplitPlaylist::previous() List *list = view->listView(); // check if the item still exists (hackitude: 50%) bool found=false; - for (QListViewItem *i = list->firstChild(); i; i = i->nextSibling()) + for (TQListViewItem *i = list->firstChild(); i; i = i->nextSibling()) { if (i == static_cast(randomPrevious.data())) { @@ -215,15 +215,15 @@ void SplitPlaylist::setCurrent(const PlaylistItem &i, bool emitC) // remove the old icon SafeListViewItem *now=static_cast(current().data()); if (now) - now->setPixmap(0, QPixmap()); + now->setPixmap(0, TQPixmap()); - QRect rect(view->listView()->itemRect(static_cast(current().data()))); + TQRect rect(view->listView()->itemRect(static_cast(current().data()))); rect.setWidth(view->listView()->viewport()->width()); currentItem=i; view->listView()->viewport()->repaint(rect,true); view->listView()->ensureItemVisible(static_cast(current().data())); - QRect currentRect= view->listView()->itemRect(static_cast(current().data())); + TQRect currentRect= view->listView()->itemRect(static_cast(current().data())); view->listView()->viewport()->repaint(currentRect); now=static_cast(current().data()); @@ -240,7 +240,7 @@ void SplitPlaylist::remove(const PlaylistItem &) // delete i; } -void SplitPlaylist::listItemSelected(QListViewItem *i) +void SplitPlaylist::listItemSelected(TQListViewItem *i) { setCurrent(PlaylistItem(static_cast(i)), false); emit playCurrent(); @@ -253,8 +253,8 @@ void SplitPlaylist::randomize() view->setSorting(false); List *lview = view->listView(); // eeeeevil :) - QPtrList list; - QPtrList items; + TQPtrList list; + TQPtrList items; for(int i = 0; i < lview->childCount(); i++) { list.append( (void*) i ); diff --git a/noatun/modules/splitplaylist/playlist.h b/noatun/modules/splitplaylist/playlist.h index 04cb648d..204d97c2 100644 --- a/noatun/modules/splitplaylist/playlist.h +++ b/noatun/modules/splitplaylist/playlist.h @@ -10,8 +10,8 @@ class PlaylistItem PlaylistItem(const KURL &u=0); virtual ~PlaylistItem(); - QString title() const; - virtual void setTitle(const QString &t); + TQString title() const; + virtual void setTitle(const TQString &t); KURL url() const; virtual void setUrl(const KURL &u); @@ -77,7 +77,7 @@ public slots: void setCurrent(const PlaylistItem &, bool emitC); void setCurrent(const PlaylistItem &); - void listItemSelected(QListViewItem*); + void listItemSelected(TQListViewItem*); void randomize(); @@ -90,7 +90,7 @@ signals: private: bool mExiting; // HACK HACK HACK HACK!!! View *view; -// QRect currentRect; +// TQRect currentRect; static SplitPlaylist *Self; }; diff --git a/noatun/modules/splitplaylist/view.cpp b/noatun/modules/splitplaylist/view.cpp index 7f5584f9..8df38afd 100644 --- a/noatun/modules/splitplaylist/view.cpp +++ b/noatun/modules/splitplaylist/view.cpp @@ -10,13 +10,13 @@ // Abandon All Hope, Ye Who Enter Here -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include #include @@ -43,8 +43,8 @@ #define SPL SplitPlaylist::SPL() -SafeListViewItem::SafeListViewItem(QListView *parent, QListViewItem *after, const KURL &text) - : QCheckListItem(parent,0, QCheckListItem::CheckBox), PlaylistItemData(), removed(false) +SafeListViewItem::SafeListViewItem(TQListView *parent, TQListViewItem *after, const KURL &text) + : TQCheckListItem(parent,0, TQCheckListItem::CheckBox), PlaylistItemData(), removed(false) { addRef(); setUrl(text); @@ -65,8 +65,8 @@ SafeListViewItem::SafeListViewItem(QListView *parent, QListViewItem *after, cons PlaylistItemData::added(); } -SafeListViewItem::SafeListViewItem(QListView *parent, QListViewItem *after, const QMap &props) - : QCheckListItem(parent, 0, QCheckListItem::CheckBox), removed(false) +SafeListViewItem::SafeListViewItem(TQListView *parent, TQListViewItem *after, const TQMap &props) + : TQCheckListItem(parent, 0, TQCheckListItem::CheckBox), removed(false) { addRef(); @@ -75,10 +75,10 @@ SafeListViewItem::SafeListViewItem(QListView *parent, QListViewItem *after, cons // A version of setProperty that assumes a key is unique, // and doesn't call modified for every new key. // Ugly, but this function is a very hot path on playlist loading - for (QMap::ConstIterator i=props.begin(); i!=props.end(); ++i ) + for (TQMap::ConstIterator i=props.begin(); i!=props.end(); ++i ) { - QString n = i.key(); - QString val = i.data(); + TQString n = i.key(); + TQString val = i.data(); if (n=="enabled") { @@ -109,12 +109,12 @@ SafeListViewItem::~SafeListViewItem() remove(); } -QString SafeListViewItem::file() const +TQString SafeListViewItem::file() const { return localFilename(); } -static void pad(QString &str) +static void pad(TQString &str) { int len=str.length(); int at = 0; @@ -123,11 +123,11 @@ static void pad(QString &str) static const int paddingsize=12; // not static for reason - const QChar chars[paddingsize] = + const TQChar chars[paddingsize] = { - QChar('0'), QChar('0'), QChar('0'), QChar('0'), - QChar('0'), QChar('0'), QChar('0'), QChar('0'), - QChar('0'), QChar('0'), QChar('0'), QChar('0') + TQChar('0'), TQChar('0'), TQChar('0'), TQChar('0'), + TQChar('0'), TQChar('0'), TQChar('0'), TQChar('0'), + TQChar('0'), TQChar('0'), TQChar('0'), TQChar('0') }; for (int i=0; i < len; i++) @@ -155,19 +155,19 @@ static void pad(QString &str) } } -int SafeListViewItem::compare(QListViewItem * i, int col, bool) const +int SafeListViewItem::compare(TQListViewItem * i, int col, bool) const { - QString text1 = text(col); - QString text2 = i->text(col); + TQString text1 = text(col); + TQString text2 = i->text(col); pad(text1); pad(text2); return text1.compare(text2); } -QString SafeListViewItem::property(const QString &n, const QString &def) const +TQString SafeListViewItem::property(const TQString &n, const TQString &def) const { - for (QValueList::ConstIterator i=mProperties.begin(); i != mProperties.end(); ++i) + for (TQValueList::ConstIterator i=mProperties.begin(); i != mProperties.end(); ++i) { if ((*i).key==n) return (*i).value; @@ -180,7 +180,7 @@ QString SafeListViewItem::property(const QString &n, const QString &def) const return def; } -void SafeListViewItem::setProperty(const QString &n, const QString &val) +void SafeListViewItem::setProperty(const TQString &n, const TQString &val) { if (n=="enabled") { @@ -201,7 +201,7 @@ void SafeListViewItem::setProperty(const QString &n, const QString &val) modified(); } -void SafeListViewItem::clearProperty(const QString &n) +void SafeListViewItem::clearProperty(const TQString &n) { if (n=="enabled") { @@ -210,7 +210,7 @@ void SafeListViewItem::clearProperty(const QString &n) return; } - for (QValueList::Iterator i=mProperties.begin(); i != mProperties.end(); ++i) + for (TQValueList::Iterator i=mProperties.begin(); i != mProperties.end(); ++i) { if ((*i).key==n) { @@ -221,18 +221,18 @@ void SafeListViewItem::clearProperty(const QString &n) } } -QStringList SafeListViewItem::properties() const +TQStringList SafeListViewItem::properties() const { - QStringList list; - for (QValueList::ConstIterator i=mProperties.begin(); i != mProperties.end(); ++i) + TQStringList list; + for (TQValueList::ConstIterator i=mProperties.begin(); i != mProperties.end(); ++i) list += (*i).key; list += "enabled"; return list; } -bool SafeListViewItem::isProperty(const QString &n) const +bool SafeListViewItem::isProperty(const TQString &n) const { - for (QValueList::ConstIterator i=mProperties.begin(); i != mProperties.end(); ++i) + for (TQValueList::ConstIterator i=mProperties.begin(); i != mProperties.end(); ++i) { if ((*i).key==n) return true; @@ -243,7 +243,7 @@ bool SafeListViewItem::isProperty(const QString &n) const void SafeListViewItem::downloaded(int percent) { if (!removed) - setText(1, QString::number(percent)+'%'); + setText(1, TQString::number(percent)+'%'); } void SafeListViewItem::downloadTimeout() @@ -285,25 +285,25 @@ void SafeListViewItem::stateChange(bool s) // if you uncheck this, uncheck thet others that // are selected too - QPtrList list=SPL->view->listView()->selectedItems(); + TQPtrList list=SPL->view->listView()->selectedItems(); // but not if I'm not selected if (list.containsRef(this)) - for (QListViewItem *i=list.first(); i != 0; i=list.next()) - static_cast(i)->setOn(s); + for (TQListViewItem *i=list.first(); i != 0; i=list.next()) + static_cast(i)->setOn(s); else - QCheckListItem::stateChange(s); + TQCheckListItem::stateChange(s); } -void SafeListViewItem::paintCell(QPainter *p, const QColorGroup &cg, int column, int width, int align) +void SafeListViewItem::paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int align) { - QCheckListItem::paintCell(p, cg, column, width, align); + TQCheckListItem::paintCell(p, cg, column, width, align); if (SPL->current() == this) { p->save(); p->setRasterOp(XorROP); - p->fillRect(0, 0, width, height(), QColor(255,255,255)); + p->fillRect(0, 0, width, height(), TQColor(255,255,255)); p->restore(); } @@ -354,11 +354,11 @@ List::List(View *parent) setDropVisualizer(true); setDragEnabled(true); setItemsMovable(true); - setSelectionMode(QListView::Extended); - connect(this, SIGNAL(dropped(QDropEvent*, QListViewItem*)), SLOT(dropEvent(QDropEvent*, QListViewItem*))); - connect(this, SIGNAL(moved()), SLOT(move())); - connect(this, SIGNAL(aboutToMove()), parent, SLOT(setNoSorting())); - connect(this, SIGNAL(deleteCurrentItem()), parent, SLOT(deleteSelected())); + 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())); } List::~List() @@ -370,12 +370,12 @@ void List::move() emit modified(); } -bool List::acceptDrag(QDropEvent *event) const +bool List::acceptDrag(TQDropEvent *event) const { return KURLDrag::canDecode(event) || KListView::acceptDrag(event); } -void List::dropEvent(QDropEvent *event, QListViewItem *after) +void List::dropEvent(TQDropEvent *event, TQListViewItem *after) { static_cast(parent())->setNoSorting(); KURL::List textlist; @@ -390,7 +390,7 @@ void List::dropEvent(QDropEvent *event, QListViewItem *after) emit modified(); } -void List::keyPressEvent(QKeyEvent *e) +void List::keyPressEvent(TQKeyEvent *e) { if (e->key()==Key_Enter || e->key()==Key_Return) { @@ -425,18 +425,18 @@ class NoatunSaver : public PlaylistSaver List *mList; SafeListViewItem *after, *mFirst; public: - NoatunSaver(List *l, QListViewItem *after=0) + NoatunSaver(List *l, TQListViewItem *after=0) : mList(l) { this->after = static_cast(after); mFirst = 0; } - QListViewItem *getAfter() { return after; } - QListViewItem *getFirst() { return mFirst; } + TQListViewItem *getAfter() { return after; } + TQListViewItem *getFirst() { return mFirst; } protected: - virtual void readItem(const QMap &properties) + virtual void readItem(const TQMap &properties) { after = new SafeListViewItem(mList, after, properties); if (mFirst==0) @@ -474,10 +474,10 @@ bool View::saveToURL(const KURL &url) void View::exportTo(const KURL &url) { - QString local(napp->tempSaveName(url.path())); - QFile saver(local); + TQString local(napp->tempSaveName(url.path())); + TQFile saver(local); saver.open(IO_ReadWrite | IO_Truncate); - QTextStream t(&saver); + TQTextStream t(&saver); // navigate the list for (SafeListViewItem *i=static_cast(listView()->firstChild()); i != 0; i=static_cast(i->itemBelow())) @@ -495,7 +495,7 @@ void View::exportTo(const KURL &url) saver.remove(); } -QListViewItem *List::openGlobal(const KURL &u, QListViewItem *after) +TQListViewItem *List::openGlobal(const KURL &u, TQListViewItem *after) { clear(); NoatunSaver saver(this, after); @@ -505,7 +505,7 @@ QListViewItem *List::openGlobal(const KURL &u, QListViewItem *after) } // for m3u files -QListViewItem *List::importGlobal(const KURL &u, QListViewItem *after) +TQListViewItem *List::importGlobal(const KURL &u, TQListViewItem *after) { NoatunSaver saver(this, after); if (!saver.metalist(u)) @@ -524,7 +524,7 @@ QListViewItem *List::importGlobal(const KURL &u, QListViewItem *after) return saver.getAfter(); } -QListViewItem *List::addFile(const KURL& url, bool play, QListViewItem *after) +TQListViewItem *List::addFile(const KURL& url, bool play, TQListViewItem *after) { // when a new item is added, we don't want to sort anymore SPL->view->setNoSorting(); @@ -536,7 +536,7 @@ QListViewItem *List::addFile(const KURL& url, bool play, QListViewItem *after) ) { // a playlist is requested - QListViewItem *i = importGlobal(url, after); + TQListViewItem *i = importGlobal(url, after); if (play) SPL->listItemSelected(i); return i; @@ -552,7 +552,7 @@ QListViewItem *List::addFile(const KURL& url, bool play, QListViewItem *after) } else { - QListViewItem *i = new SafeListViewItem(this, after, url); + TQListViewItem *i = new SafeListViewItem(this, after, url); if (play) SPL->listItemSelected(i); return i; @@ -569,22 +569,22 @@ void List::addNextPendingDirectory() currentJobURL= *pendingIt; listJob= KIO::listRecursive(currentJobURL, false,false); connect( - listJob, SIGNAL(entries(KIO::Job*, const KIO::UDSEntryList&)), - SLOT(slotEntries(KIO::Job*, const KIO::UDSEntryList&)) + listJob, TQT_SIGNAL(entries(KIO::Job*, const KIO::UDSEntryList&)), + TQT_SLOT(slotEntries(KIO::Job*, const KIO::UDSEntryList&)) ); connect( - listJob, SIGNAL(result(KIO::Job *)), - SLOT(slotResult(KIO::Job *)) + listJob, TQT_SIGNAL(result(KIO::Job *)), + TQT_SLOT(slotResult(KIO::Job *)) ); connect( - listJob, SIGNAL(redirection(KIO::Job *, const KURL &)), - SLOT(slotRedirection(KIO::Job *, const KURL &)) + listJob, TQT_SIGNAL(redirection(KIO::Job *, const KURL &)), + TQT_SLOT(slotRedirection(KIO::Job *, const KURL &)) ); pendingAddDirectories.remove(pendingIt); } } -void List::addDirectoryRecursive(const KURL &dir, QListViewItem *after) +void List::addDirectoryRecursive(const KURL &dir, TQListViewItem *after) { if (!after) after=lastItem(); recursiveAddAfter= after; @@ -602,7 +602,7 @@ void List::slotResult(KIO::Job *job) void List::slotEntries(KIO::Job *, const KIO::UDSEntryList &entries) { - QMap __list; // temp list to sort entries + TQMap __list; // temp list to sort entries KIO::UDSEntryListConstIterator it = entries.begin(); KIO::UDSEntryListConstIterator end = entries.end(); @@ -619,7 +619,7 @@ void List::slotEntries(KIO::Job *, const KIO::UDSEntryList &entries) if (!file.isDir()) __list.insert(file.url().path(), file.url()); } - QMap::Iterator __it; + TQMap::Iterator __it; for( __it = __list.begin(); __it != __list.end(); ++__it ) { recursiveAddAfter= addFile(__it.data(), false, recursiveAddAfter); @@ -638,25 +638,25 @@ View::View(SplitPlaylist *) { list=new List(this); setCentralWidget(list); - connect(list, SIGNAL(modified(void)), this, SLOT(setModified(void)) ); + connect(list, TQT_SIGNAL(modified(void)), this, TQT_SLOT(setModified(void)) ); // connect the click on the header with sorting - connect(list->header(),SIGNAL(clicked(int)),this,SLOT(headerClicked(int)) ); + connect(list->header(),TQT_SIGNAL(clicked(int)),this,TQT_SLOT(headerClicked(int)) ); - mOpen=new KAction(i18n("Add &Files..."), "queue", 0, this, SLOT(addFiles()), actionCollection(), "add_files"); - (void) new KAction(i18n("Add Fol&ders..."), "folder", 0, this, SLOT(addDirectory()), actionCollection(), "add_dir"); - mDelete=new KAction(i18n("Delete"), "editdelete", Key_Delete, this, SLOT(deleteSelected()), actionCollection(), "delete"); + 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"); - mClose=KStdAction::close(this, SLOT(close()), actionCollection()); - mFind=KStdAction::find(this, SLOT(find()), actionCollection()); + mClose=KStdAction::close(this, TQT_SLOT(close()), actionCollection()); + mFind=KStdAction::find(this, TQT_SLOT(find()), actionCollection()); - (void) KStdAction::configureToolbars(this, SLOT(configureToolBars()), actionCollection()); - mOpenNew=KStdAction::openNew(this, SLOT(openNew()), actionCollection()); - mOpenpl=KStdAction::open(this, SLOT(open()), actionCollection()); - mSave=KStdAction::save(this, SLOT(save()), actionCollection()); - mSaveAs=KStdAction::saveAs(this, SLOT(saveAs()), 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) new KAction(i18n("Shuffle"), "misc", 0, SPL, SLOT( randomize() ), actionCollection(), "shuffle"); - (void) new KAction(i18n("Clear"), "editclear", 0, list, SLOT( clear() ), actionCollection(), "clear"); + (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"); createGUI("splui.rc"); @@ -669,10 +669,10 @@ View::View(SplitPlaylist *) void View::find() { mFinder->show(); - connect(mFinder, SIGNAL(search(Finder*)), SLOT(findIt(Finder*))); + connect(mFinder, TQT_SIGNAL(search(Finder*)), TQT_SLOT(findIt(Finder*))); } -static bool testWord(QListViewItem *i, const QString &finder) +static bool testWord(TQListViewItem *i, const TQString &finder) { PlaylistItemData *item=static_cast(i); if (item->title().find(finder, 0, false) >=0) @@ -688,7 +688,7 @@ static bool testWord(QListViewItem *i, const QString &finder) return false; } -static bool testWord(QListViewItem *i, const QRegExp &finder) +static bool testWord(TQListViewItem *i, const TQRegExp &finder) { PlaylistItemData *item=static_cast(i); if (item->title().find(finder) >=0) @@ -706,7 +706,7 @@ static bool testWord(QListViewItem *i, const QRegExp &finder) void View::findIt(Finder *f) { - QListViewItem *search=list->currentItem(); + TQListViewItem *search=list->currentItem(); if (list->currentItem()) { @@ -728,7 +728,7 @@ void View::findIt(Finder *f) { if (f->regexp()) { - if (testWord(search, QRegExp(f->string(), false))) + if (testWord(search, TQRegExp(f->string(), false))) break; } else @@ -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?"),QString::null,KStdGuiItem::cont(),KStdGuiItem::cancel()) == KMessageBox::Yes) + if (KMessageBox::questionYesNo(this, i18n("End of playlist reached. Continue searching from beginning?"),TQString::null,KStdGuiItem::cont(),KStdGuiItem::cancel()) == KMessageBox::Yes) search=list->firstChild(); } else { - if (KMessageBox::questionYesNo(this, i18n("Beginning of playlist reached. Continue searching from end?"),QString::null,KStdGuiItem::cont(),KStdGuiItem::cancel()) == KMessageBox::Yes) + if (KMessageBox::questionYesNo(this, i18n("Beginning of playlist reached. Continue searching from end?"),TQString::null,KStdGuiItem::cont(),KStdGuiItem::cancel()) == KMessageBox::Yes) search=list->lastChild(); } } @@ -760,8 +760,8 @@ void View::findIt(Finder *f) if (search) { { // select none - QPtrList sel=list->selectedItems(); - for (QListViewItem *i=sel.first(); i!=0; i=sel.next()) + TQPtrList sel=list->selectedItems(); + for (TQListViewItem *i=sel.first(); i!=0; i=sel.next()) list->setSelected(i, false); } list->setSelected(search, true); @@ -781,7 +781,7 @@ View::~View() void View::init() { // see if we are importing an old-style list - bool importing= ! QFile(napp->dirs()->saveLocation("data", "noatun/") + "splitplaylist.xml").exists(); + bool importing= ! TQFile(napp->dirs()->saveLocation("data", "noatun/") + "splitplaylist.xml").exists(); if (importing) { @@ -802,7 +802,7 @@ void View::init() // this has to come after openGlobal, since openGlobal emits modified() setModified(config.readBoolEntry("modified", false)); - QString path = config.readPathEntry("file"); + TQString path = config.readPathEntry("file"); // don't call setPath with an empty path, that would make the url "valid" if ( !path.isEmpty() ) mPlaylistFile.setPath(path); @@ -860,18 +860,18 @@ void List::clear() { SPL->setCurrent(0); - QListView::clear(); + TQListView::clear(); } void View::deleteSelected() { - QPtrList items(list->selectedItems()); + TQPtrList items(list->selectedItems()); bool stopped=false; // noatun shouldn't play files for now - QListViewItem *afterLast=0; + TQListViewItem *afterLast=0; - for (QPtrListIterator it(items); it.current(); ++it) + for (TQPtrListIterator it(items); it.current(); ++it) { SafeListViewItem *i = static_cast(*it); if (!stopped && SPL->current() == i) @@ -895,7 +895,7 @@ void View::addFiles() { KURL::List files=KFileDialog::getOpenURLs(":mediadir", napp->mimeTypes(), this, i18n("Select File to Play")); - QListViewItem *last = list->lastItem(); + TQListViewItem *last = list->lastItem(); for(KURL::List::Iterator it=files.begin(); it!=files.end(); ++it) last = addFile(KURL(*it), false); @@ -904,7 +904,7 @@ void View::addFiles() void View::addDirectory() { - QString file=KFileDialog::getExistingDirectory(0, this, i18n("Select Folder")); + TQString file=KFileDialog::getExistingDirectory(0, this, i18n("Select Folder")); if (!file) return; KURL url; @@ -914,17 +914,17 @@ void View::addDirectory() setModified(true); } -void View::closeEvent(QCloseEvent*) +void View::closeEvent(TQCloseEvent*) { hide(); } -void View::showEvent(QShowEvent *) +void View::showEvent(TQShowEvent *) { emit shown(); } -void View::hideEvent(QHideEvent *) +void View::hideEvent(TQHideEvent *) { emit hidden(); } @@ -964,7 +964,7 @@ void View::configureToolBars() { saveMainWindowSettings(KGlobal::config(), "SPL Window"); KEditToolbar dlg(actionCollection(), "splui.rc"); - connect(&dlg, SIGNAL(newToolbarConfig()), SLOT(newToolBarConfig())); + connect(&dlg, TQT_SIGNAL(newToolbarConfig()), TQT_SLOT(newToolBarConfig())); dlg.exec(); } diff --git a/noatun/modules/splitplaylist/view.h b/noatun/modules/splitplaylist/view.h index 18dc917a..785608fd 100644 --- a/noatun/modules/splitplaylist/view.h +++ b/noatun/modules/splitplaylist/view.h @@ -1,12 +1,12 @@ #ifndef VIEW_H #define VIEW_H -#include -#include +#include +#include #include #include -#include -#include +#include +#include #include #include @@ -21,19 +21,19 @@ class SafeListViewItem , public DownloadItem { public: - SafeListViewItem(QListView *parent, QListViewItem *after, const KURL &text); - SafeListViewItem(QListView *parent, QListViewItem *after, const QMap &properties); + SafeListViewItem(TQListView *parent, TQListViewItem *after, const KURL &text); + SafeListViewItem(TQListView *parent, TQListViewItem *after, const TQMap &properties); virtual ~SafeListViewItem(); - virtual QString property(const QString &, const QString & = 0) const; - virtual void setProperty(const QString &, const QString &); - virtual void clearProperty(const QString &); - virtual QStringList properties() const; - virtual bool isProperty(const QString &) const; + virtual TQString property(const TQString &, const TQString & = 0) const; + virtual void setProperty(const TQString &, const TQString &); + virtual void clearProperty(const TQString &); + virtual TQStringList properties() const; + virtual bool isProperty(const TQString &) const; - virtual QString file() const; + virtual TQString file() const; - int compare(QListViewItem * i, int col, bool ascending) const; + int compare(TQListViewItem * i, int col, bool ascending) const; virtual void remove(); protected: @@ -43,15 +43,15 @@ protected: virtual void modified(); virtual void stateChange(bool s); - void paintCell(QPainter *p, const QColorGroup &cg, int column, int width, int align); + void paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int align); private: struct Property { - QString key; - QString value; + TQString key; + TQString value; }; - QValueList mProperties; + TQValueList mProperties; bool removed; }; @@ -62,10 +62,10 @@ friend class View; public: List(View *parent); virtual ~List(); - QListViewItem *openGlobal(const KURL&, QListViewItem * =0); - QListViewItem *importGlobal(const KURL&, QListViewItem * =0); - QListViewItem *addFile(const KURL&, bool play=false, QListViewItem * =0); - void addDirectoryRecursive(const KURL &dir, QListViewItem *after= 0); + TQListViewItem *openGlobal(const KURL&, TQListViewItem * =0); + TQListViewItem *importGlobal(const KURL&, TQListViewItem * =0); + TQListViewItem *addFile(const KURL&, bool play=false, TQListViewItem * =0); + void addDirectoryRecursive(const KURL &dir, TQListViewItem *after= 0); public slots: virtual void clear(); @@ -75,15 +75,15 @@ signals: void deleteCurrentItem(); protected: - virtual bool acceptDrag(QDropEvent *event) const; - virtual void keyPressEvent(QKeyEvent *e); + virtual bool acceptDrag(TQDropEvent *event) const; + virtual void keyPressEvent(TQKeyEvent *e); protected slots: - virtual void dropEvent(QDropEvent *event, QListViewItem *after); + virtual void dropEvent(TQDropEvent *event, TQListViewItem *after); void move(); protected: - QListViewItem *recursiveAddAfter; + TQListViewItem *recursiveAddAfter; protected slots: // used when adding directories via KIO::listRecursive @@ -111,7 +111,7 @@ public: void init(); virtual ~View(); List *listView() const { return list; } - QListViewItem *addFile(const KURL &u, bool play=false) + TQListViewItem *addFile(const KURL &u, bool play=false) { return list->addFile(u, play, list->lastItem()); } @@ -143,9 +143,9 @@ protected: void exportTo(const KURL &); void setModified(bool); - virtual void closeEvent(QCloseEvent*e); - virtual void showEvent(QShowEvent *); - virtual void hideEvent(QHideEvent *); + virtual void closeEvent(TQCloseEvent*e); + virtual void showEvent(TQShowEvent *); + virtual void hideEvent(TQHideEvent *); signals: void hidden(); diff --git a/noatun/modules/systray/cmodule.cpp b/noatun/modules/systray/cmodule.cpp index 4adf7e44..c0e04fd3 100644 --- a/noatun/modules/systray/cmodule.cpp +++ b/noatun/modules/systray/cmodule.cpp @@ -30,25 +30,25 @@ #include //#include #include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include -YHModule::YHModule(QObject *_parent) +YHModule::YHModule(TQObject *_parent) : CModule(i18n("System Tray Icon"), i18n("Configure System Tray Icon"), "bottom", _parent) { - QVBoxLayout *top = new QVBoxLayout(this); + TQVBoxLayout *top = new TQVBoxLayout(this); mWidget = new YHConfigWidget(this); top->addWidget(mWidget); @@ -58,9 +58,9 @@ YHModule::YHModule(QObject *_parent) mWidget->cmbModifier->insertItem(i18n("Ctrl"), YHConfig::Ctrl); mWidget->cmbModifier->setCurrentItem(YHConfig::None); - connect(mWidget->chkUsePopup, SIGNAL(toggled(bool)), this, SLOT(slotUsePopupToggled(bool))); - connect(mWidget->cmbModifier, SIGNAL(activated(int)), this, SLOT(slotModifierActivated(int))); - connect(mWidget->grpMwheel, SIGNAL(clicked(int)), this, SLOT(slotMwheelClicked(int))); + connect(mWidget->chkUsePopup, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotUsePopupToggled(bool))); + connect(mWidget->cmbModifier, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotModifierActivated(int))); + connect(mWidget->grpMwheel, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(slotMwheelClicked(int))); reopen(); } diff --git a/noatun/modules/systray/cmodule.h b/noatun/modules/systray/cmodule.h index fecc70e3..fd9cae2c 100644 --- a/noatun/modules/systray/cmodule.h +++ b/noatun/modules/systray/cmodule.h @@ -26,7 +26,7 @@ #ifndef CMODULE_H #define CMODULE_H -#include +#include #include class YHConfigWidget; @@ -35,7 +35,7 @@ class YHModule : public CModule { Q_OBJECT public: - YHModule(QObject *_parent); + YHModule(TQObject *_parent); virtual void save(); virtual void reopen(); @@ -44,7 +44,7 @@ Q_OBJECT private: YHConfigWidget *mWidget; - QMap mActionMap; + TQMap mActionMap; private slots: void slotUsePopupToggled(bool on); diff --git a/noatun/modules/systray/kitsystemtray.cpp b/noatun/modules/systray/kitsystemtray.cpp index 5847d7da..8e42a3ed 100644 --- a/noatun/modules/systray/kitsystemtray.cpp +++ b/noatun/modules/systray/kitsystemtray.cpp @@ -33,7 +33,7 @@ #include #include -#include +#include #include "kitsystemtray.h" #include @@ -44,26 +44,26 @@ #include -KitSystemTray::KitSystemTray(const QString &contextMenu, KMainWindow *parent, const char *name) +KitSystemTray::KitSystemTray(const TQString &contextMenu, KMainWindow *parent, const char *name) : KSystemTray(parent, name) { setAlignment(AlignHCenter | AlignVCenter); menu = (KPopupMenu *)parent->guiFactory()->container(contextMenu, parent); - menu->insertTitle(SmallIcon("noatun"), QString::null, 0, 0); + menu->insertTitle(SmallIcon("noatun"), TQString::null, 0, 0); setAcceptDrops(true); } -void KitSystemTray::changeTitle(const QPixmap &pixmap, const QString &title) +void KitSystemTray::changeTitle(const TQPixmap &pixmap, const TQString &title) { menu->changeTitle(0, pixmap, title); } -void KitSystemTray::showEvent(QShowEvent *) +void KitSystemTray::showEvent(TQShowEvent *) { // empty } -void KitSystemTray::mousePressEvent(QMouseEvent *event) +void KitSystemTray::mousePressEvent(TQMouseEvent *event) { switch(event->button()) { @@ -82,12 +82,12 @@ void KitSystemTray::mousePressEvent(QMouseEvent *event) } } -void KitSystemTray::dragEnterEvent(QDragEnterEvent * event) +void KitSystemTray::dragEnterEvent(TQDragEnterEvent * event) { event->accept(KURLDrag::canDecode(event)); // accept uri drops only } -void KitSystemTray::dropEvent(QDropEvent * event) +void KitSystemTray::dropEvent(TQDropEvent * event) { KURL::List uris; if (KURLDrag::decode(event, uris)) @@ -98,7 +98,7 @@ void KitSystemTray::dropEvent(QDropEvent * event) } } -void KitSystemTray::wheelEvent(QWheelEvent *event) +void KitSystemTray::wheelEvent(TQWheelEvent *event) { YHConfig *c = YHConfig::self(); diff --git a/noatun/modules/systray/kitsystemtray.h b/noatun/modules/systray/kitsystemtray.h index 2f640adb..d697ca95 100644 --- a/noatun/modules/systray/kitsystemtray.h +++ b/noatun/modules/systray/kitsystemtray.h @@ -39,14 +39,14 @@ class KitSystemTray : public KSystemTray Q_OBJECT public: - KitSystemTray(const QString &contextMenu, KMainWindow *parent, const char *name = 0); - void changeTitle(const QPixmap &, const QString &); + KitSystemTray(const TQString &contextMenu, KMainWindow *parent, const char *name = 0); + void changeTitle(const TQPixmap &, const TQString &); protected: - virtual void showEvent(QShowEvent *); - virtual void mousePressEvent(QMouseEvent *); - virtual void dragEnterEvent(QDragEnterEvent *); - virtual void dropEvent(QDropEvent *); - virtual void wheelEvent(QWheelEvent *e); + virtual void showEvent(TQShowEvent *); + virtual void mousePressEvent(TQMouseEvent *); + virtual void dragEnterEvent(TQDragEnterEvent *); + virtual void dropEvent(TQDropEvent *); + virtual void wheelEvent(TQWheelEvent *e); KPopupMenu *menu; }; diff --git a/noatun/modules/systray/systray.cpp b/noatun/modules/systray/systray.cpp index c93080ca..2493bdbc 100644 --- a/noatun/modules/systray/systray.cpp +++ b/noatun/modules/systray/systray.cpp @@ -40,21 +40,21 @@ #include #include -#include +#include #include #include #include #include #include #include -#include -#include -#include -#include -#include -#include - -#include +#include +#include +#include +#include +#include +#include + +#include #include #include #include @@ -72,15 +72,15 @@ const int COVER_MAXH = 128; class PassivePopup : public KPassivePopup { public: - PassivePopup(QWidget *parent = 0, const char *name = 0) : KPassivePopup(parent, name) {} + PassivePopup(TQWidget *parent = 0, const char *name = 0) : KPassivePopup(parent, name) {} protected: - virtual void enterEvent(QEvent *) + virtual void enterEvent(TQEvent *) { setTimeout(3000000); // Make timeout damn near infinite } - virtual void leaveEvent(QEvent *) + virtual void leaveEvent(TQEvent *) { setTimeout(250); // Close quickly } @@ -100,9 +100,9 @@ NoatunSystray::NoatunSystray() : KMainWindow(0, "NoatunSystray"), Plugin(), removeCover(); // make sure any old temp cover is gone - KStdAction::quit(napp, SLOT(quit()), actionCollection()); - KStdAction::open(napp, SLOT(fileOpen()), actionCollection()); - KStdAction::preferences(napp, SLOT(preferences()), actionCollection()); + KStdAction::quit(napp, TQT_SLOT(quit()), actionCollection()); + KStdAction::open(napp, TQT_SLOT(fileOpen()), actionCollection()); + KStdAction::preferences(napp, TQT_SLOT(preferences()), actionCollection()); NoatunStdAction::back(actionCollection(), "back"); NoatunStdAction::stop(actionCollection(), "stop"); NoatunStdAction::playpause(actionCollection(), "play"); @@ -117,18 +117,18 @@ NoatunSystray::NoatunSystray() : KMainWindow(0, "NoatunSystray"), Plugin(), mTray = new KitSystemTray("tray", this); mTray->show(); - trayBase = renderIcon(BASEICON, QString::null); + trayBase = renderIcon(BASEICON, TQString::null); trayStatus = renderIcon(BASEICON, "player_stop"); mTray->changeTitle(*trayBase, i18n("Noatun")); showingTrayStatus = false; - mBlinkTimer = new QTimer(this); - connect(mBlinkTimer, SIGNAL(timeout()), this, SLOT(slotBlinkTimer())); + mBlinkTimer = new TQTimer(this); + connect(mBlinkTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotBlinkTimer())); - connect(napp->player(), SIGNAL(playing()), this, SLOT(slotPlayPause())); - connect(napp->player(), SIGNAL(paused()), this, SLOT(slotPlayPause())); - connect(napp->player(), SIGNAL(stopped()), this, SLOT(slotStopped())); + connect(napp->player(), TQT_SIGNAL(playing()), this, TQT_SLOT(slotPlayPause())); + connect(napp->player(), TQT_SIGNAL(paused()), this, TQT_SLOT(slotPlayPause())); + connect(napp->player(), TQT_SIGNAL(stopped()), this, TQT_SLOT(slotStopped())); //napp->player()->handleButtons(); } @@ -146,7 +146,7 @@ NoatunSystray::~NoatunSystray() void NoatunSystray::init() { YHModule *cmod = new YHModule(this); - connect(cmod, SIGNAL(saved()), this, SLOT(slotLoadSettings())); + connect(cmod, TQT_SIGNAL(saved()), this, TQT_SLOT(slotLoadSettings())); slotLoadSettings(); } @@ -165,9 +165,9 @@ void NoatunSystray::slotLoadSettings() if(c->tip()) - QToolTip::add(mTray, tipText); + TQToolTip::add(mTray, tipText); else - QToolTip::remove(mTray); + TQToolTip::remove(mTray); if (!c->passivePopupCovers()) removeCover(); @@ -184,7 +184,7 @@ void NoatunSystray::slotLoadSettings() } -void NoatunSystray::closeEvent(QCloseEvent*) +void NoatunSystray::closeEvent(TQCloseEvent*) { //kdDebug(66666) << k_funcinfo << "Called." << endl; disconnect(napp->player(), 0, 0, 0); @@ -194,7 +194,7 @@ void NoatunSystray::closeEvent(QCloseEvent*) void NoatunSystray::slotPlayPause() { - QString status; + TQString status; if(napp->player()->isPaused()) { @@ -208,26 +208,26 @@ void NoatunSystray::slotPlayPause() } const PlaylistItem item = napp->player()->current(); - QString s; + TQString s; if(!item.isProperty("title")) { // No metadata - s = QString("%1").arg(item.title()); + s = TQString("%1").arg(item.title()); } else { - s = QString("

%1

").arg(item.property("title")); + s = TQString("

%1

").arg(item.property("title")); if(item.isProperty("author")) - s += QString("%1
").arg(item.property("author")); + s += TQString("%1
").arg(item.property("author")); if(item.isProperty("album")) { if(item.isProperty("date")) - s += QString("%1 (%2)
").arg(item.property("album")).arg(item.property("date")); + s += TQString("%1 (%2)
").arg(item.property("album")).arg(item.property("date")); else - s += QString("%1
").arg(item.property("album")); + s += TQString("%1
").arg(item.property("album")); } } @@ -235,18 +235,18 @@ void NoatunSystray::slotPlayPause() if (YHConfig::self()->passivePopupCovers()) updateCover(); - if(YHConfig::self()->passivePopupCovers() && QFile::exists(tmpCoverPath)) + if(YHConfig::self()->passivePopupCovers() && TQFile::exists(tmpCoverPath)) { // QT always adds an empty line after the table so we add en empty line before the // table to get equal spacing on top and bottom - setTipText(QString("
" \ + setTipText(TQString("
" \ "" \ "" \ "

%1

%2
").arg(status).arg(s).arg(tmpCoverPath)); } else { - setTipText(QString("

%1

%2
").arg(status).arg(s)); + setTipText(TQString("

%1

%2
").arg(status).arg(s)); } } @@ -256,12 +256,12 @@ void NoatunSystray::slotStopped() if(!napp->player()->current()) return; changeTray("player_stop"); - setTipText(QString("

%1

").arg(i18n("Noatun - Stopped"))); + setTipText(TQString("

%1

").arg(i18n("Noatun - Stopped"))); } -void NoatunSystray::changeTray(const QString &pm) +void NoatunSystray::changeTray(const TQString &pm) { delete trayStatus; trayStatus = renderIcon(BASEICON, pm); @@ -297,19 +297,19 @@ void NoatunSystray::slotBlinkTimer() void NoatunSystray::updateCover() { //kdDebug(66666) << k_funcinfo << endl; - QString dir = napp->player()->current().url().directory(); - QString cover; + TQString dir = napp->player()->current().url().directory(); + TQString cover; // TODO: Maybe make these filenames configurable? - if(QFile::exists(dir + "/folder.png")) + if(TQFile::exists(dir + "/folder.png")) cover = dir + "/folder.png"; - else if(QFile::exists(dir + "/.folder.png")) + else if(TQFile::exists(dir + "/.folder.png")) cover = dir + "/.folder.png"; - else if(QFile::exists(dir + "/cover.png")) + else if(TQFile::exists(dir + "/cover.png")) cover = dir + "/cover.png"; - else if(QFile::exists(dir + "/cover.jpg")) + else if(TQFile::exists(dir + "/cover.jpg")) cover = dir + "/cover.jpg"; - else if(QFile::exists(dir + "/cover.jpeg")) + else if(TQFile::exists(dir + "/cover.jpeg")) cover = dir + "/cover.jpeg"; else // no cover { @@ -318,9 +318,9 @@ void NoatunSystray::updateCover() return; } - QString title = napp->player()->current().title(); + TQString title = napp->player()->current().title(); - QImage previmg; + TQImage previmg; previmg.load(tmpCoverPath); if(previmg.text("Title") != title) @@ -328,13 +328,13 @@ void NoatunSystray::updateCover() /*kdDebug(66666) << k_funcinfo << "Creating new temp cover for '" << cover << "'" << endl;*/ - QImage src; - QImage tmpimg; + TQImage src; + TQImage tmpimg; if(src.load(cover)) { if(src.width() >= COVER_MAXW || src.height() >= COVER_MAXH) - tmpimg = src.scale(COVER_MAXW, COVER_MAXH, QImage::ScaleMin); + tmpimg = src.scale(COVER_MAXW, COVER_MAXH, TQImage::ScaleMin); else tmpimg = src; @@ -351,12 +351,12 @@ void NoatunSystray::updateCover() void NoatunSystray::removeCover() { - if(QFile::exists(tmpCoverPath)) + if(TQFile::exists(tmpCoverPath)) KIO::NetAccess::del(KURL(tmpCoverPath), this); } -void NoatunSystray::setTipText(const QString& text) +void NoatunSystray::setTipText(const TQString& text) { if(text == tipText) // save the planet, save cpu cycles ;) return; @@ -364,10 +364,10 @@ void NoatunSystray::setTipText(const QString& text) YHConfig *c = YHConfig::self(); if(c->passivePopup()) - QTimer::singleShot(0, this, SLOT(showPassivePopup())); + TQTimer::singleShot(0, this, TQT_SLOT(showPassivePopup())); if(c->tip()) - QToolTip::add(mTray, tipText); + TQToolTip::add(mTray, tipText); } @@ -379,12 +379,12 @@ void NoatunSystray::showPassivePopup() return; } - mPassivePopup->reparent(0L, QPoint(0,0)); + mPassivePopup->reparent(0L, TQPoint(0,0)); if (YHConfig::self()->passivePopupButtons() && !napp->player()->isStopped()) { - QVBox *widget = mPassivePopup->standardView(QString::null, tipText, QPixmap()); - QHBox *box = new QHBox(mPassivePopup, "popupbox"); + TQVBox *widget = mPassivePopup->standardView(TQString::null, tipText, TQPixmap()); + TQHBox *box = new TQHBox(mPassivePopup, "popupbox"); box->setSpacing(8); @@ -394,52 +394,52 @@ void NoatunSystray::showPassivePopup() NETRect frame, win; ni.kdeGeometry(frame, win); - QRect bounds = KGlobalSettings::desktopGeometry(QPoint(win.pos.x, win.pos.y)); + TQRect bounds = KGlobalSettings::desktopGeometry(TQPoint(win.pos.x, win.pos.y)); if(win.pos.x < bounds.center().x()) { // Buttons to the left - QVBox *buttonBox = new QVBox(box); + TQVBox *buttonBox = new TQVBox(box); buttonBox->setSpacing(3); - QPushButton *forwardButton = new QPushButton(action("forward")->iconSet(), 0, buttonBox, "popup_forward"); + TQPushButton *forwardButton = new TQPushButton(action("forward")->iconSet(), 0, buttonBox, "popup_forward"); forwardButton->setFlat(true); - connect(forwardButton, SIGNAL(clicked()), action("forward"), SLOT(activate())); + connect(forwardButton, TQT_SIGNAL(clicked()), action("forward"), TQT_SLOT(activate())); - QPushButton *backButton = new QPushButton(action("back")->iconSet(), 0, buttonBox, "popup_back"); + TQPushButton *backButton = new TQPushButton(action("back")->iconSet(), 0, buttonBox, "popup_back"); backButton->setFlat(true); - connect(backButton, SIGNAL(clicked()), action("back"), SLOT(activate())); + connect(backButton, TQT_SIGNAL(clicked()), action("back"), TQT_SLOT(activate())); - QFrame *line = new QFrame(box); - line->setFrameShape(QFrame::VLine); + TQFrame *line = new TQFrame(box); + line->setFrameShape(TQFrame::VLine); - widget->reparent(box, QPoint(0, 0)); + widget->reparent(box, TQPoint(0, 0)); } else { // Buttons to the right - widget->reparent(box, QPoint(0, 0)); + widget->reparent(box, TQPoint(0, 0)); - QFrame *line = new QFrame(box); - line->setFrameShape(QFrame::VLine); + TQFrame *line = new TQFrame(box); + line->setFrameShape(TQFrame::VLine); - QVBox *buttonBox = new QVBox(box); + TQVBox *buttonBox = new TQVBox(box); buttonBox->setSpacing(3); - QPushButton *forwardButton = new QPushButton(action("forward")->iconSet(), 0, buttonBox, "popup_forward"); + TQPushButton *forwardButton = new TQPushButton(action("forward")->iconSet(), 0, buttonBox, "popup_forward"); forwardButton->setFlat(true); - connect(forwardButton, SIGNAL(clicked()), action("forward"), SLOT(activate())); + connect(forwardButton, TQT_SIGNAL(clicked()), action("forward"), TQT_SLOT(activate())); - QPushButton *backButton = new QPushButton(action("back")->iconSet(), 0, buttonBox, "popup_back"); + TQPushButton *backButton = new TQPushButton(action("back")->iconSet(), 0, buttonBox, "popup_back"); backButton->setFlat(true); - connect(backButton, SIGNAL(clicked()), action("back"), SLOT(activate())); + connect(backButton, TQT_SIGNAL(clicked()), action("back"), TQT_SLOT(activate())); } mPassivePopup->setView(box); } else { - mPassivePopup->setView(QString::null, tipText); + mPassivePopup->setView(TQString::null, tipText); } mPassivePopup->setTimeout(YHConfig::self()->passivePopupTimeout()*1000); @@ -447,17 +447,17 @@ void NoatunSystray::showPassivePopup() } -QPixmap *NoatunSystray::renderIcon(const QString& baseIcon, const QString &overlayIcon) const +TQPixmap *NoatunSystray::renderIcon(const TQString& baseIcon, const TQString &overlayIcon) const { - QPixmap *base = new QPixmap(KSystemTray::loadIcon(baseIcon)); + TQPixmap *base = new TQPixmap(KSystemTray::loadIcon(baseIcon)); if(!(overlayIcon.isNull())) // otherwise leave the base as-is { - QPixmap overlay = KSystemTray::loadIcon(overlayIcon); + TQPixmap overlay = KSystemTray::loadIcon(overlayIcon); if(!overlay.isNull()) { // draw the overlay on top of it - QPainter p(base); + TQPainter p(base); p.drawPixmap(0, 0, overlay); } } diff --git a/noatun/modules/systray/systray.h b/noatun/modules/systray/systray.h index f602c4e3..aa723eb5 100644 --- a/noatun/modules/systray/systray.h +++ b/noatun/modules/systray/systray.h @@ -30,7 +30,7 @@ #include #include -#include +#include #include @@ -47,34 +47,34 @@ public: virtual void init(); protected: - virtual void closeEvent(QCloseEvent *); + virtual void closeEvent(TQCloseEvent *); public slots: void slotPlayPause(); void slotStopped(); private slots: - void changeTray(const QString &); + void changeTray(const TQString &); void slotLoadSettings(); void slotBlinkTimer(); void showPassivePopup(); - QPixmap *renderIcon(const QString &, const QString &) const; + TQPixmap *renderIcon(const TQString &, const TQString &) const; private: - void setTipText(const QString&); + void setTipText(const TQString&); void updateCover(); void removeCover(); private: KitSystemTray *mTray; - QTimer *mBlinkTimer; - QPixmap *trayStatus; - QPixmap *trayBase; + TQTimer *mBlinkTimer; + TQPixmap *trayStatus; + TQPixmap *trayBase; PassivePopup *mPassivePopup; bool showingTrayStatus; - QString tipText; - QString tmpCoverPath; + TQString tipText; + TQString tmpCoverPath; }; #endif diff --git a/noatun/modules/voiceprint/prefs.cpp b/noatun/modules/voiceprint/prefs.cpp index 48998680..230c542f 100644 --- a/noatun/modules/voiceprint/prefs.cpp +++ b/noatun/modules/voiceprint/prefs.cpp @@ -3,33 +3,33 @@ #include #include -#include -#include +#include +#include #include #include -Prefs::Prefs(QObject* parent) +Prefs::Prefs(TQObject* parent) : CModule(i18n("Voiceprint"), i18n("Options for the Voiceprint Visualization"), "xapp", parent) { - QVBoxLayout *king=new QVBoxLayout(this); - QHBoxLayout *minor; + QVBoxLayout *king=new TQVBoxLayout(this); + TQHBoxLayout *minor; - QLabel *label; + TQLabel *label; mForeground=new KColorButton(this); - label=new QLabel(mForeground, i18n("&Foreground color:"), this); - minor=new QHBoxLayout(king); + label=new TQLabel(mForeground, i18n("&Foreground color:"), this); + minor=new TQHBoxLayout(king); minor->addWidget(label); minor->addWidget(mForeground); mBackground=new KColorButton(this); - label=new QLabel(mBackground, i18n("&Background color:"), this); - minor=new QHBoxLayout(king); + label=new TQLabel(mBackground, i18n("&Background color:"), this); + minor=new TQHBoxLayout(king); minor->addWidget(label); minor->addWidget(mBackground); mLine=new KColorButton(this); - label=new QLabel(mForeground, i18n("&Sweep color:"), this); - minor=new QHBoxLayout(king); + label=new TQLabel(mForeground, i18n("&Sweep color:"), this); + minor=new TQHBoxLayout(king); minor->addWidget(label); minor->addWidget(mLine); @@ -40,8 +40,8 @@ void Prefs::reopen() { KConfig *config=KGlobal::config(); config->setGroup("VoicePrint"); - QColor black(0, 0, 0); - QColor blue(0, 0, 222); + TQColor black(0, 0, 0); + TQColor blue(0, 0, 222); mBackground->setColor(config->readColorEntry("Background", &black)); mForeground->setColor(config->readColorEntry("Foreground", &blue)); mLine->setColor(config->readColorEntry("Line", &black)); diff --git a/noatun/modules/voiceprint/prefs.h b/noatun/modules/voiceprint/prefs.h index 6541b4de..65f4cf3d 100644 --- a/noatun/modules/voiceprint/prefs.h +++ b/noatun/modules/voiceprint/prefs.h @@ -1,7 +1,7 @@ #ifndef PREFS_H #define PREFS_H -#include +#include #include class KColorButton; @@ -10,7 +10,7 @@ class Prefs : public CModule { Q_OBJECT public: - Prefs(QObject* parent); + Prefs(TQObject* parent); virtual void save(); virtual void reopen(); diff --git a/noatun/modules/voiceprint/voiceprint.cpp b/noatun/modules/voiceprint/voiceprint.cpp index 4f6c7aea..0a82a1ab 100644 --- a/noatun/modules/voiceprint/voiceprint.cpp +++ b/noatun/modules/voiceprint/voiceprint.cpp @@ -2,7 +2,7 @@ #include #include #include -#include +#include #include "prefs.h" #include #include @@ -17,7 +17,7 @@ extern "C" VoicePrint *VoicePrint::voicePrint=0; -VoicePrint::VoicePrint() : QWidget(0,0,WRepaintNoErase), MonoFFTScope(50), Plugin() +VoicePrint::VoicePrint() : TQWidget(0,0,WRepaintNoErase), MonoFFTScope(50), Plugin() { voicePrint=this; mOffset=0; @@ -41,7 +41,7 @@ void VoicePrint::init() resizeEvent(0); } -void VoicePrint::setColors(const QColor &bg, const QColor &fg, const QColor &l) +void VoicePrint::setColors(const TQColor &bg, const TQColor &fg, const TQColor &l) { mProgress=l; mLowColor=bg.rgb(); @@ -49,17 +49,17 @@ void VoicePrint::setColors(const QColor &bg, const QColor &fg, const QColor &l) setBackgroundColor(mLowColor); } -void VoicePrint::closeEvent(QCloseEvent *) +void VoicePrint::closeEvent(TQCloseEvent *) { unload(); } -void VoicePrint::resizeEvent(QResizeEvent *) +void VoicePrint::resizeEvent(TQResizeEvent *) { mOffset=0; mBuffer.resize(size()); - QPainter paint(&mBuffer); - paint.fillRect(QRect(0,0, QWidget::width(), height()), QColor(mLowColor)); + TQPainter paint(&mBuffer); + paint.fillRect(TQRect(0,0, TQWidget::width(), height()), TQColor(mLowColor)); setBands(magic(height()/mSegmentWidth)); } @@ -78,7 +78,7 @@ inline static QRgb averageByIntensity(QRgb bgcolor, QRgb fgcolor, int octet) #undef COLOR -void VoicePrint::paintEvent(QPaintEvent *e) +void VoicePrint::paintEvent(TQPaintEvent *e) { bitBlt(this, e->rect().topLeft(), &mBuffer, e->rect(), Qt::CopyROP); } @@ -88,7 +88,7 @@ void VoicePrint::scopeEvent(float *data, int bands) // save cpu if(isHidden()) return; - QPainter paint(&mBuffer); + TQPainter paint(&mBuffer); // each square has a width of mSegmentWidth float brightness = float(bands * mSegmentWidth); for (int i=0; i255) band=255; else if (band<0) band=0; - QColor area(averageByIntensity(mLowColor, mHighColor, band)); + TQColor area(averageByIntensity(mLowColor, mHighColor, band)); int bandTop=i*height()/bands, bandBottom=(i+1)*height()/bands; paint.fillRect(mOffset, bandTop, mSegmentWidth,bandBottom-bandTop,area); } int newOffset = mOffset+mSegmentWidth; - if (newOffset>QWidget::width()) newOffset=0; + if (newOffset>TQWidget::width()) newOffset=0; paint.fillRect(newOffset, 0, mSegmentWidth, height(), mProgress); // redraw changes with the minimum amount of work diff --git a/noatun/modules/voiceprint/voiceprint.h b/noatun/modules/voiceprint/voiceprint.h index ab5af69d..4d78909a 100644 --- a/noatun/modules/voiceprint/voiceprint.h +++ b/noatun/modules/voiceprint/voiceprint.h @@ -3,7 +3,7 @@ #include -class VoicePrint : public QWidget, public MonoFFTScope, public Plugin +class VoicePrint : public TQWidget, public MonoFFTScope, public Plugin { Q_OBJECT @@ -11,21 +11,21 @@ public: VoicePrint(); virtual ~VoicePrint(); - void setColors(const QColor &bg, const QColor &fg, const QColor &l); + void setColors(const TQColor &bg, const TQColor &fg, const TQColor &l); void init(); protected: - virtual void closeEvent(QCloseEvent *); + virtual void closeEvent(TQCloseEvent *); virtual void scopeEvent(float *data, int bands); - virtual void resizeEvent(QResizeEvent *); - virtual void paintEvent(QPaintEvent *); + virtual void resizeEvent(TQResizeEvent *); + virtual void paintEvent(TQPaintEvent *); public: static VoicePrint* voicePrint; private: - QColor mProgress; - QPixmap mBuffer; + TQColor mProgress; + TQPixmap mBuffer; QRgb mLowColor, mHighColor; int mOffset, mSegmentWidth; }; diff --git a/noatun/modules/winskin/fileInfo.cpp b/noatun/modules/winskin/fileInfo.cpp index 69f93215..6e721cd9 100644 --- a/noatun/modules/winskin/fileInfo.cpp +++ b/noatun/modules/winskin/fileInfo.cpp @@ -1,14 +1,14 @@ #include #include -#include +#include #include #include "fileInfo.h" fileInfo::fileInfo(const PlaylistItem &item) { - QString prop; + TQString prop; prop = item.property("bitrate"); if (prop.isNull()) diff --git a/noatun/modules/winskin/guiSpectrumAnalyser.cpp b/noatun/modules/winskin/guiSpectrumAnalyser.cpp index d015e5da..583266e0 100644 --- a/noatun/modules/winskin/guiSpectrumAnalyser.cpp +++ b/noatun/modules/winskin/guiSpectrumAnalyser.cpp @@ -12,9 +12,9 @@ #include -#include -#include -#include +#include +#include +#include #include #include "waColor.h" @@ -28,11 +28,11 @@ GuiSpectrumAnalyser::GuiSpectrumAnalyser() : WaWidget(_WA_MAPPING_ANALYSER) { - connect(WaSkinModel::instance(), SIGNAL(skinChanged()), this, SLOT(pixmapChange())); + connect(WaSkinModel::instance(), TQT_SIGNAL(skinChanged()), this, TQT_SLOT(pixmapChange())); - contextMenu = new QPopupMenu(this); - visualizationMenu = new QPopupMenu(); - analyserMenu = new QPopupMenu(); + contextMenu = new TQPopupMenu(this); + visualizationMenu = new TQPopupMenu(); + analyserMenu = new TQPopupMenu(); contextMenu->insertItem(i18n("Visualization Mode"), visualizationMenu); contextMenu->insertItem(i18n("Analyzer Mode"), analyserMenu); @@ -40,13 +40,13 @@ GuiSpectrumAnalyser::GuiSpectrumAnalyser() visualizationMenu->insertItem(i18n("Analyzer"), (int)MODE_ANALYSER); visualizationMenu->insertItem(i18n("Disabled"), (int)MODE_DISABLED); visualizationMenu->setCheckable(true); - connect(visualizationMenu, SIGNAL(activated(int)), this, SLOT(setVisualizationMode(int))); + connect(visualizationMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(setVisualizationMode(int))); analyserMenu->insertItem(i18n("Normal"), (int)MODE_NORMAL); analyserMenu->insertItem(i18n("Fire"), (int)MODE_FIRE); analyserMenu->insertItem(i18n("Vertical Lines"), (int)MODE_VERTICAL_LINES); analyserMenu->setCheckable(true); - connect(analyserMenu, SIGNAL(activated(int)), this, SLOT(setAnalyserMode(int))); + connect(analyserMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(setAnalyserMode(int))); analyserCache = NULL; winSkinVis = NULL; @@ -70,7 +70,7 @@ GuiSpectrumAnalyser::~GuiSpectrumAnalyser() delete analyserCache; } -void GuiSpectrumAnalyser::mousePressEvent ( QMouseEvent *e ) +void GuiSpectrumAnalyser::mousePressEvent ( TQMouseEvent *e ) { if (e->button() == LeftButton) { if (visualization_mode == MODE_DISABLED) @@ -79,7 +79,7 @@ void GuiSpectrumAnalyser::mousePressEvent ( QMouseEvent *e ) setVisualizationMode(MODE_DISABLED); } else if (e->button() == RightButton) { - contextMenu->popup(mapToGlobal(QPoint(e->x(), e->y()))); + contextMenu->popup(mapToGlobal(TQPoint(e->x(), e->y()))); } } @@ -139,7 +139,7 @@ void GuiSpectrumAnalyser::setVisualizationMode(int mode) if (!winSkinVis) { winSkinVis=new WinSkinVis(this,"WinSkinVis"); - connect(winSkinVis,SIGNAL(doRepaint()),this,SLOT(updatePeaks())); + connect(winSkinVis,TQT_SIGNAL(doRepaint()),this,TQT_SLOT(updatePeaks())); } } else @@ -160,20 +160,20 @@ void GuiSpectrumAnalyser::freshenAnalyserCache() // The analyser cache is a 34x16 pixmap containing all the bits needed // to quickly draw the spectrum analyser - analyserCache = new QPixmap(34, 16); - QPainter p(analyserCache); + analyserCache = new TQPixmap(34, 16); + TQPainter p(analyserCache); for (unsigned int x = 0;x < 17;x++) { if (x != 16) { - p.setPen(QPen(colorScheme->skinColors[INDEX_BACKGROUND_COLOR])); + p.setPen(TQPen(colorScheme->skinColors[INDEX_BACKGROUND_COLOR])); p.drawLine(x * 2, 0, x * 2, 16 - x - 1); } for (unsigned int y = 0; y < (16 - x);y++) { if (y % 2) - p.setPen(QPen(colorScheme->skinColors[INDEX_GRID_COLOR])); + p.setPen(TQPen(colorScheme->skinColors[INDEX_GRID_COLOR])); else - p.setPen(QPen(colorScheme->skinColors[INDEX_BACKGROUND_COLOR])); + p.setPen(TQPen(colorScheme->skinColors[INDEX_BACKGROUND_COLOR])); p.drawPoint((x * 2) + 1, y); } @@ -184,13 +184,13 @@ void GuiSpectrumAnalyser::freshenAnalyserCache() switch (analyser_mode) { case MODE_FIRE: for (unsigned int y = (16 - x); y < 16; y++) { - p.setPen(QPen(colorScheme->skinColors[INDEX_SPEC_BASE + (y - (16 - x))])); + p.setPen(TQPen(colorScheme->skinColors[INDEX_SPEC_BASE + (y - (16 - x))])); p.drawPoint((x * 2), y); p.drawPoint((x * 2) + 1, y); } break; case MODE_VERTICAL_LINES: - p.setPen(QPen(colorScheme->skinColors[INDEX_SPEC_BASE + (16 - x)])); + p.setPen(TQPen(colorScheme->skinColors[INDEX_SPEC_BASE + (16 - x)])); p.drawLine((x * 2), (15 - x), (x * 2), 15); p.drawLine((x * 2) + 1, (15 - x), (x * 2) + 1, 15); break; @@ -198,7 +198,7 @@ void GuiSpectrumAnalyser::freshenAnalyserCache() // Fall through default: for (unsigned int y = (16 - x); y < 16; y++) { - p.setPen(QPen(colorScheme->skinColors[INDEX_SPEC_BASE + y])); + p.setPen(TQPen(colorScheme->skinColors[INDEX_SPEC_BASE + y])); p.drawPoint((x * 2), y); p.drawPoint((x * 2) + 1, y); } @@ -207,7 +207,7 @@ void GuiSpectrumAnalyser::freshenAnalyserCache() } } -void GuiSpectrumAnalyser::paintEvent (QPaintEvent *) +void GuiSpectrumAnalyser::paintEvent (TQPaintEvent *) { if (visualization_mode == MODE_DISABLED) paintBackground(); diff --git a/noatun/modules/winskin/guiSpectrumAnalyser.h b/noatun/modules/winskin/guiSpectrumAnalyser.h index ecef8d37..e2dd3431 100644 --- a/noatun/modules/winskin/guiSpectrumAnalyser.h +++ b/noatun/modules/winskin/guiSpectrumAnalyser.h @@ -34,7 +34,7 @@ class GuiSpectrumAnalyser : public WaWidget { GuiSpectrumAnalyser(); ~GuiSpectrumAnalyser(); - void mousePressEvent(QMouseEvent * mouseEvent); + void mousePressEvent(TQMouseEvent * mouseEvent); public slots: void pauseVisualization(); @@ -48,18 +48,18 @@ class GuiSpectrumAnalyser : public WaWidget { void setAnalyserMode(int); private: - void paintEvent(QPaintEvent *); + void paintEvent(TQPaintEvent *); - QPopupMenu *contextMenu; - QPopupMenu *visualizationMenu; - QPopupMenu *analyserMenu; + TQPopupMenu *contextMenu; + TQPopupMenu *visualizationMenu; + TQPopupMenu *analyserMenu; void freshenAnalyserCache(); int visualization_mode; int analyser_mode; - QPixmap *analyserCache; + TQPixmap *analyserCache; WinSkinVis *winSkinVis; }; #endif diff --git a/noatun/modules/winskin/skinMap.h b/noatun/modules/winskin/skinMap.h index f67f1557..1b9f8530 100644 --- a/noatun/modules/winskin/skinMap.h +++ b/noatun/modules/winskin/skinMap.h @@ -16,7 +16,7 @@ #ifndef _SKINMAP_H #define _SKINMAP_H -#include +#include typedef struct { int x; diff --git a/noatun/modules/winskin/waBalanceSlider.cpp b/noatun/modules/winskin/waBalanceSlider.cpp index 1ac1b562..cb6b0f19 100644 --- a/noatun/modules/winskin/waBalanceSlider.cpp +++ b/noatun/modules/winskin/waBalanceSlider.cpp @@ -38,10 +38,10 @@ void WaBalanceSlider::buildGui() ws->setValue(0); - connect(ws, SIGNAL(valueChanged(int)), this, - SIGNAL(balanceSetValue(int))); - connect(ws, SIGNAL(sliderPressed()), SIGNAL(sliderPressed())); - connect(ws, SIGNAL(sliderReleased()), SIGNAL(sliderReleased())); + connect(ws, TQT_SIGNAL(valueChanged(int)), this, + TQT_SIGNAL(balanceSetValue(int))); + connect(ws, TQT_SIGNAL(sliderPressed()), TQT_SIGNAL(sliderPressed())); + connect(ws, TQT_SIGNAL(sliderReleased()), TQT_SIGNAL(sliderReleased())); } diff --git a/noatun/modules/winskin/waButton.cpp b/noatun/modules/winskin/waButton.cpp index cac0275a..da113c87 100644 --- a/noatun/modules/winskin/waButton.cpp +++ b/noatun/modules/winskin/waButton.cpp @@ -10,7 +10,7 @@ */ -#include +#include #include "waButton.h" @@ -44,12 +44,12 @@ void WaButton::setPixmapDownSelected(int pixId) { nDownIdSelected=pixId; } -void WaButton::paintEvent(QPaintEvent *) { +void WaButton::paintEvent(TQPaintEvent *) { paintPixmap(getPixmapId()); } -void WaButton::mousePressEvent(QMouseEvent* e) { +void WaButton::mousePressEvent(TQMouseEvent* e) { if (e->button() != LeftButton) { // We can't deal with it, but maybe the widget can do something clever WaWidget::mousePressEvent(e); @@ -60,7 +60,7 @@ void WaButton::mousePressEvent(QMouseEvent* e) { } } -void WaButton::mouseReleaseEvent(QMouseEvent* e) { +void WaButton::mouseReleaseEvent(TQMouseEvent* e) { if (!pressed) { // We're not pressed, so just pass along the mouse event, it's not ours WaWidget::mouseReleaseEvent(e); diff --git a/noatun/modules/winskin/waButton.h b/noatun/modules/winskin/waButton.h index 50947216..bfaf43ff 100644 --- a/noatun/modules/winskin/waButton.h +++ b/noatun/modules/winskin/waButton.h @@ -16,7 +16,7 @@ #ifndef __WABUTTON_H #define __WABUTTON_H -#include +#include #include "waWidget.h" class WaButton : public WaWidget { @@ -37,18 +37,18 @@ class WaButton : public WaWidget { bool togglable() const { return _togglable; } int getPixmapId(); - void paintEvent(QPaintEvent*); + void paintEvent(TQPaintEvent*); private: - void mousePressEvent (QMouseEvent* e); - void mouseReleaseEvent (QMouseEvent* e); + void mousePressEvent (TQMouseEvent* e); + void mouseReleaseEvent (TQMouseEvent* e); int nUpId; int nDownId; int nDownIdSelected; int nUpIdSelected; - QPoint currentLocation; + TQPoint currentLocation; bool _toggled; bool _togglable; diff --git a/noatun/modules/winskin/waClutterbar.cpp b/noatun/modules/winskin/waClutterbar.cpp index 6ceb7d04..f4370e87 100644 --- a/noatun/modules/winskin/waClutterbar.cpp +++ b/noatun/modules/winskin/waClutterbar.cpp @@ -6,6 +6,6 @@ WaClutterbar::WaClutterbar() : WaWidget(_WA_MAPPING_CLUTTERBAR) { WaClutterbar::~WaClutterbar() { } -void WaClutterbar::paintEvent(QPaintEvent *) { +void WaClutterbar::paintEvent(TQPaintEvent *) { paintPixmap(_WA_SKIN_CLUTTERBAR_DISABLED); } diff --git a/noatun/modules/winskin/waClutterbar.h b/noatun/modules/winskin/waClutterbar.h index 69339c37..5a96993a 100644 --- a/noatun/modules/winskin/waClutterbar.h +++ b/noatun/modules/winskin/waClutterbar.h @@ -1,7 +1,7 @@ #ifndef __WACLUTTERBAR_H #define __WACLUTTERBAR_H -#include +#include #include "waWidget.h" class WaClutterbar : public WaWidget { @@ -12,7 +12,7 @@ class WaClutterbar : public WaWidget { ~WaClutterbar(); public slots: - void paintEvent(QPaintEvent *); + void paintEvent(TQPaintEvent *); }; #endif diff --git a/noatun/modules/winskin/waColor.cpp b/noatun/modules/winskin/waColor.cpp index e06b38bc..43fa5154 100644 --- a/noatun/modules/winskin/waColor.cpp +++ b/noatun/modules/winskin/waColor.cpp @@ -1,11 +1,11 @@ #include -#include +#include #include "waColor.h" WaColor *colorScheme = NULL; -WaColor::WaColor(QString filename) { +WaColor::WaColor(TQString filename) { int r, g, b; char comma; @@ -38,7 +38,7 @@ WaColor::WaColor(QString filename) { return; } - std::ifstream viscolor(QFile::encodeName(filename)); + std::ifstream viscolor(TQFile::encodeName(filename)); if (!viscolor) return; diff --git a/noatun/modules/winskin/waColor.h b/noatun/modules/winskin/waColor.h index a0e18484..e029b70b 100644 --- a/noatun/modules/winskin/waColor.h +++ b/noatun/modules/winskin/waColor.h @@ -3,8 +3,8 @@ #ifndef WACOLOR_H #define WACOLOR_H -#include -#include +#include +#include #define INDEX_BACKGROUND_COLOR 0 #define INDEX_GRID_COLOR 1 @@ -14,10 +14,10 @@ class WaColor { public: - WaColor(QString filename); + WaColor(TQString filename); ~WaColor(); - QColor skinColors[24]; + TQColor skinColors[24]; }; extern WaColor *colorScheme; diff --git a/noatun/modules/winskin/waDigit.cpp b/noatun/modules/winskin/waDigit.cpp index b775d7cf..15a3ae46 100644 --- a/noatun/modules/winskin/waDigit.cpp +++ b/noatun/modules/winskin/waDigit.cpp @@ -34,7 +34,7 @@ WaDigit::~WaDigit() config->writeEntry("timeReversed", reverse_time); } -void WaDigit::paintEvent(QPaintEvent *) +void WaDigit::paintEvent(TQPaintEvent *) { paintBackground(); @@ -49,7 +49,7 @@ void WaDigit::paintEvent(QPaintEvent *) int x = waSkinModel->getMapGeometry(mapping).x(); int y = waSkinModel->getMapGeometry(mapping).y(); - QRect mapRect; + TQRect mapRect; // We expect strings either in the form "xx:yy", or "-xx:yy" // If the string length is 6, we have it in the form of "-xx:yy" @@ -77,7 +77,7 @@ void WaDigit::paintEvent(QPaintEvent *) waSkinModel->getDigit(time[4], this, mapRect.x() - x, mapRect.y() - y); } -void WaDigit::mousePressEvent(QMouseEvent* e) { +void WaDigit::mousePressEvent(TQMouseEvent* e) { if (e->button() == LeftButton) { reverse_time = !reverse_time; emit digitsClicked(); diff --git a/noatun/modules/winskin/waDigit.h b/noatun/modules/winskin/waDigit.h index cefbfeb3..cee5da1d 100644 --- a/noatun/modules/winskin/waDigit.h +++ b/noatun/modules/winskin/waDigit.h @@ -16,7 +16,7 @@ #ifndef __WADIGIT_H #define __WADIGIT_H -#include +#include #include "waWidget.h" @@ -27,20 +27,20 @@ class WaDigit : public WaWidget { WaDigit(); ~WaDigit(); - void setTime(QString time) { timeString = time; update(); } - QString time() const { return timeString; } + void setTime(TQString time) { timeString = time; update(); } + TQString time() const { return timeString; } bool timeReversed() const { return reverse_time; } public slots: - void paintEvent(QPaintEvent * paintEvent); + void paintEvent(TQPaintEvent * paintEvent); private: - void mousePressEvent(QMouseEvent* e); + void mousePressEvent(TQMouseEvent* e); bool reverse_time; WaSkinModel *waSkinModel; - QString timeString; + TQString timeString; signals: void digitsClicked(); diff --git a/noatun/modules/winskin/waIndicator.cpp b/noatun/modules/winskin/waIndicator.cpp index 9c5efa84..1c6a64cc 100644 --- a/noatun/modules/winskin/waIndicator.cpp +++ b/noatun/modules/winskin/waIndicator.cpp @@ -25,7 +25,7 @@ WaIndicator::~WaIndicator() { } -void WaIndicator::paintEvent(QPaintEvent *) +void WaIndicator::paintEvent(TQPaintEvent *) { paintPixmap( _state ? _enabled_mapping : _disabled_mapping ); } diff --git a/noatun/modules/winskin/waIndicator.h b/noatun/modules/winskin/waIndicator.h index f367fe84..b4d37482 100644 --- a/noatun/modules/winskin/waIndicator.h +++ b/noatun/modules/winskin/waIndicator.h @@ -16,7 +16,7 @@ #ifndef __WAINDICATOR_H #define __WAINDICATOR_H -#include +#include #include "waWidget.h" @@ -31,7 +31,7 @@ class WaIndicator : public WaWidget { bool state() const { return _state; } public slots: - void paintEvent(QPaintEvent *); + void paintEvent(TQPaintEvent *); private: int _enabled_mapping; diff --git a/noatun/modules/winskin/waInfo.cpp b/noatun/modules/winskin/waInfo.cpp index c735a8e4..d64191da 100644 --- a/noatun/modules/winskin/waInfo.cpp +++ b/noatun/modules/winskin/waInfo.cpp @@ -12,8 +12,8 @@ */ -#include -#include +#include +#include #include @@ -25,18 +25,18 @@ WaInfo::WaInfo() : WaWidget(_WA_MAPPING_INFO) { - connect(WaSkinModel::instance(), SIGNAL(skinChanged()), - this, SLOT(pixmapChange())); + connect(WaSkinModel::instance(), TQT_SIGNAL(skinChanged()), + this, TQT_SLOT(pixmapChange())); - completePixmap = new QPixmap(); + completePixmap = new TQPixmap(); - QSize size = sizeHint(); + TQSize size = sizeHint(); completePixmap->resize(size.width(), size.height()); xGrabbedPos = -1; - timer = new QTimer(this); - connect(timer, SIGNAL(timeout()), this, SLOT(timeEvent())); + timer = new TQTimer(this); + connect(timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(timeEvent())); } WaInfo::~WaInfo() @@ -65,7 +65,7 @@ void WaInfo::scrollerSetup() xScrollPos = 0; xScrollDirection = 0; timer->stop(); - QSize size = sizeHint(); + TQSize size = sizeHint(); if (completePixmap->width() > size.width()) { xScrollDirection = 1; @@ -77,9 +77,9 @@ void WaInfo::scrollerSetup() } } -void WaInfo::paintEvent(QPaintEvent *) +void WaInfo::paintEvent(TQPaintEvent *) { - QSize size = sizeHint(); + TQSize size = sizeHint(); if (completePixmap->width() <= size.width()) { bitBlt(this, 0, 0, completePixmap); @@ -105,7 +105,7 @@ void WaInfo::paintEvent(QPaintEvent *) } -void WaInfo::setText(QString song) +void WaInfo::setText(TQString song) { if (_text != song) { _text = song; @@ -113,7 +113,7 @@ void WaInfo::setText(QString song) } } -QString WaInfo::text() const +TQString WaInfo::text() const { return _text; } @@ -127,7 +127,7 @@ void WaInfo::pixmapChange() int x = 0; int n=infoString ? strlen(infoString) : 0; - QSize size = sizeHint(); + TQSize size = sizeHint(); completePixmap->resize(QMAX(n * _WA_TEXT_WIDTH, size.width()), _WA_TEXT_HEIGHT); @@ -149,12 +149,12 @@ void WaInfo::pixmapChange() update(); } -void WaInfo::mousePressEvent (QMouseEvent *e) { +void WaInfo::mousePressEvent (TQMouseEvent *e) { if (e->button() == LeftButton) xGrabbedPos = (e->x() + xScrollPos) % completePixmap->width(); } -void WaInfo::mouseMoveEvent (QMouseEvent * e) { +void WaInfo::mouseMoveEvent (TQMouseEvent * e) { xScrollPos = -e->x() + xGrabbedPos; if (xScrollPos < 0) @@ -165,7 +165,7 @@ void WaInfo::mouseMoveEvent (QMouseEvent * e) { update(); } -void WaInfo::mouseReleaseEvent (QMouseEvent *) { +void WaInfo::mouseReleaseEvent (TQMouseEvent *) { xGrabbedPos = -1; } diff --git a/noatun/modules/winskin/waInfo.h b/noatun/modules/winskin/waInfo.h index 513ff3cc..32d310e4 100644 --- a/noatun/modules/winskin/waInfo.h +++ b/noatun/modules/winskin/waInfo.h @@ -16,8 +16,8 @@ #ifndef __WAINFO_H #define __WAINFO_H -#include -#include +#include +#include #include "waWidget.h" @@ -28,20 +28,20 @@ class WaInfo : public WaWidget { WaInfo(); ~WaInfo(); - void setText(QString song); - QString text() const; + void setText(TQString song); + TQString text() const; void scrollerSetup(); protected: - void paintEvent(QPaintEvent * paintEvent); + void paintEvent(TQPaintEvent * paintEvent); - void mousePressEvent (QMouseEvent * e); - void mouseMoveEvent (QMouseEvent * e); - void mouseReleaseEvent (QMouseEvent * e); + void mousePressEvent (TQMouseEvent * e); + void mouseMoveEvent (TQMouseEvent * e); + void mouseReleaseEvent (TQMouseEvent * e); - QPixmap *completePixmap; - QString _text; - QTimer *timer; + TQPixmap *completePixmap; + TQString _text; + TQTimer *timer; int xScrollPos; int xScrollDirection; int xGrabbedPos; diff --git a/noatun/modules/winskin/waJumpSlider.cpp b/noatun/modules/winskin/waJumpSlider.cpp index 51633300..b8750dc1 100644 --- a/noatun/modules/winskin/waJumpSlider.cpp +++ b/noatun/modules/winskin/waJumpSlider.cpp @@ -30,9 +30,9 @@ void WaJumpSlider::buildGui() ws->setRange(0, 100); ws->setValue(0); - connect(ws, SIGNAL(sliderPressed()), this, SIGNAL(sliderPressed())); - connect(ws, SIGNAL(sliderReleased()), this, SLOT(releasedSlider())); - connect(ws, SIGNAL(valueChanged(int)), this, SIGNAL(valueChanged(int))); + connect(ws, TQT_SIGNAL(sliderPressed()), this, TQT_SIGNAL(sliderPressed())); + connect(ws, TQT_SIGNAL(sliderReleased()), this, TQT_SLOT(releasedSlider())); + connect(ws, TQT_SIGNAL(valueChanged(int)), this, TQT_SIGNAL(valueChanged(int))); } void WaJumpSlider::setJumpRange(int val) @@ -63,11 +63,11 @@ void WaJumpSlider::releasedSlider() { emit(sliderReleased()); } -void WaJumpSlider::showEvent (QShowEvent *) { +void WaJumpSlider::showEvent (TQShowEvent *) { ws->show(); } -void WaJumpSlider::hideEvent (QHideEvent *) { +void WaJumpSlider::hideEvent (TQHideEvent *) { ws->hide(); } diff --git a/noatun/modules/winskin/waJumpSlider.h b/noatun/modules/winskin/waJumpSlider.h index 12c07808..e8a48b1f 100644 --- a/noatun/modules/winskin/waJumpSlider.h +++ b/noatun/modules/winskin/waJumpSlider.h @@ -35,8 +35,8 @@ class WaJumpSlider : public WaWidget { protected: WaSlider *ws; - void showEvent (QShowEvent *); - void hideEvent (QHideEvent *); + void showEvent (TQShowEvent *); + void hideEvent (TQHideEvent *); private slots: void releasedSlider(); diff --git a/noatun/modules/winskin/waLabel.cpp b/noatun/modules/winskin/waLabel.cpp index 8f3ddb60..54b7513b 100644 --- a/noatun/modules/winskin/waLabel.cpp +++ b/noatun/modules/winskin/waLabel.cpp @@ -11,20 +11,20 @@ */ -#include -#include +#include +#include #include "waLabel.h" #include "waSkinModel.h" WaLabel::WaLabel(int mapping) : WaWidget(mapping) { - connect(WaSkinModel::instance(), SIGNAL(skinChanged()), - this, SLOT(pixmapChange())); + connect(WaSkinModel::instance(), TQT_SIGNAL(skinChanged()), + this, TQT_SLOT(pixmapChange())); - completePixmap = new QPixmap(); + completePixmap = new TQPixmap(); - QSize size = sizeHint(); + TQSize size = sizeHint(); completePixmap->resize(size.width(), size.height()); } @@ -34,12 +34,12 @@ WaLabel::~WaLabel() delete completePixmap; } -void WaLabel::paintEvent(QPaintEvent *) +void WaLabel::paintEvent(TQPaintEvent *) { bitBlt(this, 0, 0, completePixmap); } -void WaLabel::setText(const QString &new_text) +void WaLabel::setText(const TQString &new_text) { int width = WaSkinModel::instance()->getMapGeometry(mapping).width(); diff --git a/noatun/modules/winskin/waLabel.h b/noatun/modules/winskin/waLabel.h index f1470902..ce7ad771 100644 --- a/noatun/modules/winskin/waLabel.h +++ b/noatun/modules/winskin/waLabel.h @@ -13,7 +13,7 @@ #ifndef __WABPS_H #define __WABPS_H -#include +#include #include "waWidget.h" class WaLabel : public WaWidget { @@ -23,14 +23,14 @@ class WaLabel : public WaWidget { WaLabel(int mapping); ~WaLabel(); - void setText(const QString &text); - QString text() const { return _text; } + void setText(const TQString &text); + TQString text() const { return _text; } private: - void paintEvent(QPaintEvent *); + void paintEvent(TQPaintEvent *); - QPixmap *completePixmap; - QString _text; + TQPixmap *completePixmap; + TQString _text; private slots: diff --git a/noatun/modules/winskin/waMain.cpp b/noatun/modules/winskin/waMain.cpp index a5bb7fdc..f66b8535 100644 --- a/noatun/modules/winskin/waMain.cpp +++ b/noatun/modules/winskin/waMain.cpp @@ -6,7 +6,7 @@ WaMain::WaMain() : WaWidget(_WA_MAPPING_MAIN) { WaMain::~WaMain() { } -void WaMain::paintEvent(QPaintEvent *) { +void WaMain::paintEvent(TQPaintEvent *) { paintPixmap(_WA_SKIN_MAIN); } diff --git a/noatun/modules/winskin/waMain.h b/noatun/modules/winskin/waMain.h index 06bcfe5d..fbc47a64 100644 --- a/noatun/modules/winskin/waMain.h +++ b/noatun/modules/winskin/waMain.h @@ -10,7 +10,7 @@ public: ~WaMain(); protected: - void paintEvent(QPaintEvent *); + void paintEvent(TQPaintEvent *); }; #endif diff --git a/noatun/modules/winskin/waRegion.cpp b/noatun/modules/winskin/waRegion.cpp index ab4d2e57..06f6851e 100644 --- a/noatun/modules/winskin/waRegion.cpp +++ b/noatun/modules/winskin/waRegion.cpp @@ -11,9 +11,9 @@ */ #include -#include -#include -#include +#include +#include +#include #include "waSkinModel.h" #include "waSkins.h" @@ -26,7 +26,7 @@ WaRegion *windowRegion = NULL; const char *pointListNames[] = {"PointList", "pointlist", "Pointlist", "pointList", "POINTLIST", 0}; const char *numPointsNames[] = {"NumPoints", "numpoints", "Numpoints", "numPoints", "NUMPOINTS", 0}; -WaRegion::WaRegion(QString filename) { +WaRegion::WaRegion(TQString filename) { // Load the region file, which happens to be in KConfig format KSimpleConfig regionFile(filename, true); @@ -35,19 +35,19 @@ WaRegion::WaRegion(QString filename) { shade_mask = 0; // Make the new bitmaps, default window size - window_mask = new QBitmap(WaSkinModel::instance()->getMapGeometry(_WA_MAPPING_MAIN).size(), true); - shade_mask = new QBitmap(WaSkinModel::instance()->getMapGeometry(_WA_MAPPING_TITLE).size(), true); + window_mask = new TQBitmap(WaSkinModel::instance()->getMapGeometry(_WA_MAPPING_MAIN).size(), true); + shade_mask = new TQBitmap(WaSkinModel::instance()->getMapGeometry(_WA_MAPPING_TITLE).size(), true); // Load the normal window mask data regionFile.setGroup("Normal"); - QValueList num_points; + TQValueList num_points; for (int x = 0;numPointsNames[x];x++) { if (regionFile.hasKey(numPointsNames[x])) num_points = parseList(regionFile.readEntry(numPointsNames[x])); } - QValueList point_list; + TQValueList point_list; for (int x = 0;pointListNames[x];x++) { if (regionFile.hasKey(pointListNames[x])) point_list = parseList(regionFile.readEntry(pointListNames[x])); @@ -71,27 +71,27 @@ WaRegion::~WaRegion() { delete shade_mask; } -void WaRegion::buildPixmap(const QValueList &num_points_list, const QValueList &points_list, QBitmap *dest) { +void WaRegion::buildPixmap(const TQValueList &num_points_list, const TQValueList &points_list, TQBitmap *dest) { if (!num_points_list.count()) { dest->fill(Qt::color1); return; } - QValueList::const_iterator points = points_list.begin(); + TQValueList::const_iterator points = points_list.begin(); - QPainter p(dest); + TQPainter p(dest); // Coordinates in REGION.TXT can go one pixel beyond the window size - QBitmap bm(dest->width()+1,dest->height()+1,true); - QPainter bmp(&bm); + 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 // Go over each "region" in the file - for (QValueList::const_iterator num_points = num_points_list.begin();num_points != num_points_list.end();num_points++) { + for (TQValueList::const_iterator num_points = num_points_list.begin();num_points != num_points_list.end();num_points++) { // Make a new point array - QPointArray point_array(*num_points); + TQPointArray point_array(*num_points); // Populate it for (int i = 0;i < *num_points;i++) { @@ -112,14 +112,14 @@ void WaRegion::buildPixmap(const QValueList &num_points_list, const QValueL // The winamp list format is absolutely insane, it will accept either // commas or whitespace as the delimiter. This function deals with // that. -QValueList WaRegion::parseList(const QString &list) const { - QValueList temp_list; +TQValueList WaRegion::parseList(const TQString &list) const { + TQValueList temp_list; if (list.isEmpty()) return temp_list; - QStringList open=QStringList::split(QRegExp("[,\\s]+"), list); - for (QStringList::Iterator i=open.begin(); i != open.end(); ++i) + TQStringList open=TQStringList::split(TQRegExp("[,\\s]+"), list); + for (TQStringList::Iterator i=open.begin(); i != open.end(); ++i) temp_list.append((*i).toInt()); return temp_list; diff --git a/noatun/modules/winskin/waRegion.h b/noatun/modules/winskin/waRegion.h index 853909c1..66c7c811 100644 --- a/noatun/modules/winskin/waRegion.h +++ b/noatun/modules/winskin/waRegion.h @@ -1,23 +1,23 @@ #ifndef WAREGION_H #define WAREGION_H -#include -#include +#include +#include class WaRegion { public: - WaRegion(QString filename); + WaRegion(TQString filename); ~WaRegion(); - const QBitmap *mainWindowMask() const { return window_mask; } - const QBitmap *mainWindowShadeMask() const { return shade_mask; } + const TQBitmap *mainWindowMask() const { return window_mask; } + const TQBitmap *mainWindowShadeMask() const { return shade_mask; } private: - QValueList parseList(const QString &list) const; - void buildPixmap(const QValueList &num_points, const QValueList &point_list, QBitmap *dest); + TQValueList parseList(const TQString &list) const; + void buildPixmap(const TQValueList &num_points, const TQValueList &point_list, TQBitmap *dest); - QBitmap *window_mask; - QBitmap *shade_mask; + TQBitmap *window_mask; + TQBitmap *shade_mask; }; extern WaRegion *windowRegion; diff --git a/noatun/modules/winskin/waSkin.cpp b/noatun/modules/winskin/waSkin.cpp index 7d95047d..d7b443ee 100644 --- a/noatun/modules/winskin/waSkin.cpp +++ b/noatun/modules/winskin/waSkin.cpp @@ -12,7 +12,7 @@ */ #include -#include +#include #include #include #include @@ -21,7 +21,7 @@ #include #include #include -#include +#include #include #include #include @@ -57,7 +57,7 @@ WaSkin *_waskin_instance = NULL; -WaSkin::WaSkin() : QWidget(0, "NoatunWinampSkin"), UserInterface() +WaSkin::WaSkin() : TQWidget(0, "NoatunWinampSkin"), UserInterface() { mJumpPressed = false; mVolumePressed = false; @@ -83,22 +83,22 @@ WaSkin::WaSkin() : QWidget(0, "NoatunWinampSkin"), UserInterface() title_shaded = false; // These slots make Young Hickory love us - connect( napp, SIGNAL(hideYourself()), this, SLOT(hide()) ); - connect( napp, SIGNAL(showYourself()), this, SLOT(show()) ); - - connect(napp->player(), SIGNAL(playlistShown()), this, - SLOT(playlistShown())); - connect(napp->player(), SIGNAL(playlistHidden()), this, - SLOT(playlistHidden())); - connect(napp->player(), SIGNAL(loopTypeChange(int)), this, - SLOT(loopChange(int))); - connect(napp->player(), SIGNAL(newSong()), this, SLOT(newSong())); - - connect(napp->player(), SIGNAL(timeout()), this, SLOT(timetick())); + connect( napp, TQT_SIGNAL(hideYourself()), this, TQT_SLOT(hide()) ); + connect( napp, TQT_SIGNAL(showYourself()), this, TQT_SLOT(show()) ); + + connect(napp->player(), TQT_SIGNAL(playlistShown()), this, + TQT_SLOT(playlistShown())); + connect(napp->player(), TQT_SIGNAL(playlistHidden()), this, + TQT_SLOT(playlistHidden())); + connect(napp->player(), TQT_SIGNAL(loopTypeChange(int)), this, + TQT_SLOT(loopChange(int))); + connect(napp->player(), TQT_SIGNAL(newSong()), this, TQT_SLOT(newSong())); + + connect(napp->player(), TQT_SIGNAL(timeout()), this, TQT_SLOT(timetick())); KConfig *config=KGlobal::config(); config->setGroup("Winskin"); - QString skin = config->readEntry("CurrentSkin", WaSkin::defaultSkin()); + TQString skin = config->readEntry("CurrentSkin", WaSkin::defaultSkin()); loadSkin(skin); @@ -106,13 +106,13 @@ WaSkin::WaSkin() : QWidget(0, "NoatunWinampSkin"), UserInterface() setIcon(SmallIcon("noatun")); - QObject::connect(waTitleBar, SIGNAL(shaded()), this, SLOT(shadeEvent())); + TQObject::connect(waTitleBar, TQT_SIGNAL(shaded()), this, TQT_SLOT(shadeEvent())); // connect to players signals - so we can update our display if someone else // changes settings... - connect(napp->player(), SIGNAL(stopped()), this, SLOT(slotStopped())); - connect(napp->player(), SIGNAL(playing()), this, SLOT(slotPlaying())); - connect(napp->player(), SIGNAL(paused()), this, SLOT(slotPaused())); + connect(napp->player(), TQT_SIGNAL(stopped()), this, TQT_SLOT(slotStopped())); + connect(napp->player(), TQT_SIGNAL(playing()), this, TQT_SLOT(slotPlaying())); + connect(napp->player(), TQT_SIGNAL(paused()), this, TQT_SLOT(slotPaused())); napp->player()->handleButtons(); @@ -126,7 +126,7 @@ WaSkin::WaSkin() : QWidget(0, "NoatunWinampSkin"), UserInterface() newSong(); // HACK: We won't get focus events otherwise - setFocusPolicy(QWidget::ClickFocus); + setFocusPolicy(TQWidget::ClickFocus); show(); } @@ -138,7 +138,7 @@ WaSkin::~WaSkin() waSkinManager = 0L; } -void WaSkin::loadSkin(QString newSkinDir) +void WaSkin::loadSkin(TQString newSkinDir) { waSkinManager->loadSkin(newSkinDir); @@ -154,9 +154,9 @@ void WaSkin::loadSkin(QString newSkinDir) } } -QSize WaSkin::sizeHint() const +TQSize WaSkin::sizeHint() const { - QRect temp_rect; + TQRect temp_rect; temp_rect = waSkinModel->getGeometry(_WA_SKIN_MAIN); @@ -180,22 +180,22 @@ void WaSkin::createButtons() menu = new WaButton(_WA_MAPPING_TITLE_MENU); menu->setPixmapUp(_WA_SKIN_TITLE_MENU_NORM); menu->setPixmapDown(_WA_SKIN_TITLE_MENU_PRES); - connect(menu, SIGNAL(clicked()), this, SLOT(menuEvent())); + connect(menu, TQT_SIGNAL(clicked()), this, TQT_SLOT(menuEvent())); minimize = new WaButton(_WA_MAPPING_TITLE_MIN); minimize->setPixmapUp(_WA_SKIN_TITLE_MIN_NORM); minimize->setPixmapDown(_WA_SKIN_TITLE_MIN_PRES); - connect(minimize, SIGNAL(clicked()), this, SLOT(minimizeEvent())); + connect(minimize, TQT_SIGNAL(clicked()), this, TQT_SLOT(minimizeEvent())); titleshade = new WaButton(_WA_MAPPING_TITLE_SHADE); titleshade->setPixmapUp(_WA_SKIN_TITLE_SHADE_NORM); titleshade->setPixmapDown(_WA_SKIN_TITLE_SHADE_PRES); - connect(titleshade, SIGNAL(clicked()), this, SLOT(shadeEvent())); + connect(titleshade, TQT_SIGNAL(clicked()), this, TQT_SLOT(shadeEvent())); close = new WaButton(_WA_MAPPING_TITLE_CLOSE); close->setPixmapUp(_WA_SKIN_TITLE_CLOSE_NORM); close->setPixmapDown(_WA_SKIN_TITLE_CLOSE_PRES); - connect(close, SIGNAL(clicked()), this, SLOT(doClose())); + connect(close, TQT_SIGNAL(clicked()), this, TQT_SLOT(doClose())); shuffle->setTogglable(true); shuffle->show(); @@ -203,44 +203,44 @@ void WaSkin::createButtons() repeat->setTogglable(true); playlist->setTogglable(true); - connect(shuffle, SIGNAL(toggleEvent(bool)), - this, SLOT(shuffleClickedEvent(bool))); + connect(shuffle, TQT_SIGNAL(toggleEvent(bool)), + this, TQT_SLOT(shuffleClickedEvent(bool))); - connect(repeat, SIGNAL(toggleEvent(bool)), - this, SLOT(repeatClickedEvent(bool))); + connect(repeat, TQT_SIGNAL(toggleEvent(bool)), + this, TQT_SLOT(repeatClickedEvent(bool))); - connect(playlist, SIGNAL(toggleEvent(bool)), - this, SLOT(playlistClickedEvent(bool))); + connect(playlist, TQT_SIGNAL(toggleEvent(bool)), + this, TQT_SLOT(playlistClickedEvent(bool))); - connect(eq, SIGNAL(clicked()), - this, SLOT(eqClickedEvent())); + connect(eq, TQT_SIGNAL(clicked()), + this, TQT_SLOT(eqClickedEvent())); prev->setPixmapUp(_WA_SKIN_CBUTTONS_PREV_NORM); prev->setPixmapDown(_WA_SKIN_CBUTTONS_PREV_PRES); - connect(prev, SIGNAL(clicked()), napp->player(), SLOT(back())); + connect(prev, TQT_SIGNAL(clicked()), napp->player(), TQT_SLOT(back())); play->setPixmapUp(_WA_SKIN_CBUTTONS_PLAY_NORM); play->setPixmapDown(_WA_SKIN_CBUTTONS_PLAY_PRES); - connect(play, SIGNAL(clicked()), this, SLOT(playCurrentEvent())); + connect(play, TQT_SIGNAL(clicked()), this, TQT_SLOT(playCurrentEvent())); pause->setPixmapUp(_WA_SKIN_CBUTTONS_PAUSE_NORM); pause->setPixmapDown(_WA_SKIN_CBUTTONS_PAUSE_PRES); - connect(pause, SIGNAL(clicked()), this, SLOT(playPauseEvent())); + connect(pause, TQT_SIGNAL(clicked()), this, TQT_SLOT(playPauseEvent())); stop->setPixmapUp(_WA_SKIN_CBUTTONS_STOP_NORM); stop->setPixmapDown(_WA_SKIN_CBUTTONS_STOP_PRES); - connect(stop, SIGNAL(clicked()), napp->player(), SLOT(stop())); + connect(stop, TQT_SIGNAL(clicked()), napp->player(), TQT_SLOT(stop())); next->setPixmapUp(_WA_SKIN_CBUTTONS_NEXT_NORM); next->setPixmapDown(_WA_SKIN_CBUTTONS_NEXT_PRES); - connect(next, SIGNAL(clicked()), napp->player(), SLOT(forward())); + connect(next, TQT_SIGNAL(clicked()), napp->player(), TQT_SLOT(forward())); eject->setPixmapUp(_WA_SKIN_CBUTTONS_EJECT_NORM); eject->setPixmapDown(_WA_SKIN_CBUTTONS_EJECT_PRESS); - connect(eject, SIGNAL(clicked()), napp, SLOT(fileOpen())); + connect(eject, TQT_SIGNAL(clicked()), napp, TQT_SLOT(fileOpen())); shuffle->setPixmapUp(_WA_SKIN_SHUFREP_SHUFFLE_NOT_SET_NORM); shuffle->setPixmapDown(_WA_SKIN_SHUFREP_SHUFFLE_NOT_SET_PRES); @@ -280,25 +280,25 @@ void WaSkin::createHighLevelElements() waVolumeSlider = new WaVolumeSlider(); waVolumeSlider->buildGui(); - connect(waVolumeSlider, SIGNAL(volumeSetValue(int)), - this, SLOT(volumeSetValue(int))); - connect(waVolumeSlider, SIGNAL(sliderPressed()), - this, SLOT(volumeSliderPressed())); - connect(waVolumeSlider, SIGNAL(sliderReleased()), - this, SLOT(volumeSliderReleased())); + connect(waVolumeSlider, TQT_SIGNAL(volumeSetValue(int)), + this, TQT_SLOT(volumeSetValue(int))); + connect(waVolumeSlider, TQT_SIGNAL(sliderPressed()), + this, TQT_SLOT(volumeSliderPressed())); + connect(waVolumeSlider, TQT_SIGNAL(sliderReleased()), + this, TQT_SLOT(volumeSliderReleased())); waBalanceSlider = new WaBalanceSlider(); waBalanceSlider->buildGui(); - connect(waBalanceSlider, SIGNAL(balanceSetValue(int)), - this, SLOT(balanceSetValue(int))); - connect(waBalanceSlider, SIGNAL(sliderPressed()), - this, SLOT(balanceSliderPressed())); - connect(waBalanceSlider, SIGNAL(sliderReleased()), - this, SLOT(balanceSliderReleased())); + connect(waBalanceSlider, TQT_SIGNAL(balanceSetValue(int)), + this, TQT_SLOT(balanceSetValue(int))); + connect(waBalanceSlider, TQT_SIGNAL(sliderPressed()), + this, TQT_SLOT(balanceSliderPressed())); + connect(waBalanceSlider, TQT_SIGNAL(sliderReleased()), + this, TQT_SLOT(balanceSliderReleased())); waDigit = new WaDigit(); - connect(waDigit, SIGNAL(digitsClicked()), this, SLOT(digitsClicked())); + connect(waDigit, TQT_SIGNAL(digitsClicked()), this, TQT_SLOT(digitsClicked())); waBPS = new WaLabel(_WA_MAPPING_BPS); waFreq = new WaLabel(_WA_MAPPING_FREQ); @@ -310,13 +310,13 @@ void WaSkin::createHighLevelElements() 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); - connect(waJumpSlider, SIGNAL(jump(int)), this, SLOT(jump(int))); - connect(waJumpSlider, SIGNAL(sliderPressed()), - this, SLOT(jumpSliderPressed())); - connect(waJumpSlider, SIGNAL(sliderReleased()), - this, SLOT(jumpSliderReleased())); - connect(waJumpSlider, SIGNAL(valueChanged(int)), - this, SLOT(jumpValueChanged(int))); + connect(waJumpSlider, TQT_SIGNAL(jump(int)), this, TQT_SLOT(jump(int))); + connect(waJumpSlider, TQT_SIGNAL(sliderPressed()), + this, TQT_SLOT(jumpSliderPressed())); + connect(waJumpSlider, TQT_SIGNAL(sliderReleased()), + this, TQT_SLOT(jumpSliderReleased())); + connect(waJumpSlider, TQT_SIGNAL(valueChanged(int)), + this, TQT_SLOT(jumpValueChanged(int))); } @@ -352,7 +352,7 @@ void WaSkin::unshade() { title_shaded = false; } -void WaSkin::focusOutEvent( QFocusEvent * ) { +void WaSkin::focusOutEvent( TQFocusEvent * ) { menu->setPixmapUp(_WA_SKIN_TITLE_MENU_INACTIVE); menu->update(); @@ -368,7 +368,7 @@ void WaSkin::focusOutEvent( QFocusEvent * ) { waTitleBar->setState(false); } -void WaSkin::focusInEvent( QFocusEvent * ) { +void WaSkin::focusInEvent( TQFocusEvent * ) { menu->setPixmapUp(_WA_SKIN_TITLE_MENU_NORM); menu->update(); @@ -384,7 +384,7 @@ void WaSkin::focusInEvent( QFocusEvent * ) { waTitleBar->setState(true); } -void WaSkin::wheelEvent(QWheelEvent *e) { +void WaSkin::wheelEvent(TQWheelEvent *e) { // Get the current volume int newVolume = napp->player()->volume(); @@ -448,7 +448,7 @@ void WaSkin::jumpSliderReleased() void WaSkin::jumpValueChanged(int val) { if (mJumpPressed && !napp->player()->isStopped()) { - QString timeStr = i18n("Seek to: %1/%2 (%3%)"). + TQString timeStr = i18n("Seek to: %1/%2 (%3%)"). arg(getTimeString(val * 1000)). arg(getTimeString(napp->player()->getLength())). arg((val * 1000 * 100) / napp->player()->getLength()); @@ -456,15 +456,15 @@ void WaSkin::jumpValueChanged(int val) } } -QString WaSkin::getTitleString() { +TQString WaSkin::getTitleString() { int length; - QString title = ""; + TQString title = ""; if (!napp->playlist()->current()) { title = "Noatun "; - title += QString::number(NOATUN_MAJOR) + "."; - title += QString::number(NOATUN_MINOR) + "."; - title += QString::number(NOATUN_PATCHLEVEL); + title += TQString::number(NOATUN_MAJOR) + "."; + title += TQString::number(NOATUN_MINOR) + "."; + title += TQString::number(NOATUN_PATCHLEVEL); } else { length = napp->playlist()->current().length(); @@ -483,9 +483,9 @@ QString WaSkin::getTitleString() { return title; } -QString WaSkin::getTimeString(int milliseconds, bool truncate) { +TQString WaSkin::getTimeString(int milliseconds, bool truncate) { int seconds = abs(milliseconds / 1000); - QString ret = ""; + TQString ret = ""; // Do we need to convert to hours:minutes instead of minutes:seconds? if (truncate && (abs(seconds) >= (100 * 60))) @@ -498,7 +498,7 @@ QString WaSkin::getTimeString(int milliseconds, bool truncate) { } void WaSkin::menuEvent() { - NoatunStdAction::ContextMenu::showContextMenu(mapToGlobal(QPoint(0, 14))); + NoatunStdAction::ContextMenu::showContextMenu(mapToGlobal(TQPoint(0, 14))); } void WaSkin::minimizeEvent() { @@ -518,16 +518,16 @@ void WaSkin::doUnload() { } void WaSkin::doClose() { - QTimer::singleShot(0, this, SLOT(doUnload())); + TQTimer::singleShot(0, this, TQT_SLOT(doUnload())); } -void WaSkin::dragEnterEvent(QDragEnterEvent * event) +void WaSkin::dragEnterEvent(TQDragEnterEvent * event) { // accept uri drops only event->accept(KURLDrag::canDecode(event)); } -void WaSkin::dropEvent(QDropEvent * event) +void WaSkin::dropEvent(TQDropEvent * event) { KURL::List uri; if (KURLDrag::decode(event, uri)) @@ -690,12 +690,12 @@ void WaSkin::slotPlaying() if (!info.bps()) waBPS->setText(""); else - waBPS->setText(QString::number(info.bps())); + waBPS->setText(TQString::number(info.bps())); if (!info.KHz()) waFreq->setText(""); else - waFreq->setText(QString::number(info.KHz() / 1000)); + waFreq->setText(TQString::number(info.KHz() / 1000)); setChannels(info.channelCount()); guiSpectrumAnalyser->resumeVisualization(); @@ -736,7 +736,7 @@ void WaSkin::slotPaused() waStatus->setStatus(STATUS_PAUSED); } -void WaSkin::keyPressEvent(QKeyEvent *e) { +void WaSkin::keyPressEvent(TQKeyEvent *e) { switch(e->key()) { case Key_Up: napp->player()->setVolume(napp->player()->volume() + 5); @@ -793,7 +793,7 @@ void WaSkin::keyPressEvent(QKeyEvent *e) { } } -QString WaSkin::defaultSkin() { +TQString WaSkin::defaultSkin() { return "Winamp"; } diff --git a/noatun/modules/winskin/waSkin.h b/noatun/modules/winskin/waSkin.h index 7a2db9e1..947ce81e 100644 --- a/noatun/modules/winskin/waSkin.h +++ b/noatun/modules/winskin/waSkin.h @@ -19,7 +19,7 @@ #include #include #include -#include +#include // Use forward declarations so we compile in a finite time class WaSkinModel; @@ -44,7 +44,7 @@ class GuiSpectrumAnalyser; class WaSkin; extern WaSkin *_waskin_instance; -class WaSkin : public QWidget, public UserInterface { +class WaSkin : public TQWidget, public UserInterface { Q_OBJECT NOATUNPLUGIND WaSkinModel *waSkinModel; @@ -56,12 +56,12 @@ class WaSkin : public QWidget, public UserInterface { int getSkinId(); - void loadSkin(QString skinDir); + void loadSkin(TQString skinDir); void setChannels(int val); - QSize sizeHint() const; + TQSize sizeHint() const; - static QString defaultSkin(); + static TQString defaultSkin(); static WaSkin *instance() { return _waskin_instance; } public slots: @@ -117,21 +117,21 @@ class WaSkin : public QWidget, public UserInterface { void createButtons(); void createHighLevelElements(); - void keyPressEvent(QKeyEvent *); + void keyPressEvent(TQKeyEvent *); void shade(); void unshade(); - QString getTitleString(); - QString getTimeString(int milliseconds, bool truncate = false); + TQString getTitleString(); + TQString getTimeString(int milliseconds, bool truncate = false); - void focusOutEvent ( QFocusEvent * ); - void focusInEvent ( QFocusEvent * ); + void focusOutEvent ( TQFocusEvent * ); + void focusInEvent ( TQFocusEvent * ); - void dragEnterEvent(QDragEnterEvent * event); - void dropEvent(QDropEvent * event); + void dragEnterEvent(TQDragEnterEvent * event); + void dropEvent(TQDropEvent * event); - void wheelEvent(QWheelEvent *e); + void wheelEvent(TQWheelEvent *e); WaButton *prev; WaButton *play; diff --git a/noatun/modules/winskin/waSkinManager.cpp b/noatun/modules/winskin/waSkinManager.cpp index 5cde117b..cb5b0e2a 100644 --- a/noatun/modules/winskin/waSkinManager.cpp +++ b/noatun/modules/winskin/waSkinManager.cpp @@ -1,8 +1,8 @@ #include -#include -#include +#include +#include #include -#include +#include #include #include #include @@ -19,21 +19,21 @@ WaSkinManager::WaSkinManager() : DCOPObject("WaSkinManager") { WaSkinManager::~WaSkinManager() { } -QStringList WaSkinManager::availableSkins() { - QStringList skinDirs = KGlobal::dirs()->findDirs("data", "noatun/skins/winamp"); - QStringList skin_list; +TQStringList WaSkinManager::availableSkins() { + TQStringList skinDirs = KGlobal::dirs()->findDirs("data", "noatun/skins/winamp"); + TQStringList skin_list; // This loop adds them all to our skin list for(unsigned int x = 0;x < skinDirs.count();x++) { - QDir skinQDir(skinDirs[x]); + TQDir skinQDir(skinDirs[x]); // We only want directories, although there shouldn't be anything else - skinQDir.setFilter( QDir::Dirs ); + skinQDir.setFilter( TQDir::Dirs ); // I guess name is as good as any - skinQDir.setSorting( QDir::Name ); + skinQDir.setSorting( TQDir::Name ); for (unsigned int y = 0;y < skinQDir.count();y++) { - QStringList skins = skinQDir.entryList(QDir::Dirs, QDir::Name); + TQStringList skins = skinQDir.entryList(TQDir::Dirs, TQDir::Name); // We really don't care for '.' and '..' if (skinQDir[y][0] != (char)'.') { @@ -46,16 +46,16 @@ QStringList WaSkinManager::availableSkins() { return skin_list; } -QString WaSkinManager::currentSkin() { +TQString WaSkinManager::currentSkin() { return mCurrentSkin; } -QString WaSkinManager::defaultSkin() { +TQString WaSkinManager::defaultSkin() { return "Winamp"; } -bool WaSkinManager::loadSkin(QString skinName) { - QStringList skins = KGlobal::dirs()->findDirs("data", "noatun/skins/winamp/" + skinName); +bool WaSkinManager::loadSkin(TQString skinName) { + TQStringList skins = KGlobal::dirs()->findDirs("data", "noatun/skins/winamp/" + skinName); if (!skins.count()) mCurrentSkin = defaultSkin(); @@ -65,15 +65,15 @@ bool WaSkinManager::loadSkin(QString skinName) { return _waskinmodel_instance->load(skins[0]); } -bool WaSkinManager::installSkin(QString _url) { - QString location = KGlobal::dirs()->saveLocation("data", "noatun/skins/winamp"); +bool WaSkinManager::installSkin(TQString _url) { + TQString location = KGlobal::dirs()->saveLocation("data", "noatun/skins/winamp"); KURL url(_url); - QString mimetype = KMimeType::findByURL(_url)->name(); + TQString mimetype = KMimeType::findByURL(_url)->name(); if (mimetype == "inode/directory") { KIO::Job *job = KIO::copy(url, location, !url.isLocalFile()); - connect(job, SIGNAL(result(KIO::Job *)), this, SIGNAL(updateSkinList())); + connect(job, TQT_SIGNAL(result(KIO::Job *)), this, TQT_SIGNAL(updateSkinList())); return true; } else if ((mimetype == "interface/x-winamp-skin") || (mimetype == "application/x-zip")) @@ -81,10 +81,10 @@ bool WaSkinManager::installSkin(QString _url) { if (!url.isLocalFile()) return false; - QString base_path; - base_path = location + "/" + QFileInfo(url.path()).baseName().replace(QRegExp("_"), " "); + TQString base_path; + base_path = location + "/" + TQFileInfo(url.path()).baseName().replace(TQRegExp("_"), " "); KIO::Job *job = KIO::copy("zip:" + url.path(), base_path); - connect(job, SIGNAL(result(KIO::Job *)), this, SIGNAL(updateSkinList())); + connect(job, TQT_SIGNAL(result(KIO::Job *)), this, TQT_SIGNAL(updateSkinList())); return true; } @@ -92,30 +92,30 @@ bool WaSkinManager::installSkin(QString _url) { return false; } -bool WaSkinManager::removeSkin(QString skinName) { +bool WaSkinManager::removeSkin(TQString skinName) { if (!skinRemovable(skinName)) return false; - QStringList skins = KGlobal::dirs()->findDirs("data", "noatun/skins/winamp/" + skinName); + TQStringList skins = KGlobal::dirs()->findDirs("data", "noatun/skins/winamp/" + skinName); KIO::Job *job = KIO::del(KURL(skins[0]), false, false); - connect(job, SIGNAL(result(KIO::Job *)), this, SIGNAL(updateSkinList())); + connect(job, TQT_SIGNAL(result(KIO::Job *)), this, TQT_SIGNAL(updateSkinList())); return true; } -bool WaSkinManager::skinRemovable(QString skinName) { - QStringList skins = KGlobal::dirs()->findDirs("data", "noatun/skins/winamp/" + skinName); +bool WaSkinManager::skinRemovable(TQString skinName) { + TQStringList skins = KGlobal::dirs()->findDirs("data", "noatun/skins/winamp/" + skinName); if (!skins.count()) return false; - QFileInfo info(skins[0]); + TQFileInfo info(skins[0]); return info.isWritable(); } -QStringList WaSkinManager::skinMimeTypes() { - QStringList temp; +TQStringList WaSkinManager::skinMimeTypes() { + TQStringList temp; temp.append("interface/x-winamp-skin"); temp.append("application/x-zip"); diff --git a/noatun/modules/winskin/waSkinManager.h b/noatun/modules/winskin/waSkinManager.h index 17b21daf..360826b1 100644 --- a/noatun/modules/winskin/waSkinManager.h +++ b/noatun/modules/winskin/waSkinManager.h @@ -2,12 +2,12 @@ #define _WASKINMANAGER_H #include -#include -#include -#include -#include +#include +#include +#include +#include -class WaSkinManager : public QObject, public DCOPObject { +class WaSkinManager : public TQObject, public DCOPObject { Q_OBJECT K_DCOP @@ -16,24 +16,24 @@ public: ~WaSkinManager(); k_dcop: - QStringList availableSkins(); - QString currentSkin(); - bool loadSkin(QString skinName); + TQStringList availableSkins(); + TQString currentSkin(); + bool loadSkin(TQString skinName); - QString defaultSkin(); + TQString defaultSkin(); - bool installSkin(QString url); + bool installSkin(TQString url); - bool skinRemovable(QString skinName); - bool removeSkin(QString skinName); + bool skinRemovable(TQString skinName); + bool removeSkin(TQString skinName); - QStringList skinMimeTypes(); + TQStringList skinMimeTypes(); signals: void updateSkinList(); private: - QString mCurrentSkin; + TQString mCurrentSkin; }; #endif diff --git a/noatun/modules/winskin/waSkinModel.cpp b/noatun/modules/winskin/waSkinModel.cpp index ff53b4e6..bbe20a39 100644 --- a/noatun/modules/winskin/waSkinModel.cpp +++ b/noatun/modules/winskin/waSkinModel.cpp @@ -13,9 +13,9 @@ #include -#include -#include -#include +#include +#include +#include #include #include @@ -39,7 +39,7 @@ int digit_height; struct WaPixmapEntry { const char *filename; - QPixmap *pixmap; + TQPixmap *pixmap; }; WaPixmapEntry waPixmapEntries[11] = { @@ -74,15 +74,15 @@ WaSkinModel::~WaSkinModel() delete colorScheme; } -bool WaSkinModel::load(QString skinDir) +bool WaSkinModel::load(TQString skinDir) { bool success = true; - QDir dir(skinDir); + TQDir dir(skinDir); if (findFile(dir, "main.bmp").isEmpty()) { // Ack, our skin dir doesn't exist, fall back to the default - dir = QDir(KGlobal::dirs()->findDirs("data", "noatun/skins/winamp/" + WaSkin::defaultSkin())[0]); + dir = TQDir(KGlobal::dirs()->findDirs("data", "noatun/skins/winamp/" + WaSkin::defaultSkin())[0]); success = false; } @@ -105,27 +105,27 @@ bool WaSkinModel::load(QString skinDir) // Filename -must- be lowercase, which is an nice optimization, since // this is a private API, and all our filenames are internally lowercase // anyway -QString WaSkinModel::findFile(const QDir &dir, const QString &filename) { - QFileInfo fileInfo; - QString ret = ""; +TQString WaSkinModel::findFile(const TQDir &dir, const TQString &filename) { + TQFileInfo fileInfo; + TQString ret = ""; - QStringList strList = dir.entryList(); + TQStringList strList = dir.entryList(); - for (QStringList::iterator file = strList.begin(); file != strList.end(); file++) { - QFileInfo fileInfo(*file); + for (TQStringList::iterator file = strList.begin(); file != strList.end(); file++) { + TQFileInfo fileInfo(*file); if (fileInfo.isDir()) continue; if (fileInfo.filePath().lower() == filename) - return dir.absPath() + "/" + QString(fileInfo.filePath()); + return dir.absPath() + "/" + TQString(fileInfo.filePath()); } return ""; } -void WaSkinModel::loadColors(const QDir &dir) { - QString colorFile = findFile(dir, "viscolor.txt"); +void WaSkinModel::loadColors(const TQDir &dir) { + TQString colorFile = findFile(dir, "viscolor.txt"); if (colorScheme) { delete colorScheme; @@ -134,8 +134,8 @@ void WaSkinModel::loadColors(const QDir &dir) { colorScheme = new WaColor(colorFile); } -void WaSkinModel::loadRegion(const QDir &dir) { - QString regionFile = findFile(dir, "region.txt"); +void WaSkinModel::loadRegion(const TQDir &dir) { + TQString regionFile = findFile(dir, "region.txt"); if (windowRegion) { delete windowRegion; @@ -145,12 +145,12 @@ void WaSkinModel::loadRegion(const QDir &dir) { windowRegion = new WaRegion(regionFile); } -int WaSkinModel::getPixmap(const QDir &dir, QString fname, - QPixmap *target) +int WaSkinModel::getPixmap(const TQDir &dir, TQString fname, + TQPixmap *target) { - QFileInfo fileInfo; - QStringList strList = dir.entryList(); - QString abspath; + TQFileInfo fileInfo; + TQStringList strList = dir.entryList(); + TQString abspath; abspath = findFile(dir, fname); @@ -161,46 +161,46 @@ int WaSkinModel::getPixmap(const QDir &dir, QString fname, // now the filename mapping 1.8x -> 2.0 if (fname == "volume.bmp") - return WaSkinModel::getPixmap(dir, QString("volbar.bmp"), target); + return WaSkinModel::getPixmap(dir, TQString("volbar.bmp"), target); if (fname == "numbers.bmp") - return WaSkinModel::getPixmap(dir, QString("nums_ex.bmp"), target); + return WaSkinModel::getPixmap(dir, TQString("nums_ex.bmp"), target); // Even 2.x themes can omit BALANCE, in which case we use VOLUME if (fname == "balance.bmp") - return WaSkinModel::getPixmap(dir, QString("volume.bmp"), target); + return WaSkinModel::getPixmap(dir, TQString("volume.bmp"), target); return false; } -QRect WaSkinModel::getGeometry(int id) { +TQRect WaSkinModel::getGeometry(int id) { if ( (id < 0) || (id >= _WA_SKIN_ENTRIES) ) { kdDebug() << "Array index out of range. WaSkinModel::getGeometry"<= _WA_MAPPING_ENTRIES) ) { kdDebug() << "Array index out of range. WaSkinModel::getMapGeometry"< -#include -#include +#include +#include +#include #include "waSkins.h" @@ -25,25 +25,25 @@ class QChar; class WaSkinModel; extern WaSkinModel *_waskinmodel_instance; -class WaSkinModel : public QObject { +class WaSkinModel : public TQObject { Q_OBJECT public: WaSkinModel(); ~WaSkinModel(); - void getDigit(char number, QPaintDevice *dest, int x, int y); - void getText(char text, QPaintDevice *dest, int x, int y); + void getDigit(char number, TQPaintDevice *dest, int x, int y); + void getText(char text, TQPaintDevice *dest, int x, int y); - void bltTo(int id, QPaintDevice *dest, int x, int y); - void bltTo(int id, QPaintDevice *dest, int x, int y, int argument); + void bltTo(int id, TQPaintDevice *dest, int x, int y); + void bltTo(int id, TQPaintDevice *dest, int x, int y, int argument); - void paintBackgroundTo(int mapping, QPaintDevice *dest, int x, int y); + void paintBackgroundTo(int mapping, TQPaintDevice *dest, int x, int y); - QRect getGeometry(int id); - QRect getMapGeometry(int id); + TQRect getGeometry(int id); + TQRect getMapGeometry(int id); - bool load(QString skinDir); + bool load(TQString skinDir); void setSkinModel(skin_models new_model); static WaSkinModel *instance() { return _waskinmodel_instance; } @@ -51,12 +51,12 @@ class WaSkinModel : public QObject { private: void resetSkinModel(); - QString findFile(const QDir &dir, const QString &filename); - QChar deaccent(QChar input); + TQString findFile(const TQDir &dir, const TQString &filename); + TQChar deaccent(TQChar input); - int getPixmap(const QDir &dir, QString fname, QPixmap * target); - void loadColors(const QDir &dir); - void loadRegion(const QDir &dir); + int getPixmap(const TQDir &dir, TQString fname, TQPixmap * target); + void loadColors(const TQDir &dir); + void loadRegion(const TQDir &dir); signals: void skinChanged(); diff --git a/noatun/modules/winskin/waSlider.cpp b/noatun/modules/winskin/waSlider.cpp index 4fff1b0d..99e52402 100644 --- a/noatun/modules/winskin/waSlider.cpp +++ b/noatun/modules/winskin/waSlider.cpp @@ -44,7 +44,7 @@ void WaSlider::setPixmapSliderBar(int pixId) update(); } -void WaSlider::paintEvent(QPaintEvent *) +void WaSlider::paintEvent(TQPaintEvent *) { // POSBAR.BMP does not have full height in all Winamp skins // Paint background before painting slider to be on the safe side @@ -58,7 +58,7 @@ void WaSlider::paintEvent(QPaintEvent *) } -void WaSlider::mouseMoveEvent(QMouseEvent * e) +void WaSlider::mouseMoveEvent(TQMouseEvent * e) { if (lDragging == false) { WaWidget::mouseMoveEvent(e); @@ -70,7 +70,7 @@ void WaSlider::mouseMoveEvent(QMouseEvent * e) if (newX < 0) newX = 0; - QSize size = sizeHint(); + TQSize size = sizeHint(); int maxX = size.width() - slider_width; @@ -101,7 +101,7 @@ void WaSlider::updateSliderPos(int value) update(); } -void WaSlider::mousePressEvent(QMouseEvent *e) { +void WaSlider::mousePressEvent(TQMouseEvent *e) { if (e->button() != LeftButton && e->button() != MidButton) { WaWidget::mousePressEvent(e); return; @@ -127,7 +127,7 @@ void WaSlider::mousePressEvent(QMouseEvent *e) { emit(sliderPressed()); } -void WaSlider::mouseReleaseEvent(QMouseEvent *e) +void WaSlider::mouseReleaseEvent(TQMouseEvent *e) { if (!lDragging) { WaWidget::mouseReleaseEvent(e); @@ -143,7 +143,7 @@ void WaSlider::mouseReleaseEvent(QMouseEvent *e) int WaSlider::pixel2Value(int xpos) { - QSize size = sizeHint(); + TQSize size = sizeHint(); int min = abs(minValue); int max = abs(maxValue); @@ -158,7 +158,7 @@ int WaSlider::pixel2Value(int xpos) int WaSlider::value2Pixel(int value) { - QSize size = sizeHint(); + TQSize size = sizeHint(); 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 0003afd2..47630a6c 100644 --- a/noatun/modules/winskin/waSlider.h +++ b/noatun/modules/winskin/waSlider.h @@ -16,7 +16,7 @@ #ifndef __WASLIDER_H #define __WASLIDER_H -#include +#include #include "waWidget.h" #include "waButton.h" @@ -44,7 +44,7 @@ class WaSlider : public WaWidget { void setPixmapSliderBar(int pixId); private: - void paintEvent(QPaintEvent *); + void paintEvent(TQPaintEvent *); int pixel2Value(int xpos); int value2Pixel(int value); @@ -60,16 +60,16 @@ class WaSlider : public WaWidget { int sliderBarMapId; bool lDragging; - QPoint pressPoint; + TQPoint pressPoint; int currentValue; int minValue; int maxValue; - void mousePressEvent(QMouseEvent *e); - void mouseMoveEvent(QMouseEvent *e); - void mouseReleaseEvent(QMouseEvent *e); + void mousePressEvent(TQMouseEvent *e); + void mouseMoveEvent(TQMouseEvent *e); + void mouseReleaseEvent(TQMouseEvent *e); private slots: void updateSliderPos(int value); diff --git a/noatun/modules/winskin/waStatus.cpp b/noatun/modules/winskin/waStatus.cpp index e028b7f0..861e8677 100644 --- a/noatun/modules/winskin/waStatus.cpp +++ b/noatun/modules/winskin/waStatus.cpp @@ -23,7 +23,7 @@ WaStatus::~WaStatus() { } -void WaStatus::paintEvent(QPaintEvent *) +void WaStatus::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 a3fe1bc8..e67054df 100644 --- a/noatun/modules/winskin/waStatus.h +++ b/noatun/modules/winskin/waStatus.h @@ -16,7 +16,7 @@ #ifndef __WASTATUS_H #define __WASTATUS_H -#include +#include #include "waWidget.h" @@ -33,7 +33,7 @@ class WaStatus : public WaWidget { status_enum status() const { return _status; } private: - void paintEvent(QPaintEvent * paintEvent); + void paintEvent(TQPaintEvent * paintEvent); status_enum _status; }; diff --git a/noatun/modules/winskin/waTitleBar.cpp b/noatun/modules/winskin/waTitleBar.cpp index 82b603f5..bba7386e 100644 --- a/noatun/modules/winskin/waTitleBar.cpp +++ b/noatun/modules/winskin/waTitleBar.cpp @@ -12,8 +12,8 @@ */ -#include -#include +#include +#include #include "waTitleBar.h" #include "waSkinModel.h" @@ -32,7 +32,7 @@ WaTitleBar::~WaTitleBar() { } -void WaTitleBar::mousePressEvent(QMouseEvent * e) +void WaTitleBar::mousePressEvent(TQMouseEvent * e) { if (e->button() != RightButton) { if (!moving) { @@ -49,11 +49,11 @@ void WaTitleBar::mousePressEvent(QMouseEvent * e) WaWidget::mousePressEvent(e); } -void WaTitleBar::mouseDoubleClickEvent(QMouseEvent *) { +void WaTitleBar::mouseDoubleClickEvent(TQMouseEvent *) { emit(shaded()); } -void WaTitleBar::mouseReleaseEvent(QMouseEvent * e) +void WaTitleBar::mouseReleaseEvent(TQMouseEvent * e) { if (e->button() != RightButton) { moving = false; @@ -64,9 +64,9 @@ void WaTitleBar::mouseReleaseEvent(QMouseEvent * e) WaWidget::mouseReleaseEvent(e); } -void WaTitleBar::mouseMoveEvent(QMouseEvent * e) +void WaTitleBar::mouseMoveEvent(TQMouseEvent * e) { - QPoint diff = e->globalPos() - mLastPos; + TQPoint diff = e->globalPos() - mLastPos; if (abs(diff.x()) > 10 || abs(diff.y()) > 10) { // Moving starts only, when passing a drag border moving = true; diff --git a/noatun/modules/winskin/waTitleBar.h b/noatun/modules/winskin/waTitleBar.h index 4e001394..30bfe29a 100644 --- a/noatun/modules/winskin/waTitleBar.h +++ b/noatun/modules/winskin/waTitleBar.h @@ -16,7 +16,7 @@ #ifndef __WATITLEBAR_H #define __WATITLEBAR_H -#include +#include #include "waIndicator.h" @@ -35,14 +35,14 @@ class WaTitleBar : public WaIndicator { ~WaTitleBar(); private: - void mouseDoubleClickEvent (QMouseEvent * e); - void mousePressEvent(QMouseEvent * e); - void mouseReleaseEvent(QMouseEvent * e); - void mouseMoveEvent(QMouseEvent * e); + void mouseDoubleClickEvent (TQMouseEvent * e); + void mousePressEvent(TQMouseEvent * e); + void mouseReleaseEvent(TQMouseEvent * e); + void mouseMoveEvent(TQMouseEvent * e); bool moving; - QPoint mLastPos; - QPoint mDragStart; + TQPoint mLastPos; + TQPoint mDragStart; signals: void shaded(); diff --git a/noatun/modules/winskin/waVolumeSlider.cpp b/noatun/modules/winskin/waVolumeSlider.cpp index d0a934d7..f61e22f1 100644 --- a/noatun/modules/winskin/waVolumeSlider.cpp +++ b/noatun/modules/winskin/waVolumeSlider.cpp @@ -33,10 +33,10 @@ void WaVolumeSlider::buildGui() ws->setPixmapSliderButtonDown(_WA_SKIN_VOLUME_SLIDER_PRES); ws->setPixmapSliderBar(_WA_SKIN_VOLUME_BAR); - connect(ws, SIGNAL(valueChanged(int)), this, - SIGNAL(volumeSetValue(int))); - connect(ws, SIGNAL(sliderPressed()), SIGNAL(sliderPressed())); - connect(ws, SIGNAL(sliderReleased()), SIGNAL(sliderReleased())); + connect(ws, TQT_SIGNAL(valueChanged(int)), this, + TQT_SIGNAL(volumeSetValue(int))); + connect(ws, TQT_SIGNAL(sliderPressed()), TQT_SIGNAL(sliderPressed())); + connect(ws, TQT_SIGNAL(sliderReleased()), TQT_SIGNAL(sliderReleased())); } void WaVolumeSlider::setVolumeValue(int val) diff --git a/noatun/modules/winskin/waWidget.cpp b/noatun/modules/winskin/waWidget.cpp index ffe2d3b4..a93537b9 100644 --- a/noatun/modules/winskin/waWidget.cpp +++ b/noatun/modules/winskin/waWidget.cpp @@ -3,10 +3,10 @@ #include "noatun/stdaction.h" #include "waSkin.h" -WaWidget::WaWidget(int _mapping) : QWidget(WaSkin::instance()) { +WaWidget::WaWidget(int _mapping) : TQWidget(WaSkin::instance()) { mapping = _mapping; setBackgroundMode(NoBackground); - connect (WaSkinModel::instance(), SIGNAL(skinChanged()), this, SLOT(skinChanged())); + connect (WaSkinModel::instance(), TQT_SIGNAL(skinChanged()), this, TQT_SLOT(skinChanged())); } WaWidget::~WaWidget() { @@ -41,11 +41,11 @@ void WaWidget::paintPixmap(int pixmap_mapping, int argument, int x, int y) { WaSkinModel::instance()->paintBackgroundTo(mapping, this, x, y); } -QSize WaWidget::sizeHint() { +TQSize WaWidget::sizeHint() { return WaSkinModel::instance()->getMapGeometry(mapping).size(); } -void WaWidget::mousePressEvent(QMouseEvent *e) { +void WaWidget::mousePressEvent(TQMouseEvent *e) { if (e->button() == RightButton) NoatunStdAction::ContextMenu::showContextMenu(); } diff --git a/noatun/modules/winskin/waWidget.h b/noatun/modules/winskin/waWidget.h index f2a41c82..076d0a5c 100644 --- a/noatun/modules/winskin/waWidget.h +++ b/noatun/modules/winskin/waWidget.h @@ -1,16 +1,16 @@ #ifndef _WAWIDGET_H #define _WAWIDGET_H -#include +#include #include "waSkinModel.h" -class WaWidget : public QWidget { +class WaWidget : public TQWidget { Q_OBJECT public: WaWidget(int mapping); virtual ~WaWidget(); - QSize sizeHint(); + TQSize sizeHint(); void paintPixmap(int wa_mapping); void paintPixmap(int wa_mapping, int number); @@ -21,7 +21,7 @@ public: void paintBackground() { WaSkinModel::instance()->paintBackgroundTo(mapping, this, 0, 0); } protected: - void mousePressEvent(QMouseEvent *); + void mousePressEvent(TQMouseEvent *); int mapping; private slots: diff --git a/noatun/modules/winskin/winSkinConfig.cpp b/noatun/modules/winskin/winSkinConfig.cpp index 649fd1fe..07352c7b 100644 --- a/noatun/modules/winskin/winSkinConfig.cpp +++ b/noatun/modules/winskin/winSkinConfig.cpp @@ -1,77 +1,77 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include -#include -#include -#include +#include +#include +#include #include #include #include #include #include #include -#include +#include #include "waSkin.h" #include "waInfo.h" #include "waSkinManager.h" #include "winSkinConfig.h" -WinSkinConfig::WinSkinConfig(QWidget * parent, WaSkinManager *waSkinManager) : +WinSkinConfig::WinSkinConfig(TQWidget * parent, WaSkinManager *waSkinManager) : CModule(i18n("Winskin"), i18n("Skin Selection for the Winskin Plugin"), "style", parent) { // Make a token horizontal layout box - vbox = new QVBoxLayout(this); + vbox = new TQVBoxLayout(this); vbox->setSpacing( 6 ); vbox->setMargin( 0 ); // Add a simple list of skins, populated in WinSkinConfig::reopen() - skin_list = new QListBox(this, "skin_list"); + skin_list = new TQListBox(this, "skin_list"); vbox->addWidget(skin_list); - QHBoxLayout* hbox = new QHBoxLayout( 0, 6, 6 ); + TQHBoxLayout* hbox = new TQHBoxLayout( 0, 6, 6 ); - QPushButton* buttonInstall = new QPushButton( i18n("&Install New Skin..."), this ); + TQPushButton* buttonInstall = new TQPushButton( i18n("&Install New Skin..."), this ); hbox->addWidget(buttonInstall); - buttonRemove = new QPushButton( i18n("&Remove Skin"), this ); + buttonRemove = new TQPushButton( i18n("&Remove Skin"), this ); buttonRemove->setEnabled(false); hbox->addWidget(buttonRemove); vbox->addLayout(hbox); - connect( skin_list, SIGNAL(highlighted(const QString &)), this, SLOT(selected())); - connect( buttonInstall, SIGNAL(clicked()), this, SLOT(install())); - connect( buttonRemove, SIGNAL(clicked()), this, SLOT(remove())); - connect(waSkinManager, SIGNAL(updateSkinList()), this, SLOT(reopen())); + connect( skin_list, TQT_SIGNAL(highlighted(const TQString &)), this, TQT_SLOT(selected())); + connect( buttonInstall, TQT_SIGNAL(clicked()), this, TQT_SLOT(install())); + connect( buttonRemove, TQT_SIGNAL(clicked()), this, TQT_SLOT(remove())); + connect(waSkinManager, TQT_SIGNAL(updateSkinList()), this, TQT_SLOT(reopen())); mWaSkinManager = waSkinManager; - QGroupBox *settingsBox = new QGroupBox( 1, Vertical, i18n("Settings"), this ); + TQGroupBox *settingsBox = new TQGroupBox( 1, Vertical, i18n("Settings"), this ); vbox->addWidget(settingsBox); - QHBox *box = new QHBox(settingsBox); - QLabel *label = new QLabel(i18n("T&itle scrolling speed:"), box); - new QLabel(i18n("None"), box); + TQHBox *box = new TQHBox(settingsBox); + TQLabel *label = new TQLabel(i18n("T&itle scrolling speed:"), box); + new TQLabel(i18n("None"), box); - scrollSpeed = new QSlider(box); + scrollSpeed = new TQSlider(box); label->setBuddy(scrollSpeed); - scrollSpeed->setMinimumSize( QSize( 80, 0 ) ); + scrollSpeed->setMinimumSize( TQSize( 80, 0 ) ); scrollSpeed->setMinValue( 0 ); scrollSpeed->setMaxValue( 50 ); scrollSpeed->setPageStep( 1 ); - scrollSpeed->setOrientation( QSlider::Horizontal ); - scrollSpeed->setTickmarks( QSlider::NoMarks ); + scrollSpeed->setOrientation( TQSlider::Horizontal ); + scrollSpeed->setTickmarks( TQSlider::NoMarks ); - label = new QLabel(i18n("Fast"), box); + label = new TQLabel(i18n("Fast"), box); reopen(); } @@ -99,7 +99,7 @@ void WinSkinConfig::reopen() { skin_list->clear(); // Get a list of skins - QStringList skins = mWaSkinManager->availableSkins(); + TQStringList skins = mWaSkinManager->availableSkins(); // This loop adds them all to our skin list for(unsigned int x = 0;x < skins.count();x++) { @@ -108,10 +108,10 @@ void WinSkinConfig::reopen() { } // Figure out our current skin - QString orig_skin = mWaSkinManager->currentSkin(); + TQString orig_skin = mWaSkinManager->currentSkin(); // Where is that skin in our big-list-o-skins? - QListBoxItem *item = skin_list->findItem(orig_skin); + TQListBoxItem *item = skin_list->findItem(orig_skin); if (item) { // Aha, found it... make it the currently selected skin @@ -135,14 +135,14 @@ void WinSkinConfig::selected() void WinSkinConfig::install() { - QString url; + TQString url; // Ask the user for directory containing a skin - KURLRequesterDlg* udlg = new KURLRequesterDlg( QString::null, this, "udlg", true ); + KURLRequesterDlg* udlg = new KURLRequesterDlg( TQString::null, this, "udlg", true ); udlg->urlRequester()->setFilter(mWaSkinManager->skinMimeTypes().join(" ")); udlg->urlRequester()->setMode( KFile::File | KFile::Directory | KFile::ExistingOnly ); - if( udlg->exec() == QDialog::Accepted ) { + if( udlg->exec() == TQDialog::Accepted ) { url = udlg->urlRequester()->url(); mWaSkinManager->installSkin( url ); } @@ -163,7 +163,7 @@ void WinSkinConfig::remove() // Ask the user first if( KMessageBox::warningContinueCancel( this, - i18n("Are you sure you want to remove the %1 skin?").arg( skin_list->currentText() ), QString::null, KStdGuiItem::del() ) + i18n("Are you sure you want to remove the %1 skin?").arg( skin_list->currentText() ), TQString::null, KStdGuiItem::del() ) == KMessageBox::Continue ) { mWaSkinManager->removeSkin( skin_list->currentText() ); diff --git a/noatun/modules/winskin/winSkinConfig.h b/noatun/modules/winskin/winSkinConfig.h index 22dca884..0aabb1f5 100644 --- a/noatun/modules/winskin/winSkinConfig.h +++ b/noatun/modules/winskin/winSkinConfig.h @@ -2,7 +2,7 @@ #define __WINSKINCONFIG_H #include -#include +#include class QVBoxLayout; class WaSkinManager; @@ -11,7 +11,7 @@ class QSlider; class WinSkinConfig:public CModule { Q_OBJECT public: - WinSkinConfig(QWidget * parent, WaSkinManager *waManager); + WinSkinConfig(TQWidget * parent, WaSkinManager *waManager); void save(); @@ -25,11 +25,11 @@ class WinSkinConfig:public CModule { private: WaSkinManager *mWaSkinManager; - QListBox *skin_list; - QString orig_skin; - QVBoxLayout *vbox; - QPushButton *buttonRemove; - QSlider *scrollSpeed; + TQListBox *skin_list; + TQString orig_skin; + TQVBoxLayout *vbox; + TQPushButton *buttonRemove; + TQSlider *scrollSpeed; }; #endif diff --git a/noatun/modules/winskin/winSkinVis.cpp b/noatun/modules/winskin/winSkinVis.cpp index f9937981..8ec025d2 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(QObject *parent, const char *name): - QObject(parent,name),Visualization(50) { +WinSkinVis::WinSkinVis(TQObject *parent, const char *name): + TQObject(parent,name),Visualization(50) { m_currentPeaks=new float[__BANDS]; diff --git a/noatun/modules/winskin/winSkinVis.h b/noatun/modules/winskin/winSkinVis.h index 7d139d0c..51c33205 100644 --- a/noatun/modules/winskin/winSkinVis.h +++ b/noatun/modules/winskin/winSkinVis.h @@ -14,7 +14,7 @@ #ifndef __WINSKINVIS_H #define __WINSKINVIS_H -#include +#include // These are needed for the Visualisation class #include @@ -23,11 +23,11 @@ #include "vis/winskinvis.h" -class WinSkinVis : public QObject, public Visualization { +class WinSkinVis : public TQObject, public Visualization { Q_OBJECT public: - WinSkinVis(QObject* parent,const char* name); + WinSkinVis(TQObject* parent,const char* name); ~WinSkinVis(); /** -- cgit v1.2.1