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

Small bug and compiler warning fixes:

Browse Source 
- gui/forums/CreateForumMsg.cpp used endl instead of std::endl
- constructor's initializer in the wrong order
- temporary variables type causing signedness warnings


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3107 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
leander-256 2010-06-10 14:13:20 +00:00
parent d48035385b
commit c3c607ec80
6 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
retroshare-gui/src/gui/FileTransferInfoWidget.cpp
View File

@ -194,7 +194,7 @@ void FileTransferInfoWidget::draw(const FileInfo& nfo,const FileChunksInfo& info
// //
int nb_chunks = info.file_size/info.chunk_size + !!(info.file_size % info.chunk_size); int nb_chunks = info.file_size/info.chunk_size + !!(info.file_size % info.chunk_size);
for(uint i=0;i<availability_map_size_X;++i) for(int i=0;i<availability_map_size_X;++i)
{ {
int nb_src = 0 ; int nb_src = 0 ;
int chunk_num = (int)floor(i/float(availability_map_size_X)*(nb_chunks-1)) ; int chunk_num = (int)floor(i/float(availability_map_size_X)*(nb_chunks-1)) ;
@ -209,7 +209,7 @@ void FileTransferInfoWidget::draw(const FileInfo& nfo,const FileChunksInfo& info
y += block_sep + availability_map_size_Y ; y += block_sep + availability_map_size_Y ;
painter->setPen(QColor::fromRgb(70,70,70)) ; painter->setPen(QColor::fromRgb(70,70,70)) ;
painter->drawLine(0,y,maxWidth,y) ; painter->drawLine(0,y,maxWidth,y) ;
y += block_sep ; y += block_sep ;
// various info: // various info:
// //

4
retroshare-gui/src/gui/QuickStartWizard.cpp
View File

@ -119,7 +119,7 @@ void QuickStartWizard::on_pushButtonConnectionNext_clicked()
rsPeers->setNetworkMode(rsPeers->getOwnId(), netMode); rsPeers->setNetworkMode(rsPeers->getOwnId(), netMode);
/* Check if vis has changed */ /* Check if vis has changed */
int visState = 0; uint32_t visState = 0;
if (0 == ui.discoveryComboBox->currentIndex()) if (0 == ui.discoveryComboBox->currentIndex())
{ {
visState |= RS_VS_DISC_ON; visState |= RS_VS_DISC_ON;
@ -453,7 +453,7 @@ void QuickStartWizard::saveChanges()
} }
rsPeers->setNetworkMode(ownId, netMode); rsPeers->setNetworkMode(ownId, netMode);
int visState = 0; uint32_t visState = 0;
/* Check if vis has changed */ /* Check if vis has changed */
if (0 == ui.discoveryComboBox->currentIndex()) if (0 == ui.discoveryComboBox->currentIndex())
{ {

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

@ -40,8 +40,8 @@
RemoteDirModel::RemoteDirModel(bool mode, QObject *parent) RemoteDirModel::RemoteDirModel(bool mode, QObject *parent)
: QAbstractItemModel(parent), : QAbstractItemModel(parent),
RemoteMode(mode), nIndex(1), indexSet(1) /* ass zero index cant be used */, ageIndicator(IND_ALWAYS),
ageIndicator(IND_ALWAYS) RemoteMode(mode), nIndex(1), indexSet(1) /* ass zero index cant be used */
{ {
setSupportedDragActions(Qt::CopyAction); setSupportedDragActions(Qt::CopyAction);
treeStyle(); treeStyle();

2
retroshare-gui/src/gui/forums/CreateForumMsg.cpp
View File

@ -198,7 +198,7 @@ void CreateForumMsg::loadEmoticonsForums()
#endif #endif
if(!sm_file.open(QIODevice::ReadOnly)) if(!sm_file.open(QIODevice::ReadOnly))
{ {
std::cerr << "Could not open resouce file :/emoticons/emotes.acs" << endl ; std::cerr << "Could not open resouce file :/emoticons/emotes.acs" << std::endl ;
return ; return ;
} }
sm_codes = sm_file.readAll(); sm_codes = sm_file.readAll();

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

@ -229,7 +229,7 @@ void ServerPage::saveAddresses()
int netIndex = ui.netModeComboBox->currentIndex(); int netIndex = ui.netModeComboBox->currentIndex();
/* Check if netMode has changed */ /* Check if netMode has changed */
int netMode = 0; uint32_t netMode = 0;
switch(netIndex) switch(netIndex)
{ {
case 2: case 2:
@ -247,7 +247,7 @@ void ServerPage::saveAddresses()
if (detail.tryNetMode != netMode) if (detail.tryNetMode != netMode)
rsPeers->setNetworkMode(ownId, netMode); rsPeers->setNetworkMode(ownId, netMode);
int visState = 0; uint32_t visState = 0;
/* Check if vis has changed */ /* Check if vis has changed */
if (0 == ui.discComboBox->currentIndex()) if (0 == ui.discComboBox->currentIndex())
visState |= RS_VS_DISC_ON; visState |= RS_VS_DISC_ON;

4
retroshare-gui/src/gui/xprogressbar.cpp
View File

@ -198,9 +198,9 @@ void xProgressBar::paint()
if(ss > 1) // for small files we use a more progressive display if(ss > 1) // for small files we use a more progressive display
{ {
if(!_pinfo.cmap._map.empty()) if(!_pinfo.cmap._map.empty())
for(int i=0;i<ss;++i) for(uint32_t i=0;i<ss;++i)
{ {
int j=0 ; uint32_t j=0 ;
while(i+j<ss && _pinfo.cmap[i+j]) while(i+j<ss && _pinfo.cmap[i+j])
++j ; ++j ;