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

diff --git a/src/invitation-dialog.cpp b/src/invitation-dialog.cpp
index d14715b..1da8f00 100644
--- a/src/invitation-dialog.cpp
+++ b/src/invitation-dialog.cpp
@@ -12,7 +12,6 @@
 #include "invitation-dialog.h"
 #include "ui_invitation-dialog.h"
 
-using namespace std;
 using namespace ndn;
 
 InvitationDialog::InvitationDialog(QWidget *parent) 
@@ -33,11 +32,11 @@
 }
 
 void
-InvitationDialog::setInvitation(const string& alias,
-                                const string& chatroom,
+InvitationDialog::setInvitation(const std::string& alias,
+                                const std::string& chatroom,
                                 const Name& interestName)
 {
-  string msg = alias;
+  std::string msg = alias;
   m_invitationInterest = interestName;
   msg.append(" invites you to: ").append(chatroom);
   ui->msgLabel->setText(QString::fromStdString(msg));