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

---
 kdeaccounts-plugin/CMakeLists.txt        | 4 ++--
 kdeaccounts-plugin/Makefile.am           | 2 +-
 kdeaccounts-plugin/kdeaccountsformat.cpp | 6 +++---
 kdeaccounts-plugin/kdeaccountsformat.h   | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'kdeaccounts-plugin')

diff --git a/kdeaccounts-plugin/CMakeLists.txt b/kdeaccounts-plugin/CMakeLists.txt
index 2a144863..04fc43e8 100644
--- a/kdeaccounts-plugin/CMakeLists.txt
+++ b/kdeaccounts-plugin/CMakeLists.txt
@@ -22,13 +22,13 @@ link_directories(
 ##### other data ################################
 
 install( FILES kdeaccountsplugin.desktop
-  DESTINATION ${DATA_INSTALL_DIR}/kabc/formats )
+  DESTINATION ${DATA_INSTALL_DIR}/tdeabc/formats )
 
 
 ##### kabcformat_kdeaccounts (module) ###########
 
 tde_add_kpart( kabcformat_kdeaccounts
   SOURCES kdeaccountsformat.cpp
-  LINK kabc-shared
+  LINK tdeabc-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kdeaccounts-plugin/Makefile.am b/kdeaccounts-plugin/Makefile.am
index 7be8cea3..9c412ffa 100644
--- a/kdeaccounts-plugin/Makefile.am
+++ b/kdeaccounts-plugin/Makefile.am
@@ -12,6 +12,6 @@ METASOURCES = AUTO
 messages: rc.cpp
 	$(XGETTEXT) *.cpp -o $(podir)/kabcformat_kdeaccounts.pot
 
-linkdir		= $(kde_datadir)/kabc/formats
+linkdir		= $(kde_datadir)/tdeabc/formats
 link_DATA	= kdeaccountsplugin.desktop
 EXTRA_DIST	= $(link_DATA) README
diff --git a/kdeaccounts-plugin/kdeaccountsformat.cpp b/kdeaccounts-plugin/kdeaccountsformat.cpp
index fc9f2cb3..97a07d4d 100644
--- a/kdeaccounts-plugin/kdeaccountsformat.cpp
+++ b/kdeaccounts-plugin/kdeaccountsformat.cpp
@@ -3,9 +3,9 @@
 #include <tqcstring.h>
 #include <tqfile.h>
 
-#include <kabc/addressbook.h>
-#include <kabc/addressee.h>
-#include <kabc/resourcefile.h>
+#include <tdeabc/addressbook.h>
+#include <tdeabc/addressee.h>
+#include <tdeabc/resourcefile.h>
 
 extern "C"
 {
diff --git a/kdeaccounts-plugin/kdeaccountsformat.h b/kdeaccounts-plugin/kdeaccountsformat.h
index db132fef..ea763c38 100644
--- a/kdeaccounts-plugin/kdeaccountsformat.h
+++ b/kdeaccounts-plugin/kdeaccountsformat.h
@@ -10,7 +10,7 @@
 #ifndef KDEACCOUNTSPARSER_H
 #define KDEACCOUNTSPARSER_H
 
-#include <kabc/formatplugin.h>
+#include <tdeabc/formatplugin.h>
 
 namespace KABC {
     class AddressBook;
-- 
cgit v1.2.1