summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--tderesources/birthdays/Makefile.am6
-rw-r--r--tderesources/carddav/plugin.cpp2
-rw-r--r--tderesources/carddav/tdeabc_carddav.desktop (renamed from tderesources/carddav/kabc_carddav.desktop)0
-rw-r--r--tderesources/egroupware/tdeabc_egroupwareprefs.kcfgc (renamed from tderesources/egroupware/kabc_egroupwareprefs.kcfgc)2
-rw-r--r--tderesources/egroupware/tdeabc_resourcexmlrpc.cpp (renamed from tderesources/egroupware/kabc_resourcexmlrpc.cpp)0
-rw-r--r--tderesources/egroupware/tdeabc_resourcexmlrpc.h (renamed from tderesources/egroupware/kabc_resourcexmlrpc.h)0
-rw-r--r--tderesources/egroupware/tdeabc_resourcexmlrpcconfig.cpp (renamed from tderesources/egroupware/kabc_resourcexmlrpcconfig.cpp)0
-rw-r--r--tderesources/egroupware/tdeabc_resourcexmlrpcconfig.h (renamed from tderesources/egroupware/kabc_resourcexmlrpcconfig.h)0
-rw-r--r--tderesources/egroupware/tdeabc_resourcexmlrpcplugin.cpp (renamed from tderesources/egroupware/kabc_resourcexmlrpcplugin.cpp)2
-rw-r--r--tderesources/egroupware/tdeabc_xmlrpc.desktop (renamed from tderesources/egroupware/kabc_xmlrpc.desktop)0
-rw-r--r--tderesources/egroupware/tderesources_tdeabc_egroupware.kcfg (renamed from tderesources/egroupware/tderesources_kabc_egroupware.kcfg)2
-rw-r--r--tderesources/groupdav/tdeabc_groupdav.desktop (renamed from tderesources/groupdav/kabc_groupdav.desktop)0
-rw-r--r--tderesources/groupdav/tdeabc_resourcegroupdav.cpp (renamed from tderesources/groupdav/kabc_resourcegroupdav.cpp)0
-rw-r--r--tderesources/groupdav/tdeabc_resourcegroupdav.h (renamed from tderesources/groupdav/kabc_resourcegroupdav.h)0
-rw-r--r--tderesources/groupdav/tdeabc_resourcegroupdav_plugin.cpp (renamed from tderesources/groupdav/kabc_resourcegroupdav_plugin.cpp)2
-rw-r--r--tderesources/groupware/tdeabc_groupware.desktop (renamed from tderesources/groupware/kabc_groupware.desktop)0
-rw-r--r--tderesources/groupware/tdeabc_groupwareprefs.kcfgc (renamed from tderesources/groupware/kabc_groupwareprefs.kcfgc)2
-rw-r--r--tderesources/groupware/tdeabc_resourcegroupware.cpp (renamed from tderesources/groupware/kabc_resourcegroupware.cpp)0
-rw-r--r--tderesources/groupware/tdeabc_resourcegroupware.h (renamed from tderesources/groupware/kabc_resourcegroupware.h)0
-rw-r--r--tderesources/groupware/tdeabc_resourcegroupware_plugin.cpp (renamed from tderesources/groupware/kabc_resourcegroupware_plugin.cpp)2
-rw-r--r--tderesources/groupware/tdeabc_resourcegroupwareconfig.cpp (renamed from tderesources/groupware/kabc_resourcegroupwareconfig.cpp)0
-rw-r--r--tderesources/groupware/tdeabc_resourcegroupwareconfig.h (renamed from tderesources/groupware/kabc_resourcegroupwareconfig.h)0
-rw-r--r--tderesources/groupware/tderesources_tdeabc_groupware.kcfg (renamed from tderesources/groupware/tderesources_kabc_groupware.kcfg)2
-rw-r--r--tderesources/groupwise/tdeabc_groupwise.desktop (renamed from tderesources/groupwise/kabc_groupwise.desktop)0
-rw-r--r--tderesources/groupwise/tdeabc_groupwiseprefs.kcfgc (renamed from tderesources/groupwise/kabc_groupwiseprefs.kcfgc)2
-rw-r--r--tderesources/groupwise/tdeabc_resourcegroupwise.cpp (renamed from tderesources/groupwise/kabc_resourcegroupwise.cpp)0
-rw-r--r--tderesources/groupwise/tdeabc_resourcegroupwise.h (renamed from tderesources/groupwise/kabc_resourcegroupwise.h)0
-rw-r--r--tderesources/groupwise/tdeabc_resourcegroupwise_plugin.cpp (renamed from tderesources/groupwise/kabc_resourcegroupwise_plugin.cpp)2
-rw-r--r--tderesources/groupwise/tdeabc_resourcegroupwiseconfig.cpp (renamed from tderesources/groupwise/kabc_resourcegroupwiseconfig.cpp)0
-rw-r--r--tderesources/groupwise/tdeabc_resourcegroupwiseconfig.h (renamed from tderesources/groupwise/kabc_resourcegroupwiseconfig.h)0
-rw-r--r--tderesources/groupwise/tderesources_tdeabc_groupwise.kcfg (renamed from tderesources/groupwise/tderesources_kabc_groupwise.kcfg)2
-rw-r--r--tderesources/lib/tdeabc_resourcegroupwarebase.cpp (renamed from tderesources/lib/kabc_resourcegroupwarebase.cpp)0
-rw-r--r--tderesources/lib/tdeabc_resourcegroupwarebase.h (renamed from tderesources/lib/kabc_resourcegroupwarebase.h)0
-rw-r--r--tderesources/lib/tdeabc_resourcegroupwarebaseconfig.cpp (renamed from tderesources/lib/kabc_resourcegroupwarebaseconfig.cpp)0
-rw-r--r--tderesources/lib/tdeabc_resourcegroupwarebaseconfig.h (renamed from tderesources/lib/kabc_resourcegroupwarebaseconfig.h)0
-rw-r--r--tderesources/newexchange/tdeabc_newexchange.desktop (renamed from tderesources/newexchange/kabc_newexchange.desktop)0
-rw-r--r--tderesources/newexchange/tdeabc_newexchange_final.desktop (renamed from tderesources/newexchange/kabc_newexchange_final.desktop)0
-rw-r--r--tderesources/newexchange/tdeabc_resourceexchange.cpp (renamed from tderesources/newexchange/kabc_resourceexchange.cpp)0
-rw-r--r--tderesources/newexchange/tdeabc_resourceexchange.h (renamed from tderesources/newexchange/kabc_resourceexchange.h)0
-rw-r--r--tderesources/newexchange/tdeabc_resourceexchange_plugin.cpp (renamed from tderesources/newexchange/kabc_resourceexchange_plugin.cpp)0
-rw-r--r--tderesources/slox/kabcresourceslox.cpp8
-rw-r--r--tderesources/slox/kabcresourceslox_plugin.cpp2
-rw-r--r--tderesources/slox/kabcsloxprefs.kcfgc2
-rw-r--r--tderesources/slox/tdeabc_ox.desktop (renamed from tderesources/slox/kabc_ox.desktop)0
-rw-r--r--tderesources/slox/tdeabc_slox.desktop (renamed from tderesources/slox/kabc_slox.desktop)0
-rw-r--r--tderesources/slox/tderesources_tdeabc_slox.kcfg (renamed from tderesources/slox/tderesources_kabc_slox.kcfg)2
46 files changed, 21 insertions, 21 deletions
diff --git a/tderesources/birthdays/Makefile.am b/tderesources/birthdays/Makefile.am
index 6a5830052..c31fc0472 100644
--- a/tderesources/birthdays/Makefile.am
+++ b/tderesources/birthdays/Makefile.am
@@ -5,9 +5,9 @@ INCLUDES = -I$(top_srcdir) -I$(top_builddir) \
kde_module_LTLIBRARIES = kcal_kabc.la
-kcal_kabc_la_SOURCES = resourcekabc.cpp resourcekabcconfig.cpp
-kcal_kabc_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
-kcal_kabc_la_LIBADD = $(top_builddir)/libkcal/libkcal.la \
+kcal_tdeabc_la_SOURCES = resourcekabc.cpp resourcekabcconfig.cpp
+kcal_tdeabc_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+kcal_tdeabc_la_LIBADD = $(top_builddir)/libkcal/libkcal.la \
$(top_builddir)/kaddressbook/common/libkabcommon.la
libkcalincludedir = $(includedir)/libkcal
diff --git a/tderesources/carddav/plugin.cpp b/tderesources/carddav/plugin.cpp
index 9079ecd33..8b19e49a0 100644
--- a/tderesources/carddav/plugin.cpp
+++ b/tderesources/carddav/plugin.cpp
@@ -36,7 +36,7 @@ typedef KRES::PluginFactory<ResourceCardDav, ResourceCardDavConfig> CardDavFacto
extern "C"
{
- void *init_kabc_carddav()
+ void *init_tdeabc_carddav()
{
TDEGlobal::locale()->insertCatalogue( "tdepimresources" );
TDEGlobal::locale()->insertCatalogue( "kres_caldav" );
diff --git a/tderesources/carddav/kabc_carddav.desktop b/tderesources/carddav/tdeabc_carddav.desktop
index 585d11b36..585d11b36 100644
--- a/tderesources/carddav/kabc_carddav.desktop
+++ b/tderesources/carddav/tdeabc_carddav.desktop
diff --git a/tderesources/egroupware/kabc_egroupwareprefs.kcfgc b/tderesources/egroupware/tdeabc_egroupwareprefs.kcfgc
index 10adb19b2..50c0d2394 100644
--- a/tderesources/egroupware/kabc_egroupwareprefs.kcfgc
+++ b/tderesources/egroupware/tdeabc_egroupwareprefs.kcfgc
@@ -1,5 +1,5 @@
# Code generation options for tdeconfig_compiler
-File=tderesources_kabc_egroupware.kcfg
+File=tderesources_tdeabc_egroupware.kcfg
ClassName=EGroupwarePrefs
NameSpace=KABC
Singleton=false
diff --git a/tderesources/egroupware/kabc_resourcexmlrpc.cpp b/tderesources/egroupware/tdeabc_resourcexmlrpc.cpp
index 587ebc84d..587ebc84d 100644
--- a/tderesources/egroupware/kabc_resourcexmlrpc.cpp
+++ b/tderesources/egroupware/tdeabc_resourcexmlrpc.cpp
diff --git a/tderesources/egroupware/kabc_resourcexmlrpc.h b/tderesources/egroupware/tdeabc_resourcexmlrpc.h
index b4b6411a4..b4b6411a4 100644
--- a/tderesources/egroupware/kabc_resourcexmlrpc.h
+++ b/tderesources/egroupware/tdeabc_resourcexmlrpc.h
diff --git a/tderesources/egroupware/kabc_resourcexmlrpcconfig.cpp b/tderesources/egroupware/tdeabc_resourcexmlrpcconfig.cpp
index 03665e75d..03665e75d 100644
--- a/tderesources/egroupware/kabc_resourcexmlrpcconfig.cpp
+++ b/tderesources/egroupware/tdeabc_resourcexmlrpcconfig.cpp
diff --git a/tderesources/egroupware/kabc_resourcexmlrpcconfig.h b/tderesources/egroupware/tdeabc_resourcexmlrpcconfig.h
index 0a9dc9f06..0a9dc9f06 100644
--- a/tderesources/egroupware/kabc_resourcexmlrpcconfig.h
+++ b/tderesources/egroupware/tdeabc_resourcexmlrpcconfig.h
diff --git a/tderesources/egroupware/kabc_resourcexmlrpcplugin.cpp b/tderesources/egroupware/tdeabc_resourcexmlrpcplugin.cpp
index c14a8f679..e1f25bdcb 100644
--- a/tderesources/egroupware/kabc_resourcexmlrpcplugin.cpp
+++ b/tderesources/egroupware/tdeabc_resourcexmlrpcplugin.cpp
@@ -32,7 +32,7 @@ typedef KRES::PluginFactory< ResourceXMLRPC, ResourceXMLRPCConfig > XMLRPCFactor
// Problem: How to insert the catalogue!
extern "C"
{
- void *init_kabc_xmlrpc()
+ void *init_tdeabc_xmlrpc()
{
TDEGlobal::locale()->insertCatalogue( "kres_xmlrpc" );
return new XMLRPCFactory;
diff --git a/tderesources/egroupware/kabc_xmlrpc.desktop b/tderesources/egroupware/tdeabc_xmlrpc.desktop
index 6eeb94f33..6eeb94f33 100644
--- a/tderesources/egroupware/kabc_xmlrpc.desktop
+++ b/tderesources/egroupware/tdeabc_xmlrpc.desktop
diff --git a/tderesources/egroupware/tderesources_kabc_egroupware.kcfg b/tderesources/egroupware/tderesources_tdeabc_egroupware.kcfg
index 5ada19426..af0f07474 100644
--- a/tderesources/egroupware/tderesources_kabc_egroupware.kcfg
+++ b/tderesources/egroupware/tderesources_tdeabc_egroupware.kcfg
@@ -3,7 +3,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.kde.org/standards/kcfg/1.0
http://www.kde.org/standards/kcfg/1.0/kcfg.xsd" >
- <kcfgfile name="tderesources_kabc_egroupwarerc"/>
+ <kcfgfile name="tderesources_tdeabc_egroupwarerc"/>
<group name="General">
<entry type="String" name="Url">
diff --git a/tderesources/groupdav/kabc_groupdav.desktop b/tderesources/groupdav/tdeabc_groupdav.desktop
index c10ea97c2..c10ea97c2 100644
--- a/tderesources/groupdav/kabc_groupdav.desktop
+++ b/tderesources/groupdav/tdeabc_groupdav.desktop
diff --git a/tderesources/groupdav/kabc_resourcegroupdav.cpp b/tderesources/groupdav/tdeabc_resourcegroupdav.cpp
index 1f50e04bb..1f50e04bb 100644
--- a/tderesources/groupdav/kabc_resourcegroupdav.cpp
+++ b/tderesources/groupdav/tdeabc_resourcegroupdav.cpp
diff --git a/tderesources/groupdav/kabc_resourcegroupdav.h b/tderesources/groupdav/tdeabc_resourcegroupdav.h
index ca7ed96d3..ca7ed96d3 100644
--- a/tderesources/groupdav/kabc_resourcegroupdav.h
+++ b/tderesources/groupdav/tdeabc_resourcegroupdav.h
diff --git a/tderesources/groupdav/kabc_resourcegroupdav_plugin.cpp b/tderesources/groupdav/tdeabc_resourcegroupdav_plugin.cpp
index 2377808a2..1ef588dfd 100644
--- a/tderesources/groupdav/kabc_resourcegroupdav_plugin.cpp
+++ b/tderesources/groupdav/tdeabc_resourcegroupdav_plugin.cpp
@@ -33,7 +33,7 @@ typedef KRES::PluginFactory< ResourceGroupDav, ResourceGroupwareBaseConfig > Gro
// Problem: How do I insert the catalogue???
extern "C"
{
- void *init_kabc_groupdav()
+ void *init_tdeabc_groupdav()
{
TDEGlobal::locale()->insertCatalogue( "tdepimresources" );
TDEGlobal::locale()->insertCatalogue( "kres_groupdav" );
diff --git a/tderesources/groupware/kabc_groupware.desktop b/tderesources/groupware/tdeabc_groupware.desktop
index dee5d9c24..dee5d9c24 100644
--- a/tderesources/groupware/kabc_groupware.desktop
+++ b/tderesources/groupware/tdeabc_groupware.desktop
diff --git a/tderesources/groupware/kabc_groupwareprefs.kcfgc b/tderesources/groupware/tdeabc_groupwareprefs.kcfgc
index 771ddccf4..10abd7af8 100644
--- a/tderesources/groupware/kabc_groupwareprefs.kcfgc
+++ b/tderesources/groupware/tdeabc_groupwareprefs.kcfgc
@@ -1,5 +1,5 @@
ClassName=GroupwarePrefs
-File=tderesources_kabc_groupware.kcfg
+File=tderesources_tdeabc_groupware.kcfg
GlobalEnums=true
IncludeFiles=libtdepim/kresourceprefs.h
Inherits=KResourcePrefs
diff --git a/tderesources/groupware/kabc_resourcegroupware.cpp b/tderesources/groupware/tdeabc_resourcegroupware.cpp
index e2503b83d..e2503b83d 100644
--- a/tderesources/groupware/kabc_resourcegroupware.cpp
+++ b/tderesources/groupware/tdeabc_resourcegroupware.cpp
diff --git a/tderesources/groupware/kabc_resourcegroupware.h b/tderesources/groupware/tdeabc_resourcegroupware.h
index 1c5feb847..1c5feb847 100644
--- a/tderesources/groupware/kabc_resourcegroupware.h
+++ b/tderesources/groupware/tdeabc_resourcegroupware.h
diff --git a/tderesources/groupware/kabc_resourcegroupware_plugin.cpp b/tderesources/groupware/tdeabc_resourcegroupware_plugin.cpp
index 12f3233b6..08a415745 100644
--- a/tderesources/groupware/kabc_resourcegroupware_plugin.cpp
+++ b/tderesources/groupware/tdeabc_resourcegroupware_plugin.cpp
@@ -30,7 +30,7 @@ typedef KRES::PluginFactory<ResourceGroupware, ResourceGroupwareConfig> Groupwar
extern "C"
{
- void *init_kabc_groupware()
+ void *init_tdeabc_groupware()
{
TDEGlobal::locale()->insertCatalogue( "libkcal" );
TDEGlobal::locale()->insertCatalogue( "kres_groupware" );
diff --git a/tderesources/groupware/kabc_resourcegroupwareconfig.cpp b/tderesources/groupware/tdeabc_resourcegroupwareconfig.cpp
index 35ca8596f..35ca8596f 100644
--- a/tderesources/groupware/kabc_resourcegroupwareconfig.cpp
+++ b/tderesources/groupware/tdeabc_resourcegroupwareconfig.cpp
diff --git a/tderesources/groupware/kabc_resourcegroupwareconfig.h b/tderesources/groupware/tdeabc_resourcegroupwareconfig.h
index c07c4d0b4..c07c4d0b4 100644
--- a/tderesources/groupware/kabc_resourcegroupwareconfig.h
+++ b/tderesources/groupware/tdeabc_resourcegroupwareconfig.h
diff --git a/tderesources/groupware/tderesources_kabc_groupware.kcfg b/tderesources/groupware/tderesources_tdeabc_groupware.kcfg
index 9beca9c98..2c6c57dc9 100644
--- a/tderesources/groupware/tderesources_kabc_groupware.kcfg
+++ b/tderesources/groupware/tderesources_tdeabc_groupware.kcfg
@@ -3,7 +3,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.kde.org/standards/kcfg/1.0
http://www.kde.org/standards/kcfg/1.0/kcfg.xsd" >
- <kcfgfile name="tderesources_kabc_groupwarerc" />
+ <kcfgfile name="tderesources_tdeabc_groupwarerc" />
<group name="General" >
<entry key="Url" type="String" >
<label>Server URL</label>
diff --git a/tderesources/groupwise/kabc_groupwise.desktop b/tderesources/groupwise/tdeabc_groupwise.desktop
index 695ab445b..695ab445b 100644
--- a/tderesources/groupwise/kabc_groupwise.desktop
+++ b/tderesources/groupwise/tdeabc_groupwise.desktop
diff --git a/tderesources/groupwise/kabc_groupwiseprefs.kcfgc b/tderesources/groupwise/tdeabc_groupwiseprefs.kcfgc
index 08e997f64..0dd55c2f6 100644
--- a/tderesources/groupwise/kabc_groupwiseprefs.kcfgc
+++ b/tderesources/groupwise/tdeabc_groupwiseprefs.kcfgc
@@ -1,5 +1,5 @@
ClassName=GroupwisePrefs
-File=tderesources_kabc_groupwise.kcfg
+File=tderesources_tdeabc_groupwise.kcfg
GlobalEnums=true
IncludeFiles=libtdepim/kresourceprefs.h
Inherits=KResourcePrefs
diff --git a/tderesources/groupwise/kabc_resourcegroupwise.cpp b/tderesources/groupwise/tdeabc_resourcegroupwise.cpp
index 8499aa9ff..8499aa9ff 100644
--- a/tderesources/groupwise/kabc_resourcegroupwise.cpp
+++ b/tderesources/groupwise/tdeabc_resourcegroupwise.cpp
diff --git a/tderesources/groupwise/kabc_resourcegroupwise.h b/tderesources/groupwise/tdeabc_resourcegroupwise.h
index 0c7533eef..0c7533eef 100644
--- a/tderesources/groupwise/kabc_resourcegroupwise.h
+++ b/tderesources/groupwise/tdeabc_resourcegroupwise.h
diff --git a/tderesources/groupwise/kabc_resourcegroupwise_plugin.cpp b/tderesources/groupwise/tdeabc_resourcegroupwise_plugin.cpp
index e71a66e5e..b3a94a901 100644
--- a/tderesources/groupwise/kabc_resourcegroupwise_plugin.cpp
+++ b/tderesources/groupwise/tdeabc_resourcegroupwise_plugin.cpp
@@ -31,7 +31,7 @@ typedef KRES::PluginFactory<ResourceGroupwise, ResourceGroupwiseConfig> Groupwis
// Problem: How do I insert the catalogue???
extern "C"
{
- void *init_kabc_groupwise()
+ void *init_tdeabc_groupwise()
{
TDEGlobal::locale()->insertCatalogue( "libkcal" );
TDEGlobal::locale()->insertCatalogue( "kres_groupwise" );
diff --git a/tderesources/groupwise/kabc_resourcegroupwiseconfig.cpp b/tderesources/groupwise/tdeabc_resourcegroupwiseconfig.cpp
index 1212a6bc5..1212a6bc5 100644
--- a/tderesources/groupwise/kabc_resourcegroupwiseconfig.cpp
+++ b/tderesources/groupwise/tdeabc_resourcegroupwiseconfig.cpp
diff --git a/tderesources/groupwise/kabc_resourcegroupwiseconfig.h b/tderesources/groupwise/tdeabc_resourcegroupwiseconfig.h
index eb54803c0..eb54803c0 100644
--- a/tderesources/groupwise/kabc_resourcegroupwiseconfig.h
+++ b/tderesources/groupwise/tdeabc_resourcegroupwiseconfig.h
diff --git a/tderesources/groupwise/tderesources_kabc_groupwise.kcfg b/tderesources/groupwise/tderesources_tdeabc_groupwise.kcfg
index 6bc3e4c3c..188e50d9f 100644
--- a/tderesources/groupwise/tderesources_kabc_groupwise.kcfg
+++ b/tderesources/groupwise/tderesources_tdeabc_groupwise.kcfg
@@ -3,7 +3,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.kde.org/standards/kcfg/1.0
http://www.kde.org/standards/kcfg/1.0/kcfg.xsd" >
- <kcfgfile name="tderesources_kabc_groupwiserc" />
+ <kcfgfile name="tderesources_tdeabc_groupwiserc" />
<group name="General" >
<entry key="Url" type="String" >
<label>Server URL</label>
diff --git a/tderesources/lib/kabc_resourcegroupwarebase.cpp b/tderesources/lib/tdeabc_resourcegroupwarebase.cpp
index 3ebd175eb..3ebd175eb 100644
--- a/tderesources/lib/kabc_resourcegroupwarebase.cpp
+++ b/tderesources/lib/tdeabc_resourcegroupwarebase.cpp
diff --git a/tderesources/lib/kabc_resourcegroupwarebase.h b/tderesources/lib/tdeabc_resourcegroupwarebase.h
index 28ce5199e..28ce5199e 100644
--- a/tderesources/lib/kabc_resourcegroupwarebase.h
+++ b/tderesources/lib/tdeabc_resourcegroupwarebase.h
diff --git a/tderesources/lib/kabc_resourcegroupwarebaseconfig.cpp b/tderesources/lib/tdeabc_resourcegroupwarebaseconfig.cpp
index 918dfc52b..918dfc52b 100644
--- a/tderesources/lib/kabc_resourcegroupwarebaseconfig.cpp
+++ b/tderesources/lib/tdeabc_resourcegroupwarebaseconfig.cpp
diff --git a/tderesources/lib/kabc_resourcegroupwarebaseconfig.h b/tderesources/lib/tdeabc_resourcegroupwarebaseconfig.h
index f505d9ceb..f505d9ceb 100644
--- a/tderesources/lib/kabc_resourcegroupwarebaseconfig.h
+++ b/tderesources/lib/tdeabc_resourcegroupwarebaseconfig.h
diff --git a/tderesources/newexchange/kabc_newexchange.desktop b/tderesources/newexchange/tdeabc_newexchange.desktop
index c48d5f3cf..c48d5f3cf 100644
--- a/tderesources/newexchange/kabc_newexchange.desktop
+++ b/tderesources/newexchange/tdeabc_newexchange.desktop
diff --git a/tderesources/newexchange/kabc_newexchange_final.desktop b/tderesources/newexchange/tdeabc_newexchange_final.desktop
index 19cdda43e..19cdda43e 100644
--- a/tderesources/newexchange/kabc_newexchange_final.desktop
+++ b/tderesources/newexchange/tdeabc_newexchange_final.desktop
diff --git a/tderesources/newexchange/kabc_resourceexchange.cpp b/tderesources/newexchange/tdeabc_resourceexchange.cpp
index bd60cd2fc..bd60cd2fc 100644
--- a/tderesources/newexchange/kabc_resourceexchange.cpp
+++ b/tderesources/newexchange/tdeabc_resourceexchange.cpp
diff --git a/tderesources/newexchange/kabc_resourceexchange.h b/tderesources/newexchange/tdeabc_resourceexchange.h
index 941f91792..941f91792 100644
--- a/tderesources/newexchange/kabc_resourceexchange.h
+++ b/tderesources/newexchange/tdeabc_resourceexchange.h
diff --git a/tderesources/newexchange/kabc_resourceexchange_plugin.cpp b/tderesources/newexchange/tdeabc_resourceexchange_plugin.cpp
index adc0b6859..adc0b6859 100644
--- a/tderesources/newexchange/kabc_resourceexchange_plugin.cpp
+++ b/tderesources/newexchange/tdeabc_resourceexchange_plugin.cpp
diff --git a/tderesources/slox/kabcresourceslox.cpp b/tderesources/slox/kabcresourceslox.cpp
index 426d86add..17b282969 100644
--- a/tderesources/slox/kabcresourceslox.cpp
+++ b/tderesources/slox/kabcresourceslox.cpp
@@ -243,7 +243,7 @@ void ResourceSlox::slotResult( TDEIO::Job *job )
TQValueList<SloxItem>::ConstIterator it;
for( it = items.begin(); it != items.end(); ++it ) {
SloxItem item = *it;
- TQString uid = "tderesources_slox_kabc_" + item.sloxId;
+ TQString uid = "tderesources_slox_tdeabc_" + item.sloxId;
if ( item.status == SloxItem::Delete ) {
TQMap<TQString,Addressee>::Iterator it;
it = mAddrMap.find( uid );
@@ -317,7 +317,7 @@ void ResourceSlox::slotUploadResult( TDEIO::Job *job )
// use the id provided by the server
Addressee a = *search_res;
mAddrMap.remove( search_res );
- a.setUid( "tderesources_slox_kabc_" + item.sloxId );
+ a.setUid( "tderesources_slox_tdeabc_" + item.sloxId );
a.setResource( this );
a.setChanged( false );
mAddrMap.replace( a.uid(), a );
@@ -494,7 +494,7 @@ void ResourceSlox::uploadContacts()
} else if ( !changedAddr.isEmpty() ) {
mUploadAddressee = changedAddr.first();
WebdavHandler::addSloxElement( this, doc, prop, fieldName( ObjectId ),
- mUploadAddressee.uid().remove( 0, sizeof("tderesources_slox_kabc_") - 1) );
+ mUploadAddressee.uid().remove( 0, sizeof("tderesources_slox_tdeabc_") - 1) );
} else if ( !deletedAddr.isEmpty() ) {
mUploadAddressee = deletedAddr.first();
isDelete = true;
@@ -507,7 +507,7 @@ void ResourceSlox::uploadContacts()
if ( !isDelete ) {
createAddresseeFields( doc, prop, mUploadAddressee );
} else {
- TQString tmp_uid = mUploadAddressee.uid().remove( 0, sizeof("tderesources_slox_kabc_") - 1); // remove prefix from uid
+ TQString tmp_uid = mUploadAddressee.uid().remove( 0, sizeof("tderesources_slox_tdeabc_") - 1); // remove prefix from uid
WebdavHandler::addSloxElement( this, doc, prop, fieldName( ObjectId ), tmp_uid );
WebdavHandler::addSloxElement( this, doc, prop, "method", "DELETE" );
}
diff --git a/tderesources/slox/kabcresourceslox_plugin.cpp b/tderesources/slox/kabcresourceslox_plugin.cpp
index 0ee425179..49e1f368b 100644
--- a/tderesources/slox/kabcresourceslox_plugin.cpp
+++ b/tderesources/slox/kabcresourceslox_plugin.cpp
@@ -30,7 +30,7 @@ typedef KRES::PluginFactory< ResourceSlox, ResourceSloxConfig > SloxFactory;
extern "C"
{
- void *init_kabc_slox()
+ void *init_tdeabc_slox()
{
TDEGlobal::locale()->insertCatalogue( "libkcal" );
TDEGlobal::locale()->insertCatalogue( "kabc_slox" );
diff --git a/tderesources/slox/kabcsloxprefs.kcfgc b/tderesources/slox/kabcsloxprefs.kcfgc
index 51bd1ac16..70c006f52 100644
--- a/tderesources/slox/kabcsloxprefs.kcfgc
+++ b/tderesources/slox/kabcsloxprefs.kcfgc
@@ -1,5 +1,5 @@
# Code generation options for tdeconfig_compiler
-File=tderesources_kabc_slox.kcfg
+File=tderesources_tdeabc_slox.kcfg
ClassName=SloxPrefs
NameSpace=KABC
Singleton=false
diff --git a/tderesources/slox/kabc_ox.desktop b/tderesources/slox/tdeabc_ox.desktop
index 39570ad29..39570ad29 100644
--- a/tderesources/slox/kabc_ox.desktop
+++ b/tderesources/slox/tdeabc_ox.desktop
diff --git a/tderesources/slox/kabc_slox.desktop b/tderesources/slox/tdeabc_slox.desktop
index 6c7b0352c..6c7b0352c 100644
--- a/tderesources/slox/kabc_slox.desktop
+++ b/tderesources/slox/tdeabc_slox.desktop
diff --git a/tderesources/slox/tderesources_kabc_slox.kcfg b/tderesources/slox/tderesources_tdeabc_slox.kcfg
index 6e3057e64..a193ee02b 100644
--- a/tderesources/slox/tderesources_kabc_slox.kcfg
+++ b/tderesources/slox/tderesources_tdeabc_slox.kcfg
@@ -3,7 +3,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.kde.org/standards/kcfg/1.0
http://www.kde.org/standards/kcfg/1.0/kcfg.xsd" >
- <kcfgfile name="tderesources_kabc_sloxrc"/>
+ <kcfgfile name="tderesources_tdeabc_sloxrc"/>
<group name="General">
<entry type="String" name="Url">