Moved AvatarImage::create from FriendListitem to SituareService.

diff --git a/src/situareservice/situareservice.cpp b/src/situareservice/situareservice.cpp
index c9080a8..a1a4f02 100644 (file)
--- a/src/situareservice/situareservice.cpp
+++ b/src/situareservice/situareservice.cpp
@@ -28,6 +28,7 @@
 #include "situareservice.h"
 #include "situarecommon.h"
 #include "parser.h"
+#include "ui/avatarimage.h"
 
 SituareService::SituareService(QObject *parent)
         : QObject(parent)
@@ -371,22 +372,22 @@ void SituareService::imageReceived(const QUrl &url, const QPixmap &image)
     // assign facebook silhouette image to all who doesn't have a profile image
     if(url == QUrl(SILHOUETTE_URL)) {
         if(m_user->profileImageUrl().isEmpty()) {
-            m_user->setProfileImage(image);
+            m_user->setProfileImage(AvatarImage::create(image));
         }
         for(int i=0;i < m_friendsList.count();i++) {
             if(m_friendsList.at(i)->profileImageUrl().isEmpty()) {
-                m_friendsList.at(i)->setProfileImage(image);
+                m_friendsList.at(i)->setProfileImage(AvatarImage::create(image));
             }
         }
     }
 
     if(m_user->profileImageUrl() == url) {
-        m_user->setProfileImage(image);
+        m_user->setProfileImage(AvatarImage::create(image));
     }
 
     for(int i=0;i<m_friendsList.count();i++) {
         if(m_friendsList.at(i)->profileImageUrl() == url) {
-            m_friendsList.at(i)->setProfileImage(image);
+            m_friendsList.at(i)->setProfileImage(AvatarImage::create(image));
             m_nbrOfImages++; // indicates how many friend profile images has been downloaded
         }
     }

diff --git a/src/ui/friendlistitem.cpp b/src/ui/friendlistitem.cpp
index d729433..7eae647 100644 (file)
--- a/src/ui/friendlistitem.cpp
+++ b/src/ui/friendlistitem.cpp
@@ -33,7 +33,6 @@
 
 #include "friendlistitem.h"
 #include "../user/user.h"
-#include "avatarimage.h"
 #include "imagebutton.h"
 
 const int BACKGROUND_TOP_HEIGHT = 20;
@@ -162,7 +161,7 @@ void FriendListItem::setData(User *user)
 
     m_user = user;
 
-    m_imageLabel->setPixmap(AvatarImage::create(m_user->profileImage()));
+    m_imageLabel->setPixmap(m_user->profileImage());
 
     QString unit;
     double value;
@@ -283,5 +282,7 @@ void FriendListItem::paintEvent(QPaintEvent *event)
 
 void FriendListItem::findButtonClicked()
 {
+    qDebug() << __PRETTY_FUNCTION__;
+
     emit findFriend(m_user->coordinates());
 }

diff --git a/src/ui/mainwindow.cpp b/src/ui/mainwindow.cpp
index 46c04d5..ffb301b 100644 (file)
--- a/src/ui/mainwindow.cpp
+++ b/src/ui/mainwindow.cpp
@@ -114,7 +114,7 @@ void MainWindow::createMenus()
     m_gpsToggleAct->setCheckable(true);
     m_gpsToggleAct->setChecked(true);
     connect(m_gpsToggleAct, SIGNAL(toggled(bool)),
-        this, SLOT(gpsActionToggled(bool)));
+        this, SLOT(gpsToggled(bool)));
     m_autoCenteringAct = new QAction(tr("Auto centering"), this);
     m_autoCenteringAct->setCheckable(true);
     m_autoCenteringAct->setChecked(true);