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

---
 tdefile-plugins/bmp/tdefile_bmp.cpp      | 2 +-
 tdefile-plugins/dds/tdefile_dds.cpp      | 2 +-
 tdefile-plugins/dvi/tdefile_dvi.cpp      | 2 +-
 tdefile-plugins/exr/tdefile_exr.cpp      | 2 +-
 tdefile-plugins/gif/tdefile_gif.cpp      | 2 +-
 tdefile-plugins/ico/tdefile_ico.cpp      | 2 +-
 tdefile-plugins/jpeg/exif.cpp            | 2 +-
 tdefile-plugins/jpeg/tdefile_jpeg.cpp    | 2 +-
 tdefile-plugins/png/tdefile_png.cpp      | 2 +-
 tdefile-plugins/ps/tdefile_ps.cpp        | 2 +-
 tdefile-plugins/raw/kcamerarawplugin.cpp | 4 ++--
 tdefile-plugins/tga/tdefile_tga.cpp      | 2 +-
 tdefile-plugins/xbm/tdefile_xbm.cpp      | 2 +-
 13 files changed, 14 insertions(+), 14 deletions(-)

(limited to 'tdefile-plugins')

diff --git a/tdefile-plugins/bmp/tdefile_bmp.cpp b/tdefile-plugins/bmp/tdefile_bmp.cpp
index 354ea54e..5349edb0 100644
--- a/tdefile-plugins/bmp/tdefile_bmp.cpp
+++ b/tdefile-plugins/bmp/tdefile_bmp.cpp
@@ -21,7 +21,7 @@
 #include "tdefile_bmp.h"
 
 #include <kprocess.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kgenericfactory.h>
 #include <kstringvalidator.h>
 #include <kdebug.h>
diff --git a/tdefile-plugins/dds/tdefile_dds.cpp b/tdefile-plugins/dds/tdefile_dds.cpp
index e49bf498..71f19c4f 100644
--- a/tdefile-plugins/dds/tdefile_dds.cpp
+++ b/tdefile-plugins/dds/tdefile_dds.cpp
@@ -21,7 +21,7 @@
 #include "tdefile_dds.h"
 
 #include <kprocess.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kgenericfactory.h>
 #include <kstringvalidator.h>
 #include <kdebug.h>
diff --git a/tdefile-plugins/dvi/tdefile_dvi.cpp b/tdefile-plugins/dvi/tdefile_dvi.cpp
index 374e5e54..1f981a2e 100644
--- a/tdefile-plugins/dvi/tdefile_dvi.cpp
+++ b/tdefile-plugins/dvi/tdefile_dvi.cpp
@@ -24,7 +24,7 @@
 
 #include <kgenericfactory.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdefilemetainfo.h>
 
 #include <tqstring.h>
diff --git a/tdefile-plugins/exr/tdefile_exr.cpp b/tdefile-plugins/exr/tdefile_exr.cpp
index d8007e3d..a2613bff 100644
--- a/tdefile-plugins/exr/tdefile_exr.cpp
+++ b/tdefile-plugins/exr/tdefile_exr.cpp
@@ -41,7 +41,7 @@
 
 #include <kurl.h>
 #include <kprocess.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kgenericfactory.h>
 #include <kdebug.h>
 
diff --git a/tdefile-plugins/gif/tdefile_gif.cpp b/tdefile-plugins/gif/tdefile_gif.cpp
index 9cc522dc..112b780a 100644
--- a/tdefile-plugins/gif/tdefile_gif.cpp
+++ b/tdefile-plugins/gif/tdefile_gif.cpp
@@ -27,7 +27,7 @@
 
 #include <kurl.h>
 #include <kprocess.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kgenericfactory.h>
 #include <kdebug.h>
 
diff --git a/tdefile-plugins/ico/tdefile_ico.cpp b/tdefile-plugins/ico/tdefile_ico.cpp
index 273a5e18..057fe0a8 100644
--- a/tdefile-plugins/ico/tdefile_ico.cpp
+++ b/tdefile-plugins/ico/tdefile_ico.cpp
@@ -21,7 +21,7 @@
 #include "tdefile_ico.h"
 
 #include <kprocess.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kgenericfactory.h>
 #include <kstringvalidator.h>
 #include <kdebug.h>
diff --git a/tdefile-plugins/jpeg/exif.cpp b/tdefile-plugins/jpeg/exif.cpp
index 60c689bd..d50ecaf6 100644
--- a/tdefile-plugins/jpeg/exif.cpp
+++ b/tdefile-plugins/jpeg/exif.cpp
@@ -10,7 +10,7 @@
 
 #include "exif.h"
 #include <tqwmatrix.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 
 static unsigned char * LastExifRefd;
diff --git a/tdefile-plugins/jpeg/tdefile_jpeg.cpp b/tdefile-plugins/jpeg/tdefile_jpeg.cpp
index c902b99b..2c0894c2 100644
--- a/tdefile-plugins/jpeg/tdefile_jpeg.cpp
+++ b/tdefile-plugins/jpeg/tdefile_jpeg.cpp
@@ -25,7 +25,7 @@
 
 #include <kurl.h>
 #include <kprocess.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kgenericfactory.h>
 #include <kdebug.h>
 
diff --git a/tdefile-plugins/png/tdefile_png.cpp b/tdefile-plugins/png/tdefile_png.cpp
index 9766fbc6..8a558aa6 100644
--- a/tdefile-plugins/png/tdefile_png.cpp
+++ b/tdefile-plugins/png/tdefile_png.cpp
@@ -23,7 +23,7 @@
 
 #include <kurl.h>
 #include <kprocess.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kgenericfactory.h>
 #include <kdebug.h>
 
diff --git a/tdefile-plugins/ps/tdefile_ps.cpp b/tdefile-plugins/ps/tdefile_ps.cpp
index 87161176..87b653d3 100644
--- a/tdefile-plugins/ps/tdefile_ps.cpp
+++ b/tdefile-plugins/ps/tdefile_ps.cpp
@@ -22,7 +22,7 @@
 
 #include <tqfile.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kgenericfactory.h>
 #include <kdebug.h>
 
diff --git a/tdefile-plugins/raw/kcamerarawplugin.cpp b/tdefile-plugins/raw/kcamerarawplugin.cpp
index a7a0cb27..6ac4759c 100644
--- a/tdefile-plugins/raw/kcamerarawplugin.cpp
+++ b/tdefile-plugins/raw/kcamerarawplugin.cpp
@@ -23,10 +23,10 @@
 #include <config.h>
 #endif
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kgenericfactory.h>
 #include <kdebug.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <kimageio.h>
 #include <tqfile.h>
 #include <tqimage.h>
diff --git a/tdefile-plugins/tga/tdefile_tga.cpp b/tdefile-plugins/tga/tdefile_tga.cpp
index 36fad13c..5263af48 100644
--- a/tdefile-plugins/tga/tdefile_tga.cpp
+++ b/tdefile-plugins/tga/tdefile_tga.cpp
@@ -21,7 +21,7 @@
 #include "tdefile_tga.h"
 
 #include <kprocess.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kgenericfactory.h>
 #include <kstringvalidator.h>
 #include <kdebug.h>
diff --git a/tdefile-plugins/xbm/tdefile_xbm.cpp b/tdefile-plugins/xbm/tdefile_xbm.cpp
index d4871d6f..1e9937a3 100644
--- a/tdefile-plugins/xbm/tdefile_xbm.cpp
+++ b/tdefile-plugins/xbm/tdefile_xbm.cpp
@@ -21,7 +21,7 @@
 #include "tdefile_xbm.h"
 
 #include <kprocess.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kgenericfactory.h>
 #include <kstringvalidator.h>
 #include <kdebug.h>
-- 
cgit v1.2.3