--- a/qtmobility/src/contacts/details/qcontactavatar.h	Fri Apr 16 15:51:22 2010 +0300
+++ b/qtmobility/src/contacts/details/qcontactavatar.h	Mon May 03 13:18:40 2010 +0300
@@ -43,16 +43,12 @@
 #define QCONTACTAVATAR_H
 
 #include <QString>
-#include <QPixmap>
+#include <QUrl>
+
 #include "qtcontactsglobal.h"
 #include "qcontactdetail.h"
 #include "qcontact.h"
 
-QT_BEGIN_NAMESPACE
-class QPixmap;
-class QSize;
-QT_END_NAMESPACE
-
 QTM_BEGIN_NAMESPACE
 
 /* Leaf class */
@@ -60,41 +56,23 @@
 {
 public:
 #ifdef Q_QDOC
-    const char* DefinitionName;
-    const char* FieldAvatar;
-    const char* FieldAvatarPixmap;
-    const char* FieldSubType;
-    const char* SubTypeImage;
-    const char* SubTypeVideo;
-    const char* SubTypeTexturedMesh;
-    const char* SubTypeAudioRingtone;
-    const char* SubTypeVideoRingtone;
+    static const QLatin1Constant DefinitionName;
+    static const QLatin1Constant FieldImageUrl;
+    static const QLatin1Constant FieldVideoUrl;
 #else
     Q_DECLARE_CUSTOM_CONTACT_DETAIL(QContactAvatar, "Avatar")
-    Q_DECLARE_LATIN1_LITERAL(FieldAvatar, "Avatar");
-    Q_DECLARE_LATIN1_LITERAL(FieldAvatarPixmap, "AvatarPixmap");
-    Q_DECLARE_LATIN1_LITERAL(FieldSubType, "SubType");
-    Q_DECLARE_LATIN1_LITERAL(SubTypeImage, "Image");
-    Q_DECLARE_LATIN1_LITERAL(SubTypeVideo, "Video");
-    Q_DECLARE_LATIN1_LITERAL(SubTypeTexturedMesh, "TexturedMesh");
-    Q_DECLARE_LATIN1_LITERAL(SubTypeAudioRingtone, "AudioRingtone");
-    Q_DECLARE_LATIN1_LITERAL(SubTypeVideoRingtone, "VideoRingtone");
+    Q_DECLARE_LATIN1_CONSTANT(FieldImageUrl, "ImageUrl");
+    Q_DECLARE_LATIN1_CONSTANT(FieldVideoUrl, "VideoUrl");
+    // MeshUri, VibetoneUri, Audio(theme)Uri, ...?
 #endif
 
-    void setAvatar(const QString& avatarPath) {setValue(FieldAvatar, avatarPath);}
-    QString avatar() const {return value(FieldAvatar);}
-    QPixmap pixmap() const {return value<QPixmap>(QContactAvatar::FieldAvatarPixmap);}
-    bool setPixmap(const QPixmap& pixmap)
-    {
-        setSubType(SubTypeImage);
-        return setValue(FieldAvatarPixmap, QVariant::fromValue(pixmap));
-    }
-    
-    void setSubType(const QString& subType) {setValue(FieldSubType, subType);}
-    QString subType() const {return value(FieldSubType);}
+    void setImageUrl(const QUrl& imageUrl) {setValue(FieldImageUrl, imageUrl);}
+    QUrl imageUrl() const {return value<QUrl>(FieldImageUrl);}
+
+    void setVideoUrl(const QUrl& videoUrl) {setValue(FieldVideoUrl, videoUrl);}
+    QUrl videoUrl() const {return value<QUrl>(FieldVideoUrl);}
 };
 
 QTM_END_NAMESPACE
 
 #endif
-