commit 4694828b7b0f3857cac6e60ae94d80553147bbd8
author Yingdi Yu <yuyingdi@gmail.com> Wed Nov 06 18:43:31 2013 -0800
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> Fri May 09 15:15:58 2014 -0700
tree 6c1940e89d9f890ab62bd7b79e027656bbcd0322
parent 2e3199c56e1b6537144877257c194e41da2a7b17

Add nick name in settings

src/settingdialog.cpp

diff --git a/src/settingdialog.cpp b/src/settingdialog.cpp
index a8dca16..ed9a1bd 100644
--- a/src/settingdialog.cpp
+++ b/src/settingdialog.cpp
@@ -29,21 +29,28 @@
 }
 
 void
-SettingDialog::setIdentity(const std::string& identity)
+SettingDialog::setIdentity(const std::string& identity,
+                           const std::string& nickName)
 { 
   m_identity = identity;
-  ui->identityLine->setText(QString::fromUtf8(m_identity.c_str()));
+  ui->identityLine->setText(QString::fromStdString(m_identity));
+  m_nickName = nickName;
+  ui->nickLine->setText(QString::fromStdString(m_nickName));
 }
 
 void
 SettingDialog::onOkClicked()
 {
-  QString text = ui->identityLine->text();
-  string identity = text.toUtf8().constData();
-  if(identity != m_identity)
+  QString qIdentity = ui->identityLine->text();
+  string identity = qIdentity.toStdString();
+  QString qNick = ui->nickLine->text();
+  string nick = qNick.toStdString();
+
+  if(identity != m_identity || nick != m_nickName)
     {
       m_identity = identity;
-      emit identitySet(text);
+      m_nickName = nick;
+      emit identitySet(qIdentity, qNick);
     }
   this->close();
 }