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

---
 knotes/knote.cpp               | 6 +++---
 knotes/knotealarmdlg.cpp       | 2 +-
 knotes/knotebutton.cpp         | 2 +-
 knotes/knoteconfigdlg.cpp      | 2 +-
 knotes/knoteedit.cpp           | 2 +-
 knotes/knotehostdlg.cpp        | 4 ++--
 knotes/knoteprinter.cpp        | 2 +-
 knotes/knotesalarm.cpp         | 4 ++--
 knotes/knotesapp.cpp           | 2 +-
 knotes/knoteslegacy.cpp        | 2 +-
 knotes/knotesnetrecv.cpp       | 4 ++--
 knotes/knotesnetsend.cpp       | 4 ++--
 knotes/main.cpp                | 2 +-
 knotes/resourcelocal.cpp       | 4 ++--
 knotes/resourcelocalconfig.cpp | 2 +-
 15 files changed, 22 insertions(+), 22 deletions(-)

(limited to 'knotes')

diff --git a/knotes/knote.cpp b/knotes/knote.cpp
index 29ad10f5a..62c8efc8c 100644
--- a/knotes/knote.cpp
+++ b/knotes/knote.cpp
@@ -43,14 +43,14 @@
 #include <kxmlguifactory.h>
 #include <kcolordrag.h>
 #include <kiconeffect.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kfind.h>
 #include <kprocess.h>
 #include <kinputdialog.h>
 #include <kmdcodec.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <tdefiledialog.h>
 #include <tdeio/netaccess.h>
 
diff --git a/knotes/knotealarmdlg.cpp b/knotes/knotealarmdlg.cpp
index cb1ea1163..4496da264 100644
--- a/knotes/knotealarmdlg.cpp
+++ b/knotes/knotealarmdlg.cpp
@@ -34,7 +34,7 @@
 #include <tqbuttongroup.h>
 #include <tqvbox.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <libtdepim/kdateedit.h>
 #include <libtdepim/ktimeedit.h>
diff --git a/knotes/knotebutton.cpp b/knotes/knotebutton.cpp
index 006b1e9c5..ff89b2dea 100644
--- a/knotes/knotebutton.cpp
+++ b/knotes/knotebutton.cpp
@@ -23,7 +23,7 @@
 #include <tqiconset.h>
 #include <tqsizepolicy.h>
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kicontheme.h>
 #include <kiconloader.h>
 
diff --git a/knotes/knoteconfigdlg.cpp b/knotes/knoteconfigdlg.cpp
index e3ee66fae..bd388c389 100644
--- a/knotes/knoteconfigdlg.cpp
+++ b/knotes/knoteconfigdlg.cpp
@@ -27,7 +27,7 @@
 
 #include <tdeapplication.h>
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <kcolorbutton.h>
 #include <knuminput.h>
diff --git a/knotes/knoteedit.cpp b/knotes/knoteedit.cpp
index 7ebb44354..2ba215b7b 100644
--- a/knotes/knoteedit.cpp
+++ b/knotes/knoteedit.cpp
@@ -22,7 +22,7 @@
 #include <tqfont.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeaction.h>
 #include <kurldrag.h>
 #include <kstdaction.h>
diff --git a/knotes/knotehostdlg.cpp b/knotes/knotehostdlg.cpp
index 3b8b8f50f..9d8fff975 100644
--- a/knotes/knotehostdlg.cpp
+++ b/knotes/knotehostdlg.cpp
@@ -36,8 +36,8 @@
 #include <tqvbox.h>
 
 #include <kdebug.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 #include <ksimpleconfig.h>
 #include <kcombobox.h>
diff --git a/knotes/knoteprinter.cpp b/knotes/knoteprinter.cpp
index c58031671..ade0a8a70 100644
--- a/knotes/knoteprinter.cpp
+++ b/knotes/knoteprinter.cpp
@@ -2,7 +2,7 @@
 
 #include <libkcal/journal.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kprinter.h>
 #include <kdebug.h>
 #include <tqfont.h>
diff --git a/knotes/knotesalarm.cpp b/knotes/knotesalarm.cpp
index 285d7224e..c2d1bd1cd 100644
--- a/knotes/knotesalarm.cpp
+++ b/knotes/knotesalarm.cpp
@@ -31,8 +31,8 @@
 
 #include <tqstringlist.h>
 
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 
 #include <libkcal/calendarresources.h>
 
diff --git a/knotes/knotesapp.cpp b/knotes/knotesapp.cpp
index f3b2ae158..26aee48c3 100644
--- a/knotes/knotesapp.cpp
+++ b/knotes/knotesapp.cpp
@@ -27,7 +27,7 @@
 #include <kxmlguifactory.h>
 #include <kxmlguibuilder.h>
 #include <ksystemtray.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconeffect.h>
 #include <kstandarddirs.h>
 #include <tdepopupmenu.h>
diff --git a/knotes/knoteslegacy.cpp b/knotes/knoteslegacy.cpp
index 35816f88e..fb832a5b8 100644
--- a/knotes/knoteslegacy.cpp
+++ b/knotes/knoteslegacy.cpp
@@ -27,7 +27,7 @@
 
 #include <kdebug.h>
 #include <tdeapplication.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kurl.h>
 #include <kstandarddirs.h>
 #include <ksimpleconfig.h>
diff --git a/knotes/knotesnetrecv.cpp b/knotes/knotesnetrecv.cpp
index 94ff29526..48bb791fd 100644
--- a/knotes/knotesnetrecv.cpp
+++ b/knotes/knotesnetrecv.cpp
@@ -38,8 +38,8 @@
 #include <kdebug.h>
 #include <kbufferedsocket.h>
 #include <tdesocketaddress.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 
 #include "knotesnetrecv.h"
 
diff --git a/knotes/knotesnetsend.cpp b/knotes/knotesnetsend.cpp
index 001dcf9ff..26d2b8f7d 100644
--- a/knotes/knotesnetsend.cpp
+++ b/knotes/knotesnetsend.cpp
@@ -30,8 +30,8 @@
  your version.
 *******************************************************************/
 
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 #include "knotesnetsend.h"
 
diff --git a/knotes/main.cpp b/knotes/main.cpp
index a8dde2d0f..e809a8f71 100644
--- a/knotes/main.cpp
+++ b/knotes/main.cpp
@@ -21,7 +21,7 @@
 #include <kuniqueapplication.h>
 #include <tdecmdlineargs.h>
 #include <tdeaboutdata.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kxerrorhandler.h>
 
 #include <X11/Xlib.h>
diff --git a/knotes/resourcelocal.cpp b/knotes/resourcelocal.cpp
index 7e208531e..e5d4d6e5e 100644
--- a/knotes/resourcelocal.cpp
+++ b/knotes/resourcelocal.cpp
@@ -31,8 +31,8 @@
  your version.
 *******************************************************************/
 
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kstandarddirs.h>
 
 #include <libkcal/icalformat.h>
diff --git a/knotes/resourcelocalconfig.cpp b/knotes/resourcelocalconfig.cpp
index 1214e0ad6..c4eed4e0c 100644
--- a/knotes/resourcelocalconfig.cpp
+++ b/knotes/resourcelocalconfig.cpp
@@ -22,7 +22,7 @@
 #include <tqlayout.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tderesources/configwidget.h>
 #include <kurlrequester.h>
 
-- 
cgit v1.2.1