Merge branch 'master' into contact_dialog

[situare] / src / ui / friendlistitem.cpp

diff --git a/src/ui/friendlistitem.cpp b/src/ui/friendlistitem.cpp
index c4491f2..9a8c67a 100644 (file)
--- a/src/ui/friendlistitem.cpp
+++ b/src/ui/friendlistitem.cpp
@@ -36,44 +36,21 @@ FriendListItem::FriendListItem()
     setSubitemTextWidth(SUBITEM_TEXT_MAX_WIDTH);
 }
 
-GeoCoordinate FriendListItem::coordinates() const
+FriendListItem::~FriendListItem()
 {
     qDebug() << __PRETTY_FUNCTION__;
-
-    return m_coordinates;
 }
 
-void FriendListItem::setUserData(User *user)
+GeoCoordinate FriendListItem::coordinates() const
 {
     qDebug() << __PRETTY_FUNCTION__;
 
-    QString unit;
-    double value;
-    user->distance(value, unit);
-    QString distanceText = QString::number(value) + " " + unit;
-    setData(DISTANCE_TEXT_DISPLAY_INDEX, distanceText);
-    setDistanceIcon(value, unit);
-
-    //Dummy value to get painter font metrics.
-    QPixmap p = QPixmap(ICON_WIDTH, ICON_HEIGHT);
-    QPainter painter(&p);
-    painter.setFont(NOKIA_FONT_SMALL);
-    QFontMetrics distanceTextFontMetrics = painter.fontMetrics();
-    QRect distanceRect = distanceTextFontMetrics.boundingRect(distanceText);
-
-    setData(DISTANCE_SIZE_HINT_INDEX, distanceRect);
-    setTitle(shortenText(user->name(), NAME_TEXT_MAX_WIDTH - distanceRect.width() + MARGIN,
-                        ListItem::TEXT_SIZE_NORMAL));
-    setCoordinates(user->coordinates());
-
-    if (!user->profileImage().isNull())
-        setImage(user->profileImage());
-
-    clearSubItems();
+    return m_coordinates;
+}
 
-    addSubItem(user->note(), QPixmap(":/res/images/envelope.png"));
-    addSubItem(user->address(), QPixmap(":/res/images/compass.png"));
-    addSubItem(user->timestamp(), QPixmap(":/res/images/clock.png"));
+QString FriendListItem::facebookId() const
+{
+    return m_facebookId;
 }
 
 void FriendListItem::setAvatarImage(const QPixmap &image)
@@ -113,7 +90,44 @@ void FriendListItem::setDistanceIcon(double value, const QString &unit)
     setData(DISTANCE_IMAGE_INDEX, distanceImage);
 }
 
-FriendListItem::~FriendListItem()
+
+void FriendListItem::setFacebookId(const QString &facebookId)
 {
     qDebug() << __PRETTY_FUNCTION__;
+
+    m_facebookId = facebookId;
+}
+void FriendListItem::setUserData(User *user)
+{
+    qDebug() << __PRETTY_FUNCTION__;
+
+    QString unit;
+    double value;
+    user->distance(value, unit);
+    QString distanceText = QString::number(value) + " " + unit;
+    setData(DISTANCE_TEXT_DISPLAY_INDEX, distanceText);
+    setDistanceIcon(value, unit);
+
+    setFacebookId(user->userId());
+
+    //Dummy value to get painter font metrics.
+    QPixmap p = QPixmap(ICON_WIDTH, ICON_HEIGHT);
+    QPainter painter(&p);
+    painter.setFont(NOKIA_FONT_SMALL);
+    QFontMetrics distanceTextFontMetrics = painter.fontMetrics();
+    QRect distanceRect = distanceTextFontMetrics.boundingRect(distanceText);
+
+    setData(DISTANCE_SIZE_HINT_INDEX, distanceRect);
+    setTitle(shortenText(user->name(), NAME_TEXT_MAX_WIDTH - distanceRect.width() - MARGIN * 2,
+                        ListItem::TEXT_SIZE_NORMAL));
+    setCoordinates(user->coordinates());
+
+    if (!user->profileImage().isNull())
+        setImage(user->profileImage());
+
+    clearSubItems();
+
+    addSubItem(user->note(), QPixmap(":/res/images/envelope.png"));
+    addSubItem(user->address(), QPixmap(":/res/images/compass.png"));
+    addSubItem(user->timestamp(), QPixmap(":/res/images/clock.png"));
 }