summaryrefslogtreecommitdiffstats
path: root/src/kdiff3.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-02-15 21:45:50 -0600
committerTimothy Pearson <[email protected]>2013-02-15 21:45:50 -0600
commitdbf3ee6a200368cbe33ce33f06a1534aa5de241b (patch)
tree5a4e7bffa0a86437e9b6e099497468113e63fa96 /src/kdiff3.cpp
parent5d58fe4201cc465d1bc54f4c9530c653af7809a8 (diff)
downloadkdiff3-dbf3ee6a200368cbe33ce33f06a1534aa5de241b.tar.gz
kdiff3-dbf3ee6a200368cbe33ce33f06a1534aa5de241b.zip
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'src/kdiff3.cpp')
-rw-r--r--src/kdiff3.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/kdiff3.cpp b/src/kdiff3.cpp
index 9922812..7343e1e 100644
--- a/src/kdiff3.cpp
+++ b/src/kdiff3.cpp
@@ -36,11 +36,11 @@
// include files for KDE
#include <kiconloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <tdefiledialog.h>
-#include <kmenubar.h>
+#include <tdemenubar.h>
#include <kstatusbar.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeconfig.h>
#include <kstdaction.h>
#include <tdecmdlineargs.h>