--- a/qtmobility/src/contacts/qcontactrelationship.h	Fri Apr 16 15:51:22 2010 +0300
+++ b/qtmobility/src/contacts/qcontactrelationship.h	Mon May 03 13:18:40 2010 +0300
@@ -59,21 +59,20 @@
 {
 public:
 #ifdef Q_QDOC
-    const char* HasMember;
-    const char* Aggregates;
-    const char* Is;
-    const char* IsSameAs;
-    const char* HasAssistant;
-    const char* HasManager;
-    const char* HasSpouse;
+    static const QLatin1Constant HasMember;
+    static const QLatin1Constant Aggregates;
+    static const QLatin1Constant Is;
+    static const QLatin1Constant IsSameAs;
+    static const QLatin1Constant HasAssistant;
+    static const QLatin1Constant HasManager;
+    static const QLatin1Constant HasSpouse;
 #else
-    Q_DECLARE_LATIN1_LITERAL(HasMember, "HasMember");
-    Q_DECLARE_LATIN1_LITERAL(Aggregates, "Aggregates");
-    Q_DECLARE_LATIN1_LITERAL(Is, "IsSameAs"); // deprecated
-    Q_DECLARE_LATIN1_LITERAL(IsSameAs, "IsSameAs");
-    Q_DECLARE_LATIN1_LITERAL(HasAssistant, "HasAssistant");
-    Q_DECLARE_LATIN1_LITERAL(HasManager, "HasManager");
-    Q_DECLARE_LATIN1_LITERAL(HasSpouse, "HasSpouse");
+    Q_DECLARE_LATIN1_CONSTANT(HasMember, "HasMember");
+    Q_DECLARE_LATIN1_CONSTANT(Aggregates, "Aggregates");
+    Q_DECLARE_LATIN1_CONSTANT(IsSameAs, "IsSameAs");
+    Q_DECLARE_LATIN1_CONSTANT(HasAssistant, "HasAssistant");
+    Q_DECLARE_LATIN1_CONSTANT(HasManager, "HasManager");
+    Q_DECLARE_LATIN1_CONSTANT(HasSpouse, "HasSpouse");
 #endif
 
     QContactRelationship();
@@ -92,10 +91,21 @@
     void setSecond(const QContactId& secondId);
     void setRelationshipType(const QString& relationshipType);
 
+    enum Role {
+        First = 0,
+        Second,
+        Either
+    };
+
 private:
     QSharedDataPointer<QContactRelationshipPrivate> d;
 };
 
+Q_CONTACTS_EXPORT uint qHash(const QContactRelationship& key);
+#ifndef QT_NO_DEBUG_STREAM
+Q_CONTACTS_EXPORT QDebug operator<<(QDebug dbg, const QContactRelationship& rel);
+#endif
+
 QTM_END_NAMESPACE
 
 #endif