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/invite-list-dialog.cpp

diff --git a/src/invite-list-dialog.cpp b/src/invite-list-dialog.cpp
index c46036f..bfc4040 100644
--- a/src/invite-list-dialog.cpp
+++ b/src/invite-list-dialog.cpp
@@ -11,8 +11,6 @@
 #include "invite-list-dialog.h"
 #include "ui_invite-list-dialog.h"
 
-using namespace std;
-
 InviteListDialog::InviteListDialog(QWidget *parent) 
   :QDialog(parent)
   , ui(new Ui::InviteListDialog)
@@ -35,9 +33,9 @@
 }
 
 void
-InviteListDialog::setInviteLabel(string label)
+InviteListDialog::setInviteLabel(std::string label)
 { 
-  string msg("invite to chatroom:\n");
+  std::string msg("invite to chatroom:\n");
   msg += label;
   ui->inviteLabel->setText(QString::fromStdString(msg));
 }