diff options
Diffstat (limited to 'src/archive.cpp')
-rw-r--r-- | src/archive.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/archive.cpp b/src/archive.cpp index d9c76cb..6345a00 100644 --- a/src/archive.cpp +++ b/src/archive.cpp @@ -600,9 +600,9 @@ void Archive::renameMergedStates(TQDomNode notes, TQMap<TQString, TQString> &mer } } -void Archive::loadExtractedBaskets(const TQString &extractionFolder, TQDomNode &basketNode, TQMap<TQString, TQString> &folderMap, Basket *tqparent) +void Archive::loadExtractedBaskets(const TQString &extractionFolder, TQDomNode &basketNode, TQMap<TQString, TQString> &folderMap, Basket *parent) { - bool basketSetAsCurrent = (tqparent != 0); + bool basketSetAsCurrent = (parent != 0); TQDomNode n = basketNode; while ( ! n.isNull() ) { TQDomElement element = n.toElement(); @@ -618,7 +618,7 @@ void Archive::loadExtractedBaskets(const TQString &extractionFolder, TQDomNode & copier.moveFolder(extractionFolder + "baskets/" + folderName, Global::basketsFolder() + newFolderName); // Append and load the basket in the tree: Basket *basket = Global::bnpView->loadBasket(newFolderName); - BasketListViewItem *basketItem = Global::bnpView->appendBasket(basket, (basket && tqparent ? Global::bnpView->listViewItemForBasket(tqparent) : 0)); + BasketListViewItem *basketItem = Global::bnpView->appendBasket(basket, (basket && parent ? Global::bnpView->listViewItemForBasket(parent) : 0)); basketItem->setOpen(!XMLWork::trueOrFalse(element.attribute("folded", "false"), false)); TQDomElement properties = XMLWork::getElement(element, "properties"); importBasketIcon(properties, extractionFolder); // Rename the icon fileName if necessary |