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

7 files changed, 21 insertions, 21 deletions

diff --git a/konqueror/keditbookmarks/listview.cpp b/konqueror/keditbookmarks/listview.cpp
index 7f2d785ae..62702a1c3 100644
--- a/konqueror/keditbookmarks/listview.cpp
+++ b/konqueror/keditbookmarks/listview.cpp
@@ -376,7 +376,7 @@ KEBListViewItem* ListView::getItemAtAddress(const TQString &address) const {
 
 void ListView::setOpen(bool open) {
     for (TQListViewItemIterator it(m_listView); it.current() != 0; ++it)
-        if (it.current()->tqparent())
+        if (it.current()->parent())
             it.current()->setOpen(open);
 }
 
@@ -456,7 +456,7 @@ void ListView::updateListView()
     {
         KEBListViewItem * item = static_cast<KEBListViewItem*>(m_listView->currentItem());
         if(item->isEmptyFolderPadder())
-            s_current_address = static_cast<KEBListViewItem*>(item->tqparent())->bookmark().address();
+            s_current_address = static_cast<KEBListViewItem*>(item->parent())->bookmark().address();
         else
             s_current_address = item->bookmark().address();
     }
@@ -804,7 +804,7 @@ TQDragObject *KEBListView::dragObject() {
 bool KEBListViewItem::parentSelected(TQListViewItem * item)
 {
     TQListViewItem *root = item->listView()->firstChild();
-    for( TQListViewItem *parent = item->tqparent(); parent ; parent = parent->tqparent())
+    for( TQListViewItem *parent = item->parent(); parent ; parent = parent->parent())
         if (parent->isSelected() && parent != root)
             return true;
     return false;
@@ -814,7 +814,7 @@ void KEBListViewItem::setSelected(bool s)
 {
     if( isEmptyFolderPadder())
     {
-        tqparent()->setSelected(true);
+        parent()->setSelected(true);
         return;
     }
 
@@ -904,7 +904,7 @@ KEBListViewItem::KEBListViewItem(TQListView *parent, TQListViewItem *after, cons
 
 // DESIGN - move this into kbookmark or into a helper
 void KEBListViewItem::setOpen(bool open) {
-    if (!tqparent())
+    if (!parent())
         return;
     m_bookmark.internalElement().setAttribute("folded", open ? "no" : "yes");
     TQListViewItem::setOpen(open);
diff --git a/konqueror/konq_mainwindow.cc b/konqueror/konq_mainwindow.cc
index 26422cf1b..7cc4877b2 100644
--- a/konqueror/konq_mainwindow.cc
+++ b/konqueror/konq_mainwindow.cc
@@ -1046,7 +1046,7 @@ TQObject *KonqMainWindow::lastFrame( KonqView *view )
   viewFrame = 0;
   while ( nextFrame != 0 && ! nextFrame->inherits( TQWIDGETSTACK_OBJECT_NAME_STRING ) ) {
     viewFrame = nextFrame;
-    nextFrame = nextFrame->tqparent();
+    nextFrame = nextFrame->parent();
   }
   return nextFrame ? viewFrame : 0L;
 }
diff --git a/konqueror/listview/konq_listviewwidget.cc b/konqueror/listview/konq_listviewwidget.cc
index e0e1d778d..b72586f8f 100644
--- a/konqueror/listview/konq_listviewwidget.cc
+++ b/konqueror/listview/konq_listviewwidget.cc
@@ -989,13 +989,13 @@ void KonqBaseListViewWidget::slotReturnPressed( TQListViewItem *_item )
 
 	   // calculate nesting depth
 	   int nestingDepth = 0;
-	   for (TQListViewItem *currentItem = _item->tqparent();
+	   for (TQListViewItem *currentItem = _item->parent();
 	        currentItem != 0;
-	        currentItem = currentItem->tqparent())
+	        currentItem = currentItem->parent())
 	  	  nestingDepth++;
 	
 	   // no parent no indent
-	   if (_item->tqparent() == 0)
+	   if (_item->parent() == 0)
 		nestingDepth = 0;
 	
 	   // Root decoration means additional indent
@@ -1371,13 +1371,13 @@ KonqBaseListViewWidget::iterator& KonqBaseListViewWidget::iterator::operator++()
       m_p = i;
       return *this;
    }
-   m_p = (KonqBaseListViewItem *)m_p->tqparent();
+   m_p = (KonqBaseListViewItem *)m_p->parent();
 
    while ( m_p )
    {
       if ( m_p->nextSibling() )
          break;
-      m_p = (KonqBaseListViewItem *)m_p->tqparent();
+      m_p = (KonqBaseListViewItem *)m_p->parent();
    }
 
    if ( m_p )
@@ -1402,13 +1402,13 @@ KonqBaseListViewWidget::iterator KonqBaseListViewWidget::iterator::operator++(in
       m_p = i;
       return it;
    }
-   m_p = (KonqBaseListViewItem *)m_p->tqparent();
+   m_p = (KonqBaseListViewItem *)m_p->parent();
 
    while ( m_p )
    {
       if ( m_p->nextSibling() )
          break;
-      m_p = (KonqBaseListViewItem *)m_p->tqparent();
+      m_p = (KonqBaseListViewItem *)m_p->parent();
    }
 
    if ( m_p )
diff --git a/konqueror/sidebar/konqsidebarplugin.cpp b/konqueror/sidebar/konqsidebarplugin.cpp
index 0f3fdddde..75e762d35 100644
--- a/konqueror/sidebar/konqsidebarplugin.cpp
+++ b/konqueror/sidebar/konqsidebarplugin.cpp
@@ -52,7 +52,7 @@ void KonqSidebarPlugin::handlePreviewOnMouseOver(const KFileItem& /*items*/) {}
 
 bool KonqSidebarPlugin::universalMode() {
 	if (!parent()) return false;
-	KonqSidebarIface *ksi=static_cast<KonqSidebarIface*>(tqparent()->qt_cast("KonqSidebarIface"));
+	KonqSidebarIface *ksi=static_cast<KonqSidebarIface*>(parent()->qt_cast("KonqSidebarIface"));
 	if (!ksi) return false;
 	kdDebug()<<"calling KonqSidebarIface->universalMode()"<<endl;
 	return ksi->universalMode();
diff --git a/konqueror/sidebar/sidebar_widget.cpp b/konqueror/sidebar/sidebar_widget.cpp
index 04358ddc4..e97c42c3f 100644
--- a/konqueror/sidebar/sidebar_widget.cpp
+++ b/konqueror/sidebar/sidebar_widget.cpp
@@ -1123,7 +1123,7 @@ void Sidebar_Widget::createNewWindow( const KURL &url, const KParts::URLArgs &ar
 
 void Sidebar_Widget::enableAction( const char * name, bool enabled )
 {
- 	if (TQT_TQOBJECT_CONST(sender())->tqparent()->isA("ButtonInfo"))
+ 	if (TQT_TQOBJECT_CONST(sender())->parent()->isA("ButtonInfo"))
 	{
 		ButtonInfo *btninfo = static_cast<ButtonInfo*>(sender()->parent());
 		if (btninfo)
@@ -1148,7 +1148,7 @@ void Sidebar_Widget::enableAction( const char * name, bool enabled )
 
 bool  Sidebar_Widget::doEnableActions()
 {
- 	if (!(TQT_TQOBJECT_CONST(sender())->tqparent()->isA("ButtonInfo")))
+ 	if (!(TQT_TQOBJECT_CONST(sender())->parent()->isA("ButtonInfo")))
 	{
 		kdDebug()<<"Couldn't set active module, aborting"<<endl;
 		return false;
@@ -1299,9 +1299,9 @@ void Sidebar_Widget::resizeEvent(TQResizeEvent* ev)
 TQSplitter *Sidebar_Widget::splitter() const
 {
 	if (m_universalMode) return 0;
-	TQObject *p = tqparent();
+	TQObject *p = parent();
 	if (!p) return 0;
-	p = p->tqparent();
+	p = p->parent();
 	return static_cast<TQSplitter*>(TQT_TQWIDGET(p));
 }
 
diff --git a/konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp b/konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp
index 1437d7f83..d1b5cc16e 100644
--- a/konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp
+++ b/konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp
@@ -161,10 +161,10 @@ void KonqSidebarBookmarkModule::slotMoved(TQListViewItem *i, TQListViewItem*, TQ
     KBookmarkGroup parentGroup;
     // try to get the parent group (assume that the TQListViewItem has been reparented by KListView)...
     // if anything goes wrong, use the root.
-    if (item->tqparent()) {
+    if (item->parent()) {
         bool error = false;
 
-        KonqSidebarBookmarkItem *parent = dynamic_cast<KonqSidebarBookmarkItem*>( (item->tqparent()) );
+        KonqSidebarBookmarkItem *parent = dynamic_cast<KonqSidebarBookmarkItem*>( (item->parent()) );
         if (!parent) {
             error = true;
         } else {
diff --git a/konqueror/sidebar/trees/history_module/history_item.cpp b/konqueror/sidebar/trees/history_module/history_item.cpp
index 57647c04c..02e77c526 100644
--- a/konqueror/sidebar/trees/history_module/history_item.cpp
+++ b/konqueror/sidebar/trees/history_module/history_item.cpp
@@ -29,7 +29,7 @@
 #include <kiconloader.h>
 
 #define MYMODULE static_cast<KonqSidebarHistoryModule*>(module())
-#define MYGROUP static_cast<KonqSidebarHistoryGroupItem*>(tqparent())
+#define MYGROUP static_cast<KonqSidebarHistoryGroupItem*>(parent())
 
 KonqSidebarHistorySettings * KonqSidebarHistoryItem::s_settings = 0L;