Trinity Qt initial conversion

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdemultimedia@1157644 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

15 files changed, 149 insertions, 149 deletions

diff --git a/kaboodle/conf.cpp b/kaboodle/conf.cpp
index eb5b0d7d..4570bf2e 100644
--- a/kaboodle/conf.cpp
+++ b/kaboodle/conf.cpp
@@ -25,19 +25,19 @@
 
 #include <kconfig.h>
 #include <klocale.h>
-#include <qcheckbox.h>
-#include <qvbox.h>
+#include <tqcheckbox.h>
+#include <tqvbox.h>
 
 #include "conf.h"
 #include "view.h"
 
-Kaboodle::Conf::Conf(QWidget *_parent, const char *_name)
-	: KDialogBase(_parent, _name, true, QString::null, Ok | Cancel)
+Kaboodle::Conf::Conf(TQWidget *_parent, const char *_name)
+	: KDialogBase(_parent, _name, true, TQString::null, Ok | Cancel)
 {
-	QVBox *box = makeVBoxMainWidget();
+	TQVBox *box = makeVBoxMainWidget();
 
-	autoPlay = new QCheckBox(i18n("Start playing automatically"), box);
-	quitAfterPlaying = new QCheckBox(i18n("Quit when finished playing"), box);
+	autoPlay = new TQCheckBox(i18n("Start playing automatically"), box);
+	quitAfterPlaying = new TQCheckBox(i18n("Quit when finished playing"), box);
 
 	KConfig &config = *KGlobal::config();
 	config.setGroup("core");
diff --git a/kaboodle/conf.h b/kaboodle/conf.h
index ecd1d0da..a79bc08a 100644
--- a/kaboodle/conf.h
+++ b/kaboodle/conf.h
@@ -38,13 +38,13 @@ class Conf : public KDialogBase
 Q_OBJECT
 
 public:
-	Conf(QWidget *_parent = 0, const char *_name = 0);
+	Conf(TQWidget *_parent = 0, const char *_name = 0);
 
 protected:
 	virtual void accept(void);
 
 private:
-	QCheckBox *autoPlay, *quitAfterPlaying;
+	TQCheckBox *autoPlay, *quitAfterPlaying;
 };
 
 }
diff --git a/kaboodle/controls.cpp b/kaboodle/controls.cpp
index 4d86e1c7..305ae661 100644
--- a/kaboodle/controls.cpp
+++ b/kaboodle/controls.cpp
@@ -23,15 +23,15 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include "controls.h"
 
-Kaboodle::L33tSlider::L33tSlider(QWidget * parent, const char * name) :
-	QSlider(parent,name), pressed(false)
+Kaboodle::L33tSlider::L33tSlider(TQWidget * parent, const char * name) :
+	TQSlider(parent,name), pressed(false)
 {}
-Kaboodle::L33tSlider::L33tSlider(Orientation o, QWidget * parent, const char * name) :
-	QSlider(o,parent,name), pressed(false)
+Kaboodle::L33tSlider::L33tSlider(Orientation o, TQWidget * parent, const char * name) :
+	TQSlider(o,parent,name), pressed(false)
 {}
 Kaboodle::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 Kaboodle::L33tSlider::currentlyPressed() const
@@ -42,28 +42,28 @@ bool Kaboodle::L33tSlider::currentlyPressed() const
 void Kaboodle::L33tSlider::setValue(int i)
 {
 	if (!pressed)
-		QSlider::setValue(i);
+		TQSlider::setValue(i);
 }
 
-void Kaboodle::L33tSlider::mousePressEvent(QMouseEvent*e)
+void Kaboodle::L33tSlider::mousePressEvent(TQMouseEvent*e)
 {
 	if (e->button()!=RightButton)
 	{
 		pressed=true;
-		QSlider::mousePressEvent(e);
+		TQSlider::mousePressEvent(e);
 	}
 }
 
-void Kaboodle::L33tSlider::mouseReleaseEvent(QMouseEvent*e)
+void Kaboodle::L33tSlider::mouseReleaseEvent(TQMouseEvent*e)
 {
 	pressed=false;
-	QSlider::mouseReleaseEvent(e);
+	TQSlider::mouseReleaseEvent(e);
 	emit userChanged(value());
 }
 
-void Kaboodle::L33tSlider::wheelEvent(QWheelEvent *e)
+void Kaboodle::L33tSlider::wheelEvent(TQWheelEvent *e)
 {
-	QSlider::wheelEvent(e);
+	TQSlider::wheelEvent(e);
 	int newValue = value();
 
 	if(newValue < minValue())
@@ -75,15 +75,15 @@ void Kaboodle::L33tSlider::wheelEvent(QWheelEvent *e)
 	emit userChanged(newValue);
 }
 
-Kaboodle::SliderAction::SliderAction(const QString& text, int accel, const QObject *receiver,
-                                 const char *member, QObject* parent, const char* name )
+Kaboodle::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 Kaboodle::SliderAction::plug( QWidget *w, int index )
+int Kaboodle::SliderAction::plug( TQWidget *w, int index )
 {
 	if (!w->inherits("KToolBar")) return -1;
 
@@ -97,11 +97,11 @@ int Kaboodle::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 Kaboodle::SliderAction::unplug( QWidget *w )
+void Kaboodle::SliderAction::unplug( TQWidget *w )
 {
 	KToolBar *toolBar = (KToolBar *)w;
 	int idx = findContainer( w );
diff --git a/kaboodle/controls.h b/kaboodle/controls.h
index d288d1fc..a434489f 100644
--- a/kaboodle/controls.h
+++ b/kaboodle/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 <qguardedptr.h>
+#include <tqguardedptr.h>
 
 #include <kaction.h>
 #include <ktoolbar.h>
-#include <qslider.h>
-#include <qstringlist.h>
+#include <tqslider.h>
+#include <tqstringlist.h>
 
 class QComboBox;
 class QLabel;
@@ -44,10 +44,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:
@@ -59,9 +59,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;
@@ -74,11 +74,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();
@@ -86,9 +86,9 @@ signals:
 public slots:
 	void toolbarMoved(KToolBar::BarPosition pos);
 private:
-	QGuardedPtr<QSlider> m_slider;
-	QStringList m_items;
-	const QObject *m_receiver;
+	TQGuardedPtr<TQSlider> m_slider;
+	TQStringList m_items;
+	const TQObject *m_receiver;
 	const char *m_member;
 };
 
diff --git a/kaboodle/engine.cpp b/kaboodle/engine.cpp
index 20d9d2e4..5909dbcd 100644
--- a/kaboodle/engine.cpp
+++ b/kaboodle/engine.cpp
@@ -33,9 +33,9 @@ extern "C"
 #include <kmimetype.h>
 #include <kstandarddirs.h>
 #include <kurl.h>
-#include <qtimer.h>
-#include <qfile.h>
-#include <qdir.h>
+#include <tqtimer.h>
+#include <tqfile.h>
+#include <tqdir.h>
 
 #include <connect.h>
 #include <dynamicrequest.h>
@@ -71,8 +71,8 @@ public:
 	KURL file;
 };
 
-Kaboodle::Engine::Engine(QObject *parent)
-	: QObject(parent)
+Kaboodle::Engine::Engine(TQObject *parent)
+	: TQObject(parent)
 	, d(new EnginePrivate)
 {
 }
diff --git a/kaboodle/engine.h b/kaboodle/engine.h
index 7174af3a..c8001e56 100644
--- a/kaboodle/engine.h
+++ b/kaboodle/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 <qobject.h>
+#include <tqobject.h>
 #include <kmedia2.h>
 #include <kmediaplayer/player.h>
 #include <kurl.h>
@@ -47,7 +47,7 @@ class Engine : public QObject
 Q_OBJECT
 
 public:
-	Engine(QObject *parent=0);
+	Engine(TQObject *parent=0);
 	~Engine();
 
 	Arts::PlayObject playObject() const;
diff --git a/kaboodle/kaboodle_factory.cpp b/kaboodle/kaboodle_factory.cpp
index 1706f3c3..99302702 100644
--- a/kaboodle/kaboodle_factory.cpp
+++ b/kaboodle/kaboodle_factory.cpp
@@ -42,9 +42,9 @@ Kaboodle::KaboodleFactory::~KaboodleFactory()
 	s_instance = 0;
 }
 
-KParts::Part *Kaboodle::KaboodleFactory::createPartObject(QWidget *widgetParent, const char *widgetName, QObject *parent, const char *name, const char *className, const QStringList &)
+KParts::Part *Kaboodle::KaboodleFactory::createPartObject(TQWidget *widgetParent, const char *widgetName, TQObject *parent, const char *name, const char *className, const TQStringList &)
 {
-	if(className == QString("KMediaPlayer/Engine"))
+	if(className == TQString("KMediaPlayer/Engine"))
 	{
 		return new Player(parent, name);
 	}
diff --git a/kaboodle/kaboodle_factory.h b/kaboodle/kaboodle_factory.h
index 0c43c7c2..415876d5 100644
--- a/kaboodle/kaboodle_factory.h
+++ b/kaboodle/kaboodle_factory.h
@@ -40,7 +40,7 @@ public:
 	KaboodleFactory();
 	virtual ~KaboodleFactory();
 
-	virtual KParts::Part *createPartObject(QWidget *widgetParent, const char *widgetName, QObject *parent = 0, const char *name = 0, const char *classname = "QObject", const QStringList &args = QStringList());
+	virtual KParts::Part *createPartObject(TQWidget *widgetParent, const char *widgetName, TQObject *parent = 0, const char *name = 0, const char *classname = "TQObject", const TQStringList &args = TQStringList());
 
 	static const KAboutData *aboutData();
 	static KInstance *instance();
diff --git a/kaboodle/main.cpp b/kaboodle/main.cpp
index 35e858df..943e90df 100644
--- a/kaboodle/main.cpp
+++ b/kaboodle/main.cpp
@@ -24,7 +24,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <kaboutdata.h>
 #include <kcmdlineargs.h>
 #include <klocale.h>
-#include <qapplication.h>
+#include <tqapplication.h>
 
 #include "kaboodle_factory.h"
 #include "kaboodleapp.h"
diff --git a/kaboodle/player.cpp b/kaboodle/player.cpp
index 2530c0c5..70517c2d 100644
--- a/kaboodle/player.cpp
+++ b/kaboodle/player.cpp
@@ -32,7 +32,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "player.h"
 #include "view.h"
 
-Kaboodle::Player::Player(QObject *parent, const char *name)
+Kaboodle::Player::Player(TQObject *parent, const char *name)
 	: KMediaPlayer::Player(parent, name)
 	, engine(new Engine(this))
 	, widget(0)
@@ -41,13 +41,13 @@ Kaboodle::Player::Player(QObject *parent, const char *name)
 {
 	setInstance(KaboodleFactory::instance());
 
-	connect(&ticker, SIGNAL(timeout()), SLOT(tickerTimeout()));
+	connect(&ticker, TQT_SIGNAL(timeout()), TQT_SLOT(tickerTimeout()));
 	ticker.start(500);
 	setState(Empty);
 }
 
-Kaboodle::Player::Player(QWidget *widgetParent, const char *widgetName,
-                         QObject *parent, const char *name)
+Kaboodle::Player::Player(TQWidget *widgetParent, const char *widgetName,
+                         TQObject *parent, const char *name)
 	: KMediaPlayer::Player(widgetParent, widgetName, parent, name)
 	, engine(new Engine(this))
 	, widget(new View(widgetParent, widgetName, this))
@@ -56,18 +56,18 @@ Kaboodle::Player::Player(QWidget *widgetParent, const char *widgetName,
 {
 	setInstance(KaboodleFactory::instance());
 
-	connect(&ticker, SIGNAL(timeout()), SLOT(tickerTimeout()));
+	connect(&ticker, TQT_SIGNAL(timeout()), TQT_SLOT(tickerTimeout()));
 	ticker.start(500);
 	setState(Empty);
 
-	playAction = new KAction(i18n("&Play"), 0, this, SLOT(play()), actionCollection(), "play");
-	pauseAction = new KAction(i18n("&Pause"), 0, this, SLOT(pause()), actionCollection(), "pause");
-	stopAction = new KAction(i18n("&Stop"), 0, this, SLOT(stop()), actionCollection(), "stop");
-	loopAction = new KToggleAction(i18n("&Looping"), 0, this, SLOT(loop()), actionCollection(), "loop");
+	playAction = new KAction(i18n("&Play"), 0, this, TQT_SLOT(play()), actionCollection(), "play");
+	pauseAction = new KAction(i18n("&Pause"), 0, this, TQT_SLOT(pause()), actionCollection(), "pause");
+	stopAction = new KAction(i18n("&Stop"), 0, this, TQT_SLOT(stop()), actionCollection(), "stop");
+	loopAction = new KToggleAction(i18n("&Looping"), 0, this, TQT_SLOT(loop()), actionCollection(), "loop");
 	stopAction->setEnabled(false);
 	playAction->setEnabled(false);
 	pauseAction->setEnabled(false);
-	connect(this, SIGNAL(loopingChanged(bool)), loopAction, SLOT(setChecked(bool)));
+	connect(this, TQT_SIGNAL(loopingChanged(bool)), loopAction, TQT_SLOT(setChecked(bool)));
 
 	KParts::Part::setWidget(widget);
 	setXMLFile("kaboodlepartui.rc");
@@ -124,23 +124,23 @@ bool Kaboodle::Player::openFile(void)
 	return true;
 }
 
-QString Kaboodle::Player::timeString(unsigned long time)
+TQString Kaboodle::Player::timeString(unsigned long time)
 {
 	int posSecs = (int)(time / 1000);
 	int posSeconds = posSecs % 60;
 	int posMinutes = (posSecs - posSeconds) / 60;
 
-	QString result;
+	TQString result;
 	result.sprintf("%.2d:%.2d", posMinutes, posSeconds);
 	return result;
 }
 
-QString Kaboodle::Player::positionString(void)
+TQString Kaboodle::Player::positionString(void)
 {
 	return timeString(engine->position());
 }
 
-QString Kaboodle::Player::lengthString(void)
+TQString Kaboodle::Player::lengthString(void)
 {
 	return timeString(engine->length());
 }
diff --git a/kaboodle/player.h b/kaboodle/player.h
index 90ddad49..4d67abb6 100644
--- a/kaboodle/player.h
+++ b/kaboodle/player.h
@@ -28,8 +28,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <kmediaplayer/player.h>
 #include <kparts/browserextension.h>
 #include <kurl.h>
-#include <qobject.h>
-#include <qtimer.h>
+#include <tqobject.h>
+#include <tqtimer.h>
 
 class KAction;
 class KToggleAction;
@@ -53,9 +53,9 @@ class Player : public KMediaPlayer::Player
 Q_OBJECT
 
 public:
-	Player(QWidget *widgetParent, const char *widgetName,
-	       QObject *parent, const char *name);
-	Player(QObject *parent, const char *name);
+	Player(TQWidget *widgetParent, const char *widgetName,
+	       TQObject *parent, const char *name);
+	Player(TQObject *parent, const char *name);
 	virtual ~Player();
 
 	virtual bool openURL(const KURL &);
@@ -66,9 +66,9 @@ public:
 	 * be used in the UI:
 	 * CC:CC/LL:LL (mm:ss)
 	 **/
-	static QString timeString(unsigned long);
-	QString lengthString(void);
-	QString positionString(void);
+	static TQString timeString(unsigned long);
+	TQString lengthString(void);
+	TQString positionString(void);
 
 	virtual KMediaPlayer::View *view(void);
 
@@ -105,7 +105,7 @@ private:
 	KAction *playAction, *pauseAction, *stopAction;
 	KToggleAction *loopAction;
 
-	QTimer ticker;
+	TQTimer ticker;
 	KURL current;
 	bool uncompleted;
 
diff --git a/kaboodle/userinterface.cpp b/kaboodle/userinterface.cpp
index eca95c75..72449fcf 100644
--- a/kaboodle/userinterface.cpp
+++ b/kaboodle/userinterface.cpp
@@ -34,10 +34,10 @@
 #include <kstatusbar.h>
 #include <kstdaction.h>
 #include <kurldrag.h>
-#include <qdragobject.h>
-#include <qlayout.h>
-#include <qlcdnumber.h>
-#include <qvbox.h>
+#include <tqdragobject.h>
+#include <tqlayout.h>
+#include <tqlcdnumber.h>
+#include <tqvbox.h>
 #include <kkeydialog.h>
 #include <kvideowidget.h>
 
@@ -48,19 +48,19 @@
 #include "view.h"
 #include "userinterface.h"
 
-Kaboodle::UserInterface::UserInterface(QWidget *parent, const KURL &initialFile)
+Kaboodle::UserInterface::UserInterface(TQWidget *parent, const KURL &initialFile)
 	: KParts::MainWindow(parent)
 {
 	setAcceptDrops(true);
 	setStandardToolBarMenuEnabled(true);
 
-	KStdAction::open(this, SLOT(fileOpen()), actionCollection());
-	KStdAction::quit(kapp, SLOT(quit()), actionCollection());
-	KStdAction::preferences(this, SLOT(playerPreferences()), actionCollection());
-        KStdAction::keyBindings( this, SLOT( slotConfigureKeys() ), actionCollection() );
+	KStdAction::open(this, TQT_SLOT(fileOpen()), actionCollection());
+	KStdAction::quit(kapp, TQT_SLOT(quit()), actionCollection());
+	KStdAction::preferences(this, TQT_SLOT(playerPreferences()), actionCollection());
+        KStdAction::keyBindings( this, TQT_SLOT( slotConfigureKeys() ), actionCollection() );
 
-	menubarAction = KStdAction::showMenubar(this, SLOT(showMenubar()), actionCollection());
-	propertiesAction = new KAction(i18n("Properties"), 0, this, SLOT(properties()), actionCollection(), "properties");
+	menubarAction = KStdAction::showMenubar(this, TQT_SLOT(showMenubar()), actionCollection());
+	propertiesAction = new KAction(i18n("Properties"), 0, this, TQT_SLOT(properties()), actionCollection(), "properties");
 	propertiesAction->setEnabled(false);
 
 	part = new Player(this, "KaboodlePlayer", this, "KaboodleView");
@@ -72,8 +72,8 @@ Kaboodle::UserInterface::UserInterface(QWidget *parent, const KURL &initialFile)
 
 	statusBar()->show();
 
-	connect(part, SIGNAL(setWindowCaption(const QString &)), this, SLOT(updateTitle(const QString &)));
-	connect(part->view(), SIGNAL(adaptSize(int, int)), this, SLOT(adaptSize(int, int)));
+	connect(part, TQT_SIGNAL(setWindowCaption(const TQString &)), this, TQT_SLOT(updateTitle(const TQString &)));
+	connect(part->view(), TQT_SIGNAL(adaptSize(int, int)), this, TQT_SLOT(adaptSize(int, int)));
 
 	setIcon(SmallIcon("kaboodle"));
 
@@ -109,7 +109,7 @@ Kaboodle::UserInterface::~UserInterface(void)
 
 void Kaboodle::UserInterface::fileOpen(void)
 {
-	KURL file(KFileDialog::getOpenURL(QString::null, KDE::PlayObjectFactory::mimeTypes().join(" "), this, i18n("Select File to Play")));
+	KURL file(KFileDialog::getOpenURL(TQString::null, KDE::PlayObjectFactory::mimeTypes().join(" "), this, i18n("Select File to Play")));
 	if(file.isValid())
 	{
 		part->openURL(file);
@@ -117,13 +117,13 @@ void Kaboodle::UserInterface::fileOpen(void)
 	}
 }
 
-void Kaboodle::UserInterface::dragEnterEvent(QDragEnterEvent *event)
+void Kaboodle::UserInterface::dragEnterEvent(TQDragEnterEvent *event)
 {
     // accept uri drops only
     event->accept(KURLDrag::canDecode(event));
 }
 
-void Kaboodle::UserInterface::dropEvent(QDropEvent *event)
+void Kaboodle::UserInterface::dropEvent(TQDropEvent *event)
 {
 	KURL::List list;
 	if (KURLDrag::decode(event, list))
@@ -157,7 +157,7 @@ void Kaboodle::UserInterface::showMenubar(void)
 		menuBar()->hide();
 }
 
-void Kaboodle::UserInterface::updateTitle(const QString &text)
+void Kaboodle::UserInterface::updateTitle(const TQString &text)
 {
 	setCaption(text);
 	statusBar()->message(text);
diff --git a/kaboodle/userinterface.h b/kaboodle/userinterface.h
index db91ebad..a58dfa5d 100644
--- a/kaboodle/userinterface.h
+++ b/kaboodle/userinterface.h
@@ -43,14 +43,14 @@ class UserInterface : public KParts::MainWindow
 {
 Q_OBJECT
 public:
-	UserInterface(QWidget *parent, const KURL &initialFile = KURL());
+	UserInterface(TQWidget *parent, const KURL &initialFile = KURL());
 	virtual ~UserInterface(void);
 
-	void load(const QString& url);
+	void load(const TQString& url);
 
 protected:
-	virtual void dragEnterEvent(QDragEnterEvent *);
-	virtual void dropEvent(QDropEvent *);
+	virtual void dragEnterEvent(TQDragEnterEvent *);
+	virtual void dropEvent(TQDropEvent *);
 
 public slots:
 	void playerPreferences(void);
@@ -58,7 +58,7 @@ public slots:
 private slots:
 	void fileOpen(void);
 	void showMenubar(void);
-	void updateTitle(const QString &text);
+	void updateTitle(const TQString &text);
 	void applySettings(void);
 	void properties(void);
 	void adaptSize(int width, int height);
diff --git a/kaboodle/view.cpp b/kaboodle/view.cpp
index 3ddf3621..eba6ff20 100644
--- a/kaboodle/view.cpp
+++ b/kaboodle/view.cpp
@@ -29,33 +29,33 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <kiconloader.h>
 #include <klocale.h>
 #include <kvideowidget.h>
-#include <qdragobject.h>
-#include <qlabel.h>
-#include <qlayout.h>
-#include <qpushbutton.h>
-#include <qtoolbutton.h>
-#include <qtooltip.h>
-#include <qwidget.h>
-#include <qvbox.h>
+#include <tqdragobject.h>
+#include <tqlabel.h>
+#include <tqlayout.h>
+#include <tqpushbutton.h>
+#include <tqtoolbutton.h>
+#include <tqtooltip.h>
+#include <tqwidget.h>
+#include <tqvbox.h>
 
 #include "view.h"
 #include "player.h"
 
 namespace
 {
-QButton *createButton(const QIconSet &_iconset, const QString &_tip, QObject *_receiver, const char *_slot, QWidget *_parent)
+TQButton *createButton(const TQIconSet &_iconset, const TQString &_tip, TQObject *_receiver, const char *_slot, TQWidget *_parent)
 {
-	QToolButton *button = new QToolButton(_parent);
+	TQToolButton *button = new TQToolButton(_parent);
 	button->setMaximumSize(50, 50);
 	button->setIconSet(_iconset);
-	QToolTip::add(button, _tip);
-	QObject::connect(button, SIGNAL(clicked()), _receiver, _slot);
+	TQToolTip::add(button, _tip);
+	TQObject::connect(button, TQT_SIGNAL(clicked()), _receiver, _slot);
 	button->show();
 	return button;
 }
 }
 
-Kaboodle::View::View(QWidget *parent, const char *name, Player *p)
+Kaboodle::View::View(TQWidget *parent, const char *name, Player *p)
 	: KMediaPlayer::View(parent, name)
 	, state((KMediaPlayer::Player::State)p->state())
 	, autoPlay(false)
@@ -64,54 +64,54 @@ Kaboodle::View::View(QWidget *parent, const char *name, Player *p)
 	, firstVideo(false)
 	, lastWidth(0)
 {
-	(new QHBoxLayout(this))->setAutoAdd(true);
-	QVBox *box = new QVBox(this);
+	(new TQHBoxLayout(this))->setAutoAdd(true);
+	TQVBox *box = new TQVBox(this);
 	box->setSpacing(KDialog::spacingHint());
 	box->setMargin(0);
 
 	video = new KVideoWidget(player, box);
 	video->actionCollection()->readShortcutSettings();
 	setVideoWidget(video);
-	connect(video, SIGNAL(adaptSize(int, int)), this, SLOT(calculateSize(int, int)));
-	connect(video, SIGNAL(mouseButtonPressed(int, const QPoint&, int)), this, SLOT(slotButtonPressed(int, const QPoint &, int) ) ) ;
-	connect(video, SIGNAL(mouseButtonDoubleClick(const QPoint&, int)), this, SLOT(slotDblClick(const QPoint &, int) ) ) ;
+	connect(video, TQT_SIGNAL(adaptSize(int, int)), this, TQT_SLOT(calculateSize(int, int)));
+	connect(video, TQT_SIGNAL(mouseButtonPressed(int, const TQPoint&, int)), this, TQT_SLOT(slotButtonPressed(int, const TQPoint &, int) ) ) ;
+	connect(video, TQT_SIGNAL(mouseButtonDoubleClick(const TQPoint&, int)), this, TQT_SLOT(slotDblClick(const TQPoint &, int) ) ) ;
 
-	QWidget *sliderBox = new QWidget(box);
-	sliderBox->setFocusPolicy(QWidget::ClickFocus);
+	TQWidget *sliderBox = new TQWidget(box);
+	sliderBox->setFocusPolicy(TQWidget::ClickFocus);
 	sliderBox->setAcceptDrops(true);
 
-	QHBoxLayout *layout = new QHBoxLayout(sliderBox);
+	TQHBoxLayout *layout = new TQHBoxLayout(sliderBox);
 	layout->setSpacing(KDialog::spacingHint());
 	layout->setMargin(0);
 	layout->setAutoAdd(true);
 
-	playButton = createButton(BarIconSet("1rightarrow"), i18n("Play"), player, SLOT(play()), sliderBox);
-	pauseButton = createButton(BarIconSet("player_pause"), i18n("Pause"), player, SLOT(pause()), sliderBox);
-	stopButton = createButton(BarIconSet("player_stop"), i18n("Stop"), player, SLOT(stop()), sliderBox);
+	playButton = createButton(BarIconSet("1rightarrow"), i18n("Play"), player, TQT_SLOT(play()), sliderBox);
+	pauseButton = createButton(BarIconSet("player_pause"), i18n("Pause"), player, TQT_SLOT(pause()), sliderBox);
+	stopButton = createButton(BarIconSet("player_stop"), i18n("Stop"), player, TQT_SLOT(stop()), sliderBox);
 
 	slider = new L33tSlider(0, 1000, 10, 0, L33tSlider::Horizontal, sliderBox);
-	slider->setTickmarks(QSlider::NoMarks);
+	slider->setTickmarks(TQSlider::NoMarks);
 	slider->show();
 
-	elapsedLabel = new QLabel(sliderBox);
-	QFont labelFont = elapsedLabel->font();
+	elapsedLabel = new TQLabel(sliderBox);
+	TQFont labelFont = elapsedLabel->font();
 	labelFont.setPointSize(24);
 	labelFont.setBold(true);
-	QFontMetrics labelFontMetrics(labelFont);
+	TQFontMetrics labelFontMetrics(labelFont);
 	elapsedLabel->setFont(labelFont);
 	elapsedLabel->setAlignment(AlignCenter | AlignVCenter | ExpandTabs);
 	elapsedLabel->setFixedHeight(labelFontMetrics.height());
 	elapsedLabel->setMinimumWidth(labelFontMetrics.width("00:00"));
 
-	connect(player, SIGNAL(stateChanged(int)), this, SLOT(stateChanged(int)));
-	connect(player, SIGNAL(completed()), this, SLOT(playerFinished()));
-	connect(player, SIGNAL(timeout()), this, SLOT(playerTimeout()));
+	connect(player, TQT_SIGNAL(stateChanged(int)), this, TQT_SLOT(stateChanged(int)));
+	connect(player, TQT_SIGNAL(completed()), this, TQT_SLOT(playerFinished()));
+	connect(player, TQT_SIGNAL(timeout()), this, TQT_SLOT(playerTimeout()));
 
-	connect(slider, SIGNAL(userChanged(int)), this, SLOT(skipToWrapper(int)));
-	connect(slider, SIGNAL(sliderMoved(int)), this, SLOT(sliderMoved(int)));
+	connect(slider, TQT_SIGNAL(userChanged(int)), this, TQT_SLOT(skipToWrapper(int)));
+	connect(slider, TQT_SIGNAL(sliderMoved(int)), this, TQT_SLOT(sliderMoved(int)));
 	slider->setEnabled(false);
 
-	connect(this, SIGNAL(buttonsChanged(int)), this, SLOT(updateButtons(int)));
+	connect(this, TQT_SIGNAL(buttonsChanged(int)), this, TQT_SLOT(updateButtons(int)));
 	updateButtons(buttons());
 
 	updateLabel("--:--/--:--");
@@ -233,7 +233,7 @@ void Kaboodle::View::skipToWrapper(int second)
 	player->seek((unsigned long)(second*1000));
 }
 
-void Kaboodle::View::updateLabel(const QString &text)
+void Kaboodle::View::updateLabel(const TQString &text)
 {
 	if(elapsedLabel)
 		elapsedLabel->setText(text.left(5));
@@ -304,14 +304,14 @@ void Kaboodle::View::updateButtons(int b)
 
 }
 
-void Kaboodle::View::slotButtonPressed(int /*type*/, const QPoint &, int /* state */)
+void Kaboodle::View::slotButtonPressed(int /*type*/, const TQPoint &, int /* state */)
 {
 	if((KMediaPlayer::Player::State)player->state() == KMediaPlayer::Player::Pause )
 		player->play();
 	else player->pause();
 }
 
-void Kaboodle::View::slotDblClick( const QPoint &, int /* state */)
+void Kaboodle::View::slotDblClick( const TQPoint &, int /* state */)
 {
 	if ( video->isFullscreen() )
 		video->setWindowed();
diff --git a/kaboodle/view.h b/kaboodle/view.h
index f21de905..8ac94db4 100644
--- a/kaboodle/view.h
+++ b/kaboodle/view.h
@@ -27,11 +27,11 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <kmediaplayer/player.h>
 #include <kmediaplayer/view.h>
 #include <kurl.h>
-#include <qevent.h>
-#include <qhbox.h>
-#include <qlayout.h>
-#include <qlcdnumber.h>
-#include <qwidget.h>
+#include <tqevent.h>
+#include <tqhbox.h>
+#include <tqlayout.h>
+#include <tqlcdnumber.h>
+#include <tqwidget.h>
 
 #include "controls.h"
 #include "player.h"
@@ -47,7 +47,7 @@ class View : public KMediaPlayer::View
 Q_OBJECT
 
 public:
-	View(QWidget *parent, const char *name, Player *player);
+	View(TQWidget *parent, const char *name, Player *player);
 	virtual ~View(void);
 	
 	/**
@@ -78,9 +78,9 @@ signals:
 	void adaptSize(int width, int height);
 
 private slots:
-	void updateLabel(const QString &text);
-	void slotButtonPressed( int, const QPoint &, int state );
-	void slotDblClick( const QPoint &, int state );
+	void updateLabel(const TQString &text);
+	void slotButtonPressed( int, const TQPoint &, int state );
+	void slotDblClick( const TQPoint &, int state );
 
 	void calculateSize(int width, int height);
 
@@ -92,13 +92,13 @@ private:
 	void updateTicks(void);
 
 	L33tSlider *slider;
-	QLabel *elapsedLabel;
+	TQLabel *elapsedLabel;
 	KVideoWidget *video;
 	bool firstVideo;
 
 	int lastWidth;
 	
-	QButton *playButton, *pauseButton, *stopButton;
+	TQButton *playButton, *pauseButton, *stopButton;
 };
 }
 #endif