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

---
 kaddressbook/interfaces/CMakeLists.txt        | 2 +-
 kaddressbook/interfaces/configurewidget.cpp   | 2 +-
 kaddressbook/interfaces/contacteditorwidget.h | 2 +-
 kaddressbook/interfaces/core.h                | 2 +-
 kaddressbook/interfaces/extensionwidget.h     | 2 +-
 kaddressbook/interfaces/xxport.cpp            | 2 +-
 kaddressbook/interfaces/xxport.h              | 4 ++--
 7 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'kaddressbook/interfaces')

diff --git a/kaddressbook/interfaces/CMakeLists.txt b/kaddressbook/interfaces/CMakeLists.txt
index d6876c93c..b0511b83b 100644
--- a/kaddressbook/interfaces/CMakeLists.txt
+++ b/kaddressbook/interfaces/CMakeLists.txt
@@ -46,6 +46,6 @@ tde_add_library( kabinterfaces SHARED AUTOMOC
     configurewidget.cpp contacteditorwidget.cpp
     core.cpp extensionwidget.cpp xxport.cpp
   VERSION 1.0.0
-  LINK kabc-shared
+  LINK tdeabc-shared
   DESTINATION ${LIB_INSTALL_DIR}
 )
diff --git a/kaddressbook/interfaces/configurewidget.cpp b/kaddressbook/interfaces/configurewidget.cpp
index c5efa60aa..bcb7a1764 100644
--- a/kaddressbook/interfaces/configurewidget.cpp
+++ b/kaddressbook/interfaces/configurewidget.cpp
@@ -21,7 +21,7 @@
     without including the source code for TQt in the source distribution.
 */
 
-#include <kabc/addressbook.h>
+#include <tdeabc/addressbook.h>
 
 #include "configurewidget.h"
 
diff --git a/kaddressbook/interfaces/contacteditorwidget.h b/kaddressbook/interfaces/contacteditorwidget.h
index 8ac5d6929..c8efa56c1 100644
--- a/kaddressbook/interfaces/contacteditorwidget.h
+++ b/kaddressbook/interfaces/contacteditorwidget.h
@@ -26,7 +26,7 @@
 
 #include <tqwidget.h>
 
-#include <kabc/addressbook.h>
+#include <tdeabc/addressbook.h>
 #include <klibloader.h>
 #include <tdepimmacros.h>
 
diff --git a/kaddressbook/interfaces/core.h b/kaddressbook/interfaces/core.h
index 3a5baba92..fcf41028f 100644
--- a/kaddressbook/interfaces/core.h
+++ b/kaddressbook/interfaces/core.h
@@ -32,7 +32,7 @@
 
 #include <tqobject.h>
 
-#include <kabc/field.h>
+#include <tdeabc/field.h>
 #include <kcommand.h>
 #include <kxmlguiclient.h>
 #include <tdepimmacros.h>
diff --git a/kaddressbook/interfaces/extensionwidget.h b/kaddressbook/interfaces/extensionwidget.h
index 1cca99afe..265484a4d 100644
--- a/kaddressbook/interfaces/extensionwidget.h
+++ b/kaddressbook/interfaces/extensionwidget.h
@@ -26,7 +26,7 @@
 
 #include <tqwidget.h>
 
-#include <kabc/addressbook.h>
+#include <tdeabc/addressbook.h>
 #include <klibloader.h>
 #include <tdepimmacros.h>
 
diff --git a/kaddressbook/interfaces/xxport.cpp b/kaddressbook/interfaces/xxport.cpp
index fb2680677..d0790ccfa 100644
--- a/kaddressbook/interfaces/xxport.cpp
+++ b/kaddressbook/interfaces/xxport.cpp
@@ -26,7 +26,7 @@
 
 #include <tdeaction.h>
 #include <kinstance.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeapplication.h>
 #include "xxport.h"
 
diff --git a/kaddressbook/interfaces/xxport.h b/kaddressbook/interfaces/xxport.h
index f3eddebbf..515470c55 100644
--- a/kaddressbook/interfaces/xxport.h
+++ b/kaddressbook/interfaces/xxport.h
@@ -26,8 +26,8 @@
 
 #include <tqobject.h>
 
-#include <kabc/addressbook.h>
-#include <kabc/addresseelist.h>
+#include <tdeabc/addressbook.h>
+#include <tdeabc/addresseelist.h>
 #include <klibloader.h>
 #include <kxmlguiclient.h>
 #include <tdepimmacros.h>
-- 
cgit v1.2.1