summaryrefslogtreecommitdiffstats
path: root/tderesources/caldav
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-27 01:05:15 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-27 01:05:15 -0600
commit64df902cf71a8ee258fb85f6be26248f399aa01f (patch)
treedba58f705042c22cea26b678d5b0e4e9a34bf202 /tderesources/caldav
parentde53c98cab07e9c4b0f5e25dab82830fb6fc67ec (diff)
downloadtdepim-64df902cf71a8ee258fb85f6be26248f399aa01f.tar.gz
tdepim-64df902cf71a8ee258fb85f6be26248f399aa01f.zip
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'tderesources/caldav')
-rw-r--r--tderesources/caldav/prefsskel.kcfgc2
-rw-r--r--tderesources/caldav/resource.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/tderesources/caldav/prefsskel.kcfgc b/tderesources/caldav/prefsskel.kcfgc
index b6b3aae0b..4406dc794 100644
--- a/tderesources/caldav/prefsskel.kcfgc
+++ b/tderesources/caldav/prefsskel.kcfgc
@@ -1,4 +1,4 @@
-# Code generation options for kconfig_compiler
+# Code generation options for tdeconfig_compiler
File=prefsskel.kcfg
ClassName=CalDavPrefsSkel
NameSpace=KCal
diff --git a/tderesources/caldav/resource.h b/tderesources/caldav/resource.h
index ea04ef483..ee5805327 100644
--- a/tderesources/caldav/resource.h
+++ b/tderesources/caldav/resource.h
@@ -27,7 +27,7 @@
#include <kabc/locknull.h>
#include <tdepimmacros.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
namespace KCal {