summaryrefslogtreecommitdiffstats
path: root/noatun-plugins/alsaplayer
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-06-18 17:00:31 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-06-18 17:00:31 +0000
commit395a904bff7b4d6ead445c342f7ac0c5fbf29121 (patch)
tree9829cadb79d2cc7c29a940627fadb28b11e54150 /noatun-plugins/alsaplayer
parent399f47c376fdf4d19192732a701ea9578d11619d (diff)
downloadtdeaddons-395a904bff7b4d6ead445c342f7ac0c5fbf29121.tar.gz
tdeaddons-395a904bff7b4d6ead445c342f7ac0c5fbf29121.zip
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
Diffstat (limited to 'noatun-plugins/alsaplayer')
-rw-r--r--noatun-plugins/alsaplayer/AlsaPlayer.ui88
-rw-r--r--noatun-plugins/alsaplayer/Makefile.am2
-rw-r--r--noatun-plugins/alsaplayer/configmodule.cpp10
-rw-r--r--noatun-plugins/alsaplayer/configmodule.h1
-rw-r--r--noatun-plugins/alsaplayer/seeker.cpp4
-rw-r--r--noatun-plugins/alsaplayer/seeker.h3
-rw-r--r--noatun-plugins/alsaplayer/userinterface.cpp20
-rw-r--r--noatun-plugins/alsaplayer/userinterface.h1
8 files changed, 66 insertions, 63 deletions
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 @@
<!DOCTYPE UI><UI version="3.0" stdsetdef="1">
<class>APMainWindow</class>
-<widget class="QWidget">
+<widget class="TQWidget">
<property name="name">
<cstring>APMainWindow</cstring>
</property>
@@ -18,9 +18,9 @@
<property name="acceptDrops">
<bool>true</bool>
</property>
- <property name="layoutMargin" stdset="0">
+ <property name="tqlayoutMargin" stdset="0">
</property>
- <property name="layoutSpacing" stdset="0">
+ <property name="tqlayoutSpacing" stdset="0">
</property>
<vbox>
<property name="name">
@@ -32,7 +32,7 @@
<property name="spacing">
<number>2</number>
</property>
- <widget class="QFrame">
+ <widget class="TQFrame">
<property name="name">
<cstring>Frame3</cstring>
</property>
@@ -292,9 +292,9 @@
<property name="frameShadow">
<enum>Plain</enum>
</property>
- <property name="layoutMargin" stdset="0">
+ <property name="tqlayoutMargin" stdset="0">
</property>
- <property name="layoutSpacing" stdset="0">
+ <property name="tqlayoutSpacing" stdset="0">
</property>
<grid>
<property name="name">
@@ -306,7 +306,7 @@
<property name="spacing">
<number>4</number>
</property>
- <widget class="QLabel" row="0" column="0">
+ <widget class="TQLabel" row="0" column="0">
<property name="name">
<cstring>speedLabelLeft</cstring>
</property>
@@ -574,13 +574,13 @@
<property name="text">
<string>Speed:</string>
</property>
- <property name="alignment">
+ <property name="tqalignment">
<set>AlignVCenter|AlignRight</set>
</property>
<property name="hAlign" stdset="0">
</property>
</widget>
- <widget class="QLabel" row="1" column="3">
+ <widget class="TQLabel" row="1" column="3">
<property name="name">
<cstring>timeLabel</cstring>
</property>
@@ -849,7 +849,7 @@
<string>No time data</string>
</property>
</widget>
- <widget class="QLabel" row="0" column="1">
+ <widget class="TQLabel" row="0" column="1">
<property name="name">
<cstring>speedLabel</cstring>
</property>
@@ -1118,7 +1118,7 @@
<string>100%</string>
</property>
</widget>
- <widget class="QLabel" row="0" column="2" rowspan="1" colspan="2">
+ <widget class="TQLabel" row="0" column="2" rowspan="1" colspan="2">
<property name="name">
<cstring>titleLabel</cstring>
</property>
@@ -1387,7 +1387,7 @@
<string>No stream</string>
</property>
</widget>
- <widget class="QLabel" row="1" column="1">
+ <widget class="TQLabel" row="1" column="1">
<property name="name">
<cstring>volumeLabel</cstring>
</property>
@@ -1656,7 +1656,7 @@
<string>100%</string>
</property>
</widget>
- <widget class="QLabel" row="1" column="0">
+ <widget class="TQLabel" row="1" column="0">
<property name="name">
<cstring>volumeLabelLeft</cstring>
</property>
@@ -1924,13 +1924,13 @@
<property name="text">
<string>Volume:</string>
</property>
- <property name="alignment">
+ <property name="tqalignment">
<set>AlignVCenter|AlignRight</set>
</property>
<property name="hAlign" stdset="0">
</property>
</widget>
- <widget class="QLabel" row="1" column="2">
+ <widget class="TQLabel" row="1" column="2">
<property name="name">
<cstring>infoLabel</cstring>
</property>
@@ -2205,18 +2205,18 @@
<property name="name">
<cstring>seeker</cstring>
</property>
- <property name="minimumSize">
+ <property name="tqminimumSize">
<size>
<width>32</width>
<height>16</height>
</size>
</property>
</widget>
- <widget class="QLayoutWidget">
+ <widget class="TQLayoutWidget">
<property name="name">
<cstring>Layout10</cstring>
</property>
- <property name="layoutSpacing" stdset="0">
+ <property name="tqlayoutSpacing" stdset="0">
</property>
<hbox>
<property name="name">
@@ -2228,11 +2228,11 @@
<property name="spacing">
<number>4</number>
</property>
- <widget class="QLayoutWidget">
+ <widget class="TQLayoutWidget">
<property name="name">
<cstring>Layout9</cstring>
</property>
- <property name="layoutSpacing" stdset="0">
+ <property name="tqlayoutSpacing" stdset="0">
</property>
<vbox>
<property name="name">
@@ -2254,18 +2254,18 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
</size>
</property>
</spacer>
- <widget class="QLayoutWidget">
+ <widget class="TQLayoutWidget">
<property name="name">
<cstring>Layout8</cstring>
</property>
- <property name="layoutSpacing" stdset="0">
+ <property name="tqlayoutSpacing" stdset="0">
</property>
<hbox>
<property name="name">
@@ -2277,7 +2277,7 @@
<property name="spacing">
<number>2</number>
</property>
- <widget class="QToolButton">
+ <widget class="TQToolButton">
<property name="name">
<cstring>menuButton</cstring>
</property>
@@ -2297,7 +2297,7 @@
<string>Menu</string>
</property>
</widget>
- <widget class="QToolButton">
+ <widget class="TQToolButton">
<property name="name">
<cstring>previousButton</cstring>
</property>
@@ -2314,7 +2314,7 @@
<string>Skip to previous track</string>
</property>
</widget>
- <widget class="QToolButton">
+ <widget class="TQToolButton">
<property name="name">
<cstring>playButton</cstring>
</property>
@@ -2331,7 +2331,7 @@
<string>Play</string>
</property>
</widget>
- <widget class="QToolButton">
+ <widget class="TQToolButton">
<property name="name">
<cstring>nextButton</cstring>
</property>
@@ -2348,7 +2348,7 @@
<string>Skip to next track</string>
</property>
</widget>
- <widget class="QToolButton">
+ <widget class="TQToolButton">
<property name="name">
<cstring>stopButton</cstring>
</property>
@@ -2365,7 +2365,7 @@
<string>Stop</string>
</property>
</widget>
- <widget class="QToolButton">
+ <widget class="TQToolButton">
<property name="name">
<cstring>playlistButton</cstring>
</property>
@@ -2394,7 +2394,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -2403,11 +2403,11 @@
</spacer>
</vbox>
</widget>
- <widget class="QLayoutWidget">
+ <widget class="TQLayoutWidget">
<property name="name">
<cstring>Layout5</cstring>
</property>
- <property name="layoutSpacing" stdset="0">
+ <property name="tqlayoutSpacing" stdset="0">
</property>
<vbox>
<property name="name">
@@ -2419,11 +2419,11 @@
<property name="spacing">
<number>2</number>
</property>
- <widget class="QLayoutWidget">
+ <widget class="TQLayoutWidget">
<property name="name">
<cstring>Layout3</cstring>
</property>
- <property name="layoutSpacing" stdset="0">
+ <property name="tqlayoutSpacing" stdset="0">
</property>
<hbox>
<property name="name">
@@ -2435,7 +2435,7 @@
<property name="spacing">
<number>2</number>
</property>
- <widget class="QToolButton">
+ <widget class="TQToolButton">
<property name="name">
<cstring>pauseButton</cstring>
</property>
@@ -2455,7 +2455,7 @@
<string>Pause</string>
</property>
</widget>
- <widget class="QToolButton">
+ <widget class="TQToolButton">
<property name="name">
<cstring>forwardButton</cstring>
</property>
@@ -2475,7 +2475,7 @@
<string>Forwards, normal speed</string>
</property>
</widget>
- <widget class="QSlider">
+ <widget class="TQSlider">
<property name="name">
<cstring>speedSlider</cstring>
</property>
@@ -2497,11 +2497,11 @@
</widget>
</hbox>
</widget>
- <widget class="QLayoutWidget">
+ <widget class="TQLayoutWidget">
<property name="name">
<cstring>Layout4</cstring>
</property>
- <property name="layoutSpacing" stdset="0">
+ <property name="tqlayoutSpacing" stdset="0">
</property>
<hbox>
<property name="name">
@@ -2513,7 +2513,7 @@
<property name="spacing">
<number>2</number>
</property>
- <widget class="QLabel">
+ <widget class="TQLabel">
<property name="name">
<cstring>PixmapLabel2</cstring>
</property>
@@ -2530,7 +2530,7 @@
<string>Balance</string>
</property>
</widget>
- <widget class="QSlider">
+ <widget class="TQSlider">
<property name="name">
<cstring>balanceSlider</cstring>
</property>
@@ -2547,7 +2547,7 @@
<string>Balance</string>
</property>
</widget>
- <widget class="QLabel">
+ <widget class="TQLabel">
<property name="name">
<cstring>PixmapLabel1</cstring>
</property>
@@ -2561,7 +2561,7 @@
<string>Volume</string>
</property>
</widget>
- <widget class="QSlider">
+ <widget class="TQSlider">
<property name="name">
<cstring>volumeSlider</cstring>
</property>
@@ -2636,5 +2636,5 @@
<data format="XPM.GZ" length="646">789c6dd2c10ac2300c00d07bbf2234b7229d1be245fc04c5a3201e4615f430059d0711ff5ddb2e6bb236ec90eed134cb5a19d8ef36602af5ecdbfeeac05dda0798d3abebde87e3faa374d3807fa0d633a52d38d8de6f679fe33fc776e196f53cd010188256a3600a292882096246517815ca99884606e18044a3a40d91824820924265a7923a2e8bcd05f33db1173e002913175f2a6be6d3294871a2d95fa00e8a94ee017b69d339d90df1e77c57ea072ede6758</data>
</image>
</images>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
</UI>
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 <noatun/player.h>
#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<TQMouseEvent *>(e));
+ mousePressEvent(TQT_TQMOUSEEVENT(e));
break;
case TQEvent::Wheel:
- wheelEvent(static_cast<TQWheelEvent*>(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:
generated by cgit v1.2.1 (git 2.18.0) at 2024-07-05 17:22:16 +0000