summaryrefslogtreecommitdiffstats
path: root/kdesktop/kdiconview.cc
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 /kdesktop/kdiconview.cc
parent4f841fbbbc5d3399535ade061699cc76363c7a3f (diff)
downloadtdebase-de9b6c9ad15f9f51812daae17cce635d1050a9ba.tar.gz
tdebase-de9b6c9ad15f9f51812daae17cce635d1050a9ba.zip
Rename KIcon to enhance compatibility with KDE4
Diffstat (limited to 'kdesktop/kdiconview.cc')
-rw-r--r--kdesktop/kdiconview.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/kdesktop/kdiconview.cc b/kdesktop/kdiconview.cc
index e8e95b2d1..8fd04b230 100644
--- a/kdesktop/kdiconview.cc
+++ b/kdesktop/kdiconview.cc
@@ -490,7 +490,7 @@ void KDIconView::setAutoAlign( bool b )
// Auto line-up icons
if ( b ) {
// set maxItemWidth to ensure sane initial icon layout before the auto align code is fully activated
- int sz = iconSize() ? iconSize() : TDEGlobal::iconLoader()->currentSize( KIcon::Desktop );
+ int sz = iconSize() ? iconSize() : TDEGlobal::iconLoader()->currentSize( TDEIcon::Desktop );
setMaxItemWidth( QMAX( QMAX( sz, previewIconSize( iconSize() ) ), KonqFMSettings::settings()->iconTextWidth() ) );
setFont( font() ); // Force calcRect()
@@ -505,7 +505,7 @@ void KDIconView::setAutoAlign( bool b )
}
else {
// change maxItemWidth, because when grid-align was active, it changed this for the grid
- int sz = iconSize() ? iconSize() : TDEGlobal::iconLoader()->currentSize( KIcon::Desktop );
+ int sz = iconSize() ? iconSize() : TDEGlobal::iconLoader()->currentSize( TDEIcon::Desktop );
setMaxItemWidth( QMAX( QMAX( sz, previewIconSize( iconSize() ) ), KonqFMSettings::settings()->iconTextWidth() ) );
setFont( font() ); // Force calcRect()
@@ -1528,7 +1528,7 @@ void KDIconView::showEvent( TQShowEvent *e )
if (m_hasExistingPos)
TQScrollView::showEvent( e );
else
- KIconView::showEvent( e );
+ TDEIconView::showEvent( e );
}
void KDIconView::contentsDropEvent( TQDropEvent * e )
@@ -1548,7 +1548,7 @@ void KDIconView::contentsDropEvent( TQDropEvent * e )
bool bSignals = signalsBlocked();
setItemsMovable(false);
blockSignals(true);
- KIconView::contentsDropEvent( e );
+ TDEIconView::contentsDropEvent( e );
blockSignals(bSignals);
setItemsMovable(bMovable);
// End hack