commit 17032f8fa6aebc6d5f399e171ed77f2b4e01b001
author Yingdi Yu <yuyingdi@gmail.com> Tue Mar 25 15:48:23 2014 -0700
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> Fri May 09 15:16:11 2014 -0700
tree ce64143958c400f393114a05985d06b8456da534
parent a7876727b0b405fec8dcbe82443c233c7493fa08

namespace: try to resolve ndn and std conflicts

Change-Id: I141ead4b8f30ce75bae73974e47e6e5acd75a296

src/start-chat-dialog.cpp

diff --git a/src/start-chat-dialog.cpp b/src/start-chat-dialog.cpp
index e9ac1f8..c508c1e 100644
--- a/src/start-chat-dialog.cpp
+++ b/src/start-chat-dialog.cpp
@@ -11,8 +11,6 @@
 #include "start-chat-dialog.h"
 #include "ui_start-chat-dialog.h"
 
-using namespace std;
-
 StartChatDialog::StartChatDialog(QWidget *parent) 
   : QDialog(parent)
   , ui(new Ui::StartChatDialog)
@@ -31,7 +29,7 @@
 }
 
 void
-StartChatDialog::setChatroom(const string& chatroom)
+StartChatDialog::setChatroom(const std::string& chatroom)
 { 
   ui->chatroomInput->setText(QString::fromStdString(chatroom)); 
 }