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

---
 kmag/kmag.cpp         | 8 ++++----
 kmag/kmagselrect.cpp  | 2 +-
 kmag/kmagzoomview.cpp | 2 +-
 kmag/main.cpp         | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'kmag')

diff --git a/kmag/kmag.cpp b/kmag/kmag.cpp
index 0bd9cdd..7961ee6 100644
--- a/kmag/kmag.cpp
+++ b/kmag/kmag.cpp
@@ -40,10 +40,10 @@
 #include <kkeydialog.h>
 #include <kinputdialog.h>
 #include <kiconloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdefiledialog.h>
-#include <kmenubar.h>
-#include <klocale.h>
+#include <tdemenubar.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <kstdaction.h>
@@ -51,7 +51,7 @@
 #include <kimageio.h>
 #include <tdeio/job.h>
 #include <tdeio/netaccess.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <tdepopupmenu.h>
 #include <kedittoolbar.h>
 #include <twin.h>
diff --git a/kmag/kmagselrect.cpp b/kmag/kmagselrect.cpp
index cde24d1..ba49fe3 100644
--- a/kmag/kmagselrect.cpp
+++ b/kmag/kmagselrect.cpp
@@ -27,7 +27,7 @@
 #include <tqbitmap.h>
 
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 static uchar line_bits[] = {0x2d, 0x96, 0x4b, 0xa5, 0xd2, 0x69, 0xb4, 0x5a};
 
diff --git a/kmag/kmagzoomview.cpp b/kmag/kmagzoomview.cpp
index da8bc8e..644e91a 100644
--- a/kmag/kmagzoomview.cpp
+++ b/kmag/kmagzoomview.cpp
@@ -36,7 +36,7 @@
 #include <tdeapplication.h>
 #include <kcursor.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <X11/Xlib.h>
 #include <X11/Xatom.h>
diff --git a/kmag/main.cpp b/kmag/main.cpp
index 0eb747f..1d85e05 100644
--- a/kmag/main.cpp
+++ b/kmag/main.cpp
@@ -18,7 +18,7 @@
 
 #include <tdecmdlineargs.h>
 #include <tdeaboutdata.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "kmag.h"
 
-- 
cgit v1.2.3