summaryrefslogtreecommitdiffstats
path: root/kompare/komparepart/komparelistview.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-02-15 21:59:53 -0600
committerTimothy Pearson <[email protected]>2013-02-15 21:59:53 -0600
commit508a49f9ef02a7b03411c8e9953ba79c99b91c0c (patch)
tree1df40da8f05d010a3e175c3d48e3529cccf2e067 /kompare/komparepart/komparelistview.cpp
parent19cea58302be2d15b10b106c80ff82f7b5a2fa79 (diff)
downloadtdesdk-508a49f9ef02a7b03411c8e9953ba79c99b91c0c.tar.gz
tdesdk-508a49f9ef02a7b03411c8e9953ba79c99b91c0c.zip
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'kompare/komparepart/komparelistview.cpp')
-rw-r--r--kompare/komparepart/komparelistview.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/kompare/komparepart/komparelistview.cpp b/kompare/komparepart/komparelistview.cpp
index 77158e9f..31b946bd 100644
--- a/kompare/komparepart/komparelistview.cpp
+++ b/kompare/komparepart/komparelistview.cpp
@@ -25,8 +25,8 @@
#include <tqtimer.h>
#include <kdebug.h>
-#include <kglobal.h>
-#include <kglobalsettings.h>
+#include <tdeglobal.h>
+#include <tdeglobalsettings.h>
#include "diffmodel.h"
#include "diffhunk.h"