summaryrefslogtreecommitdiffstats
path: root/libtdepim/komposer
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 /libtdepim/komposer
parent38b7daf1afffa515cf4880847c0d985f3c6ee753 (diff)
downloadtdepim-cfb328d59024a251690b6e47c9f8d343fd8c241c.tar.gz
tdepim-cfb328d59024a251690b6e47c9f8d343fd8c241c.zip
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'libtdepim/komposer')
-rw-r--r--libtdepim/komposer/core/core.cpp2
-rw-r--r--libtdepim/komposer/core/prefsmodule.cpp2
-rw-r--r--libtdepim/komposer/core/tests/main.cpp2
-rw-r--r--libtdepim/komposer/plugins/default/defaulteditor.cpp2
-rw-r--r--libtdepim/komposer/test/test.cpp2
5 files changed, 5 insertions, 5 deletions
diff --git a/libtdepim/komposer/core/core.cpp b/libtdepim/komposer/core/core.cpp
index acd798120..24a3b7d34 100644
--- a/libtdepim/komposer/core/core.cpp
+++ b/libtdepim/komposer/core/core.cpp
@@ -37,7 +37,7 @@
#include <kiconloader.h>
#include <kstandarddirs.h>
#include <tdeshortcut.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kstatusbar.h>
#include <kguiitem.h>
#include <tdepopupmenu.h>
diff --git a/libtdepim/komposer/core/prefsmodule.cpp b/libtdepim/komposer/core/prefsmodule.cpp
index 80b9951a2..3070b165d 100644
--- a/libtdepim/komposer/core/prefsmodule.cpp
+++ b/libtdepim/komposer/core/prefsmodule.cpp
@@ -24,7 +24,7 @@
#include <tdeaboutdata.h>
#include <kdebug.h>
#include <kcombobox.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <ktrader.h>
#include <tqlayout.h>
diff --git a/libtdepim/komposer/core/tests/main.cpp b/libtdepim/komposer/core/tests/main.cpp
index c59080ed4..d5fe826a9 100644
--- a/libtdepim/komposer/core/tests/main.cpp
+++ b/libtdepim/komposer/core/tests/main.cpp
@@ -22,7 +22,7 @@
#include <tdeaboutdata.h>
#include <tdeapplication.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdecmdlineargs.h>
#include <unistd.h>
diff --git a/libtdepim/komposer/plugins/default/defaulteditor.cpp b/libtdepim/komposer/plugins/default/defaulteditor.cpp
index a5e2ff696..82c04e3f9 100644
--- a/libtdepim/komposer/plugins/default/defaulteditor.cpp
+++ b/libtdepim/komposer/plugins/default/defaulteditor.cpp
@@ -31,7 +31,7 @@
#include <kcolordialog.h>
#include <tdefiledialog.h>
#include <kinstance.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kstdaction.h>
#include <kprinter.h>
#include <kfinddialog.h>
diff --git a/libtdepim/komposer/test/test.cpp b/libtdepim/komposer/test/test.cpp
index 40996d1e6..b5dfc63ad 100644
--- a/libtdepim/komposer/test/test.cpp
+++ b/libtdepim/komposer/test/test.cpp
@@ -24,7 +24,7 @@
#include <tdeaboutdata.h>
#include <tdecmdlineargs.h>
#include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kuniqueapplication.h>
#include <tqlabel.h>