diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-17 02:06:43 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-17 02:06:43 -0600 |
commit | 10251f9a2a51f37c2a42833c1d05cd5a8fdf6bb5 (patch) | |
tree | 7ff76e953c38b426d2ff3a7841e2b75332e85b5a /tderesources/slox | |
parent | 4535df08c5c3c40e38d2bddd7cda8c41be27fd0f (diff) | |
download | tdepim-10251f9a2a51f37c2a42833c1d05cd5a8fdf6bb5.tar.gz tdepim-10251f9a2a51f37c2a42833c1d05cd5a8fdf6bb5.zip |
Fix FTBFS
Diffstat (limited to 'tderesources/slox')
-rw-r--r-- | tderesources/slox/kabcresourceslox.cpp | 8 | ||||
-rw-r--r-- | tderesources/slox/kabcresourceslox_plugin.cpp | 2 | ||||
-rw-r--r-- | tderesources/slox/kabcsloxprefs.kcfgc | 2 | ||||
-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 |
6 files changed, 7 insertions, 7 deletions
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"> |