From 395a904bff7b4d6ead445c342f7ac0c5fbf29121 Mon Sep 17 00:00:00 2001 From: tpearson Date: Sat, 18 Jun 2011 17:00:31 +0000 Subject: TQt4 port kdeaddons This enables compilation under both Qt3 and Qt4 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdeaddons@1237404 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- noatun-plugins/alsaplayer/AlsaPlayer.ui | 88 ++++++++++++++--------------- noatun-plugins/alsaplayer/Makefile.am | 2 +- noatun-plugins/alsaplayer/configmodule.cpp | 10 ++-- noatun-plugins/alsaplayer/configmodule.h | 1 + noatun-plugins/alsaplayer/seeker.cpp | 4 +- noatun-plugins/alsaplayer/seeker.h | 3 +- noatun-plugins/alsaplayer/userinterface.cpp | 20 +++---- noatun-plugins/alsaplayer/userinterface.h | 1 + 8 files changed, 66 insertions(+), 63 deletions(-) (limited to 'noatun-plugins/alsaplayer') diff --git a/noatun-plugins/alsaplayer/AlsaPlayer.ui b/noatun-plugins/alsaplayer/AlsaPlayer.ui index 772af81..925a51f 100644 --- a/noatun-plugins/alsaplayer/AlsaPlayer.ui +++ b/noatun-plugins/alsaplayer/AlsaPlayer.ui @@ -1,6 +1,6 @@ APMainWindow - + APMainWindow @@ -18,9 +18,9 @@ true - + - + @@ -32,7 +32,7 @@ 2 - + Frame3 @@ -292,9 +292,9 @@ Plain - + - + @@ -306,7 +306,7 @@ 4 - + speedLabelLeft @@ -574,13 +574,13 @@ Speed: - + AlignVCenter|AlignRight - + timeLabel @@ -849,7 +849,7 @@ No time data - + speedLabel @@ -1118,7 +1118,7 @@ 100% - + titleLabel @@ -1387,7 +1387,7 @@ No stream - + volumeLabel @@ -1656,7 +1656,7 @@ 100% - + volumeLabelLeft @@ -1924,13 +1924,13 @@ Volume: - + AlignVCenter|AlignRight - + infoLabel @@ -2205,18 +2205,18 @@ seeker - + 32 16 - + Layout10 - + @@ -2228,11 +2228,11 @@ 4 - + Layout9 - + @@ -2254,18 +2254,18 @@ Expanding - + 20 20 - + Layout8 - + @@ -2277,7 +2277,7 @@ 2 - + menuButton @@ -2297,7 +2297,7 @@ Menu - + previousButton @@ -2314,7 +2314,7 @@ Skip to previous track - + playButton @@ -2331,7 +2331,7 @@ Play - + nextButton @@ -2348,7 +2348,7 @@ Skip to next track - + stopButton @@ -2365,7 +2365,7 @@ Stop - + playlistButton @@ -2394,7 +2394,7 @@ Expanding - + 20 20 @@ -2403,11 +2403,11 @@ - + Layout5 - + @@ -2419,11 +2419,11 @@ 2 - + Layout3 - + @@ -2435,7 +2435,7 @@ 2 - + pauseButton @@ -2455,7 +2455,7 @@ Pause - + forwardButton @@ -2475,7 +2475,7 @@ Forwards, normal speed - + speedSlider @@ -2497,11 +2497,11 @@ - + Layout4 - + @@ -2513,7 +2513,7 @@ 2 - + PixmapLabel2 @@ -2530,7 +2530,7 @@ Balance - + balanceSlider @@ -2547,7 +2547,7 @@ Balance - + PixmapLabel1 @@ -2561,7 +2561,7 @@ Volume - + volumeSlider @@ -2636,5 +2636,5 @@ 789c6dd2c10ac2300c00d07bbf2234b7229d1be245fc04c5a3201e4615f430059d0711ff5ddb2e6bb236ec90eed134cb5a19d8ef36602af5ecdbfeeac05dda0798d3abebde87e3faa374d3807fa0d633a52d38d8de6f679fe33fc776e196f53cd010188256a3600a292882096246517815ca99884606e18044a3a40d91824820924265a7923a2e8bcd05f33db1173e002913175f2a6be6d3294871a2d95fa00e8a94ee017b69d339d90df1e77c57ea072ede6758 - + diff --git a/noatun-plugins/alsaplayer/Makefile.am b/noatun-plugins/alsaplayer/Makefile.am index 3b149f6..ce584a8 100644 --- a/noatun-plugins/alsaplayer/Makefile.am +++ b/noatun-plugins/alsaplayer/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES= $(all_includes) +INCLUDES= $(all_includes) -I$(kde_includes)/kde -I$(kde_includes)/arts kde_module_LTLIBRARIES = noatunalsaplayer.la diff --git a/noatun-plugins/alsaplayer/configmodule.cpp b/noatun-plugins/alsaplayer/configmodule.cpp index 6fd02f8..339b484 100644 --- a/noatun-plugins/alsaplayer/configmodule.cpp +++ b/noatun-plugins/alsaplayer/configmodule.cpp @@ -29,23 +29,23 @@ #include "configmodule.h" -AlsaPlayerConfigModule::AlsaPlayerConfigModule(TQObject * parent) +AlsaPlayerConfigModule::AlsaPlayerConfigModule(TQObject * tqparent) : CModule ( i18n("AlsaPlayer"), i18n("AlsaPlayer Interface Settings"), "appearance", - parent + tqparent ) { scroll_ = new TQCheckBox(i18n("Scroll song title"), this); - TQVBoxLayout * layout = new TQVBoxLayout(this); + TQVBoxLayout * tqlayout = new TQVBoxLayout(this); - layout->addWidget(scroll_); + tqlayout->addWidget(scroll_); - layout->addStretch(100); + tqlayout->addStretch(100); reopen(); } diff --git a/noatun-plugins/alsaplayer/configmodule.h b/noatun-plugins/alsaplayer/configmodule.h index 004ec79..e804cc1 100644 --- a/noatun-plugins/alsaplayer/configmodule.h +++ b/noatun-plugins/alsaplayer/configmodule.h @@ -30,6 +30,7 @@ class TQCheckBox; class AlsaPlayerConfigModule : public CModule { Q_OBJECT + TQ_OBJECT public: diff --git a/noatun-plugins/alsaplayer/seeker.cpp b/noatun-plugins/alsaplayer/seeker.cpp index 606b461..e3c12c1 100644 --- a/noatun-plugins/alsaplayer/seeker.cpp +++ b/noatun-plugins/alsaplayer/seeker.cpp @@ -26,8 +26,8 @@ #include #include "seeker.h" -Seeker::Seeker(TQWidget * parent, const char * name) - : L33tSlider(0, 1000, 10, 0, Horizontal, parent, name) +Seeker::Seeker(TQWidget * tqparent, const char * name) + : L33tSlider(0, 1000, 10, 0,Qt::Horizontal, tqparent, name) { connect(this, TQT_SIGNAL(userChanged(int)), TQT_SLOT(slotValueChanged(int))); diff --git a/noatun-plugins/alsaplayer/seeker.h b/noatun-plugins/alsaplayer/seeker.h index d17a760..9eb67ed 100644 --- a/noatun-plugins/alsaplayer/seeker.h +++ b/noatun-plugins/alsaplayer/seeker.h @@ -28,10 +28,11 @@ class Seeker : public L33tSlider { Q_OBJECT + TQ_OBJECT public: - Seeker(TQWidget * parent, const char * name = 0); + Seeker(TQWidget * tqparent, const char * name = 0); virtual ~Seeker(); protected slots: diff --git a/noatun-plugins/alsaplayer/userinterface.cpp b/noatun-plugins/alsaplayer/userinterface.cpp index f329c4f..cc53b06 100644 --- a/noatun-plugins/alsaplayer/userinterface.cpp +++ b/noatun-plugins/alsaplayer/userinterface.cpp @@ -118,7 +118,7 @@ AlsaPlayer::AlsaPlayer() connect ( - new AlsaPlayerConfigModule(this), + new AlsaPlayerConfigModule(TQT_TQOBJECT(this)), TQT_SIGNAL(saved()), TQT_SLOT(slotConfigChanged()) ); @@ -155,7 +155,7 @@ AlsaPlayer::AlsaPlayer() loadConfig(); - resize(sizeHint().width(), minimumSizeHint().height()); + resize(tqsizeHint().width(), tqminimumSizeHint().height()); show(); } @@ -196,7 +196,7 @@ void AlsaPlayer::setTitleText(const TQString & s) void AlsaPlayer::slotPlaying() { - setTitleText(TQString::null); + setTitleText(TQString()); playButton->setOn(true); stopButton->setEnabled(true); @@ -212,7 +212,7 @@ void AlsaPlayer::slotStopped() void AlsaPlayer::slotPaused() { - setTitleText(TQString::null); + setTitleText(TQString()); stopButton->setEnabled(true); playButton->setOn(false); @@ -223,11 +223,11 @@ bool AlsaPlayer::eventFilter(TQObject *o, TQEvent *e) switch (e->type()) { case TQEvent::MouseButtonPress: - mousePressEvent(static_cast(e)); + mousePressEvent(TQT_TQMOUSEEVENT(e)); break; case TQEvent::Wheel: - wheelEvent(static_cast(e)); + wheelEvent(TQT_TQWHEELEVENT(e)); return true; break; @@ -250,7 +250,7 @@ void AlsaPlayer::slotPlayListHidden() void AlsaPlayer::mousePressEvent(TQMouseEvent * e) { - if (e->button() == RightButton) + if (e->button() == Qt::RightButton) { NoatunStdAction::ContextMenu::showContextMenu(); return; @@ -273,7 +273,7 @@ void AlsaPlayer::slotConfigChanged() void AlsaPlayer::slotVolumeChanged(int i) { TQString text("%1%"); - volumeLabel->setText(text.arg(i)); + volumeLabel->setText(text.tqarg(i)); volumeSlider->setValue(i); } @@ -284,7 +284,7 @@ void AlsaPlayer::slotTimeout() if (!napp->player()->current()) return; - setTitleText(TQString::null); + setTitleText(TQString()); TQString lengthText(napp->player()->lengthString()); @@ -312,7 +312,7 @@ void AlsaPlayer::slotSetSpeed(int newSpeed) speed_ = newSpeed; pauseButton->setEnabled(0 != speed_); - speedLabel->setText(TQString("%1%").arg(speed_)); + speedLabel->setText(TQString("%1%").tqarg(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 210f16b..abec7fd 100644 --- a/noatun-plugins/alsaplayer/userinterface.h +++ b/noatun-plugins/alsaplayer/userinterface.h @@ -37,6 +37,7 @@ class Seeker; class AlsaPlayer : public APMainWindow, public UserInterface { Q_OBJECT + TQ_OBJECT public: -- cgit v1.2.1