summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libopie/pim/ocontactaccessbackend_vcard.cpp18
-rw-r--r--libopie/pim/ocontactaccessbackend_vcard.h5
-rw-r--r--libopie2/opiepim/backend/ocontactaccessbackend_vcard.cpp18
-rw-r--r--libopie2/opiepim/backend/ocontactaccessbackend_vcard.h5
4 files changed, 36 insertions, 10 deletions
diff --git a/libopie/pim/ocontactaccessbackend_vcard.cpp b/libopie/pim/ocontactaccessbackend_vcard.cpp
index 903c0b7..013f3af 100644
--- a/libopie/pim/ocontactaccessbackend_vcard.cpp
+++ b/libopie/pim/ocontactaccessbackend_vcard.cpp
@@ -3,2 +3,3 @@
*
+ * Copyright (C) 2000 Trolltech AS. All rights reserved.
* Copyright (c) 2002 by Stefan Eilers (Eilers.Stefan@epost.de)
@@ -18,2 +19,5 @@
* $Log$
+ * Revision 1.2 2002/11/10 15:41:53 eilers
+ * Bugfixes..
+ *
* Revision 1.1 2002/11/09 14:34:52 eilers
@@ -33,3 +37,5 @@ OContactAccessBackend_VCard::OContactAccessBackend_VCard ( QString , QString fil
m_file( filename )
-{}
+{
+ load();
+}
@@ -88,7 +94,5 @@ bool OContactAccessBackend_VCard::save()
vo = createVObject( *it );
- addVObjectProp( obj, vo );
+ writeVObject( file.directHandle() , vo );
+ cleanVObject( vo );
}
- writeVObject( file.directHandle() , obj );
- cleanVObject( obj );
-
cleanStrTbl();
@@ -168,2 +172,6 @@ bool OContactAccessBackend_VCard::hasQuerySettings (uint ) const
+bool OContactAccessBackend_VCard::wasChangedExternally()
+{
+ return false; // Don't expect concurrent access
+}
diff --git a/libopie/pim/ocontactaccessbackend_vcard.h b/libopie/pim/ocontactaccessbackend_vcard.h
index c1422b0..177ec24 100644
--- a/libopie/pim/ocontactaccessbackend_vcard.h
+++ b/libopie/pim/ocontactaccessbackend_vcard.h
@@ -3,2 +3,3 @@
*
+ * Copyright (C) 2000 Trolltech AS. All rights reserved.
* Copyright (c) 2002 by Stefan Eilers (Eilers.Stefan@epost.de)
@@ -18,2 +19,5 @@
* $Log$
+ * Revision 1.2 2002/11/10 15:41:53 eilers
+ * Bugfixes..
+ *
* Revision 1.1 2002/11/09 14:34:52 eilers
@@ -51,2 +55,3 @@ class OContactAccessBackend_VCard : public OContactAccessBackend {
bool hasQuerySettings (uint querySettings) const;
+ bool wasChangedExternally();
diff --git a/libopie2/opiepim/backend/ocontactaccessbackend_vcard.cpp b/libopie2/opiepim/backend/ocontactaccessbackend_vcard.cpp
index 903c0b7..013f3af 100644
--- a/libopie2/opiepim/backend/ocontactaccessbackend_vcard.cpp
+++ b/libopie2/opiepim/backend/ocontactaccessbackend_vcard.cpp
@@ -3,2 +3,3 @@
*
+ * Copyright (C) 2000 Trolltech AS. All rights reserved.
* Copyright (c) 2002 by Stefan Eilers (Eilers.Stefan@epost.de)
@@ -18,2 +19,5 @@
* $Log$
+ * Revision 1.2 2002/11/10 15:41:53 eilers
+ * Bugfixes..
+ *
* Revision 1.1 2002/11/09 14:34:52 eilers
@@ -33,3 +37,5 @@ OContactAccessBackend_VCard::OContactAccessBackend_VCard ( QString , QString fil
m_file( filename )
-{}
+{
+ load();
+}
@@ -88,7 +94,5 @@ bool OContactAccessBackend_VCard::save()
vo = createVObject( *it );
- addVObjectProp( obj, vo );
+ writeVObject( file.directHandle() , vo );
+ cleanVObject( vo );
}
- writeVObject( file.directHandle() , obj );
- cleanVObject( obj );
-
cleanStrTbl();
@@ -168,2 +172,6 @@ bool OContactAccessBackend_VCard::hasQuerySettings (uint ) const
+bool OContactAccessBackend_VCard::wasChangedExternally()
+{
+ return false; // Don't expect concurrent access
+}
diff --git a/libopie2/opiepim/backend/ocontactaccessbackend_vcard.h b/libopie2/opiepim/backend/ocontactaccessbackend_vcard.h
index c1422b0..177ec24 100644
--- a/libopie2/opiepim/backend/ocontactaccessbackend_vcard.h
+++ b/libopie2/opiepim/backend/ocontactaccessbackend_vcard.h
@@ -3,2 +3,3 @@
*
+ * Copyright (C) 2000 Trolltech AS. All rights reserved.
* Copyright (c) 2002 by Stefan Eilers (Eilers.Stefan@epost.de)
@@ -18,2 +19,5 @@
* $Log$
+ * Revision 1.2 2002/11/10 15:41:53 eilers
+ * Bugfixes..
+ *
* Revision 1.1 2002/11/09 14:34:52 eilers
@@ -51,2 +55,3 @@ class OContactAccessBackend_VCard : public OContactAccessBackend {
bool hasQuerySettings (uint querySettings) const;
+ bool wasChangedExternally();