summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-04 14:02:13 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-04 14:02:13 -0600
commited6d66d4170624a5f83650abc3e4667e1be63e4c (patch)
tree2caf83656a97c3c58e66cc984532213eecbec461
parent5c2673b2c03a832bef135b4361e03fb87cd5ce6f (diff)
downloadkbfx-ed6d66d4170624a5f83650abc3e4667e1be63e4c.tar.gz
kbfx-ed6d66d4170624a5f83650abc3e4667e1be63e4c.zip
Rename KIcon to enhance compatibility with KDE4
-rw-r--r--kbfxlib/common/kbfxconfig.cpp4
-rw-r--r--src/kbfxplasmacanvasitem.cpp4
-rw-r--r--src/kbfxplasmacanvasitem_events.cpp2
-rw-r--r--src/kbfxplasmaindexitem.cpp4
-rw-r--r--src/kbfxspinxtoolbutton.cpp4
5 files changed, 9 insertions, 9 deletions
diff --git a/kbfxlib/common/kbfxconfig.cpp b/kbfxlib/common/kbfxconfig.cpp
index 8234167..84f97ee 100644
--- a/kbfxlib/common/kbfxconfig.cpp
+++ b/kbfxlib/common/kbfxconfig.cpp
@@ -329,7 +329,7 @@ void KbfxConfig::read()
TDEConfig *conf = confskel->config();
- TQString __default = TDEGlobal::iconLoader()->iconPath ( "kbfx", ( int ) KIcon::Desktop, FALSE );
+ TQString __default = TDEGlobal::iconLoader()->iconPath ( "kbfx", ( int ) TDEIcon::Desktop, FALSE );
conf->setGroup ( "KbfxGeneral" );
m_KbfxGeneralVersion = conf->readNumEntry ( "Version", 0 );
@@ -501,7 +501,7 @@ void KbfxConfig::readThemerc ( TQString &themePath, TQString &themeName, bool us
/* use theme's default dude image if any */
TDEConfigSkeleton *confskel = new TDEConfigSkeleton ( TQString::fromLatin1 ( "kbfxrc" ) );
TDEConfig *conf = confskel->config();
- TQString __default = TDEGlobal::iconLoader()->iconPath ( "kbfx", ( int ) KIcon::Desktop, FALSE );
+ TQString __default = TDEGlobal::iconLoader()->iconPath ( "kbfx", ( int ) TDEIcon::Desktop, FALSE );
if ( m_SpinxDudeImageDefault == TQString() || !TDEStandardDirs::exists ( m_SpinxDudeImageDefault ) )
{
diff --git a/src/kbfxplasmacanvasitem.cpp b/src/kbfxplasmacanvasitem.cpp
index d552578..0c6eb76 100644
--- a/src/kbfxplasmacanvasitem.cpp
+++ b/src/kbfxplasmacanvasitem.cpp
@@ -132,8 +132,8 @@ KbfxPlasmaCanvasItem::setExec ( TQString desktopfile )
void
KbfxPlasmaCanvasItem::setIconPath ( TQString str )
{
- KIconLoader *iconload = TDEGlobal::iconLoader ();
- m_iconPath = iconload->iconPath ( str, KIcon::Desktop, false );
+ TDEIconLoader *iconload = TDEGlobal::iconLoader ();
+ m_iconPath = iconload->iconPath ( str, TDEIcon::Desktop, false );
// m_icon.load(m_iconPath);
TQImage _img ( m_iconPath );
diff --git a/src/kbfxplasmacanvasitem_events.cpp b/src/kbfxplasmacanvasitem_events.cpp
index 8377dec..8e635c3 100644
--- a/src/kbfxplasmacanvasitem_events.cpp
+++ b/src/kbfxplasmacanvasitem_events.cpp
@@ -62,7 +62,7 @@ KbfxPlasmaCanvasItem::exec()
return;
-// KIconEffect::visualActivate(new TQWidget(), this->boundingRect());
+// TDEIconEffect::visualActivate(new TQWidget(), this->boundingRect());
m_source->exec();
}
diff --git a/src/kbfxplasmaindexitem.cpp b/src/kbfxplasmaindexitem.cpp
index 55c4642..08d3a73 100644
--- a/src/kbfxplasmaindexitem.cpp
+++ b/src/kbfxplasmaindexitem.cpp
@@ -44,8 +44,8 @@ KbfxPlasmaIndexItem::~KbfxPlasmaIndexItem()
void
KbfxPlasmaIndexItem::setIcon ( TQString str )
{
- KIconLoader *iconload = TDEGlobal::iconLoader ();
- m_iconPath = iconload->iconPath ( str, KIcon::Desktop, false );
+ TDEIconLoader *iconload = TDEGlobal::iconLoader ();
+ m_iconPath = iconload->iconPath ( str, TDEIcon::Desktop, false );
m_icon.load ( m_iconPath );
}
diff --git a/src/kbfxspinxtoolbutton.cpp b/src/kbfxspinxtoolbutton.cpp
index a525435..cd40d73 100644
--- a/src/kbfxspinxtoolbutton.cpp
+++ b/src/kbfxspinxtoolbutton.cpp
@@ -105,8 +105,8 @@ KbfxSpinxToolButton::setDataSource ( KbfxDataSource * src )
m_exe = src->command();
m_dataSource = new KbfxDataSource();
*m_dataSource = *src; // copy
- KIconLoader *iconload = TDEGlobal::iconLoader ();
- TQString m_iconPath = iconload->iconPath ( m_icon, KIcon::Desktop, false );
+ TDEIconLoader *iconload = TDEGlobal::iconLoader ();
+ TQString m_iconPath = iconload->iconPath ( m_icon, TDEIcon::Desktop, false );
m_iconPixmap = TQPixmap ( m_iconPath );
}