diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:20:01 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:20:01 -0600 |
| commit | 69f1eaa31f6b96de636583c19d283f4e657d5c40 (patch) | |
| tree | 02370f7430cfbfd3fe35250bede9bd07651aac9d /kbfxlib | |
| parent | 5fb97907dcc15645d95f5ad0a987cd4f5e52a68f (diff) | |
| download | kbfx-69f1eaa31f6b96de636583c19d283f4e657d5c40.tar.gz kbfx-69f1eaa31f6b96de636583c19d283f4e657d5c40.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'kbfxlib')
| -rw-r--r-- | kbfxlib/common/kbfxconfig.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/kbfxlib/common/kbfxconfig.cpp b/kbfxlib/common/kbfxconfig.cpp index 0e1c8ee..88d6ea2 100644 --- a/kbfxlib/common/kbfxconfig.cpp +++ b/kbfxlib/common/kbfxconfig.cpp @@ -26,8 +26,8 @@ KbfxConfig::KbfxConfig() /* set default configuration values */ /* KBFX internal settings */ - KbfxThemeRcDestination = KGlobal::dirs()->saveLocation ( "data", TQString ( "kbfx/themerc/" ), TRUE ); - KbfxRcPath = KGlobal::dirs()->findResource ( "config", "kbfxrc" ); + KbfxThemeRcDestination = TDEGlobal::dirs()->saveLocation ( "data", TQString ( "kbfx/themerc/" ), TRUE ); + KbfxRcPath = TDEGlobal::dirs()->findResource ( "config", "kbfxrc" ); m_KbfxDeleteOldConf = FALSE; TQString _unspecified = tr2i18n ( "Not Specified" ); TQString path = locate ( "data", "kbfx/skins/default/bg.png" ); @@ -329,7 +329,7 @@ void KbfxConfig::read() KConfig *conf = confskel->config(); - TQString __default = KGlobal::iconLoader()->iconPath ( "kbfx", ( int ) KIcon::Desktop, FALSE ); + TQString __default = TDEGlobal::iconLoader()->iconPath ( "kbfx", ( int ) KIcon::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 */ KConfigSkeleton *confskel = new KConfigSkeleton ( TQString::fromLatin1 ( "kbfxrc" ) ); KConfig *conf = confskel->config(); - TQString __default = KGlobal::iconLoader()->iconPath ( "kbfx", ( int ) KIcon::Desktop, FALSE ); + TQString __default = TDEGlobal::iconLoader()->iconPath ( "kbfx", ( int ) KIcon::Desktop, FALSE ); if ( m_SpinxDudeImageDefault == TQString() || !KStandardDirs::exists ( m_SpinxDudeImageDefault ) ) { |