summaryrefslogtreecommitdiffstats
path: root/karm/karm_part.cpp
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 /karm/karm_part.cpp
parent38b7daf1afffa515cf4880847c0d985f3c6ee753 (diff)
downloadtdepim-cfb328d59024a251690b6e47c9f8d343fd8c241c.tar.gz
tdepim-cfb328d59024a251690b6e47c9f8d343fd8c241c.zip
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'karm/karm_part.cpp')
-rw-r--r--karm/karm_part.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/karm/karm_part.cpp b/karm/karm_part.cpp
index 8d968ed7..b46202bf 100644
--- a/karm/karm_part.cpp
+++ b/karm/karm_part.cpp
@@ -12,8 +12,8 @@
#include <tdeaction.h>
#include <kstdaction.h>
#include <tdefiledialog.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
#include <tqfile.h>
#include <tqtextstream.h>
@@ -369,7 +369,7 @@ void karmPart::fileSaveAs()
// 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* karmPartFactory::s_instance = 0L;
TDEAboutData* karmPartFactory::s_about = 0L;