From db9d51186b28bc2252032458b433ba5f8d1972bc Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 10 Aug 2011 22:19:39 +0000 Subject: 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 --- kdeui/kactionclasses.cpp | 2 +- kdeui/kcompletionbox.cpp | 2 +- kdeui/kdockwidget.cpp | 14 +++++++------- kdeui/klistview.cpp | 24 ++++++++++++------------ 4 files changed, 21 insertions(+), 21 deletions(-) (limited to 'kdeui') 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(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(tqparent())->setForcedFixedWidth(this,w); + ::tqqt_cast(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(tqparent())->setForcedFixedHeight(this,h); + ::tqqt_cast(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(tqparent())->restoreFromForcedFixedSize(this); + ::tqqt_cast(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"<(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"<(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(tqparent()); + item = dynamic_cast(parent()); if (item) previous = item->m_odd; - item = dynamic_cast(tqparent()->firstChild()); + item = dynamic_cast(parent()->firstChild()); } else { -- cgit v1.2.1