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 /kcontrol/kthememanager/kthememanager.cpp | |
parent | 9a898d493f493adbc404f7223043c85f3817472b (diff) | |
download | tdebase-79b21d47bce1ee428affc97534cd8b257232a871.tar.gz tdebase-79b21d47bce1ee428affc97534cd8b257232a871.zip |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'kcontrol/kthememanager/kthememanager.cpp')
-rw-r--r-- | kcontrol/kthememanager/kthememanager.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/kcontrol/kthememanager/kthememanager.cpp b/kcontrol/kthememanager/kthememanager.cpp index 4a3f21644..5489aedbf 100644 --- a/kcontrol/kthememanager/kthememanager.cpp +++ b/kcontrol/kthememanager/kthememanager.cpp @@ -106,7 +106,7 @@ kthememanager::~kthememanager() void kthememanager::init() { - KGlobal::dirs()->addResourceType( "themes", KStandardDirs::kde_default("data") + + TDEGlobal::dirs()->addResourceType( "themes", KStandardDirs::kde_default("data") + "kthememanager/themes/" ); } @@ -115,7 +115,7 @@ void kthememanager::updateButton() TQListViewItem * cur = dlg->lvThemes->currentItem(); bool enable = (cur != 0); if (enable) { - enable = TQFile(KGlobal::dirs()->saveLocation( "themes", cur->text( 0 ) + "/"+ cur->text( 0 )+ ".xml" ,false)).exists() ; + enable = TQFile(TDEGlobal::dirs()->saveLocation( "themes", cur->text( 0 ) + "/"+ cur->text( 0 )+ ".xml" ,false)).exists() ; } dlg->btnRemove->setEnabled(enable); } @@ -160,7 +160,7 @@ void kthememanager::save() { TQString themeName = cur->text( 0 ); - m_theme = new KTheme( this, KGlobal::dirs()->findResource( "themes", themeName + "/" + themeName + ".xml") ); + m_theme = new KTheme( this, TDEGlobal::dirs()->findResource( "themes", themeName + "/" + themeName + ".xml") ); m_theme->apply(); // Save the current theme name @@ -180,7 +180,7 @@ void kthememanager::listThemes() dlg->lvThemes->clear(); dlg->lbPreview->setPixmap( TQPixmap() ); - TQStringList themes = KGlobal::dirs()->findAllResources( "themes", "*.xml", true /*recursive*/ ); + TQStringList themes = TDEGlobal::dirs()->findAllResources( "themes", "*.xml", true /*recursive*/ ); TQStringList::const_iterator it; @@ -197,7 +197,7 @@ void kthememanager::listThemes() float kthememanager::getThemeVersion( const TQString & themeName ) { - TQStringList themes = KGlobal::dirs()->findAllResources( "themes", "*.xml", true /*recursive*/ ); + TQStringList themes = TDEGlobal::dirs()->findAllResources( "themes", "*.xml", true /*recursive*/ ); TQStringList::const_iterator it; @@ -325,7 +325,7 @@ void kthememanager::slotThemeChanged( TQListViewItem * item ) TQString themeName = item->text(0); kdDebug() << "Activated theme: " << themeName << endl; - TQString themeDir = KGlobal::dirs()->findResourceDir( "themes", themeName + "/" + themeName + ".xml") + themeName + "/"; + TQString themeDir = TDEGlobal::dirs()->findResourceDir( "themes", themeName + "/" + themeName + ".xml") + themeName + "/"; TQString pixFile = themeDir + themeName + ".preview.png"; @@ -392,7 +392,7 @@ void kthememanager::queryLNFModules() dlg->lvDetails->sort();*/ // For now use a static list - KIconLoader * il = KGlobal::iconLoader(); + 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 ) ); @@ -417,7 +417,7 @@ extern "C" { KDE_EXPORT KCModule *create_kthememanager(TQWidget *parent, const char *) { - KGlobal::locale()->insertCatalogue( "kthememanager" ); + TDEGlobal::locale()->insertCatalogue( "kthememanager" ); return new kthememanager( parent, "kthememanager" ); } } |