diff --git a/tderesources/birthdays/Makefile.am b/tderesources/birthdays/Makefile.am index 6a583005..c31fc047 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 9079ecd3..8b19e49a 100644 --- a/tderesources/carddav/plugin.cpp +++ b/tderesources/carddav/plugin.cpp @@ -36,7 +36,7 @@ typedef KRES::PluginFactory 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 similarity index 100% rename from tderesources/carddav/kabc_carddav.desktop rename to tderesources/carddav/tdeabc_carddav.desktop diff --git a/tderesources/egroupware/kabc_egroupwareprefs.kcfgc b/tderesources/egroupware/tdeabc_egroupwareprefs.kcfgc similarity index 85% rename from tderesources/egroupware/kabc_egroupwareprefs.kcfgc rename to tderesources/egroupware/tdeabc_egroupwareprefs.kcfgc index 10adb19b..50c0d239 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 similarity index 100% rename from tderesources/egroupware/kabc_resourcexmlrpc.cpp rename to tderesources/egroupware/tdeabc_resourcexmlrpc.cpp diff --git a/tderesources/egroupware/kabc_resourcexmlrpc.h b/tderesources/egroupware/tdeabc_resourcexmlrpc.h similarity index 100% rename from tderesources/egroupware/kabc_resourcexmlrpc.h rename to tderesources/egroupware/tdeabc_resourcexmlrpc.h diff --git a/tderesources/egroupware/kabc_resourcexmlrpcconfig.cpp b/tderesources/egroupware/tdeabc_resourcexmlrpcconfig.cpp similarity index 100% rename from tderesources/egroupware/kabc_resourcexmlrpcconfig.cpp rename to tderesources/egroupware/tdeabc_resourcexmlrpcconfig.cpp diff --git a/tderesources/egroupware/kabc_resourcexmlrpcconfig.h b/tderesources/egroupware/tdeabc_resourcexmlrpcconfig.h similarity index 100% rename from tderesources/egroupware/kabc_resourcexmlrpcconfig.h rename to tderesources/egroupware/tdeabc_resourcexmlrpcconfig.h diff --git a/tderesources/egroupware/kabc_resourcexmlrpcplugin.cpp b/tderesources/egroupware/tdeabc_resourcexmlrpcplugin.cpp similarity index 97% rename from tderesources/egroupware/kabc_resourcexmlrpcplugin.cpp rename to tderesources/egroupware/tdeabc_resourcexmlrpcplugin.cpp index c14a8f67..e1f25bdc 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 similarity index 100% rename from tderesources/egroupware/kabc_xmlrpc.desktop rename to tderesources/egroupware/tdeabc_xmlrpc.desktop diff --git a/tderesources/egroupware/tderesources_kabc_egroupware.kcfg b/tderesources/egroupware/tderesources_tdeabc_egroupware.kcfg similarity index 92% rename from tderesources/egroupware/tderesources_kabc_egroupware.kcfg rename to tderesources/egroupware/tderesources_tdeabc_egroupware.kcfg index 5ada1942..af0f0747 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" > - + diff --git a/tderesources/groupdav/kabc_groupdav.desktop b/tderesources/groupdav/tdeabc_groupdav.desktop similarity index 100% rename from tderesources/groupdav/kabc_groupdav.desktop rename to tderesources/groupdav/tdeabc_groupdav.desktop diff --git a/tderesources/groupdav/kabc_resourcegroupdav.cpp b/tderesources/groupdav/tdeabc_resourcegroupdav.cpp similarity index 100% rename from tderesources/groupdav/kabc_resourcegroupdav.cpp rename to tderesources/groupdav/tdeabc_resourcegroupdav.cpp diff --git a/tderesources/groupdav/kabc_resourcegroupdav.h b/tderesources/groupdav/tdeabc_resourcegroupdav.h similarity index 100% rename from tderesources/groupdav/kabc_resourcegroupdav.h rename to tderesources/groupdav/tdeabc_resourcegroupdav.h diff --git a/tderesources/groupdav/kabc_resourcegroupdav_plugin.cpp b/tderesources/groupdav/tdeabc_resourcegroupdav_plugin.cpp similarity index 97% rename from tderesources/groupdav/kabc_resourcegroupdav_plugin.cpp rename to tderesources/groupdav/tdeabc_resourcegroupdav_plugin.cpp index 2377808a..1ef588df 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 similarity index 100% rename from tderesources/groupware/kabc_groupware.desktop rename to tderesources/groupware/tdeabc_groupware.desktop diff --git a/tderesources/groupware/kabc_groupwareprefs.kcfgc b/tderesources/groupware/tdeabc_groupwareprefs.kcfgc similarity index 79% rename from tderesources/groupware/kabc_groupwareprefs.kcfgc rename to tderesources/groupware/tdeabc_groupwareprefs.kcfgc index 771ddccf..10abd7af 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 similarity index 100% rename from tderesources/groupware/kabc_resourcegroupware.cpp rename to tderesources/groupware/tdeabc_resourcegroupware.cpp diff --git a/tderesources/groupware/kabc_resourcegroupware.h b/tderesources/groupware/tdeabc_resourcegroupware.h similarity index 100% rename from tderesources/groupware/kabc_resourcegroupware.h rename to tderesources/groupware/tdeabc_resourcegroupware.h diff --git a/tderesources/groupware/kabc_resourcegroupware_plugin.cpp b/tderesources/groupware/tdeabc_resourcegroupware_plugin.cpp similarity index 97% rename from tderesources/groupware/kabc_resourcegroupware_plugin.cpp rename to tderesources/groupware/tdeabc_resourcegroupware_plugin.cpp index 12f3233b..08a41574 100644 --- a/tderesources/groupware/kabc_resourcegroupware_plugin.cpp +++ b/tderesources/groupware/tdeabc_resourcegroupware_plugin.cpp @@ -30,7 +30,7 @@ typedef KRES::PluginFactory 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 similarity index 100% rename from tderesources/groupware/kabc_resourcegroupwareconfig.cpp rename to tderesources/groupware/tdeabc_resourcegroupwareconfig.cpp diff --git a/tderesources/groupware/kabc_resourcegroupwareconfig.h b/tderesources/groupware/tdeabc_resourcegroupwareconfig.h similarity index 100% rename from tderesources/groupware/kabc_resourcegroupwareconfig.h rename to tderesources/groupware/tdeabc_resourcegroupwareconfig.h diff --git a/tderesources/groupware/tderesources_kabc_groupware.kcfg b/tderesources/groupware/tderesources_tdeabc_groupware.kcfg similarity index 91% rename from tderesources/groupware/tderesources_kabc_groupware.kcfg rename to tderesources/groupware/tderesources_tdeabc_groupware.kcfg index 9beca9c9..2c6c57dc 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" > - + diff --git a/tderesources/groupwise/kabc_groupwise.desktop b/tderesources/groupwise/tdeabc_groupwise.desktop similarity index 100% rename from tderesources/groupwise/kabc_groupwise.desktop rename to tderesources/groupwise/tdeabc_groupwise.desktop diff --git a/tderesources/groupwise/kabc_groupwiseprefs.kcfgc b/tderesources/groupwise/tdeabc_groupwiseprefs.kcfgc similarity index 79% rename from tderesources/groupwise/kabc_groupwiseprefs.kcfgc rename to tderesources/groupwise/tdeabc_groupwiseprefs.kcfgc index 08e997f6..0dd55c2f 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 similarity index 100% rename from tderesources/groupwise/kabc_resourcegroupwise.cpp rename to tderesources/groupwise/tdeabc_resourcegroupwise.cpp diff --git a/tderesources/groupwise/kabc_resourcegroupwise.h b/tderesources/groupwise/tdeabc_resourcegroupwise.h similarity index 100% rename from tderesources/groupwise/kabc_resourcegroupwise.h rename to tderesources/groupwise/tdeabc_resourcegroupwise.h diff --git a/tderesources/groupwise/kabc_resourcegroupwise_plugin.cpp b/tderesources/groupwise/tdeabc_resourcegroupwise_plugin.cpp similarity index 97% rename from tderesources/groupwise/kabc_resourcegroupwise_plugin.cpp rename to tderesources/groupwise/tdeabc_resourcegroupwise_plugin.cpp index e71a66e5..b3a94a90 100644 --- a/tderesources/groupwise/kabc_resourcegroupwise_plugin.cpp +++ b/tderesources/groupwise/tdeabc_resourcegroupwise_plugin.cpp @@ -31,7 +31,7 @@ typedef KRES::PluginFactory 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 similarity index 100% rename from tderesources/groupwise/kabc_resourcegroupwiseconfig.cpp rename to tderesources/groupwise/tdeabc_resourcegroupwiseconfig.cpp diff --git a/tderesources/groupwise/kabc_resourcegroupwiseconfig.h b/tderesources/groupwise/tdeabc_resourcegroupwiseconfig.h similarity index 100% rename from tderesources/groupwise/kabc_resourcegroupwiseconfig.h rename to tderesources/groupwise/tdeabc_resourcegroupwiseconfig.h diff --git a/tderesources/groupwise/tderesources_kabc_groupwise.kcfg b/tderesources/groupwise/tderesources_tdeabc_groupwise.kcfg similarity index 97% rename from tderesources/groupwise/tderesources_kabc_groupwise.kcfg rename to tderesources/groupwise/tderesources_tdeabc_groupwise.kcfg index 6bc3e4c3..188e50d9 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" > - + diff --git a/tderesources/lib/kabc_resourcegroupwarebase.cpp b/tderesources/lib/tdeabc_resourcegroupwarebase.cpp similarity index 100% rename from tderesources/lib/kabc_resourcegroupwarebase.cpp rename to tderesources/lib/tdeabc_resourcegroupwarebase.cpp diff --git a/tderesources/lib/kabc_resourcegroupwarebase.h b/tderesources/lib/tdeabc_resourcegroupwarebase.h similarity index 100% rename from tderesources/lib/kabc_resourcegroupwarebase.h rename to tderesources/lib/tdeabc_resourcegroupwarebase.h diff --git a/tderesources/lib/kabc_resourcegroupwarebaseconfig.cpp b/tderesources/lib/tdeabc_resourcegroupwarebaseconfig.cpp similarity index 100% rename from tderesources/lib/kabc_resourcegroupwarebaseconfig.cpp rename to tderesources/lib/tdeabc_resourcegroupwarebaseconfig.cpp diff --git a/tderesources/lib/kabc_resourcegroupwarebaseconfig.h b/tderesources/lib/tdeabc_resourcegroupwarebaseconfig.h similarity index 100% rename from tderesources/lib/kabc_resourcegroupwarebaseconfig.h rename to tderesources/lib/tdeabc_resourcegroupwarebaseconfig.h diff --git a/tderesources/newexchange/kabc_newexchange.desktop b/tderesources/newexchange/tdeabc_newexchange.desktop similarity index 100% rename from tderesources/newexchange/kabc_newexchange.desktop rename to tderesources/newexchange/tdeabc_newexchange.desktop diff --git a/tderesources/newexchange/kabc_newexchange_final.desktop b/tderesources/newexchange/tdeabc_newexchange_final.desktop similarity index 100% rename from tderesources/newexchange/kabc_newexchange_final.desktop rename to tderesources/newexchange/tdeabc_newexchange_final.desktop diff --git a/tderesources/newexchange/kabc_resourceexchange.cpp b/tderesources/newexchange/tdeabc_resourceexchange.cpp similarity index 100% rename from tderesources/newexchange/kabc_resourceexchange.cpp rename to tderesources/newexchange/tdeabc_resourceexchange.cpp diff --git a/tderesources/newexchange/kabc_resourceexchange.h b/tderesources/newexchange/tdeabc_resourceexchange.h similarity index 100% rename from tderesources/newexchange/kabc_resourceexchange.h rename to tderesources/newexchange/tdeabc_resourceexchange.h diff --git a/tderesources/newexchange/kabc_resourceexchange_plugin.cpp b/tderesources/newexchange/tdeabc_resourceexchange_plugin.cpp similarity index 100% rename from tderesources/newexchange/kabc_resourceexchange_plugin.cpp rename to tderesources/newexchange/tdeabc_resourceexchange_plugin.cpp diff --git a/tderesources/slox/kabcresourceslox.cpp b/tderesources/slox/kabcresourceslox.cpp index 426d86ad..17b28296 100644 --- a/tderesources/slox/kabcresourceslox.cpp +++ b/tderesources/slox/kabcresourceslox.cpp @@ -243,7 +243,7 @@ void ResourceSlox::slotResult( TDEIO::Job *job ) TQValueList::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::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 0ee42517..49e1f368 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 51bd1ac1..70c006f5 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 similarity index 100% rename from tderesources/slox/kabc_ox.desktop rename to tderesources/slox/tdeabc_ox.desktop diff --git a/tderesources/slox/kabc_slox.desktop b/tderesources/slox/tdeabc_slox.desktop similarity index 100% rename from tderesources/slox/kabc_slox.desktop rename to tderesources/slox/tdeabc_slox.desktop diff --git a/tderesources/slox/tderesources_kabc_slox.kcfg b/tderesources/slox/tderesources_tdeabc_slox.kcfg similarity index 94% rename from tderesources/slox/tderesources_kabc_slox.kcfg rename to tderesources/slox/tderesources_tdeabc_slox.kcfg index 6e3057e6..a193ee02 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" > - +