-rw-r--r-- | kabc/addressbook.cpp | 2 | ||||
-rw-r--r-- | kabc/plugins/file/resourcefile.cpp | 8 | ||||
-rw-r--r-- | kabc/stdaddressbook.cpp | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/kabc/addressbook.cpp b/kabc/addressbook.cpp index 97bd3ef..0838157 100644 --- a/kabc/addressbook.cpp +++ b/kabc/addressbook.cpp @@ -248,13 +248,13 @@ AddressBook::~AddressBook() //US delete d->mErrorHandler; d->mErrorHandler = 0; delete d; d = 0; } bool AddressBook::load() { - kdDebug(5700) << "AddressBook::load()" << endl; + clear(); KRES::Manager<Resource>::ActiveIterator it; bool ok = true; for ( it = d->mManager->activeBegin(); it != d->mManager->activeEnd(); ++it ) diff --git a/kabc/plugins/file/resourcefile.cpp b/kabc/plugins/file/resourcefile.cpp index 80af841..3920f69 100644 --- a/kabc/plugins/file/resourcefile.cpp +++ b/kabc/plugins/file/resourcefile.cpp @@ -191,13 +191,13 @@ bool ResourceFile::doOpen() void ResourceFile::doClose() { } bool ResourceFile::load() { - kdDebug(5700) << "ResourceFile::load(): '" << mFileName << "'" << endl; + QFile file( mFileName ); if ( !file.open( IO_ReadOnly ) ) { addressBook()->error( i18n( "Unable to open file '%1'." ).arg( mFileName ) ); return false; } @@ -207,13 +207,13 @@ bool ResourceFile::load() return mFormat->loadAll( addressBook(), this, &file ); } bool ResourceFile::save( Ticket *ticket ) { // qDebug("ResourceFile::save format %s, %s", mFileName.latin1(), mFormatName.latin1()); - kdDebug(5700) << "ResourceFile::save()" << endl; + // create backup file QString extension = "_" + QString::number( QDate::currentDate().dayOfWeek() ); /*US we use a simpler method to create a backupfile @@ -254,24 +254,24 @@ bool ResourceFile::save( Ticket *ticket ) qDebug("ResourceFile::save has to be changed"); return true; } bool ResourceFile::lock( const QString &fileName ) { - kdDebug(5700) << "ResourceFile::lock()" << endl; + QString fn = fileName; //US change the implementation how the lockfilename is getting created //US fn.replace( QRegExp("/"), "_" ); //US QString lockName = locateLocal( "data", "kabc/lock/" + fn + ".lock" ); KURL url(fn); QString lockName = locateLocal( "data", "kabc/lock/" + url.fileName() + ".lock" ); - kdDebug(5700) << "-- lock name: " << lockName << endl; + if (QFile::exists( lockName )) return false; QString lockUniqueName; lockUniqueName = fn + KApplication::randomString( 8 ); diff --git a/kabc/stdaddressbook.cpp b/kabc/stdaddressbook.cpp index 075f12f..1e00cc6 100644 --- a/kabc/stdaddressbook.cpp +++ b/kabc/stdaddressbook.cpp @@ -149,13 +149,13 @@ void StdAddressBook::init( bool ) res = manager->createResource( "file" ); if ( res ) { addResource( res ); } else - kdDebug(5700) << "No resource available!!!" << endl; + qDebug(" No resource available!!!"); } setStandardResource( res ); manager->writeConfig(); load(); |