author | ulf69 <ulf69> | 2004-08-03 20:49:15 (UTC) |
---|---|---|
committer | ulf69 <ulf69> | 2004-08-03 20:49:15 (UTC) |
commit | be52d7d03e57620919b23cb0cbb33ac22d0920e0 (patch) (unidiff) | |
tree | 34e8e29a221c828424126694f865d702c7635f97 /kabc/plugins/opie | |
parent | d5358380edce9a2c39f3eea4df741a148338880c (diff) | |
download | kdepimpi-be52d7d03e57620919b23cb0cbb33ac22d0920e0.zip kdepimpi-be52d7d03e57620919b23cb0cbb33ac22d0920e0.tar.gz kdepimpi-be52d7d03e57620919b23cb0cbb33ac22d0920e0.tar.bz2 |
hopefully last modifications of resource based export/import functionality
for opie, qtopia and sharpdtm
-rw-r--r-- | kabc/plugins/opie/resourceopie.cpp | 39 | ||||
-rw-r--r-- | kabc/plugins/opie/resourceopie.h | 10 |
2 files changed, 6 insertions, 43 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 | |||
@@ -86,8 +86,9 @@ ResourceOpie::ResourceOpie( const QString &fileName, bool syncable ) | |||
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() ) ); |
@@ -253,9 +254,13 @@ bool ResourceOpie::lock( const QString &lockfileName ) | |||
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 | ||
@@ -339,37 +344,5 @@ void ResourceOpie::cleanUp() | |||
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" |
diff --git a/kabc/plugins/opie/resourceopie.h b/kabc/plugins/opie/resourceopie.h index ca30fee..d5b4ebd 100644 --- a/kabc/plugins/opie/resourceopie.h +++ b/kabc/plugins/opie/resourceopie.h | |||
@@ -121,18 +121,8 @@ public: | |||
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 | ||