rename the following methods:

tqparent parent
tqmask mask


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

4 files changed, 8 insertions, 8 deletions

diff --git a/kcontrol/filetypes/filetypesview.cpp b/kcontrol/filetypes/filetypesview.cpp
index 45c700fd9..41a11ee43 100644
--- a/kcontrol/filetypes/filetypesview.cpp
+++ b/kcontrol/filetypes/filetypesview.cpp
@@ -301,10 +301,10 @@ void FileTypesView::removeType()
   if (!li)
       li = current->itemBelow();
   if (!li)
-      li = current->tqparent();
+      li = current->parent();
 
   removedList.append(current->name());
-  current->tqparent()->takeItem(current);
+  current->parent()->takeItem(current);
   m_itemList.removeRef( current );
   setDirty(true);
 
diff --git a/kcontrol/kcontrol/moduletreeview.cpp b/kcontrol/kcontrol/moduletreeview.cpp
index fda83854f..b90d8bc07 100644
--- a/kcontrol/kcontrol/moduletreeview.cpp
+++ b/kcontrol/kcontrol/moduletreeview.cpp
@@ -312,7 +312,7 @@ void ModuleTreeItem::setPixmap(int column, const TQPixmap& pm)
 {
   if (!pm.isNull())
   {
-    ModuleTreeItem* p = dynamic_cast<ModuleTreeItem*>(tqparent());
+    ModuleTreeItem* p = dynamic_cast<ModuleTreeItem*>(parent());
     if (p)
       p->regChildIconWidth(pm.width());
   }
@@ -331,7 +331,7 @@ void ModuleTreeItem::paintCell( TQPainter * p, const TQColorGroup & cg, int colu
   if (!pixmap(0))
   {
     int offset = 0;
-    ModuleTreeItem* parentItem = dynamic_cast<ModuleTreeItem*>(tqparent());
+    ModuleTreeItem* parentItem = dynamic_cast<ModuleTreeItem*>(parent());
     if (parentItem)
     {
       offset = parentItem->maxChildIconWidth();
diff --git a/kcontrol/kio/kcookiesmanagement.cpp b/kcontrol/kio/kcookiesmanagement.cpp
index fa9bb097c..9a4f6eb2c 100644
--- a/kcontrol/kio/kcookiesmanagement.cpp
+++ b/kcontrol/kio/kcookiesmanagement.cpp
@@ -383,7 +383,7 @@ void KCookiesManagement::doPolicy()
 
     if( domain.isEmpty() )
     {
-      CookieListViewItem *parent = static_cast<CookieListViewItem*>( item->tqparent() );
+      CookieListViewItem *parent = static_cast<CookieListViewItem*>( item->parent() );
 
       if ( parent )
         domain = parent->domain ();
@@ -407,7 +407,7 @@ void KCookiesManagement::deleteCookie(TQListViewItem* deleteItem)
   CookieListViewItem *item = static_cast<CookieListViewItem*>( deleteItem );
   if( item->cookie() )
   {
-    CookieListViewItem *parent = static_cast<CookieListViewItem*>(item->tqparent());
+    CookieListViewItem *parent = static_cast<CookieListViewItem*>(item->parent());
     CookiePropList *list = deletedCookies.find(parent->domain());
     if(!list)
     {
diff --git a/kcontrol/screensaver/scrnsave.cpp b/kcontrol/screensaver/scrnsave.cpp
index 87d4b3208..9f0463c7d 100644
--- a/kcontrol/screensaver/scrnsave.cpp
+++ b/kcontrol/screensaver/scrnsave.cpp
@@ -639,9 +639,9 @@ void KScreenSaver::slotScreenSaver(TQListViewItem *item)
 
     int i = 0, indx = -1;
     for (SaverConfig* saver = mSaverList.first(); saver != 0; saver = mSaverList.next()) {
-        if ( item->tqparent() )
+        if ( item->parent() )
         {
-            if (  item->tqparent()->text( 0 ) == saver->category() && saver->name() == item->text (0))
+            if (  item->parent()->text( 0 ) == saver->category() && saver->name() == item->text (0))
             {
                 indx = i;
                 break;