author | eilers <eilers> | 2002-11-10 15:41:53 (UTC) |
---|---|---|
committer | eilers <eilers> | 2002-11-10 15:41:53 (UTC) |
commit | b0b173498acde27957f8ed9297bb2ed2346eb700 (patch) (unidiff) | |
tree | 615180f2fda640ae036450701cf7a728461e7055 /libopie | |
parent | a982df01d5755c1280c6279df6d46791bd4c9e7e (diff) | |
download | opie-b0b173498acde27957f8ed9297bb2ed2346eb700.zip opie-b0b173498acde27957f8ed9297bb2ed2346eb700.tar.gz opie-b0b173498acde27957f8ed9297bb2ed2346eb700.tar.bz2 |
Bugfixes..
-rw-r--r-- | libopie/pim/ocontactaccessbackend_vcard.cpp | 18 | ||||
-rw-r--r-- | libopie/pim/ocontactaccessbackend_vcard.h | 5 |
2 files changed, 18 insertions, 5 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,6 +1,7 @@ | |||
1 | /* | 1 | /* |
2 | * VCard Backend for the OPIE-Contact Database. | 2 | * VCard Backend for the OPIE-Contact Database. |
3 | * | 3 | * |
4 | * Copyright (C) 2000 Trolltech AS. All rights reserved. | ||
4 | * Copyright (c) 2002 by Stefan Eilers (Eilers.Stefan@epost.de) | 5 | * Copyright (c) 2002 by Stefan Eilers (Eilers.Stefan@epost.de) |
5 | * | 6 | * |
6 | * ===================================================================== | 7 | * ===================================================================== |
@@ -16,6 +17,9 @@ | |||
16 | * ===================================================================== | 17 | * ===================================================================== |
17 | * History: | 18 | * History: |
18 | * $Log$ | 19 | * $Log$ |
20 | * Revision 1.2 2002/11/10 15:41:53 eilers | ||
21 | * Bugfixes.. | ||
22 | * | ||
19 | * Revision 1.1 2002/11/09 14:34:52 eilers | 23 | * Revision 1.1 2002/11/09 14:34:52 eilers |
20 | * Added VCard Backend. | 24 | * Added VCard Backend. |
21 | * | 25 | * |
@@ -31,7 +35,9 @@ | |||
31 | OContactAccessBackend_VCard::OContactAccessBackend_VCard ( QString , QString filename = 0l ): | 35 | OContactAccessBackend_VCard::OContactAccessBackend_VCard ( QString , QString filename = 0l ): |
32 | m_dirty( false ), | 36 | m_dirty( false ), |
33 | m_file( filename ) | 37 | m_file( filename ) |
34 | {} | 38 | { |
39 | load(); | ||
40 | } | ||
35 | 41 | ||
36 | 42 | ||
37 | bool OContactAccessBackend_VCard::load () | 43 | bool OContactAccessBackend_VCard::load () |
@@ -86,11 +92,9 @@ bool OContactAccessBackend_VCard::save() | |||
86 | VObject *vo; | 92 | VObject *vo; |
87 | for(QMap<int, OContact>::ConstIterator it=m_map.begin(); it !=m_map.end(); ++it ){ | 93 | for(QMap<int, OContact>::ConstIterator it=m_map.begin(); it !=m_map.end(); ++it ){ |
88 | vo = createVObject( *it ); | 94 | vo = createVObject( *it ); |
89 | addVObjectProp( obj, vo ); | 95 | writeVObject( file.directHandle() , vo ); |
96 | cleanVObject( vo ); | ||
90 | } | 97 | } |
91 | writeVObject( file.directHandle() , obj ); | ||
92 | cleanVObject( obj ); | ||
93 | |||
94 | cleanStrTbl(); | 98 | cleanStrTbl(); |
95 | 99 | ||
96 | m_dirty = false; | 100 | m_dirty = false; |
@@ -166,6 +170,10 @@ bool OContactAccessBackend_VCard::hasQuerySettings (uint ) const | |||
166 | return false; // No search possible, therefore all settings invalid ;) | 170 | return false; // No search possible, therefore all settings invalid ;) |
167 | } | 171 | } |
168 | 172 | ||
173 | bool OContactAccessBackend_VCard::wasChangedExternally() | ||
174 | { | ||
175 | return false; // Don't expect concurrent access | ||
176 | } | ||
169 | 177 | ||
170 | // *** Private stuff *** | 178 | // *** Private stuff *** |
171 | 179 | ||
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,6 +1,7 @@ | |||
1 | /* | 1 | /* |
2 | * VCard Backend for the OPIE-Contact Database. | 2 | * VCard Backend for the OPIE-Contact Database. |
3 | * | 3 | * |
4 | * Copyright (C) 2000 Trolltech AS. All rights reserved. | ||
4 | * Copyright (c) 2002 by Stefan Eilers (Eilers.Stefan@epost.de) | 5 | * Copyright (c) 2002 by Stefan Eilers (Eilers.Stefan@epost.de) |
5 | * | 6 | * |
6 | * ===================================================================== | 7 | * ===================================================================== |
@@ -16,6 +17,9 @@ | |||
16 | * ===================================================================== | 17 | * ===================================================================== |
17 | * History: | 18 | * History: |
18 | * $Log$ | 19 | * $Log$ |
20 | * Revision 1.2 2002/11/10 15:41:53 eilers | ||
21 | * Bugfixes.. | ||
22 | * | ||
19 | * Revision 1.1 2002/11/09 14:34:52 eilers | 23 | * Revision 1.1 2002/11/09 14:34:52 eilers |
20 | * Added VCard Backend. | 24 | * Added VCard Backend. |
21 | * | 25 | * |
@@ -49,6 +53,7 @@ class OContactAccessBackend_VCard : public OContactAccessBackend { | |||
49 | 53 | ||
50 | const uint querySettings(); | 54 | const uint querySettings(); |
51 | bool hasQuerySettings (uint querySettings) const; | 55 | bool hasQuerySettings (uint querySettings) const; |
56 | bool wasChangedExternally(); | ||
52 | 57 | ||
53 | private: | 58 | private: |
54 | OContact parseVObject( VObject* obj ); | 59 | OContact parseVObject( VObject* obj ); |