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

---
 kandy/src/atcommand.cpp           | 2 +-
 kandy/src/cmdpropertiesdialog.cpp | 2 +-
 kandy/src/commandscheduler.cpp    | 2 +-
 kandy/src/kandy.cpp               | 8 ++++----
 kandy/src/kandyprefsdialog.cpp    | 6 +++---
 kandy/src/kandyview.cpp           | 6 +++---
 kandy/src/main.cpp                | 4 ++--
 kandy/src/mobilegui.cpp           | 6 +++---
 kandy/src/mobilemain.cpp          | 8 ++++----
 kandy/src/modem.cpp               | 2 +-
 10 files changed, 23 insertions(+), 23 deletions(-)

(limited to 'kandy')

diff --git a/kandy/src/atcommand.cpp b/kandy/src/atcommand.cpp
index 2fcf5f24c..755e8e664 100644
--- a/kandy/src/atcommand.cpp
+++ b/kandy/src/atcommand.cpp
@@ -25,7 +25,7 @@
 #include "atcommand.h"
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 ATParameter::ATParameter()
 {
diff --git a/kandy/src/cmdpropertiesdialog.cpp b/kandy/src/cmdpropertiesdialog.cpp
index 3e72754f4..9d605fda7 100644
--- a/kandy/src/cmdpropertiesdialog.cpp
+++ b/kandy/src/cmdpropertiesdialog.cpp
@@ -27,7 +27,7 @@
 #include <tqcheckbox.h>
 
 #include <kinputdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "atcommand.h"
 
diff --git a/kandy/src/commandscheduler.cpp b/kandy/src/commandscheduler.cpp
index 076582140..cc18a666a 100644
--- a/kandy/src/commandscheduler.cpp
+++ b/kandy/src/commandscheduler.cpp
@@ -23,7 +23,7 @@
 */
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "modem.h"
 
diff --git a/kandy/src/kandy.cpp b/kandy/src/kandy.cpp
index 7877cd9f8..13bd4ff6b 100644
--- a/kandy/src/kandy.cpp
+++ b/kandy/src/kandy.cpp
@@ -28,10 +28,10 @@
 #include <tqpainter.h>
 #include <tqpaintdevicemetrics.h>
 
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
-#include <kmenubar.h>
+#include <tdemenubar.h>
 #include <kkeydialog.h>
 #include <tdeaccel.h>
 #include <tdeio/netaccess.h>
@@ -40,7 +40,7 @@
 #include <kurl.h>
 #include <kurlrequesterdlg.h>
 #include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kstandarddirs.h>
 #include <kedittoolbar.h>
 #include <tdestdaccel.h>
diff --git a/kandy/src/kandyprefsdialog.cpp b/kandy/src/kandyprefsdialog.cpp
index 9ff0bf665..15a4eb8df 100644
--- a/kandy/src/kandyprefsdialog.cpp
+++ b/kandy/src/kandyprefsdialog.cpp
@@ -39,11 +39,11 @@
 
 #include <tdeapplication.h>
 #include <kdebug.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <tdefontdialog.h>
 #include <kstandarddirs.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kcolordialog.h>
 #include <kiconloader.h>
 #include <kiconeffect.h>
diff --git a/kandy/src/kandyview.cpp b/kandy/src/kandyview.cpp
index fbf5deaa2..52e9de0ab 100644
--- a/kandy/src/kandyview.cpp
+++ b/kandy/src/kandyview.cpp
@@ -39,10 +39,10 @@
 #include <tqpushbutton.h>
 
 #include <kurl.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kdebug.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <tdeconfig.h>
 #include <kinputdialog.h>
 #include <kdialog.h>
diff --git a/kandy/src/main.cpp b/kandy/src/main.cpp
index d7d8e7ad0..a22229d52 100644
--- a/kandy/src/main.cpp
+++ b/kandy/src/main.cpp
@@ -28,9 +28,9 @@
 #include <dcopclient.h>
 #include <tdeaboutdata.h>
 #include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include "modem.h"
 #include "kandy.h"
diff --git a/kandy/src/mobilegui.cpp b/kandy/src/mobilegui.cpp
index 0408e9c6d..5b391c389 100644
--- a/kandy/src/mobilegui.cpp
+++ b/kandy/src/mobilegui.cpp
@@ -36,12 +36,12 @@
 
 #include <kdebug.h>
 #include <tdefiledialog.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 #include <tdeapplication.h>
 #include <kstatusbar.h>
 
-#include <kabc/stdaddressbook.h>
+#include <tdeabc/stdaddressbook.h>
 
 #include "modem.h"
 #include "atcommand.h"
diff --git a/kandy/src/mobilemain.cpp b/kandy/src/mobilemain.cpp
index 788fdc9bd..33da5f56e 100644
--- a/kandy/src/mobilemain.cpp
+++ b/kandy/src/mobilemain.cpp
@@ -22,15 +22,15 @@
     without including the source code for TQt in the source distribution.
 */
 
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
-#include <kmenubar.h>
+#include <tdemenubar.h>
 #include <kkeydialog.h>
 #include <tdeaccel.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kstandarddirs.h>
 #include <kedittoolbar.h>
 #include <kurldrag.h>
diff --git a/kandy/src/modem.cpp b/kandy/src/modem.cpp
index f77a3365c..86c36d675 100644
--- a/kandy/src/modem.cpp
+++ b/kandy/src/modem.cpp
@@ -42,7 +42,7 @@
 
 #include <tqglobal.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 #include "modem.h"
-- 
cgit v1.2.1