-rw-r--r-- | kabc/plugins/sharpdtm/resourcesharpdtm.cpp | 30 | ||||
-rw-r--r-- | kabc/plugins/sharpdtm/resourcesharpdtm.h | 10 |
2 files changed, 6 insertions, 34 deletions
diff --git a/kabc/plugins/sharpdtm/resourcesharpdtm.cpp b/kabc/plugins/sharpdtm/resourcesharpdtm.cpp index 14f272d..70c3718 100644 --- a/kabc/plugins/sharpdtm/resourcesharpdtm.cpp +++ b/kabc/plugins/sharpdtm/resourcesharpdtm.cpp | |||
@@ -246,13 +246,18 @@ bool ResourceSharpDTM::lock( const QString &lockfileName ) | |||
246 | 246 | ||
247 | KURL url(fn); | 247 | KURL url(fn); |
248 | QString lockName = locateLocal( "data", "kabc/lock/" + url.fileName() + ".lock" ); | 248 | QString lockName = locateLocal( "data", "kabc/lock/" + url.fileName() + ".lock" ); |
249 | 249 | ||
250 | kdDebug(5700) << "-- lock name: " << lockName << endl; | 250 | kdDebug(5700) << "-- lock name: " << lockName << endl; |
251 | 251 | ||
252 | if (QFile::exists( lockName )) return false; | 252 | if (QFile::exists( lockName )) |
253 | { | ||
254 | qDebug("ResourceSharpDTM::lock: lockfile %s already exists. (Delete it before continuing if nobody else is accessing the resourcefile %s)", lockName.latin1(), fileName()); | ||
255 | return false; | ||
256 | } | ||
257 | |||
253 | 258 | ||
254 | QString lockUniqueName; | 259 | QString lockUniqueName; |
255 | lockUniqueName = fn + KApplication::randomString( 8 ); | 260 | lockUniqueName = fn + KApplication::randomString( 8 ); |
256 | 261 | ||
257 | url = lockUniqueName; | 262 | url = lockUniqueName; |
258 | //US mLockUniqueName = locateLocal( "data", "kabc/lock/" + lockUniqueName ); | 263 | //US mLockUniqueName = locateLocal( "data", "kabc/lock/" + lockUniqueName ); |
@@ -325,31 +330,8 @@ void ResourceSharpDTM::removeAddressee( const Addressee &addr ) | |||
325 | 330 | ||
326 | void ResourceSharpDTM::cleanUp() | 331 | void ResourceSharpDTM::cleanUp() |
327 | { | 332 | { |
328 | unlock( fileName() ); | 333 | unlock( fileName() ); |
329 | } | 334 | } |
330 | 335 | ||
331 | /** | ||
332 | * This method returns the number of elements that are currently in the resource. | ||
333 | */ | ||
334 | int ResourceSharpDTM::count() const | ||
335 | { | ||
336 | if (mAccess != 0) | ||
337 | return mAccess->count(); | ||
338 | else | ||
339 | return 0; | ||
340 | } | ||
341 | |||
342 | |||
343 | /** | ||
344 | * This method removes all elements from the resource!! (Not from the addressbook) | ||
345 | */ | ||
346 | bool ResourceSharpDTM::clear() | ||
347 | { | ||
348 | if (mAccess != 0) | ||
349 | return mAccess->deleteCard(0, SlZDataBase::AllCard ); | ||
350 | else | ||
351 | return false; | ||
352 | } | ||
353 | |||
354 | 336 | ||
355 | 337 | ||
diff --git a/kabc/plugins/sharpdtm/resourcesharpdtm.h b/kabc/plugins/sharpdtm/resourcesharpdtm.h index 60d38a1..f386e69 100644 --- a/kabc/plugins/sharpdtm/resourcesharpdtm.h +++ b/kabc/plugins/sharpdtm/resourcesharpdtm.h | |||
@@ -119,22 +119,12 @@ public: | |||
119 | /** | 119 | /** |
120 | * This method is called by an error handler if the application | 120 | * This method is called by an error handler if the application |
121 | * crashed | 121 | * crashed |
122 | */ | 122 | */ |
123 | virtual void cleanUp(); | 123 | virtual void cleanUp(); |
124 | 124 | ||
125 | /** | ||
126 | * This method returns the number of elements that are currently in the resource. | ||
127 | */ | ||
128 | virtual int count() const; | ||
129 | |||
130 | /** | ||
131 | * This method removes all elements from the resource!! (Not from the addressbook) | ||
132 | */ | ||
133 | virtual bool clear(); | ||
134 | |||
135 | 125 | ||
136 | protected slots: | 126 | protected slots: |
137 | void fileChanged(); | 127 | void fileChanged(); |
138 | 128 | ||
139 | protected: | 129 | protected: |
140 | void init( const QString &fileName ); | 130 | void init( const QString &fileName ); |