summaryrefslogtreecommitdiffstats
path: root/ktnef/gui
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-15 21:59:38 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-15 21:59:38 -0600
commitcfb328d59024a251690b6e47c9f8d343fd8c241c (patch)
tree7c11070cd07e5e023a26ddcfa41832c208c63732 /ktnef/gui
parent38b7daf1afffa515cf4880847c0d985f3c6ee753 (diff)
downloadtdepim-cfb328d59024a251690b6e47c9f8d343fd8c241c.tar.gz
tdepim-cfb328d59024a251690b6e47c9f8d343fd8c241c.zip
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'ktnef/gui')
-rw-r--r--ktnef/gui/attachpropertydialog.cpp4
-rw-r--r--ktnef/gui/ktnefmain.cpp6
-rw-r--r--ktnef/gui/ktnefview.cpp2
-rw-r--r--ktnef/gui/main.cpp2
-rw-r--r--ktnef/gui/messagepropertydialog.cpp2
5 files changed, 8 insertions, 8 deletions
diff --git a/ktnef/gui/attachpropertydialog.cpp b/ktnef/gui/attachpropertydialog.cpp
index c62001e5..73b20871 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 4db5013f..a689d47b 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 b06a8d6a..a28a7d51 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 c68fd3e6..4a16a8c8 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 ba4dad91..ad610617 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" ),