From a5430e4b98efd05937bd3bfe78c56eb826f145fa Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 1 Feb 2013 23:19:22 -0600 Subject: Rename many classes and header files to avoid conflicts with KDE4 --- konqueror/keditbookmarks/bookmarkiterator.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'konqueror/keditbookmarks/bookmarkiterator.cpp') diff --git a/konqueror/keditbookmarks/bookmarkiterator.cpp b/konqueror/keditbookmarks/bookmarkiterator.cpp index c30d890e3..c22d2e628 100644 --- a/konqueror/keditbookmarks/bookmarkiterator.cpp +++ b/konqueror/keditbookmarks/bookmarkiterator.cpp @@ -28,7 +28,7 @@ #include -BookmarkIterator::BookmarkIterator(TQValueList bks) : m_bklist(bks) { +BookmarkIterator::BookmarkIterator(TQValueList bks) : m_btdelist(bks) { connect(this, TQT_SIGNAL( deleteSelf(BookmarkIterator *) ), TQT_SLOT( slotCancelTest(BookmarkIterator *) )); delayedEmitNextOne(); @@ -60,12 +60,12 @@ const KBookmark BookmarkIterator::curBk() const { void BookmarkIterator::nextOne() { // kdDebug() << "BookmarkIterator::nextOne" << endl; - if (m_bklist.isEmpty()) { + if (m_btdelist.isEmpty()) { emit deleteSelf(this); return; } - TQValueListIterator head = m_bklist.begin(); + TQValueListIterator head = m_btdelist.begin(); KBookmark bk = (*head); bool viable = bk.hasParent() && isApplicable(bk); @@ -75,7 +75,7 @@ void BookmarkIterator::nextOne() { doAction(); } - m_bklist.remove(head); + m_btdelist.remove(head); if (!viable) delayedEmitNextOne(); -- cgit v1.2.1