From 8e026986e2974e9cacbf465ee4ae6a5889a6c1ba Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Mon, 4 Feb 2013 14:18:49 -0600 Subject: [PATCH] Rename KIcon to enhance compatibility with KDE4 --- fifteenapplet/fifteenapplet.cpp | 2 +- kmoon/kmoonwidget.cpp | 4 ++-- kweather/kweather.cpp | 2 +- kweather/weatherbutton.cpp | 8 ++++---- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/fifteenapplet/fifteenapplet.cpp b/fifteenapplet/fifteenapplet.cpp index f411f1a..47f8c08 100644 --- a/fifteenapplet/fifteenapplet.cpp +++ b/fifteenapplet/fifteenapplet.cpp @@ -85,7 +85,7 @@ void FifteenApplet::about() } KAboutApplication dialog(_aboutData); - dialog.setProgramLogo( TDEGlobal::instance()->iconLoader()->iconPath( "fifteenpieces", -KIcon::SizeLarge ) ); + dialog.setProgramLogo( TDEGlobal::instance()->iconLoader()->iconPath( "fifteenpieces", -TDEIcon::SizeLarge ) ); dialog.exec(); } diff --git a/kmoon/kmoonwidget.cpp b/kmoon/kmoonwidget.cpp index 1d25c96..eb428c7 100644 --- a/kmoon/kmoonwidget.cpp +++ b/kmoon/kmoonwidget.cpp @@ -229,8 +229,8 @@ TQImage MoonWidget::loadMoon(int index) if (path.isNull()) kdFatal() << "cound't find " << filename << ". Exiting.\n"; TQImage image(path); - KIconEffect iconeffect; - image=iconeffect.apply(image, KIcon::Panel, KIcon::DefaultState); + TDEIconEffect iconeffect; + image=iconeffect.apply(image, TDEIcon::Panel, TDEIcon::DefaultState); return image; } diff --git a/kweather/kweather.cpp b/kweather/kweather.cpp index 120fdf2..98fbae1 100644 --- a/kweather/kweather.cpp +++ b/kweather/kweather.cpp @@ -144,7 +144,7 @@ void kweather::about(){ I18N_NOOP( "Improvements and more code cleanups" ), "jratke@comcast.net" ); KAboutApplication about(&aboutData, this, 0); - about.setProgramLogo( TDEGlobal::instance()->iconLoader()->iconPath( "kweather", -KIcon::SizeLarge ) ); + about.setProgramLogo( TDEGlobal::instance()->iconLoader()->iconPath( "kweather", -TDEIcon::SizeLarge ) ); about.exec(); } diff --git a/kweather/weatherbutton.cpp b/kweather/weatherbutton.cpp index 355180f..1905a75 100644 --- a/kweather/weatherbutton.cpp +++ b/kweather/weatherbutton.cpp @@ -100,10 +100,10 @@ void WeatherButton::generateIcons() TQImage image = pixmap()->convertToImage(); image = image.smoothScale( pixmapSize(), TQ_ScaleMin ); - KIconEffect effect; + TDEIconEffect effect; - m_normalIcon = effect.apply( image, KIcon::Panel, KIcon::DefaultState ); - m_activeIcon = effect.apply( image, KIcon::Panel, KIcon::ActiveState ); + m_normalIcon = effect.apply( image, TDEIcon::Panel, TDEIcon::DefaultState ); + m_activeIcon = effect.apply( image, TDEIcon::Panel, TDEIcon::ActiveState ); } void WeatherButton::slotSettingsChanged( int category ) @@ -120,7 +120,7 @@ void WeatherButton::slotSettingsChanged( int category ) void WeatherButton::slotIconChanged( int group ) { - if ( group != KIcon::Panel ) + if ( group != TDEIcon::Panel ) return; generateIcons();