Use enumerations for detail types and detail fields.

This patch changes the internal representation of detail
types and field names within details from a string-based
representation to enum constants.
Detail definition names are then replaced by the
concept of "Detail Type".
Enum values are also aligned across C++ Vs QML APIs

Authors:
- Tommi Anttila <tommi.4.anttila@nokia.com>
- Claudio Brunelli <claudio.brunelli@nokia.com>
- Cristiano di Flora <cristiano.di-flora@nokia.com>

Change-Id: I8b86022d08f9c3baf84b658f07e6600efdc73b8b
Reviewed-by: Cristiano di Flora <cristiano.di-flora@nokia.com>
Reviewed-by: Claudio Brunelli <claudio.brunelli@nokia.com>

1 files changed, 3 insertions, 15 deletions

diff --git a/src/imports/contacts/details/qdeclarativecontactextendeddetail_p.h b/src/imports/contacts/details/qdeclarativecontactextendeddetail_p.h
index 0bb2044d4..69234aabc 100644
--- a/src/imports/contacts/details/qdeclarativecontactextendeddetail_p.h
+++ b/src/imports/contacts/details/qdeclarativecontactextendeddetail_p.h
@@ -57,8 +57,8 @@ class QDeclarativeContactExtendedDetail : public QDeclarativeContactDetail
     Q_ENUMS(FieldType)
 public:
     enum FieldType {
-        Name = 0,
-        Data
+        Name = QContactExtendedDetail::FieldName,
+        Data = QContactExtendedDetail::FieldData
     };
 
     QDeclarativeContactExtendedDetail (QObject *parent = 0)
@@ -68,7 +68,7 @@ public:
         connect(this, SIGNAL(valueChanged()), SIGNAL(detailChanged()));
     }
 
-    ContactDetailType detailType() const
+    DetailType detailType() const
     {
         return QDeclarativeContactDetail::ExtendedDetail;
     }
@@ -99,18 +99,6 @@ public:
         return detail().value(QContactExtendedDetail::FieldData);
     }
 
-    static QString fieldNameFromFieldType(int type)
-    {
-        switch (type) {
-        case Name:
-            return QContactExtendedDetail::FieldName;
-        case Data:
-            return QContactExtendedDetail::FieldData;
-        }
-        qmlInfo(0) << tr("invalid field type:") << type;
-        return QString();
-    }
-
 signals:
     void valueChanged();
 };