Rename a number of classes to enhance compatibility with KDE4

1 files changed, 14 insertions, 14 deletions

diff --git a/src/app/bookmarkviewcontroller.cpp b/src/app/bookmarkviewcontroller.cpp
index fe0d032..e7fb24f 100644
--- a/src/app/bookmarkviewcontroller.cpp
+++ b/src/app/bookmarkviewcontroller.cpp
@@ -53,7 +53,7 @@ namespace Gwenview {
 
 // URLDropListView	
 URLDropListView::URLDropListView(TQWidget* parent)
-: KListView(parent) {
+: TDEListView(parent) {
 	setAcceptDrops(true);
 }
 
@@ -69,10 +69,10 @@ void URLDropListView::contentsDragMoveEvent(TQDragMoveEvent* event) {
 
 
 
-struct BookmarkItem : public KListViewItem {
+struct BookmarkItem : public TDEListViewItem {
 	template <class ItemParent>
 	BookmarkItem(ItemParent* parent, const KBookmark& bookmark)
-	: KListViewItem(parent)
+	: TDEListViewItem(parent)
 	, mBookmark(bookmark)
 	{
 		refresh();
@@ -89,7 +89,7 @@ struct BookmarkItem : public KListViewItem {
 
 class BookmarkToolTip : public TQToolTip {
 public:
-	BookmarkToolTip(KListView* lv)
+	BookmarkToolTip(TDEListView* lv)
 	: TQToolTip(lv->viewport())
 	, mListView(lv) {}
 
@@ -102,17 +102,17 @@ public:
 		tip(rect, item->mBookmark.url().prettyURL());
 	};
 	
-	KListView* mListView;
+	TDEListView* mListView;
 };
 
 
 struct BookmarkViewController::Private {
 	TQVBox* mBox;
-	KListView* mListView;
+	TDEListView* mListView;
 	KBookmarkManager* mManager;
 	KURL mCurrentURL;
 	std::auto_ptr<BookmarkToolTip> mToolTip;
-	KActionCollection* mActionCollection;
+	TDEActionCollection* mActionCollection;
 	KURL mDroppedURL;
 
 	template <class ItemParent>
@@ -184,7 +184,7 @@ BookmarkViewController::BookmarkViewController(TQWidget* parent)
 	// Init listview
 	d->mListView=new URLDropListView(d->mBox);
 	d->mToolTip.reset(new BookmarkToolTip(d->mListView) );
-	d->mActionCollection=new KActionCollection(d->mListView);
+	d->mActionCollection=new TDEActionCollection(d->mListView);
 
 	d->mListView->header()->hide();
 	d->mListView->setRootIsDecorated(true);
@@ -203,13 +203,13 @@ BookmarkViewController::BookmarkViewController(TQWidget* parent)
 		this, TQT_SLOT(slotURLDropped(TQDropEvent*, const KURL::List&)) );
 
 	// Init toolbar
-	KToolBar* toolbar=new KToolBar(d->mBox, "", true);
-	KAction* action;
-	toolbar->setIconText(KToolBar::IconTextRight);
-	action=new KAction(i18n("Add a bookmark (keep it short)", "Add"), "bookmark_add", 0, 
+	TDEToolBar* toolbar=new TDEToolBar(d->mBox, "", true);
+	TDEAction* action;
+	toolbar->setIconText(TDEToolBar::IconTextRight);
+	action=new TDEAction(i18n("Add a bookmark (keep it short)", "Add"), "bookmark_add", 0, 
 			this, TQT_SLOT(bookmarkCurrentURL()), d->mActionCollection);
 	action->plug(toolbar);
-	action=new KAction(i18n("Remove a bookmark (keep it short)", "Remove"), "editdelete", 0,
+	action=new TDEAction(i18n("Remove a bookmark (keep it short)", "Remove"), "editdelete", 0,
 			this, TQT_SLOT(deleteCurrentBookmark()), d->mActionCollection);
 	action->plug(toolbar);
 }
@@ -252,7 +252,7 @@ void BookmarkViewController::fill() {
 void BookmarkViewController::slotURLDropped(TQDropEvent* event, const KURL::List& urls) {
 	// Get a pointer to the drop item
 	TQPoint point(0,event->pos().y());
-	KListView* lst=d->mListView;
+	TDEListView* lst=d->mListView;
 	BookmarkItem* item=static_cast<BookmarkItem*>( lst->itemAt(lst->contentsToViewport(point)) );
 	
 	TQPopupMenu menu(lst);