diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:49:30 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:49:30 -0600 |
commit | a9bde819f2b421dcc44741156e75eca4bb5fb4f4 (patch) | |
tree | d087071b1e8fcf79698938efec19f8e48bab0799 /kresources/groupware | |
parent | 5c4a80ead2b1fe57dc6a8c29d0368792344cd61e (diff) | |
download | tdepim-a9bde819f2b421dcc44741156e75eca4bb5fb4f4.tar.gz tdepim-a9bde819f2b421dcc44741156e75eca4bb5fb4f4.zip |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'kresources/groupware')
-rw-r--r-- | kresources/groupware/kabc_resourcegroupware_plugin.cpp | 4 | ||||
-rw-r--r-- | kresources/groupware/kcal_resourcegroupware_plugin.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/kresources/groupware/kabc_resourcegroupware_plugin.cpp b/kresources/groupware/kabc_resourcegroupware_plugin.cpp index 38b156fd9..c7266b181 100644 --- a/kresources/groupware/kabc_resourcegroupware_plugin.cpp +++ b/kresources/groupware/kabc_resourcegroupware_plugin.cpp @@ -32,8 +32,8 @@ extern "C" { void *init_kabc_groupware() { - KGlobal::locale()->insertCatalogue( "libkcal" ); - KGlobal::locale()->insertCatalogue( "kres_groupware" ); + TDEGlobal::locale()->insertCatalogue( "libkcal" ); + TDEGlobal::locale()->insertCatalogue( "kres_groupware" ); return new ResourceGroupware; } } diff --git a/kresources/groupware/kcal_resourcegroupware_plugin.cpp b/kresources/groupware/kcal_resourcegroupware_plugin.cpp index bfa4f9f6d..992a95d58 100644 --- a/kresources/groupware/kcal_resourcegroupware_plugin.cpp +++ b/kresources/groupware/kcal_resourcegroupware_plugin.cpp @@ -33,8 +33,8 @@ extern "C" { void *init_kcal_groupware() { - KGlobal::locale()->insertCatalogue( "libkcal" ); - KGlobal::locale()->insertCatalogue( "kres_groupware" ); + TDEGlobal::locale()->insertCatalogue( "libkcal" ); + TDEGlobal::locale()->insertCatalogue( "kres_groupware" ); return new ResourceGroupware; } } |