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/features/CMakeLists.txt               |  4 ++--
 kaddressbook/features/distributionlistngwidget.cpp |  4 ++--
 kaddressbook/features/distributionlistngwidget.h   |  2 +-
 kaddressbook/features/distributionlistwidget.cpp   | 14 +++++++-------
 kaddressbook/features/resourceselection.cpp        |  8 ++++----
 5 files changed, 16 insertions(+), 16 deletions(-)

(limited to 'kaddressbook/features')

diff --git a/kaddressbook/features/CMakeLists.txt b/kaddressbook/features/CMakeLists.txt
index f85bbf7e4..7317b3b4d 100644
--- a/kaddressbook/features/CMakeLists.txt
+++ b/kaddressbook/features/CMakeLists.txt
@@ -46,7 +46,7 @@ install( FILES
 
 tde_add_kpart( ${TARGET} AUTOMOC
   SOURCES ${SOURCE}
-  LINK kabinterfaces-shared tdepim-shared kabc-shared
+  LINK kabinterfaces-shared tdepim-shared tdeabc-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
 
@@ -55,6 +55,6 @@ tde_add_kpart( ${TARGET} AUTOMOC
 
 tde_add_kpart( libkaddrbk_resourceselection AUTOMOC
   SOURCES resourceselection.cpp
-  LINK kabinterfaces-shared tdepim-shared kabc-shared
+  LINK kabinterfaces-shared tdepim-shared tdeabc-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kaddressbook/features/distributionlistngwidget.cpp b/kaddressbook/features/distributionlistngwidget.cpp
index 471769616..1d5acc09c 100644
--- a/kaddressbook/features/distributionlistngwidget.cpp
+++ b/kaddressbook/features/distributionlistngwidget.cpp
@@ -27,12 +27,12 @@
 #include <libtdepim/distributionlist.h>
 #include <libtdepim/kvcarddrag.h>
 
-#include <kabc/vcardconverter.h>
+#include <tdeabc/vcardconverter.h>
 
 #include <kdialog.h>
 #include <kiconloader.h>
 #include <tdelistview.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdepopupmenu.h>
 
 #include <tqevent.h>
diff --git a/kaddressbook/features/distributionlistngwidget.h b/kaddressbook/features/distributionlistngwidget.h
index fdeb83864..3e5515486 100644
--- a/kaddressbook/features/distributionlistngwidget.h
+++ b/kaddressbook/features/distributionlistngwidget.h
@@ -25,7 +25,7 @@
 
 #include "extensionwidget.h"
 
-#include <kabc/addressee.h>
+#include <tdeabc/addressee.h>
 
 #include <tdelistbox.h>
 
diff --git a/kaddressbook/features/distributionlistwidget.cpp b/kaddressbook/features/distributionlistwidget.cpp
index 73afa2ea5..95bf46607 100644
--- a/kaddressbook/features/distributionlistwidget.cpp
+++ b/kaddressbook/features/distributionlistwidget.cpp
@@ -33,21 +33,21 @@
 #include <tdeaccelmanager.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kinputdialog.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
-#include <kabc/addresseedialog.h>
+#include <tdeabc/addresseedialog.h>
 #ifdef TDEPIM_NEW_DISTRLISTS
 #include <libtdepim/distributionlist.h>
 typedef KPIM::DistributionList DistributionList;
 #else
-#include <kabc/distributionlist.h>
+#include <tdeabc/distributionlist.h>
 typedef KABC::DistributionList DistributionList;
 #endif
-#include <kabc/stdaddressbook.h>
-#include <kabc/vcardconverter.h>
+#include <tdeabc/stdaddressbook.h>
+#include <tdeabc/vcardconverter.h>
 #include <libtdepim/kvcarddrag.h>
 
 #include "core.h"
diff --git a/kaddressbook/features/resourceselection.cpp b/kaddressbook/features/resourceselection.cpp
index d812c4803..132d0bc8a 100644
--- a/kaddressbook/features/resourceselection.cpp
+++ b/kaddressbook/features/resourceselection.cpp
@@ -29,13 +29,13 @@
 #include <tqheader.h>
 #include <tqtooltip.h>
 
-#include <kabc/resource.h>
+#include <tdeabc/resource.h>
 #include <kdialog.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
 #include <kinputdialog.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <tderesources/configdialog.h>
 
 #include "core.h"
-- 
cgit v1.2.1