From c3c607ec8025eaa3206ddb8e2ca87f97d903b680 Mon Sep 17 00:00:00 2001
From: leander-256 <leander-256@users.sourceforge.net>
Date: Thu, 10 Jun 2010 14:13:20 +0000
Subject: [PATCH] Small bug and compiler warning fixes:

- 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
---
 retroshare-gui/src/gui/FileTransferInfoWidget.cpp | 4 ++--
 retroshare-gui/src/gui/QuickStartWizard.cpp       | 4 ++--
 retroshare-gui/src/gui/RemoteDirModel.cpp         | 4 ++--
 retroshare-gui/src/gui/forums/CreateForumMsg.cpp  | 2 +-
 retroshare-gui/src/gui/settings/ServerPage.cpp    | 4 ++--
 retroshare-gui/src/gui/xprogressbar.cpp           | 4 ++--
 6 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/retroshare-gui/src/gui/FileTransferInfoWidget.cpp b/retroshare-gui/src/gui/FileTransferInfoWidget.cpp
index c006680c9..f528c915b 100644
--- a/retroshare-gui/src/gui/FileTransferInfoWidget.cpp
+++ b/retroshare-gui/src/gui/FileTransferInfoWidget.cpp
@@ -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);
 
-	 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 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 ;
 	 painter->setPen(QColor::fromRgb(70,70,70)) ;
 	 painter->drawLine(0,y,maxWidth,y) ;
-	 y += block_sep ;
+         y += block_sep ;
 
 	 // various info:
 	 //
diff --git a/retroshare-gui/src/gui/QuickStartWizard.cpp b/retroshare-gui/src/gui/QuickStartWizard.cpp
index 740f19df7..862b5617d 100644
--- a/retroshare-gui/src/gui/QuickStartWizard.cpp
+++ b/retroshare-gui/src/gui/QuickStartWizard.cpp
@@ -119,7 +119,7 @@ void QuickStartWizard::on_pushButtonConnectionNext_clicked()
         rsPeers->setNetworkMode(rsPeers->getOwnId(), netMode);
 
         /* Check if vis has changed */
-        int visState = 0;
+        uint32_t visState = 0;
         if (0 == ui.discoveryComboBox->currentIndex())
         {
                 visState |= RS_VS_DISC_ON;
@@ -453,7 +453,7 @@ void QuickStartWizard::saveChanges()
 	}
         rsPeers->setNetworkMode(ownId, netMode);
 
-        int visState = 0;
+        uint32_t visState = 0;
         /* Check if vis has changed */
         if (0 == ui.discoveryComboBox->currentIndex())
         {
diff --git a/retroshare-gui/src/gui/RemoteDirModel.cpp b/retroshare-gui/src/gui/RemoteDirModel.cpp
index c354de776..76def3083 100644
--- a/retroshare-gui/src/gui/RemoteDirModel.cpp
+++ b/retroshare-gui/src/gui/RemoteDirModel.cpp
@@ -40,8 +40,8 @@
 
 RemoteDirModel::RemoteDirModel(bool mode, QObject *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);
 	treeStyle();
diff --git a/retroshare-gui/src/gui/forums/CreateForumMsg.cpp b/retroshare-gui/src/gui/forums/CreateForumMsg.cpp
index f496cdd16..764ebf979 100644
--- a/retroshare-gui/src/gui/forums/CreateForumMsg.cpp
+++ b/retroshare-gui/src/gui/forums/CreateForumMsg.cpp
@@ -198,7 +198,7 @@ void CreateForumMsg::loadEmoticonsForums()
 	#endif
 	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 ;
 	}
 	sm_codes = sm_file.readAll();
diff --git a/retroshare-gui/src/gui/settings/ServerPage.cpp b/retroshare-gui/src/gui/settings/ServerPage.cpp
index dc24ce0a1..52323e6e9 100755
--- a/retroshare-gui/src/gui/settings/ServerPage.cpp
+++ b/retroshare-gui/src/gui/settings/ServerPage.cpp
@@ -229,7 +229,7 @@ void ServerPage::saveAddresses()
 	int netIndex = ui.netModeComboBox->currentIndex();
 
 	/* Check if netMode has changed */
-	int netMode = 0;
+	uint32_t netMode = 0;
 	switch(netIndex)
 	{
 		case 2:
@@ -247,7 +247,7 @@ void ServerPage::saveAddresses()
 	if (detail.tryNetMode != netMode)
 		rsPeers->setNetworkMode(ownId, netMode);
 
-	int visState = 0;
+	uint32_t visState = 0;
 	/* Check if vis has changed */
 	if (0 == ui.discComboBox->currentIndex())
 		visState |= RS_VS_DISC_ON;
diff --git a/retroshare-gui/src/gui/xprogressbar.cpp b/retroshare-gui/src/gui/xprogressbar.cpp
index 7e8286bd2..4d949aa01 100644
--- a/retroshare-gui/src/gui/xprogressbar.cpp
+++ b/retroshare-gui/src/gui/xprogressbar.cpp
@@ -198,9 +198,9 @@ void xProgressBar::paint()
 	if(ss > 1)	// for small files we use a more progressive display
 	{
 		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])
 					++j ;