summaryrefslogtreecommitdiffstats
path: root/kcontrol/kthememanager
diff options
context:
space:
mode:
Diffstat (limited to 'kcontrol/kthememanager')
-rw-r--r--kcontrol/kthememanager/ktheme.cpp4
-rw-r--r--kcontrol/kthememanager/kthememanager.cpp16
-rw-r--r--kcontrol/kthememanager/kthememanager.h8
3 files changed, 14 insertions, 14 deletions
diff --git a/kcontrol/kthememanager/ktheme.cpp b/kcontrol/kthememanager/ktheme.cpp
index e686ef347..94d9bf7bd 100644
--- a/kcontrol/kthememanager/ktheme.cpp
+++ b/kcontrol/kthememanager/ktheme.cpp
@@ -187,7 +187,7 @@ TQString KTheme::createYourself( bool pack )
// 3. Icons
globalConf->setGroup( "Icons" );
TQDomElement iconElem = m_dom.createElement( "icons" );
- iconElem.setAttribute( "name", globalConf->readEntry( "Theme",KIconTheme::current() ) );
+ iconElem.setAttribute( "name", globalConf->readEntry( "Theme",TDEIconTheme::current() ) );
createIconElems( "DesktopIcons", "desktop", iconElem, globalConf );
createIconElems( "MainToolbarIcons", "mainToolbar", iconElem, globalConf );
createIconElems( "PanelIcons", "panel", iconElem, globalConf );
@@ -483,7 +483,7 @@ void KTheme::apply()
}
iconConf->sync();
- for ( int i = 0; i < KIcon::LastGroup; i++ )
+ for ( int i = 0; i < TDEIcon::LastGroup; i++ )
KIPC::sendMessageAll( KIPC::IconChanged, i );
KService::rebuildKSycoca( m_parent );
}
diff --git a/kcontrol/kthememanager/kthememanager.cpp b/kcontrol/kthememanager/kthememanager.cpp
index 87be37c02..23a89ca01 100644
--- a/kcontrol/kthememanager/kthememanager.cpp
+++ b/kcontrol/kthememanager/kthememanager.cpp
@@ -385,20 +385,20 @@ void kthememanager::queryLNFModules()
if ( p->isType( KST_KService ) )
{
KService *s = static_cast<KService *>( p );
- ( void ) new KThemeDetailsItem( dlg->lvDetails, s->name(), s->pixmap( KIcon::Desktop ), s->exec() );
+ ( void ) new KThemeDetailsItem( dlg->lvDetails, s->name(), s->pixmap( TDEIcon::Desktop ), s->exec() );
}
}
dlg->lvDetails->sort();*/
// For now use a static list
- KIconLoader * il = TDEGlobal::iconLoader();
- dlg->btnBackground->setIconSet( il->loadIconSet( "background", KIcon::Desktop, 32 ) );
- dlg->btnColors->setIconSet( il->loadIconSet( "colorscm", KIcon::Desktop, 32 ) );
- dlg->btnStyle->setIconSet( il->loadIconSet( "style", KIcon::Desktop, 32 ) );
- dlg->btnIcons->setIconSet( il->loadIconSet( "icons", KIcon::Desktop, 32 ) );
- dlg->btnFonts->setIconSet( il->loadIconSet( "fonts", KIcon::Desktop, 32 ) );
- dlg->btnSaver->setIconSet( il->loadIconSet( "tdescreensaver", KIcon::Desktop, 32 ) );
+ TDEIconLoader * il = TDEGlobal::iconLoader();
+ dlg->btnBackground->setIconSet( il->loadIconSet( "background", TDEIcon::Desktop, 32 ) );
+ dlg->btnColors->setIconSet( il->loadIconSet( "colorscm", TDEIcon::Desktop, 32 ) );
+ dlg->btnStyle->setIconSet( il->loadIconSet( "style", TDEIcon::Desktop, 32 ) );
+ dlg->btnIcons->setIconSet( il->loadIconSet( "icons", TDEIcon::Desktop, 32 ) );
+ dlg->btnFonts->setIconSet( il->loadIconSet( "fonts", TDEIcon::Desktop, 32 ) );
+ dlg->btnSaver->setIconSet( il->loadIconSet( "tdescreensaver", TDEIcon::Desktop, 32 ) );
}
void kthememanager::updatePreview( const TQString & pixFile )
diff --git a/kcontrol/kthememanager/kthememanager.h b/kcontrol/kthememanager/kthememanager.h
index 56b25f94c..2c5e494f4 100644
--- a/kcontrol/kthememanager/kthememanager.h
+++ b/kcontrol/kthememanager/kthememanager.h
@@ -34,13 +34,13 @@ class TDEAboutData;
#define ORIGINAL_THEME "original" // no i18n() here!!!
/*
-class KIconViewItem;
+class TDEIconViewItem;
-class KThemeDetailsItem: public KIconViewItem
+class KThemeDetailsItem: public TDEIconViewItem
{
public:
- KThemeDetailsItem( KIconView * parent, const TQString & text, const TQPixmap & icon, const TQString & execString )
- : KIconViewItem( parent, text, icon ) { m_exec = execString; }
+ KThemeDetailsItem( TDEIconView * parent, const TQString & text, const TQPixmap & icon, const TQString & execString )
+ : TDEIconViewItem( parent, text, icon ) { m_exec = execString; }
virtual ~KThemeDetailsItem() { };
void exec() {