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 --- konq-plugins/sidebar/mediaplayer/controls.cpp | 38 ++++++++--------- konq-plugins/sidebar/mediaplayer/controls.h | 34 +++++++-------- konq-plugins/sidebar/mediaplayer/engine.cpp | 10 ++--- konq-plugins/sidebar/mediaplayer/engine.h | 4 +- konq-plugins/sidebar/mediaplayer/mediaplayer.cpp | 12 +++--- konq-plugins/sidebar/mediaplayer/mediaplayer.h | 8 ++-- konq-plugins/sidebar/mediaplayer/mediawidget.cpp | 54 ++++++++++++------------ konq-plugins/sidebar/mediaplayer/mediawidget.h | 8 ++-- konq-plugins/sidebar/mediaplayer/player.cpp | 10 ++--- konq-plugins/sidebar/mediaplayer/player.h | 10 ++--- 10 files changed, 94 insertions(+), 94 deletions(-) (limited to 'konq-plugins/sidebar/mediaplayer') diff --git a/konq-plugins/sidebar/mediaplayer/controls.cpp b/konq-plugins/sidebar/mediaplayer/controls.cpp index 76671d5..6c3be21 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(QWidget * parent, const char * name) : - QSlider(parent,name), pressed(false) +L33tSlider::L33tSlider(TQWidget * parent, const char * name) : + TQSlider(parent,name), pressed(false) {} -L33tSlider::L33tSlider(Orientation o, QWidget * parent, const char * name) : - QSlider(o,parent,name), pressed(false) +L33tSlider::L33tSlider(Orientation o, TQWidget * parent, const char * name) : + TQSlider(o,parent,name), pressed(false) {} L33tSlider::L33tSlider(int minValue, int maxValue, int pageStep, int value, - Orientation o, QWidget * parent, const char * name) : - QSlider(minValue, maxValue, pageStep, value, o, parent,name), pressed(false) + Orientation o, TQWidget * parent, const char * name) : + TQSlider(minValue, maxValue, pageStep, value, o, parent,name), pressed(false) {} bool L33tSlider::currentlyPressed() const @@ -42,28 +42,28 @@ bool L33tSlider::currentlyPressed() const void L33tSlider::setValue(int i) { if (!pressed) - QSlider::setValue(i); + TQSlider::setValue(i); } -void L33tSlider::mousePressEvent(QMouseEvent*e) +void L33tSlider::mousePressEvent(TQMouseEvent*e) { if (e->button()!=RightButton) { pressed=true; - QSlider::mousePressEvent(e); + TQSlider::mousePressEvent(e); } } -void L33tSlider::mouseReleaseEvent(QMouseEvent*e) +void L33tSlider::mouseReleaseEvent(TQMouseEvent*e) { pressed=false; - QSlider::mouseReleaseEvent(e); + TQSlider::mouseReleaseEvent(e); emit userChanged(value()); } -void L33tSlider::wheelEvent(QWheelEvent *e) +void L33tSlider::wheelEvent(TQWheelEvent *e) { - QSlider::wheelEvent(e); + TQSlider::wheelEvent(e); int newValue = value(); if(newValue < minValue()) @@ -75,15 +75,15 @@ void L33tSlider::wheelEvent(QWheelEvent *e) emit userChanged(newValue); } -SliderAction::SliderAction(const QString& text, int accel, const QObject *receiver, - const char *member, QObject* parent, const char* name ) +SliderAction::SliderAction(const TQString& text, int accel, const TQObject *receiver, + const char *member, TQObject* parent, const char* name ) : KAction( text, accel, parent, name ) { m_receiver = receiver; m_member = member; } -int SliderAction::plug( QWidget *w, int index ) +int SliderAction::plug( TQWidget *w, int index ) { if (!w->inherits("KToolBar")) return -1; @@ -97,11 +97,11 @@ int SliderAction::plug( QWidget *w, int index ) addContainer( toolBar, id ); - connect( toolBar, SIGNAL( destroyed() ), this, SLOT( slotDestroyed() ) ); + connect( toolBar, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotDestroyed() ) ); toolBar->setItemAutoSized( id, true ); if (w->inherits( "KToolBar" )) - connect(toolBar, SIGNAL(moved(KToolBar::BarPosition)), this, SLOT(toolbarMoved(KToolBar::BarPosition))); + connect(toolBar, TQT_SIGNAL(moved(KToolBar::BarPosition)), this, TQT_SLOT(toolbarMoved(KToolBar::BarPosition))); emit plugged(); @@ -126,7 +126,7 @@ return; */ } -void SliderAction::unplug( QWidget *w ) +void SliderAction::unplug( TQWidget *w ) { KToolBar *toolBar = (KToolBar *)w; int idx = findContainer( w ); diff --git a/konq-plugins/sidebar/mediaplayer/controls.h b/konq-plugins/sidebar/mediaplayer/controls.h index d05a977..37604eb 100644 --- a/konq-plugins/sidebar/mediaplayer/controls.h +++ b/konq-plugins/sidebar/mediaplayer/controls.h @@ -24,12 +24,12 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #ifndef __CONTROLS_H #define __CONTROLS_H -#include +#include #include #include -#include -#include +#include +#include class QComboBox; class QLabel; @@ -42,10 +42,10 @@ class L33tSlider : public QSlider { Q_OBJECT public: - L33tSlider(QWidget * parent, const char * name=0); - L33tSlider(Orientation, QWidget * parent, const char * name=0); + L33tSlider(TQWidget * parent, const char * name=0); + L33tSlider(Orientation, TQWidget * parent, const char * name=0); L33tSlider(int minValue, int maxValue, int pageStep, int value, - Orientation, QWidget * parent, const char * name=0); + Orientation, TQWidget * parent, const char * name=0); bool currentlyPressed() const; signals: @@ -57,9 +57,9 @@ signals: public slots: virtual void setValue(int); protected: - virtual void mousePressEvent(QMouseEvent*); - virtual void mouseReleaseEvent(QMouseEvent*); - virtual void wheelEvent(QWheelEvent *e); + virtual void mousePressEvent(TQMouseEvent*); + virtual void mouseReleaseEvent(TQMouseEvent*); + virtual void wheelEvent(TQWheelEvent *e); private: bool pressed; @@ -72,11 +72,11 @@ class SliderAction : public KAction { Q_OBJECT public: - SliderAction(const QString& text, int accel, const QObject *receiver, - const char *member, QObject* parent, const char* name ); - virtual int plug( QWidget *w, int index = -1 ); - virtual void unplug( QWidget *w ); - QSlider* slider() const { return m_slider; } + SliderAction(const TQString& text, int accel, const TQObject *receiver, + const char *member, TQObject* parent, const char* name ); + virtual int plug( TQWidget *w, int index = -1 ); + virtual void unplug( TQWidget *w ); + TQSlider* slider() const { return m_slider; } signals: void plugged(); @@ -84,9 +84,9 @@ signals: public slots: void toolbarMoved(KToolBar::BarPosition pos); private: - QGuardedPtr m_slider; - QStringList m_items; - const QObject *m_receiver; + TQGuardedPtr m_slider; + TQStringList m_items; + const TQObject *m_receiver; const char *m_member; }; diff --git a/konq-plugins/sidebar/mediaplayer/engine.cpp b/konq-plugins/sidebar/mediaplayer/engine.cpp index cdb9486..e4590b6 100644 --- a/konq-plugins/sidebar/mediaplayer/engine.cpp +++ b/konq-plugins/sidebar/mediaplayer/engine.cpp @@ -33,9 +33,9 @@ extern "C" #include #include #include -#include -#include -#include +#include +#include +#include #include #include @@ -71,8 +71,8 @@ public: KURL file; }; -Engine::Engine(QObject *parent) - : QObject(parent) +Engine::Engine(TQObject *parent) + : TQObject(parent) , d(new EnginePrivate) { } diff --git a/konq-plugins/sidebar/mediaplayer/engine.h b/konq-plugins/sidebar/mediaplayer/engine.h index 1a5638f..07e46f1 100644 --- a/konq-plugins/sidebar/mediaplayer/engine.h +++ b/konq-plugins/sidebar/mediaplayer/engine.h @@ -24,7 +24,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #ifndef _ENGINE_H #define _ENGINE_H -#include +#include #include #include #include @@ -45,7 +45,7 @@ class Engine : public QObject Q_OBJECT public: - Engine(QObject *parent=0); + Engine(TQObject *parent=0); ~Engine(); Arts::PlayObject playObject() const; diff --git a/konq-plugins/sidebar/mediaplayer/mediaplayer.cpp b/konq-plugins/sidebar/mediaplayer/mediaplayer.cpp index ce8d1af..2de09af 100644 --- a/konq-plugins/sidebar/mediaplayer/mediaplayer.cpp +++ b/konq-plugins/sidebar/mediaplayer/mediaplayer.cpp @@ -27,7 +27,7 @@ #include #include "mediawidget.h" -KonqSidebar_MediaPlayer::KonqSidebar_MediaPlayer(KInstance *instance,QObject *parent,QWidget *widgetParent, QString &desktopName_, const char* name): +KonqSidebar_MediaPlayer::KonqSidebar_MediaPlayer(KInstance *instance,TQObject *parent,TQWidget *widgetParent, TQString &desktopName_, const char* name): KonqSidebarPlugin(instance,parent,widgetParent,desktopName_,name) { widget=new KSB_MediaWidget(widgetParent); @@ -36,11 +36,11 @@ KonqSidebar_MediaPlayer::KonqSidebar_MediaPlayer(KInstance *instance,QObject *pa KonqSidebar_MediaPlayer::~KonqSidebar_MediaPlayer(){;} -void* KonqSidebar_MediaPlayer::provides(const QString &) {return 0;} +void* KonqSidebar_MediaPlayer::provides(const TQString &) {return 0;} -void KonqSidebar_MediaPlayer::emitStatusBarText (const QString &) {;} +void KonqSidebar_MediaPlayer::emitStatusBarText (const TQString &) {;} -QWidget *KonqSidebar_MediaPlayer::getWidget(){return widget;} +TQWidget *KonqSidebar_MediaPlayer::getWidget(){return widget;} void KonqSidebar_MediaPlayer::handleURL(const KURL &/*url*/) { @@ -51,7 +51,7 @@ void KonqSidebar_MediaPlayer::handleURL(const KURL &/*url*/) extern "C" { - KDE_EXPORT void* create_konqsidebar_mediaplayer(KInstance *instance,QObject *par,QWidget *widp,QString &desktopname,const char *name) + KDE_EXPORT void* create_konqsidebar_mediaplayer(KInstance *instance,TQObject *par,TQWidget *widp,TQString &desktopname,const char *name) { KGlobal::locale()->insertCatalogue("konqsidebar_mediaplayer"); return new KonqSidebar_MediaPlayer(instance,par,widp,desktopname,name); @@ -60,7 +60,7 @@ extern "C" extern "C" { - KDE_EXPORT bool add_konqsidebar_mediaplayer(QString* fn, QString* /*param*/, QMap *map) + KDE_EXPORT bool add_konqsidebar_mediaplayer(TQString* fn, TQString* /*param*/, TQMap *map) { map->insert("Type","Link"); map->insert("Icon","konqsidebar_mediaplayer"); diff --git a/konq-plugins/sidebar/mediaplayer/mediaplayer.h b/konq-plugins/sidebar/mediaplayer/mediaplayer.h index c563e20..0e74248 100644 --- a/konq-plugins/sidebar/mediaplayer/mediaplayer.h +++ b/konq-plugins/sidebar/mediaplayer/mediaplayer.h @@ -28,11 +28,11 @@ class KonqSidebar_MediaPlayer: public KonqSidebarPlugin { Q_OBJECT public: - KonqSidebar_MediaPlayer(KInstance *instance,QObject *parent,QWidget *widgetParent, QString &desktopName_, const char* name=0); + KonqSidebar_MediaPlayer(KInstance *instance,TQObject *parent,TQWidget *widgetParent, TQString &desktopName_, const char* name=0); ~KonqSidebar_MediaPlayer(); - virtual void *provides(const QString &); - void emitStatusBarText (const QString &); - virtual QWidget *getWidget(); + virtual void *provides(const TQString &); + void emitStatusBarText (const TQString &); + virtual TQWidget *getWidget(); protected: virtual void handleURL(const KURL &url); private: diff --git a/konq-plugins/sidebar/mediaplayer/mediawidget.cpp b/konq-plugins/sidebar/mediaplayer/mediawidget.cpp index c460c3c..ac37e9c 100644 --- a/konq-plugins/sidebar/mediaplayer/mediawidget.cpp +++ b/konq-plugins/sidebar/mediaplayer/mediawidget.cpp @@ -24,45 +24,45 @@ #include #include -#include -#include -#include -#include -#include -#include -#include - -KSB_MediaWidget::KSB_MediaWidget(QWidget *parent):KSB_MediaWidget_skel(parent) +#include +#include +#include +#include +#include +#include +#include + +KSB_MediaWidget::KSB_MediaWidget(TQWidget *parent):KSB_MediaWidget_skel(parent) { player = new Player(this); empty(); - QFont labelFont = time->font(); + TQFont labelFont = time->font(); labelFont.setPointSize(18); labelFont.setBold(true); time->setFont(labelFont); - connect(Play, SIGNAL(clicked()), player, SLOT(play())); - connect(Pause, SIGNAL(clicked()), player, SLOT(pause())); - connect(Stop, SIGNAL(clicked()), player, SLOT(stop())); + connect(Play, TQT_SIGNAL(clicked()), player, TQT_SLOT(play())); + connect(Pause, TQT_SIGNAL(clicked()), player, TQT_SLOT(pause())); + connect(Stop, TQT_SIGNAL(clicked()), player, TQT_SLOT(stop())); - connect(player, SIGNAL(timeout()), this, SLOT(playerTimeout())); - connect(player, SIGNAL(finished()), this, SLOT(playerFinished())); - connect(player, SIGNAL(playing()), this, SLOT(playing())); - connect(player, SIGNAL(paused()), this, SLOT(paused())); - connect(player, SIGNAL(stopped()), this, SLOT(stopped())); - connect(player, SIGNAL(empty()), this, SLOT(empty())); + connect(player, TQT_SIGNAL(timeout()), this, TQT_SLOT(playerTimeout())); + connect(player, TQT_SIGNAL(finished()), this, TQT_SLOT(playerFinished())); + connect(player, TQT_SIGNAL(playing()), this, TQT_SLOT(playing())); + connect(player, TQT_SIGNAL(paused()), this, TQT_SLOT(paused())); + connect(player, TQT_SIGNAL(stopped()), this, TQT_SLOT(stopped())); + connect(player, TQT_SIGNAL(empty()), this, TQT_SLOT(empty())); - connect(Position, SIGNAL(userChanged(int)), this, SLOT(skipToWrapper(int))); - connect(this, SIGNAL(skipTo(unsigned long)), player, SLOT(skipTo(unsigned long))); + connect(Position, TQT_SIGNAL(userChanged(int)), this, TQT_SLOT(skipToWrapper(int))); + connect(this, TQT_SIGNAL(skipTo(unsigned long)), player, TQT_SLOT(skipTo(unsigned long))); setAcceptDrops(true); pretty=""; needLengthUpdate=false; - QToolTip::add(Play,i18n("Play")); - QToolTip::add(Pause,i18n("Pause")); - QToolTip::add(Stop,i18n("Stop")); + TQToolTip::add(Play,i18n("Play")); + TQToolTip::add(Pause,i18n("Pause")); + TQToolTip::add(Stop,i18n("Stop")); } void KSB_MediaWidget::skipToWrapper(int second) @@ -70,12 +70,12 @@ void KSB_MediaWidget::skipToWrapper(int second) emit skipTo((unsigned long)(second*1000)); } -void KSB_MediaWidget::dragEnterEvent ( QDragEnterEvent * e) +void KSB_MediaWidget::dragEnterEvent ( TQDragEnterEvent * e) { e->accept(KURLDrag::canDecode(e)); } -void KSB_MediaWidget::dropEvent ( QDropEvent * e) +void KSB_MediaWidget::dropEvent ( TQDropEvent * e) { m_kuri_list.clear(); if (KURLDrag::decode(e, m_kuri_list)) @@ -101,7 +101,7 @@ void KSB_MediaWidget::playerTimeout() if (needLengthUpdate) { int counter = player->lengthString().length() - (player->lengthString().find("/")+1); - QString length=player->lengthString().right(counter); + 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 ff2137b..69fa0f2 100644 --- a/konq-plugins/sidebar/mediaplayer/mediawidget.h +++ b/konq-plugins/sidebar/mediaplayer/mediawidget.h @@ -25,18 +25,18 @@ class KSB_MediaWidget: public KSB_MediaWidget_skel { Q_OBJECT public: - KSB_MediaWidget(QWidget *parent); + KSB_MediaWidget(TQWidget *parent); ~KSB_MediaWidget(){;} private: class Player *player; - QString pretty; + TQString pretty; bool needLengthUpdate; KURL::List m_kuri_list; protected: - virtual void dragEnterEvent ( QDragEnterEvent * ); - virtual void dropEvent ( QDropEvent * ); + virtual void dragEnterEvent ( TQDragEnterEvent * ); + virtual void dropEvent ( TQDropEvent * ); private slots: void playerTimeout(); diff --git a/konq-plugins/sidebar/mediaplayer/player.cpp b/konq-plugins/sidebar/mediaplayer/player.cpp index 360f8e8..741a6b6 100644 --- a/konq-plugins/sidebar/mediaplayer/player.cpp +++ b/konq-plugins/sidebar/mediaplayer/player.cpp @@ -29,14 +29,14 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "engine.h" #include "player.h" -Player::Player(QObject *parent) - : QObject(parent) +Player::Player(TQObject *parent) + : TQObject(parent) , position(0) , unfinished(false) { mEngine = new Engine; mLooping = false; - connect(&ticker, SIGNAL(timeout()), SLOT(tickerTimeout())); + connect(&ticker, TQT_SIGNAL(timeout()), TQT_SLOT(tickerTimeout())); ticker.start(500); stop(); } @@ -134,7 +134,7 @@ void Player::tickerTimeout() } -QString Player::lengthString(long _position) +TQString Player::lengthString(long _position) { if(_position == -1) _position = position; @@ -146,7 +146,7 @@ QString Player::lengthString(long _position) int totSeconds = totSecs % 60; int totMinutes = (totSecs - totSeconds) / 60; - QString result; + TQString result; result.sprintf("%.2d:%.2d/%.2d:%.2d", posMinutes, posSeconds, totMinutes, totSeconds); return result; } diff --git a/konq-plugins/sidebar/mediaplayer/player.h b/konq-plugins/sidebar/mediaplayer/player.h index 6acf146..c262ab6 100644 --- a/konq-plugins/sidebar/mediaplayer/player.h +++ b/konq-plugins/sidebar/mediaplayer/player.h @@ -24,8 +24,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #ifndef PLAYER_H #define PLAYER_H -#include -#include +#include +#include #include class Engine; @@ -39,7 +39,7 @@ Q_OBJECT friend class KaboodlePart; public: - Player(QObject *parent = 0); + Player(TQObject *parent = 0); ~Player(); /** @@ -47,7 +47,7 @@ public: * be used in the UI: * CC:CC/LL:LL (mm:ss) **/ - QString lengthString(long _position = -1); + TQString lengthString(long _position = -1); bool looping(void) const { return mLooping; } @@ -166,7 +166,7 @@ protected: private: Engine *mEngine; - QTimer ticker; + TQTimer ticker; long position; bool mLooping; unsigned long mLength; -- cgit v1.2.1