Merge branch 'master' into situare_interact

[situare] / src / ui / userinfo.h

diff --git a/src/ui/userinfo.h b/src/ui/userinfo.h
index 3a8151f..2288ec2 100644 (file)
--- a/src/ui/userinfo.h
+++ b/src/ui/userinfo.h
@@ -29,7 +29,8 @@
 #include <QWidget>
 
 #include "coordinates/geocoordinate.h"
-#include "updatelocation/updatelocationdialog.h"
+
+class QLabel;
 
 class ImageButton;
 class TagsDialog;
@@ -108,13 +109,6 @@ public:
     void setProfileImage(const QPixmap &image);
 
     /**
-     * @brief Sets the user tags
-     *
-     * @param tags list of tags
-     */
-    void setProfileImage(const QStringList &tags);
-
-    /**
     * @brief Sets the user tags
     *
     * @param tags list of tags
@@ -149,20 +143,6 @@ public:
 
 public slots:
     /**
-     * @brief Saves status message and Facebook publish setting
-     *
-     * @param status message that user sends. Message is stored to m_backupMessage data member
-     * @param publish setting that determines whether the user status message is published on
-     *        Facebook. This value is stored to m_backupFacebookPublishPolicity data member.
-     */
-    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
@@ -171,11 +151,6 @@ public slots:
 
 private:
     /**
-     * @brief reads Unsend message from settings at startup
-     */
-    void restoreUnsendMessage();
-
-    /**
      * @brief Set shortened or full-length text to labels.
      *
      * @param expanded true if full-length text is set, false otherwise
@@ -194,20 +169,10 @@ private slots:
     void findButtonClicked();
 
     /**
-     * @brief Slot function to forward messageUpdate launch signal
-     */
-    void messageUpdate();
-
-    /**
     * @brief Slot to handle changes in tags dialog.
     */
     void tagsDialogFinished(int reason);
 
-    /**
-     * @brief Slot function to get indication when dialog is finished
-     */
-    void updateLocationDialogFinished(int reason);
-
 /******************************************************************************
 * SIGNALS
 ******************************************************************************/
@@ -227,20 +192,6 @@ signals:
     void findUser(const GeoCoordinate &coordinates);
 
     /**
-     * @brief Signal that used to inform user that his message/location update tp Situare server
-     *        was failed.
-     *        This signal is originally sended from UserInfo
-     * @param message message for notification
-     * @param modal true if modal notification otherwice false
-     */
-    void notificateUpdateFailing(const QString &message, bool modal);
-
-    /**
-     * @brief Signal for requesting reverseGeo from SituareEngine
-     */
-    void requestReverseGeo();
-
-    /**
     * @brief Signal for removing tags.
     *
     * @param tags tags to add
@@ -248,32 +199,16 @@ signals:
     void removeTags(const QStringList &tags);
 
     /**
-     * @brief Signals, when address data is ready
-     *
-     * @param address Street address
-     */
-    void reverseGeoReady(const QString &address);
-
-    /**
     * @brief Signals, when item selection changed
     *
     * @param address Street address
     */
     void itemSelectionChanged(bool selected);
 
-    /**
-     * @brief Signal for requestLocationUpdate from SituareEngine via MainWindow class
-     *
-     * @param status Status message
-     * @param publish Publish on Facebook
-     */
-    void statusUpdate(const QString &status, const bool &publish);
-
 /******************************************************************************
 * DATA MEMBERS
 ******************************************************************************/
 private:
-    bool m_backupFacebookPublishPolicity;   ///< Backup of publish on Facebook checkbox value
     bool m_expanded;                        ///< Item expanded state
 
     QLabel *m_locationLabel;                ///< Location label
@@ -291,8 +226,6 @@ private:
 
     QPoint m_mousePosition;                 ///< Current mouse press position
 
-    QString m_backupMessage;                ///< Backup of users message
-    QString m_expandedMessageText;          ///< Expanded message text
     QString m_messageText;                  ///< User's message
     QString m_userName;                     ///< User's name
 
@@ -301,7 +234,6 @@ private:
     GeoCoordinate m_coordinates;            ///< User current coordinates
     ImageButton *m_avatar;                  ///< User find button
     TagsDialog *m_tagsDialog;               ///< Tags dialog
-    UpdateLocationDialog *m_updateLocation; ///< Update location dialog    
 };
 
 #endif // USERINFO_H