From f24ac211b8e67f545e757a50da4a00252d092869 Mon Sep 17 00:00:00 2001 From: tpearson Date: Sat, 9 Jul 2011 02:23:29 +0000 Subject: Remove the tq in front of these incorrectly TQt4-converted methods/data members: tqrepaint[...] tqinvalidate[...] tqparent[...] tqmask[...] tqlayout[...] tqalignment[...] git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/basket@1240522 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- src/basket.cpp | 138 +++++++++++++++++++++++----------------------- src/basket.h | 6 +- src/basket_part.cpp | 4 +- src/basket_part.h | 2 +- src/bnpview.cpp | 40 +++++++------- src/bnpview.h | 12 ++-- src/formatimporter.cpp | 6 +- src/kcolorcombo2.cpp | 16 +++--- src/kicondialogui.ui | 2 +- src/newbasketdialog.cpp | 6 +- src/newbasketdialog.h | 2 +- src/note.cpp | 86 ++++++++++++++--------------- src/note.h | 6 +- src/notedrag.cpp | 2 +- src/notefactory.cpp | 2 +- src/passwordlayout.ui | 4 +- src/settings.cpp | 2 +- src/softwareimporters.cpp | 22 ++++---- src/softwareimporters.h | 4 +- src/systemtray.cpp | 2 +- src/tag.cpp | 12 ++-- src/tag.h | 2 +- src/tagsedit.cpp | 12 ++-- 23 files changed, 195 insertions(+), 195 deletions(-) diff --git a/src/basket.cpp b/src/basket.cpp index b71f745..79abb4b 100644 --- a/src/basket.cpp +++ b/src/basket.cpp @@ -170,14 +170,14 @@ int NoteSelection::count() return count; } -TQValueList NoteSelection::tqparentGroups() +TQValueList NoteSelection::parentGroups() { TQValueList groups; // For each note: for (NoteSelection *node = firstStacked(); node; node = node->nextStacked()) // For each tqparent groups of the note: - for (Note *note = node->note->tqparentNote(); note; note = note->tqparentNote()) + for (Note *note = node->note->parentNote(); note; note = note->parentNote()) // Add it (if it was not already in the list): if (!note->isColumn() && !groups.tqcontains(note)) groups.append(note); @@ -430,7 +430,7 @@ void Basket::appendNoteAfter(Note *note, Note *after) if (after) { // The normal case: for (Note *n = note; n; n = n->next()) - n->setParentNote(after->tqparentNote()); + n->setParentNote(after->parentNote()); note->setPrev(after); last->setNext(after->next()); after->setNext(note); @@ -470,15 +470,15 @@ void Basket::appendNoteBefore(Note *note, Note *before) if (before) { // The normal case: for (Note *n = note; n; n = n->next()) - n->setParentNote(before->tqparentNote()); + n->setParentNote(before->parentNote()); note->setPrev(before->prev()); last->setNext(before); before->setPrev(last); if (note->prev()) note->prev()->setNext(note); else { - if (note->tqparentNote()) - note->tqparentNote()->setFirstChild(note); + if (note->parentNote()) + note->parentNote()->setFirstChild(note); else m_firstNote = note; } @@ -556,19 +556,19 @@ void Basket::unplugNote(Note *note) if (note->next()) note->next()->setPrev(note->prev()); - if (note->tqparentNote()) { + if (note->parentNote()) { // If it was the first note of a group, change the first note of the group: - if (note->tqparentNote()->firstChild() == note) - note->tqparentNote()->setFirstChild( note->next() ); + if (note->parentNote()->firstChild() == note) + note->parentNote()->setFirstChild( note->next() ); - if (!note->tqparentNote()->isColumn()) { + if (!note->parentNote()->isColumn()) { // Ungroup if still 0 note inside tqparent group: - if ( ! note->tqparentNote()->firstChild() ) - unplugNote(note->tqparentNote()); // TODO delete + if ( ! note->parentNote()->firstChild() ) + unplugNote(note->parentNote()); // TODO delete // Ungroup if still 1 note inside tqparent group: - else if ( ! note->tqparentNote()->firstChild()->next() ) - ungroupNote(note->tqparentNote()); + else if ( ! note->parentNote()->firstChild()->next() ) + ungroupNote(note->parentNote()); } } @@ -593,7 +593,7 @@ void Basket::ungroupNote(Note *group) lastGroupedNote->next()->setPrev(note); note->setNext(lastGroupedNote->next()); lastGroupedNote->setNext(note); - note->setParentNote(group->tqparentNote()); + note->setParentNote(group->parentNote()); note->setPrev(lastGroupedNote); note->setGroupWidth(group->groupWidth() - Note::GROUP_WIDTH); @@ -605,7 +605,7 @@ void Basket::ungroupNote(Note *group) group->setFirstChild(0); unplugNote(group); // TODO: delete - retqlayoutNotes(true); + relayoutNotes(true); } void Basket::groupNoteBefore(Note *note, Note *with) @@ -627,11 +627,11 @@ void Basket::groupNoteBefore(Note *note, Note *with) group->setNext(with->next()); group->setX(with->x()); group->setY(with->y()); - if (with->tqparentNote() && with->tqparentNote()->firstChild() == with) - with->tqparentNote()->setFirstChild(group); + if (with->parentNote() && with->parentNote()->firstChild() == with) + with->parentNote()->setFirstChild(group); else if (m_firstNote == with) m_firstNote = group; - group->setParentNote(with->tqparentNote()); + group->setParentNote(with->parentNote()); group->setFirstChild(note); group->setGroupWidth(with->groupWidth() + Note::GROUP_WIDTH); @@ -671,11 +671,11 @@ void Basket::groupNoteAfter(Note *note, Note *with) group->setNext(with->next()); group->setX(with->x()); group->setY(with->y()); - if (with->tqparentNote() && with->tqparentNote()->firstChild() == with) - with->tqparentNote()->setFirstChild(group); + if (with->parentNote() && with->parentNote()->firstChild() == with) + with->parentNote()->setFirstChild(group); else if (m_firstNote == with) m_firstNote = group; - group->setParentNote(with->tqparentNote()); + group->setParentNote(with->parentNote()); group->setFirstChild(with); group->setGroupWidth(with->groupWidth() + Note::GROUP_WIDTH); @@ -983,11 +983,11 @@ void Basket::setDisposition(int disposition, int columnCount) } if (columnCount != m_columnsCount) { m_columnsCount = (columnCount <= 0 ? 1 : columnCount); - equalizeColumnSizes(); // Will retqlayoutNotes() + equalizeColumnSizes(); // Will relayoutNotes() } } else if (currentDisposition == COLUMNS_LAYOUT && (disposition == FREE_LAYOUT || disposition == MINDMAPS_LAYOUT)) { Note *column = firstNote(); - m_columnsCount = 0; // Now, so retqlayoutNotes() will not retqlayout the free notes as if they were columns! + m_columnsCount = 0; // Now, so relayoutNotes() will not retqlayout the free notes as if they were columns! while (column) { // Move all childs on the first level: Note *nextColumn = column->next(); @@ -996,7 +996,7 @@ void Basket::setDisposition(int disposition, int columnCount) } unselectAll(); m_mindMap = (disposition == MINDMAPS_LAYOUT); - retqlayoutNotes(true); + relayoutNotes(true); } else if ((currentDisposition == FREE_LAYOUT || currentDisposition == MINDMAPS_LAYOUT) && disposition == COLUMNS_LAYOUT) { if (firstNote()) { // TODO: Reorder notes! @@ -1031,7 +1031,7 @@ void Basket::setDisposition(int disposition, int columnCount) } } m_columnsCount = (columnCount <= 0 ? 1 : columnCount); - equalizeColumnSizes(); // Will retqlayoutNotes() + equalizeColumnSizes(); // Will relayoutNotes() } } @@ -1041,7 +1041,7 @@ void Basket::equalizeColumnSizes() return; // Necessary to know the available space; - retqlayoutNotes(true); + relayoutNotes(true); int availableSpace = visibleWidth(); int columnWidth = (visibleWidth() - (columnsCount()-1)*Note::GROUP_WIDTH) / columnsCount(); @@ -1067,7 +1067,7 @@ void Basket::equalizeColumnSizes() column = column->next(); } - retqlayoutNotes(true); + relayoutNotes(true); } void Basket::enableActions() @@ -1117,7 +1117,7 @@ void Basket::aboutToBeActivated() FOR_EACH_NOTE (note) note->finishLazyLoad(); - //retqlayoutNotes(/*animate=*/false); + //relayoutNotes(/*animate=*/false); setFocusedNote(0); // So that during the focusInEvent that will come shortly, the FIRST note is focused. if (Settings::playAnimations() && !decoration()->filterBar()->filterData().isFiltering && Global::bnpView->currentBasket() == this) // No animation when filtering all! @@ -1205,7 +1205,7 @@ void Basket::load() m_columnsCount = columnsCount; } - retqlayoutNotes(false); + relayoutNotes(false); // On application start, the current basket is not focused yet, so the focus rectangle is not shown when calling focusANote(): if (Global::bnpView->currentBasket() == this) @@ -1243,7 +1243,7 @@ void Basket::newFilter(const FilterData &data, bool andEnsureVisible/* = true*/) for (Note *note = firstNote(); note; note = note->next()) m_countFounds += note->newFilter(data); - retqlayoutNotes(true); + relayoutNotes(true); signalCountsChanged(); if (hasFocus()) // if (!hasFocus()), focusANote() will be called at focusInEvent() @@ -1351,7 +1351,7 @@ Basket::Basket(TQWidget *tqparent, const TQString &folderName) m_doNotCloseEditor(false), m_editParagraph(0), m_editIndex(0), m_isDuringDrag(false), m_draggedNotes(), m_focusedNote(0), m_startOfShiftSelectionNote(0), - m_finishLoadOnFirstShow(false), m_retqlayoutOnNextShow(false) + m_finishLoadOnFirstShow(false), m_relayoutOnNextShow(false) { TQString sAction = "local_basket_activate_" + folderName; m_action = new KAction("FAKE TEXT", "FAKE ICON", KShortcut(), TQT_TQOBJECT(this), TQT_SLOT(activatedShortcut()), Global::bnpView->actionCollection(), sAction); @@ -1554,7 +1554,7 @@ void Basket::contentsMousePressEvent(TQMouseEvent *event) // Folding/Unfolding group: if (zone == Note::GroupExpander) { clicked->toggleFolded(Settings::playAnimations()); - retqlayoutNotes(true); + relayoutNotes(true); m_noActionOnMouseRelease = true; return; } @@ -1847,7 +1847,7 @@ void Basket::insertNote(Note *note, Note *clicked, int zone, const TQPoint &pos, appendNoteAfter(note, lastNote()); } - retqlayoutNotes(true); + relayoutNotes(true); } void Basket::clickedToInsert(TQMouseEvent *event, Note *clicked, /*Note::Zone*/int zone) @@ -1938,7 +1938,7 @@ void Basket::contentsDropEvent(TQDropEvent *event) // Do NOT check the bottom&right borders. // Because imagine someone drag&drop a big note from the top to the bottom of a big basket (with big vertical scrollbars), - // the note is first removed, and retqlayoutNotes() compute the new height that is smaller + // the note is first removed, and relayoutNotes() compute the new height that is smaller // Then noteAt() is called for the mouse pointer position, because the basket is now smaller, the cursor is out of boundaries!!! // Should, of course, not return 0: Note *clicked = noteAt(event->pos().x(), event->pos().y()); @@ -2428,7 +2428,7 @@ void Basket::contentsMouseMoveEvent(TQMouseEvent *event) if (m_resizingNote) { int groupWidth = event->pos().x() - m_resizingNote->x() - m_pickedResizer; int minRight = m_resizingNote->minRight(); - int maxRight = 100 * contentsWidth(); // A big enough value (+infinity) for free tqlayouts. + int maxRight = 100 * contentsWidth(); // A big enough value (+infinity) for free layouts. Note *nextColumn = m_resizingNote->next(); if (m_resizingNote->isColumn()) { if (nextColumn) @@ -2452,7 +2452,7 @@ void Basket::contentsMouseMoveEvent(TQMouseEvent *event) column->setGroupWidth(column->groupWidth() - delta); } } - retqlayoutNotes(true); + relayoutNotes(true); } // Moving a Note: @@ -2463,8 +2463,8 @@ void Basket::contentsMouseMoveEvent(TQMouseEvent *event) if (y < 0) y = 0; m_movingNote->setX(x); m_movingNote->setY(y); - m_movingNote->retqlayoutAt(x, y, / *animate=* /false); - retqlayoutNotes(true); + m_movingNote->relayoutAt(x, y, / *animate=* /false); + relayoutNotes(true); } */ @@ -2565,14 +2565,14 @@ void Basket::selectAll() } else { // First select all in the group, then in the tqparent group... Note *child = m_focusedNote; - Note *tqparent = (m_focusedNote ? m_focusedNote->tqparentNote() : 0); + Note *tqparent = (m_focusedNote ? m_focusedNote->parentNote() : 0); while (tqparent) { if (!tqparent->allSelected()) { tqparent->setSelectedRecursivly(true); return; } child = tqparent; - tqparent = tqparent->tqparentNote(); + tqparent = tqparent->parentNote(); } // Then, select all: FOR_EACH_NOTE (note) @@ -2687,7 +2687,7 @@ void Basket::doHoverEffects(const TQPoint &pos) // Don't do hover effects when a popup menu is opened. // Primarily because the basket area will only receive mouseEnterEvent and mouveLeaveEvent. - // It willn't be noticed of mouseMoveEvent, which would result in a aptqparently broken application state: + // It willn't be noticed of mouseMoveEvent, which would result in a apparently broken application state: if (kapp->activePopupWidget()) underMouse = false; @@ -2933,7 +2933,7 @@ Note* Basket::noteAt(int x, int y) //NO: // // Do NOT check the bottom&right borders. // // Because imagine someone drag&drop a big note from the top to the bottom of a big basket (with big vertical scrollbars), -// // the note is first removed, and retqlayoutNotes() compute the new height that is smaller +// // the note is first removed, and relayoutNotes() compute the new height that is smaller // // Then noteAt() is called for the mouse pointer position, because the basket is now smaller, the cursor is out of boundaries!!! // // Should, of course, not return 0: if (x < 0 || x > contentsWidth() || y < 0 || y > contentsHeight()) @@ -2957,7 +2957,7 @@ Note* Basket::noteAt(int x, int y) note = note->next(); } - // If the basket is tqlayouted in columns, return one of the columns to be able to add notes in them: + // If the basket is layouted in columns, return one of the columns to be able to add notes in them: if (isColumnsLayout()) { Note *column = m_firstNote; while (column) { @@ -2984,7 +2984,7 @@ Basket::~Basket() void Basket::viewportResizeEvent(TQResizeEvent *event) { - retqlayoutNotes(true); + relayoutNotes(true); //cornerWidget()->setShown(horizontalScrollBar()->isShown() && verticalScrollBar()->isShown()); if (horizontalScrollBar()->isShown() && verticalScrollBar()->isShown()) { if (!cornerWidget()) @@ -3254,7 +3254,7 @@ void Basket::unsetNotesWidth() } } -void Basket::retqlayoutNotes(bool animate) +void Basket::relayoutNotes(bool animate) { if (Global::bnpView->currentBasket() != this) return; // Optimize load time, and basket will be relaid out when activated, anyway @@ -3273,12 +3273,12 @@ void Basket::retqlayoutNotes(bool animate) Note *note = m_firstNote; while (note) { if (note->matching()) { - note->retqlayoutAt(0, h, animate); + note->relayoutAt(0, h, animate); if (note->hasResizer()) { int minGroupWidth = note->minRight() - note->finalX(); if (note->groupWidth() < minGroupWidth) { note->setGroupWidth(minGroupWidth); - retqlayoutNotes(animate); // Redo the thing, but this time it should not recurse + relayoutNotes(animate); // Redo the thing, but this time it should not recurse return; } } @@ -3343,7 +3343,7 @@ void Basket::animateObjects() if (m_underMouse) doHoverEffects(); recomputeBlankRects(); - //retqlayoutNotes(true); // In case an animated note was to the contents view boundaries, resize the view! + //relayoutNotes(true); // In case an animated note was to the contents view boundaries, resize the view! updateContents(); // If the drawing of the last frame was too long, we skip the drawing of the current and do the next one: } else { @@ -3368,7 +3368,7 @@ void Basket::popupEmblemMenu(Note *note, int emblemNumber) m_tagPopupNote = note; State *state = note->stateForEmblemNumber(emblemNumber); State *nextState = state->nextState(/*cycle=*/false); - Tag *tag = state->tqparentTag(); + Tag *tag = state->parentTag(); m_tagPopup = tag; TQKeySequence sequence = tag->shortcut().operator TQKeySequence(); @@ -3863,7 +3863,7 @@ bool Basket::closeEditor() m_rightEditorBorder = 0; Note *note = m_editor->note(); - note->setWidth(0); // For retqlayoutNotes() to succeed to take care of the change + note->setWidth(0); // For relayoutNotes() to succeed to take care of the change // Delete the editor BEFORE unselecting the note because unselecting the note would trigger closeEditor() recursivly: bool isEmpty = m_editor->isEmpty(); @@ -4005,7 +4005,7 @@ void Basket::showEditedNoteWhileFiltering() Note *note = m_editor->note(); filterAgain(); note->setSelected(true); - retqlayoutNotes(false); + relayoutNotes(false); note->setX(note->finalX()); note->setY(note->finalY()); filterAgainDelayed(); @@ -4136,7 +4136,7 @@ void Basket::focusANonSelectedNoteBelow(bool inSameColumn) while (next && next->isSelected()) next = next->nextShownInStack(); if (next) { - if (inSameColumn && isColumnsLayout() && m_focusedNote->tqparentPrimaryNote() == next->tqparentPrimaryNote()) { + if (inSameColumn && isColumnsLayout() && m_focusedNote->parentPrimaryNote() == next->parentPrimaryNote()) { setFocusedNote(next); m_startOfShiftSelectionNote = next; } @@ -4152,7 +4152,7 @@ void Basket::focusANonSelectedNoteAbove(bool inSameColumn) while (prev && prev->isSelected()) prev = prev->prevShownInStack(); if (prev) { - if (inSameColumn && isColumnsLayout() && m_focusedNote->tqparentPrimaryNote() == prev->tqparentPrimaryNote()) { + if (inSameColumn && isColumnsLayout() && m_focusedNote->parentPrimaryNote() == prev->parentPrimaryNote()) { setFocusedNote(prev); m_startOfShiftSelectionNote = prev; } @@ -4190,7 +4190,7 @@ void Basket::noteDeleteWithoutConfirmation(bool deleteFilesToo) note = next; } - retqlayoutNotes(true); // FIXME: filterAgain()? + relayoutNotes(true); // FIXME: filterAgain()? save(); } @@ -4452,7 +4452,7 @@ void Basket::noteGroup() unselectAll(); group->setSelectedRecursivly(true); // Notes were unselected by unplugging - retqlayoutNotes(true); + relayoutNotes(true); save(); } @@ -4522,7 +4522,7 @@ void Basket::noteMoveOnTop() insertSelection(selection, fakeNote); unplugNote(fakeNote); selectSelection(selection); - retqlayoutNotes(true); + relayoutNotes(true); save(); } @@ -4547,7 +4547,7 @@ void Basket::noteMoveOnBottom() insertSelection(selection, fakeNote); unplugNote(fakeNote); selectSelection(selection); - retqlayoutNotes(true); + relayoutNotes(true); save(); } @@ -4566,7 +4566,7 @@ void Basket::moveSelectionTo(Note *here, bool below/* = true*/) insertSelection(selection, fakeNote); unplugNote(fakeNote); selectSelection(selection); - retqlayoutNotes(true); + relayoutNotes(true); save(); } @@ -4603,7 +4603,7 @@ void Basket::linkLookChanged() note->linkLookChanged(); note = note->next(); } - retqlayoutNotes(true); + relayoutNotes(true); } void Basket::slotCopyingDone2(KIO::Job *job) @@ -4795,7 +4795,7 @@ Note* Basket::noteOn(NoteOn side) int bestDistance = contentsWidth() * contentsHeight() * 10; Note *note = firstNoteShownInStack(); - Note *primary = m_focusedNote->tqparentPrimaryNote(); + Note *primary = m_focusedNote->parentPrimaryNote(); while (note) { switch (side) { case LEFT_SIDE: distance = m_focusedNote->distanceOnLeftRight(note, LEFT_SIDE); break; @@ -4803,7 +4803,7 @@ Note* Basket::noteOn(NoteOn side) case TOP_SIDE: distance = m_focusedNote->distanceOnTopBottom(note, TOP_SIDE); break; case BOTTOM_SIDE: distance = m_focusedNote->distanceOnTopBottom(note, BOTTOM_SIDE); break; } - if ((side == TOP_SIDE || side == BOTTOM_SIDE || primary != note->tqparentPrimaryNote()) && note != m_focusedNote && distance > 0 && distance < bestDistance) { + if ((side == TOP_SIDE || side == BOTTOM_SIDE || primary != note->parentPrimaryNote()) && note != m_focusedNote && distance > 0 && distance < bestDistance) { bestNote = note; bestDistance = distance; } @@ -4816,12 +4816,12 @@ Note* Basket::noteOn(NoteOn side) Note* Basket::firstNoteInGroup() { Note *child = m_focusedNote; - Note *tqparent = (m_focusedNote ? m_focusedNote->tqparentNote() : 0); + Note *tqparent = (m_focusedNote ? m_focusedNote->parentNote() : 0); while (tqparent) { if (tqparent->firstChild() != child && !tqparent->isColumn()) return tqparent->firstRealChild(); child = tqparent; - tqparent = tqparent->tqparentNote(); + tqparent = tqparent->parentNote(); } return 0; } @@ -4830,12 +4830,12 @@ Note* Basket::noteOnHome() { // First try to find the first note of the group containing the focused note: Note *child = m_focusedNote; - Note *tqparent = (m_focusedNote ? m_focusedNote->tqparentNote() : 0); + Note *tqparent = (m_focusedNote ? m_focusedNote->parentNote() : 0); while (tqparent) { if (tqparent->nextShownInStack() != m_focusedNote) return tqparent->nextShownInStack(); child = tqparent; - tqparent = tqparent->tqparentNote(); + tqparent = tqparent->parentNote(); } // If it was not found, then focus the very first note in the basket: @@ -4857,7 +4857,7 @@ Note* Basket::noteOnHome() Note* Basket::noteOnEnd() { Note *child = m_focusedNote; - Note *tqparent = (m_focusedNote ? m_focusedNote->tqparentNote() : 0); + Note *tqparent = (m_focusedNote ? m_focusedNote->parentNote() : 0); Note *lastChild; while (tqparent) { lastChild = tqparent->lastRealChild(); @@ -4869,7 +4869,7 @@ Note* Basket::noteOnEnd() return lastChild; } child = tqparent; - tqparent = tqparent->tqparentNote(); + tqparent = tqparent->parentNote(); } if (isFreeLayout()) { Note *last; @@ -5555,7 +5555,7 @@ void Basket::delNote(Note *note, bool askForMirroredFile) if (note->isSelected()) note->setSelected(false); //removeSelectedNote(); - retqlayoutNotes(); + relayoutNotes(); recolorizeNotes(); resetInsertTo(); // If we delete the first or the last, pointer to it is invalid save(); diff --git a/src/basket.h b/src/basket.h index 2c20224..fd35a8b 100644 --- a/src/basket.h +++ b/src/basket.h @@ -101,7 +101,7 @@ class NoteSelection void append(NoteSelection *node); int count(); - TQValueList tqparentGroups(); + TQValueList parentGroups(); }; /** This store all needed information when exporting to HTML @@ -215,7 +215,7 @@ class Basket : public TQScrollView, public TQToolTip int tmpHeight; public: void unsetNotesWidth(); - void retqlayoutNotes(bool animate); + void relayoutNotes(bool animate); Note* noteAt(int x, int y); inline Note* firstNote() { return m_firstNote; } inline int columnsCount() { return m_columnsCount; } @@ -673,7 +673,7 @@ public slots: /// SPEED OPTIMIZATION private: bool m_finishLoadOnFirstShow; - bool m_retqlayoutOnNextShow; + bool m_relayoutOnNextShow; public: void aboutToBeActivated(); }; diff --git a/src/basket_part.cpp b/src/basket_part.cpp index 7c51696..c3f1c8b 100644 --- a/src/basket_part.cpp +++ b/src/basket_part.cpp @@ -35,7 +35,7 @@ typedef KParts::GenericFactory< BasketPart > BasketFactory; K_EXPORT_COMPONENT_FACTORY( libbasketpart, BasketFactory ) -BasketPart::BasketPart( TQWidget *tqparentWidget, const char *, +BasketPart::BasketPart( TQWidget *parentWidget, const char *, TQObject *tqparent, const char *name, const TQStringList & ) : KParts::ReadWritePart(tqparent, name) { @@ -44,7 +44,7 @@ BasketPart::BasketPart( TQWidget *tqparentWidget, const char *, BasketStatusBar* bar = new BasketStatusBar(new KParts::StatusBarExtension(this)); // this should be your custom internal widget - m_view = new BNPView(tqparentWidget, "BNPViewPart", this, actionCollection(), bar); + m_view = new BNPView(parentWidget, "BNPViewPart", this, actionCollection(), bar); connect(m_view, TQT_SIGNAL(setWindowCaption(const TQString &)), this, TQT_SLOT(setCaption(const TQString &))); connect(m_view, TQT_SIGNAL(showPart()), this, TQT_SIGNAL(showPart())); m_view->setFocusPolicy(TQ_ClickFocus); diff --git a/src/basket_part.h b/src/basket_part.h index 9cfbb76..308f66a 100644 --- a/src/basket_part.h +++ b/src/basket_part.h @@ -46,7 +46,7 @@ public: /** * Default constructor */ - BasketPart(TQWidget *tqparentWidget, const char *widgetName, + BasketPart(TQWidget *parentWidget, const char *widgetName, TQObject *tqparent, const char *name, const TQStringList &); /** 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() diff --git a/src/bnpview.h b/src/bnpview.h index f62441d..aad8c2f 100644 --- a/src/bnpview.h +++ b/src/bnpview.h @@ -65,7 +65,7 @@ class BNPView : public TQSplitter, virtual public BasketDcopInterface ~BNPView(); /// MANAGE CONFIGURATION EVENTS!: void setTreePlacement(bool onLeft); - void retqlayoutAllBaskets(); + void relayoutAllBaskets(); void recomputeAllStyles(); void removedStates(const TQValueList &deletedStates); void linkLookChanged(); @@ -73,7 +73,7 @@ class BNPView : public TQSplitter, virtual public BasketDcopInterface /// MANAGE BASKETS: BasketListViewItem* listViewItemForBasket(Basket *basket); Basket* currentBasket(); - Basket* tqparentBasketOf(Basket *basket); + Basket* parentBasketOf(Basket *basket); void setCurrentBasket(Basket *basket); void removeBasket(Basket *basket); /// For NewBasketDialog (and later some other classes): @@ -86,7 +86,7 @@ class BNPView : public TQSplitter, virtual public BasketDcopInterface void enableActions(); private: - TQDomElement basketElement(TQListViewItem *item, TQDomDocument &document, TQDomElement &tqparentElement); + TQDomElement basketElement(TQListViewItem *item, TQDomDocument &document, TQDomElement &parentElement); public slots: void countsChanged(Basket *basket); void notesStateChanged(); @@ -94,8 +94,8 @@ class BNPView : public TQSplitter, virtual public BasketDcopInterface void updateBasketListViewItem(Basket *basket); void save(); - void save(TQListViewItem *firstItem, TQDomDocument &document, TQDomElement &tqparentElement); - void saveSubHierarchy(TQListViewItem *item, TQDomDocument &document, TQDomElement &tqparentElement, bool recursive); + void save(TQListViewItem *firstItem, TQDomDocument &document, TQDomElement &parentElement); + void saveSubHierarchy(TQListViewItem *item, TQDomDocument &document, TQDomElement &parentElement, bool recursive); void load(); void load(KListView *listView, TQListViewItem *item, const TQDomElement &baskets); void loadNewBasket(const TQString &folderName, const TQDomElement &properties, Basket *tqparent); @@ -279,7 +279,7 @@ class BNPView : public TQSplitter, virtual public BasketDcopInterface public: Basket* loadBasket(const TQString &folderName); // Public only for class Archive - BasketListViewItem* appendBasket(Basket *basket, TQListViewItem *tqparentItem); // Public only for class Archive + BasketListViewItem* appendBasket(Basket *basket, TQListViewItem *parentItem); // Public only for class Archive Basket* basketForFolderName(const TQString &folderName); TQPopupMenu* popupMenu(const TQString &menuName); diff --git a/src/formatimporter.cpp b/src/formatimporter.cpp index 1d203ca..672695c 100644 --- a/src/formatimporter.cpp +++ b/src/formatimporter.cpp @@ -219,14 +219,14 @@ TQDomElement FormatImporter::importBasket(const TQString &folderName) XMLWork::addElement(*document, e, "tags", (isChecked ? "todo_done" : "todo_unchecked")); } // Import annotations as folded groups: - TQDomElement tqparentE = column; + TQDomElement parentE = column; TQString annotations = XMLWork::getElementText(e, "annotations", ""); if (!annotations.isEmpty()) { TQDomElement annotGroup = document->createElement("group"); column.insertBefore(annotGroup, e); annotGroup.setAttribute("folded", "true"); annotGroup.appendChild(e); - tqparentE = annotGroup; + parentE = annotGroup; // Create the text note and add it to the DOM tree: TQDomElement annotNote = document->createElement("note"); annotNote.setAttribute("type", "text"); @@ -271,7 +271,7 @@ TQDomElement FormatImporter::importBasket(const TQString &folderName) } // Add the element to the DOM: TQDomElement launcherElem = document->createElement("note"); - tqparentE.insertBefore(launcherElem, e); + parentE.insertBefore(launcherElem, e); launcherElem.setAttribute("type", "launcher"); XMLWork::addElement(*document, launcherElem, "content", launcherFileName); } diff --git a/src/kcolorcombo2.cpp b/src/kcolorcombo2.cpp index e898e46..5db3178 100644 --- a/src/kcolorcombo2.cpp +++ b/src/kcolorcombo2.cpp @@ -520,22 +520,22 @@ TQPixmap KColorCombo2::colorRectPixmap(const TQColor &color, bool isDefault, int TQPixmap pixmap(width, height); TQBitmap tqmask(width, height); TQPainter painter(&pixmap); - TQPainter tqmaskPainter(&tqmask); + TQPainter maskPainter(&tqmask); // Draw pixmap: drawColorRect(painter, 0, 0, color, isDefault, width, height); // Draw tqmask (make the four corners transparent): - tqmaskPainter.fillRect(0, 0, width, height, TQt::color1); // opaque - tqmaskPainter.setPen(TQt::color0); // transparent - tqmaskPainter.drawPoint(0, 0); - tqmaskPainter.drawPoint(0, height - 1); - tqmaskPainter.drawPoint(width - 1, height - 1); - tqmaskPainter.drawPoint(width - 1, 0); + maskPainter.fillRect(0, 0, width, height, TQt::color1); // opaque + maskPainter.setPen(TQt::color0); // transparent + maskPainter.drawPoint(0, 0); + maskPainter.drawPoint(0, height - 1); + maskPainter.drawPoint(width - 1, height - 1); + maskPainter.drawPoint(width - 1, 0); // Finish: painter.end(); - tqmaskPainter.end(); + maskPainter.end(); pixmap.setMask(tqmask); return pixmap; } diff --git a/src/kicondialogui.ui b/src/kicondialogui.ui index 95b9dcf..e29c0a3 100644 --- a/src/kicondialogui.ui +++ b/src/kicondialogui.ui @@ -232,7 +232,7 @@ browseButton searchLine - + klistbox.h kiconcanvas.h diff --git a/src/newbasketdialog.cpp b/src/newbasketdialog.cpp index b322e05..eb9f0cb 100644 --- a/src/newbasketdialog.cpp +++ b/src/newbasketdialog.cpp @@ -84,7 +84,7 @@ NewBasketDefaultProperties::NewBasketDefaultProperties() /** class NewBasketDialog: */ -NewBasketDialog::NewBasketDialog(Basket *tqparentBasket, const NewBasketDefaultProperties &defaultProperties, TQWidget *tqparent) +NewBasketDialog::NewBasketDialog(Basket *parentBasket, const NewBasketDefaultProperties &defaultProperties, TQWidget *tqparent) : KDialogBase(KDialogBase::Swallow, i18n("New Basket"), KDialogBase::Ok | KDialogBase::Cancel, KDialogBase::Ok, tqparent, /*name=*/"NewBasket", /*modal=*/true, /*separator=*/true) , m_defaultProperties(defaultProperties) @@ -232,11 +232,11 @@ NewBasketDialog::NewBasketDialog(Basket *tqparentBasket, const NewBasketDefaultP connect( m_templates, TQT_SIGNAL(doubleClicked(TQIconViewItem*)), this, TQT_SLOT(slotOk()) ); connect( m_templates, TQT_SIGNAL(returnPressed(TQIconViewItem*)), this, TQT_SLOT(returnPressed()) ); - if (tqparentBasket) { + if (parentBasket) { int index = 0; for (TQMap::Iterator it = m_basketsMap.begin(); it != m_basketsMap.end(); ++it) - if (it.data() == tqparentBasket) { + if (it.data() == parentBasket) { index = it.key(); break; } diff --git a/src/newbasketdialog.h b/src/newbasketdialog.h index 579077a..c8e4d5c 100644 --- a/src/newbasketdialog.h +++ b/src/newbasketdialog.h @@ -80,7 +80,7 @@ class NewBasketDialog : public KDialogBase Q_OBJECT TQ_OBJECT public: - NewBasketDialog(Basket *tqparentBasket, const NewBasketDefaultProperties &defaultProperties, TQWidget *tqparent = 0); + NewBasketDialog(Basket *parentBasket, const NewBasketDefaultProperties &defaultProperties, TQWidget *tqparent = 0); ~NewBasketDialog(); void polish(); protected slots: diff --git a/src/note.cpp b/src/note.cpp index 54bb90d..12ff890 100644 --- a/src/note.cpp +++ b/src/note.cpp @@ -454,7 +454,7 @@ bool Note::tqcontains(Note *note) if (note == this) return true; else - note = note->tqparentNote(); + note = note->parentNote(); // FOR_EACH_CHILD (child) // if (child->tqcontains(note)) @@ -520,18 +520,18 @@ int Note::yExpander() bool Note::isFree() { - return tqparentNote() == 0 && basket()->isFreeLayout(); + return parentNote() == 0 && basket()->isFreeLayout(); } bool Note::isColumn() { - return tqparentNote() == 0 && basket()->isColumnsLayout(); + return parentNote() == 0 && basket()->isColumnsLayout(); } bool Note::hasResizer() { // "isFree" || "isColmun but not the last" - return tqparentNote() == 0 && (basket()->isFreeLayout() || m_next != 0L); + return parentNote() == 0 && (basket()->isFreeLayout() || m_next != 0L); } int Note::resizerHeight() @@ -733,7 +733,7 @@ void Note::setCursor(Zone zone) case Note::None: basket()->viewport()->unsetCursor(); break; default: State *state = stateForEmblemNumber(zone - Emblem0); - if (state && state->tqparentTag()->states().count() > 1) + if (state && state->parentTag()->states().count() > 1) basket()->viewport()->setCursor(TQt::PointingHandCursor); else basket()->viewport()->unsetCursor(); @@ -857,7 +857,7 @@ void Note::requestRetqlayout() { m_width = 0; unbufferize(); - basket()->retqlayoutNotes(true); // TODO: A signal that will retqlayout ONCE and DELAYED if called several times + basket()->relayoutNotes(true); // TODO: A signal that will retqlayout ONCE and DELAYED if called several times } void Note::setWidth(int width) // TODO: inline ? @@ -998,7 +998,7 @@ void Note::toggleFolded(bool animate) if (basket()->isLoaded() && !m_isFolded) { //basket()->setFocusedNote(this); - basket()->retqlayoutNotes(true); + basket()->relayoutNotes(true); basket()->ensureNoteVisible(this); } @@ -1090,7 +1090,7 @@ bool Note::showSubNotes() return !m_isFolded || !m_collapseFinished || basket()->isFiltering(); } -void Note::retqlayoutAt(int x, int y, bool animate) +void Note::relayoutAt(int x, int y, bool animate) { if (!matching()) return; @@ -1127,14 +1127,14 @@ void Note::retqlayoutAt(int x, int y, bool animate) bool first = true; while (child) { if (child->matching() && (!m_isFolded || first || basket()->isFiltering())) { // Don't use showSubNotes() but use !m_isFolded because we don't want a retqlayout for the animated collapsing notes - child->retqlayoutAt(x + width(), y+h, animate); + child->relayoutAt(x + width(), y+h, animate); h += child->finalHeight(); } else // In case the user collapse a group, then move it and then expand it: child->setXRecursivly(x + width()); // notes SHOULD have a good X coordonate, and not the old one! // For future animation when re-match, but on bottom of already matched notes! // Find tqparent primary note and set the Y to THAT y: if (!child->matching()) - child->setY(tqparentPrimaryNote()->y()); + child->setY(parentPrimaryNote()->y()); child = child->next(); first = false; } @@ -1154,7 +1154,7 @@ void Note::retqlayoutAt(int x, int y, bool animate) } // Set the basket area limits (but not for child notes: no need, because they will look for theire tqparent note): - if (!tqparentNote()) { + if (!parentNote()) { if (basket()->tmpWidth < finalRightLimit() + (hasResizer() ? RESIZER_WIDTH : 0)) basket()->tmpWidth = finalRightLimit() + (hasResizer() ? RESIZER_WIDTH : 0); if (basket()->tmpHeight < finalY() + finalHeight()) @@ -1203,8 +1203,8 @@ int Note::rightLimit() { if (isColumn() && m_next == 0L) // The last column return TQMAX(x() + minWidth(), basket()->visibleWidth()); - else if (tqparentNote()) - return tqparentNote()->rightLimit(); + else if (parentNote()) + return parentNote()->rightLimit(); else return m_x + m_groupWidth; } @@ -1213,8 +1213,8 @@ int Note::finalRightLimit() { if (isColumn() && m_next == 0L) // The last column return TQMAX(finalX() + minWidth(), basket()->visibleWidth()); - else if (tqparentNote()) - return tqparentNote()->finalRightLimit(); + else if (parentNote()) + return parentNote()->finalRightLimit(); else return finalX() + m_groupWidth; } @@ -2088,18 +2088,18 @@ void Note::addState(State *state, bool orReplace) if (!content()) return; - Tag *tag = state->tqparentTag(); + Tag *tag = state->parentTag(); State::List::iterator itStates = m_states.begin(); // Browse all tags, see if the note has it, increment itSates if yes, and then insert the state at this position... // For each existing tags: for (Tag::List::iterator it = Tag::all.begin(); it != Tag::all.end(); ++it) { // If the current tag isn't the one to assign or the current one on the note, go to the next tag: - if (*it != tag && itStates != m_states.end() && *it != (*itStates)->tqparentTag()) + if (*it != tag && itStates != m_states.end() && *it != (*itStates)->parentTag()) continue; // We found the tag to insert: if (*it == tag) { // And the note already have the tag: - if (itStates != m_states.end() && *it == (*itStates)->tqparentTag()) { + if (itStates != m_states.end() && *it == (*itStates)->parentTag()) { // We replace the state if wanted: if (orReplace) { itStates = m_states.insert(itStates, state); @@ -2114,7 +2114,7 @@ void Note::addState(State *state, bool orReplace) return; } // The note has this tag: - if (itStates != m_states.end() && *it == (*itStates)->tqparentTag()) + if (itStates != m_states.end() && *it == (*itStates)->parentTag()) ++itStates; } } @@ -2197,7 +2197,7 @@ void Note::removeState(State *state) void Note::removeTag(Tag *tag) { for (State::List::iterator it = m_states.begin(); it != m_states.end(); ++it) - if ((*it)->tqparentTag() == tag) { + if ((*it)->parentTag() == tag) { m_states.remove(it); recomputeStyle(); return; @@ -2254,7 +2254,7 @@ void Note::addStateToSelectedNotes(State *state, bool orReplace) void Note::changeStateOfSelectedNotes(State *state) { - if (content() && isSelected() && hasTag(state->tqparentTag())) + if (content() && isSelected() && hasTag(state->parentTag())) addState(state); FOR_EACH_CHILD (child) @@ -2283,7 +2283,7 @@ bool Note::hasState(State *state) bool Note::hasTag(Tag *tag) { for (State::List::iterator it = m_states.begin(); it != m_states.end(); ++it) - if ((*it)->tqparentTag() == tag) + if ((*it)->parentTag() == tag) return true; return false; } @@ -2291,7 +2291,7 @@ bool Note::hasTag(Tag *tag) State* Note::stateOfTag(Tag *tag) { for (State::List::iterator it = m_states.begin(); it != m_states.end(); ++it) - if ((*it)->tqparentTag() == tag) + if ((*it)->parentTag() == tag) return *it; return 0; } @@ -2354,8 +2354,8 @@ void Note::inheritTagsOf(Note *note) return; for (State::List::iterator it = note->states().begin(); it != note->states().end(); ++it) - if ((*it)->tqparentTag() && (*it)->tqparentTag()->inheritedBySiblings()) - addTag((*it)->tqparentTag()); + if ((*it)->parentTag() && (*it)->parentTag()->inheritedBySiblings()) + addTag((*it)->parentTag()); } void Note::unbufferizeAll() @@ -2386,11 +2386,11 @@ TQRect Note::visibleRect() areas.append(rect()); // When we are folding a tqparent group, if this note is bigger than the first real note of the group, cut the top of this: - Note *tqparent = tqparentNote(); + Note *tqparent = parentNote(); while (tqparent) { if (tqparent->expandingOrCollapsing()) substractRectOnAreas(TQRect(x(), tqparent->y() - height(), width(), height()), areas, true); - tqparent = tqparent->tqparentNote(); + tqparent = tqparent->parentNote(); } if (areas.count() > 0) @@ -2453,7 +2453,7 @@ Note* Note::noteForFullPath(const TQString &path) void Note::listUsedTags(TQValueList &list) { for (State::List::Iterator it = m_states.begin(); it != m_states.end(); ++it) { - Tag *tag = (*it)->tqparentTag(); + Tag *tag = (*it)->parentTag(); if (!list.tqcontains(tag)) list.append(tag); } @@ -2491,7 +2491,7 @@ Note* Note::nextInStack() return next()->nextInStack(); // And finally, in the tqparent: - Note *note = tqparentNote(); + Note *note = parentNote(); while (note) if (note->next()) if (note->next()->content()) @@ -2499,7 +2499,7 @@ Note* Note::nextInStack() else return note->next()->nextInStack(); else - note = note->tqparentNote(); + note = note->parentNote(); // Not found: return 0; @@ -2518,8 +2518,8 @@ Note* Note::prevInStack() return note; } - if (tqparentNote()) - return tqparentNote()->prevInStack(); + if (parentNote()) + return parentNote()->prevInStack(); else return 0; } @@ -2554,13 +2554,13 @@ bool Note::isShown() return true; // So, here we go to the complexe case: if the note is inside a collapsed group: - Note *group = tqparentNote(); + Note *group = parentNote(); Note *child = this; while (group) { if (group->isFolded() && group->firstChild() != child) return false; child = group; - group = group->tqparentNote(); + group = group->parentNote(); } return true; } @@ -2645,7 +2645,7 @@ void Note::groupIn(Note *group) bool Note::tryExpandParent() { - Note *tqparent = tqparentNote(); + Note *tqparent = parentNote(); Note *child = this; while (tqparent) { if (tqparent->firstChild() != child) @@ -2654,18 +2654,18 @@ bool Note::tryExpandParent() return false; if (tqparent->isFolded()) { tqparent->toggleFolded(true); - basket()->retqlayoutNotes(true); + basket()->relayoutNotes(true); return true; } child = tqparent; - tqparent = tqparent->tqparentNote(); + tqparent = tqparent->parentNote(); } return false; } bool Note::tryFoldParent() // TODO: withCtrl ? withShift ? { - Note *tqparent = tqparentNote(); + Note *tqparent = parentNote(); Note *child = this; while (tqparent) { if (tqparent->firstChild() != child) @@ -2674,11 +2674,11 @@ bool Note::tryFoldParent() // TODO: withCtrl ? withShift ? return false; if (!tqparent->isFolded()) { tqparent->toggleFolded(true); - basket()->retqlayoutNotes(true); + basket()->relayoutNotes(true); return true; } child = tqparent; - tqparent = tqparent->tqparentNote(); + tqparent = tqparent->parentNote(); } return false; } @@ -2754,11 +2754,11 @@ int Note::distanceOnTopBottom(Note *note, int side) return int(sqrt(pow(noteCenterX - thisCenterX, 2) + pow(noteCenterY - thisCenterY, 2)) + angle); } -Note* Note::tqparentPrimaryNote() +Note* Note::parentPrimaryNote() { Note *primary = this; - while (primary->tqparentNote()) - primary = primary->tqparentNote(); + while (primary->parentNote()) + primary = primary->parentNote(); return primary; } diff --git a/src/note.h b/src/note.h index 736a7e8..47ffd20 100644 --- a/src/note.h +++ b/src/note.h @@ -88,7 +88,7 @@ class Note TQRect rect(); TQRect resizerRect(); TQRect visibleRect(); - void retqlayoutAt(int x, int y, bool animate); + void relayoutAt(int x, int y, bool animate); int contentX(); int minWidth(); int minRight(); @@ -118,7 +118,7 @@ class Note inline bool isGroup() { return m_content == 0L; } inline bool isFolded() { return m_isFolded; } inline Note* firstChild() { return m_firstChild; } - inline Note* tqparentNote() { return m_parentNote; } + inline Note* parentNote() { return m_parentNote; } /*inline*/ bool showSubNotes();// { return !m_isFolded || !m_collapseFinished; } inline void setParentNote(Note *note) { m_parentNote = note; } inline void setFirstChild(Note *note) { m_firstChild = note; } @@ -315,7 +315,7 @@ class Note Note* nextShownInStack(); Note* prevShownInStack(); - Note* tqparentPrimaryNote(); // TODO: There are places in the code where this methods is hand-copied / hand-inlined instead of called. + Note* parentPrimaryNote(); // TODO: There are places in the code where this methods is hand-copied / hand-inlined instead of called. Note* firstSelected(); Note* lastSelected(); diff --git a/src/notedrag.cpp b/src/notedrag.cpp index 7d3d80a..b177e68 100644 --- a/src/notedrag.cpp +++ b/src/notedrag.cpp @@ -68,7 +68,7 @@ TQDragObject* NoteDrag::dragObject(NoteSelection *noteList, bool cutting, TQWidg // Then a list of pointers to all notes, and tqparent groups: for (NoteSelection *node = noteList->firstStacked(); node; node = node->nextStacked()) stream << (TQ_UINT64)(node->note); - TQValueList groups = noteList->tqparentGroups(); + TQValueList groups = noteList->parentGroups(); for (TQValueList::iterator it = groups.begin(); it != groups.end(); ++it) stream << (TQ_UINT64)(*it); stream << (TQ_UINT64)0; diff --git a/src/notefactory.cpp b/src/notefactory.cpp index 91b9a2a..4d1c5a3 100644 --- a/src/notefactory.cpp +++ b/src/notefactory.cpp @@ -767,7 +767,7 @@ NoteType::Id NoteFactory::typeForURL(const KURL &url, Basket */*tqparent*/) { /* KMimeType::Ptr kMimeType = KMimeType::findByURL(url); if (Global::debugWindow) - *Global::debugWindow << "typeForURL: " + kMimeType->tqparentMimeType();//property("MimeType").toString();*/ + *Global::debugWindow << "typeForURL: " + kMimeType->parentMimeType();//property("MimeType").toString();*/ bool viewText = Settings::viewTextFileContent(); bool viewHTML = Settings::viewHtmlFileContent(); bool viewImage = Settings::viewImageFileContent(); diff --git a/src/passwordlayout.ui b/src/passwordlayout.ui index fe776b4..e04577f 100644 --- a/src/passwordlayout.ui +++ b/src/passwordlayout.ui @@ -117,6 +117,6 @@ changeKey() clearKey() - - + + diff --git a/src/settings.cpp b/src/settings.cpp index e9c1f0a..6cb38ea 100644 --- a/src/settings.cpp +++ b/src/settings.cpp @@ -341,7 +341,7 @@ void Settings::setBigNotes(bool big) Note::MIN_HEIGHT = 2*Note::NOTE_MARGIN + Note::EMBLEM_SIZE; if (Global::bnpView) - Global::bnpView->retqlayoutAllBaskets(); + Global::bnpView->relayoutAllBaskets(); } void Settings::setAutoBullet(bool yes) 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 "" + tomboy + ""; } -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: 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); } } } diff --git a/src/softwareimporters.h b/src/softwareimporters.h index 2d7394f..1f93775 100644 --- a/src/softwareimporters.h +++ b/src/softwareimporters.h @@ -74,7 +74,7 @@ namespace SoftwareImporters // Useful methods to design importers: TQString fromICS(const TQString &ics); TQString fromTomboy(TQString tomboy); - Note* insertTitledNote(Basket *tqparent, const TQString &title, const TQString &content, TQt::TextFormat format = TQt::PlainText, Note *tqparentNote = 0); + Note* insertTitledNote(Basket *tqparent, const TQString &title, const TQString &content, TQt::TextFormat format = TQt::PlainText, Note *parentNote = 0); void finishImport(Basket *basket); // The importers in themselves: @@ -87,7 +87,7 @@ namespace SoftwareImporters void importTextFile(); // - void importTuxCardsNode(const TQDomElement &element, Basket *tqparentBasket, Note *tqparentNote, int remainingHierarchy); + void importTuxCardsNode(const TQDomElement &element, Basket *parentBasket, Note *parentNote, int remainingHierarchy); } #endif // SOFTWAREIMPORTERS_H diff --git a/src/systemtray.cpp b/src/systemtray.cpp index 3d65a36..ba1f17d 100644 --- a/src/systemtray.cpp +++ b/src/systemtray.cpp @@ -102,7 +102,7 @@ void KSystemTray2::displayCloseMessage(TQString fileMenu) // 2. And then if the icon is visible too (eg. this->show() has been called): useSystray = useSystray && isVisible(); - // 3. Kicker (or another systray manager) can be visible but tqmasked out of + // 3. Kicker (or another systray manager) can be visible but masked out of // the screen (ie. on right or on left of it). We check if the icon isn't // out of screen. if (useSystray) { diff --git a/src/tag.cpp b/src/tag.cpp index 0532d37..43b6ca4 100644 --- a/src/tag.cpp +++ b/src/tag.cpp @@ -52,10 +52,10 @@ State::~State() State* State::nextState(bool cycle /*= true*/) { - if (!tqparentTag()) + if (!parentTag()) return 0; - List states = tqparentTag()->states(); + List states = parentTag()->states(); // The tag contains only one state: if (states.count() == 1) return 0; @@ -75,9 +75,9 @@ State* State::nextState(bool cycle /*= true*/) TQString State::fullName() { - if (!tqparentTag() || tqparentTag()->states().count() == 1) - return (name().isEmpty() && tqparentTag() ? tqparentTag()->name() : name()); - return TQString(i18n("%1: %2")).tqarg(tqparentTag()->name(), name()); + if (!parentTag() || parentTag()->states().count() == 1) + return (name().isEmpty() && parentTag() ? parentTag()->name() : name()); + return TQString(i18n("%1: %2")).tqarg(parentTag()->name(), name()); } TQFont State::font(TQFont base) @@ -781,7 +781,7 @@ TQSize IndentedMenuItem::tqsizeHint() StateMenuItem::StateMenuItem(State *state, const TQString &shortcut, bool withTagName) : m_state(state), m_shortcut(shortcut) { - m_name = (withTagName && m_state->tqparentTag() ? m_state->tqparentTag()->name() : m_state->name()); + m_name = (withTagName && m_state->parentTag() ? m_state->parentTag()->name() : m_state->name()); } StateMenuItem::~StateMenuItem() diff --git a/src/tag.h b/src/tag.h index b1cc495..df7c0dc 100644 --- a/src/tag.h +++ b/src/tag.h @@ -75,7 +75,7 @@ class State TQColor backgroundColor() const { return m_backgroundColor; } TQString textEquivalent() const { return m_textEquivalent; } bool onAllTextLines() const { return m_onAllTextLines; } - Tag* tqparentTag() const { return m_parentTag; } + Tag* parentTag() const { return m_parentTag; } /// HELPING FUNCTIONS: State *nextState(bool cycle = true); TQString fullName(); diff --git a/src/tagsedit.cpp b/src/tagsedit.cpp index e4c6863..8b2aaee 100644 --- a/src/tagsedit.cpp +++ b/src/tagsedit.cpp @@ -926,9 +926,9 @@ void TagsEditDialog::deleteTag() // Remove the new tag, to avoid keyboard-shortcut clashes: delete item->tagCopy()->newTag; } else { - TagListViewItem *tqparentItem = item->tqparent(); + TagListViewItem *parentItem = item->tqparent(); // Remove the state: - tqparentItem->tagCopy()->stateCopies.remove(item->stateCopy()); + parentItem->tagCopy()->stateCopies.remove(item->stateCopy()); if (item->stateCopy()->oldState) { m_deletedStates.append(item->stateCopy()->oldState); m_addedStates.remove(item->stateCopy()->oldState); @@ -937,9 +937,9 @@ void TagsEditDialog::deleteTag() delete item; item = 0; // Transform to single-state tag if needed: - if (tqparentItem->childCount() == 1) { - delete tqparentItem->firstChild(); - m_tags->setCurrentItem(tqparentItem); + if (parentItem->childCount() == 1) { + delete parentItem->firstChild(); + m_tags->setCurrentItem(parentItem); } } @@ -1197,7 +1197,7 @@ void TagsEditDialog::slotOk() Global::bnpView->removedStates(m_deletedStates); // Update every note (change colors, size because of font change or added/removed emblems...): - Global::bnpView->retqlayoutAllBaskets(); + Global::bnpView->relayoutAllBaskets(); Global::bnpView->recomputeAllStyles(); KDialogBase::slotOk(); -- cgit v1.2.1