From 631d7b9b0878ca3842496b5719f9c5803335e150 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/applications/basket@1246260 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- src/bnpview.cpp | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) (limited to 'src/bnpview.cpp') diff --git a/src/bnpview.cpp b/src/bnpview.cpp index ee35bf3..d483c53 100644 --- a/src/bnpview.cpp +++ b/src/bnpview.cpp @@ -80,9 +80,9 @@ const int BNPView::c_delayTooltipTime = 275; -BNPView::BNPView(TQWidget *tqparent, const char *name, KXMLGUIClient *aGUIClient, +BNPView::BNPView(TQWidget *parent, const char *name, KXMLGUIClient *aGUIClient, KActionCollection *actionCollection, BasketStatusBar *bar) - : DCOPObject("BasketIface"), TQSplitter(Qt::Horizontal, tqparent, name), m_actLockBasket(0), m_actPassBasket(0), + : DCOPObject("BasketIface"), TQSplitter(Qt::Horizontal, parent, name), m_actLockBasket(0), m_actPassBasket(0), m_loading(true), m_newBasketPopup(false), m_firstShow(true), m_regionGrabber(0), m_passiveDroppedSelection(0), m_passivePopup(0), m_actionCollection(actionCollection), m_guiClient(aGUIClient), m_statusbar(bar), m_tryHideTimer(0), m_hideTimer(0) @@ -268,7 +268,7 @@ void BNPView::setupGlobalShortcuts() KGlobalAccel *globalAccel = Global::globalAccel; // Better for the following lines // Ctrl+Shift+W only works when started standalone: - TQWidget *basketMainWindow = (TQWidget*) (Global::bnpView->tqparent()->inherits("MainWindow") ? Global::bnpView->tqparent() : 0); + TQWidget *basketMainWindow = (TQWidget*) (Global::bnpView->parent()->inherits("MainWindow") ? Global::bnpView->parent() : 0); if (basketMainWindow) { globalAccel->insert( "global_show_hide_main_window", i18n("Show/hide main window"), @@ -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 *parentWidget = (TQWidget*) tqparent(); + TQWidget *parentWidget = (TQWidget*) parent(); while (parentWidget) { if (parentWidget->inherits("MainWindow")) runInsideKontact = false; - parentWidget = (TQWidget*) parentWidget->tqparent(); + parentWidget = (TQWidget*) parentWidget->parent(); } // Use the "basket" incon in Kontact so it is consistent with the Kontact "New..." icon @@ -658,9 +658,9 @@ void BNPView::slotContextMenu(KListView */*listView*/, TQListViewItem *item, con } else { menuName = "tab_bar_popup"; /* - * "File -> New" create a new basket with the same tqparent basket as the the current one. + * "File -> New" create a new basket with the same parent basket as the the current one. * But when invoked when right-clicking the empty area at the bottom of the basket tree, - * it is obvious the user want to create a new basket at the bottom of the tree (with no tqparent). + * it is obvious the user want to create a new basket at the bottom of the tree (with no parent). * So we set a temporary variable during the time the popup menu is shown, * so the slot askNewBasket() will do the right thing: */ @@ -803,11 +803,11 @@ Basket* BNPView::loadBasket(const TQString &folderName) return basket; } -int BNPView::basketCount(TQListViewItem *tqparent) +int BNPView::basketCount(TQListViewItem *parent) { int count = 0; - TQListViewItem *item = (tqparent ? tqparent->firstChild() : m_tree->firstChild()); + TQListViewItem *item = (parent ? parent->firstChild() : m_tree->firstChild()); while (item) { count += 1 + basketCount(item); item = item->nextSibling(); @@ -821,7 +821,7 @@ bool BNPView::canFold() BasketListViewItem *item = listViewItemForBasket(currentBasket()); if (!item) return false; - return item->tqparent() || (item->firstChild() && item->isOpen()); + return item->parent() || (item->firstChild() && item->isOpen()); } bool BNPView::canExpand() @@ -852,10 +852,10 @@ BasketListViewItem* BNPView::appendBasket(Basket *basket, TQListViewItem *parent return newBasketItem; } -void BNPView::loadNewBasket(const TQString &folderName, const TQDomElement &properties, Basket *tqparent) +void BNPView::loadNewBasket(const TQString &folderName, const TQDomElement &properties, Basket *parent) { Basket *basket = loadBasket(folderName); - appendBasket(basket, (basket ? listViewItemForBasket(tqparent) : 0)); + appendBasket(basket, (basket ? listViewItemForBasket(parent) : 0)); basket->loadProperties(properties); setCurrentBasket(basket); // save(); @@ -922,7 +922,7 @@ void BNPView::foldBasket() { BasketListViewItem *item = listViewItemForBasket(currentBasket()); if (item && !item->firstChild()) - item->setOpen(false); // If Alt+Left is hitted and there is nothing to close, make sure the focus will go to the tqparent basket + item->setOpen(false); // If Alt+Left is hitted and there is nothing to close, make sure the focus will go to the parent basket TQKeyEvent* keyEvent = new TQKeyEvent(TQEvent::KeyPress, TQt::Key_Left, 0, 0); TQApplication::postEvent(m_tree, keyEvent); @@ -948,7 +948,7 @@ bool BNPView::convertTexts() { bool convertedNotes = false; KProgressDialog dialog( - /*tqparent=*/0, + /*parent=*/0, /*name=*/"", /*caption=*/i18n("Plain Text Notes Conversion"), /*text=*/i18n("Converting plain text notes to rich text ones..."), @@ -1108,7 +1108,7 @@ Basket* BNPView::currentBasket() Basket* BNPView::parentBasketOf(Basket *basket) { - BasketListViewItem *item = (BasketListViewItem*)(listViewItemForBasket(basket)->tqparent()); + BasketListViewItem *item = (BasketListViewItem*)(listViewItemForBasket(basket)->parent()); if (item) return item->basket(); else @@ -1155,13 +1155,13 @@ void BNPView::removeBasket(Basket *basket) // Find a new basket to switch to and select it. // Strategy: get the next sibling, or the previous one if not found. - // If there is no such one, get the tqparent basket: + // If there is no such one, get the parent basket: BasketListViewItem *basketItem = listViewItemForBasket(basket); BasketListViewItem *nextBasketItem = (BasketListViewItem*)(basketItem->nextSibling()); if (!nextBasketItem) nextBasketItem = basketItem->prevSibling(); if (!nextBasketItem) - nextBasketItem = (BasketListViewItem*)(basketItem->tqparent()); + nextBasketItem = (BasketListViewItem*)(basketItem->parent()); if (nextBasketItem) setCurrentBasket(nextBasketItem->basket()); @@ -1241,7 +1241,7 @@ void BNPView::filterPlacementChanged(bool onTop) TQListViewItemIterator it(m_tree); while (it.current()) { BasketListViewItem *item = static_cast(it.current()); - DecoratedBasket *decoration = static_cast(TQT_TQWIDGET(item->basket()->tqparent())); + DecoratedBasket *decoration = static_cast(TQT_TQWIDGET(item->basket()->parent())); decoration->setFilterBarPosition(onTop); ++it; } @@ -1883,7 +1883,7 @@ void BNPView::askNewBasket() askNewBasket(0, 0); } -void BNPView::askNewBasket(Basket *tqparent, Basket *pickProperties) +void BNPView::askNewBasket(Basket *parent, Basket *pickProperties) { NewBasketDefaultProperties properties; if (pickProperties) { @@ -1895,17 +1895,17 @@ void BNPView::askNewBasket(Basket *tqparent, Basket *pickProperties) properties.columnCount = pickProperties->columnsCount(); } - NewBasketDialog(tqparent, properties, this).exec(); + NewBasketDialog(parent, properties, this).exec(); } void BNPView::askNewSubBasket() { - askNewBasket( /*tqparent=*/currentBasket(), /*pickPropertiesOf=*/currentBasket() ); + askNewBasket( /*parent=*/currentBasket(), /*pickPropertiesOf=*/currentBasket() ); } void BNPView::askNewSiblingBasket() { - askNewBasket( /*tqparent=*/parentBasketOf(currentBasket()), /*pickPropertiesOf=*/currentBasket() ); + askNewBasket( /*parent=*/parentBasketOf(currentBasket()), /*pickPropertiesOf=*/currentBasket() ); } void BNPView::globalPasteInCurrentBasket() -- cgit v1.2.3