diff options
Diffstat (limited to 'src/bnpview.cpp')
| -rw-r--r-- | src/bnpview.cpp | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/src/bnpview.cpp b/src/bnpview.cpp index 8d6c9e6..2804f3d 100644 --- a/src/bnpview.cpp +++ b/src/bnpview.cpp @@ -555,11 +555,11 @@ void BNPView::setupActions() // At this stage, main.cpp has not set kapp->mainWidget(), so Global::runInsideKontact() // returns true. We do it ourself: bool runInsideKontact = true; - TQWidget *tqparentWidget = (TQWidget*) tqparent(); - while (tqparentWidget) { - if (tqparentWidget->inherits("MainWindow")) + TQWidget *parentWidget = (TQWidget*) tqparent(); + while (parentWidget) { + if (parentWidget->inherits("MainWindow")) runInsideKontact = false; - tqparentWidget = (TQWidget*) tqparentWidget->tqparent(); + parentWidget = (TQWidget*) parentWidget->tqparent(); } // Use the "basket" incon in Kontact so it is consistent with the Kontact "New..." icon @@ -697,15 +697,15 @@ void BNPView::save() // } } -void BNPView::save(TQListViewItem *firstItem, TQDomDocument &document, TQDomElement &tqparentElement) +void BNPView::save(TQListViewItem *firstItem, TQDomDocument &document, TQDomElement &parentElement) { TQListViewItem *item = firstItem; while (item) { // Basket *basket = ((BasketListViewItem*)item)->basket(); - TQDomElement basketElement = this->basketElement(item, document, tqparentElement); + TQDomElement basketElement = this->basketElement(item, document, parentElement); /* TQDomElement basketElement = document.createElement("basket"); - tqparentElement.appendChild(basketElement); + parentElement.appendChild(basketElement); // Save Attributes: basketElement.setAttribute("folderName", basket->folderName()); if (item->firstChild()) // If it can be expanded/folded: @@ -725,11 +725,11 @@ void BNPView::save(TQListViewItem *firstItem, TQDomDocument &document, TQDomElem } } -TQDomElement BNPView::basketElement(TQListViewItem *item, TQDomDocument &document, TQDomElement &tqparentElement) +TQDomElement BNPView::basketElement(TQListViewItem *item, TQDomDocument &document, TQDomElement &parentElement) { Basket *basket = ((BasketListViewItem*)item)->basket(); TQDomElement basketElement = document.createElement("basket"); - tqparentElement.appendChild(basketElement); + parentElement.appendChild(basketElement); // Save Attributes: basketElement.setAttribute("folderName", basket->folderName()); if (item->firstChild()) // If it can be expanded/folded: @@ -743,9 +743,9 @@ TQDomElement BNPView::basketElement(TQListViewItem *item, TQDomDocument &documen return basketElement; } -void BNPView::saveSubHierarchy(TQListViewItem *item, TQDomDocument &document, TQDomElement &tqparentElement, bool recursive) +void BNPView::saveSubHierarchy(TQListViewItem *item, TQDomDocument &document, TQDomElement &parentElement, bool recursive) { - TQDomElement element = basketElement(item, document, tqparentElement); + TQDomElement element = basketElement(item, document, parentElement); if (recursive && item->firstChild()) save(item->firstChild(), document, element); } @@ -832,11 +832,11 @@ bool BNPView::canExpand() return item->firstChild(); } -BasketListViewItem* BNPView::appendBasket(Basket *basket, TQListViewItem *tqparentItem) +BasketListViewItem* BNPView::appendBasket(Basket *basket, TQListViewItem *parentItem) { BasketListViewItem *newBasketItem; - if (tqparentItem) - newBasketItem = new BasketListViewItem(tqparentItem, ((BasketListViewItem*)tqparentItem)->lastChild(), basket); + if (parentItem) + newBasketItem = new BasketListViewItem(parentItem, ((BasketListViewItem*)parentItem)->lastChild(), basket); else { TQListViewItem *child = m_tree->firstChild(); TQListViewItem *lastChild = 0; @@ -1106,7 +1106,7 @@ Basket* BNPView::currentBasket() return 0; } -Basket* BNPView::tqparentBasketOf(Basket *basket) +Basket* BNPView::parentBasketOf(Basket *basket) { BasketListViewItem *item = (BasketListViewItem*)(listViewItemForBasket(basket)->tqparent()); if (item) @@ -1134,7 +1134,7 @@ void BNPView::setCurrentBasket(Basket *basket) // If the window has changed size, only the current basket receive the event, // the others will receive ony one just before they are shown. // But this triggers unwanted animations, so we eliminate it: - basket->retqlayoutNotes(/*animate=*/false); + basket->relayoutNotes(/*animate=*/false); basket->openBasket(); setCaption(item->basket()->basketName()); countsChanged(basket); @@ -1192,14 +1192,14 @@ void BNPView::setTreePlacement(bool onLeft) kapp->postEvent( this, new TQResizeEvent(size(), size()) ); } -void BNPView::retqlayoutAllBaskets() +void BNPView::relayoutAllBaskets() { TQListViewItemIterator it(m_tree); while (it.current()) { BasketListViewItem *item = ((BasketListViewItem*)it.current()); //item->basket()->unbufferizeAll(); item->basket()->unsetNotesWidth(); - item->basket()->retqlayoutNotes(true); + item->basket()->relayoutNotes(true); ++it; } } @@ -1211,7 +1211,7 @@ void BNPView::recomputeAllStyles() BasketListViewItem *item = ((BasketListViewItem*)it.current()); item->basket()->recomputeAllStyles(); item->basket()->unsetNotesWidth(); - item->basket()->retqlayoutNotes(true); + item->basket()->relayoutNotes(true); ++it; } } @@ -1905,7 +1905,7 @@ void BNPView::askNewSubBasket() void BNPView::askNewSiblingBasket() { - askNewBasket( /*tqparent=*/tqparentBasketOf(currentBasket()), /*pickPropertiesOf=*/currentBasket() ); + askNewBasket( /*tqparent=*/parentBasketOf(currentBasket()), /*pickPropertiesOf=*/currentBasket() ); } void BNPView::globalPasteInCurrentBasket() |