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

---
 libkdcraw/libkdcraw/dcrawbinary.cpp         | 6 +++---
 libkdcraw/libkdcraw/dcrawsettingswidget.cpp | 2 +-
 libkdcraw/libkdcraw/rcombobox.cpp           | 2 +-
 libkdcraw/libkdcraw/rnuminput.cpp           | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/libkdcraw/libkdcraw/dcrawbinary.cpp b/libkdcraw/libkdcraw/dcrawbinary.cpp
index 98698f4..338edef 100644
--- a/libkdcraw/libkdcraw/dcrawbinary.cpp
+++ b/libkdcraw/libkdcraw/dcrawbinary.cpp
@@ -28,10 +28,10 @@
 // KDE includes
 
 #include <kprocess.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeapplication.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <tdeaboutdata.h>
 
 // Local includes
diff --git a/libkdcraw/libkdcraw/dcrawsettingswidget.cpp b/libkdcraw/libkdcraw/dcrawsettingswidget.cpp
index f3f16cb..74e711c 100644
--- a/libkdcraw/libkdcraw/dcrawsettingswidget.cpp
+++ b/libkdcraw/libkdcraw/dcrawsettingswidget.cpp
@@ -35,7 +35,7 @@
 
 #include <tdeapplication.h>
 #include <kdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kurllabel.h>
 
 // Local includes.
diff --git a/libkdcraw/libkdcraw/rcombobox.cpp b/libkdcraw/libkdcraw/rcombobox.cpp
index cb9d037..c20c414 100644
--- a/libkdcraw/libkdcraw/rcombobox.cpp
+++ b/libkdcraw/libkdcraw/rcombobox.cpp
@@ -30,7 +30,7 @@
 // KDE includes.
 
 #include <kdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 
 // Local includes.
diff --git a/libkdcraw/libkdcraw/rnuminput.cpp b/libkdcraw/libkdcraw/rnuminput.cpp
index e9426bd..b5c0465 100644
--- a/libkdcraw/libkdcraw/rnuminput.cpp
+++ b/libkdcraw/libkdcraw/rnuminput.cpp
@@ -30,7 +30,7 @@
 
 // KDE includes.
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <kdialog.h>
 
-- 
cgit v1.2.1