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, 2 insertions, 14 deletions

diff --git a/src/imports/contacts/details/qdeclarativecontactdisplaylabel_p.h b/src/imports/contacts/details/qdeclarativecontactdisplaylabel_p.h
index 325fc1d33..80679d898 100644
--- a/src/imports/contacts/details/qdeclarativecontactdisplaylabel_p.h
+++ b/src/imports/contacts/details/qdeclarativecontactdisplaylabel_p.h
@@ -57,7 +57,7 @@ class QDeclarativeContactDisplayLabel : public QDeclarativeContactDetail
     Q_CLASSINFO("DefaultProperty", "label")
 public:
     enum FieldType {
-        Label = 0
+        Label = QContactDisplayLabel::FieldLabel
     };
     QDeclarativeContactDisplayLabel(QObject* parent = 0)
         :QDeclarativeContactDetail(parent)
@@ -66,23 +66,11 @@ public:
         connect(this, SIGNAL(valueChanged()), SIGNAL(detailChanged()));
     }
 
-    ContactDetailType detailType() const
+    DetailType detailType() const
     {
         return QDeclarativeContactDetail::DisplayLabel;
     }
 
-    static QString fieldNameFromFieldType(int fieldType)
-    {
-        switch (fieldType) {
-        case Label:
-            return QContactDisplayLabel::FieldLabel;
-        default:
-            break;
-        }
-        qmlInfo(0) << tr("Unknown field type.");
-        return QString();
-    }
-
     QString label() const {
         return detail().value(QContactDisplayLabel::FieldLabel).toString();
     }