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
@@ -1,9 +1,10 @@
 /*
 * VCard Backend for the OPIE-Contact Database.
 *
+ * Copyright (C) 2000 Trolltech AS.  All rights reserved.
 * Copyright (c) 2002 by Stefan Eilers (Eilers.Stefan@epost.de)
 *
 * =====================================================================
         *This program is free software; you can redistribute it and/or
         *modify it under the terms of the GNU Library General Public
 *      License as published by the Free Software Foundation; either
@@ -13,12 +14,15 @@
 *
 * =====================================================================
 * Version: $Id$
 * =====================================================================
 * History:
 * $Log$
+ * Revision 1.2  2002/11/10 15:41:53  eilers
+ * Bugfixes..
+ *
 * Revision 1.1  2002/11/09 14:34:52  eilers
 * Added VCard Backend.
 *
 */
 #include "ocontactaccessbackend_vcard.h"
 #include "../../library/backend/vobject_p.h"
@@ -28,13 +32,15 @@
 #include <qfile.h>
 OContactAccessBackend_VCard::OContactAccessBackend_VCard ( QString , QString filename = 0l ):
        m_dirty( false ),
        m_file( filename )
-{}
+{
+        load();
+}
 bool OContactAccessBackend_VCard::load ()
 {   
        m_map.clear();
        m_dirty = false;
@@ -83,17 +89,15 @@ bool OContactAccessBackend_VCard::save()
        obj = newVObject( VCCalProp );
        addPropValue( obj, VCVersionProp, "1.0" );
        VObject *vo;
        for(QMap<int, OContact>::ConstIterator it=m_map.begin(); it !=m_map.end(); ++it ){
                vo = createVObject( *it );
-                addVObjectProp( obj, vo );
+                writeVObject( file.directHandle() , vo );
+                cleanVObject( vo );
        }
-        writeVObject( file.directHandle() , obj );
-        cleanVObject( obj );
-        
        cleanStrTbl();
        m_dirty = false;
        return true;
        
@@ -163,12 +167,16 @@ const uint OContactAccessBackend_VCard::querySettings()
 bool OContactAccessBackend_VCard::hasQuerySettings (uint ) const
 {
        return false; // No search possible, therefore all settings invalid ;)
 }
+bool OContactAccessBackend_VCard::wasChangedExternally()
+{
+        return false; // Don't expect concurrent access
+}
 // *** Private stuff ***
 OContact OContactAccessBackend_VCard::parseVObject( VObject *obj )
 {
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
@@ -1,9 +1,10 @@
 /*
 * VCard Backend for the OPIE-Contact Database.
 *
+ * Copyright (C) 2000 Trolltech AS.  All rights reserved.
 * Copyright (c) 2002 by Stefan Eilers (Eilers.Stefan@epost.de)
 *
 * =====================================================================
         *This program is free software; you can redistribute it and/or
         *modify it under the terms of the GNU Library General Public
 *      License as published by the Free Software Foundation; either
@@ -13,12 +14,15 @@
 *
 * =====================================================================
 * Version: $Id$
 * =====================================================================
 * History:
 * $Log$
+ * Revision 1.2  2002/11/10 15:41:53  eilers
+ * Bugfixes..
+ *
 * Revision 1.1  2002/11/09 14:34:52  eilers
 * Added VCard Backend.
 *
 */
 #ifndef __OCONTACTACCESSBACKEND_VCARD_H_
 #define __OCONTACTACCESSBACKEND_VCARD_H_
@@ -46,12 +50,13 @@ class OContactAccessBackend_VCard : public OContactAccessBackend {
        QArray<int> allRecords() const;
        QArray<int> queryByExample ( const OContact &query, int settings );
        QArray<int> matchRegexp(  const QRegExp &r ) const;
        const uint querySettings();
        bool hasQuerySettings (uint querySettings) const;
+        bool wasChangedExternally();
        
 private:
        OContact parseVObject( VObject* obj );
        VObject* createVObject( const OContact& c );
        QDate convVCardDateToDate( const QString& datestr );
        VObject *safeAddPropValue( VObject *o, const char* prop, const QString& value );
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
@@ -1,9 +1,10 @@
 /*
 * VCard Backend for the OPIE-Contact Database.
 *
+ * Copyright (C) 2000 Trolltech AS.  All rights reserved.
 * Copyright (c) 2002 by Stefan Eilers (Eilers.Stefan@epost.de)
 *
 * =====================================================================
         *This program is free software; you can redistribute it and/or
         *modify it under the terms of the GNU Library General Public
 *      License as published by the Free Software Foundation; either
@@ -13,12 +14,15 @@
 *
 * =====================================================================
 * Version: $Id$
 * =====================================================================
 * History:
 * $Log$
+ * Revision 1.2  2002/11/10 15:41:53  eilers
+ * Bugfixes..
+ *
 * Revision 1.1  2002/11/09 14:34:52  eilers
 * Added VCard Backend.
 *
 */
 #include "ocontactaccessbackend_vcard.h"
 #include "../../library/backend/vobject_p.h"
@@ -28,13 +32,15 @@
 #include <qfile.h>
 OContactAccessBackend_VCard::OContactAccessBackend_VCard ( QString , QString filename = 0l ):
        m_dirty( false ),
        m_file( filename )
-{}
+{
+        load();
+}
 bool OContactAccessBackend_VCard::load ()
 {   
        m_map.clear();
        m_dirty = false;
@@ -83,17 +89,15 @@ bool OContactAccessBackend_VCard::save()
        obj = newVObject( VCCalProp );
        addPropValue( obj, VCVersionProp, "1.0" );
        VObject *vo;
        for(QMap<int, OContact>::ConstIterator it=m_map.begin(); it !=m_map.end(); ++it ){
                vo = createVObject( *it );
-                addVObjectProp( obj, vo );
+                writeVObject( file.directHandle() , vo );
+                cleanVObject( vo );
        }
-        writeVObject( file.directHandle() , obj );
-        cleanVObject( obj );
-        
        cleanStrTbl();
        m_dirty = false;
        return true;
        
@@ -163,12 +167,16 @@ const uint OContactAccessBackend_VCard::querySettings()
 bool OContactAccessBackend_VCard::hasQuerySettings (uint ) const
 {
        return false; // No search possible, therefore all settings invalid ;)
 }
+bool OContactAccessBackend_VCard::wasChangedExternally()
+{
+        return false; // Don't expect concurrent access
+}
 // *** Private stuff ***
 OContact OContactAccessBackend_VCard::parseVObject( VObject *obj )
 {
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
@@ -1,9 +1,10 @@
 /*
 * VCard Backend for the OPIE-Contact Database.
 *
+ * Copyright (C) 2000 Trolltech AS.  All rights reserved.
 * Copyright (c) 2002 by Stefan Eilers (Eilers.Stefan@epost.de)
 *
 * =====================================================================
         *This program is free software; you can redistribute it and/or
         *modify it under the terms of the GNU Library General Public
 *      License as published by the Free Software Foundation; either
@@ -13,12 +14,15 @@
 *
 * =====================================================================
 * Version: $Id$
 * =====================================================================
 * History:
 * $Log$
+ * Revision 1.2  2002/11/10 15:41:53  eilers
+ * Bugfixes..
+ *
 * Revision 1.1  2002/11/09 14:34:52  eilers
 * Added VCard Backend.
 *
 */
 #ifndef __OCONTACTACCESSBACKEND_VCARD_H_
 #define __OCONTACTACCESSBACKEND_VCARD_H_
@@ -46,12 +50,13 @@ class OContactAccessBackend_VCard : public OContactAccessBackend {
        QArray<int> allRecords() const;
        QArray<int> queryByExample ( const OContact &query, int settings );
        QArray<int> matchRegexp(  const QRegExp &r ) const;
        const uint querySettings();
        bool hasQuerySettings (uint querySettings) const;
+        bool wasChangedExternally();
        
 private:
        OContact parseVObject( VObject* obj );
        VObject* createVObject( const OContact& c );
        QDate convVCardDateToDate( const QString& datestr );
        VObject *safeAddPropValue( VObject *o, const char* prop, const QString& value );