Merge branch 'master' into contact_dialog

[situare] / src / ui / userinfo.h

diff --git a/src/ui/userinfo.h b/src/ui/userinfo.h
index de62847..a7b52c9 100644 (file)
--- a/src/ui/userinfo.h
+++ b/src/ui/userinfo.h
@@ -77,9 +77,9 @@ protected:
     /**
      * @brief This function is called when the widget is drawn
      *
-     * @param aPaintEvent Pointer to paint event
+     * @param event Pointer to paint event
      */
-    void paintEvent(QPaintEvent *aPaintEvent);
+    void paintEvent(QPaintEvent *event);
 
 /******************************************************************************
 * MEMBER FUNCTIONS AND SLOTS
@@ -121,12 +121,6 @@ public:
     void setUserName(const QString &name);
 
 public slots:
-
-    /**
-     * @brief Clears backups of message and publish on Facebook setting
-     */
-    void clearUpdateLocationDialogData();
-
     /**
      * @brief Saves status message and Facebook publish setting
      *
@@ -137,6 +131,11 @@ public slots:
     void backupUpdateLocationDialogData(const QString &status, bool publish);
 
     /**
+     * @brief Clears backups of message and publish on Facebook setting
+     */
+    void clearUpdateLocationDialogData();
+
+    /**
      * @brief Sets the message text
      *
      * @param text Reference to user message
@@ -144,7 +143,6 @@ public slots:
     void setMessageText(const QString &text);
 
 private:
-
     /**
      * @brief reads Unsend message from settings at startup
      */
@@ -155,16 +153,14 @@ private:
      *
      * @param expanded true if full-length text is set, false otherwise
      */
-    void setText(bool expanded);
+    void setExpanded(bool expanded);
 
+private slots:
     /**
-     * @brief Set shortened texts from User data.
-     *
-     * Text length is defined by MAXIMUM_CHARS.
+     * @brief Slot for collapse user info
      */
-    QString shortenText(const QLabel *label, const QString &text, int textMaxWidth);
+    void collapse();
 
-private slots:
     /**
      * @brief Slot for find button click
      */
@@ -201,11 +197,6 @@ signals:
     void notificateUpdateFailing(const QString &message, bool modal);
 
     /**
-     * @brief Signal for refreshing user data.
-     */
-    void refreshUserData();
-
-    /**
      * @brief Signal for requesting reverseGeo from SituareEngine
      */
     void requestReverseGeo();
@@ -245,13 +236,12 @@ private:
 
     QString m_address;                      ///< Address from where the new message was sent
     QString m_backupMessage;                ///< Backup of users message
-    QString m_expandedMessageText;          ///< Expanded message text
     QString m_messageText;                  ///< User's message
     QString m_time;                         ///< Time when the new message was sent
     QString m_userName;                     ///< User's name
 
     GeoCoordinate m_coordinates;            ///< User current coordinates
-    ImageButton *m_findButton;              ///< User find button
+    ImageButton *m_avatar;                  ///< User find button
     UpdateLocationDialog *m_updateLocation; ///< Update location dialog
 };