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/editors/CMakeLists.txt      | 2 +-
 kaddressbook/editors/cryptowidget.cpp    | 2 +-
 kaddressbook/editors/imaddresswidget.cpp | 2 +-
 kaddressbook/editors/imeditorwidget.cpp  | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'kaddressbook/editors')

diff --git a/kaddressbook/editors/CMakeLists.txt b/kaddressbook/editors/CMakeLists.txt
index 0fd3d0f8c..a2b8c898c 100644
--- a/kaddressbook/editors/CMakeLists.txt
+++ b/kaddressbook/editors/CMakeLists.txt
@@ -48,6 +48,6 @@ tde_add_library( kabim STATIC_PIC AUTOMOC
 
 tde_add_kpart( libkaddrbk_cryptosettings AUTOMOC
   SOURCES cryptowidget.cpp
-  LINK kabinterfaces-shared kleopatra-shared kabc-shared
+  LINK kabinterfaces-shared kleopatra-shared tdeabc-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kaddressbook/editors/cryptowidget.cpp b/kaddressbook/editors/cryptowidget.cpp
index f89a068e6..892125852 100644
--- a/kaddressbook/editors/cryptowidget.cpp
+++ b/kaddressbook/editors/cryptowidget.cpp
@@ -33,7 +33,7 @@
 #include <kdebug.h>
 #include <kdialog.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqlayout.h>
 #include <tqlabel.h>
diff --git a/kaddressbook/editors/imaddresswidget.cpp b/kaddressbook/editors/imaddresswidget.cpp
index 4b3516ea1..0a3336d6a 100644
--- a/kaddressbook/editors/imaddresswidget.cpp
+++ b/kaddressbook/editors/imaddresswidget.cpp
@@ -28,7 +28,7 @@
 
 #include <kdebug.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kplugininfo.h>
 
 #include "imaddresswidget.h"
diff --git a/kaddressbook/editors/imeditorwidget.cpp b/kaddressbook/editors/imeditorwidget.cpp
index 45523de54..b0f1590e7 100644
--- a/kaddressbook/editors/imeditorwidget.cpp
+++ b/kaddressbook/editors/imeditorwidget.cpp
@@ -32,8 +32,8 @@
 #include <kdialogbase.h>
 #include <kdebug.h>
 #include <kiconloader.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kplugininfo.h>
 #include <kpushbutton.h>
 #include <ktrader.h>
-- 
cgit v1.2.1