diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 01:05:15 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 01:05:15 -0600 |
| commit | 64df902cf71a8ee258fb85f6be26248f399aa01f (patch) | |
| tree | dba58f705042c22cea26b678d5b0e4e9a34bf202 /tderesources/groupware | |
| parent | de53c98cab07e9c4b0f5e25dab82830fb6fc67ec (diff) | |
| download | tdepim-64df902cf71a8ee258fb85f6be26248f399aa01f.tar.gz tdepim-64df902cf71a8ee258fb85f6be26248f399aa01f.zip | |
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'tderesources/groupware')
5 files changed, 7 insertions, 7 deletions
diff --git a/tderesources/groupware/kabc_resourcegroupware.cpp b/tderesources/groupware/kabc_resourcegroupware.cpp index 3c9d9792c..44cee5630 100644 --- a/tderesources/groupware/kabc_resourcegroupware.cpp +++ b/tderesources/groupware/kabc_resourcegroupware.cpp @@ -22,7 +22,7 @@ #include <kabc/addressee.h> #include <kabc/vcardconverter.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kdebug.h> #include <klocale.h> diff --git a/tderesources/groupware/kabc_resourcegroupware.h b/tderesources/groupware/kabc_resourcegroupware.h index 53c1d007a..1c5feb847 100644 --- a/tderesources/groupware/kabc_resourcegroupware.h +++ b/tderesources/groupware/kabc_resourcegroupware.h @@ -24,7 +24,7 @@ #include <libtdepim/progressmanager.h> -#include <kio/job.h> +#include <tdeio/job.h> class TDEConfig; diff --git a/tderesources/groupware/kcal_groupwareprefsbase.kcfgc b/tderesources/groupware/kcal_groupwareprefsbase.kcfgc index 7e243ddc0..e174cad41 100644 --- a/tderesources/groupware/kcal_groupwareprefsbase.kcfgc +++ b/tderesources/groupware/kcal_groupwareprefsbase.kcfgc @@ -1,4 +1,4 @@ -# Code generation options for kconfig_compiler +# Code generation options for tdeconfig_compiler File=tderesources_kcal_groupware.kcfg ClassName=GroupwarePrefsBase NameSpace=KCal diff --git a/tderesources/groupware/kcal_resourcegroupware.h b/tderesources/groupware/kcal_resourcegroupware.h index d3c809db7..d757ad730 100644 --- a/tderesources/groupware/kcal_resourcegroupware.h +++ b/tderesources/groupware/kcal_resourcegroupware.h @@ -26,8 +26,8 @@ #include <libkcal/resourcecached.h> #include <kabc/locknull.h> -#include <kio/job.h> -#include <kconfig.h> +#include <tdeio/job.h> +#include <tdeconfig.h> namespace KPIM { class GroupwarePrefsBase; @@ -36,7 +36,7 @@ class GroupwarePrefsBase; namespace KCal { /** - This class provides a resource for accessing a Groupware kioslave-based + This class provides a resource for accessing a Groupware tdeioslave-based calendar. */ class ResourceGroupware : public ResourceCached diff --git a/tderesources/groupware/kcal_resourcegroupwareconfig.h b/tderesources/groupware/kcal_resourcegroupwareconfig.h index dd6a93afa..7bfa34d44 100644 --- a/tderesources/groupware/kcal_resourcegroupwareconfig.h +++ b/tderesources/groupware/kcal_resourcegroupwareconfig.h @@ -34,7 +34,7 @@ class ResourceCachedReloadConfig; class ResourceCachedSaveConfig; /** - Configuration widget for groupware kioslave resource. + Configuration widget for groupware tdeioslave resource. @see KCalResourceGroupware */ |