--- a/qtmobility/src/contacts/details/qcontactname.h	Fri Apr 16 15:51:22 2010 +0300
+++ b/qtmobility/src/contacts/details/qcontactname.h	Mon May 03 13:18:40 2010 +0300
@@ -55,27 +55,21 @@
 {
 public:
 #ifdef Q_QDOC
-    const char* DefinitionName;
-    const char* FieldPrefix;
-    const char* FieldFirst; // deprecated
-    const char* FieldMiddle;// deprecated
-    const char* FieldLast;  // deprecated
-    const char* FieldFirstName;
-    const char* FieldMiddleName;
-    const char* FieldLastName;
-    const char* FieldSuffix;
-    const char* FieldCustomLabel;
+    static const QLatin1Constant DefinitionName;
+    static const QLatin1Constant FieldPrefix;
+    static const QLatin1Constant FieldFirstName;
+    static const QLatin1Constant FieldMiddleName;
+    static const QLatin1Constant FieldLastName;
+    static const QLatin1Constant FieldSuffix;
+    static const QLatin1Constant FieldCustomLabel;
 #else
     Q_DECLARE_CUSTOM_CONTACT_DETAIL(QContactName, "Name")
-    Q_DECLARE_LATIN1_LITERAL(FieldPrefix, "Prefix");
-    Q_DECLARE_LATIN1_LITERAL(FieldFirst, "FirstName");  // deprecated
-    Q_DECLARE_LATIN1_LITERAL(FieldMiddle, "MiddleName");// deprecated
-    Q_DECLARE_LATIN1_LITERAL(FieldLast, "LastName");    // deprecated
-    Q_DECLARE_LATIN1_LITERAL(FieldFirstName, "FirstName");
-    Q_DECLARE_LATIN1_LITERAL(FieldMiddleName, "MiddleName");
-    Q_DECLARE_LATIN1_LITERAL(FieldLastName, "LastName");
-    Q_DECLARE_LATIN1_LITERAL(FieldSuffix, "Suffix");
-    Q_DECLARE_LATIN1_LITERAL(FieldCustomLabel, "CustomLabel");
+    Q_DECLARE_LATIN1_CONSTANT(FieldPrefix, "Prefix");
+    Q_DECLARE_LATIN1_CONSTANT(FieldFirstName, "FirstName");
+    Q_DECLARE_LATIN1_CONSTANT(FieldMiddleName, "MiddleName");
+    Q_DECLARE_LATIN1_CONSTANT(FieldLastName, "LastName");
+    Q_DECLARE_LATIN1_CONSTANT(FieldSuffix, "Suffix");
+    Q_DECLARE_LATIN1_CONSTANT(FieldCustomLabel, "CustomLabel");
 #endif
 
     QString prefix() const {return value(FieldPrefix);}