rename the following methods:

tqparent parent
tqmask mask


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

2 files changed, 10 insertions, 10 deletions

diff --git a/src/modules/popupeditor/popupeditor.cpp b/src/modules/popupeditor/popupeditor.cpp
index 38c5bd57..db3479e2 100644
--- a/src/modules/popupeditor/popupeditor.cpp
+++ b/src/modules/popupeditor/popupeditor.cpp
@@ -62,8 +62,8 @@ KviPopupListViewItem::KviPopupListViewItem(KviTalListView * pListView,KviPopupLi
 	init();
 }
 
-KviPopupListViewItem::KviPopupListViewItem(KviPopupListViewItem * tqparent,KviPopupListViewItem * after,Type t)
-: KviTalListViewItem(tqparent,after)
+KviPopupListViewItem::KviPopupListViewItem(KviPopupListViewItem * parent,KviPopupListViewItem * after,Type t)
+: KviTalListViewItem(parent,after)
 {
 	m_type = t;
 	init();
@@ -379,7 +379,7 @@ void KviSinglePopupEditor::itemPressed(KviTalListViewItem *it,const TQPoint &pnt
 
 	if(it)
 	{
-		parentMenu = (KviPopupListViewItem *) (((KviPopupListViewItem *)it)->tqparent());
+		parentMenu = (KviPopupListViewItem *) (((KviPopupListViewItem *)it)->parent());
 		bIsMenu = ((KviPopupListViewItem *)it)->m_type == KviPopupListViewItem::Menu;
 	}
 
@@ -584,13 +584,13 @@ KviPopupListViewItem * KviSinglePopupEditor::newItem(KviPopupListViewItem * par,
 KviPopupListViewItem * KviSinglePopupEditor::newItemBelow(KviPopupListViewItem * it,KviPopupListViewItem::Type t)
 {
 	if(!it)return newItem(0,0,t);
-	return newItem((KviPopupListViewItem *)it->tqparent(),it,t);
+	return newItem((KviPopupListViewItem *)it->parent(),it,t);
 }
 
 KviPopupListViewItem * KviSinglePopupEditor::newItemAbove(KviPopupListViewItem * it,KviPopupListViewItem::Type t)
 {
 	if(!it)return newItem(0,0,t);
-	return newItem((KviPopupListViewItem *)it->tqparent(),(KviPopupListViewItem *)it->itemAbove(),t);
+	return newItem((KviPopupListViewItem *)it->parent(),(KviPopupListViewItem *)it->itemAbove(),t);
 }
 
 KviPopupListViewItem * KviSinglePopupEditor::newItemInside(KviPopupListViewItem * it,KviPopupListViewItem::Type t)
@@ -607,7 +607,7 @@ KviPopupListViewItem * KviSinglePopupEditor::newItemInside(KviPopupListViewItem
 
 void KviSinglePopupEditor::contextNewPrologue()
 {
-	KviPopupListViewItem * it = m_pLastSelectedItem ? (KviPopupListViewItem *)m_pLastSelectedItem->tqparent() : 0;
+	KviPopupListViewItem * it = m_pLastSelectedItem ? (KviPopupListViewItem *)m_pLastSelectedItem->parent() : 0;
 //	if(!findPrologue(it))
 //	{
 		m_pListView->setCurrentItem(newItem(it,it,KviPopupListViewItem::Prologue));
@@ -616,7 +616,7 @@ void KviSinglePopupEditor::contextNewPrologue()
 
 void KviSinglePopupEditor::contextNewEpilogue()
 {
-	KviPopupListViewItem * it = m_pLastSelectedItem ? (KviPopupListViewItem *)m_pLastSelectedItem->tqparent() : 0;
+	KviPopupListViewItem * it = m_pLastSelectedItem ? (KviPopupListViewItem *)m_pLastSelectedItem->parent() : 0;
 //	if(!findEpilogue(it))
 //	{
 		KviPopupListViewItem * after = it ? (KviPopupListViewItem *)it->firstChild() : (KviPopupListViewItem *)m_pListView->firstChild();
@@ -653,14 +653,14 @@ void KviSinglePopupEditor::contextCut()
 void KviSinglePopupEditor::contextPasteBelow()
 {
 	if(!m_pClipboard)return;
-	KviPopupListViewItem * par = m_pLastSelectedItem ? (KviPopupListViewItem *)m_pLastSelectedItem->tqparent() : 0;
+	KviPopupListViewItem * par = m_pLastSelectedItem ? (KviPopupListViewItem *)m_pLastSelectedItem->parent() : 0;
 	populateMenu(m_pClipboard,par,m_pLastSelectedItem);
 }
 
 void KviSinglePopupEditor::contextPasteAbove()
 {
 	if(!m_pClipboard)return;
-	KviPopupListViewItem * par = m_pLastSelectedItem ? (KviPopupListViewItem *)m_pLastSelectedItem->tqparent() : 0;
+	KviPopupListViewItem * par = m_pLastSelectedItem ? (KviPopupListViewItem *)m_pLastSelectedItem->parent() : 0;
 	KviPopupListViewItem * above = m_pLastSelectedItem ? (KviPopupListViewItem *)m_pLastSelectedItem->itemAbove() : 0;
 	populateMenu(m_pClipboard,par,above);
 
diff --git a/src/modules/popupeditor/popupeditor.h b/src/modules/popupeditor/popupeditor.h
index 5c4ce209..5c214ff9 100644
--- a/src/modules/popupeditor/popupeditor.h
+++ b/src/modules/popupeditor/popupeditor.h
@@ -42,7 +42,7 @@ public:
 	enum Type { Item , Menu , Separator , Label , Epilogue , Prologue , ExtMenu };
 public:
 	KviPopupListViewItem(KviTalListView * pListView,KviPopupListViewItem * after,Type t);
-	KviPopupListViewItem(KviPopupListViewItem * tqparent,KviPopupListViewItem * after,Type t);
+	KviPopupListViewItem(KviPopupListViewItem * parent,KviPopupListViewItem * after,Type t);
 public:
 	Type                   m_type;
 	TQString                m_szText;