summaryrefslogtreecommitdiffstats
path: root/tdefile-plugins
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-15 21:59:53 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-15 21:59:53 -0600
commit508a49f9ef02a7b03411c8e9953ba79c99b91c0c (patch)
tree1df40da8f05d010a3e175c3d48e3529cccf2e067 /tdefile-plugins
parent19cea58302be2d15b10b106c80ff82f7b5a2fa79 (diff)
downloadtdesdk-508a49f9ef02a7b03411c8e9953ba79c99b91c0c.tar.gz
tdesdk-508a49f9ef02a7b03411c8e9953ba79c99b91c0c.zip
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'tdefile-plugins')
-rw-r--r--tdefile-plugins/c++/tdefile_cpp.cpp2
-rw-r--r--tdefile-plugins/diff/tdefile_diff.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/tdefile-plugins/c++/tdefile_cpp.cpp b/tdefile-plugins/c++/tdefile_cpp.cpp
index 31f777df..9adf3f89 100644
--- a/tdefile-plugins/c++/tdefile_cpp.cpp
+++ b/tdefile-plugins/c++/tdefile_cpp.cpp
@@ -20,7 +20,7 @@
#include "tdefile_cpp.h"
#include <kurl.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kgenericfactory.h>
#include <kdebug.h>
diff --git a/tdefile-plugins/diff/tdefile_diff.cpp b/tdefile-plugins/diff/tdefile_diff.cpp
index 2edee0a7..51807ee2 100644
--- a/tdefile-plugins/diff/tdefile_diff.cpp
+++ b/tdefile-plugins/diff/tdefile_diff.cpp
@@ -36,7 +36,7 @@
#include <kdebug.h>
#include <kgenericfactory.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kprocess.h>
#include <kurl.h>