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

---
 parts/diff/diffdlg.cpp    | 2 +-
 parts/diff/diffpart.cpp   | 4 ++--
 parts/diff/diffwidget.cpp | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'parts/diff')

diff --git a/parts/diff/diffdlg.cpp b/parts/diff/diffdlg.cpp
index 1974f39e..3fd4b666 100644
--- a/parts/diff/diffdlg.cpp
+++ b/parts/diff/diffdlg.cpp
@@ -11,7 +11,7 @@
 
 #include <tqlayout.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
  
 #include "diffdlg.h"
 #include "diffwidget.h"
diff --git a/parts/diff/diffpart.cpp b/parts/diff/diffpart.cpp
index 3861f202..70e676c8 100644
--- a/parts/diff/diffpart.cpp
+++ b/parts/diff/diffpart.cpp
@@ -15,7 +15,7 @@
 #include <tqwhatsthis.h>
 #include <tqpopupmenu.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdevgenericfactory.h>
 #include <tdeaction.h>
 #include <tdefiledialog.h>
@@ -24,7 +24,7 @@
 #include <tdeio/job.h>
 #include <tdeparts/part.h>
 #include <tdetexteditor/editinterface.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kdebug.h>
 #include <kiconloader.h>
 
diff --git a/parts/diff/diffwidget.cpp b/parts/diff/diffwidget.cpp
index a7ab3077..b766b064 100644
--- a/parts/diff/diffwidget.cpp
+++ b/parts/diff/diffwidget.cpp
@@ -17,13 +17,13 @@
 
 #include <tdeconfig.h>
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kservice.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <tdepopupmenu.h>
 #include <kiconloader.h>
 #include <tdefiledialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include <tdeparts/componentfactory.h>
 #include <tdeparts/part.h>
-- 
cgit v1.2.3