5 files changed, 22 insertions, 22 deletions

diff --git a/noatun-plugins/oblique/cmodule.cpp b/noatun-plugins/oblique/cmodule.cpp
index a43f0a2..f4ac917 100644
--- a/noatun-plugins/oblique/cmodule.cpp
+++ b/noatun-plugins/oblique/cmodule.cpp
@@ -22,7 +22,7 @@
 #include <tqfileinfo.h>
 #include <tqtooltip.h>
 #include <tqpushbutton.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqcombobox.h>
 #include <tqwhatsthis.h>
 #include <tqtabwidget.h>
@@ -36,9 +36,9 @@ SchemaConfig::SchemaConfig(TQWidget *parent, Oblique *oblique)
 	mRegexpEditor=0;
 
 	{
-		TQVBoxLayout *tqlayout = new TQVBoxLayout(this, 11, 7);
-		tqlayout->setAutoAdd(true);
-		tqlayout->setSpacing(7);
+		TQVBoxLayout *layout = new TQVBoxLayout(this, 11, 7);
+		layout->setAutoAdd(true);
+		layout->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 tqchildren become direct tqchildren of this node's parent"));
+			TQWhatsThis::add(mOptionChildrenVisible, i18n("Don't create this node, this nodes children become direct children of this node's parent"));
 			connect(mOptionChildrenVisible, TQT_SIGNAL(toggled(bool)), TQT_SLOT(updateCurrent()));
 
 			mOptionAutoOpen = new TQCheckBox(i18n("Auto &open"), groupbox);
diff --git a/noatun-plugins/oblique/query.cpp b/noatun-plugins/oblique/query.cpp
index d53437e..34ebe72 100644
--- a/noatun-plugins/oblique/query.cpp
+++ b/noatun-plugins/oblique/query.cpp
@@ -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() == "tqchildrenvisible")
+				else if (e.tagName().lower() == "childrenvisible")
 					group->setOption(QueryGroup::ChildrenVisible, true);
 				else if (e.tagName().lower() == "autoopen")
 					group->setOption(QueryGroup::AutoOpen, true);
@@ -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("tqchildrenvisible"));
+			childe.appendChild(doc.createElement("childrenvisible"));
 		if (group->option(QueryGroup::AutoOpen))
 			childe.appendChild(doc.createElement("autoopen"));
 	}
diff --git a/noatun-plugins/oblique/tree.cpp b/noatun-plugins/oblique/tree.cpp
index 7f3415c..0087b99 100644
--- a/noatun-plugins/oblique/tree.cpp
+++ b/noatun-plugins/oblique/tree.cpp
@@ -180,7 +180,7 @@ TreeItem::~TreeItem()
 		tree()->mPlayableItemCount--;
 	}
 
-	// I have to remove my tqchildren, because they need their parent
+	// I have to remove my children, because they need their parent
 	// in tact for the below code
 	while (TreeItem *c = firstChild())
 		delete c;
@@ -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 tqchildren
-	TreeItem *tqchildren;
+	// search childOf's immediate children
+	TreeItem *children;
 	if (childOf)
-		tqchildren = childOf->firstChild();
+		children = childOf->firstChild();
 	else
-		tqchildren = firstChild();
+		children = firstChild();
 
 	TQString presentation = group->presentation(file);
-	while (tqchildren)
+	while (children)
 	{
 		// merging would be done here
 		bool matches=false;
 		if (group->fuzzyness(QueryGroup::Case))
 		{
-			matches = (tqchildren->text(0).lower() == presentation.lower());
+			matches = (children->text(0).lower() == presentation.lower());
 		}
 		else
 		{
-			matches = (tqchildren->text(0) == presentation);
+			matches = (children->text(0) == presentation);
 		}
 
-		matches = matches && !tqchildren->group()->option(QueryGroup::Playable);
+		matches = matches && !children->group()->option(QueryGroup::Playable);
 
 		if (matches)
 		{
-			tqchildren->setFile(File());
-			return tqchildren;
+			children->setFile(File());
+			return children;
 		}
 
-		tqchildren = tqchildren->nextSibling();
+		children = children->nextSibling();
 	}
 
 	TreeItem *item;
diff --git a/noatun-plugins/oblique/tree.h b/noatun-plugins/oblique/tree.h
index c8e545e..4e5ca83 100644
--- a/noatun-plugins/oblique/tree.h
+++ b/noatun-plugins/oblique/tree.h
@@ -182,7 +182,7 @@ private:
 	TreeItem *node(TreeItem *fix, QueryGroup *group, const File &file, TreeItem *childOf);
 
 	/**
-	 * remove the siblings and tqchildren of the treeitem
+	 * remove the siblings and children of the treeitem
 	 **/
 	void remove(TreeItem *, const File &file);
 
diff --git a/noatun-plugins/oblique/view.cpp b/noatun-plugins/oblique/view.cpp
index 5f32b4d..073873c 100644
--- a/noatun-plugins/oblique/view.cpp
+++ b/noatun-plugins/oblique/view.cpp
@@ -74,7 +74,7 @@ View::View(Oblique *oblique)
 	{
 		TQLabel *l = new TQLabel(i18n("&Jump:"), 0, "kde toolbar widget");
 		l->setBackgroundMode( TQt::PaletteButton );
-		l->tqsetAlignment(
+		l->setAlignment(
 				(TQApplication::reverseLayout() ? TQt::AlignRight : TQt::AlignLeft) |
 					TQt::AlignVCenter | TQt::ShowPrefix
 			);
@@ -138,7 +138,7 @@ View::~View()
 		int slice = tree->slice()->id();
 		TQString query = tree->fileOfQuery();
 
-		TQString t = TQString("%1:%2").tqarg(slice).tqarg(query);
+		TQString t = TQString("%1:%2").arg(slice).arg(query);
 		tabids.append(t);
 	}