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

---
 ktnef/gui/attachpropertydialog.cpp  | 4 ++--
 ktnef/gui/ktnefmain.cpp             | 6 +++---
 ktnef/gui/ktnefview.cpp             | 2 +-
 ktnef/gui/main.cpp                  | 2 +-
 ktnef/gui/messagepropertydialog.cpp | 2 +-
 ktnef/lib/mapi.cpp                  | 2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'ktnef')

diff --git a/ktnef/gui/attachpropertydialog.cpp b/ktnef/gui/attachpropertydialog.cpp
index c62001e56..73b208715 100644
--- a/ktnef/gui/attachpropertydialog.cpp
+++ b/ktnef/gui/attachpropertydialog.cpp
@@ -26,8 +26,8 @@
 #include <tdelistview.h>
 #include <kmimetype.h>
 #include <kdebug.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <tdefiledialog.h>
 #include <tqbuffer.h>
 #include <tqdatastream.h>
diff --git a/ktnef/gui/ktnefmain.cpp b/ktnef/gui/ktnefmain.cpp
index 4db5013fc..a689d47ba 100644
--- a/ktnef/gui/ktnefmain.cpp
+++ b/ktnef/gui/ktnefmain.cpp
@@ -27,7 +27,7 @@
 
 #include <tqpopupmenu.h>
 #include <tdelistview.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeapplication.h>
 #include <kiconloader.h>
 #include <tqpixmap.h>
@@ -36,12 +36,12 @@
 #include <tdefiledialog.h>
 #include <tqdir.h>
 #include <kprocess.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 #include <tdeaction.h>
 #include <kstdaction.h>
 #include <kdialogbase.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <kkeydialog.h>
 
 #ifdef KDE_NO_COMPAT
diff --git a/ktnef/gui/ktnefview.cpp b/ktnef/gui/ktnefview.cpp
index b06a8d6a2..a28a7d51f 100644
--- a/ktnef/gui/ktnefview.cpp
+++ b/ktnef/gui/ktnefview.cpp
@@ -25,7 +25,7 @@
 
 #include <tdeapplication.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 #include <kmimetype.h>
diff --git a/ktnef/gui/main.cpp b/ktnef/gui/main.cpp
index c68fd3e6f..4a16a8c83 100644
--- a/ktnef/gui/main.cpp
+++ b/ktnef/gui/main.cpp
@@ -17,7 +17,7 @@
 
 #include <tdecmdlineargs.h>
 #include <tdeaboutdata.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeapplication.h>
 
 #include "ktnefmain.h"
diff --git a/ktnef/gui/messagepropertydialog.cpp b/ktnef/gui/messagepropertydialog.cpp
index ba4dad91f..ad6106172 100644
--- a/ktnef/gui/messagepropertydialog.cpp
+++ b/ktnef/gui/messagepropertydialog.cpp
@@ -20,7 +20,7 @@
 #include "ktnef/ktnefmessage.h"
 
 #include <tdelistview.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 MessagePropertyDialog::MessagePropertyDialog( TQWidget *parent, KTNEFMessage *msg )
 	: KDialogBase( parent, "MessagePropertyDialog", true, i18n( "Message Properties" ),
diff --git a/ktnef/lib/mapi.cpp b/ktnef/lib/mapi.cpp
index 449c41770..486ea84ea 100644
--- a/ktnef/lib/mapi.cpp
+++ b/ktnef/lib/mapi.cpp
@@ -17,7 +17,7 @@
 
 #include "mapi.h"
 #include <tqmap.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 static struct
 {
-- 
cgit v1.2.1