Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-06-20 04:14:27 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed compile on Windows

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7194 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2014-03-21 14:50:34 +00:00
parent e2c8c6e141
commit a4b54e1021
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
libretroshare/src/retroshare/rsids.h
View file

@ -85,7 +85,7 @@ template<uint32_t ID_SIZE_IN_BYTES,bool UPPER_CASE,uint32_t UNIQUE_IDENTIFIER> c
this->bytes[i] = temp.toByteArray()[i]; this->bytes[i] = temp.toByteArray()[i];
} }
inline void clear() { bzero(bytes,SIZE_IN_BYTES) ; } inline void clear() { memset(bytes,0,SIZE_IN_BYTES) ; }
// Converts to a std::string using cached value. // Converts to a std::string using cached value.
// //

4
retroshare-gui/src/gui/settings/rsharesettings.cpp
View file

@ -550,7 +550,7 @@ bool RshareSettings::getRetroShareProtocol()
QSettings retroshare("HKEY_CLASSES_ROOT\\retroshare", QSettings::NativeFormat); QSettings retroshare("HKEY_CLASSES_ROOT\\retroshare", QSettings::NativeFormat);
if (retroshare.contains("Default")) { if (retroshare.contains("Default")) {
/* Check profile */ /* Check profile */
if (retroshare.value("Profile").toString().toStdString() == rsPeers->getOwnId()) { if (retroshare.value("Profile").toString().toStdString() == rsPeers->getOwnId().toStdString()) {
/* Check app path */ /* Check app path */
QSettings command("HKEY_CLASSES_ROOT\\retroshare\\shell\\open\\command", QSettings::NativeFormat); QSettings command("HKEY_CLASSES_ROOT\\retroshare\\shell\\open\\command", QSettings::NativeFormat);
if (command.value("Default").toString() == getAppPathForProtocol()) { if (command.value("Default").toString() == getAppPathForProtocol()) {
@ -588,7 +588,7 @@ bool RshareSettings::setRetroShareProtocol(bool value)
return false; return false;
} }
retroshare.setValue("URL Protocol", ""); retroshare.setValue("URL Protocol", "");
retroshare.setValue("Profile", QString::fromStdString(rsPeers->getOwnId())); retroshare.setValue("Profile", QString::fromStdString(rsPeers->getOwnId().toStdString()));
QSettings command("HKEY_CLASSES_ROOT\\retroshare\\shell\\open\\command", QSettings::NativeFormat); QSettings command("HKEY_CLASSES_ROOT\\retroshare\\shell\\open\\command", QSettings::NativeFormat);
command.setValue("Default", getAppPathForProtocol()); command.setValue("Default", getAppPathForProtocol());