cleaning

diff --git a/src/engine/engine.cpp b/src/engine/engine.cpp
index cb25d17..d59ed1b 100644 (file)
--- a/src/engine/engine.cpp
+++ b/src/engine/engine.cpp
@@ -435,6 +435,4 @@ void SituareEngine::userDataChanged(User *user, QList<User *> &friendsList)
 
     emit userLocationReady(user);
     emit friendsLocationsReady(friendsList);
-    qWarning() << "USER IMAGE URL: " << user->profileImageUrl();
-    qWarning() << "USER IMAGE URL BIG: " << user->profileImageUrlBig();
 }

diff --git a/src/situareservice/situarecommon.h b/src/situareservice/situarecommon.h
index c5deb06..b047fd0 100644 (file)
--- a/src/situareservice/situarecommon.h
+++ b/src/situareservice/situarecommon.h
@@ -35,7 +35,7 @@ const QString TEST_API_KEY = "cf77865a5070f2c2ba3b52cbf3371579";
 // Situare PHP scripts
 const QString UPDATE_LOCATION = "updateLocation.php";
 const QString REVERSE_GEO = "reversegeo.php";
-const QString GET_LOCATIONS = "getLocations.php?extra_user_data=pic_big"; //use pic_big or pic
+const QString GET_LOCATIONS = "getLocations.php?extra_user_data=pic_big";
 
 // Cookies
 const QString COOKIE = "Cookie";

diff --git a/src/situareservice/situareservice.cpp b/src/situareservice/situareservice.cpp
index afdc7c9..6c05c51 100644 (file)
--- a/src/situareservice/situareservice.cpp
+++ b/src/situareservice/situareservice.cpp
@@ -327,9 +327,7 @@ void SituareService::parseUserData(const QByteArray &jsonReply)
     QPointF coordinates(userMap["longitude"].toReal(), userMap["latitude"].toReal());
 
     QUrl imageUrl = userMap["profile_pic"].toUrl();
-    qWarning() << "JOOO1" << imageUrl;
     QUrl imageUrlBig = userMap["pic_big"].toUrl();
-    qWarning() << "JOOO2" << imageUrlBig;
 
     if(imageUrl.isEmpty()) {
         // user doesn't have profile image, so we need to get him a silhouette image
@@ -391,7 +389,6 @@ void SituareService::imageReceived(const QUrl &url, const QPixmap &image)
 
     if(m_user->profileImageUrlBig() == url) {
         m_user->setProfileImageBig(AvatarImage::create(image));
-        qWarning() << "OTETTIIN VASTAAN SUURI PROFIILIKUVA";
     }
 
     for(int i=0;i<m_friendsList.count();i++) {
@@ -417,14 +414,11 @@ void SituareService::addProfileImages()
         emit fetchImage(QUrl(SILHOUETTE_URL));
     }
 
-    if(!m_user->profileImageUrl().isEmpty() && m_user->profileImageUrl().isValid()) {
+    if(!m_user->profileImageUrl().isEmpty() && m_user->profileImageUrl().isValid())
         emit fetchImage(m_user->profileImageUrl());
-        qWarning() << "PROFILE IMAGE URL: " << m_user->profileImageUrl();
-    }
 
     if(!m_user->profileImageUrlBig().isEmpty() && m_user->profileImageUrlBig().isValid()) {
         emit fetchImage(m_user->profileImageUrlBig());
-        qWarning() << "PROFILE IMAGE URL BIG: " << m_user->profileImageUrlBig();
     }
 
     for(int i=0;i<m_friendsList.count();i++) {

diff --git a/src/ui/avatarimage.cpp b/src/ui/avatarimage.cpp
index c52615a..6c90fec 100644 (file)
--- a/src/ui/avatarimage.cpp
+++ b/src/ui/avatarimage.cpp
@@ -22,7 +22,6 @@
 
 #include "avatarimage.h"
 #include <QPainter>
-#include <QPen>
 #include <QDebug>
 
 // constants for normal images

diff --git a/src/ui/userinfo.cpp b/src/ui/userinfo.cpp
index e85921f..f0bec2f 100644 (file)
--- a/src/ui/userinfo.cpp
+++ b/src/ui/userinfo.cpp
@@ -116,7 +116,6 @@ UserInfo::UserInfo(QWidget *parent)
         this, SLOT(findButtonClicked()));
 
     setFixedWidth(BACKGROUND_WIDTH);
-    //setFixedWidth(500);
 
     this->setFont(NOKIA_FONT_SMALL);
     m_nameLabel->setFont(NOKIA_FONT_NORMAL);
@@ -224,6 +223,7 @@ void UserInfo::mouseReleaseEvent(QMouseEvent *event)
         }
     }
 }
+
 void UserInfo::paintEvent(QPaintEvent *aPaintEvent)
 {
     qDebug() << __PRETTY_FUNCTION__ << " " << aPaintEvent->rect();

diff --git a/src/ui/userinfopanel.cpp b/src/ui/userinfopanel.cpp
index 1ec99dd..98b2e67 100644 (file)
--- a/src/ui/userinfopanel.cpp
+++ b/src/ui/userinfopanel.cpp
@@ -70,7 +70,6 @@ void UserInfoPanel::userDataReceived(User *user)
 
     if(user) {
         m_userInfo->setUserName(user->name());
-//        m_userInfo->setProfileImage(user->profileImage());
         m_userInfo->setProfileImage(user->profileImageBig());
         m_userInfo->setMessageText(user->note());
         m_userInfo->setAddress(user->address());

diff --git a/src/user/user.h b/src/user/user.h
index 4100e81..ff6a22c 100644 (file)
--- a/src/user/user.h
+++ b/src/user/user.h
@@ -91,14 +91,26 @@ public:
     * @param image Image
     */
     void setProfileImage(const QPixmap &image);
+
+    /**
+    * @brief Set big profile image
+    *
+    * @param image big profile Image
+    */
     void setProfileImageBig(const QPixmap &image);
 
     /**
     * @brief Set download address for profile image
     *
-    * @param imageUrl image url
+    * @param imageUrl image url of big image
     */
     void setProfileImageUrl(const QUrl &imageUrl);
+
+    /**
+    * @brief Set download address for big profile image
+    *
+    * @param imageUrl image url
+    */
     void setProfileImageUrlBig(const QUrl &imageUrl);
 
     /**
@@ -150,6 +162,12 @@ public:
     * @return QPixmap image
     */
     const QPixmap &profileImage() const;
+
+    /**
+    * @brief Get big profile image
+    *
+    * @return QPixmap big profile image
+    */
     const QPixmap &profileImageBig() const;
 
     /**
@@ -158,6 +176,12 @@ public:
     * @return QString url
     */
     const QUrl &profileImageUrl() const;
+
+    /**
+    * @brief Get download address for big profile image
+    *
+    * @return QString url of big profile image
+    */
     const QUrl &profileImageUrlBig() const;
 
     /**