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

---
 korn/boxcontaineritem.cpp     | 4 ++--
 korn/dcop_proto.cpp           | 2 +-
 korn/dockeditem.cpp           | 4 ++--
 korn/kio.cpp                  | 2 +-
 korn/kmail_proto.cpp          | 2 +-
 korn/kornboxcfgimpl.cpp       | 2 +-
 korn/korncfgimpl.cpp          | 2 +-
 korn/kornshell.cpp            | 2 +-
 korn/maildlg.cpp              | 2 +-
 korn/mailsubject.cpp          | 4 ++--
 korn/main.cpp                 | 2 +-
 korn/subjectsdlg.cpp          | 4 ++--
 korn/tdeio_delete.cpp         | 2 +-
 korn/tdeio_proto.h            | 2 +-
 korn/tdeio_read.cpp           | 2 +-
 korn/tdeio_single_subject.cpp | 2 +-
 16 files changed, 20 insertions(+), 20 deletions(-)

(limited to 'korn')

diff --git a/korn/boxcontaineritem.cpp b/korn/boxcontaineritem.cpp
index 4b1fd76d..e67296d5 100644
--- a/korn/boxcontaineritem.cpp
+++ b/korn/boxcontaineritem.cpp
@@ -26,10 +26,10 @@
 #include <kbugreport.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconeffect.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kpassivepopup.h>
 #include <tdepopupmenu.h>
 #include <kprocess.h>
diff --git a/korn/dcop_proto.cpp b/korn/dcop_proto.cpp
index d4a8bd3b..94fd5f04 100644
--- a/korn/dcop_proto.cpp
+++ b/korn/dcop_proto.cpp
@@ -23,7 +23,7 @@
 #include "dcopdrop.h"
 
 #include <tdeconfigbase.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqmap.h>
 #include <tqptrlist.h>
diff --git a/korn/dockeditem.cpp b/korn/dockeditem.cpp
index 7d5de186..40274474 100644
--- a/korn/dockeditem.cpp
+++ b/korn/dockeditem.cpp
@@ -23,11 +23,11 @@
 #include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
 #include <kpassivepopup.h>
 #include <tdepopupmenu.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqbitmap.h>
 #include <tqcursor.h>
diff --git a/korn/kio.cpp b/korn/kio.cpp
index 195f73d8..678b3848 100644
--- a/korn/kio.cpp
+++ b/korn/kio.cpp
@@ -43,7 +43,7 @@
 #include<tdeconfig.h>
 #include<tdeconfigbase.h>
 #include<kdebug.h>
-#include<klocale.h>
+#include<tdelocale.h>
 #include<kprocess.h>
 
 #include<tqptrlist.h>
diff --git a/korn/kmail_proto.cpp b/korn/kmail_proto.cpp
index 7be0555d..a3fddad3 100644
--- a/korn/kmail_proto.cpp
+++ b/korn/kmail_proto.cpp
@@ -26,7 +26,7 @@
 
 #include <tdeconfig.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqmap.h>
 #include <tqobject.h>
diff --git a/korn/kornboxcfgimpl.cpp b/korn/kornboxcfgimpl.cpp
index 92f81be8..7d29e1f5 100644
--- a/korn/kornboxcfgimpl.cpp
+++ b/korn/kornboxcfgimpl.cpp
@@ -28,7 +28,7 @@ class TDEConfig;
 #include <kdebug.h>
 #include <tdefiledialog.h>
 #include <tdefontdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kicondialog.h>
 #include <kurlrequester.h>
 
diff --git a/korn/korncfgimpl.cpp b/korn/korncfgimpl.cpp
index 1d3ba736..c6e8d171 100644
--- a/korn/korncfgimpl.cpp
+++ b/korn/korncfgimpl.cpp
@@ -25,7 +25,7 @@
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <kdialogbase.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqcolor.h>
 #include <tqcheckbox.h>
diff --git a/korn/kornshell.cpp b/korn/kornshell.cpp
index 72ca18a8..7f5587bc 100644
--- a/korn/kornshell.cpp
+++ b/korn/kornshell.cpp
@@ -28,7 +28,7 @@
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <kdialogbase.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqtimer.h>
 
diff --git a/korn/maildlg.cpp b/korn/maildlg.cpp
index 3424e19e..d912c447 100644
--- a/korn/maildlg.cpp
+++ b/korn/maildlg.cpp
@@ -1,7 +1,7 @@
 #include "maildlg.h"
 #include <tqlayout.h>
 #include<kdebug.h>
-#include<klocale.h>
+#include<tdelocale.h>
 #include<tqapplication.h>
 #include "mailsubject.h"
 #include <tqprogressdialog.h>
diff --git a/korn/mailsubject.cpp b/korn/mailsubject.cpp
index 459d7d46..0b7a2e3a 100644
--- a/korn/mailsubject.cpp
+++ b/korn/mailsubject.cpp
@@ -3,8 +3,8 @@
 #include <kmime_codecs.h>
 #include <kcharsets.h>
 #include <kdebug.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <tqdatetime.h>
 #include <tqtextcodec.h>
 #include <ctype.h>
diff --git a/korn/main.cpp b/korn/main.cpp
index d5a68a3a..f3e8cf9a 100644
--- a/korn/main.cpp
+++ b/korn/main.cpp
@@ -6,7 +6,7 @@
 #include"kornapp.h"
 #include <tdeaboutdata.h>
 #include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include"kornshell.h"
 
diff --git a/korn/subjectsdlg.cpp b/korn/subjectsdlg.cpp
index 6a2ec184..f3e4b3f4 100644
--- a/korn/subjectsdlg.cpp
+++ b/korn/subjectsdlg.cpp
@@ -7,9 +7,9 @@
 #include <tqdatetime.h>
 #include <tqtimer.h>
 #include "mailsubject.h"
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqprogressdialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include "maildlg.h"
 #include "progress_dialog.h"
 
diff --git a/korn/tdeio_delete.cpp b/korn/tdeio_delete.cpp
index 4550f20d..1bb87d25 100644
--- a/korn/tdeio_delete.cpp
+++ b/korn/tdeio_delete.cpp
@@ -24,7 +24,7 @@
 #include "tdeio_proto.h"
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kurl.h>
 #include <tdeio/global.h>
 #include <tdeio/jobclasses.h>
diff --git a/korn/tdeio_proto.h b/korn/tdeio_proto.h
index e56de688..67e673e7 100644
--- a/korn/tdeio_proto.h
+++ b/korn/tdeio_proto.h
@@ -28,7 +28,7 @@
 
 class TQString;
 #include <tdeio/global.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqstringlist.h>
 #include "protocol.h"
 
diff --git a/korn/tdeio_read.cpp b/korn/tdeio_read.cpp
index 6ec5a12b..4d8cbf6c 100644
--- a/korn/tdeio_read.cpp
+++ b/korn/tdeio_read.cpp
@@ -24,7 +24,7 @@
 #include "stringid.h"
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kurl.h>
 #include <tdeio/global.h>
 #include <tdeio/jobclasses.h>
diff --git a/korn/tdeio_single_subject.cpp b/korn/tdeio_single_subject.cpp
index b98a2edb..022dac49 100644
--- a/korn/tdeio_single_subject.cpp
+++ b/korn/tdeio_single_subject.cpp
@@ -23,7 +23,7 @@
 #include "stringid.h"
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kurl.h>
 #include <tdeio/global.h>
 #include <tdeio/scheduler.h>
-- 
cgit v1.2.3