From cfb328d59024a251690b6e47c9f8d343fd8c241c Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 15 Feb 2013 21:59:38 -0600
Subject: Rename additional header files to avoid conflicts with KDE4

---
 tdefile-plugins/palm-databases/tdefile_palm.cpp | 2 +-
 tdefile-plugins/rfc822/tdefile_rfc822.cpp       | 2 +-
 tdefile-plugins/vcf/CMakeLists.txt              | 2 +-
 tdefile-plugins/vcf/tdefile_vcf.cpp             | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'tdefile-plugins')

diff --git a/tdefile-plugins/palm-databases/tdefile_palm.cpp b/tdefile-plugins/palm-databases/tdefile_palm.cpp
index 3d4e20e9..e995b136 100644
--- a/tdefile-plugins/palm-databases/tdefile_palm.cpp
+++ b/tdefile-plugins/palm-databases/tdefile_palm.cpp
@@ -21,7 +21,7 @@
 
 #include "tdefile_palm.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kgenericfactory.h>
 
 #include <tqfile.h>
diff --git a/tdefile-plugins/rfc822/tdefile_rfc822.cpp b/tdefile-plugins/rfc822/tdefile_rfc822.cpp
index 261f0835..f1b4d6ff 100644
--- a/tdefile-plugins/rfc822/tdefile_rfc822.cpp
+++ b/tdefile-plugins/rfc822/tdefile_rfc822.cpp
@@ -21,7 +21,7 @@
 #include "tdefile_rfc822.h"
 
 #include <kprocess.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kgenericfactory.h>
 #include <kstringvalidator.h>
 #include <kdebug.h>
diff --git a/tdefile-plugins/vcf/CMakeLists.txt b/tdefile-plugins/vcf/CMakeLists.txt
index 4cf771d2..c0a8944a 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 e8746c56..3b70960d 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>
-- 
cgit v1.2.3