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

20 files changed, 209 insertions, 181 deletions

diff --git a/noatun-plugins/oblique/Makefile.am b/noatun-plugins/oblique/Makefile.am
index 09b200c..4b2789c 100644
--- a/noatun-plugins/oblique/Makefile.am
+++ b/noatun-plugins/oblique/Makefile.am
@@ -1,6 +1,6 @@
 SUBDIRS = . schemas
 
-INCLUDES= -I$(top_srcdir)/noatun/library $(all_includes)
+INCLUDES= -I$(top_srcdir)/noatun/library $(all_includes) -I$(kde_includes)/kde
 kde_module_LTLIBRARIES = noatun_oblique.la
 
 noatun_oblique_la_SOURCES = base.cpp kbuffer.cpp query.cpp oblique.cpp tree.cpp file.cpp selector.cpp menu.cpp cmodule.cpp kdatacollection.cpp view.cpp
diff --git a/noatun-plugins/oblique/base.cpp b/noatun-plugins/oblique/base.cpp
index c9e6fb6..6288f20 100644
--- a/noatun-plugins/oblique/base.cpp
+++ b/noatun-plugins/oblique/base.cpp
@@ -133,7 +133,7 @@ File Base::add(const TQString &file)
 	return File();
 }
 
-File Base::find(FileId id)
+File Base::tqfind(FileId id)
 {
 	if (id == 0) return File();
 
@@ -155,7 +155,7 @@ void Base::clear()
 {
 	for (FileId id = high(); id >= 1; id--)
 	{
-		File f = find(id);
+		File f = tqfind(id);
 		if (f)
 			f.remove();
 	}
@@ -171,7 +171,7 @@ File Base::first(FileId first)
 {
 	if (first > high()) return File();
 
-	while (!find(first))
+	while (!tqfind(first))
 	{
 		++first;
 		if (first > high())
@@ -183,8 +183,8 @@ File Base::first(FileId first)
 TQString Base::property(FileId id, const TQString &property) const
 {
 	loadIntoCache(id);
-	if (!d->cachedProperties.contains(property)) return TQString::null;
-	TQMap<TQString,TQString>::Iterator i = d->cachedProperties.find(property);
+	if (!d->cachedProperties.tqcontains(property)) return TQString();
+	TQMap<TQString,TQString>::Iterator i = d->cachedProperties.tqfind(property);
 	return i.data();
 }
 
diff --git a/noatun-plugins/oblique/base.h b/noatun-plugins/oblique/base.h
index 611c5fe..948ec78 100644
--- a/noatun-plugins/oblique/base.h
+++ b/noatun-plugins/oblique/base.h
@@ -15,9 +15,10 @@ class Slice;
 
 typedef unsigned int FileId;
 
-class Base : public QObject
+class Base : public TQObject
 {
 Q_OBJECT
+  TQ_OBJECT
 
 	struct Private;
 	Private *d; // not for BC, but for compile times :)
@@ -31,7 +32,7 @@ public:
 
 	File add(const TQString &file);
 
-	File find(FileId id);
+	File tqfind(FileId id);
 
 	void clear();
 
@@ -95,7 +96,7 @@ private: // friends for Slice
 
 private:
 	/**
-	 * load the xml that lives at the head of the db and contains
+	 * load the xml that lives at the head of the db and tqcontains
 	 * potentially lots of structured data
 	 **/
 	void loadMetaXML(const TQString &xml);
diff --git a/noatun-plugins/oblique/cmodule.cpp b/noatun-plugins/oblique/cmodule.cpp
index 729ff54..5df19b0 100644
--- a/noatun-plugins/oblique/cmodule.cpp
+++ b/noatun-plugins/oblique/cmodule.cpp
@@ -28,17 +28,17 @@
 #include <tqtabwidget.h>
 #include <tqheader.h>
 
-SchemaConfig::SchemaConfig(TQWidget *parent, Oblique *oblique)
-	: TQWidget(parent)
+SchemaConfig::SchemaConfig(TQWidget *tqparent, Oblique *oblique)
+	: TQWidget(tqparent)
 {
 	mOblique = oblique;
 	mIgnore = true;
 	mRegexpEditor=0;
 
 	{
-		TQVBoxLayout *layout = new TQVBoxLayout(this, 11, 7);
-		layout->setAutoAdd(true);
-		layout->setSpacing(7);
+		TQVBoxLayout *tqlayout = new TQVBoxLayout(this, 11, 7);
+		tqlayout->setAutoAdd(true);
+		tqlayout->setSpacing(7);
 	}
 
 
@@ -159,7 +159,7 @@ SchemaConfig::SchemaConfig(TQWidget *parent, Oblique *oblique)
 			connect(mOptionPlayable, TQT_SIGNAL(toggled(bool)), TQT_SLOT(updateCurrent()));
 
 			mOptionChildrenVisible = new TQCheckBox(i18n("&Children visible"), groupbox);
-			TQWhatsThis::add(mOptionChildrenVisible, i18n("Don't create this node, this nodes children become direct children of this node's parent"));
+			TQWhatsThis::add(mOptionChildrenVisible, i18n("Don't create this node, this nodes tqchildren become direct tqchildren of this node's tqparent"));
 			connect(mOptionChildrenVisible, TQT_SIGNAL(toggled(bool)), TQT_SLOT(updateCurrent()));
 
 			mOptionAutoOpen = new TQCheckBox(i18n("Auto &open"), groupbox);
@@ -176,14 +176,14 @@ class QueryGroupItem : public KListViewItem
 	QueryGroup *mItem;
 
 public:
-	QueryGroupItem(QueryGroupItem *parent, QueryGroup *group, QueryGroupItem *after=0)
-		: KListViewItem(parent, after)
+	QueryGroupItem(QueryGroupItem *tqparent, QueryGroup *group, QueryGroupItem *after=0)
+		: KListViewItem(tqparent, after)
 	{
 		init(group);
 	}
 
-	QueryGroupItem(KListView *parent, QueryGroup *group, QueryGroupItem *after=0)
-		: KListViewItem(parent, after)
+	QueryGroupItem(KListView *tqparent, QueryGroup *group, QueryGroupItem *after=0)
+		: KListViewItem(tqparent, after)
 	{
 		init(group);
 	}
@@ -198,8 +198,8 @@ public:
 		setText(2, item()->presentation());
 	}
 
-	QueryGroupItem *parent()
-		{ return static_cast<QueryGroupItem*>(KListViewItem::parent()); }
+	QueryGroupItem *tqparent()
+		{ return static_cast<QueryGroupItem*>(KListViewItem::tqparent()); }
 
 	KListView *listView()
 		{ return static_cast<KListView*>(KListViewItem::listView()); }
@@ -218,8 +218,8 @@ private:
 		{
 			if (QueryGroup *after = group->nextSibling())
 			{
-				if (parent())
-					new QueryGroupItem(parent(), after, this);
+				if (tqparent())
+					new QueryGroupItem(tqparent(), after, this);
 				else
 					new QueryGroupItem(listView(), after, this);
 			}
@@ -272,7 +272,7 @@ void SchemaConfig::save()
 TQString SchemaConfig::nameToFilename(const TQString &_name)
 {
 	TQString name = _name;
-	name = name.replace(TQRegExp("[^a-zA-Z0-9]"), "_");
+	name = name.tqreplace(TQRegExp("[^a-zA-Z0-9]"), "_");
 	return name;
 }
 
@@ -288,7 +288,7 @@ void SchemaConfig::newSchema()
 
 	TQString filename = nameToFilename(str);
 
-	if (mQueries.contains(nameToFilename(filename))) return;
+	if (mQueries.tqcontains(nameToFilename(filename))) return;
 
 	QueryItem queryitem;
 	queryitem.query = Query();
@@ -312,7 +312,7 @@ void SchemaConfig::copySchema()
 
 	TQString filename = nameToFilename(str);
 
-	if (mQueries.contains(nameToFilename(filename))) return;
+	if (mQueries.tqcontains(nameToFilename(filename))) return;
 
 	QueryItem queryitem;
 	queryitem.query = currentQuery()->query;
@@ -355,7 +355,7 @@ void SchemaConfig::editValueRegexp()
 	{
 		mRegexpEditor =
 			KParts::ComponentFactory::createInstanceFromQuery<TQDialog>(
-					"KRegExpEditor/KRegExpEditor", TQString::null, this
+					"KRegExpEditor/KRegExpEditor", TQString(), TQT_TQOBJECT(this)
 				);
 	}
 
@@ -413,7 +413,7 @@ void SchemaConfig::move(TQListViewItem *_item, TQListViewItem *, TQListViewItem
 	QueryGroupItem *afterNow = static_cast<QueryGroupItem*>(_afterNow);
 
 	QueryGroup *after, *under;
-	under = item->parent() ? item->parent()->item() : 0;
+	under = item->tqparent() ? item->tqparent()->item() : 0;
 	after = afterNow ? afterNow->item() : 0;
 
 	item->item()->move(&currentQuery()->query, under, after);
@@ -436,8 +436,8 @@ void SchemaConfig::addSibling()
 
 	// now match the action in the tree
 	QueryGroupItem *created;
-	if (item->parent())
-		created = new QueryGroupItem(item->parent(), g, item);
+	if (item->tqparent())
+		created = new QueryGroupItem(item->tqparent(), g, item);
 	else
 		created = new QueryGroupItem(item->listView(), g, item);
 
@@ -500,8 +500,8 @@ SchemaConfig::QueryItem *SchemaConfig::currentQuery()
 }
 
 
-SliceConfig::SliceConfig(TQWidget *parent, Oblique *oblique)
-	: TQWidget(parent)
+SliceConfig::SliceConfig(TQWidget *tqparent, Oblique *oblique)
+	: TQWidget(tqparent)
 {
 	mOblique = oblique;
 	(new TQVBoxLayout(this, 11, 7))->setAutoAdd(true);
@@ -539,16 +539,16 @@ class SliceListItem : public KListViewItem
 {
 	Slice *mSlice;
 public:
-	SliceListItem(KListView *parent, Slice *slice)
-		 : KListViewItem(parent, slice->name()), mSlice(slice)
+	SliceListItem(KListView *tqparent, Slice *slice)
+		 : KListViewItem(tqparent, slice->name()), mSlice(slice)
 	{
 	}
 
 	/**
 	 * new item
 	 **/
-	SliceListItem(KListView *parent)
-		 : KListViewItem(parent, i18n("New Slice")), mSlice(0)
+	SliceListItem(KListView *tqparent)
+		 : KListViewItem(tqparent, i18n("New Slice")), mSlice(0)
 	{
 	}
 
@@ -621,7 +621,7 @@ void SliceConfig::addSibling()
 void SliceConfig::removeSelf()
 {
 	SliceListItem *r = currentItem();
-	if (mAddedItems.contains(r))
+	if (mAddedItems.tqcontains(r))
 	{
 		mAddedItems.remove(r);
 	}
diff --git a/noatun-plugins/oblique/cmodule.h b/noatun-plugins/oblique/cmodule.h
index e935051..39bc7a9 100644
--- a/noatun-plugins/oblique/cmodule.h
+++ b/noatun-plugins/oblique/cmodule.h
@@ -16,9 +16,10 @@ class TQComboBox;
 class TQPushButton;
 class TQTabWidget;
 
-class SchemaConfig : public QWidget
+class SchemaConfig : public TQWidget
 {
 Q_OBJECT
+  TQ_OBJECT
 	Oblique *mOblique;
 
 	KListView *mSchemaTree;
@@ -44,7 +45,7 @@ Q_OBJECT
 	TQMap<TQString, QueryItem> mQueries;
 
 public:
-	SchemaConfig(TQWidget *parent, Oblique *oblique);
+	SchemaConfig(TQWidget *tqparent, Oblique *oblique);
 
 	Oblique *oblique() { return mOblique; }
 
@@ -81,9 +82,10 @@ private:
 
 class SliceListItem;
 
-class SliceConfig : public QWidget
+class SliceConfig : public TQWidget
 {
 Q_OBJECT
+  TQ_OBJECT
 	Oblique *mOblique;
 	KListView *mSliceList;
 	TQPushButton *mAdd, *mRemove;
@@ -91,7 +93,7 @@ Q_OBJECT
 	TQValueList<Slice*> mRemovedItems;
 
 public:
-	SliceConfig(TQWidget *parent, Oblique *oblique);
+	SliceConfig(TQWidget *tqparent, Oblique *oblique);
 	Oblique *oblique() { return mOblique; }
 
 	void reopen();
@@ -108,12 +110,13 @@ private slots:
 class Configure : public CModule
 {
 Q_OBJECT
+  TQ_OBJECT
 	TQTabWidget *tabs;
 	SchemaConfig *schema;
 	SliceConfig *slice;
 
 public:
-	Configure(Oblique *parent);
+	Configure(Oblique *tqparent);
 
 	virtual void reopen();
 	virtual void save();
diff --git a/noatun-plugins/oblique/kbuffer.cpp b/noatun-plugins/oblique/kbuffer.cpp
index f54110e..04a28fb 100644
--- a/noatun-plugins/oblique/kbuffer.cpp
+++ b/noatun-plugins/oblique/kbuffer.cpp
@@ -33,12 +33,16 @@ void KBuffer::flush(){
 }
 
 /** query buffer size */
-Q_ULONG KBuffer::size() const {
+#ifdef USE_QT4
+qint64 KBuffer::size() const {
+#else // USE_QT4
+TQ_ULONG KBuffer::size() const {
+#endif // USE_QT4
   return buf.size();
 }
 
 /** read a block of memory from buffer, advances read/write position */
-Q_LONG KBuffer::readBlock(char* data, long unsigned int maxLen) {
+TQ_LONG KBuffer::readBlock(char* data, long unsigned int maxLen) {
   int len;
   if ((long unsigned)(buf.end()-bufPos) > maxLen)
     len = maxLen;
@@ -52,7 +56,7 @@ Q_LONG KBuffer::readBlock(char* data, long unsigned int maxLen) {
 }
 
 /** write a block of memory into buffer */
-Q_LONG KBuffer::writeBlock(const char *data, long unsigned int len){
+TQ_LONG KBuffer::writeBlock(const char *data, long unsigned int len){
   int pos = bufPos-buf.begin();
   copy(data, data+len, inserter(buf,bufPos));
   bufPos = buf.begin() + pos + len;
diff --git a/noatun-plugins/oblique/kbuffer.h b/noatun-plugins/oblique/kbuffer.h
index 63e626b..0341fef 100644
--- a/noatun-plugins/oblique/kbuffer.h
+++ b/noatun-plugins/oblique/kbuffer.h
@@ -21,15 +21,19 @@ public:
   /** open a memory buffer */
   bool open(int mode);
   /** read in a block of memory */
-  Q_LONG readBlock(char* data, long unsigned int maxLen);
+  TQ_LONG readBlock(char* data, long unsigned int maxLen);
   /** query buffer size */
-  Q_ULONG size() const;
+#ifdef USE_QT4
+  qint64 size() const;
+#else // USE_QT4
+  TQ_ULONG size() const;
+#endif // USE_QT4
   /** No descriptions */
   void flush();
   /** Close buffer */
   void close();
   /** write a block of memory */
-  Q_LONG writeBlock(const char *data, long unsigned int maxLen);
+  TQ_LONG writeBlock(const char *data, long unsigned int maxLen);
   /** read a byte */
   int getch();
   /** undo last getch()
@@ -40,6 +44,12 @@ public:
   void* data() {
     return &buf[0];
   }
+
+#ifdef USE_QT4
+	virtual inline qint64 readData ( char * data, qint64 maxSize ) { return readBlock(data, maxSize); }
+	virtual inline qint64 writeData ( const char * data, qint64 maxSize ) { return writeBlock(data, maxSize); }
+#endif // USE_QT4
+
 private:
   std::vector<char> buf;
   std::vector<char>::iterator bufPos;
diff --git a/noatun-plugins/oblique/kdatacollection.cpp b/noatun-plugins/oblique/kdatacollection.cpp
index ed57aea..fc92093 100644
--- a/noatun-plugins/oblique/kdatacollection.cpp
+++ b/noatun-plugins/oblique/kdatacollection.cpp
@@ -85,7 +85,7 @@ TQStringList KDataCollection::names() const
 	{
 		TQFileInfo fi(*i);
 		TQString name = fi.fileName();
-		if (!n.contains(name))
+		if (!n.tqcontains(name))
 		{
 			total.append(name);
 		}
@@ -108,7 +108,7 @@ void KDataCollection::remove(const TQString &name)
 	}
 
 	TQStringList n = g.readListEntry(mEntry);
-	if (n.contains(name)) return;
+	if (n.tqcontains(name)) return;
 	n.append(name);
 	g.writeEntry(mEntry, n);
 }
@@ -137,7 +137,7 @@ TQString KDataCollection::saveFile(const TQString &name, bool create)
 		}
 		return s;
 	}
-	return TQString::null;
+	return TQString();
 }
 
 
diff --git a/noatun-plugins/oblique/kdbt.h b/noatun-plugins/oblique/kdbt.h
index 4ecc71a..ec3f25e 100644
--- a/noatun-plugins/oblique/kdbt.h
+++ b/noatun-plugins/oblique/kdbt.h
@@ -18,7 +18,7 @@
 template <typename T>
 class KDbt : public Dbt {
 public:
-  /* assume streaming operators on QDataStream
+  /* assume streaming operators on TQDataStream
   TQDataStream & operator>> ( TQDataStream& >>, T &);
   TQDataStream & operator<< ( TQDataStream& >>, T &);
   */
diff --git a/noatun-plugins/oblique/menu.cpp b/noatun-plugins/oblique/menu.cpp
index 3867f19..ae22592 100644
--- a/noatun-plugins/oblique/menu.cpp
+++ b/noatun-plugins/oblique/menu.cpp
@@ -7,8 +7,8 @@
 
 #include "tree.h"
 
-FileMenu::FileMenu(TQWidget *parent, Oblique *oblique, File file)
-	: KPopupMenu(parent)
+FileMenu::FileMenu(TQWidget *tqparent, Oblique *oblique, File file)
+	: KPopupMenu(tqparent)
 {
 	if (file)
 		mFiles.append(file);
@@ -20,8 +20,8 @@ FileMenu::FileMenu(TQWidget *parent, Oblique *oblique, File file)
 
 	(new SliceListAction(
 			i18n("&Slices"), oblique,
-			this, TQT_SLOT(toggleInSlice(Slice *)),
-			mFiles, this
+			TQT_TQOBJECT(this), TQT_SLOT(toggleInSlice(Slice *)),
+			mFiles, TQT_TQOBJECT(this)
 		))->plug(this);
 }
 
@@ -39,8 +39,8 @@ static void addTo(TQValueList<File> &files, TreeItem *item)
 	}
 }
 
-FileMenu::FileMenu(TQWidget *parent, Oblique *oblique, TreeItem *items)
-	: KPopupMenu(parent)
+FileMenu::FileMenu(TQWidget *tqparent, Oblique *oblique, TreeItem *items)
+	: KPopupMenu(tqparent)
 {
 	addTo(mFiles, items);
 
@@ -52,8 +52,8 @@ FileMenu::FileMenu(TQWidget *parent, Oblique *oblique, TreeItem *items)
 
 	(new SliceListAction(
 			i18n("&Slices"), oblique,
-			this, TQT_SLOT(toggleInSlice(Slice *)),
-			mFiles, this
+			TQT_TQOBJECT(this), TQT_SLOT(toggleInSlice(Slice *)),
+			mFiles,TQT_TQOBJECT(this)
 		))->plug(this);
 }
 
@@ -67,7 +67,7 @@ void FileMenu::removeFromList()
 
 void FileMenu::properties()
 {
-	new ObliquePropertiesDialog(mFiles, parentWidget());
+	new ObliquePropertiesDialog(mFiles, tqparentWidget());
 }
 
 void FileMenu::toggleInSlice(Slice *slice)
@@ -92,8 +92,8 @@ void FileMenu::toggleInSlice(Slice *slice)
 SliceListAction::SliceListAction(
 		const TQString &text, Oblique *oblique,
 		TQObject *reciever, const char *slot,
-		const TQValueList<File> &files, TQObject *parent, const char *name
-	) : KActionMenu(text, parent, name)
+		const TQValueList<File> &files, TQObject *tqparent, const char *name
+	) : KActionMenu(text, tqparent, name)
 {
 	mFiles = files;
 	mOblique = oblique;
@@ -153,8 +153,8 @@ void SliceListAction::hit(int index)
 SchemaListAction::SchemaListAction(
 		const TQString &text,
 		TQObject *reciever, const char *slot,
-		TQObject *parent, const char *name
-	) : KActionMenu(text, parent, name)
+		TQObject *tqparent, const char *name
+	) : KActionMenu(text, tqparent, name)
 {
 	mTree = 0;
 	if (reciever)
@@ -197,8 +197,8 @@ void SchemaListAction::hit(int index)
 
 
 
-ObliquePropertiesDialog::ObliquePropertiesDialog(const TQValueList<File> &files, TQWidget *parent)
-	: KPropertiesDialog(makeItems(files), parent), mFiles(files)
+ObliquePropertiesDialog::ObliquePropertiesDialog(const TQValueList<File> &files, TQWidget *tqparent)
+	: KPropertiesDialog(makeItems(files), tqparent), mFiles(files)
 {
 	connect(this, TQT_SIGNAL(propertiesClosed()), TQT_SLOT(deleteLater()));
 	connect(this, TQT_SIGNAL(applied()), TQT_SLOT(modified()));
diff --git a/noatun-plugins/oblique/menu.h b/noatun-plugins/oblique/menu.h
index da464dc..1c12fa7 100644
--- a/noatun-plugins/oblique/menu.h
+++ b/noatun-plugins/oblique/menu.h
@@ -17,14 +17,15 @@
 class FileMenu : public KPopupMenu
 {
 Q_OBJECT
+  TQ_OBJECT
 	TQValueList<File> mFiles;
 
 public:
-	FileMenu(TQWidget *parent, Oblique *oblique, File file);
+	FileMenu(TQWidget *tqparent, Oblique *oblique, File file);
 	/**
 	 * @recursively uses everything under @p files
 	 **/
-	FileMenu(TQWidget *parent, Oblique *oblique, TreeItem *files);
+	FileMenu(TQWidget *tqparent, Oblique *oblique, TreeItem *files);
 
 private slots:
 	void removeFromList();
@@ -35,6 +36,7 @@ private slots:
 class SliceListAction : public KActionMenu
 {
 Q_OBJECT
+  TQ_OBJECT
 	TQMap<int, Slice*> mIndexToSlices;
 	TQValueList<File> mFiles;
 	Oblique *mOblique;
@@ -43,7 +45,7 @@ public:
 	SliceListAction(
 			const TQString &text, Oblique *oblique,
 			TQObject *reciever, const char *slot,
-			const TQValueList<File> &files = TQValueList<File>(), TQObject *parent=0, const char *name=0
+			const TQValueList<File> &files = TQValueList<File>(), TQObject *tqparent=0, const char *name=0
 		);
 
 signals:
@@ -58,6 +60,7 @@ private slots:
 class SchemaListAction : public KActionMenu
 {
 Q_OBJECT
+  TQ_OBJECT
 	TQMap<int, TQString> mIndexToSchemas;
 	Tree *mTree;
 
@@ -65,7 +68,7 @@ public:
 	SchemaListAction(
 			const TQString &text,
 			TQObject *reciever, const char *slot,
-			TQObject *parent, const char *name
+			TQObject *tqparent, const char *name
 		);
 
 	void setTree(Tree *tree) { mTree = tree; }
@@ -82,10 +85,11 @@ private slots:
 class ObliquePropertiesDialog : public KPropertiesDialog
 {
 Q_OBJECT
+  TQ_OBJECT
 	TQValueList<File> mFiles;
 
 public:
-	ObliquePropertiesDialog(const TQValueList<File> &files, TQWidget *parent);
+	ObliquePropertiesDialog(const TQValueList<File> &files, TQWidget *tqparent);
 
 private:
 	static KFileItemList makeItems(const TQValueList<File> &files);
diff --git a/noatun-plugins/oblique/oblique.cpp b/noatun-plugins/oblique/oblique.cpp
index 234833a..e297e2b 100644
--- a/noatun-plugins/oblique/oblique.cpp
+++ b/noatun-plugins/oblique/oblique.cpp
@@ -215,7 +215,7 @@ void Loader::loadItemsDeferred()
 			return;
 		}
 
-		File f = mBase->find(mDeferredLoaderAt);
+		File f = mBase->tqfind(mDeferredLoaderAt);
 
 		if (f)
 		{
diff --git a/noatun-plugins/oblique/oblique.h b/noatun-plugins/oblique/oblique.h
index f7e6bc8..8755e55 100644
--- a/noatun-plugins/oblique/oblique.h
+++ b/noatun-plugins/oblique/oblique.h
@@ -1,8 +1,8 @@
 // Copyright (c) 2003-2005 Charles Samuels <charles@kde.org>
 // See the file COPYING for redistribution terms.
 
-#ifndef OBLIQUE_H
-#define OBLIQUE_H
+#ifndef OBLITQUE_H
+#define OBLITQUE_H
 
 #include <noatun/playlist.h>
 #include <noatun/plugin.h>
@@ -27,6 +27,7 @@ namespace KIO
 class Oblique : public Playlist, public Plugin
 {
 Q_OBJECT
+  TQ_OBJECT
 	View *mView;
 	Base *mBase;
 	Selector *mSelector;
@@ -86,9 +87,10 @@ private slots:
 /**
  * loads the database into a Tree
  **/
-class Loader : public QObject
+class Loader : public TQObject
 {
 Q_OBJECT
+  TQ_OBJECT
 	// the id of the next file to load
 	FileId mDeferredLoaderAt;
 	Tree *mTree;
@@ -109,9 +111,10 @@ private slots:
  * emits @ref done() when finished so you
  * can delete it
  **/
-class DirectoryAdder : public QObject
+class DirectoryAdder : public TQObject
 {
 	Q_OBJECT
+  TQ_OBJECT
 	Oblique *mOblique;
 	KURL::List pendingAddDirectories;
 	KURL::List::Iterator lastAddedSubDirectory;
diff --git a/noatun-plugins/oblique/query.cpp b/noatun-plugins/oblique/query.cpp
index 8c85b59..0727ca6 100644
--- a/noatun-plugins/oblique/query.cpp
+++ b/noatun-plugins/oblique/query.cpp
@@ -171,7 +171,7 @@ TQString QueryGroup::presentation(const File &file) const
 			uint len=counter.cap(1).length()-1;
 
 			// and half them, and remove one more
-			format.replace(start-1, len/2+1, "");
+			format.tqreplace(start-1, len/2+1, "");
 			start=start-1+len/2+find.cap(1).length()+3;
 			continue;
 		}
@@ -186,7 +186,7 @@ TQString QueryGroup::presentation(const File &file) const
 			uint len=counter.cap(1).length();
 
 			// and half them
-			format.replace(start, len/2, "");
+			format.tqreplace(start, len/2, "");
 			start=start+len/2;
 		}
 
@@ -250,12 +250,12 @@ TQString QueryGroup::presentation(const File &file) const
 		if (propval.length())
 		{
 			propval = prefix+propval+suffix;
-			format.replace(start, i+2, propval);
+			format.tqreplace(start, i+2, propval);
 			start += propval.length();
 		}
 		else
 		{
-			format.replace(start, i+2, "");
+			format.tqreplace(start, i+2, "");
 		}
 	}
 	return format;
@@ -283,10 +283,10 @@ Query &Query::operator =(const Query &copy)
 	if (&copy == this) return *this;
 	delete mGroupFirst;
 	mGroupFirst=0;
-	if (const QueryGroup *parent = copy.firstChild())
+	if (const QueryGroup *tqparent = copy.firstChild())
 	{
-		mGroupFirst = new QueryGroup(*parent);
-		deepCopy(parent->firstChild(), mGroupFirst);
+		mGroupFirst = new QueryGroup(*tqparent);
+		deepCopy(tqparent->firstChild(), mGroupFirst);
 	}
 	return *this;
 }
@@ -321,7 +321,7 @@ void Query::clear()
 TQString Query::load(const TQString &filename)
 {
 	TQFile file(filename);
-	unless (file.open(IO_ReadOnly)) return TQString::null;
+	unless (file.open(IO_ReadOnly)) return TQString();
 
 	TQDomDocument doc;
 	doc.setContent(&file);
@@ -346,7 +346,7 @@ TQString Query::load(TQDomElement element)
 	}
 	else
 	{
-		return TQString::null;
+		return TQString();
 	}
 
 	// for internationalization:
@@ -383,7 +383,7 @@ void Query::save(const TQString &name, const TQString &filename)
 	// scourge elimination
 	TQString data = doc.toString();
 	TQString old = data;
-	while (data.replace(TQRegExp("([\n\r]+)(\t*) "), "\\1\\2\t") != old)
+	while (data.tqreplace(TQRegExp("([\n\r]+)(\t*) "), "\\1\\2\t") != old)
 	{
 		old = data;
 	}
@@ -422,8 +422,8 @@ static void dump(QueryGroup *item, int depth)
 	{
 		for (int d = 0; d < depth; d++)
 			std::cerr << "    ";
-		std::cerr << "prop: " << item->propertyName().utf8() << " pres: "
-			<< item->presentation().utf8() << std::endl;
+		std::cerr << "prop: " << item->propertyName().utf8().data() << " pres: "
+			<< item->presentation().utf8().data() << std::endl;
 		dump(item->firstChild(), depth+1);
 
 	} while ((item = item->nextSibling()));
@@ -438,17 +438,17 @@ void Query::dump()
 
 
 
-void Query::loadGroup(TQDomElement element, QueryGroup *parent)
+void Query::loadGroup(TQDomElement element, QueryGroup *tqparent)
 {
 	TQDomNode node = element.firstChild();
 
 	QueryGroup *group = new QueryGroup;
-	if (parent)
+	if (tqparent)
 	{
-		if (QueryGroup *last = parent->lastChild())
+		if (QueryGroup *last = tqparent->lastChild())
 			last->setNextSibling(group);
 		else
-			parent->setFirstChild(group);
+			tqparent->setFirstChild(group);
 	}
 	else
 	{
@@ -487,7 +487,7 @@ void Query::loadGroup(TQDomElement element, QueryGroup *parent)
 					group->setOption(QueryGroup::Playable, true);
 				else if (e.tagName().lower() == "playable")
 					group->setOption(QueryGroup::Playable, true);
-				else if (e.tagName().lower() == "childrenvisible")
+				else if (e.tagName().lower() == "tqchildrenvisible")
 					group->setOption(QueryGroup::ChildrenVisible, true);
 				else if (e.tagName().lower() == "autoopen")
 					group->setOption(QueryGroup::AutoOpen, true);
@@ -500,11 +500,11 @@ void Query::loadGroup(TQDomElement element, QueryGroup *parent)
 	}
 }
 
-void Query::saveGroup(TQDomElement &parent, QueryGroup *group)
+void Query::saveGroup(TQDomElement &tqparent, QueryGroup *group)
 {
-	TQDomDocument doc = parent.ownerDocument();
+	TQDomDocument doc = tqparent.ownerDocument();
 	TQDomElement element = doc.createElement("group");
-	parent.appendChild(element);
+	tqparent.appendChild(element);
 
 	TQDomElement childe;
 	TQDomText childtext;
@@ -534,7 +534,7 @@ void Query::saveGroup(TQDomElement &parent, QueryGroup *group)
 		if (group->option(QueryGroup::Playable))
 			childe.appendChild(doc.createElement("playable"));
 		if (group->option(QueryGroup::ChildrenVisible))
-			childe.appendChild(doc.createElement("childrenvisible"));
+			childe.appendChild(doc.createElement("tqchildrenvisible"));
 		if (group->option(QueryGroup::AutoOpen))
 			childe.appendChild(doc.createElement("autoopen"));
 	}
diff --git a/noatun-plugins/oblique/query.h b/noatun-plugins/oblique/query.h
index e8a8d23..60478ff 100644
--- a/noatun-plugins/oblique/query.h
+++ b/noatun-plugins/oblique/query.h
@@ -1,8 +1,8 @@
 // Copyright (c) 2003 Charles Samuels <charles@kde.org>
 // See the file COPYING for redistribution terms.
 
-#ifndef QUERY_H
-#define QUERY_H
+#ifndef TQUERY_H
+#define TQUERY_H
 
 #include "base.h"
 
@@ -99,7 +99,7 @@ private:
 	 **/
 	TQString fuzzify(const TQString &str) const;
 	/**
-	 * @returns the previous or parent of this item (slow)
+	 * @returns the previous or tqparent of this item (slow)
 	 **/
 	QueryGroup *previous(Query *query);
 	QueryGroup *previous(QueryGroup *startWith);
@@ -160,8 +160,8 @@ public:
 	TQString dbname(Base *base);
 
 private:
-	void loadGroup(TQDomElement element, QueryGroup *parent=0);
-	void saveGroup(TQDomElement &parent, QueryGroup *group);
+	void loadGroup(TQDomElement element, QueryGroup *tqparent=0);
+	void saveGroup(TQDomElement &tqparent, QueryGroup *group);
 
 	void deepCopy(const QueryGroup *from, QueryGroup *toParent);
 	
diff --git a/noatun-plugins/oblique/selector.cpp b/noatun-plugins/oblique/selector.cpp
index f28c333..004cf91 100644
--- a/noatun-plugins/oblique/selector.cpp
+++ b/noatun-plugins/oblique/selector.cpp
@@ -129,7 +129,7 @@ Item *SequentialSelector::current()
 
 void SequentialSelector::setCurrent(const Item &item)
 {
-	TreeItem *current = mTree->find(item.itemFile());
+	TreeItem *current = mTree->tqfind(item.itemFile());
 	setCurrent(current);
 }
 
@@ -210,7 +210,7 @@ Item *RandomSelector::current()
 
 void RandomSelector::setCurrent(const Item &item)
 {
-	setCurrent(mTree->find(item.itemFile()), 0);
+	setCurrent(mTree->tqfind(item.itemFile()), 0);
 }
 
 void RandomSelector::setCurrent(TreeItem *item, TreeItem *previous)
diff --git a/noatun-plugins/oblique/tree.cpp b/noatun-plugins/oblique/tree.cpp
index 0087b99..430d4cf 100644
--- a/noatun-plugins/oblique/tree.cpp
+++ b/noatun-plugins/oblique/tree.cpp
@@ -76,7 +76,7 @@ static void treeItemSort(TreeItem **begin, TreeItem **end)
 
 static void treeItemSort(TreeItem *first)
 {
-	const int count = first->parent() ? first->parent()->childCount() : first->listView()->childCount();
+	const int count = first->tqparent() ? first->tqparent()->childCount() : first->listView()->childCount();
 	if (count < 2) return;
 	
 	Query *q = first->tree()->query();
@@ -149,28 +149,28 @@ inline static void sortify(T *item)
 }
 
 
-TreeItem::TreeItem(Tree *parent, QueryGroup *group, const File &file, const TQString &p)
-	: KListViewItem(parent, p), mGroup(group), mUserOpened(false), mHidden(false)
+TreeItem::TreeItem(Tree *tqparent, QueryGroup *group, const File &file, const TQString &p)
+	: KListViewItem(tqparent, p), mGroup(group), mUserOpened(false), mHidden(false)
 {
 	if (group->option(QueryGroup::Playable))
 	{
 		if (mFile = file)
-			parent->mPlayableItemCount++;
+			tqparent->mPlayableItemCount++;
 	}
 	
-	sortify(parent);
+	sortify(tqparent);
 }
 
-TreeItem::TreeItem(TreeItem *parent, QueryGroup *group, const File &file, const TQString &p)
-	: KListViewItem(parent, p), mGroup(group), mUserOpened(false), mHidden(false)
+TreeItem::TreeItem(TreeItem *tqparent, QueryGroup *group, const File &file, const TQString &p)
+	: KListViewItem(tqparent, p), mGroup(group), mUserOpened(false), mHidden(false)
 {
 	if (group->option(QueryGroup::Playable))
 	{
 		if (mFile = file)
-			parent->tree()->mPlayableItemCount++;
+			tqparent->tree()->mPlayableItemCount++;
 	}
 	
-	sortify(parent);
+	sortify(tqparent);
 }
 
 TreeItem::~TreeItem()
@@ -180,7 +180,7 @@ TreeItem::~TreeItem()
 		tree()->mPlayableItemCount--;
 	}
 
-	// I have to remove my children, because they need their parent
+	// I have to remove my tqchildren, because they need their tqparent
 	// in tact for the below code
 	while (TreeItem *c = firstChild())
 		delete c;
@@ -258,14 +258,14 @@ TQString TreeItem::presentation() const
 	return text(0);
 }
 
-TreeItem *TreeItem::find(File item)
+TreeItem *TreeItem::tqfind(File item)
 {
 	TreeItem *i = firstChild();
 	while (i)
 	{
 		if (i->file() == item) return i;
 
-		TreeItem *found = i->find(item);
+		TreeItem *found = i->tqfind(item);
 		if (found and found->playable()) return found;
 		i = i->nextSibling();
 	}
@@ -297,7 +297,7 @@ void TreeItem::paintCell(TQPainter *p, const TQColorGroup &cg, int column, int w
 	}
 
 	TQColorGroup newcg(cg);
-	if (parent() && parent()->isOpen() && !parent()->mUserOpened)
+	if (tqparent() && tqparent()->isOpen() && !tqparent()->mUserOpened)
 	{
 		// slow, but not often used
 		TQColor text = newcg.text();
@@ -338,8 +338,8 @@ void TreeItem::autoExpand()
 
 void TreeItem::forceAutoExpand()
 {
-	if (parent())
-		parent()->forceAutoExpand();
+	if (tqparent())
+		tqparent()->forceAutoExpand();
 
 	if (!mUserOpened)
 		tree()->addAutoExpanded(this);
@@ -352,7 +352,7 @@ bool TreeItem::hideIfNoMatch(const TQString &match)
 	{
 		if (match.length())
 		{
-			if (!text(0).contains(match, false))
+			if (!text(0).tqcontains(match, false))
 			{
 				setHidden(true);
 				return false;
@@ -367,7 +367,7 @@ bool TreeItem::hideIfNoMatch(const TQString &match)
 
 		if (match.length())
 		{
-			visible = text(0).contains(match, false);
+			visible = text(0).tqcontains(match, false);
 		}
 
 		if (visible)
@@ -419,7 +419,7 @@ TreeItem *TreeItem::next()
 		{
 			if (upYours->nextSibling())
 				return upYours->nextSibling();
-			upYours = upYours->parent();
+			upYours = upYours->tqparent();
 		} while (upYours);
 	}
 	return 0;
@@ -431,8 +431,8 @@ TreeItem *TreeItem::next()
 
 
 
-Tree::Tree(Oblique *oblique, TQWidget *parent)
-	: KListView(parent), mOblique(oblique), mAutoExpanding(0)
+Tree::Tree(Oblique *oblique, TQWidget *tqparent)
+	: KListView(tqparent), mOblique(oblique), mAutoExpanding(0)
 {
 	mCurrent = 0;
 	lastMenu =0;
@@ -503,16 +503,16 @@ void Tree::clear()
 	KListView::clear();
 }
 
-void Tree::movableDropEvent (TQListViewItem* parent, TQListViewItem* afterme)
+void Tree::movableDropEvent (TQListViewItem* tqparent, TQListViewItem* afterme)
 {
 	TQPtrList<TQListViewItem> items = selectedItems(true);
 	for (TQPtrList<TQListViewItem>::Iterator i(items.begin()); *i; ++i)
 	{
-		if ((*i)->parent() != parent)
+		if ((*i)->tqparent() != tqparent)
 			return;
 	}
 	
-	KListView::movableDropEvent(parent, afterme);
+	KListView::movableDropEvent(tqparent, afterme);
 }
 
 
@@ -535,7 +535,7 @@ void Tree::dropped(TQPtrList<TQListViewItem> &items, TQPtrList<TQListViewItem> &
 TreeItem *Tree::firstChild()
 	{ return static_cast<TreeItem*>(KListView::firstChild()); }
 
-TreeItem *Tree::find(File item)
+TreeItem *Tree::tqfind(File item)
 {
 	TreeItem *i = firstChild();
 
@@ -543,7 +543,7 @@ TreeItem *Tree::find(File item)
 	{
 		if (i->file() == item) return i;
 
-		TreeItem *found = i->find(item);
+		TreeItem *found = i->tqfind(item);
 		if (found) return found;
 
 		i = i->nextSibling();
@@ -551,19 +551,19 @@ TreeItem *Tree::find(File item)
 	return i;
 }
 
-void Tree::insert(TreeItem *replace, File file)
+void Tree::insert(TreeItem *tqreplace, File file)
 {
-	TreeItem *created = collate(replace, file);
-	if (mCurrent == replace)
+	TreeItem *created = collate(tqreplace, file);
+	if (mCurrent == tqreplace)
 	{
 		mCurrent = created;
-		repaintItem(created);
-		if (isSelected(replace))
+		tqrepaintItem(created);
+		if (isSelected(tqreplace))
 			setSelected(created, true);
 	}
-	if (created != replace)
+	if (created != tqreplace)
 	{
-		delete replace;
+		delete tqreplace;
 	}
 }
 
@@ -592,7 +592,7 @@ void Tree::checkRemove(Slice *slice, File f)
 
 void Tree::update(File file)
 {
-	if (TreeItem *item = find(file))
+	if (TreeItem *item = tqfind(file))
 	{
 		insert(item, file);
 	}
@@ -624,8 +624,8 @@ void Tree::setCurrent(TreeItem *cur)
 	mCurrent = cur;
 	TQPtrList<TreeItem> oldAutoExpanded = mAutoExpanded;
 	mAutoExpanded.clear();
-	repaintItem(old);
-	repaintItem(cur);
+	tqrepaintItem(old);
+	tqrepaintItem(cur);
 	if (cur) cur->autoExpand();
 
 	// do an anti-intersection on oldAutoUpdated and the new mAutoExpanded
@@ -750,36 +750,36 @@ TreeItem *Tree::collate(TreeItem *fix, QueryGroup *group, const File &file, Tree
 
 TreeItem *Tree::node(TreeItem *fix, QueryGroup *group, const File &file, TreeItem *childOf)
 {
-	// search childOf's immediate children
-	TreeItem *children;
+	// search childOf's immediate tqchildren
+	TreeItem *tqchildren;
 	if (childOf)
-		children = childOf->firstChild();
+		tqchildren = childOf->firstChild();
 	else
-		children = firstChild();
+		tqchildren = firstChild();
 
 	TQString presentation = group->presentation(file);
-	while (children)
+	while (tqchildren)
 	{
 		// merging would be done here
 		bool matches=false;
 		if (group->fuzzyness(QueryGroup::Case))
 		{
-			matches = (children->text(0).lower() == presentation.lower());
+			matches = (tqchildren->text(0).lower() == presentation.lower());
 		}
 		else
 		{
-			matches = (children->text(0) == presentation);
+			matches = (tqchildren->text(0) == presentation);
 		}
 
-		matches = matches && !children->group()->option(QueryGroup::Playable);
+		matches = matches && !tqchildren->group()->option(QueryGroup::Playable);
 
 		if (matches)
 		{
-			children->setFile(File());
-			return children;
+			tqchildren->setFile(File());
+			return tqchildren;
 		}
 
-		children = children->nextSibling();
+		tqchildren = tqchildren->nextSibling();
 	}
 
 	TreeItem *item;
@@ -790,7 +790,7 @@ TreeItem *Tree::node(TreeItem *fix, QueryGroup *group, const File &file, TreeIte
 	else if (fix)
 	{
 		item = fix;
-		if (fix->parent() != childOf)
+		if (fix->tqparent() != childOf)
 			moveItem(fix, childOf, 0);
 		item->setText(0, presentation);
 	}
diff --git a/noatun-plugins/oblique/tree.h b/noatun-plugins/oblique/tree.h
index f059931..8f92f2a 100644
--- a/noatun-plugins/oblique/tree.h
+++ b/noatun-plugins/oblique/tree.h
@@ -23,15 +23,15 @@ class TreeItem : public KListViewItem
 	bool mHidden:1;
 
 public:
-	TreeItem(Tree *parent, QueryGroup *group, const File &file, const TQString &p=0);
-	TreeItem(TreeItem *parent, QueryGroup *group, const File &file, const TQString &p=0);
+	TreeItem(Tree *tqparent, QueryGroup *group, const File &file, const TQString &p=0);
+	TreeItem(TreeItem *tqparent, QueryGroup *group, const File &file, const TQString &p=0);
 	~TreeItem();
 
 	QueryGroup *group() { return mGroup; }
 	const QueryGroup *group() const { return mGroup; }
 	void setGroup(QueryGroup *group) { mGroup = group; }
 
-	TreeItem *parent() { return static_cast<TreeItem*>(KListViewItem::parent()); }
+	TreeItem *tqparent() { return static_cast<TreeItem*>(KListViewItem::tqparent()); }
 	Tree *tree();
 	TreeItem *itemBelow() { return static_cast<TreeItem*>(KListViewItem::itemBelow()); }
 	TreeItem *firstChild() { return static_cast<TreeItem*>(KListViewItem::firstChild()); }
@@ -45,13 +45,13 @@ public:
 
 	void setOpen(bool o);
 
-	TreeItem *find(File item);
+	TreeItem *tqfind(File item);
 
 	bool playable() const;
 
 	/**
 	 * get the next item that is playable logically.
-	 * that is, if it has a File, and its parent hasn't a
+	 * that is, if it has a File, and its tqparent hasn't a
 	 * File
 	 **/
 	TreeItem *nextPlayable();
@@ -61,8 +61,8 @@ public:
 	virtual int compare(TQListViewItem * i, int col, bool) const;
 
 	/**
-	 * open my parents so that I'm visible, if I'm playing or
-	 * close my parents if I'm not playing, and the user
+	 * open my tqparents so that I'm visible, if I'm playing or
+	 * close my tqparents if I'm not playing, and the user
 	 * didn't open
 	 **/
 	void autoExpand();
@@ -86,6 +86,7 @@ class Loader;
 class Tree : public KListView
 {
 Q_OBJECT
+  TQ_OBJECT
 	Oblique *mOblique;
 
 	Query mQuery;
@@ -103,10 +104,10 @@ Q_OBJECT
 	Loader *mLoader;
 
 public:
-	Tree(Oblique *oblique, TQWidget *parent=0);
+	Tree(Oblique *oblique, TQWidget *tqparent=0);
 	~Tree();
 	TreeItem *firstChild();
-	TreeItem *find(File item);
+	TreeItem *tqfind(File item);
 	TreeItem *current() { return mCurrent; }
 	Query *query() { return &mQuery; }
 	Oblique *oblique() { return mOblique; }
@@ -129,10 +130,10 @@ public:
 
 protected:
 	virtual TQDragObject *dragObject();
-	void movableDropEvent(TQListViewItem* parent, TQListViewItem* afterme);
+	void movableDropEvent(TQListViewItem* tqparent, TQListViewItem* afterme);
 
 public slots:
-	void insert(TreeItem *replace, File file);
+	void insert(TreeItem *tqreplace, File file);
 	void insert(File file);
 	void remove(File file);
 	void update(File file);
@@ -181,7 +182,7 @@ private:
 	TreeItem *node(TreeItem *fix, QueryGroup *group, const File &file, TreeItem *childOf);
 
 	/**
-	 * remove the siblings and children of the treeitem
+	 * remove the siblings and tqchildren of the treeitem
 	 **/
 	void remove(TreeItem *, const File &file);
 
diff --git a/noatun-plugins/oblique/view.cpp b/noatun-plugins/oblique/view.cpp
index 8c7f81d..91d07c9 100644
--- a/noatun-plugins/oblique/view.cpp
+++ b/noatun-plugins/oblique/view.cpp
@@ -20,8 +20,8 @@
 class TabWidget : public KTabWidget
 {
 public:
-	TabWidget(TQWidget *parent)
-		: KTabWidget(parent)
+	TabWidget(TQWidget *tqparent)
+		: KTabWidget(tqparent)
 	{
 	}
 public:
@@ -42,9 +42,9 @@ View::View(Oblique *oblique)
 	setCentralWidget(mTabs);
 
 	KAction *ac;
-	ac = new KAction(i18n("Add &Files..."), "queue", 0, this, TQT_SLOT(addFiles()), actionCollection(), "add_files");
+	ac = new KAction(i18n("Add &Files..."), "queue", 0, TQT_TQOBJECT(this), TQT_SLOT(addFiles()), actionCollection(), "add_files");
 	ac->setWhatsThis(i18n("Add a reference to a media file on disk to this collection."));
-	ac = new KAction(i18n("Add Fol&ders..."), "folder", 0, this, TQT_SLOT(addDirectory()), actionCollection(), "add_dir");
+	ac = new KAction(i18n("Add Fol&ders..."), "folder", 0, TQT_TQOBJECT(this), TQT_SLOT(addDirectory()), actionCollection(), "add_dir");
 	
 	
 //	ac = new KAction(i18n("&Reload"), "reload", 0, oblique, TQT_SLOT(reload()), actionCollection(), "reload");
@@ -52,31 +52,31 @@ View::View(Oblique *oblique)
 
 	ac = new SliceListAction(
 			i18n("&Slices"), oblique,
-			this, TQT_SLOT(use(Slice*)), TQValueList<File>(), actionCollection(), "slices"
+			TQT_TQOBJECT(this), TQT_SLOT(use(Slice*)), TQValueList<File>(), actionCollection(), "slices"
 		);
 	ac->setWhatsThis(i18n("Select a sub-collection to display"));
 
 	mSchemaListAction = new SchemaListAction(
-			i18n("&Schemas"), this, TQT_SLOT(setSchema(const TQString&)), actionCollection(), "schemas"
+			i18n("&Schemas"), TQT_TQOBJECT(this), TQT_SLOT(setSchema(const TQString&)), actionCollection(), "schemas"
 		);
 	mSchemaListAction->setWhatsThis(i18n("Select a schema to use to collate the tree."));
 
 	ac = new KAction(
-			i18n("&New Tab"), "tab_new", "CTRL+SHIFT+N;CTRL+T", this, TQT_SLOT(addTab()),
+			i18n("&New Tab"), "tab_new", "CTRL+SHIFT+N;CTRL+T", TQT_TQOBJECT(this), TQT_SLOT(addTab()),
 			actionCollection(), "newtab"
 		);
 
 	mRemoveTabAction = new KAction(
-			i18n("&Close Current Tab"), "tab_remove", CTRL+Key_W, this, TQT_SLOT(removeTab()),
+			i18n("&Close Current Tab"), "tab_remove", CTRL+Key_W, TQT_TQOBJECT(this), TQT_SLOT(removeTab()),
 			actionCollection(), "removecurrenttab"
 		);
 
 	{
 		TQLabel *l = new TQLabel(i18n("&Jump:"), 0, "kde toolbar widget");
-		l->setBackgroundMode( Qt::PaletteButton );
-		l->setAlignment(
-				(TQApplication::reverseLayout() ? Qt::AlignRight : Qt::AlignLeft) |
-					Qt::AlignVCenter | Qt::ShowPrefix
+		l->setBackgroundMode( TQt::PaletteButton );
+		l->tqsetAlignment(
+				(TQApplication::reverseLayout() ? TQt::AlignRight : TQt::AlignLeft) |
+					TQt::AlignVCenter | TQt::ShowPrefix
 			);
 		l->adjustSize();
 		new KWidgetAction(l, i18n("&Jump:"), KShortcut(ALT + Key_J), 0, 0, actionCollection(), "jump_label");
@@ -87,7 +87,7 @@ View::View(Oblique *oblique)
 		connect(jumpAction->lineEdit(), TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(jumpTextChanged(const TQString&)));
 	}
 
-	KStdAction::configureToolbars(this, TQT_SLOT(configureToolBars()), actionCollection());
+	KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(configureToolBars()), actionCollection());
 
 	applyMainWindowSettings(KGlobal::config(), "Oblique View");
 	createGUI("obliqueui.rc");
@@ -138,7 +138,7 @@ View::~View()
 		int slice = tree->slice()->id();
 		TQString query = tree->fileOfQuery();
 
-		TQString t = TQString("%1:%2").arg(slice).arg(query);
+		TQString t = TQString("%1:%2").tqarg(slice).tqarg(query);
 		tabids.append(t);
 	}
 	
@@ -241,8 +241,8 @@ void View::use(Slice *s)
 
 
 
-LineEditAction::LineEditAction(const TQString &text, const TQObject *reciever, const char *slot, KActionCollection *parent, const char *name)
-	: KWidgetAction(new KLineEdit(0), text, KShortcut(0), reciever, slot, parent, name)
+LineEditAction::LineEditAction(const TQString &text, const TQObject *reciever, const char *slot, KActionCollection *tqparent, const char *name)
+	: KWidgetAction(new KLineEdit(0), text, KShortcut(0), reciever, slot, tqparent, name)
 {
 	setAutoSized(true);
 }
diff --git a/noatun-plugins/oblique/view.h b/noatun-plugins/oblique/view.h
index bf216ea..4277d06 100644
--- a/noatun-plugins/oblique/view.h
+++ b/noatun-plugins/oblique/view.h
@@ -16,6 +16,7 @@ class TabWidget;
 class View : public KMainWindow
 {
 Q_OBJECT
+  TQ_OBJECT
 	Oblique *mOblique;
 	Tree *mTree;
 	TQValueList<Tree*> mTrees;
@@ -59,8 +60,9 @@ protected:
 class LineEditAction : public KWidgetAction
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
-	LineEditAction(const TQString &text, const TQObject *reciever, const char *slot, KActionCollection *parent, const char *name);
+	LineEditAction(const TQString &text, const TQObject *reciever, const char *slot, KActionCollection *tqparent, const char *name);
 
 	KLineEdit *widget() { return static_cast<KLineEdit*>(KWidgetAction::widget()); }
 	KLineEdit *lineEdit() { return widget(); }