From 7346aee26bf190a7e70333c40fab4caca847cd27 Mon Sep 17 00:00:00 2001 From: tpearson Date: Sat, 31 Jul 2010 19:22:56 +0000 Subject: Trinity Qt initial conversion git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdeaddons@1157634 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- noatun-plugins/alsaplayer/configmodule.cpp | 10 +-- noatun-plugins/alsaplayer/configmodule.h | 4 +- noatun-plugins/alsaplayer/seeker.cpp | 10 +-- noatun-plugins/alsaplayer/seeker.h | 4 +- noatun-plugins/alsaplayer/userinterface.cpp | 110 ++++++++++++++-------------- noatun-plugins/alsaplayer/userinterface.h | 16 ++-- 6 files changed, 77 insertions(+), 77 deletions(-) (limited to 'noatun-plugins/alsaplayer') diff --git a/noatun-plugins/alsaplayer/configmodule.cpp b/noatun-plugins/alsaplayer/configmodule.cpp index 07c5cfd..6fd02f8 100644 --- a/noatun-plugins/alsaplayer/configmodule.cpp +++ b/noatun-plugins/alsaplayer/configmodule.cpp @@ -24,12 +24,12 @@ #include #include -#include -#include +#include +#include #include "configmodule.h" -AlsaPlayerConfigModule::AlsaPlayerConfigModule(QObject * parent) +AlsaPlayerConfigModule::AlsaPlayerConfigModule(TQObject * parent) : CModule ( @@ -39,9 +39,9 @@ AlsaPlayerConfigModule::AlsaPlayerConfigModule(QObject * parent) parent ) { - scroll_ = new QCheckBox(i18n("Scroll song title"), this); + scroll_ = new TQCheckBox(i18n("Scroll song title"), this); - QVBoxLayout * layout = new QVBoxLayout(this); + TQVBoxLayout * layout = new TQVBoxLayout(this); layout->addWidget(scroll_); diff --git a/noatun-plugins/alsaplayer/configmodule.h b/noatun-plugins/alsaplayer/configmodule.h index 2104fdf..701a699 100644 --- a/noatun-plugins/alsaplayer/configmodule.h +++ b/noatun-plugins/alsaplayer/configmodule.h @@ -33,7 +33,7 @@ class AlsaPlayerConfigModule : public CModule public: - AlsaPlayerConfigModule(QObject *); + AlsaPlayerConfigModule(TQObject *); signals: @@ -46,7 +46,7 @@ class AlsaPlayerConfigModule : public CModule private: - QCheckBox * scroll_; + TQCheckBox * scroll_; }; #endif // ALSAPLAYER_CONFIG_MODULE_H diff --git a/noatun-plugins/alsaplayer/seeker.cpp b/noatun-plugins/alsaplayer/seeker.cpp index 6ffac8c..606b461 100644 --- a/noatun-plugins/alsaplayer/seeker.cpp +++ b/noatun-plugins/alsaplayer/seeker.cpp @@ -20,18 +20,18 @@ * */ -#include +#include #include #include #include "seeker.h" -Seeker::Seeker(QWidget * parent, const char * name) +Seeker::Seeker(TQWidget * parent, const char * name) : L33tSlider(0, 1000, 10, 0, Horizontal, parent, name) { - connect(this, SIGNAL(userChanged(int)), SLOT(slotValueChanged(int))); + connect(this, TQT_SIGNAL(userChanged(int)), TQT_SLOT(slotValueChanged(int))); - connect(napp->player(), SIGNAL(timeout()), SLOT(slotTimeout())); + connect(napp->player(), TQT_SIGNAL(timeout()), TQT_SLOT(slotTimeout())); } Seeker::~Seeker() @@ -52,7 +52,7 @@ void Seeker::slotTimeout() setValue((int)napp->player()->getTime() / 1000 ); } -void Seeker::wheelEvent(QWheelEvent *) +void Seeker::wheelEvent(TQWheelEvent *) { // ignore } diff --git a/noatun-plugins/alsaplayer/seeker.h b/noatun-plugins/alsaplayer/seeker.h index ec5504e..d17a760 100644 --- a/noatun-plugins/alsaplayer/seeker.h +++ b/noatun-plugins/alsaplayer/seeker.h @@ -31,7 +31,7 @@ class Seeker : public L33tSlider public: - Seeker(QWidget * parent, const char * name = 0); + Seeker(TQWidget * parent, const char * name = 0); virtual ~Seeker(); protected slots: @@ -41,7 +41,7 @@ class Seeker : public L33tSlider protected: - void wheelEvent(QWheelEvent *); + void wheelEvent(TQWheelEvent *); private: }; diff --git a/noatun-plugins/alsaplayer/userinterface.cpp b/noatun-plugins/alsaplayer/userinterface.cpp index 1071736..f329c4f 100644 --- a/noatun-plugins/alsaplayer/userinterface.cpp +++ b/noatun-plugins/alsaplayer/userinterface.cpp @@ -28,11 +28,11 @@ #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include @@ -60,92 +60,92 @@ AlsaPlayer::AlsaPlayer() connect ( playlistButton, - SIGNAL(clicked()), + TQT_SIGNAL(clicked()), napp->player(), - SLOT(toggleListView()) + TQT_SLOT(toggleListView()) ); connect ( previousButton, - SIGNAL(clicked()), + TQT_SIGNAL(clicked()), napp->player(), - SLOT(back()) + TQT_SLOT(back()) ); connect ( nextButton, - SIGNAL(clicked()), + TQT_SIGNAL(clicked()), napp->player(), - SLOT(forward()) + TQT_SLOT(forward()) ); connect ( stopButton, - SIGNAL(clicked()), + TQT_SIGNAL(clicked()), napp->player(), - SLOT(stop()) + TQT_SLOT(stop()) ); connect ( playButton, - SIGNAL(clicked()), + TQT_SIGNAL(clicked()), napp->player(), - SLOT(playpause()) + TQT_SLOT(playpause()) ); - connect(napp, SIGNAL(hideYourself()), SLOT(hide())); - connect(napp, SIGNAL(showYourself()), SLOT(show())); + connect(napp, TQT_SIGNAL(hideYourself()), TQT_SLOT(hide())); + connect(napp, TQT_SIGNAL(showYourself()), TQT_SLOT(show())); - connect(napp->player(), SIGNAL(playlistShown()), SLOT(slotPlayListShown())); - connect(napp->player(), SIGNAL(playlistHidden()), SLOT(slotPlayListHidden())); - connect(napp->player(), SIGNAL(playing()), SLOT(slotPlaying())); - connect(napp->player(), SIGNAL(stopped()), SLOT(slotStopped())); - connect(napp->player(), SIGNAL(paused()), SLOT(slotPaused())); + connect(napp->player(), TQT_SIGNAL(playlistShown()), TQT_SLOT(slotPlayListShown())); + connect(napp->player(), TQT_SIGNAL(playlistHidden()), TQT_SLOT(slotPlayListHidden())); + connect(napp->player(), TQT_SIGNAL(playing()), TQT_SLOT(slotPlaying())); + connect(napp->player(), TQT_SIGNAL(stopped()), TQT_SLOT(slotStopped())); + connect(napp->player(), TQT_SIGNAL(paused()), TQT_SLOT(slotPaused())); - connect(napp->player(), SIGNAL(timeout()), SLOT(slotTimeout())); - connect(napp->player(), SIGNAL(changed()), SLOT(slotTrackChanged())); + connect(napp->player(), TQT_SIGNAL(timeout()), TQT_SLOT(slotTimeout())); + connect(napp->player(), TQT_SIGNAL(changed()), TQT_SLOT(slotTrackChanged())); connect ( napp->player(), - SIGNAL(volumeChanged(int)), - SLOT(slotVolumeChanged(int)) + TQT_SIGNAL(volumeChanged(int)), + TQT_SLOT(slotVolumeChanged(int)) ); connect ( new AlsaPlayerConfigModule(this), - SIGNAL(saved()), - SLOT(slotConfigChanged()) + TQT_SIGNAL(saved()), + TQT_SLOT(slotConfigChanged()) ); connect ( volumeSlider, - SIGNAL(valueChanged(int)), + TQT_SIGNAL(valueChanged(int)), napp->player(), - SLOT(setVolume(int)) + TQT_SLOT(setVolume(int)) ); connect ( forwardButton, - SIGNAL(clicked()), - SLOT(slotForward()) + TQT_SIGNAL(clicked()), + TQT_SLOT(slotForward()) ); connect ( pauseButton, - SIGNAL(clicked()), - SLOT(slotPause()) + TQT_SIGNAL(clicked()), + TQT_SLOT(slotPause()) ); - connect(speedSlider, SIGNAL(valueChanged(int)), SLOT(slotSetSpeed(int))); + connect(speedSlider, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotSetSpeed(int))); menuButton->setPopup(NoatunStdAction::ContextMenu::contextMenu()); @@ -165,17 +165,17 @@ AlsaPlayer::~AlsaPlayer() // Empty. } -void AlsaPlayer::closeEvent(QCloseEvent *) +void AlsaPlayer::closeEvent(TQCloseEvent *) { unload(); } -void AlsaPlayer::dragEnterEvent(QDragEnterEvent *event) +void AlsaPlayer::dragEnterEvent(TQDragEnterEvent *event) { event->accept(KURLDrag::canDecode(event)); } -void AlsaPlayer::dropEvent(QDropEvent *event) +void AlsaPlayer::dropEvent(TQDropEvent *event) { KURL::List uri; if (KURLDrag::decode(event, uri)) @@ -185,9 +185,9 @@ void AlsaPlayer::dropEvent(QDropEvent *event) } } -void AlsaPlayer::setTitleText(const QString & s) +void AlsaPlayer::setTitleText(const TQString & s) { - QString titleText + TQString titleText (s.isNull() ? napp->player()->current().title() : s); if (titleLabel->text() != titleText) @@ -196,7 +196,7 @@ void AlsaPlayer::setTitleText(const QString & s) void AlsaPlayer::slotPlaying() { - setTitleText(QString::null); + setTitleText(TQString::null); playButton->setOn(true); stopButton->setEnabled(true); @@ -212,22 +212,22 @@ void AlsaPlayer::slotStopped() void AlsaPlayer::slotPaused() { - setTitleText(QString::null); + setTitleText(TQString::null); stopButton->setEnabled(true); playButton->setOn(false); } -bool AlsaPlayer::eventFilter(QObject *o, QEvent *e) +bool AlsaPlayer::eventFilter(TQObject *o, TQEvent *e) { switch (e->type()) { - case QEvent::MouseButtonPress: - mousePressEvent(static_cast(e)); + case TQEvent::MouseButtonPress: + mousePressEvent(static_cast(e)); break; - case QEvent::Wheel: - wheelEvent(static_cast(e)); + case TQEvent::Wheel: + wheelEvent(static_cast(e)); return true; break; @@ -235,7 +235,7 @@ bool AlsaPlayer::eventFilter(QObject *o, QEvent *e) break; } - return QWidget::eventFilter(o, e); + return TQWidget::eventFilter(o, e); } void AlsaPlayer::slotPlayListShown() @@ -248,7 +248,7 @@ void AlsaPlayer::slotPlayListHidden() playlistButton->setOn(false); } -void AlsaPlayer::mousePressEvent(QMouseEvent * e) +void AlsaPlayer::mousePressEvent(TQMouseEvent * e) { if (e->button() == RightButton) { @@ -256,10 +256,10 @@ void AlsaPlayer::mousePressEvent(QMouseEvent * e) return; } - return QWidget::mousePressEvent(e); + return TQWidget::mousePressEvent(e); } -void AlsaPlayer::wheelEvent(QWheelEvent * e) +void AlsaPlayer::wheelEvent(TQWheelEvent * e) { int newVolume = napp->player()->volume() + (e->delta() / 120); napp->player()->setVolume(newVolume); @@ -272,7 +272,7 @@ void AlsaPlayer::slotConfigChanged() void AlsaPlayer::slotVolumeChanged(int i) { - QString text("%1%"); + TQString text("%1%"); volumeLabel->setText(text.arg(i)); volumeSlider->setValue(i); } @@ -284,9 +284,9 @@ void AlsaPlayer::slotTimeout() if (!napp->player()->current()) return; - setTitleText(QString::null); + setTitleText(TQString::null); - QString lengthText(napp->player()->lengthString()); + TQString lengthText(napp->player()->lengthString()); if (timeLabel->text() != lengthText) timeLabel->setText(lengthText); @@ -312,7 +312,7 @@ void AlsaPlayer::slotSetSpeed(int newSpeed) speed_ = newSpeed; pauseButton->setEnabled(0 != speed_); - speedLabel->setText(QString("%1%").arg(speed_)); + speedLabel->setText(TQString("%1%").arg(speed_)); Arts::PlayObject playobject(napp->player()->engine()->playObject()); Arts::PitchablePlayObject pitchable = Arts::DynamicCast(playobject); diff --git a/noatun-plugins/alsaplayer/userinterface.h b/noatun-plugins/alsaplayer/userinterface.h index 2a97b86..210f16b 100644 --- a/noatun-plugins/alsaplayer/userinterface.h +++ b/noatun-plugins/alsaplayer/userinterface.h @@ -43,7 +43,7 @@ class AlsaPlayer : public APMainWindow, public UserInterface AlsaPlayer(); virtual ~AlsaPlayer(); - void load(const QString & url); + void load(const TQString & url); protected slots: @@ -70,13 +70,13 @@ class AlsaPlayer : public APMainWindow, public UserInterface protected: - virtual void mousePressEvent (QMouseEvent *); - virtual void dragEnterEvent (QDragEnterEvent *); - virtual void dropEvent (QDropEvent *); - virtual void closeEvent (QCloseEvent *); - virtual bool eventFilter (QObject *, QEvent *); - virtual void wheelEvent (QWheelEvent *); - virtual void setTitleText (const QString &); + virtual void mousePressEvent (TQMouseEvent *); + virtual void dragEnterEvent (TQDragEnterEvent *); + virtual void dropEvent (TQDropEvent *); + virtual void closeEvent (TQCloseEvent *); + virtual bool eventFilter (TQObject *, TQEvent *); + virtual void wheelEvent (TQWheelEvent *); + virtual void setTitleText (const TQString &); void loadConfig(); -- cgit v1.2.1