Diffstat (limited to 'kabc/plugins/opie/resourceopie.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | kabc/plugins/opie/resourceopie.cpp | 39 |
1 files changed, 6 insertions, 33 deletions
diff --git a/kabc/plugins/opie/resourceopie.cpp b/kabc/plugins/opie/resourceopie.cpp index 5559827..9dfd473 100644 --- a/kabc/plugins/opie/resourceopie.cpp +++ b/kabc/plugins/opie/resourceopie.cpp | |||
@@ -84,12 +84,13 @@ ResourceOpie::ResourceOpie( const QString &fileName, bool syncable ) | |||
84 | { | 84 | { |
85 | init( fileName ); | 85 | init( fileName ); |
86 | } | 86 | } |
87 | 87 | ||
88 | void ResourceOpie::init( const QString &fileName ) | 88 | void ResourceOpie::init( const QString &fileName ) |
89 | { | 89 | { |
90 | qDebug("ResourceOpie::init()"); | ||
90 | 91 | ||
91 | connect( &mDirWatch, SIGNAL( dirty(const QString&) ), SLOT( fileChanged() ) ); | 92 | connect( &mDirWatch, SIGNAL( dirty(const QString&) ), SLOT( fileChanged() ) ); |
92 | connect( &mDirWatch, SIGNAL( created(const QString&) ), SLOT( fileChanged() ) ); | 93 | connect( &mDirWatch, SIGNAL( created(const QString&) ), SLOT( fileChanged() ) ); |
93 | connect( &mDirWatch, SIGNAL( deleted(const QString&) ), SLOT( fileChanged() ) ); | 94 | connect( &mDirWatch, SIGNAL( deleted(const QString&) ), SLOT( fileChanged() ) ); |
94 | 95 | ||
95 | setFileName( fileName ); | 96 | setFileName( fileName ); |
@@ -251,13 +252,17 @@ bool ResourceOpie::lock( const QString &lockfileName ) | |||
251 | 252 | ||
252 | KURL url(fn); | 253 | KURL url(fn); |
253 | QString lockName = locateLocal( "data", "kabc/lock/" + url.fileName() + ".lock" ); | 254 | QString lockName = locateLocal( "data", "kabc/lock/" + url.fileName() + ".lock" ); |
254 | 255 | ||
255 | kdDebug(5700) << "-- lock name: " << lockName << endl; | 256 | kdDebug(5700) << "-- lock name: " << lockName << endl; |
256 | 257 | ||
257 | if (QFile::exists( lockName )) return false; | 258 | if (QFile::exists( lockName )) |
259 | { | ||
260 | qDebug("ResourceOpie::lock: lockfile %s already exists. (Delete it before continuing if nobody else is accessing the resourcefile %s)", lockName.latin1(), fileName().latin1()); | ||
261 | return false; | ||
262 | } | ||
258 | 263 | ||
259 | QString lockUniqueName; | 264 | QString lockUniqueName; |
260 | lockUniqueName = fn + KApplication::randomString( 8 ); | 265 | lockUniqueName = fn + KApplication::randomString( 8 ); |
261 | 266 | ||
262 | url = lockUniqueName; | 267 | url = lockUniqueName; |
263 | //US mLockUniqueName = locateLocal( "data", "kabc/lock/" + lockUniqueName ); | 268 | //US mLockUniqueName = locateLocal( "data", "kabc/lock/" + lockUniqueName ); |
@@ -337,39 +342,7 @@ void ResourceOpie::cleanUp() | |||
337 | // qDebug("ResourceOpie::cleanup() %s", mFileName.latin1()); | 342 | // qDebug("ResourceOpie::cleanup() %s", mFileName.latin1()); |
338 | 343 | ||
339 | unlock( fileName() ); | 344 | unlock( fileName() ); |
340 | } | 345 | } |
341 | 346 | ||
342 | 347 | ||
343 | /** | ||
344 | * This method returns the number of elements that are currently in the resource. | ||
345 | */ | ||
346 | int ResourceOpie::count() const | ||
347 | { | ||
348 | qDebug("ResourceOpie::count: %x", mAccess); | ||
349 | |||
350 | if (mAccess != 0) | ||
351 | { | ||
352 | OContactAccess::List contactList = mAccess->allRecords(); | ||
353 | return contactList.count(); | ||
354 | } | ||
355 | else | ||
356 | return 0; | ||
357 | } | ||
358 | |||
359 | |||
360 | /** | ||
361 | * This method removes all elements from the resource!! (Not from the addressbook) | ||
362 | */ | ||
363 | bool ResourceOpie::clear() | ||
364 | { | ||
365 | if (mAccess != 0) { | ||
366 | mAccess->clear(); | ||
367 | return true; | ||
368 | } | ||
369 | else | ||
370 | return false; | ||
371 | } | ||
372 | |||
373 | |||
374 | |||
375 | //US #include "resourceopie.moc" | 348 | //US #include "resourceopie.moc" |