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/views/cardview.cpp                 | 2 +-
 kaddressbook/views/configurecardviewdialog.cpp  | 6 +++---
 kaddressbook/views/configuretableviewdialog.cpp | 4 ++--
 kaddressbook/views/contactlistview.cpp          | 8 ++++----
 kaddressbook/views/contactlistview.h            | 2 +-
 kaddressbook/views/kaddressbookcardview.cpp     | 6 +++---
 kaddressbook/views/kaddressbookiconview.cpp     | 8 ++++----
 kaddressbook/views/kaddressbooktableview.cpp    | 8 ++++----
 8 files changed, 22 insertions(+), 22 deletions(-)

(limited to 'kaddressbook/views')

diff --git a/kaddressbook/views/cardview.cpp b/kaddressbook/views/cardview.cpp
index 2979ee5d..9b1ef52a 100644
--- a/kaddressbook/views/cardview.cpp
+++ b/kaddressbook/views/cardview.cpp
@@ -33,7 +33,7 @@
 #include <tqtooltip.h>
 
 #include <kdebug.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 
 #include "cardview.h"
 
diff --git a/kaddressbook/views/configurecardviewdialog.cpp b/kaddressbook/views/configurecardviewdialog.cpp
index 2c520ce7..a386743c 100644
--- a/kaddressbook/views/configurecardviewdialog.cpp
+++ b/kaddressbook/views/configurecardviewdialog.cpp
@@ -32,9 +32,9 @@
 #include <tqwhatsthis.h>
 
 #include <kdebug.h>
-#include <kglobal.h>
-#include <kglobalsettings.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdeglobalsettings.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <tdeconfig.h>
 #include <tdefontdialog.h>
diff --git a/kaddressbook/views/configuretableviewdialog.cpp b/kaddressbook/views/configuretableviewdialog.cpp
index 4e478e25..f14a5c45 100644
--- a/kaddressbook/views/configuretableviewdialog.cpp
+++ b/kaddressbook/views/configuretableviewdialog.cpp
@@ -30,8 +30,8 @@
 #include <tqbuttongroup.h>
 
 #include <tdeversion.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <klineedit.h>
 #include <kurlrequester.h>
 #include <kiconloader.h>
diff --git a/kaddressbook/views/contactlistview.cpp b/kaddressbook/views/contactlistview.cpp
index f4b98e46..0d7942f9 100644
--- a/kaddressbook/views/contactlistview.cpp
+++ b/kaddressbook/views/contactlistview.cpp
@@ -30,14 +30,14 @@
 #include <tqbrush.h>
 #include <tqevent.h>
 
-#include <klocale.h>
-#include <kglobalsettings.h>
+#include <tdelocale.h>
+#include <tdeglobalsettings.h>
 #include <kdebug.h>
 #include <tdeconfig.h>
 #include <tdeapplication.h>
 #include <kurl.h>
-#include <kabc/addressbook.h>
-#include <kabc/addressee.h>
+#include <tdeabc/addressbook.h>
+#include <tdeabc/addressee.h>
 #include <tdeimproxy.h>
 
 #include "kaddressbooktableview.h"
diff --git a/kaddressbook/views/contactlistview.h b/kaddressbook/views/contactlistview.h
index 0ca029f6..b893cc35 100644
--- a/kaddressbook/views/contactlistview.h
+++ b/kaddressbook/views/contactlistview.h
@@ -31,7 +31,7 @@
 
 #include <tdelistview.h>
 
-#include <kabc/field.h>
+#include <tdeabc/field.h>
 
 class TQDropEvent;
 class KAddressBookTableView;
diff --git a/kaddressbook/views/kaddressbookcardview.cpp b/kaddressbook/views/kaddressbookcardview.cpp
index f69ce0c1..f60d171a 100644
--- a/kaddressbook/views/kaddressbookcardview.cpp
+++ b/kaddressbook/views/kaddressbookcardview.cpp
@@ -28,11 +28,11 @@
 #include <tqlayout.h>
 #include <tqstringlist.h>
 
-#include <kabc/addressbook.h>
-#include <kabc/addressee.h>
+#include <tdeabc/addressbook.h>
+#include <tdeabc/addressee.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "core.h"
 #include "configurecardviewdialog.h"
diff --git a/kaddressbook/views/kaddressbookiconview.cpp b/kaddressbook/views/kaddressbookiconview.cpp
index e5f4ab25..f88af5ff 100644
--- a/kaddressbook/views/kaddressbookiconview.cpp
+++ b/kaddressbook/views/kaddressbookiconview.cpp
@@ -26,13 +26,13 @@
 #include <tqlayout.h>
 #include <tqstringlist.h>
 
-#include <kabc/addressbook.h>
-#include <kabc/addressee.h>
+#include <tdeabc/addressbook.h>
+#include <tdeabc/addressee.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "core.h"
 #include "kabprefs.h"
diff --git a/kaddressbook/views/kaddressbooktableview.cpp b/kaddressbook/views/kaddressbooktableview.cpp
index 4c726ca3..6d8d0c97 100644
--- a/kaddressbook/views/kaddressbooktableview.cpp
+++ b/kaddressbook/views/kaddressbooktableview.cpp
@@ -36,16 +36,16 @@
 #include <tqurl.h>
 #include <tqpixmap.h>
 
-#include <kabc/addressbook.h>
+#include <tdeabc/addressbook.h>
 #include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kcolorbutton.h>
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
 #include <klineedit.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kurl.h>
 #include <kurlrequester.h>
 #include <tdeimproxy.h>
-- 
cgit v1.2.3