diff options
| author | Timothy Pearson <[email protected]> | 2013-02-15 21:59:38 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-02-15 21:59:38 -0600 |
| commit | cfb328d59024a251690b6e47c9f8d343fd8c241c (patch) | |
| tree | 7c11070cd07e5e023a26ddcfa41832c208c63732 /kaddressbook/thumbnailcreator | |
| parent | 38b7daf1afffa515cf4880847c0d985f3c6ee753 (diff) | |
| download | tdepim-cfb328d59024a251690b6e47c9f8d343fd8c241c.tar.gz tdepim-cfb328d59024a251690b6e47c9f8d343fd8c241c.zip | |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'kaddressbook/thumbnailcreator')
| -rw-r--r-- | kaddressbook/thumbnailcreator/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | kaddressbook/thumbnailcreator/ldifvcardcreator.cpp | 10 | ||||
| -rw-r--r-- | kaddressbook/thumbnailcreator/ldifvcardcreator.h | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/kaddressbook/thumbnailcreator/CMakeLists.txt b/kaddressbook/thumbnailcreator/CMakeLists.txt index d8ac40f06..00173bfef 100644 --- a/kaddressbook/thumbnailcreator/CMakeLists.txt +++ b/kaddressbook/thumbnailcreator/CMakeLists.txt @@ -28,6 +28,6 @@ install( FILES ldifvcardthumbnail.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) tde_add_kpart( ldifvcardthumbnail SOURCES ldifvcardcreator.cpp - LINK kabc-shared + LINK tdeabc-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kaddressbook/thumbnailcreator/ldifvcardcreator.cpp b/kaddressbook/thumbnailcreator/ldifvcardcreator.cpp index 4627ebd52..a0c557d1b 100644 --- a/kaddressbook/thumbnailcreator/ldifvcardcreator.cpp +++ b/kaddressbook/thumbnailcreator/ldifvcardcreator.cpp @@ -34,13 +34,13 @@ #include <tqtextstream.h> #include <kdebug.h> -#include <kglobal.h> -#include <klocale.h> -#include <kabc/ldifconverter.h> -#include <kabc/vcardconverter.h> +#include <tdeglobal.h> +#include <tdelocale.h> +#include <tdeabc/ldifconverter.h> +#include <tdeabc/vcardconverter.h> #include <kpixmapsplitter.h> #include <kstandarddirs.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include "ldifvcardcreator.h" diff --git a/kaddressbook/thumbnailcreator/ldifvcardcreator.h b/kaddressbook/thumbnailcreator/ldifvcardcreator.h index 04f788310..f09ad8ead 100644 --- a/kaddressbook/thumbnailcreator/ldifvcardcreator.h +++ b/kaddressbook/thumbnailcreator/ldifvcardcreator.h @@ -23,7 +23,7 @@ #include <tqpixmap.h> #include <tdeio/thumbcreator.h> -#include <kabc/vcardparser.h> // for KABC_VCARD_ENCODING_FIX define +#include <tdeabc/vcardparser.h> // for KABC_VCARD_ENCODING_FIX define class KPixmapSplitter; |