summaryrefslogtreecommitdiffstats
path: root/konq-plugins/sidebar/mediaplayer
diff options
context:
space:
mode:
Diffstat (limited to 'konq-plugins/sidebar/mediaplayer')
-rw-r--r--konq-plugins/sidebar/mediaplayer/controls.cpp24
-rw-r--r--konq-plugins/sidebar/mediaplayer/controls.h12
-rw-r--r--konq-plugins/sidebar/mediaplayer/engine.cpp4
-rw-r--r--konq-plugins/sidebar/mediaplayer/engine.h5
-rw-r--r--konq-plugins/sidebar/mediaplayer/mediaplayer.cpp4
-rw-r--r--konq-plugins/sidebar/mediaplayer/mediaplayer.h3
-rw-r--r--konq-plugins/sidebar/mediaplayer/mediawidget.cpp6
-rw-r--r--konq-plugins/sidebar/mediaplayer/mediawidget.h3
-rw-r--r--konq-plugins/sidebar/mediaplayer/mediawidget_skel.ui54
-rw-r--r--konq-plugins/sidebar/mediaplayer/mediawidget_skel_designer.ui56
-rw-r--r--konq-plugins/sidebar/mediaplayer/player.cpp4
-rw-r--r--konq-plugins/sidebar/mediaplayer/player.h5
12 files changed, 93 insertions, 87 deletions
diff --git a/konq-plugins/sidebar/mediaplayer/controls.cpp b/konq-plugins/sidebar/mediaplayer/controls.cpp
index 6c3be21..63d91ac 100644
--- a/konq-plugins/sidebar/mediaplayer/controls.cpp
+++ b/konq-plugins/sidebar/mediaplayer/controls.cpp
@@ -23,15 +23,15 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "controls.h"
-L33tSlider::L33tSlider(TQWidget * parent, const char * name) :
- TQSlider(parent,name), pressed(false)
+L33tSlider::L33tSlider(TQWidget * tqparent, const char * name) :
+ TQSlider(tqparent,name), pressed(false)
{}
-L33tSlider::L33tSlider(Orientation o, TQWidget * parent, const char * name) :
- TQSlider(o,parent,name), pressed(false)
+L33tSlider::L33tSlider(Qt::Orientation o, TQWidget * tqparent, const char * name) :
+ TQSlider(o,tqparent,name), pressed(false)
{}
L33tSlider::L33tSlider(int minValue, int maxValue, int pageStep, int value,
- Orientation o, TQWidget * parent, const char * name) :
- TQSlider(minValue, maxValue, pageStep, value, o, parent,name), pressed(false)
+ Qt::Orientation o, TQWidget * tqparent, const char * name) :
+ TQSlider(minValue, maxValue, pageStep, value, o, tqparent,name), pressed(false)
{}
bool L33tSlider::currentlyPressed() const
@@ -47,7 +47,7 @@ void L33tSlider::setValue(int i)
void L33tSlider::mousePressEvent(TQMouseEvent*e)
{
- if (e->button()!=RightButton)
+ if (e->button()!=Qt::RightButton)
{
pressed=true;
TQSlider::mousePressEvent(e);
@@ -76,8 +76,8 @@ void L33tSlider::wheelEvent(TQWheelEvent *e)
}
SliderAction::SliderAction(const TQString& text, int accel, const TQObject *receiver,
- const char *member, TQObject* parent, const char* name )
- : KAction( text, accel, parent, name )
+ const char *member, TQObject* tqparent, const char* name )
+ : KAction( text, accel, tqparent, name )
{
m_receiver = receiver;
m_member = member;
@@ -91,7 +91,7 @@ int SliderAction::plug( TQWidget *w, int index )
int id = KAction::getToolButtonID();
//Create it.
- m_slider=new L33tSlider(0, 1000, 100, 0, Horizontal, toolBar);
+ m_slider=new L33tSlider(0, 1000, 100, 0,Qt::Horizontal, toolBar);
m_slider->setMinimumWidth(10);
toolBar->insertWidget(id, 10, m_slider, index );
@@ -115,12 +115,12 @@ return;
/*
if (pos == KToolBar::Left || pos == KToolBar::Right)
{
- m_slider->setOrientation(Vertical);
+ m_slider->setOrientationQt::Vertical);
m_slider->setFixedWidth(m_slider->height());
}
else
{
- m_slider->setOrientation(Horizontal);
+ m_slider->setOrientationQt::Horizontal);
m_slider->resize(m_slider->height(), m_slider->height());
}
*/
diff --git a/konq-plugins/sidebar/mediaplayer/controls.h b/konq-plugins/sidebar/mediaplayer/controls.h
index 5f376dd..73a8340 100644
--- a/konq-plugins/sidebar/mediaplayer/controls.h
+++ b/konq-plugins/sidebar/mediaplayer/controls.h
@@ -38,14 +38,15 @@ class TQLabel;
* A slider that can be moved around while being
* changed internally
**/
-class L33tSlider : public QSlider
+class L33tSlider : public TQSlider
{
Q_OBJECT
+ TQ_OBJECT
public:
- L33tSlider(TQWidget * parent, const char * name=0);
- L33tSlider(Orientation, TQWidget * parent, const char * name=0);
+ L33tSlider(TQWidget * tqparent, const char * name=0);
+ L33tSlider(Qt::Orientation, TQWidget * tqparent, const char * name=0);
L33tSlider(int minValue, int maxValue, int pageStep, int value,
- Orientation, TQWidget * parent, const char * name=0);
+ Qt::Orientation, TQWidget * tqparent, const char * name=0);
bool currentlyPressed() const;
signals:
@@ -71,9 +72,10 @@ private:
class SliderAction : public KAction
{
Q_OBJECT
+ TQ_OBJECT
public:
SliderAction(const TQString& text, int accel, const TQObject *receiver,
- const char *member, TQObject* parent, const char* name );
+ const char *member, TQObject* tqparent, const char* name );
virtual int plug( TQWidget *w, int index = -1 );
virtual void unplug( TQWidget *w );
TQSlider* slider() const { return m_slider; }
diff --git a/konq-plugins/sidebar/mediaplayer/engine.cpp b/konq-plugins/sidebar/mediaplayer/engine.cpp
index e4590b6..8f01888 100644
--- a/konq-plugins/sidebar/mediaplayer/engine.cpp
+++ b/konq-plugins/sidebar/mediaplayer/engine.cpp
@@ -71,8 +71,8 @@ public:
KURL file;
};
-Engine::Engine(TQObject *parent)
- : TQObject(parent)
+Engine::Engine(TQObject *tqparent)
+ : TQObject(tqparent)
, d(new EnginePrivate)
{
}
diff --git a/konq-plugins/sidebar/mediaplayer/engine.h b/konq-plugins/sidebar/mediaplayer/engine.h
index 07e46f1..c1d129f 100644
--- a/konq-plugins/sidebar/mediaplayer/engine.h
+++ b/konq-plugins/sidebar/mediaplayer/engine.h
@@ -40,12 +40,13 @@ class SoundServerV2;
* Does almost everything related to multimedia.
* Most interfacing should be done with Player
**/
-class Engine : public QObject
+class Engine : public TQObject
{
Q_OBJECT
+ TQ_OBJECT
public:
- Engine(TQObject *parent=0);
+ Engine(TQObject *tqparent=0);
~Engine();
Arts::PlayObject playObject() const;
diff --git a/konq-plugins/sidebar/mediaplayer/mediaplayer.cpp b/konq-plugins/sidebar/mediaplayer/mediaplayer.cpp
index 2de09af..8ea041f 100644
--- a/konq-plugins/sidebar/mediaplayer/mediaplayer.cpp
+++ b/konq-plugins/sidebar/mediaplayer/mediaplayer.cpp
@@ -27,8 +27,8 @@
#include <kdemacros.h>
#include "mediawidget.h"
-KonqSidebar_MediaPlayer::KonqSidebar_MediaPlayer(KInstance *instance,TQObject *parent,TQWidget *widgetParent, TQString &desktopName_, const char* name):
- KonqSidebarPlugin(instance,parent,widgetParent,desktopName_,name)
+KonqSidebar_MediaPlayer::KonqSidebar_MediaPlayer(KInstance *instance,TQObject *tqparent,TQWidget *widgetParent, TQString &desktopName_, const char* name):
+ KonqSidebarPlugin(instance,tqparent,widgetParent,desktopName_,name)
{
widget=new KSB_MediaWidget(widgetParent);
}
diff --git a/konq-plugins/sidebar/mediaplayer/mediaplayer.h b/konq-plugins/sidebar/mediaplayer/mediaplayer.h
index 0e74248..2213ef2 100644
--- a/konq-plugins/sidebar/mediaplayer/mediaplayer.h
+++ b/konq-plugins/sidebar/mediaplayer/mediaplayer.h
@@ -27,8 +27,9 @@ class KSB_MediaWidget;
class KonqSidebar_MediaPlayer: public KonqSidebarPlugin
{
Q_OBJECT
+ TQ_OBJECT
public:
- KonqSidebar_MediaPlayer(KInstance *instance,TQObject *parent,TQWidget *widgetParent, TQString &desktopName_, const char* name=0);
+ KonqSidebar_MediaPlayer(KInstance *instance,TQObject *tqparent,TQWidget *widgetParent, TQString &desktopName_, const char* name=0);
~KonqSidebar_MediaPlayer();
virtual void *provides(const TQString &);
void emitStatusBarText (const TQString &);
diff --git a/konq-plugins/sidebar/mediaplayer/mediawidget.cpp b/konq-plugins/sidebar/mediaplayer/mediawidget.cpp
index ac37e9c..a95ae83 100644
--- a/konq-plugins/sidebar/mediaplayer/mediawidget.cpp
+++ b/konq-plugins/sidebar/mediaplayer/mediawidget.cpp
@@ -32,9 +32,9 @@
#include <tqslider.h>
#include <tqtooltip.h>
-KSB_MediaWidget::KSB_MediaWidget(TQWidget *parent):KSB_MediaWidget_skel(parent)
+KSB_MediaWidget::KSB_MediaWidget(TQWidget *tqparent):KSB_MediaWidget_skel(tqparent)
{
- player = new Player(this);
+ player = new Player(TQT_TQOBJECT(this));
empty();
TQFont labelFont = time->font();
@@ -100,7 +100,7 @@ void KSB_MediaWidget::playerTimeout()
Position->setRange(0, range);
if (needLengthUpdate)
{
- int counter = player->lengthString().length() - (player->lengthString().find("/")+1);
+ int counter = player->lengthString().length() - (player->lengthString().tqfind("/")+1);
TQString length=player->lengthString().right(counter);
needLengthUpdate=false;
}
diff --git a/konq-plugins/sidebar/mediaplayer/mediawidget.h b/konq-plugins/sidebar/mediaplayer/mediawidget.h
index 69fa0f2..8e106a8 100644
--- a/konq-plugins/sidebar/mediaplayer/mediawidget.h
+++ b/konq-plugins/sidebar/mediaplayer/mediawidget.h
@@ -24,8 +24,9 @@
class KSB_MediaWidget: public KSB_MediaWidget_skel
{
Q_OBJECT
+ TQ_OBJECT
public:
- KSB_MediaWidget(TQWidget *parent);
+ KSB_MediaWidget(TQWidget *tqparent);
~KSB_MediaWidget(){;}
private:
diff --git a/konq-plugins/sidebar/mediaplayer/mediawidget_skel.ui b/konq-plugins/sidebar/mediaplayer/mediawidget_skel.ui
index 8780a72..129f737 100644
--- a/konq-plugins/sidebar/mediaplayer/mediawidget_skel.ui
+++ b/konq-plugins/sidebar/mediaplayer/mediawidget_skel.ui
@@ -1,6 +1,6 @@
<!DOCTYPE UI><UI version="3.0" stdsetdef="1">
<class>KSB_MediaWidget_skel</class>
-<widget class="QWidget">
+<widget class="TQWidget">
<property name="name">
<cstring>KSB_MediaWidget_skel</cstring>
</property>
@@ -12,9 +12,9 @@
<height>151</height>
</rect>
</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">
@@ -26,11 +26,11 @@
<property name="spacing">
<number>0</number>
</property>
- <widget class="QLayoutWidget">
+ <widget class="TQLayoutWidget">
<property name="name">
<cstring>Layout6</cstring>
</property>
- <property name="layoutSpacing" stdset="0">
+ <property name="tqlayoutSpacing" stdset="0">
</property>
<hbox>
<property name="name">
@@ -52,14 +52,14 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
</size>
</property>
</spacer>
- <widget class="QPushButton">
+ <widget class="TQPushButton">
<property name="name">
<cstring>Play</cstring>
</property>
@@ -71,7 +71,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="maximumSize">
+ <property name="tqmaximumSize">
<size>
<width>20</width>
<height>20</height>
@@ -84,11 +84,11 @@
<pixmap>image0</pixmap>
</property>
</widget>
- <widget class="QPushButton">
+ <widget class="TQPushButton">
<property name="name">
<cstring>Pause</cstring>
</property>
- <property name="maximumSize">
+ <property name="tqmaximumSize">
<size>
<width>20</width>
<height>20</height>
@@ -101,11 +101,11 @@
<pixmap>image1</pixmap>
</property>
</widget>
- <widget class="QPushButton">
+ <widget class="TQPushButton">
<property name="name">
<cstring>Stop</cstring>
</property>
- <property name="maximumSize">
+ <property name="tqmaximumSize">
<size>
<width>20</width>
<height>20</height>
@@ -128,7 +128,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -148,7 +148,7 @@
<enum>Horizontal</enum>
</property>
</widget>
- <widget class="QFrame">
+ <widget class="TQFrame">
<property name="name">
<cstring>Frame3</cstring>
</property>
@@ -166,9 +166,9 @@
<property name="frameShadow">
<enum>Raised</enum>
</property>
- <property name="layoutMargin" stdset="0">
+ <property name="tqlayoutMargin" stdset="0">
</property>
- <property name="layoutSpacing" stdset="0">
+ <property name="tqlayoutSpacing" stdset="0">
</property>
<hbox>
<property name="name">
@@ -190,14 +190,14 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
</size>
</property>
</spacer>
- <widget class="QLabel">
+ <widget class="TQLabel">
<property name="name">
<cstring>time</cstring>
</property>
@@ -215,7 +215,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -224,7 +224,7 @@
</spacer>
</hbox>
</widget>
- <widget class="QFrame">
+ <widget class="TQFrame">
<property name="name">
<cstring>Frame4</cstring>
</property>
@@ -242,9 +242,9 @@
<property name="frameShadow">
<enum>Raised</enum>
</property>
- <property name="layoutMargin" stdset="0">
+ <property name="tqlayoutMargin" stdset="0">
</property>
- <property name="layoutSpacing" stdset="0">
+ <property name="tqlayoutSpacing" stdset="0">
</property>
<hbox>
<property name="name">
@@ -266,14 +266,14 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
</size>
</property>
</spacer>
- <widget class="QLabel">
+ <widget class="TQLabel">
<property name="name">
<cstring>currentFile</cstring>
</property>
@@ -291,7 +291,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -310,7 +310,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -336,5 +336,5 @@
<includes>
<include location="global" impldecl="in declaration">controls.h</include>
</includes>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
</UI>
diff --git a/konq-plugins/sidebar/mediaplayer/mediawidget_skel_designer.ui b/konq-plugins/sidebar/mediaplayer/mediawidget_skel_designer.ui
index a88dfde..50d0222 100644
--- a/konq-plugins/sidebar/mediaplayer/mediawidget_skel_designer.ui
+++ b/konq-plugins/sidebar/mediaplayer/mediawidget_skel_designer.ui
@@ -1,6 +1,6 @@
<!DOCTYPE UI><UI version="3.0" stdsetdef="1">
<class>KSB_MediaWidget_skel</class>
-<widget class="QWidget">
+<widget class="TQWidget">
<property name="name">
<cstring>KSB_MediaWidget_skel</cstring>
</property>
@@ -12,9 +12,9 @@
<height>151</height>
</rect>
</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">
@@ -26,11 +26,11 @@
<property name="spacing">
<number>0</number>
</property>
- <widget class="QLayoutWidget">
+ <widget class="TQLayoutWidget">
<property name="name">
<cstring>Layout6</cstring>
</property>
- <property name="layoutSpacing" stdset="0">
+ <property name="tqlayoutSpacing" stdset="0">
</property>
<hbox>
<property name="name">
@@ -52,14 +52,14 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
</size>
</property>
</spacer>
- <widget class="QPushButton">
+ <widget class="TQPushButton">
<property name="name">
<cstring>Play</cstring>
</property>
@@ -71,7 +71,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="maximumSize">
+ <property name="tqmaximumSize">
<size>
<width>20</width>
<height>20</height>
@@ -84,11 +84,11 @@
<pixmap>image0</pixmap>
</property>
</widget>
- <widget class="QPushButton">
+ <widget class="TQPushButton">
<property name="name">
<cstring>Pause</cstring>
</property>
- <property name="maximumSize">
+ <property name="tqmaximumSize">
<size>
<width>20</width>
<height>20</height>
@@ -101,11 +101,11 @@
<pixmap>image1</pixmap>
</property>
</widget>
- <widget class="QPushButton">
+ <widget class="TQPushButton">
<property name="name">
<cstring>Stop</cstring>
</property>
- <property name="maximumSize">
+ <property name="tqmaximumSize">
<size>
<width>20</width>
<height>20</height>
@@ -128,7 +128,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -137,7 +137,7 @@
</spacer>
</hbox>
</widget>
- <widget class="QSlider">
+ <widget class="TQSlider">
<property name="name">
<cstring>Position</cstring>
</property>
@@ -148,7 +148,7 @@
<enum>Horizontal</enum>
</property>
</widget>
- <widget class="QFrame">
+ <widget class="TQFrame">
<property name="name">
<cstring>Frame3</cstring>
</property>
@@ -166,9 +166,9 @@
<property name="frameShadow">
<enum>Raised</enum>
</property>
- <property name="layoutMargin" stdset="0">
+ <property name="tqlayoutMargin" stdset="0">
</property>
- <property name="layoutSpacing" stdset="0">
+ <property name="tqlayoutSpacing" stdset="0">
</property>
<hbox>
<property name="name">
@@ -190,14 +190,14 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
</size>
</property>
</spacer>
- <widget class="QLabel">
+ <widget class="TQLabel">
<property name="name">
<cstring>time</cstring>
</property>
@@ -215,7 +215,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -224,7 +224,7 @@
</spacer>
</hbox>
</widget>
- <widget class="QFrame">
+ <widget class="TQFrame">
<property name="name">
<cstring>Frame4</cstring>
</property>
@@ -242,9 +242,9 @@
<property name="frameShadow">
<enum>Raised</enum>
</property>
- <property name="layoutMargin" stdset="0">
+ <property name="tqlayoutMargin" stdset="0">
</property>
- <property name="layoutSpacing" stdset="0">
+ <property name="tqlayoutSpacing" stdset="0">
</property>
<hbox>
<property name="name">
@@ -266,14 +266,14 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
</size>
</property>
</spacer>
- <widget class="QLabel">
+ <widget class="TQLabel">
<property name="name">
<cstring>currentFile</cstring>
</property>
@@ -291,7 +291,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -310,7 +310,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -336,5 +336,5 @@
<includes>
<include location="global" impldecl="in declaration">controls.h</include>
</includes>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
</UI>
diff --git a/konq-plugins/sidebar/mediaplayer/player.cpp b/konq-plugins/sidebar/mediaplayer/player.cpp
index 741a6b6..c11b2b0 100644
--- a/konq-plugins/sidebar/mediaplayer/player.cpp
+++ b/konq-plugins/sidebar/mediaplayer/player.cpp
@@ -29,8 +29,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "engine.h"
#include "player.h"
-Player::Player(TQObject *parent)
- : TQObject(parent)
+Player::Player(TQObject *tqparent)
+ : TQObject(tqparent)
, position(0)
, unfinished(false)
{
diff --git a/konq-plugins/sidebar/mediaplayer/player.h b/konq-plugins/sidebar/mediaplayer/player.h
index c262ab6..c0a9159 100644
--- a/konq-plugins/sidebar/mediaplayer/player.h
+++ b/konq-plugins/sidebar/mediaplayer/player.h
@@ -33,13 +33,14 @@ class Engine;
/**
* This class has slots for all the common media player buttons
**/
-class Player : public QObject
+class Player : public TQObject
{
Q_OBJECT
+ TQ_OBJECT
friend class KaboodlePart;
public:
- Player(TQObject *parent = 0);
+ Player(TQObject *tqparent = 0);
~Player();
/**
generated by cgit v1.2.1 (git 2.18.0) at 2024-10-12 01:02:43 +0000