summaryrefslogtreecommitdiffabout
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--kabc/plugins/qtopia/resourceqtopia.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/kabc/plugins/qtopia/resourceqtopia.cpp b/kabc/plugins/qtopia/resourceqtopia.cpp
index 7475685..7e10e46 100644
--- a/kabc/plugins/qtopia/resourceqtopia.cpp
+++ b/kabc/plugins/qtopia/resourceqtopia.cpp
@@ -126,98 +126,99 @@ bool ResourceQtopia::doOpen()
file.close();
return ok;
} else {
if ( !file.open( IO_ReadWrite ) )
return false;
if ( file.size() == 0 ) {
file.close();
return true;
}
//US bool ok = mFormat->checkFormat( &file );
bool ok = true;
file.close();
return ok;
}
*/
return true;
}
void ResourceQtopia::doClose()
{
}
bool ResourceQtopia::load()
{
kdDebug(5700) << "ResourceQtopia::load(): '" << mFileName << "'" << endl;
// qDebug("ResourceQtopia::load: Try to load file() %s", mFileName.latin1());
AddressBookAccess* access = new AddressBookAccess();
if ( !access ) {
qDebug("Unable to load file() %s", mFileName.latin1());
addressBook()->error( i18n( "Unable to load file '%1'." ).arg( mFileName ) );
return false;
}
bool res = false;
if (mConverter == 0)
{
mConverter = new QtopiaConverter();
res = mConverter->init();
if ( !res )
{
- qDebug("Unable to initialize qtopia converter. Most likely a problem with the category file");
- addressBook()->error( i18n( "Unable to initialize qtopia converter. Most likely a problem with the category file" ) );
+ QString msg("Unable to initialize qtopia converter. Most likely a problem with the category file");
+ qDebug(msg);
+ addressBook()->error( i18n( msg ) );
delete access;
return false;
}
}
{ //create a new scope
AddressBookIterator it(*access);
const PimContact* contact;
for (contact=it.toFirst(); it.current(); ++it) {
contact = it.current();
KABC::Addressee addressee;
res = mConverter->qtopiaToAddressee( (*contact), addressee );
if ( !addressee.isEmpty() && res )
{
addressee.setResource( this );
addressBook()->insertAddressee( addressee );
}
}
}
delete access;
return true;
}
bool ResourceQtopia::save( Ticket *ticket )
{
/*US
// qDebug("ResourceFile::save format %s, %s", mFileName.latin1(), mFormatName.latin1());
kdDebug(5700) << "ResourceQtopia::save()" << endl;
// create backup file
QString extension = "_" + QString::number( QDate::currentDate().dayOfWeek() );
/*US we use a simpler method to create a backupfile
(void) KSaveFile::backupFile( mFileName, QString::null
,extension );
KSaveFile saveFile( mFileName );
bool ok = false;
if ( saveFile.status() == 0 && saveFile.file() )
{
mFormat->saveAll( addressBook(), this, saveFile.file() );
ok = saveFile.close();