From 6c715b67a8f0e32a4edca5be91332622834c8d91 Mon Sep 17 00:00:00 2001
From: eilers <eilers>
Date: Fri, 01 Aug 2003 12:30:16 +0000
Subject: Merging changes from BRANCH_1_0 to HEAD

---
(limited to 'libopie2/opiepim/ocontact.h')

diff --git a/libopie2/opiepim/ocontact.h b/libopie2/opiepim/ocontact.h
index dd2de17..9a1a8dc 100644
--- a/libopie2/opiepim/ocontact.h
+++ b/libopie2/opiepim/ocontact.h
@@ -32,7 +32,7 @@ QPC_TEMPLATEEXTERN template class QPC_EXPORT QMap<int, QString>;
 // MOC_SKIP_END
 #endif
 
-class ContactPrivate;
+class OContactPrivate;
 
 /**
  * OContact class represents a specialised PIM Record for contacts.
@@ -49,6 +49,11 @@ public:
     OContact( const QMap<int, QString> &fromMap );
     virtual ~OContact();
 
+    enum DateFormat{
+	    Zip_City_State = 0,
+	    City_State_Zip
+    };
+
     /*
      * do we need to inline them
      * if yes do we need to inline them this way?
@@ -233,7 +238,7 @@ private:
 			    const QString &country ) const;
 
     QMap<int, QString> mMap;
-    ContactPrivate *d;
+    OContactPrivate *d;
 };
 
 
--
cgit v0.9.0.2