Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-01-26 23:36:59 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Compilation fix. Rs compiles now, group and message creation work ok, more testing to do still

Browse Source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7192 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
chrisparker126 2014-03-20 11:26:53 +00:00
parent 5b472c34e2
commit e2c8c6e141
9 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libretroshare/src/rsserver/rsinit.cc
View File

@ -1361,7 +1361,7 @@ int RsServer::StartupRetroShare()
std::string currGxsDir = rsAccounts.PathAccountDirectory() + "/GXS_phase2";
#ifdef GXS_DEV_TESTNET // Different Directory for testing.
currGxsDir += "_TESTNET9";
currGxsDir += "_TESTNET10";
#endif
if(!priorGxsDir.empty())

3
libretroshare/src/serialiser/rsgxsreputationitems.h
View File

@ -31,6 +31,7 @@
#include "serialiser/rsserviceids.h"
#include "serialiser/rsserial.h"
#include "serialiser/rstlvtypes.h"
#include "retroshare/rsgxsifacetypes.h"
#define RS_PKT_SUBTYPE_GXSREPUTATION_CONFIG_ITEM 0x01
#define RS_PKT_SUBTYPE_GXSREPUTATION_SET_ITEM 0x02
@ -96,7 +97,7 @@ virtual ~RsGxsReputationUpdateItem();
virtual void clear();
std::ostream &print(std::ostream &out, uint16_t indent = 0);
std::map<std::string, uint32_t> mOpinions; // GxsId -> Opinion.
std::map<RsGxsId, uint32_t> mOpinions; // GxsId -> Opinion.
uint32_t mLatestUpdate;
};

4
libretroshare/src/services/p3gxsreputation.cc
View File

@ -256,7 +256,7 @@ bool p3GxsReputation::SendReputations(RsGxsReputationRequestItem *request)
continue;
}
std::string gxsId = rit->first.toStdString();
RsGxsId gxsId = rit->first;
pkt->mOpinions[gxsId] = ConvertToSerialised(rit->second.mOwnOpinion, true);
pkt->mLatestUpdate = rit->second.mOwnOpinionTs;
if (pkt->mLatestUpdate == (uint32_t) now)
@ -307,7 +307,7 @@ bool p3GxsReputation::RecvReputations(RsGxsReputationUpdateItem *item)
RsPeerId peerid = item->PeerId();
std::map<std::string, uint32_t>::iterator it;
std::map<RsGxsId, uint32_t>::iterator it;
for(it = item->mOpinions.begin(); it != item->mOpinions.end(); it++)
{
RsStackMutex stack(mReputationMtx); /****** LOCKED MUTEX *******/

1
libretroshare/src/services/p3gxsreputation.h
View File

@ -37,7 +37,6 @@
#include "retroshare/rsidentity.h"
#include "services/p3service.h"
//typedef std::string RsPeerId;
class p3LinkMgr;

2
retroshare-gui/src/gui/Circles/CreateCircleDialog.cpp
View File

@ -391,7 +391,7 @@ void CreateCircleDialog::updateCircleGUI()
std::cerr << "CreateCircleDialog::updateCircleGUI() : EXTERNAL CIRCLETYPE";
std::cerr << std::endl;
if (mCircleGroup.mMeta.mCircleId == mCircleGroup.mMeta.mGroupId)
if (mCircleGroup.mMeta.mCircleId.toStdString() == mCircleGroup.mMeta.mGroupId.toStdString())
{
ui.radioButton_Restricted->setChecked(true);
}

2
retroshare-gui/src/gui/Identity/IdDialog.cpp
View File

@ -548,7 +548,7 @@ void IdDialog::modifyReputation()
std::cerr << "IdDialog::modifyReputation()";
std::cerr << std::endl;
std::string id = ui.lineEdit_KeyId->text().toStdString();
RsGxsId id(ui.lineEdit_KeyId->text().toStdString());
int mod = 0;
if (ui.repMod_Accept->isChecked())

8
retroshare-gui/src/gui/Posted/PostedListDialog.cpp
View File

@ -191,10 +191,10 @@ void PostedListDialog::groupListCustomPopupMenu(QPoint /*point*/)
contextMnu.addSeparator();
action = contextMnu.addAction(QIcon(IMAGE_SHOW), tr("Show Topic Details"), this, SLOT(showTopic()));
action->setEnabled (!mCurrTopicId.empty());
action->setEnabled (!mCurrTopicId.isNull());
action = contextMnu.addAction(QIcon(IMAGE_EDIT), tr("Edit Topic Details"), this, SLOT(editTopic()));
action->setEnabled (!mCurrTopicId.empty() && IS_GROUP_ADMIN(subscribeFlags));
action->setEnabled (!mCurrTopicId.isNull() && IS_GROUP_ADMIN(subscribeFlags));
contextMnu.exec(QCursor::pos());
}
@ -378,7 +378,7 @@ void PostedListDialog::newTopic()
void PostedListDialog::showTopic()
{
if (mCurrTopicId.empty()) {
if (mCurrTopicId.isNull()) {
return;
}
@ -388,7 +388,7 @@ void PostedListDialog::showTopic()
void PostedListDialog::editTopic()
{
if (mCurrTopicId.empty()) {
if (mCurrTopicId.isNull()) {
return;
}

2
retroshare-gui/src/gui/WikiPoos/WikiDialog.cpp
View File

@ -633,7 +633,7 @@ void WikiDialog::groupListCustomPopupMenu(QPoint /*point*/)
contextMnu.addSeparator();
action = contextMnu.addAction(QIcon(IMAGE_INFO), tr("Show Wiki Group"), this, SLOT(showGroupDetails()));
action->setEnabled (!mGroupId.empty ());
action->setEnabled (!mGroupId.isNull());
action = contextMnu.addAction(QIcon(IMAGE_EDIT), tr("Edit Wiki Group"), this, SLOT(editGroupDetails()));
action->setEnabled (!mGroupId.isNull() && IS_GROUP_ADMIN(subscribeFlags));

4
retroshare-gui/src/gui/gxschannels/GxsChannelDialog.cpp
View File

@ -370,7 +370,7 @@ void GxsChannelDialog::openChat(const RsPeerId & /*peerId*/)
void GxsChannelDialog::editChannelDetail()
{
if (mChannelId.empty()) {
if (mChannelId.isNull()) {
return;
}
@ -799,7 +799,7 @@ void GxsChannelDialog::subscribeChannel()
void GxsChannelDialog::showChannelDetails()
{
if (mChannelId.empty()) {
if (mChannelId.isNull()) {
return;
}