Merging changes from BRANCH_1_0 to HEAD

1 files changed, 7 insertions, 2 deletions

diff --git a/libopie/pim/ocontact.h b/libopie/pim/ocontact.h
index dd2de17..9a1a8dc 100644
--- a/libopie/pim/ocontact.h
+++ b/libopie/pim/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;
 };