diff options
Diffstat (limited to 'src/softwareimporters.cpp')
| -rw-r--r-- | src/softwareimporters.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/softwareimporters.cpp b/src/softwareimporters.cpp index 2c9acb0..f7361b1 100644 --- a/src/softwareimporters.cpp +++ b/src/softwareimporters.cpp @@ -186,7 +186,7 @@ TQString SoftwareImporters::fromTomboy(TQString tomboy) return "<html><head><meta name=\"qrichtext\" content=\"1\" /></head><body>" + tomboy + "</body></html>"; } -Note* SoftwareImporters::insertTitledNote(Basket *tqparent, const TQString &title, const TQString &content, TQt::TextFormat format/* = TQt::PlainText*/, Note *tqparentNote/* = 0*/) +Note* SoftwareImporters::insertTitledNote(Basket *tqparent, const TQString &title, const TQString &content, TQt::TextFormat format/* = TQt::PlainText*/, Note *parentNote/* = 0*/) { Note *nGroup = new Note(tqparent); @@ -199,9 +199,9 @@ Note* SoftwareImporters::insertTitledNote(Basket *tqparent, const TQString &titl else nContent = NoteFactory::createNoteHtml(content, tqparent); - if (tqparentNote == 0) - tqparentNote = tqparent->firstNote(); // In the first column! - tqparent->insertNote(nGroup, tqparentNote, Note::BottomColumn, TQPoint(), /*animate=*/false); + if (parentNote == 0) + parentNote = tqparent->firstNote(); // In the first column! + tqparent->insertNote(nGroup, parentNote, Note::BottomColumn, TQPoint(), /*animate=*/false); tqparent->insertNote(nTitle, nGroup, Note::BottomColumn, TQPoint(), /*animate=*/false); tqparent->insertNote(nContent, nTitle, Note::BottomInsert, TQPoint(), /*animate=*/false); @@ -217,8 +217,8 @@ void SoftwareImporters::finishImport(Basket *basket) basket->setFocusedNote(basket->firstNoteShownInStack()); // Retqlayout every notes at theire new place and simulate a load animation (because already loaded just after the creation). - // Without a retqlayouting, notes on the bottom would comes from the top (because they were inserted on top) and clutter the animation load: - basket->retqlayoutNotes(/*animate=*/false); + // Without a relayouting, notes on the bottom would comes from the top (because they were inserted on top) and clutter the animation load: + basket->relayoutNotes(/*animate=*/false); basket->animateLoad(); basket->save(); } @@ -646,12 +646,12 @@ void SoftwareImporters::importTuxCards() TQDomElement collection = document->documentElement(); int remainingHierarchy = (hierarchy == 0 ? 65000 : 3 - hierarchy); - importTuxCardsNode(collection, /*tqparentBasket=*/0, /*tqparentNote=*/0, remainingHierarchy); + importTuxCardsNode(collection, /*parentBasket=*/0, /*parentNote=*/0, remainingHierarchy); } // TODO: <InformationElement isOpen="true" isEncripted="false" -void SoftwareImporters::importTuxCardsNode(const TQDomElement &element, Basket *tqparentBasket, Note *tqparentNote, int remainingHierarchy) +void SoftwareImporters::importTuxCardsNode(const TQDomElement &element, Basket *parentBasket, Note *parentNote, int remainingHierarchy) { for (TQDomNode n = element.firstChild(); !n.isNull(); n = n.nextSibling()) { TQDomElement e = n.toElement(); @@ -674,7 +674,7 @@ void SoftwareImporters::importTuxCardsNode(const TQDomElement &element, Basket * } if (remainingHierarchy > 0) { - BasketFactory::newBasket(icon, name, /*backgroundImage=*/"", /*backgroundColor=*/TQColor(), /*textColor=*/TQColor(), /*templateName=*/"1column", tqparentBasket); + BasketFactory::newBasket(icon, name, /*backgroundImage=*/"", /*backgroundColor=*/TQColor(), /*textColor=*/TQColor(), /*templateName=*/"1column", parentBasket); Basket *basket = Global::bnpView->currentBasket(); basket->load(); @@ -687,8 +687,8 @@ void SoftwareImporters::importTuxCardsNode(const TQDomElement &element, Basket * importTuxCardsNode(e, basket, 0, remainingHierarchy - 1); finishImport(basket); } else { - Note *nGroup = insertTitledNote(tqparentBasket, name, content, (isRichText ? TQt::RichText : TQt::PlainText), tqparentNote); - importTuxCardsNode(e, tqparentBasket, nGroup, remainingHierarchy - 1); + Note *nGroup = insertTitledNote(parentBasket, name, content, (isRichText ? TQt::RichText : TQt::PlainText), parentNote); + importTuxCardsNode(e, parentBasket, nGroup, remainingHierarchy - 1); } } } |