summaryrefslogtreecommitdiffstats
path: root/konqueror
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-04 14:14:55 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-04 14:14:55 -0600
commitde9b6c9ad15f9f51812daae17cce635d1050a9ba (patch)
tree6b26400ab1a616925443c5d365246eb86c9bad57 /konqueror
parent4f841fbbbc5d3399535ade061699cc76363c7a3f (diff)
downloadtdebase-de9b6c9ad15f9f51812daae17cce635d1050a9ba.tar.gz
tdebase-de9b6c9ad15f9f51812daae17cce635d1050a9ba.zip
Rename KIcon to enhance compatibility with KDE4
Diffstat (limited to 'konqueror')
-rw-r--r--konqueror/ChangeLog2
-rw-r--r--konqueror/TODO2
-rw-r--r--konqueror/about/konq_aboutpage.cc52
-rw-r--r--konqueror/iconview/konq_iconview.cc4
-rw-r--r--konqueror/keditbookmarks/actionsimpl.cpp4
-rw-r--r--konqueror/konq_combo.cc14
-rw-r--r--konqueror/konq_guiclients.cc2
-rw-r--r--konqueror/konq_mainwindow.cc2
-rw-r--r--konqueror/konq_misc.cc2
-rw-r--r--konqueror/konq_tabs.cc2
-rw-r--r--konqueror/listview/konq_infolistviewitem.cc2
-rw-r--r--konqueror/listview/konq_listview.cc2
-rw-r--r--konqueror/listview/konq_listviewitems.cc4
-rw-r--r--konqueror/listview/konq_listviewitems.h6
-rw-r--r--konqueror/listview/konq_listviewwidget.cc4
-rw-r--r--konqueror/sidebar/sidebar_widget.cpp4
-rw-r--r--konqueror/sidebar/trees/dirtree_module/dirtree_item.cpp2
-rw-r--r--konqueror/sidebar/trees/dirtree_module/dirtree_module.cpp8
18 files changed, 59 insertions, 59 deletions
diff --git a/konqueror/ChangeLog b/konqueror/ChangeLog
index f83f0e17c..181bd9451 100644
--- a/konqueror/ChangeLog
+++ b/konqueror/ChangeLog
@@ -285,7 +285,7 @@ Sat Nov 25 17:38:27 2000 Carsten Pfeiffer <pfeiffer@kde.org>
2000-11-22 David Faure <faure@kde.org>
* konq_listview.cc: Added "Default" Icon Size, which corresponds to
- KIcon::Small (but when switching to icon view, it becomes whatever's
+ TDEIcon::Small (but when switching to icon view, it becomes whatever's
configured for the "Desktop" group).
2000-11-21 David Faure <faure@kde.org>
diff --git a/konqueror/TODO b/konqueror/TODO
index fad57be2d..c75e3f271 100644
--- a/konqueror/TODO
+++ b/konqueror/TODO
@@ -1,4 +1,4 @@
-KIconView:
+TDEIconView:
==========
- When you are adding to the selection (eg. by shift + LMB)
diff --git a/konqueror/about/konq_aboutpage.cc b/konqueror/about/konq_aboutpage.cc
index 4e671ce57..809eb2576 100644
--- a/konqueror/about/konq_aboutpage.cc
+++ b/konqueror/about/konq_aboutpage.cc
@@ -98,17 +98,17 @@ TQString KonqAboutPageFactory::launch()
if ( res.isEmpty() )
return res;
- KIconLoader *iconloader = TDEGlobal::iconLoader();
- int iconSize = iconloader->currentSize(KIcon::Desktop);
- TQString home_icon_path = iconloader->iconPath("kfm_home", KIcon::Desktop );
- TQString storage_icon_path = iconloader->iconPath("system", KIcon::Desktop );
- TQString remote_icon_path = iconloader->iconPath("network", KIcon::Desktop );
- TQString wastebin_icon_path = iconloader->iconPath("trashcan_full", KIcon::Desktop );
- TQString applications_icon_path = iconloader->iconPath("kmenu", KIcon::Desktop );
- TQString settings_icon_path = iconloader->iconPath("kcontrol", KIcon::Desktop );
- TQString help_icon_path = iconloader->iconPath("khelpcenter", KIcon::Desktop );
+ TDEIconLoader *iconloader = TDEGlobal::iconLoader();
+ int iconSize = iconloader->currentSize(TDEIcon::Desktop);
+ TQString home_icon_path = iconloader->iconPath("kfm_home", TDEIcon::Desktop );
+ TQString storage_icon_path = iconloader->iconPath("system", TDEIcon::Desktop );
+ TQString remote_icon_path = iconloader->iconPath("network", TDEIcon::Desktop );
+ TQString wastebin_icon_path = iconloader->iconPath("trashcan_full", TDEIcon::Desktop );
+ TQString applications_icon_path = iconloader->iconPath("kmenu", TDEIcon::Desktop );
+ TQString settings_icon_path = iconloader->iconPath("kcontrol", TDEIcon::Desktop );
+ TQString help_icon_path = iconloader->iconPath("khelpcenter", TDEIcon::Desktop );
TQString home_folder = TQDir::homeDirPath();
- TQString continue_icon_path = TQApplication::reverseLayout()?iconloader->iconPath("1leftarrow", KIcon::Small ):iconloader->iconPath("1rightarrow", KIcon::Small );
+ TQString continue_icon_path = TQApplication::reverseLayout()?iconloader->iconPath("1leftarrow", TDEIcon::Small ):iconloader->iconPath("1rightarrow", TDEIcon::Small );
res = res.arg( locate( "data", "tdeui/about/kde_infopage.css" ) );
if ( kapp->reverseLayout() )
@@ -171,7 +171,7 @@ TQString KonqAboutPageFactory::launch()
.arg( i18n( "Settings" ) )
.arg( i18n( "Desktop configuration" ) )
.arg( continue_icon_path )
- .arg( KIcon::SizeSmall ).arg( KIcon::SizeSmall )
+ .arg( TDEIcon::SizeSmall ).arg( TDEIcon::SizeSmall )
.arg( i18n( "Next: An Introduction to Konqueror" ) )
;
i18n("Search the Web");//i18n for possible future use
@@ -190,10 +190,10 @@ TQString KonqAboutPageFactory::intro()
if ( res.isEmpty() )
return res;
- KIconLoader *iconloader = TDEGlobal::iconLoader();
- TQString back_icon_path = TQApplication::reverseLayout()?iconloader->iconPath("forward", KIcon::Small ):iconloader->iconPath("back", KIcon::Small );
- TQString gohome_icon_path = iconloader->iconPath("gohome", KIcon::Small );
- TQString continue_icon_path = TQApplication::reverseLayout()?iconloader->iconPath("1leftarrow", KIcon::Small ):iconloader->iconPath("1rightarrow", KIcon::Small );
+ TDEIconLoader *iconloader = TDEGlobal::iconLoader();
+ TQString back_icon_path = TQApplication::reverseLayout()?iconloader->iconPath("forward", TDEIcon::Small ):iconloader->iconPath("back", TDEIcon::Small );
+ TQString gohome_icon_path = iconloader->iconPath("gohome", TDEIcon::Small );
+ TQString continue_icon_path = TQApplication::reverseLayout()?iconloader->iconPath("1leftarrow", TDEIcon::Small ):iconloader->iconPath("1rightarrow", TDEIcon::Small );
res = res.arg( locate( "data", "tdeui/about/kde_infopage.css" ) );
if ( kapp->reverseLayout() )
@@ -244,9 +244,9 @@ TQString KonqAboutPageFactory::specs()
if ( s_specs_html )
return *s_specs_html;
- KIconLoader *iconloader = TDEGlobal::iconLoader();
+ TDEIconLoader *iconloader = TDEGlobal::iconLoader();
TQString res = loadFile( locate( "data", "konqueror/about/specs.html" ));
- TQString continue_icon_path = TQApplication::reverseLayout()?iconloader->iconPath("1leftarrow", KIcon::Small ):iconloader->iconPath("1rightarrow", KIcon::Small );
+ TQString continue_icon_path = TQApplication::reverseLayout()?iconloader->iconPath("1leftarrow", TDEIcon::Small ):iconloader->iconPath("1rightarrow", TDEIcon::Small );
if ( res.isEmpty() )
return res;
@@ -330,22 +330,22 @@ TQString KonqAboutPageFactory::tips()
if ( res.isEmpty() )
return res;
- KIconLoader *iconloader = TDEGlobal::iconLoader();
+ TDEIconLoader *iconloader = TDEGlobal::iconLoader();
TQString viewmag_icon_path =
- iconloader->iconPath("viewmag", KIcon::Small );
+ iconloader->iconPath("viewmag", TDEIcon::Small );
TQString history_icon_path =
- iconloader->iconPath("history", KIcon::Small );
+ iconloader->iconPath("history", TDEIcon::Small );
TQString openterm_icon_path =
- iconloader->iconPath("openterm", KIcon::Small );
+ iconloader->iconPath("openterm", TDEIcon::Small );
TQString locationbar_erase_rtl_icon_path =
- iconloader->iconPath("clear_left", KIcon::Small );
+ iconloader->iconPath("clear_left", TDEIcon::Small );
TQString locationbar_erase_icon_path =
- iconloader->iconPath("locationbar_erase", KIcon::Small );
+ iconloader->iconPath("locationbar_erase", TDEIcon::Small );
TQString window_fullscreen_icon_path =
- iconloader->iconPath("window_fullscreen", KIcon::Small );
+ iconloader->iconPath("window_fullscreen", TDEIcon::Small );
TQString view_left_right_icon_path =
- iconloader->iconPath("view_left_right", KIcon::Small );
- TQString continue_icon_path = TQApplication::reverseLayout()?iconloader->iconPath("1leftarrow", KIcon::Small ):iconloader->iconPath("1rightarrow", KIcon::Small );
+ iconloader->iconPath("view_left_right", TDEIcon::Small );
+ TQString continue_icon_path = TQApplication::reverseLayout()?iconloader->iconPath("1leftarrow", TDEIcon::Small ):iconloader->iconPath("1rightarrow", TDEIcon::Small );
res = res.arg( locate( "data", "tdeui/about/kde_infopage.css" ) );
if ( kapp->reverseLayout() )
diff --git a/konqueror/iconview/konq_iconview.cc b/konqueror/iconview/konq_iconview.cc
index 087561076..7d3dc810c 100644
--- a/konqueror/iconview/konq_iconview.cc
+++ b/konqueror/iconview/konq_iconview.cc
@@ -671,11 +671,11 @@ void KonqKfmIconView::newIconSize( int size )
//check for that when checking whether the size changed
int effSize = size;
if (effSize == 0)
- effSize = IconSize(KIcon::Desktop);
+ effSize = IconSize(TDEIcon::Desktop);
int oldEffSize = m_pIconView->iconSize();
if (oldEffSize == 0)
- oldEffSize = IconSize(KIcon::Desktop);
+ oldEffSize = IconSize(TDEIcon::Desktop);
// Make sure all actions are initialized.
KonqDirPart::newIconSize( size );
diff --git a/konqueror/keditbookmarks/actionsimpl.cpp b/konqueror/keditbookmarks/actionsimpl.cpp
index dc7670813..ff83c2d28 100644
--- a/konqueror/keditbookmarks/actionsimpl.cpp
+++ b/konqueror/keditbookmarks/actionsimpl.cpp
@@ -616,8 +616,8 @@ void ActionsImpl::slotHideInToolbar() {
void ActionsImpl::slotChangeIcon() {
KEBApp::self()->bkInfo()->commitChanges();
KBookmark bk = ListView::self()->firstSelected()->bookmark();
- KIconDialog dlg(KEBApp::self());
- TQString newIcon = dlg.selectIcon(KIcon::Small, KIcon::Place);
+ TDEIconDialog dlg(KEBApp::self());
+ TQString newIcon = dlg.selectIcon(TDEIcon::Small, TDEIcon::Place);
if (newIcon.isEmpty())
return;
EditCommand *cmd = new EditCommand(
diff --git a/konqueror/konq_combo.cc b/konqueror/konq_combo.cc
index 3d99ed337..888f79283 100644
--- a/konqueror/konq_combo.cc
+++ b/konqueror/konq_combo.cc
@@ -329,7 +329,7 @@ void KonqCombo::loadItems()
item = *it;
if ( !item.isEmpty() ) { // only insert non-empty items
if( first ) {
- insertItem( KonqPixmapProvider::self()->pixmapFor( item, KIcon::SizeSmall ),
+ insertItem( KonqPixmapProvider::self()->pixmapFor( item, TDEIcon::SizeSmall ),
item, i++, titleOfURL( item ) );
}
else
@@ -349,7 +349,7 @@ void KonqCombo::slotSetIcon( int index )
if( pixmap( index ) == NULL )
// on-demand icon loading
updateItem( KonqPixmapProvider::self()->pixmapFor( text( index ),
- KIcon::SizeSmall ), text( index ), index,
+ TDEIcon::SizeSmall ), text( index ), index,
titleOfURL( text( index ) ) );
update();
}
@@ -362,7 +362,7 @@ void KonqCombo::popup()
{
// on-demand icon loading
updateItem( KonqPixmapProvider::self()->pixmapFor( text( i ),
- KIcon::SizeSmall), text( i ), i, titleOfURL( text( i ) ) );
+ TDEIcon::SizeSmall), text( i ), i, titleOfURL( text( i ) ) );
}
}
KHistoryCombo::popup();
@@ -577,7 +577,7 @@ void KonqCombo::mouseMoveEvent( TQMouseEvent *e )
list.append( url );
KURLDrag *drag = new KURLDrag( list, this );
TQPixmap pix = KonqPixmapProvider::self()->pixmapFor( currentText(),
- KIcon::SizeMedium );
+ TDEIcon::SizeMedium );
if ( !pix.isNull() )
drag->setPixmap( pix );
drag->dragCopy();
@@ -700,13 +700,13 @@ void KonqComboListBoxPixmap::paint( TQPainter *painter )
if ( lookup_pending ) {
title = titleOfURL( text() );
if ( !title.isEmpty() )
- pm = KonqPixmapProvider::self()->pixmapFor( text(), KIcon::SizeSmall );
+ pm = KonqPixmapProvider::self()->pixmapFor( text(), TDEIcon::SizeSmall );
else if ( text().find( "://" ) == -1 ) {
title = titleOfURL( "http://"+text() );
if ( !title.isEmpty() )
- pm = KonqPixmapProvider::self()->pixmapFor( "http://"+text(), KIcon::SizeSmall );
+ pm = KonqPixmapProvider::self()->pixmapFor( "http://"+text(), TDEIcon::SizeSmall );
else
- pm = KonqPixmapProvider::self()->pixmapFor( text(), KIcon::SizeSmall );
+ pm = KonqPixmapProvider::self()->pixmapFor( text(), TDEIcon::SizeSmall );
}
else
pm = TQPixmap();
diff --git a/konqueror/konq_guiclients.cc b/konqueror/konq_guiclients.cc
index ffd45fe89..738e75338 100644
--- a/konqueror/konq_guiclients.cc
+++ b/konqueror/konq_guiclients.cc
@@ -156,7 +156,7 @@ void PopupMenuGUIClient::addEmbeddingService( TQDomElement &menu, int idx, const
action.setAttribute( "group", "preview" );
- (void)new TDEAction( name, service->pixmap( KIcon::Small ), 0,
+ (void)new TDEAction( name, service->pixmap( TDEIcon::Small ), 0,
TQT_TQOBJECT(m_mainWindow), TQT_SLOT( slotOpenEmbedded() ), actionCollection(), actName );
}
diff --git a/konqueror/konq_mainwindow.cc b/konqueror/konq_mainwindow.cc
index 37e78c7d4..69b7b85f5 100644
--- a/konqueror/konq_mainwindow.cc
+++ b/konqueror/konq_mainwindow.cc
@@ -5403,7 +5403,7 @@ void KonqMainWindow::setIcon( const TQPixmap& pix )
TQString url = m_combo->currentText();
if ( !url.isEmpty() )
- big = KonqPixmapProvider::self()->pixmapFor( url, KIcon::SizeMedium );
+ big = KonqPixmapProvider::self()->pixmapFor( url, TDEIcon::SizeMedium );
KWin::setIcons( winId(), big, pix );
}
diff --git a/konqueror/konq_misc.cc b/konqueror/konq_misc.cc
index 3ccccd441..2353b4c44 100644
--- a/konqueror/konq_misc.cc
+++ b/konqueror/konq_misc.cc
@@ -248,7 +248,7 @@ void KonqDraggableLabel::mouseMoveEvent( TQMouseEvent * ev )
KURL::List lst;
lst.append( m_mw->currentView()->url() );
TQDragObject * drag = new KURLDrag( lst, m_mw );
- drag->setPixmap( KMimeType::pixmapForURL( lst.first(), 0, KIcon::Small ) );
+ drag->setPixmap( KMimeType::pixmapForURL( lst.first(), 0, TDEIcon::Small ) );
drag->dragCopy();
}
}
diff --git a/konqueror/konq_tabs.cc b/konqueror/konq_tabs.cc
index 70cbcafd5..be7df5a07 100644
--- a/konqueror/konq_tabs.cc
+++ b/konqueror/konq_tabs.cc
@@ -509,7 +509,7 @@ void KonqFrameTabs::slotInitiateDrag( TQWidget *w )
KURL::List lst;
lst.append( frame->activeChildView()->url() );
KURLDrag *d = new KURLDrag( lst, this );
- d->setPixmap( KMimeType::pixmapForURL( lst.first(), 0, KIcon::Small ) );
+ d->setPixmap( KMimeType::pixmapForURL( lst.first(), 0, TDEIcon::Small ) );
d->dragCopy();
}
}
diff --git a/konqueror/listview/konq_infolistviewitem.cc b/konqueror/listview/konq_infolistviewitem.cc
index 79e0ead82..056fbe757 100644
--- a/konqueror/listview/konq_infolistviewitem.cc
+++ b/konqueror/listview/konq_infolistviewitem.cc
@@ -202,7 +202,7 @@ void KonqInfoListViewItem::setDisabled( bool disabled )
{
KonqBaseListViewItem::setDisabled( disabled );
int iconSize = static_cast<KonqBaseListViewWidget *>(listView())->iconSize();
- iconSize = iconSize ? iconSize : TDEGlobal::iconLoader()->currentSize( KIcon::Small ); // Default = small
+ iconSize = iconSize ? iconSize : TDEGlobal::iconLoader()->currentSize( TDEIcon::Small ); // Default = small
setPixmap( 0, m_fileitem->pixmap( iconSize, state() ) );
}
diff --git a/konqueror/listview/konq_listview.cc b/konqueror/listview/konq_listview.cc
index b872be4a7..a98a6baa9 100644
--- a/konqueror/listview/konq_listview.cc
+++ b/konqueror/listview/konq_listview.cc
@@ -675,7 +675,7 @@ void KonqListView::setupActions()
// m_paShowDot->setCheckedState(i18n("Hide &Hidden Files"));
m_paCaseInsensitive = new TDEToggleAction(i18n("Case Insensitive Sort"), 0, this, TQT_SLOT(slotCaseInsensitive()),actionCollection(), "sort_caseinsensitive" );
- newIconSize( KIcon::SizeSmall /* default size */ );
+ newIconSize( TDEIcon::SizeSmall /* default size */ );
}
void KonqListView::slotSelectionChanged()
diff --git a/konqueror/listview/konq_listviewitems.cc b/konqueror/listview/konq_listviewitems.cc
index cebf7d5be..0077c6da5 100644
--- a/konqueror/listview/konq_listviewitems.cc
+++ b/konqueror/listview/konq_listviewitems.cc
@@ -164,7 +164,7 @@ void KonqListViewItem::setDisabled( bool disabled )
{
KonqBaseListViewItem::setDisabled( disabled );
int iconSize = m_pListViewWidget->iconSize();
- iconSize = iconSize ? iconSize : TDEGlobal::iconLoader()->currentSize( KIcon::Small ); // Default = small
+ iconSize = iconSize ? iconSize : TDEGlobal::iconLoader()->currentSize( TDEIcon::Small ); // Default = small
setPixmap( 0, m_fileitem->pixmap( iconSize, state() ) );
}
@@ -176,7 +176,7 @@ void KonqListViewItem::setActive( bool active )
//#### Optimize away repaint if possible, like the iconview does?
KonqBaseListViewItem::setActive( active );
int iconSize = m_pListViewWidget->iconSize();
- iconSize = iconSize ? iconSize : TDEGlobal::iconLoader()->currentSize( KIcon::Small ); // Default = small
+ iconSize = iconSize ? iconSize : TDEGlobal::iconLoader()->currentSize( TDEIcon::Small ); // Default = small
setPixmap( 0, m_fileitem->pixmap( iconSize, state() ) );
}
diff --git a/konqueror/listview/konq_listviewitems.h b/konqueror/listview/konq_listviewitems.h
index 6ea4e79dd..6a744321c 100644
--- a/konqueror/listview/konq_listviewitems.h
+++ b/konqueror/listview/konq_listviewitems.h
@@ -57,10 +57,10 @@ class KonqBaseListViewItem : public TDEListViewItem
int state() const
{
if (m_bDisabled)
- return KIcon::DisabledState;
+ return TDEIcon::DisabledState;
if (m_bActive)
- return KIcon::ActiveState;
- return KIcon::DefaultState;
+ return TDEIcon::ActiveState;
+ return TDEIcon::DefaultState;
}
/** For KonqMimeTypeResolver */
diff --git a/konqueror/listview/konq_listviewwidget.cc b/konqueror/listview/konq_listviewwidget.cc
index 8eb2cd6bf..673362063 100644
--- a/konqueror/listview/konq_listviewwidget.cc
+++ b/konqueror/listview/konq_listviewwidget.cc
@@ -839,7 +839,7 @@ void KonqBaseListViewWidget::startDrag()
if (( urls.count() > 1 ) || (pixmap0Invalid))
{
int iconSize = m_pBrowserView->m_pProps->iconSize();
- iconSize = iconSize ? iconSize : TDEGlobal::iconLoader()->currentSize( KIcon::Small ); // Default = small
+ iconSize = iconSize ? iconSize : TDEGlobal::iconLoader()->currentSize( TDEIcon::Small ); // Default = small
pixmap2 = DesktopIcon( "tdemultiple", iconSize );
if ( pixmap2.isNull() )
kdWarning(1202) << "Could not find multiple pixmap" << endl;
@@ -1011,7 +1011,7 @@ void KonqBaseListViewWidget::slotReturnPressed( TQListViewItem *_item )
// call the icon effect if enabled
if (TDEGlobalSettings::showKonqIconActivationEffect() == true) {
- KIconEffect::visualActivate(viewport(), rect, pix);
+ TDEIconEffect::visualActivate(viewport(), rect, pix);
}
// clean up
diff --git a/konqueror/sidebar/sidebar_widget.cpp b/konqueror/sidebar/sidebar_widget.cpp
index 4dc29dbd4..a775f5160 100644
--- a/konqueror/sidebar/sidebar_widget.cpp
+++ b/konqueror/sidebar/sidebar_widget.cpp
@@ -488,9 +488,9 @@ void Sidebar_Widget::buttonPopupActivate(int id)
{
case 1:
{
- KIconDialog kicd(this);
+ TDEIconDialog kicd(this);
// kicd.setStrictIconSize(true);
- TQString iconname=kicd.selectIcon(KIcon::Small);
+ TQString iconname=kicd.selectIcon(TDEIcon::Small);
kdDebug()<<"New Icon Name:"<<iconname<<endl;
if (!iconname.isEmpty())
{
diff --git a/konqueror/sidebar/trees/dirtree_module/dirtree_item.cpp b/konqueror/sidebar/trees/dirtree_module/dirtree_item.cpp
index 57109e7cb..637c428dc 100644
--- a/konqueror/sidebar/trees/dirtree_module/dirtree_item.cpp
+++ b/konqueror/sidebar/trees/dirtree_module/dirtree_item.cpp
@@ -92,7 +92,7 @@ void KonqSidebarDirTreeItem::setOpen( bool open )
MYMODULE->openSubFolder( this );
else if ( hasStandardIcon() )
{
- int size = TDEGlobal::iconLoader()->currentSize( KIcon::Small );
+ int size = TDEGlobal::iconLoader()->currentSize( TDEIcon::Small );
if ( open )
setPixmap( 0, DesktopIcon( "folder_open", size ) );
else
diff --git a/konqueror/sidebar/trees/dirtree_module/dirtree_module.cpp b/konqueror/sidebar/trees/dirtree_module/dirtree_module.cpp
index 40dd324e8..61e5eb43f 100644
--- a/konqueror/sidebar/trees/dirtree_module/dirtree_module.cpp
+++ b/konqueror/sidebar/trees/dirtree_module/dirtree_module.cpp
@@ -325,7 +325,7 @@ void KonqSidebarDirTreeModule::openSubFolder( KonqSidebarTreeItem *item )
if ( !item->isTopLevelItem() &&
static_cast<KonqSidebarDirTreeItem *>(item)->hasStandardIcon() )
{
- int size = TDEGlobal::iconLoader()->currentSize( KIcon::Small );
+ int size = TDEGlobal::iconLoader()->currentSize( TDEIcon::Small );
TQPixmap pix = DesktopIcon( "folder_open", size );
m_pTree->startAnimation( item, "kde", 6, &pix );
}
@@ -358,7 +358,7 @@ void KonqSidebarDirTreeModule::listDirectory( KonqSidebarTreeItem *item )
{
// We have this directory listed already, just copy the entries as we
// can't use the dirlister, it would invalidate the old entries
- int size = TDEGlobal::iconLoader()->currentSize( KIcon::Small );
+ int size = TDEGlobal::iconLoader()->currentSize( TDEIcon::Small );
KonqSidebarTreeItem * parentItem = item;
KonqSidebarDirTreeItem *oldItem = static_cast<KonqSidebarDirTreeItem *> (openItem->firstChild());
while(oldItem)
@@ -424,7 +424,7 @@ void KonqSidebarDirTreeModule::slotNewItems( const KFileItemList& entries )
}
kdDebug()<<"number of additional parent items:"<< (parentItemList?parentItemList->count():0)<<endl;
- int size = TDEGlobal::iconLoader()->currentSize( KIcon::Small );
+ int size = TDEGlobal::iconLoader()->currentSize( TDEIcon::Small );
do
{
kdDebug()<<"Parent Item URL:"<<parentItem->externalURL()<<endl;
@@ -456,7 +456,7 @@ void KonqSidebarDirTreeModule::slotNewItems( const KFileItemList& entries )
void KonqSidebarDirTreeModule::slotRefreshItems( const KFileItemList &entries )
{
- int size = TDEGlobal::iconLoader()->currentSize( KIcon::Small );
+ int size = TDEGlobal::iconLoader()->currentSize( TDEIcon::Small );
TQPtrListIterator<KFileItem> kit ( entries );
kdDebug(1201) << "KonqSidebarDirTreeModule::slotRefreshItems " << entries.count() << " entries. First: " << kit.current()->url().url() << endl;