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 /libkcal/incidenceformatter.cpp | |
parent | 38b7daf1afffa515cf4880847c0d985f3c6ee753 (diff) | |
download | tdepim-cfb328d59024a251690b6e47c9f8d343fd8c241c.tar.gz tdepim-cfb328d59024a251690b6e47c9f8d343fd8c241c.zip |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'libkcal/incidenceformatter.cpp')
-rw-r--r-- | libkcal/incidenceformatter.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libkcal/incidenceformatter.cpp b/libkcal/incidenceformatter.cpp index 0a42e2aac..1455a24a0 100644 --- a/libkcal/incidenceformatter.cpp +++ b/libkcal/incidenceformatter.cpp @@ -38,15 +38,15 @@ #include <ktnef/ktnefparser.h> #include <ktnef/ktnefmessage.h> #include <ktnef/ktnefdefs.h> -#include <kabc/phonenumber.h> -#include <kabc/vcardconverter.h> -#include <kabc/stdaddressbook.h> +#include <tdeabc/phonenumber.h> +#include <tdeabc/vcardconverter.h> +#include <tdeabc/stdaddressbook.h> #include <tdeapplication.h> -#include <kemailsettings.h> +#include <tdeemailsettings.h> -#include <klocale.h> -#include <kglobal.h> +#include <tdelocale.h> +#include <tdeglobal.h> #include <kiconloader.h> #include <kcalendarsystem.h> #include <kmimetype.h> |