rename the following methods:

tqparent parent
tqmask mask


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

10 files changed, 82 insertions, 82 deletions

diff --git a/noatun-plugins/oblique/cmodule.cpp b/noatun-plugins/oblique/cmodule.cpp
index d97c21f..a43f0a2 100644
--- a/noatun-plugins/oblique/cmodule.cpp
+++ b/noatun-plugins/oblique/cmodule.cpp
@@ -28,8 +28,8 @@
 #include <tqtabwidget.h>
 #include <tqheader.h>
 
-SchemaConfig::SchemaConfig(TQWidget *tqparent, Oblique *oblique)
-	: TQWidget(tqparent)
+SchemaConfig::SchemaConfig(TQWidget *parent, Oblique *oblique)
+	: TQWidget(parent)
 {
 	mOblique = oblique;
 	mIgnore = true;
@@ -159,7 +159,7 @@ SchemaConfig::SchemaConfig(TQWidget *tqparent, 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 tqparent"));
+			TQWhatsThis::add(mOptionChildrenVisible, i18n("Don't create this node, this nodes tqchildren become direct tqchildren of this node's parent"));
 			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 *tqparent, QueryGroup *group, QueryGroupItem *after=0)
-		: KListViewItem(tqparent, after)
+	QueryGroupItem(QueryGroupItem *parent, QueryGroup *group, QueryGroupItem *after=0)
+		: KListViewItem(parent, after)
 	{
 		init(group);
 	}
 
-	QueryGroupItem(KListView *tqparent, QueryGroup *group, QueryGroupItem *after=0)
-		: KListViewItem(tqparent, after)
+	QueryGroupItem(KListView *parent, QueryGroup *group, QueryGroupItem *after=0)
+		: KListViewItem(parent, after)
 	{
 		init(group);
 	}
@@ -198,8 +198,8 @@ public:
 		setText(2, item()->presentation());
 	}
 
-	QueryGroupItem *tqparent()
-		{ return static_cast<QueryGroupItem*>(KListViewItem::tqparent()); }
+	QueryGroupItem *parent()
+		{ return static_cast<QueryGroupItem*>(KListViewItem::parent()); }
 
 	KListView *listView()
 		{ return static_cast<KListView*>(KListViewItem::listView()); }
@@ -218,8 +218,8 @@ private:
 		{
 			if (QueryGroup *after = group->nextSibling())
 			{
-				if (tqparent())
-					new QueryGroupItem(tqparent(), after, this);
+				if (parent())
+					new QueryGroupItem(parent(), after, this);
 				else
 					new QueryGroupItem(listView(), after, this);
 			}
@@ -413,7 +413,7 @@ void SchemaConfig::move(TQListViewItem *_item, TQListViewItem *, TQListViewItem
 	QueryGroupItem *afterNow = static_cast<QueryGroupItem*>(_afterNow);
 
 	QueryGroup *after, *under;
-	under = item->tqparent() ? item->tqparent()->item() : 0;
+	under = item->parent() ? item->parent()->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->tqparent())
-		created = new QueryGroupItem(item->tqparent(), g, item);
+	if (item->parent())
+		created = new QueryGroupItem(item->parent(), g, item);
 	else
 		created = new QueryGroupItem(item->listView(), g, item);
 
@@ -500,8 +500,8 @@ SchemaConfig::QueryItem *SchemaConfig::currentQuery()
 }
 
 
-SliceConfig::SliceConfig(TQWidget *tqparent, Oblique *oblique)
-	: TQWidget(tqparent)
+SliceConfig::SliceConfig(TQWidget *parent, Oblique *oblique)
+	: TQWidget(parent)
 {
 	mOblique = oblique;
 	(new TQVBoxLayout(this, 11, 7))->setAutoAdd(true);
@@ -539,16 +539,16 @@ class SliceListItem : public KListViewItem
 {
 	Slice *mSlice;
 public:
-	SliceListItem(KListView *tqparent, Slice *slice)
-		 : KListViewItem(tqparent, slice->name()), mSlice(slice)
+	SliceListItem(KListView *parent, Slice *slice)
+		 : KListViewItem(parent, slice->name()), mSlice(slice)
 	{
 	}
 
 	/**
 	 * new item
 	 **/
-	SliceListItem(KListView *tqparent)
-		 : KListViewItem(tqparent, i18n("New Slice")), mSlice(0)
+	SliceListItem(KListView *parent)
+		 : KListViewItem(parent, i18n("New Slice")), mSlice(0)
 	{
 	}
 
diff --git a/noatun-plugins/oblique/cmodule.h b/noatun-plugins/oblique/cmodule.h
index 39bc7a9..45570ed 100644
--- a/noatun-plugins/oblique/cmodule.h
+++ b/noatun-plugins/oblique/cmodule.h
@@ -45,7 +45,7 @@ Q_OBJECT
 	TQMap<TQString, QueryItem> mQueries;
 
 public:
-	SchemaConfig(TQWidget *tqparent, Oblique *oblique);
+	SchemaConfig(TQWidget *parent, Oblique *oblique);
 
 	Oblique *oblique() { return mOblique; }
 
@@ -93,7 +93,7 @@ Q_OBJECT
 	TQValueList<Slice*> mRemovedItems;
 
 public:
-	SliceConfig(TQWidget *tqparent, Oblique *oblique);
+	SliceConfig(TQWidget *parent, Oblique *oblique);
 	Oblique *oblique() { return mOblique; }
 
 	void reopen();
@@ -116,7 +116,7 @@ Q_OBJECT
 	SliceConfig *slice;
 
 public:
-	Configure(Oblique *tqparent);
+	Configure(Oblique *parent);
 
 	virtual void reopen();
 	virtual void save();
diff --git a/noatun-plugins/oblique/menu.cpp b/noatun-plugins/oblique/menu.cpp
index a65bf96..efc736d 100644
--- a/noatun-plugins/oblique/menu.cpp
+++ b/noatun-plugins/oblique/menu.cpp
@@ -7,8 +7,8 @@
 
 #include "tree.h"
 
-FileMenu::FileMenu(TQWidget *tqparent, Oblique *oblique, File file)
-	: KPopupMenu(tqparent)
+FileMenu::FileMenu(TQWidget *parent, Oblique *oblique, File file)
+	: KPopupMenu(parent)
 {
 	if (file)
 		mFiles.append(file);
@@ -39,8 +39,8 @@ static void addTo(TQValueList<File> &files, TreeItem *item)
 	}
 }
 
-FileMenu::FileMenu(TQWidget *tqparent, Oblique *oblique, TreeItem *items)
-	: KPopupMenu(tqparent)
+FileMenu::FileMenu(TQWidget *parent, Oblique *oblique, TreeItem *items)
+	: KPopupMenu(parent)
 {
 	addTo(mFiles, items);
 
@@ -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 *tqparent, const char *name
-	) : KActionMenu(text, tqparent, name)
+		const TQValueList<File> &files, TQObject *parent, const char *name
+	) : KActionMenu(text, parent, 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 *tqparent, const char *name
-	) : KActionMenu(text, tqparent, name)
+		TQObject *parent, const char *name
+	) : KActionMenu(text, parent, name)
 {
 	mTree = 0;
 	if (reciever)
@@ -197,8 +197,8 @@ void SchemaListAction::hit(int index)
 
 
 
-ObliquePropertiesDialog::ObliquePropertiesDialog(const TQValueList<File> &files, TQWidget *tqparent)
-	: KPropertiesDialog(makeItems(files), tqparent), mFiles(files)
+ObliquePropertiesDialog::ObliquePropertiesDialog(const TQValueList<File> &files, TQWidget *parent)
+	: KPropertiesDialog(makeItems(files), parent), 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 1c12fa7..e6adbac 100644
--- a/noatun-plugins/oblique/menu.h
+++ b/noatun-plugins/oblique/menu.h
@@ -21,11 +21,11 @@ Q_OBJECT
 	TQValueList<File> mFiles;
 
 public:
-	FileMenu(TQWidget *tqparent, Oblique *oblique, File file);
+	FileMenu(TQWidget *parent, Oblique *oblique, File file);
 	/**
 	 * @recursively uses everything under @p files
 	 **/
-	FileMenu(TQWidget *tqparent, Oblique *oblique, TreeItem *files);
+	FileMenu(TQWidget *parent, Oblique *oblique, TreeItem *files);
 
 private slots:
 	void removeFromList();
@@ -45,7 +45,7 @@ public:
 	SliceListAction(
 			const TQString &text, Oblique *oblique,
 			TQObject *reciever, const char *slot,
-			const TQValueList<File> &files = TQValueList<File>(), TQObject *tqparent=0, const char *name=0
+			const TQValueList<File> &files = TQValueList<File>(), TQObject *parent=0, const char *name=0
 		);
 
 signals:
@@ -68,7 +68,7 @@ public:
 	SchemaListAction(
 			const TQString &text,
 			TQObject *reciever, const char *slot,
-			TQObject *tqparent, const char *name
+			TQObject *parent, const char *name
 		);
 
 	void setTree(Tree *tree) { mTree = tree; }
@@ -89,7 +89,7 @@ Q_OBJECT
 	TQValueList<File> mFiles;
 
 public:
-	ObliquePropertiesDialog(const TQValueList<File> &files, TQWidget *tqparent);
+	ObliquePropertiesDialog(const TQValueList<File> &files, TQWidget *parent);
 
 private:
 	static KFileItemList makeItems(const TQValueList<File> &files);
diff --git a/noatun-plugins/oblique/query.cpp b/noatun-plugins/oblique/query.cpp
index dd73d66..d53437e 100644
--- a/noatun-plugins/oblique/query.cpp
+++ b/noatun-plugins/oblique/query.cpp
@@ -283,10 +283,10 @@ Query &Query::operator =(const Query &copy)
 	if (&copy == this) return *this;
 	delete mGroupFirst;
 	mGroupFirst=0;
-	if (const QueryGroup *tqparent = copy.firstChild())
+	if (const QueryGroup *parent = copy.firstChild())
 	{
-		mGroupFirst = new QueryGroup(*tqparent);
-		deepCopy(tqparent->firstChild(), mGroupFirst);
+		mGroupFirst = new QueryGroup(*parent);
+		deepCopy(parent->firstChild(), mGroupFirst);
 	}
 	return *this;
 }
@@ -438,17 +438,17 @@ void Query::dump()
 
 
 
-void Query::loadGroup(TQDomElement element, QueryGroup *tqparent)
+void Query::loadGroup(TQDomElement element, QueryGroup *parent)
 {
 	TQDomNode node = element.firstChild();
 
 	QueryGroup *group = new QueryGroup;
-	if (tqparent)
+	if (parent)
 	{
-		if (QueryGroup *last = tqparent->lastChild())
+		if (QueryGroup *last = parent->lastChild())
 			last->setNextSibling(group);
 		else
-			tqparent->setFirstChild(group);
+			parent->setFirstChild(group);
 	}
 	else
 	{
@@ -500,11 +500,11 @@ void Query::loadGroup(TQDomElement element, QueryGroup *tqparent)
 	}
 }
 
-void Query::saveGroup(TQDomElement &tqparent, QueryGroup *group)
+void Query::saveGroup(TQDomElement &parent, QueryGroup *group)
 {
-	TQDomDocument doc = tqparent.ownerDocument();
+	TQDomDocument doc = parent.ownerDocument();
 	TQDomElement element = doc.createElement("group");
-	tqparent.appendChild(element);
+	parent.appendChild(element);
 
 	TQDomElement childe;
 	TQDomText childtext;
diff --git a/noatun-plugins/oblique/query.h b/noatun-plugins/oblique/query.h
index 60478ff..15ff361 100644
--- a/noatun-plugins/oblique/query.h
+++ b/noatun-plugins/oblique/query.h
@@ -99,7 +99,7 @@ private:
 	 **/
 	TQString fuzzify(const TQString &str) const;
 	/**
-	 * @returns the previous or tqparent of this item (slow)
+	 * @returns the previous or parent 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 *tqparent=0);
-	void saveGroup(TQDomElement &tqparent, QueryGroup *group);
+	void loadGroup(TQDomElement element, QueryGroup *parent=0);
+	void saveGroup(TQDomElement &parent, QueryGroup *group);
 
 	void deepCopy(const QueryGroup *from, QueryGroup *toParent);
 	
diff --git a/noatun-plugins/oblique/tree.cpp b/noatun-plugins/oblique/tree.cpp
index fdf210e..7f3415c 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->tqparent() ? first->tqparent()->childCount() : first->listView()->childCount();
+	const int count = first->parent() ? first->parent()->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 *tqparent, QueryGroup *group, const File &file, const TQString &p)
-	: KListViewItem(tqparent, p), mGroup(group), mUserOpened(false), mHidden(false)
+TreeItem::TreeItem(Tree *parent, QueryGroup *group, const File &file, const TQString &p)
+	: KListViewItem(parent, p), mGroup(group), mUserOpened(false), mHidden(false)
 {
 	if (group->option(QueryGroup::Playable))
 	{
 		if (mFile = file)
-			tqparent->mPlayableItemCount++;
+			parent->mPlayableItemCount++;
 	}
 	
-	sortify(tqparent);
+	sortify(parent);
 }
 
-TreeItem::TreeItem(TreeItem *tqparent, QueryGroup *group, const File &file, const TQString &p)
-	: KListViewItem(tqparent, p), mGroup(group), mUserOpened(false), mHidden(false)
+TreeItem::TreeItem(TreeItem *parent, QueryGroup *group, const File &file, const TQString &p)
+	: KListViewItem(parent, p), mGroup(group), mUserOpened(false), mHidden(false)
 {
 	if (group->option(QueryGroup::Playable))
 	{
 		if (mFile = file)
-			tqparent->tree()->mPlayableItemCount++;
+			parent->tree()->mPlayableItemCount++;
 	}
 	
-	sortify(tqparent);
+	sortify(parent);
 }
 
 TreeItem::~TreeItem()
@@ -180,7 +180,7 @@ TreeItem::~TreeItem()
 		tree()->mPlayableItemCount--;
 	}
 
-	// I have to remove my tqchildren, because they need their tqparent
+	// I have to remove my tqchildren, because they need their parent
 	// in tact for the below code
 	while (TreeItem *c = firstChild())
 		delete c;
@@ -297,7 +297,7 @@ void TreeItem::paintCell(TQPainter *p, const TQColorGroup &cg, int column, int w
 	}
 
 	TQColorGroup newcg(cg);
-	if (tqparent() && tqparent()->isOpen() && !tqparent()->mUserOpened)
+	if (parent() && parent()->isOpen() && !parent()->mUserOpened)
 	{
 		// slow, but not often used
 		TQColor text = newcg.text();
@@ -338,8 +338,8 @@ void TreeItem::autoExpand()
 
 void TreeItem::forceAutoExpand()
 {
-	if (tqparent())
-		tqparent()->forceAutoExpand();
+	if (parent())
+		parent()->forceAutoExpand();
 
 	if (!mUserOpened)
 		tree()->addAutoExpanded(this);
@@ -419,7 +419,7 @@ TreeItem *TreeItem::next()
 		{
 			if (upYours->nextSibling())
 				return upYours->nextSibling();
-			upYours = upYours->tqparent();
+			upYours = upYours->parent();
 		} while (upYours);
 	}
 	return 0;
@@ -431,8 +431,8 @@ TreeItem *TreeItem::next()
 
 
 
-Tree::Tree(Oblique *oblique, TQWidget *tqparent)
-	: KListView(tqparent), mOblique(oblique), mAutoExpanding(0)
+Tree::Tree(Oblique *oblique, TQWidget *parent)
+	: KListView(parent), mOblique(oblique), mAutoExpanding(0)
 {
 	mCurrent = 0;
 	lastMenu =0;
@@ -503,16 +503,16 @@ void Tree::clear()
 	KListView::clear();
 }
 
-void Tree::movableDropEvent (TQListViewItem* tqparent, TQListViewItem* afterme)
+void Tree::movableDropEvent (TQListViewItem* parent, TQListViewItem* afterme)
 {
 	TQPtrList<TQListViewItem> items = selectedItems(true);
 	for (TQPtrList<TQListViewItem>::Iterator i(items.begin()); *i; ++i)
 	{
-		if ((*i)->tqparent() != tqparent)
+		if ((*i)->parent() != parent)
 			return;
 	}
 	
-	KListView::movableDropEvent(tqparent, afterme);
+	KListView::movableDropEvent(parent, afterme);
 }
 
 
@@ -790,7 +790,7 @@ TreeItem *Tree::node(TreeItem *fix, QueryGroup *group, const File &file, TreeIte
 	else if (fix)
 	{
 		item = fix;
-		if (fix->tqparent() != childOf)
+		if (fix->parent() != childOf)
 			moveItem(fix, childOf, 0);
 		item->setText(0, presentation);
 	}
diff --git a/noatun-plugins/oblique/tree.h b/noatun-plugins/oblique/tree.h
index bdc557d..c8e545e 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 *tqparent, QueryGroup *group, const File &file, const TQString &p=0);
-	TreeItem(TreeItem *tqparent, QueryGroup *group, const File &file, const TQString &p=0);
+	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();
 
 	QueryGroup *group() { return mGroup; }
 	const QueryGroup *group() const { return mGroup; }
 	void setGroup(QueryGroup *group) { mGroup = group; }
 
-	TreeItem *tqparent() { return static_cast<TreeItem*>(KListViewItem::tqparent()); }
+	TreeItem *parent() { return static_cast<TreeItem*>(KListViewItem::parent()); }
 	Tree *tree();
 	TreeItem *itemBelow() { return static_cast<TreeItem*>(KListViewItem::itemBelow()); }
 	TreeItem *firstChild() { return static_cast<TreeItem*>(KListViewItem::firstChild()); }
@@ -51,7 +51,7 @@ public:
 
 	/**
 	 * get the next item that is playable logically.
-	 * that is, if it has a File, and its tqparent hasn't a
+	 * that is, if it has a File, and its parent hasn't a
 	 * File
 	 **/
 	TreeItem *nextPlayable();
@@ -104,7 +104,7 @@ Q_OBJECT
 	Loader *mLoader;
 
 public:
-	Tree(Oblique *oblique, TQWidget *tqparent=0);
+	Tree(Oblique *oblique, TQWidget *parent=0);
 	~Tree();
 	TreeItem *firstChild();
 	TreeItem *find(File item);
@@ -130,7 +130,7 @@ public:
 
 protected:
 	virtual TQDragObject *dragObject();
-	void movableDropEvent(TQListViewItem* tqparent, TQListViewItem* afterme);
+	void movableDropEvent(TQListViewItem* parent, TQListViewItem* afterme);
 
 public slots:
 	void insert(TreeItem *replace, File file);
diff --git a/noatun-plugins/oblique/view.cpp b/noatun-plugins/oblique/view.cpp
index 91d07c9..5f32b4d 100644
--- a/noatun-plugins/oblique/view.cpp
+++ b/noatun-plugins/oblique/view.cpp
@@ -20,8 +20,8 @@
 class TabWidget : public KTabWidget
 {
 public:
-	TabWidget(TQWidget *tqparent)
-		: KTabWidget(tqparent)
+	TabWidget(TQWidget *parent)
+		: KTabWidget(parent)
 	{
 	}
 public:
@@ -241,8 +241,8 @@ void View::use(Slice *s)
 
 
 
-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)
+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)
 {
 	setAutoSized(true);
 }
diff --git a/noatun-plugins/oblique/view.h b/noatun-plugins/oblique/view.h
index 4277d06..b9d2a09 100644
--- a/noatun-plugins/oblique/view.h
+++ b/noatun-plugins/oblique/view.h
@@ -62,7 +62,7 @@ class LineEditAction : public KWidgetAction
 Q_OBJECT
   TQ_OBJECT
 public:
-	LineEditAction(const TQString &text, const TQObject *reciever, const char *slot, KActionCollection *tqparent, const char *name);
+	LineEditAction(const TQString &text, const TQObject *reciever, const char *slot, KActionCollection *parent, const char *name);
 
 	KLineEdit *widget() { return static_cast<KLineEdit*>(KWidgetAction::widget()); }
 	KLineEdit *lineEdit() { return widget(); }