Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-11-30 20:36:36 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Fix Some gcc warnings 383 to 208 lines

Browse source 
Left explicit #warning and deprecated.
Some lines are wrong indented and produce mal formed code.
This commit is contained in:
Phenom 2016-10-22 23:48:19 +02:00
parent 74aa55e347
commit 674b6de381
63 changed files with 379 additions and 346 deletions
Download patch file Download diff file Expand all files Collapse all files

11
retroshare-gui/src/gui/settings/RSPermissionMatrixWidget.cpp
View file

@ -103,13 +103,12 @@ void RSPermissionMatrixWidget::mousePressEvent(QMouseEvent *e)
{
std::cerr << "Peer id: " << peer_id << ", service: " << service_id << std::endl;
// make sure the service is not globally disabled
// Make sure the service is not globally disabled
RsServicePermissions serv_perms ;
rsServiceControl->getServicePermissions(service_id,serv_perms) ;
RsServicePermissions serv_perms;
rsServiceControl->getServicePermissions(service_id,serv_perms);
if(!serv_perms.mDefaultAllowed)
return ;
if (!serv_perms.mDefaultAllowed) return;
switchPermission(service_id,peer_id) ;
update() ;
@ -335,7 +334,7 @@ void RSPermissionMatrixWidget::paintEvent(QPaintEvent *)
int X = matrix_start_x + S*fCOL_SIZE/2 - 2 + i*S*fCOL_SIZE - text_width/2;
int height_index = 0 ;
while(last_width[height_index] > X-5 && height_index < last_width.size()-1)
while(last_width[height_index] > X-5 && height_index < ((int)last_width.size()-1) )
++height_index ;
int Y = S*fMATRIX_START_Y - S*fICON_SIZE_Y - 2 - line_height * height_index;