summaryrefslogtreecommitdiffstats
path: root/konqueror/keditbookmarks/bookmarkiterator.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-02-01 23:19:22 -0600
committerTimothy Pearson <[email protected]>2013-02-01 23:19:22 -0600
commita5430e4b98efd05937bd3bfe78c56eb826f145fa (patch)
tree1af88f74a9d800399de58491b215fb303cbfb1f3 /konqueror/keditbookmarks/bookmarkiterator.cpp
parenteba183d4de47093c6e44a99c8d7fe313aa2834c9 (diff)
downloadtdebase-a5430e4b98efd05937bd3bfe78c56eb826f145fa.tar.gz
tdebase-a5430e4b98efd05937bd3bfe78c56eb826f145fa.zip
Rename many classes and header files to avoid conflicts with KDE4
Diffstat (limited to 'konqueror/keditbookmarks/bookmarkiterator.cpp')
-rw-r--r--konqueror/keditbookmarks/bookmarkiterator.cpp8
1 files changed, 4 insertions, 4 deletions
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 <tqtimer.h>
-BookmarkIterator::BookmarkIterator(TQValueList<KBookmark> bks) : m_bklist(bks) {
+BookmarkIterator::BookmarkIterator(TQValueList<KBookmark> 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<KBookmark> head = m_bklist.begin();
+ TQValueListIterator<KBookmark> 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();