diff options
author | Timothy Pearson <[email protected]> | 2013-01-24 13:43:14 -0600 |
---|---|---|
committer | Timothy Pearson <[email protected]> | 2013-01-24 13:43:14 -0600 |
commit | 79b21d47bce1ee428affc97534cd8b257232a871 (patch) | |
tree | 0df1fa0109d9f2bcef932eda8b5c25b2e06669ed /libkonq/kfileivi.cc | |
parent | 9a898d493f493adbc404f7223043c85f3817472b (diff) | |
download | tdebase-79b21d47bce1ee428affc97534cd8b257232a871.tar.gz tdebase-79b21d47bce1ee428affc97534cd8b257232a871.zip |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'libkonq/kfileivi.cc')
-rw-r--r-- | libkonq/kfileivi.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libkonq/kfileivi.cc b/libkonq/kfileivi.cc index 3bc303bae..84691faa5 100644 --- a/libkonq/kfileivi.cc +++ b/libkonq/kfileivi.cc @@ -98,7 +98,7 @@ void KFileIVI::invalidateThumb( int state, bool redraw ) break; } d->icons = TQIconSet(); - d->icons.setPixmap( KGlobal::iconLoader()->iconEffect()-> + d->icons.setPixmap( TDEGlobal::iconLoader()->iconEffect()-> apply( d->thumb, KIcon::Desktop, state ), TQIconSet::Large, mode ); m_state = state; @@ -206,7 +206,7 @@ void KFileIVI::setThumbnailPixmap( const TQPixmap & pixmap ) // TQIconSet::reset() doesn't seem to clear the other generated pixmaps, // so we just create a blank TQIconSet here d->icons = TQIconSet(); - d->icons.setPixmap( KGlobal::iconLoader()->iconEffect()-> + d->icons.setPixmap( TDEGlobal::iconLoader()->iconEffect()-> apply( pixmap, KIcon::Desktop, KIcon::DefaultState ), TQIconSet::Large, TQIconSet::Normal ); @@ -244,7 +244,7 @@ void KFileIVI::setEffect( int state ) } // Do not update if the fingerprint is identical (prevents flicker)! - KIconEffect *effect = KGlobal::iconLoader()->iconEffect(); + KIconEffect *effect = TDEGlobal::iconLoader()->iconEffect(); bool haveEffect = effect->hasEffect( KIcon::Desktop, m_state ) != effect->hasEffect( KIcon::Desktop, state ); @@ -459,7 +459,7 @@ int KFileIVI::compare( TQIconViewItem *i ) const void KFileIVI::updatePixmapSize() { int size = m_size ? m_size : - KGlobal::iconLoader()->currentSize( KIcon::Desktop ); + TDEGlobal::iconLoader()->currentSize( KIcon::Desktop ); KonqIconViewWidget* view = static_cast<KonqIconViewWidget*>( iconView() ); |