From 6b45a7b7b2a804ccb2d522eb9ba6423fedb59b8f Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 16 Dec 2011 09:58:12 -0600 Subject: Revert "Rename a number of old tq methods that are no longer tq specific" This reverts commit ca82971624269719d487c6f7980d7237f9420036. --- noatun-plugins/oblique/tree.cpp | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'noatun-plugins/oblique/tree.cpp') diff --git a/noatun-plugins/oblique/tree.cpp b/noatun-plugins/oblique/tree.cpp index 0087b99..7f3415c 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 children, because they need their parent + // I have to remove my tqchildren, 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 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; -- cgit v1.2.1