author | eilers <eilers> | 2003-08-01 12:30:16 (UTC) |
---|---|---|
committer | eilers <eilers> | 2003-08-01 12:30:16 (UTC) |
commit | 6c715b67a8f0e32a4edca5be91332622834c8d91 (patch) (side-by-side diff) | |
tree | ae2d660e1fd9c990c2d725c075ce6c42480b0af8 /libopie2/opiepim/ocontact.h | |
parent | cb45aa10043fdd6fddcab42ef0e07ddafc3d506d (diff) | |
download | opie-6c715b67a8f0e32a4edca5be91332622834c8d91.zip opie-6c715b67a8f0e32a4edca5be91332622834c8d91.tar.gz opie-6c715b67a8f0e32a4edca5be91332622834c8d91.tar.bz2 |
Merging changes from BRANCH_1_0 to HEAD
-rw-r--r-- | libopie2/opiepim/ocontact.h | 9 |
1 files changed, 7 insertions, 2 deletions
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 @@ -34,3 +34,3 @@ QPC_TEMPLATEEXTERN template class QPC_EXPORT QMap<int, QString>; -class ContactPrivate; +class OContactPrivate; @@ -51,2 +51,7 @@ public: + enum DateFormat{ + Zip_City_State = 0, + City_State_Zip + }; + /* @@ -235,3 +240,3 @@ private: QMap<int, QString> mMap; - ContactPrivate *d; + OContactPrivate *d; }; |