summaryrefslogtreecommitdiffstats
path: root/lib/kofficecore/KoGlobal.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:10:32 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:10:32 -0600
commit3fe437def8063926892bddf2dcc733861308836d (patch)
tree021d66ad023a32bc8ea0074a1ab3d01316aff8b0 /lib/kofficecore/KoGlobal.cpp
parent5b8ab149469c8e186ee8b05d90c0103ae722dd85 (diff)
downloadkoffice-3fe437def8063926892bddf2dcc733861308836d.tar.gz
koffice-3fe437def8063926892bddf2dcc733861308836d.zip
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'lib/kofficecore/KoGlobal.cpp')
-rw-r--r--lib/kofficecore/KoGlobal.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/kofficecore/KoGlobal.cpp b/lib/kofficecore/KoGlobal.cpp
index 10ee5bd92..566397978 100644
--- a/lib/kofficecore/KoGlobal.cpp
+++ b/lib/kofficecore/KoGlobal.cpp
@@ -111,7 +111,7 @@ TQStringList KoGlobal::_listOfLanguages()
void KoGlobal::createListOfLanguages()
{
- KConfig config( "all_languages", true, false, "locale" );
+ TDEConfig config( "all_languages", true, false, "locale" );
// Note that we could also use KLocale::allLanguagesTwoAlpha
TQMap<TQString, bool> seenLanguages;
@@ -188,10 +188,10 @@ TQString KoGlobal::languageFromTag( const TQString &langTag )
return langTag;
}
-KConfig* KoGlobal::_kofficeConfig()
+TDEConfig* KoGlobal::_kofficeConfig()
{
if ( !m_kofficeConfig ) {
- m_kofficeConfig = new KConfig( "kofficerc" );
+ m_kofficeConfig = new TDEConfig( "kofficerc" );
}
return m_kofficeConfig;
}