summaryrefslogtreecommitdiffstats
path: root/konqueror/sidebar/trees
diff options
context:
space:
mode:
Diffstat (limited to 'konqueror/sidebar/trees')
-rw-r--r--konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp28
-rw-r--r--konqueror/sidebar/trees/bookmark_module/bookmark_module.h6
-rw-r--r--konqueror/sidebar/trees/history_module/history_module.cpp16
-rw-r--r--konqueror/sidebar/trees/history_module/history_module.h4
-rw-r--r--konqueror/sidebar/trees/history_module/kcmhistory.cpp8
-rw-r--r--konqueror/sidebar/trees/konq_sidebartree.cpp36
-rw-r--r--konqueror/sidebar/trees/konq_sidebartree.h12
-rw-r--r--konqueror/sidebar/trees/konqsidebar_tree.cpp2
8 files changed, 56 insertions, 56 deletions
diff --git a/konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp b/konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp
index 64a8fb9c6..5b170b102 100644
--- a/konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp
+++ b/konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp
@@ -47,30 +47,30 @@ KonqSidebarBookmarkModule::KonqSidebarBookmarkModule( KonqSidebarTree * parentTr
connect(tree(), TQT_SIGNAL(moved(TQListViewItem*,TQListViewItem*,TQListViewItem*)),
this, TQT_SLOT(slotMoved(TQListViewItem*,TQListViewItem*,TQListViewItem*)));
- connect(tree(), TQT_SIGNAL(dropped(KListView*,TQDropEvent*,TQListViewItem*,TQListViewItem*)),
- this, TQT_SLOT(slotDropped(KListView*,TQDropEvent*,TQListViewItem*,TQListViewItem*)));
+ connect(tree(), TQT_SIGNAL(dropped(TDEListView*,TQDropEvent*,TQListViewItem*,TQListViewItem*)),
+ this, TQT_SLOT(slotDropped(TDEListView*,TQDropEvent*,TQListViewItem*,TQListViewItem*)));
connect(tree(), TQT_SIGNAL(expanded(TQListViewItem*)),
this, TQT_SLOT(slotOpenChange(TQListViewItem*)));
connect(tree(), TQT_SIGNAL(collapsed(TQListViewItem*)),
this, TQT_SLOT(slotOpenChange(TQListViewItem*)));
- m_collection = new KActionCollection( this, "bookmark actions" );
- (void) new KAction( i18n("&Create New Folder"), "folder_new", 0, this,
+ m_collection = new TDEActionCollection( this, "bookmark actions" );
+ (void) new TDEAction( i18n("&Create New Folder"), "folder_new", 0, this,
TQT_SLOT( slotCreateFolder() ), m_collection, "create_folder");
- (void) new KAction( i18n("Delete Folder"), "editdelete", 0, this,
+ (void) new TDEAction( i18n("Delete Folder"), "editdelete", 0, this,
TQT_SLOT( slotDelete() ), m_collection, "delete_folder");
- (void) new KAction( i18n("Delete Bookmark"), "editdelete", 0, this,
+ (void) new TDEAction( i18n("Delete Bookmark"), "editdelete", 0, this,
TQT_SLOT( slotDelete() ), m_collection, "delete_bookmark");
- (void) new KAction( i18n("Properties"), "edit", 0, this,
+ (void) new TDEAction( i18n("Properties"), "edit", 0, this,
TQT_SLOT( slotProperties() ), m_collection, "item_properties");
- (void) new KAction( i18n("Open in New Window"), "window_new", 0, this,
+ (void) new TDEAction( i18n("Open in New Window"), "window_new", 0, this,
TQT_SLOT( slotOpenNewWindow() ), m_collection, "open_window");
- (void) new KAction( i18n("Open in New Tab"), "tab_new", 0, this,
+ (void) new TDEAction( i18n("Open in New Tab"), "tab_new", 0, this,
TQT_SLOT( slotOpenTab() ), m_collection, "open_tab");
- (void) new KAction( i18n("Open Folder in Tabs"), "tab_new", 0, this,
+ (void) new TDEAction( i18n("Open Folder in Tabs"), "tab_new", 0, this,
TQT_SLOT( slotOpenTab() ), m_collection, "folder_open_tabs");
- (void) new KAction( i18n("Copy Link Address"), "editcopy", 0, this,
+ (void) new TDEAction( i18n("Copy Link Address"), "editcopy", 0, this,
TQT_SLOT( slotCopyLocation() ), m_collection, "copy_location");
KStdAction::editBookmarks( KonqBookmarkManager::self(), TQT_SLOT( slotEditBookmarks() ),
@@ -159,7 +159,7 @@ void KonqSidebarBookmarkModule::slotMoved(TQListViewItem *i, TQListViewItem*, TQ
KBookmarkGroup oldParentGroup = bookmark.parentGroup();
KBookmarkGroup parentGroup;
- // try to get the parent group (assume that the TQListViewItem has been reparented by KListView)...
+ // try to get the parent group (assume that the TQListViewItem has been reparented by TDEListView)...
// if anything goes wrong, use the root.
if (item->parent()) {
bool error = false;
@@ -178,7 +178,7 @@ void KonqSidebarBookmarkModule::slotMoved(TQListViewItem *i, TQListViewItem*, TQ
parentGroup = KonqBookmarkManager::self()->root();
} else {
// No parent! This means the user dropped it before the top level item
- // And KListView has moved the item there, we need to correct it
+ // And TDEListView has moved the item there, we need to correct it
tree()->moveItem(item, m_topLevelItem, 0L);
parentGroup = KonqBookmarkManager::self()->root();
}
@@ -223,7 +223,7 @@ void KonqSidebarBookmarkModule::slotMoved(TQListViewItem *i, TQListViewItem*, TQ
}
}
-void KonqSidebarBookmarkModule::slotDropped(KListView *, TQDropEvent *e, TQListViewItem *parent, TQListViewItem *after)
+void KonqSidebarBookmarkModule::slotDropped(TDEListView *, TQDropEvent *e, TQListViewItem *parent, TQListViewItem *after)
{
if (!KBookmarkDrag::canDecode(e))
return;
diff --git a/konqueror/sidebar/trees/bookmark_module/bookmark_module.h b/konqueror/sidebar/trees/bookmark_module/bookmark_module.h
index 738bd7566..ba78a2b96 100644
--- a/konqueror/sidebar/trees/bookmark_module/bookmark_module.h
+++ b/konqueror/sidebar/trees/bookmark_module/bookmark_module.h
@@ -26,7 +26,7 @@
#include <kdialogbase.h>
class KonqSidebarBookmarkItem;
-class KActionCollection;
+class TDEActionCollection;
class KLineEdit;
/**
@@ -49,7 +49,7 @@ public:
protected slots:
void slotBookmarksChanged( const TQString & );
void slotMoved(TQListViewItem*,TQListViewItem*,TQListViewItem*);
- void slotDropped(KListView*,TQDropEvent*,TQListViewItem*,TQListViewItem*);
+ void slotDropped(TDEListView*,TQDropEvent*,TQListViewItem*,TQListViewItem*);
void slotCreateFolder();
void slotDelete();
void slotProperties(KonqSidebarBookmarkItem *bi = 0);
@@ -69,7 +69,7 @@ private:
KonqSidebarTreeTopLevelItem * m_topLevelItem;
KonqSidebarBookmarkItem * m_rootItem;
- KActionCollection *m_collection;
+ TDEActionCollection *m_collection;
bool m_ignoreOpenChange;
TQMap<TQString, bool> m_folderOpenState;
diff --git a/konqueror/sidebar/trees/history_module/history_module.cpp b/konqueror/sidebar/trees/history_module/history_module.cpp
index fa7f8ba39..5d27e010f 100644
--- a/konqueror/sidebar/trees/history_module/history_module.cpp
+++ b/konqueror/sidebar/trees/history_module/history_module.cpp
@@ -74,23 +74,23 @@ KonqSidebarHistoryModule::KonqSidebarHistoryModule( KonqSidebarTree * parentTree
connect( parentTree, TQT_SIGNAL( expanded( TQListViewItem * )),
TQT_SLOT( slotItemExpanded( TQListViewItem * )));
- m_collection = new KActionCollection( this, "history actions" );
- (void) new KAction( i18n("New &Window"), "window_new", 0, this,
+ m_collection = new TDEActionCollection( this, "history actions" );
+ (void) new TDEAction( i18n("New &Window"), "window_new", 0, this,
TQT_SLOT( slotNewWindow() ), m_collection, "open_new");
- (void) new KAction( i18n("&Remove Entry"), "editdelete", 0, this,
+ (void) new TDEAction( i18n("&Remove Entry"), "editdelete", 0, this,
TQT_SLOT( slotRemoveEntry() ), m_collection, "remove");
- (void) new KAction( i18n("C&lear History"), "history_clear", 0, this,
+ (void) new TDEAction( i18n("C&lear History"), "history_clear", 0, this,
TQT_SLOT( slotClearHistory() ), m_collection, "clear");
- (void) new KAction( i18n("&Preferences..."), "configure", 0, this,
+ (void) new TDEAction( i18n("&Preferences..."), "configure", 0, this,
TQT_SLOT( slotPreferences()), m_collection, "preferences");
- KRadioAction *sort;
- sort = new KRadioAction( i18n("By &Name"), 0, this,
+ TDERadioAction *sort;
+ sort = new TDERadioAction( i18n("By &Name"), 0, this,
TQT_SLOT( slotSortByName() ), m_collection, "byName");
sort->setExclusiveGroup("SortGroup");
sort->setChecked( m_sortsByName );
- sort = new KRadioAction( i18n("By &Date"), 0, this,
+ sort = new TDERadioAction( i18n("By &Date"), 0, this,
TQT_SLOT( slotSortByDate() ), m_collection, "byDate");
sort->setExclusiveGroup("SortGroup");
sort->setChecked( !m_sortsByName );
diff --git a/konqueror/sidebar/trees/history_module/history_module.h b/konqueror/sidebar/trees/history_module/history_module.h
index cbba40262..5c114a164 100644
--- a/konqueror/sidebar/trees/history_module/history_module.h
+++ b/konqueror/sidebar/trees/history_module/history_module.h
@@ -30,7 +30,7 @@
#include "history_item.h"
-class KActionCollection;
+class TDEActionCollection;
class KDialogBase;
class KonqSidebarHistorySettings;
class KonqSidebarTree;
@@ -94,7 +94,7 @@ private:
KonqSidebarTreeTopLevelItem * m_topLevelItem;
- KActionCollection *m_collection;
+ TDEActionCollection *m_collection;
KDialogBase *m_dlg;
TQPixmap m_folderClosed;
diff --git a/konqueror/sidebar/trees/history_module/kcmhistory.cpp b/konqueror/sidebar/trees/history_module/kcmhistory.cpp
index b2e92c6fd..813ece3df 100644
--- a/konqueror/sidebar/trees/history_module/kcmhistory.cpp
+++ b/konqueror/sidebar/trees/history_module/kcmhistory.cpp
@@ -243,15 +243,15 @@ void HistorySidebarConfig::slotOlderChanged( int value )
void HistorySidebarConfig::slotGetFontNewer()
{
- int result = KFontDialog::getFont( m_fontNewer, false, this );
- if ( result == KFontDialog::Accepted )
+ int result = TDEFontDialog::getFont( m_fontNewer, false, this );
+ if ( result == TDEFontDialog::Accepted )
configChanged();
}
void HistorySidebarConfig::slotGetFontOlder()
{
- int result = KFontDialog::getFont( m_fontOlder, false, this );
- if ( result == KFontDialog::Accepted )
+ int result = TDEFontDialog::getFont( m_fontOlder, false, this );
+ if ( result == TDEFontDialog::Accepted )
configChanged();
}
diff --git a/konqueror/sidebar/trees/konq_sidebartree.cpp b/konqueror/sidebar/trees/konq_sidebartree.cpp
index 01bdc1d7a..028a531fa 100644
--- a/konqueror/sidebar/trees/konq_sidebartree.cpp
+++ b/konqueror/sidebar/trees/konq_sidebartree.cpp
@@ -115,7 +115,7 @@ public:
KonqSidebarTree::KonqSidebarTree( KonqSidebar_Tree *parent, TQWidget *parentWidget, int virt, const TQString& path )
- : KListView( parentWidget ),
+ : TDEListView( parentWidget ),
m_currentTopLevelItem( 0 ),
m_toolTip( this ),
m_scrollingLocked( false ),
@@ -303,8 +303,8 @@ void KonqSidebarTree::contentsDragMoveEvent( TQDragMoveEvent *e )
m_autoOpenTimer->start( autoOpenTimeout );
}
} else {
- d->m_dropMode = KListViewMode;
- KListView::contentsDragMoveEvent(e);
+ d->m_dropMode = TDEListViewMode;
+ TDEListView::contentsDragMoveEvent(e);
}
}
@@ -319,8 +319,8 @@ void KonqSidebarTree::contentsDragLeaveEvent( TQDragLeaveEvent *ev )
m_dropItem = 0;
m_lstDropFormats.clear();
- if (d->m_dropMode == KListViewMode) {
- KListView::contentsDragLeaveEvent(ev);
+ if (d->m_dropMode == TDEListViewMode) {
+ TDEListView::contentsDragLeaveEvent(ev);
}
}
@@ -348,7 +348,7 @@ void KonqSidebarTree::contentsDropEvent( TQDropEvent *ev )
selection->drop( ev );
}
} else {
- KListView::contentsDropEvent(ev);
+ TDEListView::contentsDropEvent(ev);
}
}
@@ -415,7 +415,7 @@ void KonqSidebarTree::addURL(KonqSidebarTreeTopLevelItem* item, const KURL & url
bool KonqSidebarTree::acceptDrag(TQDropEvent* e) const
{
- // for KListViewMode...
+ // for TDEListViewMode...
for( int i = 0; e->format( i ); i++ )
if ( d->m_dropFormats.contains(e->format( i ) ) )
return true;
@@ -441,7 +441,7 @@ TQDragObject* KonqSidebarTree::dragObject()
void KonqSidebarTree::leaveEvent( TQEvent *e )
{
- KListView::leaveEvent( e );
+ TDEListView::leaveEvent( e );
// emitStatusBarText( TQString::null );
}
@@ -855,7 +855,7 @@ KonqSidebarTreeItem * KonqSidebarTree::currentItem() const
void KonqSidebarTree::setContentsPos( int x, int y )
{
if ( !m_scrollingLocked )
- KListView::setContentsPos( x, y );
+ TDEListView::setContentsPos( x, y );
}
void KonqSidebarTree::slotItemRenamed(TQListViewItem* item, const TQString &name, int col)
@@ -906,22 +906,22 @@ void KonqSidebarTree::showToplevelContextMenu()
if (!m_collection)
{
- m_collection = new KActionCollection( this, "bookmark actions" );
- (void) new KAction( i18n("&Create New Folder..."), "folder_new", 0, TQT_TQOBJECT(this),
+ m_collection = new TDEActionCollection( this, "bookmark actions" );
+ (void) new TDEAction( i18n("&Create New Folder..."), "folder_new", 0, TQT_TQOBJECT(this),
TQT_SLOT( slotCreateFolder() ), m_collection, "create_folder");
- (void) new KAction( i18n("Delete Folder"), "editdelete", 0, TQT_TQOBJECT(this),
+ (void) new TDEAction( i18n("Delete Folder"), "editdelete", 0, TQT_TQOBJECT(this),
TQT_SLOT( slotDelete() ), m_collection, "delete_folder");
- (void) new KAction( i18n("Rename"), 0, TQT_TQOBJECT(this),
+ (void) new TDEAction( i18n("Rename"), 0, TQT_TQOBJECT(this),
TQT_SLOT( slotRename() ), m_collection, "rename");
- (void) new KAction( i18n("Delete Link"), "editdelete", 0, TQT_TQOBJECT(this),
+ (void) new TDEAction( i18n("Delete Link"), "editdelete", 0, TQT_TQOBJECT(this),
TQT_SLOT( slotDelete() ), m_collection, "delete_link");
- (void) new KAction( i18n("Properties"), "edit", 0, TQT_TQOBJECT(this),
+ (void) new TDEAction( i18n("Properties"), "edit", 0, TQT_TQOBJECT(this),
TQT_SLOT( slotProperties() ), m_collection, "item_properties");
- (void) new KAction( i18n("Open in New Window"), "window_new", 0, TQT_TQOBJECT(this),
+ (void) new TDEAction( i18n("Open in New Window"), "window_new", 0, TQT_TQOBJECT(this),
TQT_SLOT( slotOpenNewWindow() ), m_collection, "open_window");
- (void) new KAction( i18n("Open in New Tab"), "tab_new", 0, TQT_TQOBJECT(this),
+ (void) new TDEAction( i18n("Open in New Tab"), "tab_new", 0, TQT_TQOBJECT(this),
TQT_SLOT( slotOpenTab() ), m_collection, "open_tab");
- (void) new KAction( i18n("Copy Link Address"), "editcopy", 0, TQT_TQOBJECT(this),
+ (void) new TDEAction( i18n("Copy Link Address"), "editcopy", 0, TQT_TQOBJECT(this),
TQT_SLOT( slotCopyLocation() ), m_collection, "copy_location");
}
diff --git a/konqueror/sidebar/trees/konq_sidebartree.h b/konqueror/sidebar/trees/konq_sidebartree.h
index a8e2ad075..f8626298c 100644
--- a/konqueror/sidebar/trees/konq_sidebartree.h
+++ b/konqueror/sidebar/trees/konq_sidebartree.h
@@ -31,7 +31,7 @@
class KonqSidebarTreeModule;
class KonqSidebarTreeItem;
-class KActionCollection;
+class TDEActionCollection;
class TQTimer;
@@ -64,7 +64,7 @@ private:
typedef enum {
SidebarTreeMode, // used if the drop is accepted by a KonqSidebarTreeItem. otherwise
- KListViewMode // use KListView's dnd implementation. accepts mime types set with setDropFormats()
+ TDEListViewMode // use TDEListView's dnd implementation. accepts mime types set with setDropFormats()
} DropAcceptType;
/**
@@ -73,7 +73,7 @@ typedef enum {
* a toplevel item, and creates the modules that will handle the contents
* of those items.
*/
-class KonqSidebarTree : public KListView, public KDirNotify
+class KonqSidebarTree : public TDEListView, public KDirNotify
{
Q_OBJECT
public:
@@ -106,7 +106,7 @@ public:
void itemDestructed( KonqSidebarTreeItem *item );
- void setDropFormats( const TQStringList &formats ); // used in KListView mode
+ void setDropFormats( const TQStringList &formats ); // used in TDEListView mode
// Show context menu for toplevel items
void showToplevelContextMenu();
@@ -125,7 +125,7 @@ protected:
virtual void contentsDragMoveEvent( TQDragMoveEvent *e );
virtual void contentsDragLeaveEvent( TQDragLeaveEvent *e );
virtual void contentsDropEvent( TQDropEvent *ev );
- virtual bool acceptDrag(TQDropEvent* e) const; // used in KListView mode
+ virtual bool acceptDrag(TQDropEvent* e) const; // used in TDEListView mode
virtual void leaveEvent( TQEvent * );
@@ -205,7 +205,7 @@ private:
TQMap<TQString, getModule> pluginFactories;
bool m_bOpeningFirstChild;
- KActionCollection *m_collection;
+ TDEActionCollection *m_collection;
KonqSidebarTree_Internal *d;
diff --git a/konqueror/sidebar/trees/konqsidebar_tree.cpp b/konqueror/sidebar/trees/konqsidebar_tree.cpp
index 900d25e03..04454ecb1 100644
--- a/konqueror/sidebar/trees/konqsidebar_tree.cpp
+++ b/konqueror/sidebar/trees/konqsidebar_tree.cpp
@@ -32,7 +32,7 @@ KonqSidebar_Tree::KonqSidebar_Tree(TDEInstance *instance,TQObject *parent,TQWidg
clearSearch->setTextLabel(i18n("Clear Search"), true);
clearSearch->setIconSet(SmallIconSet(TQApplication::reverseLayout() ? "clear_left" : "locationbar_erase"));
TQLabel* slbl = new TQLabel(i18n("Se&arch:"), searchline);
- KListViewSearchLine* listViewSearch = new KListViewSearchLine(searchline,tree);
+ TDEListViewSearchLine* listViewSearch = new TDEListViewSearchLine(searchline,tree);
slbl->setBuddy(listViewSearch);
connect(clearSearch, TQT_SIGNAL(pressed()), listViewSearch, TQT_SLOT(clear()));
}