--- a/qtmobility/src/contacts/qcontactmanager.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/contacts/qcontactmanager.h	Fri May 14 16:41:33 2010 +0300
@@ -61,8 +61,6 @@
 QTM_BEGIN_NAMESPACE
 
 class QContactFilter;
-class QContactAction;
-
 class QContactManagerData;
 class Q_CONTACTS_EXPORT QContactManager : public QObject
 {
@@ -70,13 +68,13 @@
 
 public:
 #if Q_QDOC // qdoc's parser fails to recognise the default map argument
-    QContactManager(const QString& managerName = QString(), const QMap<QString, QString>& parameters = 0, QObject* parent = 0);
+    explicit QContactManager(const QString& managerName = QString(), const QMap<QString, QString>& parameters = 0, QObject* parent = 0);
     QContactManager(const QString& managerName, int implementationVersion, const QMap<QString, QString>& parameters = 0, QObject* parent = 0);
 #else
-    QContactManager(const QString& managerName = QString(), const QMap<QString, QString>& parameters = (QMap<QString, QString>()), QObject* parent = 0);
+    explicit QContactManager(const QString& managerName = QString(), const QMap<QString, QString>& parameters = (QMap<QString, QString>()), QObject* parent = 0);
     QContactManager(const QString& managerName, int implementationVersion, const QMap<QString, QString>& parameters = (QMap<QString, QString>()), QObject* parent = 0);
 #endif
-    QContactManager(QObject* parent);
+    explicit QContactManager(QObject* parent);
 
     static QContactManager* fromUri(const QString& uri, QObject* parent = 0);
     ~QContactManager();                     // dtor
@@ -127,7 +125,8 @@
     QContact compatibleContact(const QContact& original); // Preliminary function!
 
     /* Synthesize the display label of a contact */
-    QString synthesizedDisplayLabel(const QContact& contact) const;
+    QString synthesizedContactDisplayLabel(const QContact& contact) const;
+    void synthesizeContactDisplayLabel(QContact* contact) const;
 
     /* "Self" contact id (MyCard) */
     bool setSelfContactId(const QContactLocalId& contactId);