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/kcmconfigs/addhostdialog.cpp         | 2 +-
 kaddressbook/kcmconfigs/addhostdialog.h           | 2 +-
 kaddressbook/kcmconfigs/addresseewidget.cpp       | 2 +-
 kaddressbook/kcmconfigs/extensionconfigdialog.cpp | 2 +-
 kaddressbook/kcmconfigs/kabconfigwidget.cpp       | 4 ++--
 kaddressbook/kcmconfigs/kcmkabconfig.cpp          | 2 +-
 kaddressbook/kcmconfigs/kcmkabldapconfig.cpp      | 2 +-
 kaddressbook/kcmconfigs/ldapoptionswidget.cpp     | 2 +-
 8 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'kaddressbook/kcmconfigs')

diff --git a/kaddressbook/kcmconfigs/addhostdialog.cpp b/kaddressbook/kcmconfigs/addhostdialog.cpp
index 0c248440..44a51680 100644
--- a/kaddressbook/kcmconfigs/addhostdialog.cpp
+++ b/kaddressbook/kcmconfigs/addhostdialog.cpp
@@ -30,7 +30,7 @@
 #include <tdeaccelmanager.h>
 #include <kbuttonbox.h>
 #include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include "addhostdialog.h"
 
 AddHostDialog::AddHostDialog( KPIM::LdapServer *server, TQWidget* parent,  const char* name )
diff --git a/kaddressbook/kcmconfigs/addhostdialog.h b/kaddressbook/kcmconfigs/addhostdialog.h
index da6cc392..1ea1865f 100644
--- a/kaddressbook/kcmconfigs/addhostdialog.h
+++ b/kaddressbook/kcmconfigs/addhostdialog.h
@@ -25,7 +25,7 @@
 #define ADDHOSTDIALOG_H
 
 #include <kdialogbase.h>
-#include <kabc/ldapconfigwidget.h>
+#include <tdeabc/ldapconfigwidget.h>
 #include <libtdepim/ldapclient.h>
 
 class KLineEdit;
diff --git a/kaddressbook/kcmconfigs/addresseewidget.cpp b/kaddressbook/kcmconfigs/addresseewidget.cpp
index ce58d272..6d8522f6 100644
--- a/kaddressbook/kcmconfigs/addresseewidget.cpp
+++ b/kaddressbook/kcmconfigs/addresseewidget.cpp
@@ -35,7 +35,7 @@
 #include <tdeconfig.h>
 #include <kdialog.h>
 #include <kinputdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <klineedit.h>
 
 #include "addresseewidget.h"
diff --git a/kaddressbook/kcmconfigs/extensionconfigdialog.cpp b/kaddressbook/kcmconfigs/extensionconfigdialog.cpp
index 5bdec2f8..55eecb18 100644
--- a/kaddressbook/kcmconfigs/extensionconfigdialog.cpp
+++ b/kaddressbook/kcmconfigs/extensionconfigdialog.cpp
@@ -23,7 +23,7 @@
 
 #include <tqlayout.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "configurewidget.h"
 #include "extensionconfigdialog.h"
diff --git a/kaddressbook/kcmconfigs/kabconfigwidget.cpp b/kaddressbook/kcmconfigs/kabconfigwidget.cpp
index 6e2c4f68..83e0bc89 100644
--- a/kaddressbook/kcmconfigs/kabconfigwidget.cpp
+++ b/kaddressbook/kcmconfigs/kabconfigwidget.cpp
@@ -36,8 +36,8 @@
 #include <kdebug.h>
 #include <kdialog.h>
 #include <tdelistview.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <ktrader.h>
 
 #include "addresseewidget.h"
diff --git a/kaddressbook/kcmconfigs/kcmkabconfig.cpp b/kaddressbook/kcmconfigs/kcmkabconfig.cpp
index 6f170697..db05432c 100644
--- a/kaddressbook/kcmconfigs/kcmkabconfig.cpp
+++ b/kaddressbook/kcmconfigs/kcmkabconfig.cpp
@@ -25,7 +25,7 @@
 
 #include <tdeaboutdata.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "kabconfigwidget.h"
 
diff --git a/kaddressbook/kcmconfigs/kcmkabldapconfig.cpp b/kaddressbook/kcmconfigs/kcmkabldapconfig.cpp
index a95fa2c8..73e8c5a2 100644
--- a/kaddressbook/kcmconfigs/kcmkabldapconfig.cpp
+++ b/kaddressbook/kcmconfigs/kcmkabldapconfig.cpp
@@ -26,7 +26,7 @@
 #include <tqlayout.h>
 
 #include <tdeaboutdata.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "ldapoptionswidget.h"
 
diff --git a/kaddressbook/kcmconfigs/ldapoptionswidget.cpp b/kaddressbook/kcmconfigs/ldapoptionswidget.cpp
index 71a41ba4..46241855 100644
--- a/kaddressbook/kcmconfigs/ldapoptionswidget.cpp
+++ b/kaddressbook/kcmconfigs/ldapoptionswidget.cpp
@@ -33,7 +33,7 @@
 #include <kbuttonbox.h>
 #include <tdeconfig.h>
 #include <tdelistview.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "addhostdialog.h"
 #include "ldapoptionswidget.h"
-- 
cgit v1.2.3