| -rw-r--r-- | libopie2/opiepim/backend/ocontactaccessbackend_xml.h | 24 | ||||
| -rw-r--r-- | libopie2/opiepim/ocontact.h | 2 |
2 files changed, 15 insertions, 11 deletions
diff --git a/libopie2/opiepim/backend/ocontactaccessbackend_xml.h b/libopie2/opiepim/backend/ocontactaccessbackend_xml.h index ae6ec9e..c765ff5 100644 --- a/libopie2/opiepim/backend/ocontactaccessbackend_xml.h +++ b/libopie2/opiepim/backend/ocontactaccessbackend_xml.h @@ -18,4 +18,7 @@ * History: * $Log$ + * Revision 1.9 2002/12/08 12:48:57 eilers + * Moved journal-enum from ocontact into i the xml-backend.. + * * Revision 1.8 2002/11/14 17:04:24 eilers * Sorting will now work if fullname is identical on some entries @@ -343,5 +346,5 @@ class OContactAccessBackend_XML : public OContactAccessBackend { { //qWarning("odefaultbackend: ACTION::ADD"); - updateJournal (newcontact, OContact::ACTION_ADD); + updateJournal (newcontact, ACTION_ADD); addContact_p( newcontact ); @@ -365,5 +368,5 @@ class OContactAccessBackend_XML : public OContactAccessBackend { } if (found) { - updateJournal (contact, OContact::ACTION_REPLACE); + updateJournal (contact, ACTION_REPLACE); m_contactList.remove (it); m_contactList.append (contact); @@ -386,5 +389,5 @@ class OContactAccessBackend_XML : public OContactAccessBackend { } if (found) { - updateJournal ( *it, OContact::ACTION_REMOVE); + updateJournal ( *it, ACTION_REMOVE); m_contactList.remove (it); return true; @@ -399,4 +402,7 @@ class OContactAccessBackend_XML : public OContactAccessBackend { private: + + enum journal_action { ACTION_ADD, ACTION_REMOVE, ACTION_REPLACE }; + void addContact_p( const OContact &newcontact ){ m_contactList.append (newcontact); @@ -418,5 +424,5 @@ class OContactAccessBackend_XML : public OContactAccessBackend { bool foundAction = false; - OContact::journal_action action = OContact::ACTION_ADD; + journal_action action = ACTION_ADD; int journalKey = 0; QMap<int, QString> contactMap; @@ -539,5 +545,5 @@ class OContactAccessBackend_XML : public OContactAccessBackend { */ case JOURNALACTION: - action = OContact::journal_action(it.data().toInt()); + action = journal_action(it.data().toInt()); foundAction = true; qWarning ("ODefBack(journal)::ACTION found: %d", action); @@ -561,13 +567,13 @@ class OContactAccessBackend_XML : public OContactAccessBackend { foundAction = false; switch ( action ) { - case OContact::ACTION_ADD: + case ACTION_ADD: addContact_p (contact); break; - case OContact::ACTION_REMOVE: + case ACTION_REMOVE: if ( !remove (contact.uid()) ) qWarning ("ODefBack(journal)::Unable to remove uid: %d", contact.uid() ); break; - case OContact::ACTION_REPLACE: + case ACTION_REPLACE: if ( !replace ( contact ) ) qWarning ("ODefBack(journal)::Unable to replace uid: %d", @@ -596,5 +602,5 @@ class OContactAccessBackend_XML : public OContactAccessBackend { void updateJournal( const OContact& cnt, - OContact::journal_action action ) { + journal_action action ) { QFile f( m_journalName ); bool created = !f.exists(); diff --git a/libopie2/opiepim/ocontact.h b/libopie2/opiepim/ocontact.h index 65ba43e..1fd1c75 100644 --- a/libopie2/opiepim/ocontact.h +++ b/libopie2/opiepim/ocontact.h @@ -45,6 +45,4 @@ public: virtual ~OContact(); - enum journal_action { ACTION_ADD, ACTION_REMOVE, ACTION_REPLACE }; - /* * do we need to inline them |