summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libopie/pim/ocontact.h2
-rw-r--r--libopie/pim/ocontactaccessbackend_xml.h24
-rw-r--r--libopie2/opiepim/backend/ocontactaccessbackend_xml.h24
-rw-r--r--libopie2/opiepim/ocontact.h2
4 files changed, 30 insertions, 22 deletions
diff --git a/libopie/pim/ocontact.h b/libopie/pim/ocontact.h
index 65ba43e..1fd1c75 100644
--- a/libopie/pim/ocontact.h
+++ b/libopie/pim/ocontact.h
@@ -43,10 +43,8 @@ public:
OContact();
OContact( const QMap<int, QString> &fromMap );
virtual ~OContact();
- enum journal_action { ACTION_ADD, ACTION_REMOVE, ACTION_REPLACE };
-
/*
* do we need to inline them
* if yes do we need to inline them this way?
* -zecke
diff --git a/libopie/pim/ocontactaccessbackend_xml.h b/libopie/pim/ocontactaccessbackend_xml.h
index ae6ec9e..c765ff5 100644
--- a/libopie/pim/ocontactaccessbackend_xml.h
+++ b/libopie/pim/ocontactaccessbackend_xml.h
@@ -16,8 +16,11 @@
* Version: $Id$
* =====================================================================
* 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
*
* Revision 1.7 2002/11/13 15:02:46 eilers
@@ -341,9 +344,9 @@ class OContactAccessBackend_XML : public OContactAccessBackend {
}
bool add ( const OContact &newcontact )
{
//qWarning("odefaultbackend: ACTION::ADD");
- updateJournal (newcontact, OContact::ACTION_ADD);
+ updateJournal (newcontact, ACTION_ADD);
addContact_p( newcontact );
m_changed = true;
@@ -363,9 +366,9 @@ class OContactAccessBackend_XML : public OContactAccessBackend {
break;
}
}
if (found) {
- updateJournal (contact, OContact::ACTION_REPLACE);
+ updateJournal (contact, ACTION_REPLACE);
m_contactList.remove (it);
m_contactList.append (contact);
return true;
} else
@@ -384,9 +387,9 @@ class OContactAccessBackend_XML : public OContactAccessBackend {
break;
}
}
if (found) {
- updateJournal ( *it, OContact::ACTION_REMOVE);
+ updateJournal ( *it, ACTION_REMOVE);
m_contactList.remove (it);
return true;
} else
return false;
@@ -397,8 +400,11 @@ class OContactAccessBackend_XML : public OContactAccessBackend {
return ( load() );
}
private:
+
+ enum journal_action { ACTION_ADD, ACTION_REMOVE, ACTION_REPLACE };
+
void addContact_p( const OContact &newcontact ){
m_contactList.append (newcontact);
}
@@ -416,9 +422,9 @@ class OContactAccessBackend_XML : public OContactAccessBackend {
const int JOURNALACTION = Qtopia::Notes + 1;
const int JOURNALROW = JOURNALACTION + 1;
bool foundAction = false;
- OContact::journal_action action = OContact::ACTION_ADD;
+ journal_action action = ACTION_ADD;
int journalKey = 0;
QMap<int, QString> contactMap;
QMap<QString, QString> customMap;
QMap<QString, QString>::Iterator customIt;
@@ -537,9 +543,9 @@ class OContactAccessBackend_XML : public OContactAccessBackend {
contact.setCategories( Qtopia::Record::idsFromString( it.data( )));
break;
*/
case JOURNALACTION:
- action = OContact::journal_action(it.data().toInt());
+ action = journal_action(it.data().toInt());
foundAction = true;
qWarning ("ODefBack(journal)::ACTION found: %d", action);
break;
case JOURNALROW:
@@ -559,17 +565,17 @@ class OContactAccessBackend_XML : public OContactAccessBackend {
if (foundAction){
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",
contact.uid() );
break;
@@ -594,9 +600,9 @@ 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();
if ( !f.open(IO_WriteOnly|IO_Append) )
return;
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
@@ -16,8 +16,11 @@
* Version: $Id$
* =====================================================================
* 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
*
* Revision 1.7 2002/11/13 15:02:46 eilers
@@ -341,9 +344,9 @@ class OContactAccessBackend_XML : public OContactAccessBackend {
}
bool add ( const OContact &newcontact )
{
//qWarning("odefaultbackend: ACTION::ADD");
- updateJournal (newcontact, OContact::ACTION_ADD);
+ updateJournal (newcontact, ACTION_ADD);
addContact_p( newcontact );
m_changed = true;
@@ -363,9 +366,9 @@ class OContactAccessBackend_XML : public OContactAccessBackend {
break;
}
}
if (found) {
- updateJournal (contact, OContact::ACTION_REPLACE);
+ updateJournal (contact, ACTION_REPLACE);
m_contactList.remove (it);
m_contactList.append (contact);
return true;
} else
@@ -384,9 +387,9 @@ class OContactAccessBackend_XML : public OContactAccessBackend {
break;
}
}
if (found) {
- updateJournal ( *it, OContact::ACTION_REMOVE);
+ updateJournal ( *it, ACTION_REMOVE);
m_contactList.remove (it);
return true;
} else
return false;
@@ -397,8 +400,11 @@ class OContactAccessBackend_XML : public OContactAccessBackend {
return ( load() );
}
private:
+
+ enum journal_action { ACTION_ADD, ACTION_REMOVE, ACTION_REPLACE };
+
void addContact_p( const OContact &newcontact ){
m_contactList.append (newcontact);
}
@@ -416,9 +422,9 @@ class OContactAccessBackend_XML : public OContactAccessBackend {
const int JOURNALACTION = Qtopia::Notes + 1;
const int JOURNALROW = JOURNALACTION + 1;
bool foundAction = false;
- OContact::journal_action action = OContact::ACTION_ADD;
+ journal_action action = ACTION_ADD;
int journalKey = 0;
QMap<int, QString> contactMap;
QMap<QString, QString> customMap;
QMap<QString, QString>::Iterator customIt;
@@ -537,9 +543,9 @@ class OContactAccessBackend_XML : public OContactAccessBackend {
contact.setCategories( Qtopia::Record::idsFromString( it.data( )));
break;
*/
case JOURNALACTION:
- action = OContact::journal_action(it.data().toInt());
+ action = journal_action(it.data().toInt());
foundAction = true;
qWarning ("ODefBack(journal)::ACTION found: %d", action);
break;
case JOURNALROW:
@@ -559,17 +565,17 @@ class OContactAccessBackend_XML : public OContactAccessBackend {
if (foundAction){
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",
contact.uid() );
break;
@@ -594,9 +600,9 @@ 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();
if ( !f.open(IO_WriteOnly|IO_Append) )
return;
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
@@ -43,10 +43,8 @@ public:
OContact();
OContact( const QMap<int, QString> &fromMap );
virtual ~OContact();
- enum journal_action { ACTION_ADD, ACTION_REMOVE, ACTION_REPLACE };
-
/*
* do we need to inline them
* if yes do we need to inline them this way?
* -zecke