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/TODO | 6 +++--- konqueror/keditbookmarks/actionsimpl.cpp | 2 +- konqueror/keditbookmarks/bookmarkinfo.cpp | 2 +- konqueror/keditbookmarks/bookmarkiterator.cpp | 8 ++++---- konqueror/keditbookmarks/bookmarkiterator.h | 2 +- konqueror/keditbookmarks/kebsearchline.h | 2 +- konqueror/keditbookmarks/listview.cpp | 4 ++-- konqueror/keditbookmarks/listview.h | 2 +- konqueror/keditbookmarks/main.cpp | 2 +- konqueror/keditbookmarks/testlink.cpp | 2 +- konqueror/keditbookmarks/toplevel.cpp | 2 +- konqueror/keditbookmarks/toplevel.h | 2 +- 12 files changed, 18 insertions(+), 18 deletions(-) (limited to 'konqueror/keditbookmarks') diff --git a/konqueror/keditbookmarks/TODO b/konqueror/keditbookmarks/TODO index 98e379560..399cfa74e 100644 --- a/konqueror/keditbookmarks/TODO +++ b/konqueror/keditbookmarks/TODO @@ -64,19 +64,19 @@ on startup: ==31246== at 0x4026A4DF: KEBListViewItem::paintCell(QPainter*, QColorGroup const&, int, int, int) (listview.cpp:786) ==31246== by 0x40FD9CA7: QListView::drawContentsOffset(QPainter*, int, int, int, int, int, int) (qlistview.cpp:2905) ==31246== by 0x41013A5D: QScrollView::viewportPaintEvent(QPaintEvent*) (qscrollview.cpp:1702) - ==31246== by 0x407E7051: TDEListView::viewportPaintEvent(QPaintEvent*) (klistview.cpp:1872) + ==31246== by 0x407E7051: TDEListView::viewportPaintEvent(QPaintEvent*) (tdelistview.cpp:1872) ==31246== ==31246== Conditional jump or move depends on uninitialised value(s) ==31246== at 0x4026A4E4: KEBListViewItem::paintCell(QPainter*, QColorGroup const&, int, int, int) (listview.cpp:786) ==31246== by 0x40FD9CA7: QListView::drawContentsOffset(QPainter*, int, int, int, int, int, int) (qlistview.cpp:2905) ==31246== by 0x41013A5D: QScrollView::viewportPaintEvent(QPaintEvent*) (qscrollview.cpp:1702) - ==31246== by 0x407E7051: TDEListView::viewportPaintEvent(QPaintEvent*) (klistview.cpp:1872) + ==31246== by 0x407E7051: TDEListView::viewportPaintEvent(QPaintEvent*) (tdelistview.cpp:1872) ==31246== ==31246== Conditional jump or move depends on uninitialised value(s) ==31246== at 0x4026A4E8: KEBListViewItem::paintCell(QPainter*, QColorGroup const&, int, int, int) (listview.cpp:786) ==31246== by 0x40FD9CA7: QListView::drawContentsOffset(QPainter*, int, int, int, int, int, int) (qlistview.cpp:2905) ==31246== by 0x41013A5D: QScrollView::viewportPaintEvent(QPaintEvent*) (qscrollview.cpp:1702) - ==31246== by 0x407E7051: TDEListView::viewportPaintEvent(QPaintEvent*) (klistview.cpp:1872) + ==31246== by 0x407E7051: TDEListView::viewportPaintEvent(QPaintEvent*) (tdelistview.cpp:1872) ==31246== lots of crap when using file->open diff --git a/konqueror/keditbookmarks/actionsimpl.cpp b/konqueror/keditbookmarks/actionsimpl.cpp index 81d47f07e..dc7670813 100644 --- a/konqueror/keditbookmarks/actionsimpl.cpp +++ b/konqueror/keditbookmarks/actionsimpl.cpp @@ -42,7 +42,7 @@ #include #include -#include +#include #include #include #include diff --git a/konqueror/keditbookmarks/bookmarkinfo.cpp b/konqueror/keditbookmarks/bookmarkinfo.cpp index 7780196ca..31d76edd7 100644 --- a/konqueror/keditbookmarks/bookmarkinfo.cpp +++ b/konqueror/keditbookmarks/bookmarkinfo.cpp @@ -34,7 +34,7 @@ #include #include -#include +#include #include #include 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(); diff --git a/konqueror/keditbookmarks/bookmarkiterator.h b/konqueror/keditbookmarks/bookmarkiterator.h index 0931ccaf7..a7d06952a 100644 --- a/konqueror/keditbookmarks/bookmarkiterator.h +++ b/konqueror/keditbookmarks/bookmarkiterator.h @@ -53,7 +53,7 @@ protected: private: KBookmark m_bk; - TQValueList m_bklist; + TQValueList m_btdelist; }; class BookmarkIteratorHolder diff --git a/konqueror/keditbookmarks/kebsearchline.h b/konqueror/keditbookmarks/kebsearchline.h index b2cdfce60..c7031a377 100644 --- a/konqueror/keditbookmarks/kebsearchline.h +++ b/konqueror/keditbookmarks/kebsearchline.h @@ -19,7 +19,7 @@ #ifndef __kebsearchline_h #define __kebsearchline_h -#include +#include #include class KEBSearchLine : public TDEListViewSearchLine diff --git a/konqueror/keditbookmarks/listview.cpp b/konqueror/keditbookmarks/listview.cpp index 55f28b90a..6efd1440b 100644 --- a/konqueror/keditbookmarks/listview.cpp +++ b/konqueror/keditbookmarks/listview.cpp @@ -40,7 +40,7 @@ #include #include -#include +#include #include #include #include @@ -48,7 +48,7 @@ #include #include #include -#include +#include #include #include diff --git a/konqueror/keditbookmarks/listview.h b/konqueror/keditbookmarks/listview.h index 1ada9506c..13bf2a15b 100644 --- a/konqueror/keditbookmarks/listview.h +++ b/konqueror/keditbookmarks/listview.h @@ -28,7 +28,7 @@ #include #include -#include +#include #include #include "toplevel.h" diff --git a/konqueror/keditbookmarks/main.cpp b/konqueror/keditbookmarks/main.cpp index 72ababe34..97e7ec0e2 100644 --- a/konqueror/keditbookmarks/main.cpp +++ b/konqueror/keditbookmarks/main.cpp @@ -110,7 +110,7 @@ static int askUser(TDEApplication &app, TQString filename, bool &readonly) { return true; } -#include +#include extern "C" KDE_EXPORT int kdemain(int argc, char **argv) { TDELocale::setMainCatalogue("konqueror"); diff --git a/konqueror/keditbookmarks/testlink.cpp b/konqueror/keditbookmarks/testlink.cpp index 97386a3e7..5a7b5ce04 100644 --- a/konqueror/keditbookmarks/testlink.cpp +++ b/konqueror/keditbookmarks/testlink.cpp @@ -34,7 +34,7 @@ #include #include -#include +#include TestLinkItrHolder *TestLinkItrHolder::s_self = 0; diff --git a/konqueror/keditbookmarks/toplevel.cpp b/konqueror/keditbookmarks/toplevel.cpp index 24ab4fbbb..aafd988ca 100644 --- a/konqueror/keditbookmarks/toplevel.cpp +++ b/konqueror/keditbookmarks/toplevel.cpp @@ -42,7 +42,7 @@ #include #include -#include +#include #include #include diff --git a/konqueror/keditbookmarks/toplevel.h b/konqueror/keditbookmarks/toplevel.h index 31f10a01a..7dd056d8d 100644 --- a/konqueror/keditbookmarks/toplevel.h +++ b/konqueror/keditbookmarks/toplevel.h @@ -22,7 +22,7 @@ #ifndef __toplevel_h #define __toplevel_h -#include +#include #include #include -- cgit v1.2.1