summaryrefslogtreecommitdiffabout
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--kabc/addressbook.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/kabc/addressbook.cpp b/kabc/addressbook.cpp
index bdc2762..ed3ac84 100644
--- a/kabc/addressbook.cpp
+++ b/kabc/addressbook.cpp
@@ -392,13 +392,13 @@ void AddressBook::export2File( QString fileName, QString resourceName )
KABC::VCardConverter::Version version;
version = KABC::VCardConverter::v3_0;
for ( it = begin(); it != end(); ++it ) {
if ( (*it).resource() ) {
bool include = (*it).resource()->includeInSync();
if ( !resourceName.isEmpty() )
- include = (resourceName == (*it).resource()->name() );
+ include = (resourceName == (*it).resource()->resourceName() );
if ( include ) {
qDebug(QString ("Exporting resource %1 to file %2").arg( (*it).resource()->name() ).arg( fileName ) );
if ( !(*it).IDStr().isEmpty() ) {
(*it).insertCustom( "KADDRESSBOOK", "X-ExternalID", (*it).IDStr() );
}
KABC::VCardConverter converter;
@@ -507,13 +507,13 @@ int AddressBook::importFromFile( QString fileName, bool replaceLabel, bool remo
Resource * setRes = 0;
if ( !resource.isEmpty() ) {
KRES::Manager<Resource>::ActiveIterator it;
KRES::Manager<Resource> *manager = d->mManager;
for ( it = manager->activeBegin(); it != manager->activeEnd(); ++it ) {
qDebug("SaveAB::checking resource..." );
- if ( (*it)->name() == resource ) {
+ if ( (*it)->resourceName() == resource ) {
setRes = (*it);
qDebug("Inserting imported contacs to resource %s", resource.latin1());
break;
}
}
}
@@ -534,13 +534,13 @@ int AddressBook::importFromFile( QString fileName, bool replaceLabel, bool remo
}
void AddressBook::setUntagged(bool setNonSyncTagged, QString resource) // = false , "")
{
Iterator ait;
if ( !resource.isEmpty() ) {
for ( ait = begin(); ait != end(); ++ait ) {
- if ( (*ait).resource() && (*ait).resource()->name() == resource ) {
+ if ( (*ait).resource() && (*ait).resource()->resourceName() == resource ) {
(*ait).setTagged( false );
}
else
(*ait).setTagged( true );
}
} else {