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/carddav | |
| 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/carddav')
| -rw-r--r-- | kresources/carddav/export.h | 6 | ||||
| -rw-r--r-- | kresources/carddav/plugin.cpp | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/kresources/carddav/export.h b/kresources/carddav/export.h index e747b58a..2e22c557 100644 --- a/kresources/carddav/export.h +++ b/kresources/carddav/export.h @@ -39,7 +39,7 @@ #define EXPORT_KRESOURCES_PLUGIN( resourceclass, resourceconfigclass, catalog ) \ typedef KRES::PluginFactory< resourceclass, resourceconfigclass > FactoryBase; \ class Factory : public FactoryBase { \ - public: Factory() { KGlobal::locale()->insertCatalogue(catalog); } \ + public: Factory() { TDEGlobal::locale()->insertCatalogue(catalog); } \ }; \ K_EXPORT_PLUGIN( Factory ) @@ -48,8 +48,8 @@ #define EXPORT_KRESOURCES_PLUGIN2( resourceclass, resourceconfigclass, catalog1, catalog2 ) \ typedef KRES::PluginFactory< resourceclass, resourceconfigclass > FactoryBase; \ class Factory : public FactoryBase { \ - public: Factory() { KGlobal::locale()->insertCatalogue(catalog1); \ - KGlobal::locale()->insertCatalogue(catalog2); } \ + public: Factory() { TDEGlobal::locale()->insertCatalogue(catalog1); \ + TDEGlobal::locale()->insertCatalogue(catalog2); } \ }; \ K_EXPORT_PLUGIN( Factory ) diff --git a/kresources/carddav/plugin.cpp b/kresources/carddav/plugin.cpp index 8d51e53b..d0c4724f 100644 --- a/kresources/carddav/plugin.cpp +++ b/kresources/carddav/plugin.cpp @@ -38,8 +38,8 @@ extern "C" { void *init_kabc_carddav() { - KGlobal::locale()->insertCatalogue( "tdepimresources" ); - KGlobal::locale()->insertCatalogue( "kres_caldav" ); + TDEGlobal::locale()->insertCatalogue( "tdepimresources" ); + TDEGlobal::locale()->insertCatalogue( "kres_caldav" ); return new CardDavFactory; } } |