From de9b6c9ad15f9f51812daae17cce635d1050a9ba Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Mon, 4 Feb 2013 14:14:55 -0600 Subject: Rename KIcon to enhance compatibility with KDE4 --- konqueror/listview/konq_infolistviewitem.cc | 2 +- konqueror/listview/konq_listview.cc | 2 +- konqueror/listview/konq_listviewitems.cc | 4 ++-- konqueror/listview/konq_listviewitems.h | 6 +++--- konqueror/listview/konq_listviewwidget.cc | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) (limited to 'konqueror/listview') 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(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 -- cgit v1.2.1