summaryrefslogtreecommitdiffstats
path: root/tderesources/scalix/kcal
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 /tderesources/scalix/kcal
parent38b7daf1afffa515cf4880847c0d985f3c6ee753 (diff)
downloadtdepim-cfb328d59024a251690b6e47c9f8d343fd8c241c.tar.gz
tdepim-cfb328d59024a251690b6e47c9f8d343fd8c241c.zip
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'tderesources/scalix/kcal')
-rw-r--r--tderesources/scalix/kcal/resourcescalix.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/tderesources/scalix/kcal/resourcescalix.cpp b/tderesources/scalix/kcal/resourcescalix.cpp
index b75fd6c9d..a58a85957 100644
--- a/tderesources/scalix/kcal/resourcescalix.cpp
+++ b/tderesources/scalix/kcal/resourcescalix.cpp
@@ -39,9 +39,9 @@
#include <dcopclient.h>
#include <libkcal/icalformat.h>
#include <libtdepim/kincidencechooser.h>
-#include <kabc/locknull.h>
+#include <tdeabc/locknull.h>
#include <tdemainwindow.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqobject.h>
#include <tqtimer.h>