Merge branch 'master' into new_panels_with_context_buttons

[situare] / src / ui / userinfo.cpp

diff --git a/src/ui/userinfo.cpp b/src/ui/userinfo.cpp
index 50dd2cb..c1d1b7f 100644 (file)
--- a/src/ui/userinfo.cpp
+++ b/src/ui/userinfo.cpp
@@ -60,10 +60,6 @@ UserInfo::UserInfo(QWidget *parent)
     infoLayout->setMargin(0);
     infoLayout->setSpacing(0);
 
-    QHBoxLayout *buttonLayout = new QHBoxLayout();
-    buttonLayout->setMargin(0);
-    buttonLayout->setSpacing(0);
-
     QLabel *envelopeLabel = new QLabel();
     envelopeLabel->setPixmap(QPixmap(":/res/images/envelope.png"));
     envelopeLabel->setContentsMargins(0, 0, MARGIN, 0);
@@ -88,16 +84,6 @@ UserInfo::UserInfo(QWidget *parent)
     m_updatedLabel = new QLabel();
     m_updatedLabel->setWordWrap(true);
 
-    ImageButton *updateFriendsButton = new ImageButton(":/res/images/refresh.png",
-                                                       ":/res/images/refresh_s.png",
-                                                       "", this);
-    ImageButton *updateStatusMessageButton = new ImageButton(":/res/images/send_position.png",
-                                                             ":/res/images/send_position_s.png",
-                                                             "", this);
-
-    buttonLayout->addWidget(updateFriendsButton);
-    buttonLayout->addWidget(updateStatusMessageButton);
-
     infoLayout->addRow(envelopeLabel, m_statusTextLabel);
     infoLayout->addRow(compassLabel, m_locationLabel);
     infoLayout->addRow(clockLabel, m_updatedLabel);
@@ -105,13 +91,6 @@ UserInfo::UserInfo(QWidget *parent)
     verticalLayout->addWidget(m_avatar, 0, Qt::AlignHCenter);
     verticalLayout->addWidget(m_nameLabel, 0, Qt::AlignHCenter);
     verticalLayout->addLayout(infoLayout);
-    verticalLayout->addLayout(buttonLayout);
-
-    connect(updateStatusMessageButton,SIGNAL(clicked()),
-            this,SLOT(messageUpdate()));
-
-    connect(updateFriendsButton,SIGNAL(clicked()),
-            this, SIGNAL(refreshUserData()));
 
     connect(m_avatar, SIGNAL(clicked()),
             this, SLOT(findButtonClicked()));