Changeset 4 for libQtGdata/trunk/qtgdata_contacts.h

Timestamp:

02/05/10 00:24:31 (2 years ago)

Author:

roeland

Message:

Parsing some more contact data.
Added doxygen comments. A lot of cleaning up or design choises are
needed. But lets first get a working prototype.

File:

• libQtGdata/trunk/qtgdata_contacts.h (modified) (2 diffs)

libQtGdata/trunk/qtgdata_contacts.h

@@ -8 +8 @@
 #include <QDateTime>
 #include <QMap>
+#include <QUrl>
+#include <QList>
 
 class QtGdata_contact
 {
   public:
-    enum GDATA_CONTACT_EMAIL {
-      GDATA_CONTACT_EMAIL_OTHER,
-      GDATA_CONTACT_EMAIL_HOME,
-      GDATA_CONTACT_EMAIL_WORK,
+    enum ADDRESS {
+      ADDRESS_OTHER
     };
 
-    enum GDATA_CONTACT_PHONE {
-      GDATA_CONTACT_PHONE_OTHER,
-      GDATA_CONTACT_PHONE_HOME,
-      GDATA_CONTACT_PHONE_HOME_FAX,
-      GDATA_CONTACT_PHONE_WORK,
-      GDATA_CONTACT_PHONE_WORK_FAX,
-      GDATA_CONTACT_PHONE_MOBILE,
-      GDATA_CONTACT_PHONE_PAGER
+    enum EMAIL {
+      EMAIL_OTHER,
+      EMAIL_HOME,
+      EMAIL_WORK,
     };
+
+    enum GENDER {
+      GENDER_MALE,
+      GENDER_FEMALE
+    };
+
+    enum PHONE {
+      PHONE_OTHER,
+      PHONE_HOME,
+      PHONE_HOME_FAX,
+      PHONE_WORK,
+      PHONE_WORK_FAX,
+      PHONE_MOBILE,
+      PHONE_PAGER
+    };
+
+    typedef struct address {
+      QString street;
+      QString postcode;
+      QString city;
+      QString region;
+      QString country;
+
+      QString formattedAddress; /* Overkill?*/
+
+      QtGdata_contact::ADDRESS type;
+    } address;
+
+    typedef struct email {
+      QString email;
+      QtGdata_contact::EMAIL type;
+      bool primary;
+    } email;
+
+    typedef struct name {
+      QString title;
+      QString fullName;
+      QString givenName;
+      QString familyName;
+    } name;
+
+    typedef struct phone {
+      QString phonenumber;
+      QtGdata_contact::PHONE type;
+    } phone;
 
     QtGdata_contact();
@@ -37 +78 @@
     /* Adders */
     void addEmail(const QString email,
-                  const QtGdata_contact::GDATA_CONTACT_EMAIL type = QtGdata_contact::GDATA_CONTACT_EMAIL_OTHER,
+                  const QtGdata_contact::EMAIL type = QtGdata_contact::EMAIL_OTHER,
                   const bool primary = false);
     void addPhone(const QString phonenumber,
-                  const QtGdata_contact::GDATA_CONTACT_PHONE type = QtGdata_contact::GDATA_CONTACT_PHONE_OTHER);
+                  const QtGdata_contact::PHONE type = QtGdata_contact::PHONE_OTHER);
 
     /* Setters */
+    void setAddress(const QString street,
+                    const QString postcode,
+                    const QString city,
+                    const QString region,
+                    const QString country,
+                    const QtGdata_contact::ADDRESS type = QtGdata_contact::ADDRESS_OTHER);
     void setGender(const QString gender);
+    void setLinkEdit(const QString link);
+    void setLinkSelf(const QString link);
     void setName(const QString name);
     void setUpdated(const QDateTime updated);
 
+    /* Set names */
+    void setTitle(const QString name);
+    void setFullName(const QString name);
+    void setGivenName(const QString name);
+    void setFamilyName(const QString name);
+
   private:
     //QDate birthday;
-    QMap<QString, QtGdata_contact::GDATA_CONTACT_EMAIL> email;
-    QString primary_email;
+    QList<address> addresses;
+    QList<email> emails;
     QString gender;
-    QString name;
-    QMap<QString, QtGdata_contact::GDATA_CONTACT_PHONE> phone;
+    name names;
+    QList<phone> phones;
     QDateTime updated;
+
+
+    QUrl linkEdit;
+    QUrl linkSelf;
 };