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 /tdefile-plugins/vcf | |
parent | 38b7daf1afffa515cf4880847c0d985f3c6ee753 (diff) | |
download | tdepim-cfb328d59024a251690b6e47c9f8d343fd8c241c.tar.gz tdepim-cfb328d59024a251690b6e47c9f8d343fd8c241c.zip |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'tdefile-plugins/vcf')
-rw-r--r-- | tdefile-plugins/vcf/CMakeLists.txt | 2 | ||||
-rw-r--r-- | tdefile-plugins/vcf/tdefile_vcf.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/tdefile-plugins/vcf/CMakeLists.txt b/tdefile-plugins/vcf/CMakeLists.txt index 4cf771d26..c0a8944a0 100644 --- a/tdefile-plugins/vcf/CMakeLists.txt +++ b/tdefile-plugins/vcf/CMakeLists.txt @@ -30,6 +30,6 @@ install( FILES tdefile_vcf.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) tde_add_kpart( tdefile_vcf AUTOMOC SOURCES tdefile_vcf.cpp - LINK kabc-shared + LINK tdeabc-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/tdefile-plugins/vcf/tdefile_vcf.cpp b/tdefile-plugins/vcf/tdefile_vcf.cpp index e8746c56a..3b70960da 100644 --- a/tdefile-plugins/vcf/tdefile_vcf.cpp +++ b/tdefile-plugins/vcf/tdefile_vcf.cpp @@ -22,9 +22,9 @@ #include "tdefile_vcf.h" #include <kprocess.h> -#include <klocale.h> +#include <tdelocale.h> #include <kgenericfactory.h> -#include <kabc/vcardconverter.h> +#include <tdeabc/vcardconverter.h> #include <tqdict.h> #include <tqfile.h> |