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 --- kdesktop/desktop.cc | 2 +- kdesktop/kcustommenu.cc | 8 ++++---- kdesktop/kdiconview.cc | 8 ++++---- kdesktop/minicli.cpp | 2 +- kdesktop/startupid.cpp | 4 ++-- kdesktop/tdefileividesktop.cpp | 6 +++--- kdesktop/tdefileividesktop.h | 2 +- 7 files changed, 16 insertions(+), 16 deletions(-) (limited to 'kdesktop') diff --git a/kdesktop/desktop.cc b/kdesktop/desktop.cc index 5b125de2c..277628e4d 100644 --- a/kdesktop/desktop.cc +++ b/kdesktop/desktop.cc @@ -810,7 +810,7 @@ void KDesktop::slotSettingsChanged(int category) void KDesktop::slotIconChanged(int group) { - if ( group == KIcon::Desktop ) + if ( group == TDEIcon::Desktop ) { kdDebug(1204) << "KDesktop::slotIconChanged" << endl; refresh(); diff --git a/kdesktop/kcustommenu.cc b/kdesktop/kcustommenu.cc index a0bf92556..d114e443f 100644 --- a/kdesktop/kcustommenu.cc +++ b/kdesktop/kcustommenu.cc @@ -84,10 +84,10 @@ KCustomMenu::insertMenuItem(KService::Ptr & s, int nId, int nIndex/*= -1*/) // to accelators, replace them with two ampersands. serviceName.replace("&", "&&"); - TQPixmap normal = TDEGlobal::instance()->iconLoader()->loadIcon(s->icon(), KIcon::Small, - 0, KIcon::DefaultState, 0L, true); - TQPixmap active = TDEGlobal::instance()->iconLoader()->loadIcon(s->icon(), KIcon::Small, - 0, KIcon::ActiveState, 0L, true); + TQPixmap normal = TDEGlobal::instance()->iconLoader()->loadIcon(s->icon(), TDEIcon::Small, + 0, TDEIcon::DefaultState, 0L, true); + TQPixmap active = TDEGlobal::instance()->iconLoader()->loadIcon(s->icon(), TDEIcon::Small, + 0, TDEIcon::ActiveState, 0L, true); // make sure they are not larger than 16x16 if (normal.width() > 16 || normal.height() > 16) { TQImage tmp = normal.convertToImage(); 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 diff --git a/kdesktop/minicli.cpp b/kdesktop/minicli.cpp index a793102f8..339ad6c38 100644 --- a/kdesktop/minicli.cpp +++ b/kdesktop/minicli.cpp @@ -864,7 +864,7 @@ void Minicli::setIcon () if ( m_iconName == "www" ) { - // Not using KIconEffect::overlay as that requires the same size + // Not using TDEIconEffect::overlay as that requires the same size // for the icon and the overlay, also the overlay definately doesn't // have a more that one-bit alpha channel here TQPixmap overlay( locate ( "icon", KMimeType::favIconForURL( m_filterData->uri() ) + ".png" ) ); diff --git a/kdesktop/startupid.cpp b/kdesktop/startupid.cpp index e61167fca..3111cd881 100644 --- a/kdesktop/startupid.cpp +++ b/kdesktop/startupid.cpp @@ -179,8 +179,8 @@ void StartupId::start_startupid( const TQString& icon_P ) = { Qt::black, Qt::darkGray, Qt::lightGray, Qt::white, Qt::white }; - TQPixmap icon_pixmap = TDEGlobal::iconLoader()->loadIcon( icon_P, KIcon::Small, 0, - KIcon::DefaultState, 0, true ); // return null pixmap if not found + TQPixmap icon_pixmap = TDEGlobal::iconLoader()->loadIcon( icon_P, TDEIcon::Small, 0, + TDEIcon::DefaultState, 0, true ); // return null pixmap if not found if( icon_pixmap.isNull()) icon_pixmap = SmallIcon( "exec" ); if( startup_widget == NULL ) diff --git a/kdesktop/tdefileividesktop.cpp b/kdesktop/tdefileividesktop.cpp index 420aeac4f..04e8db163 100644 --- a/kdesktop/tdefileividesktop.cpp +++ b/kdesktop/tdefileividesktop.cpp @@ -64,7 +64,7 @@ KFileIVIDesktop::~KFileIVIDesktop() void KFileIVIDesktop::calcRect( const TQString& _text ) { - KIconViewItem::calcRect( _text ); + TDEIconViewItem::calcRect( _text ); if ( !iconView() || !m_shadow || !wordWrap() || !( static_cast @@ -99,7 +99,7 @@ void KFileIVIDesktop::paintItem( TQPainter *p, const TQColorGroup &cg) p->save(); - // draw the pixmap as in KIconViewItem::paintItem(...) + // draw the pixmap as in TDEIconViewItem::paintItem(...) paintPixmap(p, colors); // @@ -147,7 +147,7 @@ void KFileIVIDesktop::drawShadowedText( TQPainter *p, const TQColorGroup &cg ) else textX = textRect( FALSE ).x() + 2; int textY = textRect( FALSE ).y(); - int align = ((KIconView *) iconView())->itemTextPos() == TQIconView::Bottom + int align = ((TDEIconView *) iconView())->itemTextPos() == TQIconView::Bottom ? AlignHCenter : AlignAuto; bool rebuild = shouldUpdateShadow(isSelected()); diff --git a/kdesktop/tdefileividesktop.h b/kdesktop/tdefileividesktop.h index a4a4f4e0c..46f77f636 100644 --- a/kdesktop/tdefileividesktop.h +++ b/kdesktop/tdefileividesktop.h @@ -66,7 +66,7 @@ class KFileIVIDesktop : public KFileIVI protected: /** - * Reimplements KIconView::calcRect to take the shadow metrics + * Reimplements TDEIconView::calcRect to take the shadow metrics * into account */ virtual void calcRect( const TQString& _text ); -- cgit v1.2.1