Merge pull request #1400 from sehraf/pr_small-DHT-fixes

add missing DEFINE, fix small bugs
This commit is contained in:
csoler 2018-11-08 20:59:07 +01:00 committed by GitHub
commit 18f4dbb9f4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 3 deletions

View File

@ -288,7 +288,7 @@ void DhtWindow::updateNetPeers()
rsDht->getNetPeerList(peerIds);
/* collate peer stats */
int nPeers = peerIds.size();
size_t nPeers = peerIds.size();
// from DHT peers
int nOnlinePeers = 0;
@ -339,7 +339,7 @@ void DhtWindow::updateNetPeers()
for(it = peerIds.begin(); it != peerIds.end(); ++it)
{
/* find the entry */
QTreeWidgetItem *peer_item = NULL;
QTreeWidgetItem *peer_item = nullptr;
#if 0
QString qpeerid = QString::fromStdString(*it);
int itemCount = ui.peerTreeWidget->topLevelItemCount();
@ -438,7 +438,7 @@ void DhtWindow::updateNetPeers()
case RSDHT_PEERCONN_CONNECTED:
{
cpsstr = tr("Connected");
break;
switch(status.mPeerConnectMode)
{
default:

View File

@ -432,6 +432,10 @@ rs_gxs_trans {
}
}
bitdht {
DEFINES *= RS_USE_BITDHT
}
rs_async_chat {
DEFINES *= RS_ASYNC_CHAT
}