From 39de4d2189f86e632184f4390fef1d8b6dd88027 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 15 Feb 2013 21:45:31 -0600
Subject: Rename additional header files to avoid conflicts with KDE4

---
 kbfxlib/common/kbfxconfig.h      | 4 ++--
 kbfxlib/common/kbfxfontchooser.h | 2 +-
 kbfxlib/common/kbfxkiodownload.h | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'kbfxlib')

diff --git a/kbfxlib/common/kbfxconfig.h b/kbfxlib/common/kbfxconfig.h
index 3214b1e..dd60620 100644
--- a/kbfxlib/common/kbfxconfig.h
+++ b/kbfxlib/common/kbfxconfig.h
@@ -35,9 +35,9 @@
 #include <tdeconfig.h>
 #include <tdeconfigskeleton.h>
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 #include <kuser.h>
 
diff --git a/kbfxlib/common/kbfxfontchooser.h b/kbfxlib/common/kbfxfontchooser.h
index 9ad1e80..790d801 100644
--- a/kbfxlib/common/kbfxfontchooser.h
+++ b/kbfxlib/common/kbfxfontchooser.h
@@ -22,7 +22,7 @@
 
 #include <kdialog.h>
 #include <tdefontdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <tqwidget.h>
 #include <tqlabel.h>
diff --git a/kbfxlib/common/kbfxkiodownload.h b/kbfxlib/common/kbfxkiodownload.h
index 3e9df44..2878678 100644
--- a/kbfxlib/common/kbfxkiodownload.h
+++ b/kbfxlib/common/kbfxkiodownload.h
@@ -23,7 +23,7 @@
 #define KBFX_KIO_DOWNLOAD_H
 
 #include <tdeio/job.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <kdebug.h>
 
 /**
-- 
cgit v1.2.1