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: [PATCH] Rename additional header files to avoid conflicts with KDE4

---
 kdiff3plugin/kdiff3plugin.cpp | 4 ++--
 src/diff.cpp                  | 4 ++--
 src/difftextwindow.cpp        | 2 +-
 src/directorymergewindow.cpp  | 4 ++--
 src/fileaccess.cpp            | 6 +++---
 src/kdiff3.cpp                | 6 +++---
 src/kdiff3_part.cpp           | 6 +++---
 src/kdiff3_shell.cpp          | 4 ++--
 src/main.cpp                  | 2 +-
 src/mergeresultwindow.cpp     | 4 ++--
 src/optiondialog.cpp          | 6 +++---
 src/pdiff.cpp                 | 4 ++--
 src/smalldialogs.cpp          | 2 +-
 13 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/kdiff3plugin/kdiff3plugin.cpp b/kdiff3plugin/kdiff3plugin.cpp
index 3142c98..a344091 100755
--- a/kdiff3plugin/kdiff3plugin.cpp
+++ b/kdiff3plugin/kdiff3plugin.cpp
@@ -23,11 +23,11 @@
 #include <tdeapplication.h>
 #include <kstandarddirs.h>
 #include <tdeaction.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kgenericfactory.h>
 #include <kurl.h>
 #include <ksimpleconfig.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 //#include <iostream>
 
diff --git a/src/diff.cpp b/src/diff.cpp
index feb1373..9475095 100644
--- a/src/diff.cpp
+++ b/src/diff.cpp
@@ -23,8 +23,8 @@
 #include "fileaccess.h"
 #include "optiondialog.h"
 
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 #include <tqfileinfo.h>
 #include <tqdir.h>
 #include <tqtextcodec.h>
diff --git a/src/difftextwindow.cpp b/src/difftextwindow.cpp
index 727579d..4f5f6dc 100644
--- a/src/difftextwindow.cpp
+++ b/src/difftextwindow.cpp
@@ -34,7 +34,7 @@
 #include <math.h>
 #include <cstdlib>
 #include <tqdragobject.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdefiledialog.h>
 
 class DiffTextWindowData
diff --git a/src/directorymergewindow.cpp b/src/directorymergewindow.cpp
index f3f9500..57f05aa 100644
--- a/src/directorymergewindow.cpp
+++ b/src/directorymergewindow.cpp
@@ -34,10 +34,10 @@
 #include <tqsplitter.h>
 #include <tqtextedit.h>
 #include <tqprogressdialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdefiledialog.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <iostream>
 #include <assert.h>
 //#include <konq_popupmenu.h>
diff --git a/src/fileaccess.cpp b/src/fileaccess.cpp
index 44f3037..4fe0952 100644
--- a/src/fileaccess.cpp
+++ b/src/fileaccess.cpp
@@ -12,7 +12,7 @@
 #include <iostream>
 #include <cstdlib>
 #include <tdeio/global.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include "optiondialog.h"
 #include <tqlayout.h>
 #include <tqlabel.h>
@@ -22,12 +22,12 @@
 #include <tqeventloop.h>
 
 #include "common.h"
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <tqdir.h>
 #include <tqregexp.h>
 #include <tqtextstream.h>
 #include <vector>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <sys/types.h>
 #include <sys/stat.h>
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>
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;
diff --git a/src/kdiff3_shell.cpp b/src/kdiff3_shell.cpp
index 8bcc460..2670d9a 100644
--- a/src/kdiff3_shell.cpp
+++ b/src/kdiff3_shell.cpp
@@ -31,9 +31,9 @@
 #include <kstdaction.h>
 
 #include <klibloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kstatusbar.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <iostream>
 
diff --git a/src/main.cpp b/src/main.cpp
index 3733e00..fee9f0e 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -17,7 +17,7 @@
 
 #include <tdecmdlineargs.h>
 #include <tdeaboutdata.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include "kdiff3_shell.h"
 #include <kstandarddirs.h>
 #include "version.h"
diff --git a/src/mergeresultwindow.cpp b/src/mergeresultwindow.cpp
index 760d794..f52d0a3 100644
--- a/src/mergeresultwindow.cpp
+++ b/src/mergeresultwindow.cpp
@@ -34,8 +34,8 @@
 #include <tqtextcodec.h>
 #include <tqdragobject.h>
 
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <iostream>
 
 int g_bAutoSolve = true;
diff --git a/src/optiondialog.cpp b/src/optiondialog.cpp
index 1bd4372..324edbe 100644
--- a/src/optiondialog.cpp
+++ b/src/optiondialog.cpp
@@ -37,9 +37,9 @@
 #include <kcolorbtn.h>
 #include <tdefontdialog.h> // For TDEFontChooser
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdemainwindow.h> //For tdetoolbar.h
 
 //#include <kkeydialog.h>
@@ -52,7 +52,7 @@
 #include <iostream>
 
 #ifndef KREPLACEMENTS_H
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #endif
 
 static TQString s_historyEntryStartRegExpToolTip;
diff --git a/src/pdiff.cpp b/src/pdiff.cpp
index 54f3ffb..25c042e 100644
--- a/src/pdiff.cpp
+++ b/src/pdiff.cpp
@@ -25,8 +25,8 @@
 #include <ctype.h>
 #include <tqaccel.h>
 
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <tdefontdialog.h>
 #include <kstatusbar.h>
 #include <kkeydialog.h>
diff --git a/src/smalldialogs.cpp b/src/smalldialogs.cpp
index f0d715b..da75242 100644
--- a/src/smalldialogs.cpp
+++ b/src/smalldialogs.cpp
@@ -35,7 +35,7 @@
 
 
 #include <tdefiledialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 // OpenDialog **************************************************************