Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-08-09 23:02:29 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Removed some more compiler warnings in retroshare-gui.

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4566 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2011-08-14 21:25:41 +00:00
parent cd0854c4e8
commit 39708cdd0b
8 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
retroshare-gui/src/gui/NetworkView.h
View file

@ -57,7 +57,7 @@ class NetworkView : public RsAutoUpdatePage
/** Qt Designer generated object */ /** Qt Designer generated object */
Ui::NetworkView ui; Ui::NetworkView ui;
int _max_friend_level ; uint _max_friend_level ;
std::map<std::string,GraphWidget::NodeId> _node_ids ; std::map<std::string,GraphWidget::NodeId> _node_ids ;
bool _should_update ; bool _should_update ;

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

@ -761,7 +761,7 @@ QModelIndex FlatStyle_RDM::index(int row, int column, const QModelIndex & parent
if(row < 0) if(row < 0)
return QModelIndex() ; return QModelIndex() ;
if(row < _ref_entries.size()) if(row < (int) _ref_entries.size())
{ {
void *ref = _ref_entries[row].first ; void *ref = _ref_entries[row].first ;

4
retroshare-gui/src/gui/SearchDialog.cpp
View file

@ -630,7 +630,7 @@ void SearchDialog::searchKeywords(const QString& keywords)
req_id = rsTurtle->turtleSearch(lin_exp) ; req_id = rsTurtle->turtleSearch(lin_exp) ;
} }
else else
req_id = (((uint32_t)rand()) << 16)^0x1e2fd5e4 + ((uint32_t)rand())^0x1b19acfe ; // generate a random 32 bits request id req_id = ((((uint32_t)rand()) << 16)^0x1e2fd5e4) + (((uint32_t)rand())^0x1b19acfe) ; // generate a random 32 bits request id
initSearchResult(txt,req_id) ; // this will act before turtle results come to the interface, thanks to the signals scheduling policy. initSearchResult(txt,req_id) ; // this will act before turtle results come to the interface, thanks to the signals scheduling policy.
@ -928,7 +928,7 @@ void SearchDialog::insertFile(const std::string& txt,qulonglong searchId, const
if(nb_results.find(searchId) == nb_results.end()) if(nb_results.find(searchId) == nb_results.end())
nb_results[searchId] = 0 ; nb_results[searchId] = 0 ;
if(nb_results[searchId] >= ui._max_results_SB->value()) if((int) nb_results[searchId] >= ui._max_results_SB->value())
return ; return ;
// 1 - look in result window whether the file already exists. // 1 - look in result window whether the file already exists.

2
retroshare-gui/src/gui/TurtleRouterDialog.cpp
View file

@ -9,7 +9,7 @@
#include "gui/settings/rsharesettings.h" #include "gui/settings/rsharesettings.h"
static const int MAX_TUNNEL_REQUESTS_DISPLAY = 10 ; static const uint MAX_TUNNEL_REQUESTS_DISPLAY = 10 ;
TurtleRouterDialog::TurtleRouterDialog(QWidget *parent) TurtleRouterDialog::TurtleRouterDialog(QWidget *parent)

2
retroshare-gui/src/gui/common/rwindow.cpp
View file

@ -128,7 +128,7 @@ RWindow::setVisible(bool visible)
* window visible. */ * window visible. */
if (isVisible()) { if (isVisible()) {
activateWindow(); activateWindow();
setWindowState(windowState() & ~Qt::WindowMinimized | Qt::WindowActive); setWindowState((windowState() & ~Qt::WindowMinimized) | Qt::WindowActive);
raise(); raise();
} else { } else {
restoreWindowState(); restoreWindowState();

2
retroshare-gui/src/gui/elastic/graphwidget.cpp
View file

@ -60,7 +60,7 @@ void fourn(double data[],unsigned long nn[],unsigned long ndim,int isign)
double theta,wi,wpi,wpr,wr,wtemp; double theta,wi,wpi,wpr,wr,wtemp;
ntot=1; ntot=1;
for (idim=1;idim<=ndim;idim++) for (idim=1;idim<=(long)ndim;idim++)
ntot *= nn[idim]; ntot *= nn[idim];
nprev=1; nprev=1;
for (idim=ndim;idim>=1;idim--) { for (idim=ndim;idim>=1;idim--) {

4
retroshare-gui/src/gui/elastic/node.h
View file

@ -42,7 +42,7 @@
#ifndef NODE_H #ifndef NODE_H
#define NODE_H #define NODE_H
#include <QGraphicsItem> #include <QGraphicsObject>
#include <QList> #include <QList>
#include "graphwidget.h" #include "graphwidget.h"
@ -52,7 +52,7 @@ QT_BEGIN_NAMESPACE
class QGraphicsSceneMouseEvent; class QGraphicsSceneMouseEvent;
QT_END_NAMESPACE QT_END_NAMESPACE
class Node : public QObject, public QGraphicsItem class Node : public QGraphicsObject
{ {
Q_OBJECT Q_OBJECT

2
retroshare-gui/src/gui/settings/PluginsPage.cpp
View file

@ -103,7 +103,7 @@ PluginsPage::PluginsPage(QWidget * parent, Qt::WFlags flags)
const std::vector<std::string>& dirs(rsPlugins->getPluginDirectories()) ; const std::vector<std::string>& dirs(rsPlugins->getPluginDirectories()) ;
text = "" ; text = "" ;
for(int i=0;i<dirs.size();++i) for(uint i=0;i<dirs.size();++i)
text += "<b>"+QString::fromStdString(dirs[i]) + "</b><br/>" ; text += "<b>"+QString::fromStdString(dirs[i]) + "</b><br/>" ;
ui._lookupDirectories_TB->setHtml(text) ; ui._lookupDirectories_TB->setHtml(text) ;