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/jpeg/exif.cpp         | 2 +-
 tdefile-plugins/jpeg/tdefile_jpeg.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'tdefile-plugins/jpeg')

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>
 
-- 
cgit v1.2.1