summaryrefslogtreecommitdiffstats
path: root/tderesources/egroupware
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/egroupware
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/egroupware')
-rw-r--r--tderesources/egroupware/kabc_egroupwareprefs.kcfgc2
-rw-r--r--tderesources/egroupware/kabc_resourcexmlrpc.cpp2
-rw-r--r--tderesources/egroupware/kcal_egroupwareprefs.kcfgc2
-rw-r--r--tderesources/egroupware/kcal_resourcexmlrpc.h2
-rw-r--r--tderesources/egroupware/knotes_egroupwareprefs.kcfgc2
-rw-r--r--tderesources/egroupware/knotes_resourcexmlrpc.h2
-rw-r--r--tderesources/egroupware/xmlrpciface.cpp2
7 files changed, 7 insertions, 7 deletions
diff --git a/tderesources/egroupware/kabc_egroupwareprefs.kcfgc b/tderesources/egroupware/kabc_egroupwareprefs.kcfgc
index 599001bbd..10adb19b2 100644
--- a/tderesources/egroupware/kabc_egroupwareprefs.kcfgc
+++ b/tderesources/egroupware/kabc_egroupwareprefs.kcfgc
@@ -1,4 +1,4 @@
-# Code generation options for kconfig_compiler
+# Code generation options for tdeconfig_compiler
File=tderesources_kabc_egroupware.kcfg
ClassName=EGroupwarePrefs
NameSpace=KABC
diff --git a/tderesources/egroupware/kabc_resourcexmlrpc.cpp b/tderesources/egroupware/kabc_resourcexmlrpc.cpp
index 84e783827..39e3aac14 100644
--- a/tderesources/egroupware/kabc_resourcexmlrpc.cpp
+++ b/tderesources/egroupware/kabc_resourcexmlrpc.cpp
@@ -22,7 +22,7 @@
#include <kabc/addressee.h>
#include <kabprefs.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
#include <kdebug.h>
#include <klocale.h>
#include <kmdcodec.h>
diff --git a/tderesources/egroupware/kcal_egroupwareprefs.kcfgc b/tderesources/egroupware/kcal_egroupwareprefs.kcfgc
index 6c9f6d4d3..4eb0e394a 100644
--- a/tderesources/egroupware/kcal_egroupwareprefs.kcfgc
+++ b/tderesources/egroupware/kcal_egroupwareprefs.kcfgc
@@ -1,4 +1,4 @@
-# Code generation options for kconfig_compiler
+# Code generation options for tdeconfig_compiler
File=tderesources_kcal_egroupware.kcfg
ClassName=EGroupwarePrefs
NameSpace=KCal
diff --git a/tderesources/egroupware/kcal_resourcexmlrpc.h b/tderesources/egroupware/kcal_resourcexmlrpc.h
index 5253babaa..9be4662fb 100644
--- a/tderesources/egroupware/kcal_resourcexmlrpc.h
+++ b/tderesources/egroupware/kcal_resourcexmlrpc.h
@@ -26,7 +26,7 @@
#include <tqptrlist.h>
#include <tqstring.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
#include <kurl.h>
#include <tdepimmacros.h>
diff --git a/tderesources/egroupware/knotes_egroupwareprefs.kcfgc b/tderesources/egroupware/knotes_egroupwareprefs.kcfgc
index 6c3fbdffe..70adfc55d 100644
--- a/tderesources/egroupware/knotes_egroupwareprefs.kcfgc
+++ b/tderesources/egroupware/knotes_egroupwareprefs.kcfgc
@@ -1,4 +1,4 @@
-# Code generation options for kconfig_compiler
+# Code generation options for tdeconfig_compiler
File=tderesources_knotes_egroupware.kcfg
ClassName=EGroupwarePrefs
NameSpace=KNotes
diff --git a/tderesources/egroupware/knotes_resourcexmlrpc.h b/tderesources/egroupware/knotes_resourcexmlrpc.h
index df8a4dd36..3550aed48 100644
--- a/tderesources/egroupware/knotes_resourcexmlrpc.h
+++ b/tderesources/egroupware/knotes_resourcexmlrpc.h
@@ -25,7 +25,7 @@
#include <tqptrlist.h>
#include <tqstring.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
#include <kurl.h>
#include <tdepimmacros.h>
diff --git a/tderesources/egroupware/xmlrpciface.cpp b/tderesources/egroupware/xmlrpciface.cpp
index d43613e65..7af9814a1 100644
--- a/tderesources/egroupware/xmlrpciface.cpp
+++ b/tderesources/egroupware/xmlrpciface.cpp
@@ -11,7 +11,7 @@
#include <tqfile.h>
#include <kdebug.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
#include <klocale.h>
#include <kmdcodec.h>