diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:47:22 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:47:22 -0600 |
| commit | 28edc0aa2ab09297288186f5bc15765eb7be58c0 (patch) | |
| tree | 7b7a01768b3781763186c825af21bb14717d2c32 /kabc/plugins | |
| parent | 07c48c43ff72c237e4028154f4594102b798073f (diff) | |
| download | tdelibs-28edc0aa2ab09297288186f5bc15765eb7be58c0.tar.gz tdelibs-28edc0aa2ab09297288186f5bc15765eb7be58c0.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'kabc/plugins')
| -rw-r--r-- | kabc/plugins/ldapkio/resourceldapkio.cpp | 2 | ||||
| -rw-r--r-- | kabc/plugins/ldapkio/resourceldapkioplugin.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/kabc/plugins/ldapkio/resourceldapkio.cpp b/kabc/plugins/ldapkio/resourceldapkio.cpp index f4b4f83b8..e8da1b6aa 100644 --- a/kabc/plugins/ldapkio/resourceldapkio.cpp +++ b/kabc/plugins/ldapkio/resourceldapkio.cpp @@ -110,7 +110,7 @@ ResourceLDAPKIO::ResourceLDAPKIO( const KConfig *config ) d->mCachePolicy = Cache_No; d->mAutoCache = true; } - d->mCacheDst = KGlobal::dirs()->saveLocation("cache", "ldapkio") + "/" + + d->mCacheDst = TDEGlobal::dirs()->saveLocation("cache", "ldapkio") + "/" + type() + "_" + identifier(); init(); } diff --git a/kabc/plugins/ldapkio/resourceldapkioplugin.cpp b/kabc/plugins/ldapkio/resourceldapkioplugin.cpp index 98b21061e..975837bf8 100644 --- a/kabc/plugins/ldapkio/resourceldapkioplugin.cpp +++ b/kabc/plugins/ldapkio/resourceldapkioplugin.cpp @@ -30,7 +30,7 @@ extern "C" { KDE_EXPORT void *init_kabc_ldapkio() { - KGlobal::locale()->insertCatalogue("kabc_ldapkio"); + TDEGlobal::locale()->insertCatalogue("kabc_ldapkio"); return new KRES::PluginFactory<ResourceLDAPKIO, ResourceLDAPKIOConfig>(); } } |