summaryrefslogtreecommitdiffstats
path: root/tdefile-plugins/jpeg
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-15 21:57:18 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-15 21:57:18 -0600
commit958d14ea303abe33fce2c259c1000f18171e4229 (patch)
tree61bc8236ab3aa4bc27ca205740322f8df50baff1 /tdefile-plugins/jpeg
parentb2de6514213d205907e8de3dd17f8eb80d868a4f (diff)
downloadtdegraphics-958d14ea303abe33fce2c259c1000f18171e4229.tar.gz
tdegraphics-958d14ea303abe33fce2c259c1000f18171e4229.zip
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'tdefile-plugins/jpeg')
-rw-r--r--tdefile-plugins/jpeg/exif.cpp2
-rw-r--r--tdefile-plugins/jpeg/tdefile_jpeg.cpp2
2 files changed, 2 insertions, 2 deletions
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>