Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-12-21 05:44:29 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

remove boost call

Browse Source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2030 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
joss17 2010-01-14 00:35:16 +00:00
parent 3863b8c173
commit 37cf2e98a2
3 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libretroshare/src/pqi/authgpg.cc
View File

@ -29,7 +29,6 @@
#include <iostream> #include <iostream>
#include <sstream> #include <sstream>
#include <algorithm> #include <algorithm>
#include <boost/lexical_cast.hpp>
#include "serialiser/rsconfigitems.h" #include "serialiser/rsconfigitems.h"
@ -1383,7 +1382,10 @@ int AuthGPG::privateTrustCertificate(std::string id, int trustlvl)
gpgcert trustCert = mKeyList.find(id)->second; gpgcert trustCert = mKeyList.find(id)->second;
gpgme_key_t trustKey = trustCert.key; gpgme_key_t trustKey = trustCert.key;
class TrustParams sparams((boost::lexical_cast<std::string>(trustlvl))); std::string trustString;
std::ostringstream trustStrOut;
trustStrOut << trustlvl;
class TrustParams sparams(trustStrOut.str());
class EditParams params(TRUST_START, &sparams); class EditParams params(TRUST_START, &sparams);
gpgme_data_t out; gpgme_data_t out;
gpg_error_t ERR; gpg_error_t ERR;

11
libretroshare/src/rsserver/p3peers.cc
View File

@ -29,7 +29,6 @@
#include "pqi/authssl.h" #include "pqi/authssl.h"
#include "pqi/authgpg.h" #include "pqi/authgpg.h"
#include <rsiface/rsinit.h> #include <rsiface/rsinit.h>
#include <boost/lexical_cast.hpp>
#include <iostream> #include <iostream>
@ -963,7 +962,10 @@ bool p3Peers::loadDetailsFromStringCert(std::string certstr, RsPeerDetails &pd)
if (parsePosition != std::string::npos) { if (parsePosition != std::string::npos) {
std::string local_port = subCert.substr(0, parsePosition); std::string local_port = subCert.substr(0, parsePosition);
std::cerr << "Local port : " << local_port << std::endl; std::cerr << "Local port : " << local_port << std::endl;
pd.localPort = (boost::lexical_cast<uint16_t>(local_port)); std::istringstream instream(local_port);
uint16_t local_port_int;
instream >> local_port_int;
pd.localPort = (local_port_int);
} }
} }
} }
@ -986,7 +988,10 @@ bool p3Peers::loadDetailsFromStringCert(std::string certstr, RsPeerDetails &pd)
if (parsePosition != std::string::npos) { if (parsePosition != std::string::npos) {
std::string ext_port = subCert.substr(0, parsePosition); std::string ext_port = subCert.substr(0, parsePosition);
std::cerr << "Ext port : " << ext_port << std::endl; std::cerr << "Ext port : " << ext_port << std::endl;
pd.extPort = (boost::lexical_cast<uint16_t>(ext_port)); std::istringstream instream(ext_port);
uint16_t ext_port_int;
instream >> ext_port_int;
pd.extPort = (ext_port_int);
} }
} }
} }

6
retroshare-gui/src/gui/connect/ConnectFriendWizard.cpp
View File

@ -48,8 +48,6 @@
#include <QRegExpValidator> #include <QRegExpValidator>
#include <QRegExp> #include <QRegExp>
#include <boost/lexical_cast.hpp>
#include <QDebug> #include <QDebug>
#include <sstream> #include <sstream>
#include <iostream> #include <iostream>
@ -349,9 +347,9 @@ int TextPage::nextId() const {
wizard()->setField(CERT_STRING_FIELD_CONNECT_FRIEND_WIZARD, QString::fromStdString(certstr)); wizard()->setField(CERT_STRING_FIELD_CONNECT_FRIEND_WIZARD, QString::fromStdString(certstr));
wizard()->setField("ext_friend_ip", QString::fromStdString(pd.extAddr)); wizard()->setField("ext_friend_ip", QString::fromStdString(pd.extAddr));
wizard()->setField("ext_friend_port", QString::fromStdString(boost::lexical_cast<std::string>(pd.extPort))); wizard()->setField("ext_friend_port", QString::number(pd.extPort));
wizard()->setField("local_friend_ip", QString::fromStdString(pd.localAddr)); wizard()->setField("local_friend_ip", QString::fromStdString(pd.localAddr));
wizard()->setField("local_friend_port", QString::fromStdString(boost::lexical_cast<std::string>(pd.localPort))); wizard()->setField("local_friend_port", QString::number(pd.localPort));
return ConnectFriendWizard::Page_Conclusion ; return ConnectFriendWizard::Page_Conclusion ;
} }