rename the following methods:

tqparent parent
tqmask mask


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

1 files changed, 13 insertions, 13 deletions

diff --git a/bibletime/frontend/mainindex/cmainindex.cpp b/bibletime/frontend/mainindex/cmainindex.cpp
index d5527ec..81b3405 100644
--- a/bibletime/frontend/mainindex/cmainindex.cpp
+++ b/bibletime/frontend/mainindex/cmainindex.cpp
@@ -42,7 +42,7 @@
 
 using namespace Printing;
 
-CMainIndex::ToolTip::ToolTip(CMainIndex* tqparent) : TQToolTip(tqparent->viewport()), m_mainIndex(tqparent) {}
+CMainIndex::ToolTip::ToolTip(CMainIndex* parent) : TQToolTip(parent->viewport()), m_mainIndex(parent) {}
 
 void CMainIndex::ToolTip::maybeTip(const TQPoint& p) {
 	CItemBase* i = dynamic_cast<CItemBase*>(m_mainIndex->itemAt(p));
@@ -77,7 +77,7 @@ void CMainIndex::ToolTip::maybeTip(const TQPoint& p) {
 	}
 }
 
-CMainIndex::CMainIndex(TQWidget *tqparent) : KListView(tqparent),
+CMainIndex::CMainIndex(TQWidget *parent) : KListView(parent),
 m_searchDialog(0), m_toolTip(0), m_itemsMovable(false), m_autoOpenFolder(0), m_autoOpenTimer(this) {
 	initView();
 	initConnections();
@@ -272,9 +272,9 @@ void CMainIndex::initTree() {
 }
 
 /** No descriptions */
-void CMainIndex::dropped( TQDropEvent* e, TQListViewItem* tqparent, TQListViewItem* after) {
+void CMainIndex::dropped( TQDropEvent* e, TQListViewItem* parent, TQListViewItem* after) {
 	Q_ASSERT(after);
-	Q_ASSERT(tqparent);
+	Q_ASSERT(parent);
 
 	//the drop was started in this main index widget
 	if (m_itemsMovable && ((e->source()) == (viewport()))) {
@@ -283,7 +283,7 @@ void CMainIndex::dropped( TQDropEvent* e, TQListViewItem* tqparent, TQListViewIt
 		* folder or one of its subfolders
 		* we remove the current items because the new ones will be inserted soon.
 		*/
-		if (dynamic_cast<CBookmarkFolder*>(tqparent) || dynamic_cast<Bookmarks::SubFolder*>(tqparent)) { 
+		if (dynamic_cast<CBookmarkFolder*>(parent) || dynamic_cast<Bookmarks::SubFolder*>(parent)) { 
 			// we drop onto the bookmark folder or one of it's subfolders
 			//       TQPtrList<TQListViewItem> items = selectedItems();
 			//       items.setAutoDelete(true);
@@ -292,7 +292,7 @@ void CMainIndex::dropped( TQDropEvent* e, TQListViewItem* tqparent, TQListViewIt
 	}
 
 	//finally do the drop, either with external drop data or with the moved items' data
-	CItemBase* const parentItem = dynamic_cast<CItemBase*>(tqparent);
+	CItemBase* const parentItem = dynamic_cast<CItemBase*>(parent);
 	CItemBase* const afterItem  = dynamic_cast<CItemBase*>(after);
 
 	bool removeSelectedItems = true;
@@ -323,14 +323,14 @@ void CMainIndex::dropped( TQDropEvent* e, TQListViewItem* tqparent, TQListViewIt
 			if (afterItem->acceptDrop(e)) {
 				afterItem->dropped(e, after);
 			}
-			else { //insert in the tqparent folder and then move the inserted items
+			else { //insert in the parent folder and then move the inserted items
 				parentItem->dropped(e, after);
 			}
 		}
 
 		parentItem->setOpen(true);
 	}
-	else if (parentItem) { //no after item present, but a tqparent is there
+	else if (parentItem) { //no after item present, but a parent is there
 		moveSelectedItems = false;
 		removeSelectedItems = false;
 
@@ -762,7 +762,7 @@ void CMainIndex::readSettings() {
 	
 	TQStringList openGroups = CBTConfig::get(CBTConfig::bookshelfOpenGroups);
 	for (TQStringList::Iterator it( openGroups.begin() ); it != openGroups.end(); ++it) {
-		TQStringList path = TQStringList::split("/", (*it)); //e.g. with items tqparent, child
+		TQStringList path = TQStringList::split("/", (*it)); //e.g. with items parent, child
 		TQListViewItem* item = firstChild(); //begin on the top for each item
 		Q_ASSERT(item);
 		unsigned int index = 1;
@@ -833,9 +833,9 @@ void CMainIndex::saveSettings() {
 			//it.current()'s full name needs to be added to the list
 			TQListViewItem* i = it.current();
 			TQString fullName = i->text(0);
-			while (i->tqparent()) {
-				i = i->tqparent();
-				fullName.prepend("/").prepend( i->text(0).replace("/", "\\/")); // tqparent / child
+			while (i->parent()) {
+				i = i->parent();
+				fullName.prepend("/").prepend( i->text(0).replace("/", "\\/")); // parent / child
 			}
 			openGroups << fullName;
 		}
@@ -856,7 +856,7 @@ void CMainIndex::saveSettings() {
 	TQString path;
 	while (item) {
 		path.prepend( item->text(0) + "/" );
-		item = item->tqparent();
+		item = item->parent();
 	}
 	CBTConfig::set(CBTConfig::bookshelfCurrentItem, path);
 }