Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-07-21 05:39:11 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

merge of branch v0.6-idclean 7180

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7187 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
chrisparker126 2014-03-17 20:56:06 +00:00
parent 7815efb16f
commit 0f29d28b1b
397 changed files with 6503 additions and 5702 deletions
Download patch file Download diff file Expand all files Collapse all files

12
retroshare-gui/src/gui/msgs/MessageWidget.cpp
View file

@ -303,7 +303,7 @@ void MessageWidget::getcurrentrecommended()
return;
}
std::list<std::string> srcIds;
std::list<RsPeerId> srcIds;
srcIds.push_back(msgInfo.srcId);
QModelIndexList list = ui.msgList->selectionModel()->selectedIndexes();
@ -352,7 +352,7 @@ void MessageWidget::getallrecommended()
/* do the requests */
for(it = recList.begin(); it != recList.end(); it++) {
std::cerr << "MessageWidget::getallrecommended() Calling File Request" << std::endl;
std::list<std::string> srcIds;
std::list<RsPeerId> srcIds;
srcIds.push_back(msgInfo.srcId);
rsFiles->FileRequest(it->fname, it->hash, it->size, "", RS_FILE_REQ_ANONYMOUS_ROUTING, srcIds);
}
@ -487,7 +487,7 @@ void MessageWidget::fill(const std::string &msgId)
QTreeWidgetItem *item = new QTreeWidgetItem;
item->setText(COLUMN_FILE_NAME, QString::fromUtf8(it->fname.c_str()));
item->setText(COLUMN_FILE_SIZE, QString::number(it->size));
item->setText(COLUMN_FILE_HASH, QString::fromStdString(it->hash));
item->setText(COLUMN_FILE_HASH, QString::fromStdString(it->hash.toStdString()));
/* add to the list */
items.append(item);
@ -497,7 +497,7 @@ void MessageWidget::fill(const std::string &msgId)
ui.msgList->insertTopLevelItems(0, items);
/* iterate through the sources */
std::list<std::string>::const_iterator pit;
std::list<RsPeerId>::const_iterator pit;
RetroShareLink link;
QString text;
@ -545,9 +545,9 @@ void MessageWidget::fill(const std::string &msgId)
ui.dateText->setText(DateTime::formatDateTime(msgInfo.ts));
std::string ownId = rsPeers->getOwnId();
RsPeerId ownId = rsPeers->getOwnId();
std::string srcId;
RsPeerId srcId;
if ((msgInfo.msgflags & RS_MSG_BOXMASK) == RS_MSG_OUTBOX) {
// outgoing message are from me
srcId = ownId;