Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-10-01 02:35:48 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #538 from Hopetech/master

Browse Source 
Fix some compilation warnings
This commit is contained in:
Cyril Soler 2016-10-19 15:50:22 +02:00 committed by GitHub
commit b8b78dd6cb
5 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
retroshare-gui/src/gui/RemoteDirModel.cpp
View File

@ -497,7 +497,7 @@ QVariant TreeStyle_RDM::sortRole(const QModelIndex& /*index*/,const DirDetails&
} }
return QVariant(); return QVariant();
} }
QVariant FlatStyle_RDM::sortRole(const QModelIndex& index,const DirDetails& details,int coln) const QVariant FlatStyle_RDM::sortRole(const QModelIndex& /*index*/,const DirDetails& details,int coln) const
{ {
/* /*
* Person: name, id, 0, 0; * Person: name, id, 0, 0;

2
retroshare-gui/src/gui/chat/PopupDistantChatDialog.cpp
View File

@ -167,7 +167,7 @@ void PopupDistantChatDialog::closeEvent(QCloseEvent *e)
PopupChatDialog::closeEvent(e) ; PopupChatDialog::closeEvent(e) ;
} }
QString PopupDistantChatDialog::getPeerName(const ChatId &id) const QString PopupDistantChatDialog::getPeerName(const ChatId &/*id*/) const
{ {
DistantChatPeerInfo tinfo; DistantChatPeerInfo tinfo;

2
retroshare-gui/src/gui/common/RSGraphWidget.cpp
View File

@ -393,10 +393,12 @@ void RSGraphWidget::paintData()
paintLine(points, getColor(i)); paintLine(points, getColor(i));
} }
if(_maxValue > 0.0f) if(_maxValue > 0.0f)
{
if(_flags & RSGRAPH_FLAGS_LOG_SCALE_Y) if(_flags & RSGRAPH_FLAGS_LOG_SCALE_Y)
_y_scale = _rec.height()*0.8 / log(_maxValue) ; _y_scale = _rec.height()*0.8 / log(_maxValue) ;
else else
_y_scale = _rec.height()*0.8/_maxValue ; _y_scale = _rec.height()*0.8/_maxValue ;
}
} }
/** Returns a list of points on the bandwidth graph based on the supplied set /** Returns a list of points on the bandwidth graph based on the supplied set

2
retroshare-gui/src/gui/gxs/GxsIdChooser.cpp
View File

@ -195,7 +195,7 @@ bool GxsIdChooser::isInConstraintSet(const RsGxsId& id) const
return mConstraintIdsSet.find(id) != mConstraintIdsSet.end() ; return mConstraintIdsSet.find(id) != mConstraintIdsSet.end() ;
} }
void GxsIdChooser::setEntryEnabled(int indx,bool enabled) void GxsIdChooser::setEntryEnabled(int indx,bool /*enabled*/)
{ {
removeItem(indx) ; removeItem(indx) ;

4
retroshare-gui/src/gui/settings/ServerPage.cpp
View File

@ -486,7 +486,7 @@ void ServerPage::addPeerToIPTable(QTableWidget *table,int row,const BanListPeer&
void ServerPage::toggleGroupIps(bool b) { rsBanList->enableAutoRange(b) ; } void ServerPage::toggleGroupIps(bool b) { rsBanList->enableAutoRange(b) ; }
void ServerPage::setGroupIpLimit(int n) { rsBanList->setAutoRangeLimit(n) ; } void ServerPage::setGroupIpLimit(int n) { rsBanList->setAutoRangeLimit(n) ; }
void ServerPage::ipFilterContextMenu(const QPoint& point) void ServerPage::ipFilterContextMenu(const QPoint& /*point*/)
{ {
QMenu contextMenu(this) ; QMenu contextMenu(this) ;
int row = ui.filteredIpsTable->currentRow(); int row = ui.filteredIpsTable->currentRow();
@ -604,7 +604,7 @@ void ServerPage::ipWhiteListContextMenu(const QPoint& /* point */)
if(item == NULL) if(item == NULL)
return ; return ;
bool status = item->data(Qt::UserRole).toBool(); //bool status = item->data(Qt::UserRole).toBool();
contextMenu.addAction(tr("Remove"),this,SLOT(removeWhiteListedIp())); contextMenu.addAction(tr("Remove"),this,SLOT(removeWhiteListedIp()));