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

---
 kmailcvt/filter_evolution.cxx     | 4 ++--
 kmailcvt/filter_evolution_v2.cxx  | 4 ++--
 kmailcvt/filter_kmail_archive.cxx | 2 +-
 kmailcvt/filter_kmail_maildir.cxx | 2 +-
 kmailcvt/filter_lnotes.cxx        | 4 ++--
 kmailcvt/filter_mailapp.cxx       | 4 ++--
 kmailcvt/filter_mbox.cxx          | 4 ++--
 kmailcvt/filter_oe.cxx            | 4 ++--
 kmailcvt/filter_opera.cxx         | 4 ++--
 kmailcvt/filter_outlook.cxx       | 4 ++--
 kmailcvt/filter_plain.cxx         | 2 +-
 kmailcvt/filter_pmail.cxx         | 4 ++--
 kmailcvt/filter_sylpheed.cxx      | 2 +-
 kmailcvt/filter_thebat.cxx        | 6 +++---
 kmailcvt/filter_thunderbird.cxx   | 4 ++--
 kmailcvt/filters.cxx              | 4 ++--
 kmailcvt/kselfilterpage.cpp       | 2 +-
 17 files changed, 30 insertions(+), 30 deletions(-)

(limited to 'kmailcvt')

diff --git a/kmailcvt/filter_evolution.cxx b/kmailcvt/filter_evolution.cxx
index 017385d4f..b4443d143 100644
--- a/kmailcvt/filter_evolution.cxx
+++ b/kmailcvt/filter_evolution.cxx
@@ -21,9 +21,9 @@
 #include "filter_evolution.hxx"
 
 #include <config.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdefiledialog.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 
 
 /** Default constructor. */
diff --git a/kmailcvt/filter_evolution_v2.cxx b/kmailcvt/filter_evolution_v2.cxx
index 34192f6a5..b6ee8a577 100644
--- a/kmailcvt/filter_evolution_v2.cxx
+++ b/kmailcvt/filter_evolution_v2.cxx
@@ -19,9 +19,9 @@
 #include "filter_evolution_v2.hxx"
 
 #include <config.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdefiledialog.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 
 
 /** Default constructor. */
diff --git a/kmailcvt/filter_kmail_archive.cxx b/kmailcvt/filter_kmail_archive.cxx
index 2fca99bdc..3c7c20d00 100644
--- a/kmailcvt/filter_kmail_archive.cxx
+++ b/kmailcvt/filter_kmail_archive.cxx
@@ -18,7 +18,7 @@
 */
 #include "filter_kmail_archive.hxx"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 FilterKMailArchive::FilterKMailArchive()
   : Filter( i18n( "Import KMail Archive File" ),
diff --git a/kmailcvt/filter_kmail_maildir.cxx b/kmailcvt/filter_kmail_maildir.cxx
index 9305e6448..9d642814d 100644
--- a/kmailcvt/filter_kmail_maildir.cxx
+++ b/kmailcvt/filter_kmail_maildir.cxx
@@ -18,7 +18,7 @@
 #include "filter_kmail_maildir.hxx"
 
 #include <config.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdefiledialog.h>
 
 /** Default constructor. */
diff --git a/kmailcvt/filter_lnotes.cxx b/kmailcvt/filter_lnotes.cxx
index 8d987d0db..af92e1b41 100644
--- a/kmailcvt/filter_lnotes.cxx
+++ b/kmailcvt/filter_lnotes.cxx
@@ -17,9 +17,9 @@
 
 #include <config.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdefiledialog.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <kdebug.h>
 #include <tqfileinfo.h>
 
diff --git a/kmailcvt/filter_mailapp.cxx b/kmailcvt/filter_mailapp.cxx
index 51df32359..fded411da 100644
--- a/kmailcvt/filter_mailapp.cxx
+++ b/kmailcvt/filter_mailapp.cxx
@@ -21,9 +21,9 @@
 
 
 #include <config.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdefiledialog.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <kdebug.h>
 
 #include "filter_mailapp.hxx"
diff --git a/kmailcvt/filter_mbox.cxx b/kmailcvt/filter_mbox.cxx
index 78bfec072..19afccf22 100644
--- a/kmailcvt/filter_mbox.cxx
+++ b/kmailcvt/filter_mbox.cxx
@@ -16,9 +16,9 @@
  ***************************************************************************/
 
 #include <config.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdefiledialog.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <kdebug.h>
 
 #include "filter_mbox.hxx"
diff --git a/kmailcvt/filter_oe.cxx b/kmailcvt/filter_oe.cxx
index 22c7a615a..afd96527b 100644
--- a/kmailcvt/filter_oe.cxx
+++ b/kmailcvt/filter_oe.cxx
@@ -20,9 +20,9 @@
 // This filter was created by looking at libdbx & liboe
 
 #include <config.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdefiledialog.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <kdebug.h>
 
 #include "filter_oe.hxx"
diff --git a/kmailcvt/filter_opera.cxx b/kmailcvt/filter_opera.cxx
index 784c0b101..90aef3820 100644
--- a/kmailcvt/filter_opera.cxx
+++ b/kmailcvt/filter_opera.cxx
@@ -16,9 +16,9 @@
  ***************************************************************************/
 
 #include <config.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdefiledialog.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <kdebug.h>
 
 #include "filter_opera.hxx"
diff --git a/kmailcvt/filter_outlook.cxx b/kmailcvt/filter_outlook.cxx
index 63d2848b1..10483d090 100644
--- a/kmailcvt/filter_outlook.cxx
+++ b/kmailcvt/filter_outlook.cxx
@@ -17,9 +17,9 @@
 
 
 #include <config.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdefiledialog.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <kdebug.h>
 
 #include "filter_outlook.hxx"
diff --git a/kmailcvt/filter_plain.cxx b/kmailcvt/filter_plain.cxx
index b29d13389..9f78b939c 100644
--- a/kmailcvt/filter_plain.cxx
+++ b/kmailcvt/filter_plain.cxx
@@ -16,7 +16,7 @@
  ***************************************************************************/
 
 #include <config.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdefiledialog.h>
 #include <libgen.h>
 
diff --git a/kmailcvt/filter_pmail.cxx b/kmailcvt/filter_pmail.cxx
index d79c8f4b7..e48e062de 100644
--- a/kmailcvt/filter_pmail.cxx
+++ b/kmailcvt/filter_pmail.cxx
@@ -18,10 +18,10 @@
  ***************************************************************************/
 
 #include <config.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdefiledialog.h>
 #include <tqregexp.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <kdebug.h>
 
 #include "filter_pmail.hxx"
diff --git a/kmailcvt/filter_sylpheed.cxx b/kmailcvt/filter_sylpheed.cxx
index af03a0990..1fc008d42 100644
--- a/kmailcvt/filter_sylpheed.cxx
+++ b/kmailcvt/filter_sylpheed.cxx
@@ -18,7 +18,7 @@
 #include "filter_sylpheed.hxx"
 
 #include <config.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdefiledialog.h>
 #include <kdebug.h>
 
diff --git a/kmailcvt/filter_thebat.cxx b/kmailcvt/filter_thebat.cxx
index 499caedba..eaf16461a 100644
--- a/kmailcvt/filter_thebat.cxx
+++ b/kmailcvt/filter_thebat.cxx
@@ -22,11 +22,11 @@
 #include <tqregexp.h>
 #include <tqvaluelist.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdefiledialog.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 /** Default constructor. */
 FilterTheBat::FilterTheBat( void ) :
diff --git a/kmailcvt/filter_thunderbird.cxx b/kmailcvt/filter_thunderbird.cxx
index d92e7efdf..50f6355f3 100644
--- a/kmailcvt/filter_thunderbird.cxx
+++ b/kmailcvt/filter_thunderbird.cxx
@@ -18,9 +18,9 @@
 #include "filter_thunderbird.hxx"
 
 #include <config.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdefiledialog.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 
 
 /** Default constructor. */
diff --git a/kmailcvt/filters.cxx b/kmailcvt/filters.cxx
index 78728d2c3..d7af77059 100644
--- a/kmailcvt/filters.cxx
+++ b/kmailcvt/filters.cxx
@@ -15,8 +15,8 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 #include <dcopclient.h>
 #include <dcopref.h>
 #include <kurl.h>
diff --git a/kmailcvt/kselfilterpage.cpp b/kmailcvt/kselfilterpage.cpp
index b8af0d0b3..7d97fcfd9 100644
--- a/kmailcvt/kselfilterpage.cpp
+++ b/kmailcvt/kselfilterpage.cpp
@@ -18,7 +18,7 @@
 #include <kstandarddirs.h>
 #include <tqtextedit.h>
 #include <tqcheckbox.h> 
-#include <klocale.h>
+#include <tdelocale.h>
 #include "filters.hxx"
 
 #include "filter_mbox.hxx"
-- 
cgit v1.2.1