--- a/qtmobility/src/contacts/qcontact.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/contacts/qcontact.h	Fri May 14 16:41:33 2010 +0300
@@ -95,11 +95,8 @@
     bool isEmpty() const;
     void clearDetails();
 
-    /* Access details of particular type or which support a particular action */
     QContactDetail detail(const QString& definitionId) const;
     QList<QContactDetail> details(const QString& definitionId = QString()) const;
-    QContactDetail detailWithAction(const QString& actionName) const;
-    QList<QContactDetail> detailsWithAction(const QString& actionName) const;
 
     QList<QContactDetail> details(const QString& definitionName, const QString& fieldName, const QString& value) const;
 
@@ -108,6 +105,11 @@
     QList<QContactDetail> details(const char* definitionId, const char* fieldName, const QString& value) const;
 
     /* Templated retrieval for definition names */
+#ifdef Q_QDOC
+    QContactDetail detail(const QLatin1Constant& definitionName) const;
+    QList<QContactDetail> details(const QLatin1Constant& definitionName) const;
+    QList<QContactDetail> details(const QLatin1Constant& definitionName, const QLatin1Constant& fieldName, const QString& value);
+#else
     template <int N> QContactDetail detail(const QLatin1Constant<N>& definitionName) const
     {
         return detail(definitionName.latin1());
@@ -120,6 +122,7 @@
     {
         return details(definitionName.latin1(), fieldName.latin1(), value);
     }
+#endif
 
     /* Templated (type-specific) detail retrieval */
     template<typename T> QList<T> details() const
@@ -163,15 +166,6 @@
     QList<QContactRelationship> relationships(const QString& relationshipType = QString()) const;
     QList<QContactId> relatedContacts(const QString& relationshipType = QString(), QContactRelationship::Role role = QContactRelationship::Either) const;
 
-    /* Actions available to be performed on this contact */
-    QList<QContactActionDescriptor> availableActions(const QString& vendorName = QString(), int implementationVersion = -1) const;
-
-    /* Preferences (eg, set a particular detail preferred for the SMS action) - subject to change! */
-    bool setPreferredDetail(const QString& actionName, const QContactDetail& preferredDetail);
-    bool isPreferredDetail(const QString& actionName, const QContactDetail& detail) const;
-    QContactDetail preferredDetail(const QString& actionName) const;
-    QMap<QString, QContactDetail> preferredDetails() const;
-
 private:
     friend class QContactManager;
     friend class QContactManagerData;