rename the following methods:

tqparent parent
tqmask mask


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

27 files changed, 88 insertions, 88 deletions

diff --git a/kcert/kcertpart.cc b/kcert/kcertpart.cc
index 8a0481a40..d0e091041 100644
--- a/kcert/kcertpart.cc
+++ b/kcert/kcertpart.cc
@@ -784,7 +784,7 @@ void KCertPart::slotSelectionChanged(TQListViewItem *x) {
 	KPKCS12Item *p12i = dynamic_cast<KPKCS12Item*>(x);
 	_p12 = NULL;
 	_ca = NULL;
-	if (x && x->tqparent() == _parentCA) {
+	if (x && x->parent() == _parentCA) {
 		if (!x5i) {
 			return;
 		}
@@ -797,7 +797,7 @@ void KCertPart::slotSelectionChanged(TQListViewItem *x) {
 		_save->setEnabled(true);
 		_curName = x5i->_prettyName;
 		displayCACert(_ca);
-	} else if (x && x->tqparent() == NULL && x->rtti() == 1) {
+	} else if (x && x->parent() == NULL && x->rtti() == 1) {
 		if (!x5i) {
 			return;
 		}
@@ -810,7 +810,7 @@ void KCertPart::slotSelectionChanged(TQListViewItem *x) {
 		_save->setEnabled(false);
 		_curName = x5i->_prettyName;
 		displayCACert(_ca);
-	} else if (x && x->tqparent() == _parentP12) {
+	} else if (x && x->parent() == _parentP12) {
 		if (!p12i) {
 			return;
 		}
diff --git a/kdecore/kiconeffect.cpp b/kdecore/kiconeffect.cpp
index b34ca1e97..dddfba556 100644
--- a/kdecore/kiconeffect.cpp
+++ b/kdecore/kiconeffect.cpp
@@ -520,8 +520,8 @@ void KIconEffect::semiTransparent(TQPixmap &pix)
     }
 
     TQImage img;
-    if (pix.tqmask() != 0L)
-	img = pix.tqmask()->convertToImage();
+    if (pix.mask() != 0L)
+	img = pix.mask()->convertToImage();
     else
     {
 	img.create(pix.size(), 1, 2, TQImage::BigEndian);
diff --git a/kdeprint/kmuimanager.cpp b/kdeprint/kmuimanager.cpp
index 207877f8a..53921d39f 100644
--- a/kdeprint/kmuimanager.cpp
+++ b/kdeprint/kmuimanager.cpp
@@ -143,7 +143,7 @@ void KMUiManager::setupPropertyDialog(KPrinterPropertyDialog *dlg)
 
 		// retrieve the KPrinter object
 		KPrinter	*prt(0);
-		if (dlg->parent() && dlg->tqparent()->isA("KPrintDialog"))
+		if (dlg->parent() && dlg->parent()->isA("KPrintDialog"))
 			prt = static_cast<KPrintDialog*>(dlg->parent())->printer();
 
 		// add margin page
diff --git a/kdeprint/management/kmlistview.cpp b/kdeprint/management/kmlistview.cpp
index 76ec62bb3..b9e4b738b 100644
--- a/kdeprint/management/kmlistview.cpp
+++ b/kdeprint/management/kmlistview.cpp
@@ -157,7 +157,7 @@ KMListViewItem* KMListView::findItem(KMPrinter *p)
 			if (isVirtual)
 			{
 				if (it.current()->depth() == 3 && it.current()->text(0) == p->instanceName()
-						&& it.current()->tqparent()->text(0) == p->printerName())
+						&& it.current()->parent()->text(0) == p->printerName())
 					return it.current();
 			}
 			else
diff --git a/kdeprint/management/kmwlocal.cpp b/kdeprint/management/kmwlocal.cpp
index c581bdf3c..3bbaf0eaa 100644
--- a/kdeprint/management/kmwlocal.cpp
+++ b/kdeprint/management/kmwlocal.cpp
@@ -98,7 +98,7 @@ void KMWLocal::slotPortSelected(TQListViewItem *item)
 	if (!item || item->depth() <= 1 || item->depth() > 3)
 		uri = TQString::null;
 	else if (item->depth() == 3)
-		uri = item->tqparent()->text( 1 );
+		uri = item->parent()->text( 1 );
 	else
 		uri = item->text( 1 );
 	m_block = true;
diff --git a/kdeprint/management/kxmlcommanddlg.cpp b/kdeprint/management/kxmlcommanddlg.cpp
index 474f9b61b..135ebbe4c 100644
--- a/kdeprint/management/kxmlcommanddlg.cpp
+++ b/kdeprint/management/kxmlcommanddlg.cpp
@@ -683,7 +683,7 @@ void KXmlCommandAdvancedDlg::slotRemoveItem()
 	{
 		TQListViewItem	*newCurrent(item->nextSibling());
 		if (!newCurrent)
-			newCurrent = item->tqparent();
+			newCurrent = item->parent();
 		removeItem(item);
 		delete item;
 		m_view->setSelected(newCurrent, true);
@@ -713,7 +713,7 @@ void KXmlCommandAdvancedDlg::slotMoveUp()
 			item->moveItem(after);
 		else
 		{
-			TQListViewItem	*parent = item->tqparent();
+			TQListViewItem	*parent = item->parent();
 			parent->takeItem(item);
 			parent->insertItem(item);
 		}
diff --git a/kdeprint/management/smbview.cpp b/kdeprint/management/smbview.cpp
index f13670591..8692b00bd 100644
--- a/kdeprint/management/smbview.cpp
+++ b/kdeprint/management/smbview.cpp
@@ -196,7 +196,7 @@ void SmbView::setOpen(TQListViewItem *item, bool on)
 			}
 			*m_proc << KProcess::quote (item->text (0));
 			*m_proc << " -W ";
-			*m_proc << KProcess::quote (item->tqparent ()->
+			*m_proc << KProcess::quote (item->parent ()->
 							text (0));
 			if (!krb5ccname)
 			{
@@ -281,7 +281,7 @@ void SmbView::processShares()
 void SmbView::slotSelectionChanged(TQListViewItem *item)
 {
 	if (item && item->depth() == 2)
-		emit printerSelected(item->tqparent()->tqparent()->text(0),item->tqparent()->text(0),item->text(0));
+		emit printerSelected(item->parent()->parent()->text(0),item->parent()->text(0),item->text(0));
 }
 
 void SmbView::abort()
diff --git a/kdeprint/rlpr/kmwrlpr.cpp b/kdeprint/rlpr/kmwrlpr.cpp
index 2f1d8b076..1c037ae47 100644
--- a/kdeprint/rlpr/kmwrlpr.cpp
+++ b/kdeprint/rlpr/kmwrlpr.cpp
@@ -100,7 +100,7 @@ void KMWRlpr::initPrinter(KMPrinter *p)
 		item = rlpr_findChild(item->firstChild(),m_queue->text());
 		if (item)
 		{
-			item->tqparent()->setOpen(true);
+			item->parent()->setOpen(true);
 			m_view->setCurrentItem(item);
 			m_view->ensureItemVisible(item);
 		}
@@ -203,7 +203,7 @@ void KMWRlpr::slotPrinterSelected(TQListViewItem *item)
 {
 	if (item && item->depth() == 1)
 	{
-		m_host->setText(item->tqparent()->text(0));
+		m_host->setText(item->parent()->text(0));
 		m_queue->setText(item->text(0));
 	}
 }
diff --git a/kdeui/kactionclasses.cpp b/kdeui/kactionclasses.cpp
index 4c757157d..f1ff7e169 100644
--- a/kdeui/kactionclasses.cpp
+++ b/kdeui/kactionclasses.cpp
@@ -176,7 +176,7 @@ void KToggleAction::setChecked( bool c )
     updateChecked( i );
 
   if ( c && parent() && !exclusiveGroup().isEmpty() ) {
-    const TQObjectList list = tqparent()->childrenListObject();
+    const TQObjectList list = parent()->childrenListObject();
     if ( !list.isEmpty() ) {
       TQObjectListIt it( list );
       for( ; it.current(); ++it ) {
diff --git a/kdeui/kcompletionbox.cpp b/kdeui/kcompletionbox.cpp
index 4f025803b..7e3d156a2 100644
--- a/kdeui/kcompletionbox.cpp
+++ b/kdeui/kcompletionbox.cpp
@@ -342,7 +342,7 @@ TQRect KCompletionBox::calculateGeometry() const
     // as wide as the combo, and gives the style a chance
     // to adjust it. Do that here as well, for consistency
     const TQObject* combo;
-    if ( d->m_parent && (combo = d->m_parent->tqparent() ) &&
+    if ( d->m_parent && (combo = d->m_parent->parent() ) &&
         combo->inherits(TQCOMBOBOX_OBJECT_NAME_STRING) )
     {
         const TQComboBox* cb = static_cast<const TQComboBox*>(TQT_TQWIDGET_CONST(combo));
diff --git a/kdeui/kdockwidget.cpp b/kdeui/kdockwidget.cpp
index 5590299fc..70f81138a 100644
--- a/kdeui/kdockwidget.cpp
+++ b/kdeui/kdockwidget.cpp
@@ -422,12 +422,12 @@ void KDockWidgetHeader::setDragEnabled(bool b)
 #ifndef NO_KDE2
 void KDockWidgetHeader::saveConfig( KConfig* c )
 {
-  c->writeEntry( TQString("%1%2").arg(tqparent()->name()).arg(":stayButton"), stayButton->isOn() );
+  c->writeEntry( TQString("%1%2").arg(parent()->name()).arg(":stayButton"), stayButton->isOn() );
 }
 
 void KDockWidgetHeader::loadConfig( KConfig* c )
 {
-  setDragEnabled( !c->readBoolEntry( TQString("%1%2").arg(tqparent()->name()).arg(":stayButton"), false ) );
+  setDragEnabled( !c->readBoolEntry( TQString("%1%2").arg(parent()->name()).arg(":stayButton"), false ) );
 }
 #endif
 
@@ -1238,7 +1238,7 @@ void KDockWidget::setForcedFixedWidth(int w)
 	setFixedWidth(w);
 	if (!parent()) return;
 	if (parent()->inherits("KDockSplitter"))
-		::tqqt_cast<KDockSplitter*>(tqparent())->setForcedFixedWidth(this,w);
+		::tqqt_cast<KDockSplitter*>(parent())->setForcedFixedWidth(this,w);
 }
 
 void KDockWidget::setForcedFixedHeight(int h)
@@ -1247,7 +1247,7 @@ void KDockWidget::setForcedFixedHeight(int h)
 	setFixedHeight(h);
 	if (!parent()) return;
 	if (parent()->inherits("KDockSplitter"))
-		::tqqt_cast<KDockSplitter*>(tqparent())->setForcedFixedHeight(this,h);
+		::tqqt_cast<KDockSplitter*>(parent())->setForcedFixedHeight(this,h);
 }
 
 int KDockWidget::forcedFixedWidth()
@@ -1270,7 +1270,7 @@ void KDockWidget::restoreFromForcedFixedSize()
 	setMaximumHeight(32000);
 	if (!parent()) return;
 	if (parent()->inherits("KDockSplitter"))
-		::tqqt_cast<KDockSplitter*>(tqparent())->restoreFromForcedFixedSize(this);
+		::tqqt_cast<KDockSplitter*>(parent())->restoreFromForcedFixedSize(this);
 }
 
 void KDockWidget::toDesktop()
@@ -3180,7 +3180,7 @@ void KDockContainer::activateOverlapMode(int nonOverlapSize) {
 	if (parentDockWidget() && parentDockWidget()->parent()) {
 		kdDebug(282)<<"KDockContainer::activateOverlapMode: recalculating sizes"<<endl;
 		KDockSplitter *sp= ::tqqt_cast<KDockSplitter*>(parentDockWidget()->
-			tqparent());
+			parent());
 		if (sp)
 			sp->resizeEvent(0);
 	}
@@ -3192,7 +3192,7 @@ void KDockContainer::deactivateOverlapMode() {
 	if (parentDockWidget() && parentDockWidget()->parent()) {
 		kdDebug(282)<<"KDockContainer::deactivateOverlapMode: recalculating sizes"<<endl;
 		KDockSplitter *sp= ::tqqt_cast<KDockSplitter*>(parentDockWidget()->
-			tqparent());
+			parent());
 		if (sp)
 			sp->resizeEvent(0);
 		}
diff --git a/kdeui/klistview.cpp b/kdeui/klistview.cpp
index 29c563389..e7b13325d 100644
--- a/kdeui/klistview.cpp
+++ b/kdeui/klistview.cpp
@@ -252,7 +252,7 @@ static TQListViewItem *prevItem (TQListViewItem *pi)
 	/*	Does what the TQListViewItem::previousSibling()
 	 *	of my dreams would do.
 	 */
-	if (pa && pa->tqparent() == pi->tqparent())
+	if (pa && pa->parent() == pi->parent())
 		return pa;
 
 	return 0;
@@ -278,8 +278,8 @@ void KListViewLineEdit::selectNextCell (TQListViewItem *pitem, int column, bool
 	const int ncols = p->columns();
 	const int dir = forward ? +1 : -1;
 	const int restart = forward ? 0 : (ncols - 1);
-	TQListViewItem *top = (pitem && pitem->tqparent())
-		? pitem->tqparent()->firstChild()
+	TQListViewItem *top = (pitem && pitem->parent())
+		? pitem->parent()->firstChild()
 		: p->firstChild();
 	TQListViewItem *pi = pitem;
 
@@ -1100,7 +1100,7 @@ void KListView::findDrop(const TQPoint &pos, TQListViewItem *&parent, TQListView
 
       // Ok, there's one more level of complexity. We may want to become a new
       // sibling, but of an upper-level group, rather than the "above" item
-      TQListViewItem * betterAbove = above->tqparent();
+      TQListViewItem * betterAbove = above->parent();
       TQListViewItem * last = above;
       while ( betterAbove )
       {
@@ -1113,14 +1113,14 @@ void KListView::findDrop(const TQPoint &pos, TQListViewItem *&parent, TQListView
               else
                   break; // not enough on the left, so stop
               last = betterAbove;
-              betterAbove = betterAbove->tqparent(); // up one level
+              betterAbove = betterAbove->parent(); // up one level
           } else
               break; // we're among the child of betterAbove, not after the last one
       }
   }
   // set as sibling
   after = above;
-  parent = after ? after->tqparent() : 0L ;
+  parent = after ? after->parent() : 0L ;
 }
 
 TQListViewItem* KListView::lastChild () const
@@ -1269,7 +1269,7 @@ void KListView::moveItem(TQListViewItem *item, TQListViewItem *parent, TQListVie
     {
       if(i == item)
         return;
-      i = i->tqparent();
+      i = i->parent();
     }
 
   if (after)
@@ -1280,8 +1280,8 @@ void KListView::moveItem(TQListViewItem *item, TQListViewItem *parent, TQListVie
 
   // Basically reimplementing the TQListViewItem(TQListViewItem*, TQListViewItem*) constructor
   // in here, without ever deleting the item.
-  if (item->tqparent())
-        item->tqparent()->takeItem(item);
+  if (item->parent())
+        item->parent()->takeItem(item);
   else
         takeItem(item);
 
@@ -2310,12 +2310,12 @@ bool KListViewItem::isAlternate()
     {
        KListViewItem *item;
        bool previous = true;
-       if (tqparent())
+       if (parent())
        {
-          item = dynamic_cast<KListViewItem *>(tqparent());
+          item = dynamic_cast<KListViewItem *>(parent());
           if (item)
              previous = item->m_odd;
-          item = dynamic_cast<KListViewItem *>(tqparent()->firstChild());
+          item = dynamic_cast<KListViewItem *>(parent()->firstChild());
        }
        else
        {
diff --git a/khtml/khtml_part.cpp b/khtml/khtml_part.cpp
index 0699b799a..5076e1c89 100644
--- a/khtml/khtml_part.cpp
+++ b/khtml/khtml_part.cpp
@@ -233,7 +233,7 @@ void KHTMLPart::init( KHTMLView *view, GUIProfile prof )
   else if ( prof == BrowserViewGUI )
     setXMLFile( "khtml_browser.rc" );
 
-  d = new KHTMLPartPrivate(tqparent());
+  d = new KHTMLPartPrivate(parent());
 
   d->m_view = view;
   setWidget( d->m_view );
@@ -5090,7 +5090,7 @@ void KHTMLPart::slotChildDocCreated()
 
 void KHTMLPart::slotChildURLRequest( const KURL &url, const KParts::URLArgs &args )
 {
-  khtml::ChildFrame *child = frame( TQT_TQOBJECT_CONST(sender())->tqparent() );
+  khtml::ChildFrame *child = frame( TQT_TQOBJECT_CONST(sender())->parent() );
   KHTMLPart *callingHtmlPart = const_cast<KHTMLPart *>(dynamic_cast<const KHTMLPart *>(sender()->parent()));
 
   // TODO: handle child target correctly! currently the script are always executed fur the parent
diff --git a/khtml/khtmlview.cpp b/khtml/khtmlview.cpp
index 75ecea21f..bcf9ede59 100644
--- a/khtml/khtmlview.cpp
+++ b/khtml/khtmlview.cpp
@@ -1285,8 +1285,8 @@ void KHTMLView::viewportMouseMoveEvent( TQMouseEvent * _mouse )
             attr.save_under = True;
             XChangeWindowAttributes( qt_xdisplay(), d->cursor_icon_widget->winId(), CWSaveUnder, &attr );
             d->cursor_icon_widget->resize( icon_pixmap.width(), icon_pixmap.height());
-            if( icon_pixmap.tqmask() )
-                d->cursor_icon_widget->setMask( *icon_pixmap.tqmask());
+            if( icon_pixmap.mask() )
+                d->cursor_icon_widget->setMask( *icon_pixmap.mask());
             else
                 d->cursor_icon_widget->clearMask();
             d->cursor_icon_widget->setBackgroundPixmap( icon_pixmap );
diff --git a/khtml/misc/loader.cpp b/khtml/misc/loader.cpp
index 220c9ea2d..de7d5aea2 100644
--- a/khtml/misc/loader.cpp
+++ b/khtml/misc/loader.cpp
@@ -564,7 +564,7 @@ const TQPixmap &CachedImage::tiled_pixmap(const TQColor& newc, int xWidth, int x
     bgSize = TQSize(xWidth, xHeight);
 
     //See whether we can - and should - pre-blend
-    if (isvalid && (r.hasAlphaChannel() || r.tqmask() )) {
+    if (isvalid && (r.hasAlphaChannel() || r.mask() )) {
         bg = new TQPixmap(xWidth, xHeight, r.depth());
         bg->fill(newc);
         bitBlt(bg, 0, 0, src);
@@ -749,8 +749,8 @@ void CachedImage::movieStatus(int status)
             {
                 TQPixmap* pix = new TQPixmap;
                 pix->convertFromImage( TQImage(p->convertToImage()).convertDepth( 1 ), MonoOnly|AvoidDither );
-                if ( p->tqmask() )
-                    pix->setMask( *p->tqmask() );
+                if ( p->mask() )
+                    pix->setMask( *p->mask() );
                 delete p;
                 p = pix;
                 monochrome = false;
diff --git a/kio/kfile/kopenwith.cpp b/kio/kfile/kopenwith.cpp
index 1822a0fc7..e5754cefb 100644
--- a/kio/kfile/kopenwith.cpp
+++ b/kio/kfile/kopenwith.cpp
@@ -131,7 +131,7 @@ void KAppTreeListItem::activate()
 void KAppTreeListItem::setOpen( bool o )
 {
     if( o && !parsed ) { // fill the children before opening
-        ((KApplicationTree *) tqparent())->addDesktopGroup( path, this );
+        ((KApplicationTree *) parent())->addDesktopGroup( path, this );
         parsed = true;
     }
     TQListViewItem::setOpen( o );
diff --git a/kio/kio/kmimetypechooser.cpp b/kio/kio/kmimetypechooser.cpp
index f55b17caf..c9cdf9a06 100644
--- a/kio/kio/kmimetypechooser.cpp
+++ b/kio/kio/kmimetypechooser.cpp
@@ -189,9 +189,9 @@ void KMimeTypeChooser::loadMimeTypes( const TQStringList &_selectedMimeTypes )
 
 void KMimeTypeChooser::editMimeType()
 {
-  if ( !(d->lvMimeTypes->currentItem() && (d->lvMimeTypes->currentItem())->tqparent()) )
+  if ( !(d->lvMimeTypes->currentItem() && (d->lvMimeTypes->currentItem())->parent()) )
     return;
-  TQString mt = (d->lvMimeTypes->currentItem()->tqparent())->text( 0 ) + "/" + (d->lvMimeTypes->currentItem())->text( 0 );
+  TQString mt = (d->lvMimeTypes->currentItem()->parent())->text( 0 ) + "/" + (d->lvMimeTypes->currentItem())->text( 0 );
   // thanks to libkonq/konq_operations.cc
   connect( KSycoca::self(), TQT_SIGNAL(databaseChanged()),
            this, TQT_SLOT(slotSycocaDatabaseChanged()) );
@@ -205,7 +205,7 @@ void KMimeTypeChooser::editMimeType()
 void KMimeTypeChooser::slotCurrentChanged(TQListViewItem* i)
 {
   if ( d->btnEditMimeType )
-    d->btnEditMimeType->setEnabled( i->tqparent() );
+    d->btnEditMimeType->setEnabled( i->parent() );
 }
 
 void KMimeTypeChooser::slotSycocaDatabaseChanged()
@@ -220,8 +220,8 @@ TQStringList KMimeTypeChooser::mimeTypes() const
   TQListViewItemIterator it( d->lvMimeTypes );
   for (; it.current(); ++it)
   {
-    if ( it.current()->tqparent() && ((TQCheckListItem*)it.current())->isOn() )
-      l << it.current()->tqparent()->text(0) + "/" + it.current()->text(0); // FIXME uncecked, should be Ok unless someone changes mimetypes during this!
+    if ( it.current()->parent() && ((TQCheckListItem*)it.current())->isOn() )
+      l << it.current()->parent()->text(0) + "/" + it.current()->text(0); // FIXME uncecked, should be Ok unless someone changes mimetypes during this!
   }
   return l;
 }
@@ -234,9 +234,9 @@ TQStringList KMimeTypeChooser::patterns() const
   TQListViewItemIterator it( d->lvMimeTypes );
   for (; it.current(); ++it)
   {
-    if ( it.current()->tqparent() && ((TQCheckListItem*)it.current())->isOn() )
+    if ( it.current()->parent() && ((TQCheckListItem*)it.current())->isOn() )
     {
-      p = KMimeType::mimeType( it.current()->tqparent()->text(0) + "/" + it.current()->text(0) );
+      p = KMimeType::mimeType( it.current()->parent()->text(0) + "/" + it.current()->text(0) );
       if ( p->name() != defMT )
         l += p->patterns();
     }
diff --git a/kmdi/kmdi/dockcontainer.cpp b/kmdi/kmdi/dockcontainer.cpp
index 19b013d6b..40e490aa7 100644
--- a/kmdi/kmdi/dockcontainer.cpp
+++ b/kmdi/kmdi/dockcontainer.cpp
@@ -149,7 +149,7 @@ void DockContainer::init()
   if ( parentDockWidget() && parentDockWidget()->parent() )
   {
     KDockSplitter *sp= ::tqqt_cast<KDockSplitter*>(parentDockWidget()->
-                tqparent());
+                parent());
     if ( sp )
       sp->setSeparatorPosX( m_separatorPos );
   }
@@ -421,7 +421,7 @@ void DockContainer::tabClicked(int t)
       if ( parentDockWidget() && parentDockWidget()->parent() )
       {
         KDockSplitter *sp= ::tqqt_cast<KDockSplitter*>(parentDockWidget()->
-                    tqparent());
+                    parent());
         if ( sp )
           m_separatorPos = sp->separatorPos();
       }
@@ -464,8 +464,8 @@ void DockContainer::save(KConfig* cfg,const TQString& group_or_prefix)
 {
   // group name
   TQString grp=cfg->group();
-  cfg->deleteGroup(group_or_prefix+TQString("::%1").arg(tqparent()->name()));
-  cfg->setGroup(group_or_prefix+TQString("::%1").arg(tqparent()->name()));
+  cfg->deleteGroup(group_or_prefix+TQString("::%1").arg(parent()->name()));
+  cfg->setGroup(group_or_prefix+TQString("::%1").arg(parent()->name()));
 
   // save overlap mode
   cfg->writeEntry("overlapMode",isOverlapMode());
@@ -474,7 +474,7 @@ void DockContainer::save(KConfig* cfg,const TQString& group_or_prefix)
   if ( parentDockWidget() && parentDockWidget()->parent() )
   {
     KDockSplitter *sp= ::tqqt_cast<KDockSplitter*>(parentDockWidget()->
-                tqparent());
+                parent());
     if ( sp )
       cfg->writeEntry( "separatorPosition", m_separatorPos );
   }
@@ -507,7 +507,7 @@ void DockContainer::save(KConfig* cfg,const TQString& group_or_prefix)
 void DockContainer::load(KConfig* cfg,const TQString& group_or_prefix)
 {
   TQString grp=cfg->group();
-  cfg->setGroup(group_or_prefix+TQString("::%1").arg(tqparent()->name()));
+  cfg->setGroup(group_or_prefix+TQString("::%1").arg(parent()->name()));
 
   if (cfg->readBoolEntry("overlapMode"))
     activateOverlapMode( m_vertical?m_tb->width():m_tb->height() );
diff --git a/kmdi/kmdi/guiclient.cpp b/kmdi/kmdi/guiclient.cpp
index 935378d08..b58b538c7 100644
--- a/kmdi/kmdi/guiclient.cpp
+++ b/kmdi/kmdi/guiclient.cpp
@@ -202,7 +202,7 @@ void ToggleToolViewAction::anDWChanged()
     setChecked(true);
   else if (isChecked() && (m_dw->parentDockTabGroup() &&
           ((::tqqt_cast<KDockWidget*>(m_dw->parentDockTabGroup()->
-                  tqparent()))->mayBeShow())))
+                  parent()))->mayBeShow())))
     setChecked(false);
 }
 
diff --git a/kmdi/kmdichildfrm.cpp b/kmdi/kmdichildfrm.cpp
index 47bb7b49f..4e57649c7 100644
--- a/kmdi/kmdichildfrm.cpp
+++ b/kmdi/kmdichildfrm.cpp
@@ -1068,7 +1068,7 @@ void KMdiChildFrm::doResize( bool captionOnly )
 static bool hasParent( TQObject* par, TQObject* o )
 {
 	while ( o && o != par )
-		o = o->tqparent();
+		o = o->parent();
 	return o == par;
 }
 
@@ -1086,7 +1086,7 @@ bool KMdiChildFrm::eventFilter( TQObject *obj, TQEvent *e )
 			while ( ( pObj != 0L ) && !bIsChild )
 			{
 				bIsChild = ( TQT_BASE_OBJECT(pObj) == TQT_BASE_OBJECT(this) );
-				pObj = pObj->tqparent();
+				pObj = pObj->parent();
 			}
 			// unset the resize cursor if the cursor moved from the frame into a inner widget
 			if ( bIsChild )
@@ -1112,7 +1112,7 @@ bool KMdiChildFrm::eventFilter( TQObject *obj, TQEvent *e )
 						m_pClient->activate();
 					}
 					
-					if ( ( TQT_BASE_OBJECT(obj->tqparent()) != TQT_BASE_OBJECT(m_pCaption) ) && ( TQT_BASE_OBJECT(obj) != TQT_BASE_OBJECT(m_pCaption) ) )
+					if ( ( TQT_BASE_OBJECT(obj->parent()) != TQT_BASE_OBJECT(m_pCaption) ) && ( TQT_BASE_OBJECT(obj) != TQT_BASE_OBJECT(m_pCaption) ) )
 					{
 						TQWidget* w = ( TQWidget* ) obj;
 						if ( ( w->focusPolicy() == TQ_ClickFocus ) || ( w->focusPolicy() == TQ_StrongFocus ) )
diff --git a/kmdi/kmdidockcontainer.cpp b/kmdi/kmdidockcontainer.cpp
index 6dc2a5cd0..65fe98e02 100644
--- a/kmdi/kmdidockcontainer.cpp
+++ b/kmdi/kmdidockcontainer.cpp
@@ -170,9 +170,9 @@ void KMdiDockContainer::init()
 	if (!overlap) deactivateOverlapMode();
 
 	// try to restore splitter size
-	if ( parentDockWidget() && parentDockWidget()->tqparent() )
+	if ( parentDockWidget() && parentDockWidget()->parent() )
 	{
-		KDockSplitter * sp = ::tqqt_cast<KDockSplitter*>( parentDockWidget()->tqparent() );
+		KDockSplitter * sp = ::tqqt_cast<KDockSplitter*>( parentDockWidget()->parent() );
 		if ( sp )
 			sp->setSeparatorPosX( m_separatorPos );
 	}
@@ -465,9 +465,9 @@ void KMdiDockContainer::tabClicked( int t )
 	{
 		kdDebug( 760 ) << k_funcinfo << "Tab " << t << " was just deactiviated" << endl;
 		// try save splitter position
-		if ( parentDockWidget() && parentDockWidget()->tqparent() )
+		if ( parentDockWidget() && parentDockWidget()->parent() )
 		{
-			KDockSplitter * sp = ::tqqt_cast<KDockSplitter*>( parentDockWidget()->tqparent() );
+			KDockSplitter * sp = ::tqqt_cast<KDockSplitter*>( parentDockWidget()->parent() );
 			if ( sp )
 				m_separatorPos = sp->separatorPos();
 		}
@@ -517,7 +517,7 @@ void KMdiDockContainer::save( TQDomElement& dockEl )
 	TQDomDocument doc = dockEl.ownerDocument();
 	TQDomElement el;
 	el = doc.createElement( "name" );
-	el.appendChild( doc.createTextNode( TQString( "%1" ).arg( tqparent() ->name() ) ) );
+	el.appendChild( doc.createTextNode( TQString( "%1" ).arg( parent() ->name() ) ) );
 	dockEl.appendChild( el );
 	el = doc.createElement( "overlapMode" );
 	el.appendChild( doc.createTextNode( isOverlapMode() ? "true" : "false" ) );
@@ -627,8 +627,8 @@ void KMdiDockContainer::load( TQDomElement& dockEl )
 void KMdiDockContainer::save( KConfig* cfg, const TQString& group_or_prefix )
 {
 	TQString grp = cfg->group();
-	cfg->deleteGroup( group_or_prefix + TQString( "::%1" ).arg( tqparent() ->name() ) );
-	cfg->setGroup( group_or_prefix + TQString( "::%1" ).arg( tqparent() ->name() ) );
+	cfg->deleteGroup( group_or_prefix + TQString( "::%1" ).arg( parent() ->name() ) );
+	cfg->setGroup( group_or_prefix + TQString( "::%1" ).arg( parent() ->name() ) );
 
 	if ( isOverlapMode() )
 		cfg->writeEntry( "overlapMode", "true" );
@@ -636,9 +636,9 @@ void KMdiDockContainer::save( KConfig* cfg, const TQString& group_or_prefix )
 		cfg->writeEntry( "overlapMode", "false" );
 
 	// try to save the splitter position
-	if ( parentDockWidget() && parentDockWidget() ->tqparent() )
+	if ( parentDockWidget() && parentDockWidget() ->parent() )
 	{
-		KDockSplitter * sp = ::tqqt_cast<KDockSplitter*>( parentDockWidget() -> tqparent() );
+		KDockSplitter * sp = ::tqqt_cast<KDockSplitter*>( parentDockWidget() -> parent() );
 		if ( sp )
 			cfg->writeEntry( "separatorPosition", m_separatorPos );
 	}
@@ -674,7 +674,7 @@ void KMdiDockContainer::save( KConfig* cfg, const TQString& group_or_prefix )
 void KMdiDockContainer::load( KConfig* cfg, const TQString& group_or_prefix )
 {
 	TQString grp = cfg->group();
-	cfg->setGroup( group_or_prefix + TQString( "::%1" ).arg( tqparent() ->name() ) );
+	cfg->setGroup( group_or_prefix + TQString( "::%1" ).arg( parent() ->name() ) );
 
 	if ( cfg->readEntry( "overlapMode" ) != "false" )
 		activateOverlapMode( m_horizontal?m_tb->height():m_tb->width() );
diff --git a/kmdi/kmdiguiclient.cpp b/kmdi/kmdiguiclient.cpp
index a34df98f6..f65a21f48 100644
--- a/kmdi/kmdiguiclient.cpp
+++ b/kmdi/kmdiguiclient.cpp
@@ -84,7 +84,7 @@ void ToggleToolViewAction::anDWChanged()
 		setChecked( true );
 	else if ( isChecked() && ( m_dw->parentDockTabGroup() &&
 	                           ( ( ::tqqt_cast<KDockWidget*>( m_dw->parentDockTabGroup() ->
-	                                                          tqparent() ) ) ->mayBeShow() ) ) )
+	                                                          parent() ) ) ->mayBeShow() ) ) )
 		setChecked( false );
 }
 
diff --git a/kstyles/asteroid/asteroid.cpp b/kstyles/asteroid/asteroid.cpp
index 9d09055b1..578d8f9e2 100644
--- a/kstyles/asteroid/asteroid.cpp
+++ b/kstyles/asteroid/asteroid.cpp
@@ -116,7 +116,7 @@ void AsteroidStyle::polish(TQWidget *w)
 		if (curparent->inherits("KonqFileTip") || curparent->inherits("AppletItem")) {
 			isProtectedObject = true;
 		}
-		curparent = curparent->tqparent();
+		curparent = curparent->parent();
 	}
 	if (!isProtectedObject)
 		w->setPalette(wp);
diff --git a/kstyles/keramik/keramik.cpp b/kstyles/keramik/keramik.cpp
index cb3078063..49e024442 100644
--- a/kstyles/keramik/keramik.cpp
+++ b/kstyles/keramik/keramik.cpp
@@ -1976,7 +1976,7 @@ void KeramikStyle::tqdrawComplexControl( TQ_ComplexControl control,
 			{
 				//Double-buffer only when we are in the slower full-blend mode
 				if (widget->parent() &&
-						( widget->tqparent()->inherits(TQTOOLBAR_OBJECT_NAME_STRING)|| !qstrcmp(widget->tqparent()->name(), kdeToolbarWidget) ) )
+						( widget->parent()->inherits(TQTOOLBAR_OBJECT_NAME_STRING)|| !qstrcmp(widget->parent()->name(), kdeToolbarWidget) ) )
 				{
 					buf = new TQPixmap( r.width(), r.height() );
 					br.setX(0);
diff --git a/kstyles/keramik/pixmaploader.cpp b/kstyles/keramik/pixmaploader.cpp
index 414965c01..00b4626fd 100644
--- a/kstyles/keramik/pixmaploader.cpp
+++ b/kstyles/keramik/pixmaploader.cpp
@@ -422,7 +422,7 @@ void TilePainter::draw( TQPainter *p, int x, int y, int width, int height, const
 					}
 					else
 					{
-						const TQBitmap* mask  = scale( col, row, w, h, color,  bg, disabled, false ).tqmask();
+						const TQBitmap* mask  = scale( col, row, w, h, color,  bg, disabled, false ).mask();
 						if (mask)
 						{
 							p->setBackgroundColor(Qt::color0);
@@ -442,7 +442,7 @@ void TilePainter::draw( TQPainter *p, int x, int y, int width, int height, const
 					}
 					else
 					{
-						const TQBitmap* mask = tile( col, row, color, bg, disabled, false ).tqmask();
+						const TQBitmap* mask = tile( col, row, color, bg, disabled, false ).mask();
 						if (mask)
 						{
 							p->setBackgroundColor(Qt::color0);
diff --git a/kstyles/kthemestyle/kthemebase.cpp b/kstyles/kthemestyle/kthemebase.cpp
index 70d820212..a4da66736 100644
--- a/kstyles/kthemestyle/kthemebase.cpp
+++ b/kstyles/kthemestyle/kthemebase.cpp
@@ -239,7 +239,7 @@ void KThemeBase::generateBorderPix( int i )
     if ( pbPixmaps[ i ] )
     {
         // evidently I have to do masks manually...
-        const TQBitmap * srcMask = pbPixmaps[ i ] ->tqmask();
+        const TQBitmap * srcMask = pbPixmaps[ i ] ->mask();
         TQBitmap destMask( pbWidth[ i ], pbWidth[ i ] );
         TQPixmap tmp( pbWidth[ i ], pbWidth[ i ] );
 
@@ -810,7 +810,7 @@ KThemePixmap* KThemeBase::scaleBorder( int w, int h, WidgetType widget ) const
         mPainter.begin( &mask );
 
         TQPixmap *tmp = borderPixmap( widget ) ->border( KThemePixmap::TopLeft );
-        const TQBitmap *srcMask = tmp->tqmask();
+        const TQBitmap *srcMask = tmp->mask();
         int bdWidth = tmp->width();
 
         bitBlt( TQT_TQPAINTDEVICE(pixmap), 0, 0, TQT_TQPAINTDEVICE(tmp), 0, 0, bdWidth, bdWidth,
@@ -823,7 +823,7 @@ KThemePixmap* KThemeBase::scaleBorder( int w, int h, WidgetType widget ) const
 
 
         tmp = borderPixmap( widget ) ->border( KThemePixmap::TopRight );
-        srcMask = tmp->tqmask();
+        srcMask = tmp->mask();
         bitBlt( TQT_TQPAINTDEVICE(pixmap), w - bdWidth, 0, TQT_TQPAINTDEVICE(tmp), 0, 0, bdWidth,
                 bdWidth, TQt::CopyROP, false );
         if ( srcMask )
@@ -833,7 +833,7 @@ KThemePixmap* KThemeBase::scaleBorder( int w, int h, WidgetType widget ) const
             mPainter.fillRect( w - bdWidth, 0, bdWidth, bdWidth, color1 );
 
         tmp = borderPixmap( widget ) ->border( KThemePixmap::BottomLeft );
-        srcMask = tmp->tqmask();
+        srcMask = tmp->mask();
         bitBlt( TQT_TQPAINTDEVICE(pixmap), 0, h - bdWidth, TQT_TQPAINTDEVICE(tmp), 0, 0, bdWidth,
                 bdWidth, TQt::CopyROP, false );
         if ( srcMask )
@@ -843,7 +843,7 @@ KThemePixmap* KThemeBase::scaleBorder( int w, int h, WidgetType widget ) const
             mPainter.fillRect( 0, h - bdWidth, bdWidth, bdWidth, color1 );
 
         tmp = borderPixmap( widget ) ->border( KThemePixmap::BottomRight );
-        srcMask = tmp->tqmask();
+        srcMask = tmp->mask();
         bitBlt( TQT_TQPAINTDEVICE(pixmap), w - bdWidth, h - bdWidth, TQT_TQPAINTDEVICE(tmp), 0, 0,
                 bdWidth, bdWidth, TQt::CopyROP, false );
         if ( srcMask )
@@ -857,7 +857,7 @@ KThemePixmap* KThemeBase::scaleBorder( int w, int h, WidgetType widget ) const
         if ( w - bdWidth * 2 > 0 )
         {
             tmp = borderPixmap( widget ) ->border( KThemePixmap::Top );
-            srcMask = tmp->tqmask();
+            srcMask = tmp->mask();
             p.drawTiledPixmap( bdWidth, 0, w - bdWidth * 2, bdWidth, *tmp );
             if ( srcMask )
                 bitBlt( TQT_TQPAINTDEVICE(&mask), bdWidth, 0, KDE_TQBITMAP_TO_TQPAINTDEVICE(srcMask), 0, 0,
@@ -866,7 +866,7 @@ KThemePixmap* KThemeBase::scaleBorder( int w, int h, WidgetType widget ) const
                 mPainter.fillRect( bdWidth, 0, w - bdWidth * 2, bdWidth, color1 );
 
             tmp = borderPixmap( widget ) ->border( KThemePixmap::Bottom );
-            srcMask = tmp->tqmask();
+            srcMask = tmp->mask();
             p.drawTiledPixmap( bdWidth, h - bdWidth, w - bdWidth * 2, bdWidth,
                                *tmp );
             if ( srcMask )
@@ -879,7 +879,7 @@ KThemePixmap* KThemeBase::scaleBorder( int w, int h, WidgetType widget ) const
         if ( h - bdWidth * 2 > 0 )
         {
             tmp = borderPixmap( widget ) ->border( KThemePixmap::Left );
-            srcMask = tmp->tqmask();
+            srcMask = tmp->mask();
             p.drawTiledPixmap( 0, bdWidth, bdWidth, h - bdWidth * 2, *tmp );
             if ( srcMask )
                 bitBlt( TQT_TQPAINTDEVICE(&mask), 0, bdWidth, KDE_TQBITMAP_TO_TQPAINTDEVICE(srcMask), 0, 0,
@@ -888,7 +888,7 @@ KThemePixmap* KThemeBase::scaleBorder( int w, int h, WidgetType widget ) const
                 mPainter.fillRect( 0, bdWidth, bdWidth, h - bdWidth * 2, color1 );
 
             tmp = borderPixmap( widget ) ->border( KThemePixmap::Right );
-            srcMask = tmp->tqmask();
+            srcMask = tmp->mask();
             p.drawTiledPixmap( w - bdWidth, bdWidth, bdWidth, h - bdWidth * 2,
                                *tmp );
             if ( srcMask )
diff --git a/kstyles/kthemestyle/kthemestyle.cpp b/kstyles/kthemestyle/kthemestyle.cpp
index 59ff2c30f..96cbc9b88 100644
--- a/kstyles/kthemestyle/kthemestyle.cpp
+++ b/kstyles/kthemestyle/kthemestyle.cpp
@@ -895,7 +895,7 @@ void KThemeStyle::drawPrimitive ( PrimitiveElement pe, TQPainter * p, const TQRe
             {
                 if ( isPixmap( ( flags & Style_On || flags & Style_Down ) ? ExIndicatorOn : ExIndicatorOff ) )
                 {
-                    const TQBitmap * mask = uncached( ( flags & Style_On || flags & Style_Down ) ? ExIndicatorOn : ExIndicatorOff ) ->tqmask();
+                    const TQBitmap * mask = uncached( ( flags & Style_On || flags & Style_Down ) ? ExIndicatorOn : ExIndicatorOff ) ->mask();
                     if ( mask )
                     {
                         p->setPen( Qt::color1 );
@@ -913,7 +913,7 @@ void KThemeStyle::drawPrimitive ( PrimitiveElement pe, TQPainter * p, const TQRe
                 if ( isPixmap( ( flags & Style_On ) ? IndicatorOn : IndicatorOff ) )
                 {
                     const TQBitmap * mask = uncached( ( flags & Style_On ) ? IndicatorOn :
-                                                     IndicatorOff ) ->tqmask();
+                                                     IndicatorOff ) ->mask();
                     if ( mask )
                     {
                         p->setPen( Qt::color1 );
@@ -1853,8 +1853,8 @@ void KThemeStyle::drawKStylePrimitive( KStylePrimitive kpe,
                             TQWMatrix r270;
                             r270.rotate( 270 );
                             vsliderCache = new TQPixmap( uncached( Slider ) ->xForm( r270 ) );
-                            if ( uncached( Slider ) ->tqmask() )
-                                vsliderCache->setMask( uncached( Slider ) ->tqmask() ->xForm( r270 ) );
+                            if ( uncached( Slider ) ->mask() )
+                                vsliderCache->setMask( uncached( Slider ) ->mask() ->xForm( r270 ) );
                         }
                         bitBlt( p->device(), x + ( w - vsliderCache->width() ) / 2, y,
                                 vsliderCache );