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 /kaddressbook/common | |
| parent | 38b7daf1afffa515cf4880847c0d985f3c6ee753 (diff) | |
| download | tdepim-cfb328d59024a251690b6e47c9f8d343fd8c241c.tar.gz tdepim-cfb328d59024a251690b6e47c9f8d343fd8c241c.zip | |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'kaddressbook/common')
| -rw-r--r-- | kaddressbook/common/filter.h | 2 | ||||
| -rw-r--r-- | kaddressbook/common/kabprefs.cpp | 2 | ||||
| -rw-r--r-- | kaddressbook/common/locationmap.cpp | 6 | ||||
| -rw-r--r-- | kaddressbook/common/locationmap.h | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/kaddressbook/common/filter.h b/kaddressbook/common/filter.h index 68df1036f..004da6425 100644 --- a/kaddressbook/common/filter.h +++ b/kaddressbook/common/filter.h @@ -28,7 +28,7 @@ #include <tqstringlist.h> #include <tqvaluelist.h> -#include <kabc/addressee.h> +#include <tdeabc/addressee.h> #include <tdeconfig.h> /** diff --git a/kaddressbook/common/kabprefs.cpp b/kaddressbook/common/kabprefs.cpp index 1f9e2410a..c4edf5d4d 100644 --- a/kaddressbook/common/kabprefs.cpp +++ b/kaddressbook/common/kabprefs.cpp @@ -22,7 +22,7 @@ */ #include <tdeconfig.h> -#include <klocale.h> +#include <tdelocale.h> #include <kstaticdeleter.h> #include "kabprefs.h" diff --git a/kaddressbook/common/locationmap.cpp b/kaddressbook/common/locationmap.cpp index ee6bbebe7..d4c5cb2d6 100644 --- a/kaddressbook/common/locationmap.cpp +++ b/kaddressbook/common/locationmap.cpp @@ -24,9 +24,9 @@ #include <tdeapplication.h> #include <tdeconfig.h> #include <tdeversion.h> -#include <kglobal.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdeglobal.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kstaticdeleter.h> #include <kurl.h> diff --git a/kaddressbook/common/locationmap.h b/kaddressbook/common/locationmap.h index 502aa01fe..a5a53426d 100644 --- a/kaddressbook/common/locationmap.h +++ b/kaddressbook/common/locationmap.h @@ -24,7 +24,7 @@ #ifndef LOCATIONMAP_H #define LOCATIONMAP_H -#include <kabc/address.h> +#include <tdeabc/address.h> #include <tqobject.h> #include <tqstring.h> |