hopefully last modifications of resource based export/import functionality

for opie, qtopia and sharpdtm

2 files changed, 5 insertions, 54 deletions

diff --git a/kabc/plugins/qtopia/resourceqtopia.cpp b/kabc/plugins/qtopia/resourceqtopia.cpp
index 4a35f19..242e0c6 100644
--- a/kabc/plugins/qtopia/resourceqtopia.cpp
+++ b/kabc/plugins/qtopia/resourceqtopia.cpp
@@ -235,3 +235,7 @@ bool ResourceQtopia::lock( const QString &lockfileName )
 
-  if (QFile::exists( lockName )) return false;
+  if (QFile::exists( lockName ))
+  {
+    qDebug("ResourceOpie::lock: lockfile %s already exists. (Delete it before continuing if nobody else is accessing the resourcefile %s)", lockName.latin1(), fileName());
+    return false;
+  }
 
@@ -314,45 +318,2 @@ void ResourceQtopia::cleanUp()
 
-
-
-/**
- * This method returns the number of elements that are currently in the resource.
- */
-int ResourceQtopia::count() const
-{
-  if (mAccess != 0)
-  {
-    int counter = 0;
-    AddressBookIterator it2(*mAccess);
-    for (it2.toFirst(); it2.current(); ++it2) {
-      counter++;
-    }
-
-   	return counter;
-  }
-  else
-    return 0;
-}
-
-
-/**
- * This method removes all elements from the resource!! (Not from the addressbook)
- */
-bool ResourceQtopia::clear()
-{
-  if (mAccess != 0)
-  {
-    AddressBookIterator it2(*mAccess);
-    for (it2.toFirst(); it2.current(); ++it2) {
-      mAccess->removeContact(*it2.current());
-    }
-    return true;
-  }
-  else
-	return false;
-}
-
-
-
-
-
 //US #include "resourceqtopia.moc"
diff --git a/kabc/plugins/qtopia/resourceqtopia.h b/kabc/plugins/qtopia/resourceqtopia.h
index 90ab1f4..eace280 100644
--- a/kabc/plugins/qtopia/resourceqtopia.h
+++ b/kabc/plugins/qtopia/resourceqtopia.h
@@ -124,12 +124,2 @@ public:
 
-  /**
-   * This method returns the number of elements that are currently in the resource.
-   */
-  virtual int count() const;
-
-  /**
-   * This method removes all elements from the resource!! (Not from the addressbook)
-   */
-  virtual bool clear();
-
 protected slots: