From dbf3ee6a200368cbe33ce33f06a1534aa5de241b Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 15 Feb 2013 21:45:50 -0600
Subject: Rename additional header files to avoid conflicts with KDE4

---
 src/kdiff3_part.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/kdiff3_part.cpp')

diff --git a/src/kdiff3_part.cpp b/src/kdiff3_part.cpp
index eb0fe8a..e611425 100644
--- a/src/kdiff3_part.cpp
+++ b/src/kdiff3_part.cpp
@@ -29,8 +29,8 @@
 #include "kdiff3.h"
 #include "fileaccess.h"
 
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 #include <iostream>
 
 #include "version.h"
@@ -252,7 +252,7 @@ bool KDiff3Part::saveFile()
 // It's usually safe to leave the factory code alone.. with the
 // notable exception of the TDEAboutData data
 #include <tdeaboutdata.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 TDEInstance*  KDiff3PartFactory::s_instance = 0L;
 TDEAboutData* KDiff3PartFactory::s_about = 0L;
-- 
cgit v1.2.3