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/featureplan | |
| parent | 38b7daf1afffa515cf4880847c0d985f3c6ee753 (diff) | |
| download | tdepim-cfb328d59024a251690b6e47c9f8d343fd8c241c.tar.gz tdepim-cfb328d59024a251690b6e47c9f8d343fd8c241c.zip | |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'tderesources/featureplan')
4 files changed, 6 insertions, 6 deletions
diff --git a/tderesources/featureplan/kcal_resourcefeatureplan.cpp b/tderesources/featureplan/kcal_resourcefeatureplan.cpp index 2bddc7fd9..d417c0d83 100644 --- a/tderesources/featureplan/kcal_resourcefeatureplan.cpp +++ b/tderesources/featureplan/kcal_resourcefeatureplan.cpp @@ -32,9 +32,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/featureplan/kcal_resourcefeatureplan.h b/tderesources/featureplan/kcal_resourcefeatureplan.h index 08bf1f39f..f6487521e 100644 --- a/tderesources/featureplan/kcal_resourcefeatureplan.h +++ b/tderesources/featureplan/kcal_resourcefeatureplan.h @@ -27,7 +27,7 @@ #include <libkcal/resourcecached.h> -#include <kabc/locknull.h> +#include <tdeabc/locknull.h> #include <tdepimmacros.h> #include <tdeconfig.h> diff --git a/tderesources/featureplan/kcal_resourcefeatureplanconfig.cpp b/tderesources/featureplan/kcal_resourcefeatureplanconfig.cpp index 55d12cbd9..3cedd536f 100644 --- a/tderesources/featureplan/kcal_resourcefeatureplanconfig.cpp +++ b/tderesources/featureplan/kcal_resourcefeatureplanconfig.cpp @@ -26,7 +26,7 @@ #include <kdebug.h> #include <kdialog.h> #include <klineedit.h> -#include <klocale.h> +#include <tdelocale.h> #include <knuminput.h> #include <kurlrequester.h> diff --git a/tderesources/featureplan/kcal_resourcefeatureplanplugin.cpp b/tderesources/featureplan/kcal_resourcefeatureplanplugin.cpp index ae2759e46..6a0e7b726 100644 --- a/tderesources/featureplan/kcal_resourcefeatureplanplugin.cpp +++ b/tderesources/featureplan/kcal_resourcefeatureplanplugin.cpp @@ -22,8 +22,8 @@ #include "kcal_resourcefeatureplan.h" #include "kcal_resourcefeatureplanconfig.h" -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> using namespace KCal; |