diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 21:59:38 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 21:59:38 -0600 |
| commit | cfb328d59024a251690b6e47c9f8d343fd8c241c (patch) | |
| tree | 7c11070cd07e5e023a26ddcfa41832c208c63732 /tderesources/groupware | |
| parent | 38b7daf1afffa515cf4880847c0d985f3c6ee753 (diff) | |
| download | tdepim-cfb328d59024a251690b6e47c9f8d343fd8c241c.tar.gz tdepim-cfb328d59024a251690b6e47c9f8d343fd8c241c.zip | |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'tderesources/groupware')
7 files changed, 12 insertions, 12 deletions
diff --git a/tderesources/groupware/kabc_resourcegroupware.cpp b/tderesources/groupware/kabc_resourcegroupware.cpp index 44cee5630..e2503b83d 100644 --- a/tderesources/groupware/kabc_resourcegroupware.cpp +++ b/tderesources/groupware/kabc_resourcegroupware.cpp @@ -20,11 +20,11 @@ #include <tqapplication.h> -#include <kabc/addressee.h> -#include <kabc/vcardconverter.h> +#include <tdeabc/addressee.h> +#include <tdeabc/vcardconverter.h> #include <tdeconfig.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <libtdepim/groupwarejob.h> diff --git a/tderesources/groupware/kabc_resourcegroupware_plugin.cpp b/tderesources/groupware/kabc_resourcegroupware_plugin.cpp index c7266b181..12f3233b6 100644 --- a/tderesources/groupware/kabc_resourcegroupware_plugin.cpp +++ b/tderesources/groupware/kabc_resourcegroupware_plugin.cpp @@ -21,8 +21,8 @@ #include "kabc_resourcegroupware.h" #include "kabc_resourcegroupwareconfig.h" -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> using namespace KABC; diff --git a/tderesources/groupware/kabc_resourcegroupwareconfig.cpp b/tderesources/groupware/kabc_resourcegroupwareconfig.cpp index 317c82b6f..35ca8596f 100644 --- a/tderesources/groupware/kabc_resourcegroupwareconfig.cpp +++ b/tderesources/groupware/kabc_resourcegroupwareconfig.cpp @@ -26,7 +26,7 @@ #include <kcombobox.h> #include <kdebug.h> #include <kdialog.h> -#include <klocale.h> +#include <tdelocale.h> #include <klineedit.h> #include <tdelistview.h> #include <kurlrequester.h> diff --git a/tderesources/groupware/kcal_resourcegroupware.cpp b/tderesources/groupware/kcal_resourcegroupware.cpp index f515bd06e..1bb0b2db9 100644 --- a/tderesources/groupware/kcal_resourcegroupware.cpp +++ b/tderesources/groupware/kcal_resourcegroupware.cpp @@ -34,9 +34,9 @@ #include <tqstringlist.h> #include <tqtimer.h> -#include <kabc/locknull.h> +#include <tdeabc/locknull.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tderesources/configwidget.h> #include <kstandarddirs.h> #include <kstringhandler.h> diff --git a/tderesources/groupware/kcal_resourcegroupware.h b/tderesources/groupware/kcal_resourcegroupware.h index d757ad730..7fe564bc7 100644 --- a/tderesources/groupware/kcal_resourcegroupware.h +++ b/tderesources/groupware/kcal_resourcegroupware.h @@ -25,7 +25,7 @@ #include <libkcal/resourcecached.h> -#include <kabc/locknull.h> +#include <tdeabc/locknull.h> #include <tdeio/job.h> #include <tdeconfig.h> diff --git a/tderesources/groupware/kcal_resourcegroupware_plugin.cpp b/tderesources/groupware/kcal_resourcegroupware_plugin.cpp index 992a95d58..dfbbd80d6 100644 --- a/tderesources/groupware/kcal_resourcegroupware_plugin.cpp +++ b/tderesources/groupware/kcal_resourcegroupware_plugin.cpp @@ -22,8 +22,8 @@ #include "kcal_resourcegroupware.h" #include "kcal_resourcegroupwareconfig.h" -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> using namespace KCal; diff --git a/tderesources/groupware/kcal_resourcegroupwareconfig.cpp b/tderesources/groupware/kcal_resourcegroupwareconfig.cpp index 9a191bc30..305118f14 100644 --- a/tderesources/groupware/kcal_resourcegroupwareconfig.cpp +++ b/tderesources/groupware/kcal_resourcegroupwareconfig.cpp @@ -24,7 +24,7 @@ #include <tqlayout.h> #include <tqcheckbox.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <kstandarddirs.h> #include <klineedit.h> |