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

1 files changed, 16 insertions, 16 deletions

diff --git a/src/modules/options/dialog.cpp b/src/modules/options/dialog.cpp
index 4f53ad13..b00eba60 100644
--- a/src/modules/options/dialog.cpp
+++ b/src/modules/options/dialog.cpp
@@ -61,8 +61,8 @@ extern KviPointerHashTable<TQString,KviOptionsDialog> * g_pOptionsDialogDict;
 extern KVIRC_API KviApp * g_pApp;
 extern KviOptionsInstanceManager * g_pOptionsInstanceManager;
 
-KviGeneralOptionsFrontWidget::KviGeneralOptionsFrontWidget(TQWidget *tqparent,const TQString &szText)
-:KviOptionsWidget(tqparent,"general_options_front_widget")
+KviGeneralOptionsFrontWidget::KviGeneralOptionsFrontWidget(TQWidget *parent,const TQString &szText)
+:KviOptionsWidget(parent,"general_options_front_widget")
 {
 	createLayout(1,1);
 	TQLabel * l = new TQLabel(szText,this);
@@ -80,8 +80,8 @@ KviGeneralOptionsFrontWidget::~KviGeneralOptionsFrontWidget()
 
 
 
-KviOptionsListViewItem::KviOptionsListViewItem(KviTalListView *tqparent,KviOptionsWidgetInstanceEntry * e)
-:KviTalListViewItem(tqparent,e->szName)
+KviOptionsListViewItem::KviOptionsListViewItem(KviTalListView *parent,KviOptionsWidgetInstanceEntry * e)
+:KviTalListViewItem(parent,e->szName)
 {
 	m_pInstanceEntry = e;
 	m_pOptionsWidget = 0;
@@ -89,8 +89,8 @@ KviOptionsListViewItem::KviOptionsListViewItem(KviTalListView *tqparent,KviOptio
 	setPixmap(0,*(g_pIconManager->getSmallIcon(e->iIcon)));
 }
 
-KviOptionsListViewItem::KviOptionsListViewItem(KviTalListViewItem *tqparent,KviOptionsWidgetInstanceEntry * e)
-:KviTalListViewItem(tqparent,e->szName)
+KviOptionsListViewItem::KviOptionsListViewItem(KviTalListViewItem *parent,KviOptionsWidgetInstanceEntry * e)
+:KviTalListViewItem(parent,e->szName)
 {
 	m_pInstanceEntry = e;
 	m_pOptionsWidget = 0;
@@ -272,7 +272,7 @@ KviOptionsDialog::KviOptionsDialog(TQWidget * par,const TQString &szGroup)
 
 	fillListView(0,g_pOptionsInstanceManager->instanceEntryTree(),szGroup);
 	
-	if(!tqparent())
+	if(!parent())
 	{
 
 		if(KVI_OPTION_RECT(KviOption_rectGeneralOptionsDialogGeometry).y() < 5)
@@ -293,7 +293,7 @@ KviOptionsDialog::KviOptionsDialog(TQWidget * par,const TQString &szGroup)
 
 KviOptionsDialog::~KviOptionsDialog()
 {
-	if(!tqparent())KVI_OPTION_RECT(KviOption_rectGeneralOptionsDialogGeometry) = TQRect(pos().x(),pos().y(),
+	if(!parent())KVI_OPTION_RECT(KviOption_rectGeneralOptionsDialogGeometry) = TQRect(pos().x(),pos().y(),
 			size().width(),size().height());
 	if(g_pOptionsDialogDict)
 		g_pOptionsDialogDict->remove(m_szGroup);
@@ -378,8 +378,8 @@ bool KviOptionsDialog::recursiveSearch(KviOptionsListViewItem * pItem,const TQSt
 					font.setUnderline(bOk);
 					pWidget->setFont(font);
 
-					// if there is a TQTabWidget in the tqparent chain, signal it in the tab text
-					TQObject * pParent = pWidget->tqparent();
+					// if there is a TQTabWidget in the parent chain, signal it in the tab text
+					TQObject * pParent = pWidget->parent();
 					while(pParent)
 					{
 						if(pParent->inherits(TQTABWIDGET_OBJECT_NAME_STRING))
@@ -387,13 +387,13 @@ bool KviOptionsDialog::recursiveSearch(KviOptionsListViewItem * pItem,const TQSt
 							pTabWidgetToMark = (TQTabWidget *)pParent;
 							break;
 						}
-						pParent = pParent->tqparent();
+						pParent = pParent->parent();
 					}
 
 					if(pTabWidgetToMark)
 					{
-						// lookup the KviOptionsWidget tqparent
-						pParent = pWidget->tqparent();
+						// lookup the KviOptionsWidget parent
+						pParent = pWidget->parent();
 						while(pParent)
 						{
 							if(pParent->inherits("KviOptionsWidget"))
@@ -408,7 +408,7 @@ bool KviOptionsDialog::recursiveSearch(KviOptionsListViewItem * pItem,const TQSt
 								}
 								break;
 							}
-							pParent = pParent->tqparent();
+							pParent = pParent->parent();
 						}
 					}
 				}
@@ -549,13 +549,13 @@ void KviOptionsDialog::listViewItemSelectionChanged(KviTalListViewItem *it)
 	if(it)
 	{
 		TQString str = it->text(0);
-		KviTalListViewItem * par = it->tqparent();
+		KviTalListViewItem * par = it->parent();
 
 		while(par)
 		{
 			str.prepend(" :: ");
 			str.prepend(par->text(0));
-			par = par->tqparent();
+			par = par->parent();
 		}
 		str.prepend("<b>");
 		str += "</b>";