Merge branch 'master' into situare_interact

[situare] / src / map / mapengine.cpp

diff --git a/src/map/mapengine.cpp b/src/map/mapengine.cpp
index 397365f..089f85a 100644 (file)
--- a/src/map/mapengine.cpp
+++ b/src/map/mapengine.cpp
@@ -90,8 +90,8 @@ MapEngine::MapEngine(QObject *parent)
     connect(this, SIGNAL(friendsLocationsReady(QList<User*>&)),
             m_friendItemsHandler, SLOT(friendListUpdated(QList<User*>&)));
 
-    connect(this, SIGNAL(friendImageReady(User*)),
-            m_friendItemsHandler, SLOT(friendImageReady(User*)));
+    connect(this, SIGNAL(friendImageReady(QString,QPixmap)),
+            m_friendItemsHandler, SLOT(friendImageReady(QString,QPixmap)));
 
     connect(this, SIGNAL(friendsLocationsReady(QList<User*>&)),
             this, SLOT(friendsPositionsUpdated()));