summaryrefslogtreecommitdiff
path: root/libopie/pim/ocontact.h
authoreilers <eilers>2003-08-01 12:30:16 (UTC)
committer eilers <eilers>2003-08-01 12:30:16 (UTC)
commit6c715b67a8f0e32a4edca5be91332622834c8d91 (patch) (side-by-side diff)
treeae2d660e1fd9c990c2d725c075ce6c42480b0af8 /libopie/pim/ocontact.h
parentcb45aa10043fdd6fddcab42ef0e07ddafc3d506d (diff)
downloadopie-6c715b67a8f0e32a4edca5be91332622834c8d91.zip
opie-6c715b67a8f0e32a4edca5be91332622834c8d91.tar.gz
opie-6c715b67a8f0e32a4edca5be91332622834c8d91.tar.bz2
Merging changes from BRANCH_1_0 to HEAD
Diffstat (limited to 'libopie/pim/ocontact.h') (more/less context) (ignore whitespace changes)
-rw-r--r--libopie/pim/ocontact.h9
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;
};