Removed unused parameter warnings in retroshare-gui.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4559 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2011-08-12 14:06:29 +00:00
parent c6beee44ec
commit 70d02c718d
60 changed files with 132 additions and 113 deletions

View File

@ -126,7 +126,7 @@ void ChannelFeed::processSettings(bool load)
Settings->endGroup(); Settings->endGroup();
} }
void ChannelFeed::channelListCustomPopupMenu( QPoint point ) void ChannelFeed::channelListCustomPopupMenu( QPoint /*point*/ )
{ {
ChannelInfo ci; ChannelInfo ci;
if (!rsChannels->getChannelInfo(mChannelId, ci)) { if (!rsChannels->getChannelInfo(mChannelId, ci)) {
@ -197,11 +197,11 @@ void ChannelFeed::createChannel()
/*************************************************************************************/ /*************************************************************************************/
/*************************************************************************************/ /*************************************************************************************/
void ChannelFeed::deleteFeedItem(QWidget *item, uint32_t type) void ChannelFeed::deleteFeedItem(QWidget */*item*/, uint32_t /*type*/)
{ {
} }
void ChannelFeed::openChat(std::string peerId) void ChannelFeed::openChat(std::string /*peerId*/)
{ {
} }
@ -377,7 +377,7 @@ void ChannelFeed::updateChannelList()
} }
void ChannelFeed::channelMsgReadSatusChanged(const QString& channelId, const QString& msgId, int status) void ChannelFeed::channelMsgReadSatusChanged(const QString& channelId, const QString& /*msgId*/, int /*status*/)
{ {
updateMessageSummaryList(channelId.toStdString()); updateMessageSummaryList(channelId.toStdString());
} }

View File

@ -39,7 +39,7 @@ static const int availability_map_size_X = 400 ;// length of availability bar
static const int availability_map_size_Y = 20 ; // height of availability bar static const int availability_map_size_Y = 20 ; // height of availability bar
static const int tab_size = 200 ;// size between tabulated entries static const int tab_size = 200 ;// size between tabulated entries
FileTransferInfoWidget::FileTransferInfoWidget(QWidget * parent, Qt::WFlags f ) FileTransferInfoWidget::FileTransferInfoWidget(QWidget * /*parent*/, Qt::WFlags /*f*/ )
{ {
QRect TaskGraphRect = geometry(); QRect TaskGraphRect = geometry();
maxWidth = TaskGraphRect.width(); maxWidth = TaskGraphRect.width();
@ -54,7 +54,7 @@ FileTransferInfoWidget::FileTransferInfoWidget(QWidget * parent, Qt::WFlags f )
setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding); setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
} }
void FileTransferInfoWidget::resizeEvent(QResizeEvent *event) void FileTransferInfoWidget::resizeEvent(QResizeEvent */*event*/)
{ {
QRect TaskGraphRect = geometry(); QRect TaskGraphRect = geometry();
maxWidth = TaskGraphRect.width(); maxWidth = TaskGraphRect.width();
@ -97,7 +97,7 @@ void FileTransferInfoWidget::updateDisplay()
pixmap2 = pixmap; pixmap2 = pixmap;
} }
void FileTransferInfoWidget::paintEvent(QPaintEvent *event) void FileTransferInfoWidget::paintEvent(QPaintEvent */*event*/)
{ {
//std::cout << "In paint event" << std::endl ; //std::cout << "In paint event" << std::endl ;
QStylePainter painter(this); QStylePainter painter(this);

View File

@ -275,7 +275,7 @@ void ForumsDialog::processSettings(bool bLoad)
m_bProcessSettings = false; m_bProcessSettings = false;
} }
void ForumsDialog::forumListCustomPopupMenu( QPoint point ) void ForumsDialog::forumListCustomPopupMenu( QPoint /*point*/ )
{ {
QMenu contextMnu( this ); QMenu contextMnu( this );
@ -321,7 +321,7 @@ void ForumsDialog::forumListCustomPopupMenu( QPoint point )
contextMnu.exec(QCursor::pos()); contextMnu.exec(QCursor::pos());
} }
void ForumsDialog::threadListCustomPopupMenu( QPoint point ) void ForumsDialog::threadListCustomPopupMenu( QPoint /*point*/ )
{ {
if (fillThread) { if (fillThread) {
return; return;

View File

@ -368,7 +368,7 @@ void FriendsDialog::pasteLink()
ui.lineEdit->insertHtml(RSLinkClipboard::toHtml()) ; ui.lineEdit->insertHtml(RSLinkClipboard::toHtml()) ;
} }
void FriendsDialog::contextMenu(QPoint point) void FriendsDialog::contextMenu(QPoint /*point*/)
{ {
QMenu *contextMnu = ui.lineEdit->createStandardContextMenu(); QMenu *contextMnu = ui.lineEdit->createStandardContextMenu();
@ -380,7 +380,7 @@ void FriendsDialog::contextMenu(QPoint point)
delete(contextMnu); delete(contextMnu);
} }
void FriendsDialog::peertreeWidgetCostumPopupMenu( QPoint point ) void FriendsDialog::peertreeWidgetCostumPopupMenu( QPoint /*point*/ )
{ {
QTreeWidgetItem *c = getCurrentPeer(); QTreeWidgetItem *c = getCurrentPeer();
@ -1691,7 +1691,7 @@ void FriendsDialog::setColor()
void FriendsDialog::colorChanged(const QColor &c) void FriendsDialog::colorChanged(const QColor &c)
{ {
QPixmap pxm(16,16); QPixmap pxm(16,16);
pxm.fill(mCurrentColor); pxm.fill(c);
ui.colorChatButton->setIcon(pxm); ui.colorChatButton->setIcon(pxm);
} }

View File

@ -292,7 +292,7 @@ void GenCertDialog::selectFriend()
} }
void GenCertDialog::checkChanged(int i) void GenCertDialog::checkChanged(int /*i*/)
{ {
#if 0 #if 0

View File

@ -84,7 +84,7 @@ void GetStartedDialog::changeEvent(QEvent *e)
} }
void GetStartedDialog::showEvent ( QShowEvent * event ) void GetStartedDialog::showEvent ( QShowEvent * /*event*/ )
{ {
/* do nothing if locked, or not visible */ /* do nothing if locked, or not visible */
if (RsAutoUpdatePage::eventsLocked() == true) if (RsAutoUpdatePage::eventsLocked() == true)

View File

@ -694,7 +694,7 @@ void MainWindow::updateForums()
updateTrayCombine(); updateTrayCombine();
} }
void MainWindow::updateChannels(int type) void MainWindow::updateChannels(int /*type*/)
{ {
unsigned int newMessageCount = 0; unsigned int newMessageCount = 0;
unsigned int unreadMessageCount = 0; unsigned int unreadMessageCount = 0;
@ -1174,7 +1174,7 @@ void MainWindow::doQuit()
rApp->quit(); rApp->quit();
} }
void MainWindow::displayErrorMessage(int a,int b,const QString& error_msg) void MainWindow::displayErrorMessage(int /*a*/,int /*b*/,const QString& error_msg)
{ {
QMessageBox::critical(NULL, tr("Internal Error"),error_msg) ; QMessageBox::critical(NULL, tr("Internal Error"),error_msg) ;
} }

View File

@ -523,7 +523,7 @@ bool MessagesDialog::hasMessageStar(int nRow)
return item->data(ROLE_MSGFLAGS).toInt() & RS_MSG_STAR; return item->data(ROLE_MSGFLAGS).toInt() & RS_MSG_STAR;
} }
void MessagesDialog::messageslistWidgetCostumPopupMenu( QPoint point ) void MessagesDialog::messageslistWidgetCostumPopupMenu( QPoint /*point*/ )
{ {
std::string cid; std::string cid;
std::string mid; std::string mid;
@ -621,7 +621,7 @@ void MessagesDialog::messageslistWidgetCostumPopupMenu( QPoint point )
contextMnu.exec(QCursor::pos()); contextMnu.exec(QCursor::pos());
} }
void MessagesDialog::folderlistWidgetCostumPopupMenu(QPoint point) void MessagesDialog::folderlistWidgetCostumPopupMenu(QPoint /*point*/)
{ {
if (ui.listWidget->currentRow() != ROW_TRASHBOX) { if (ui.listWidget->currentRow() != ROW_TRASHBOX) {
/* Context menu only neede for trash box */ /* Context menu only neede for trash box */
@ -1892,7 +1892,7 @@ void MessagesDialog::emptyTrash()
// LockUpdate -> insertMessages(); // LockUpdate -> insertMessages();
} }
void MessagesDialog::tabChanged(int tab) void MessagesDialog::tabChanged(int /*tab*/)
{ {
connectActions(); connectActions();
updateInterface(); updateInterface();

View File

@ -285,7 +285,7 @@ void MessengerWindow::processSettings(bool bLoad)
Settings->endGroup(); Settings->endGroup();
} }
void MessengerWindow::messengertreeWidgetCostumPopupMenu( QPoint point ) void MessengerWindow::messengertreeWidgetCostumPopupMenu( QPoint /*point*/ )
{ {
QTreeWidgetItem *c = getCurrentPeer(); QTreeWidgetItem *c = getCurrentPeer();
@ -1045,7 +1045,7 @@ void MessengerWindow::pastePerson()
//============================================================================ //============================================================================
void MessengerWindow::closeEvent (QCloseEvent * event) void MessengerWindow::closeEvent (QCloseEvent * /*event*/)
{ {
/* save the expanded peers */ /* save the expanded peers */
if (expandedPeers == NULL) { if (expandedPeers == NULL) {

View File

@ -197,7 +197,7 @@ void NetworkDialog::updateNewDiscoveryInfo()
networkview->updateDisplay(); networkview->updateDisplay();
} }
void NetworkDialog::connecttreeWidgetCostumPopupMenu( QPoint point ) void NetworkDialog::connecttreeWidgetCostumPopupMenu( QPoint /*point*/ )
{ {
//std::cerr << "NetworkDialog::connecttreeWidgetCostumPopupMenu( QPoint point ) called" << std::endl; //std::cerr << "NetworkDialog::connecttreeWidgetCostumPopupMenu( QPoint point ) called" << std::endl;
QTreeWidgetItem *wi = getCurrentNeighbour(); QTreeWidgetItem *wi = getCurrentNeighbour();

View File

@ -124,8 +124,6 @@ void NetworkView::updateDisplay()
std::cerr << "NetworkView::updateDisplay()" << std::endl; std::cerr << "NetworkView::updateDisplay()" << std::endl;
#endif #endif
int i = 0;
std::deque<NodeInfo> nodes_to_treat ; // list of nodes to be treated. Used as a queue. The int is the level of friendness std::deque<NodeInfo> nodes_to_treat ; // list of nodes to be treated. Used as a queue. The int is the level of friendness
std::set<std::string> nodes_considered ; // list of nodes already considered. Eases lookup. std::set<std::string> nodes_considered ; // list of nodes already considered. Eases lookup.

View File

@ -471,6 +471,8 @@ void NewsFeed::addFeedItemBlogNew(RsFeedItem &fi)
/* add to layout */ /* add to layout */
addFeedItem(bni); addFeedItem(bni);
#else
Q_UNUSED(fi);
#endif #endif
#ifdef NEWS_DEBUG #ifdef NEWS_DEBUG
@ -489,6 +491,8 @@ void NewsFeed::addFeedItemBlogMsg(RsFeedItem &fi)
/* add to layout */ /* add to layout */
addFeedItem(bm); addFeedItem(bm);
#else
Q_UNUSED(fi);
#endif #endif
#ifdef NEWS_DEBUG #ifdef NEWS_DEBUG
@ -535,7 +539,7 @@ void NewsFeed::addFeedItemMessage(RsFeedItem &fi)
#endif #endif
} }
void NewsFeed::addFeedItemFilesNew(RsFeedItem &fi) void NewsFeed::addFeedItemFilesNew(RsFeedItem &/*fi*/)
{ {
#ifdef NEWS_DEBUG #ifdef NEWS_DEBUG
std::cerr << "NewsFeed::addFeedItemFilesNew()"; std::cerr << "NewsFeed::addFeedItemFilesNew()";
@ -544,7 +548,7 @@ void NewsFeed::addFeedItemFilesNew(RsFeedItem &fi)
} }
/* FeedHolder Functions (for FeedItem functionality) */ /* FeedHolder Functions (for FeedItem functionality) */
void NewsFeed::deleteFeedItem(QWidget *item, uint32_t type) void NewsFeed::deleteFeedItem(QWidget *item, uint32_t /*type*/)
{ {
#ifdef NEWS_DEBUG #ifdef NEWS_DEBUG
std::cerr << "NewsFeed::deleteFeedItem()"; std::cerr << "NewsFeed::deleteFeedItem()";

View File

@ -183,6 +183,8 @@ int TreeStyle_RDM::rowCount(const QModelIndex &parent) const
int FlatStyle_RDM::rowCount(const QModelIndex &parent) const int FlatStyle_RDM::rowCount(const QModelIndex &parent) const
{ {
Q_UNUSED(parent);
#ifdef RDM_DEBUG #ifdef RDM_DEBUG
std::cerr << "RetroshareDirModel::rowCount(): " << parent.internalPointer(); std::cerr << "RetroshareDirModel::rowCount(): " << parent.internalPointer();
std::cerr << ": "; std::cerr << ": ";
@ -190,11 +192,11 @@ int FlatStyle_RDM::rowCount(const QModelIndex &parent) const
return _ref_entries.size() ; return _ref_entries.size() ;
} }
int TreeStyle_RDM::columnCount(const QModelIndex &parent) const int TreeStyle_RDM::columnCount(const QModelIndex &/*parent*/) const
{ {
return 5; return 5;
} }
int FlatStyle_RDM::columnCount(const QModelIndex &parent) const int FlatStyle_RDM::columnCount(const QModelIndex &/*parent*/) const
{ {
return 5; return 5;
} }
@ -419,7 +421,7 @@ QVariant FlatStyle_RDM::displayRole(const DirDetails& details,int coln) const
return QVariant(); return QVariant();
} /* end of DisplayRole */ } /* end of DisplayRole */
QVariant TreeStyle_RDM::sortRole(const QModelIndex& index,const DirDetails& details,int coln) const QVariant TreeStyle_RDM::sortRole(const QModelIndex& /*index*/,const DirDetails& details,int coln) const
{ {
/* /*
* Person: name, id, 0, 0; * Person: name, id, 0, 0;
@ -750,6 +752,7 @@ QModelIndex TreeStyle_RDM::index(int row, int column, const QModelIndex & parent
} }
QModelIndex FlatStyle_RDM::index(int row, int column, const QModelIndex & parent) const QModelIndex FlatStyle_RDM::index(int row, int column, const QModelIndex & parent) const
{ {
Q_UNUSED(parent);
#ifdef RDM_DEBUG #ifdef RDM_DEBUG
std::cerr << "RetroshareDirModel::index(): " << parent.internalPointer(); std::cerr << "RetroshareDirModel::index(): " << parent.internalPointer();
std::cerr << ": row:" << row << " col:" << column << " "; std::cerr << ": row:" << row << " col:" << column << " ";
@ -817,6 +820,8 @@ QModelIndex TreeStyle_RDM::parent( const QModelIndex & index ) const
} }
QModelIndex FlatStyle_RDM::parent( const QModelIndex & index ) const QModelIndex FlatStyle_RDM::parent( const QModelIndex & index ) const
{ {
Q_UNUSED(index);
#ifdef RDM_DEBUG #ifdef RDM_DEBUG
std::cerr << "RetroshareDirModel::parent(): " << index.internalPointer(); std::cerr << "RetroshareDirModel::parent(): " << index.internalPointer();
std::cerr << ": "; std::cerr << ": ";

View File

@ -24,7 +24,7 @@ RsAutoUpdatePage::~RsAutoUpdatePage()
_timer = NULL ; _timer = NULL ;
} }
void RsAutoUpdatePage::showEvent(QShowEvent *event) void RsAutoUpdatePage::showEvent(QShowEvent */*event*/)
{ {
//std::cout << "RsAutoUpdatePage::showEvent() In show event !!" << std::endl ; //std::cout << "RsAutoUpdatePage::showEvent() In show event !!" << std::endl ;
if(!_locked) if(!_locked)

View File

@ -278,7 +278,7 @@ void SearchDialog::initialiseFileTypeMappings()
SearchDialog::initialised = true; SearchDialog::initialised = true;
} }
void SearchDialog::searchtableWidgetCostumPopupMenu( QPoint point ) void SearchDialog::searchtableWidgetCostumPopupMenu( QPoint /*point*/ )
{ {
// block the popup if no results available // block the popup if no results available
if ((ui.searchResultWidget->selectedItems()).size() == 0) return; if ((ui.searchResultWidget->selectedItems()).size() == 0) return;
@ -416,7 +416,7 @@ void SearchDialog::recommendtofriends()
/** context menu searchTablewidget2 **/ /** context menu searchTablewidget2 **/
void SearchDialog::searchtableWidget2CostumPopupMenu( QPoint point ) void SearchDialog::searchtableWidget2CostumPopupMenu( QPoint /*point*/ )
{ {
// block the popup if no results available // block the popup if no results available
if ((ui.searchSummaryWidget->selectedItems()).size() == 0) return; if ((ui.searchSummaryWidget->selectedItems()).size() == 0) return;

View File

@ -89,7 +89,7 @@ ShareManager::~ShareManager()
Settings->saveWidgetInformation(this); Settings->saveWidgetInformation(this);
} }
void ShareManager::shareddirListCostumPopupMenu( QPoint point ) void ShareManager::shareddirListCostumPopupMenu( QPoint /*point*/ )
{ {
QMenu contextMnu( this ); QMenu contextMnu( this );

View File

@ -789,7 +789,7 @@ void SharedFilesDialog::sharedDirTreeWidgetContextMenu( QPoint point )
//============================================================================ //============================================================================
QAction* QAction*
SharedFilesDialog::fileAssotiationAction(const QString fileName) SharedFilesDialog::fileAssotiationAction(const QString /*fileName*/)
{ {
QAction* result = 0; QAction* result = 0;
@ -974,7 +974,7 @@ void SharedFilesDialog::FilterItems()
setCursor(Qt::ArrowCursor); setCursor(Qt::ArrowCursor);
} }
bool SharedFilesDialog::flat_FilterItem(const QModelIndex &index, const QString &text, int level) bool SharedFilesDialog::flat_FilterItem(const QModelIndex &index, const QString &text, int /*level*/)
{ {
if(index.data(RetroshareDirModel::FileNameRole).toString().contains(text, Qt::CaseInsensitive)) if(index.data(RetroshareDirModel::FileNameRole).toString().contains(text, Qt::CaseInsensitive))
{ {

View File

@ -181,7 +181,7 @@ void StartDialog::loadCertificates()
void StartDialog::on_labelProfile_linkActivated(QString link) void StartDialog::on_labelProfile_linkActivated(QString /*link*/)
{ {
// if ((QMessageBox::question(this, tr("Create a New Profile"),tr("This will generate a new Profile\n Are you sure you want to continue?"),QMessageBox::Yes|QMessageBox::No, QMessageBox::Yes))== QMessageBox::Yes) // if ((QMessageBox::question(this, tr("Create a New Profile"),tr("This will generate a new Profile\n Are you sure you want to continue?"),QMessageBox::Yes|QMessageBox::No, QMessageBox::Yes))== QMessageBox::Yes)
@ -194,7 +194,7 @@ void StartDialog::on_labelProfile_linkActivated(QString link)
} }
void StartDialog::on_labelInfo_linkActivated(QString link) void StartDialog::on_labelInfo_linkActivated(QString /*link*/)
{ {
InfoDialog infodialog (this); InfoDialog infodialog (this);
infodialog.exec (); infodialog.exec ();

View File

@ -417,7 +417,7 @@ void TransfersDialog::processSettings(bool bLoad)
// RsAutoUpdatePage::keyPressEvent(e) ; // RsAutoUpdatePage::keyPressEvent(e) ;
//} //}
void TransfersDialog::downloadListCostumPopupMenu( QPoint point ) void TransfersDialog::downloadListCostumPopupMenu( QPoint /*point*/ )
{ {
std::set<std::string> items; std::set<std::string> items;
std::set<std::string>::iterator it; std::set<std::string>::iterator it;

View File

@ -267,8 +267,8 @@ TurtleRouterStatisticsWidget::TurtleRouterStatisticsWidget(QWidget *parent)
maxHeight = 0 ; maxHeight = 0 ;
} }
void TurtleRouterStatisticsWidget::updateTunnelStatistics(const std::vector<std::vector<std::string> >& hashes_info, void TurtleRouterStatisticsWidget::updateTunnelStatistics(const std::vector<std::vector<std::string> >& /*hashes_info*/,
const std::vector<std::vector<std::string> >& tunnels_info, const std::vector<std::vector<std::string> >& /*tunnels_info*/,
const std::vector<TurtleRequestDisplayInfo >& search_reqs_info, const std::vector<TurtleRequestDisplayInfo >& search_reqs_info,
const std::vector<TurtleRequestDisplayInfo >& tunnel_reqs_info) const std::vector<TurtleRequestDisplayInfo >& tunnel_reqs_info)
@ -329,7 +329,7 @@ QString TurtleRouterStatisticsWidget::speedString(float f)
return QString::number(f/1024.0,'f',2) + " KB/s"; return QString::number(f/1024.0,'f',2) + " KB/s";
} }
void TurtleRouterStatisticsWidget::paintEvent(QPaintEvent *event) void TurtleRouterStatisticsWidget::paintEvent(QPaintEvent */*event*/)
{ {
QStylePainter(this).drawPixmap(0, 0, pixmap); QStylePainter(this).drawPixmap(0, 0, pixmap);
} }

View File

@ -312,8 +312,8 @@ VoipStatisticsWidget::VoipStatisticsWidget(QWidget *parent)
void VoipStatisticsWidget::updateVoipStatistics(const std::map<std::string, std::list<RsVoipPongResult> >& info, void VoipStatisticsWidget::updateVoipStatistics(const std::map<std::string, std::list<RsVoipPongResult> >& info,
double maxRTT, double minTS, double maxTS) double maxRTT, double minTS, double maxTS)
{ {
static const int cellx = 6 ; //static const int cellx = 6 ;
static const int celly = 10+4 ; //static const int celly = 10+4 ;
QPixmap tmppixmap(maxWidth, maxHeight); QPixmap tmppixmap(maxWidth, maxHeight);
tmppixmap.fill(this, 0, 0); tmppixmap.fill(this, 0, 0);
@ -375,7 +375,7 @@ QString VoipStatisticsWidget::speedString(float f)
return QString::number(f/1024.0,'f',2) + " KB/s"; return QString::number(f/1024.0,'f',2) + " KB/s";
} }
void VoipStatisticsWidget::paintEvent(QPaintEvent *event) void VoipStatisticsWidget::paintEvent(QPaintEvent */*event*/)
{ {
QStylePainter(this).drawPixmap(0, 0, pixmap); QStylePainter(this).drawPixmap(0, 0, pixmap);
} }

View File

@ -208,7 +208,7 @@ void CreateChannel::createChannel()
} }
void CreateChannel::togglePersonItem( QTreeWidgetItem *item, int col ) void CreateChannel::togglePersonItem( QTreeWidgetItem *item, int /*col*/ )
{ {
/* extract id */ /* extract id */

View File

@ -402,7 +402,9 @@ bool CreateChannelMsg::setThumbNail(const std::string& path, int frame){
thumbnail_label->setPixmap(img); thumbnail_label->setPixmap(img);
delete[] imageBuffer; delete[] imageBuffer;
#else
Q_UNUSED(path);
Q_UNUSED(frame);
#endif #endif
return true; return true;

View File

@ -157,7 +157,7 @@ void ShareKey::setShareList(){
} }
void ShareKey::togglePersonItem( QTreeWidgetItem *item, int col ) void ShareKey::togglePersonItem( QTreeWidgetItem *item, int /*col*/ )
{ {
/* extract id */ /* extract id */

View File

@ -429,7 +429,7 @@ void PopupChatDialog::pasteLink()
ui.chattextEdit->insertHtml(RSLinkClipboard::toHtml()) ; ui.chattextEdit->insertHtml(RSLinkClipboard::toHtml()) ;
} }
void PopupChatDialog::contextMenu( QPoint point ) void PopupChatDialog::contextMenu( QPoint /*point*/ )
{ {
std::cerr << "In context menu" << std::endl ; std::cerr << "In context menu" << std::endl ;
@ -489,7 +489,7 @@ void PopupChatDialog::updateStatusString(const QString& peer_id, const QString&
QTimer::singleShot(5000,this,SLOT(resetStatusBar())) ; QTimer::singleShot(5000,this,SLOT(resetStatusBar())) ;
} }
void PopupChatDialog::resizeEvent(QResizeEvent *event) void PopupChatDialog::resizeEvent(QResizeEvent */*event*/)
{ {
// Workaround: now the scroll position is correct calculated // Workaround: now the scroll position is correct calculated
QScrollBar *scrollbar = ui.textBrowser->verticalScrollBar(); QScrollBar *scrollbar = ui.textBrowser->verticalScrollBar();

View File

@ -124,7 +124,7 @@ void PopupChatWindow::saveSettings()
} }
} }
void PopupChatWindow::showEvent(QShowEvent *event) void PopupChatWindow::showEvent(QShowEvent */*event*/)
{ {
if (firstShow) { if (firstShow) {
firstShow = false; firstShow = false;
@ -214,7 +214,7 @@ void PopupChatWindow::showDialog(PopupChatDialog *dialog, uint chatflags)
} }
} }
void PopupChatWindow::alertDialog(PopupChatDialog *dialog) void PopupChatWindow::alertDialog(PopupChatDialog */*dialog*/)
{ {
QApplication::alert(this); QApplication::alert(this);
} }

View File

@ -364,7 +364,6 @@ void DhtWindow::updateNetPeers()
#endif #endif
peerTreeWidget->clear(); peerTreeWidget->clear();
time_t now = time(NULL);
for(it = peerIds.begin(); it != peerIds.end(); it++) for(it = peerIds.begin(); it != peerIds.end(); it++)
{ {
/* find the entry */ /* find the entry */

View File

@ -47,7 +47,6 @@
#include <math.h> #include <math.h>
static const double Pi = 3.14159265358979323846264338327950288419717; static const double Pi = 3.14159265358979323846264338327950288419717;
static double TwoPi = 2.0 * Pi;
Edge::Edge(Node *sourceNode, Node *destNode) Edge::Edge(Node *sourceNode, Node *destNode)
: arrowSize(10) : arrowSize(10)

View File

@ -256,7 +256,7 @@ void GraphWidget::keyPressEvent(QKeyEvent *event)
} }
} }
static void convolveWithGaussian(double *forceMap,int S,int s) static void convolveWithGaussian(double *forceMap,int S,int /*s*/)
{ {
static double *bf = NULL ; static double *bf = NULL ;
@ -269,7 +269,7 @@ static void convolveWithGaussian(double *forceMap,int S,int s)
{ {
int x = (i<S/2)?i:(S-i) ; int x = (i<S/2)?i:(S-i) ;
int y = (j<S/2)?j:(S-j) ; int y = (j<S/2)?j:(S-j) ;
int l=2*(x*x+y*y); // int l=2*(x*x+y*y);
bf[2*(i+S*j)] = log(sqrtf(0.1 + x*x+y*y)); // linear -> derivative is constant bf[2*(i+S*j)] = log(sqrtf(0.1 + x*x+y*y)); // linear -> derivative is constant
bf[2*(i+S*j)+1] = 0 ; bf[2*(i+S*j)+1] = 0 ;
} }
@ -334,7 +334,6 @@ void GraphWidget::timerEvent(QTimerEvent *event)
// compute convolution with 1/omega kernel. // compute convolution with 1/omega kernel.
convolveWithGaussian(forceMap,S,20) ; convolveWithGaussian(forceMap,S,20) ;
static int toto=0 ;
static float speedf=1.0f; static float speedf=1.0f;
foreach (Node *node, _nodes) foreach (Node *node, _nodes)

View File

@ -92,23 +92,23 @@ const QList<Edge *>& Node::edges() const
return edgeList; return edgeList;
} }
static double interpolate(const double *map,int W,int H,float x,float y) //static double interpolate(const double *map,int W,int H,float x,float y)
{ //{
if(x>W-2) x=W-2 ; // if(x>W-2) x=W-2 ;
if(y>H-2) y=H-2 ; // if(y>H-2) y=H-2 ;
if(x<0 ) x=0 ; // if(x<0 ) x=0 ;
if(y<0 ) y=0 ; // if(y<0 ) y=0 ;
//
// int i=(int)floor(x) ;
// int j=(int)floor(y) ;
// double di = x-i ;
// double dj = y-j ;
//
// return (1-di)*( (1-dj)*map[2*(i+W*j)] + dj*map[2*(i+W*(j+1))])
// +di *( (1-dj)*map[2*(i+1+W*j)] + dj*map[2*(i+1+W*(j+1))]) ;
//}
int i=(int)floor(x) ; void Node::calculateForces(const double *map,int width,int height,int W,int H,float x,float y,float /*speedf*/)
int j=(int)floor(y) ;
double di = x-i ;
double dj = y-j ;
return (1-di)*( (1-dj)*map[2*(i+W*j)] + dj*map[2*(i+W*(j+1))])
+di *( (1-dj)*map[2*(i+1+W*j)] + dj*map[2*(i+1+W*(j+1))]) ;
}
void Node::calculateForces(const double *map,int width,int height,int W,int H,float x,float y,float speedf)
{ {
if (!scene() || scene()->mouseGrabberItem() == this) if (!scene() || scene()->mouseGrabberItem() == this)
{ {

View File

@ -390,7 +390,7 @@ void ChanMsgItem::readToggled(bool checked)
rsChannels->setMessageStatus(mChanId, mMsgId, statusNew, CHANNEL_MSG_STATUS_READ | CHANNEL_MSG_STATUS_UNREAD_BY_USER); rsChannels->setMessageStatus(mChanId, mMsgId, statusNew, CHANNEL_MSG_STATUS_READ | CHANNEL_MSG_STATUS_UNREAD_BY_USER);
} }
void ChanMsgItem::channelMsgReadSatusChanged(const QString& channelId, const QString& msgId, int status) void ChanMsgItem::channelMsgReadSatusChanged(const QString& channelId, const QString& msgId, int /*status*/)
{ {
if (channelId.toStdString() == mChanId && msgId.toStdString() == mMsgId) { if (channelId.toStdString() == mChanId && msgId.toStdString() == mMsgId) {
updateItemStatic(); updateItemStatic();

View File

@ -65,7 +65,7 @@ CreateForumMsg::CreateForumMsg(std::string fId, std::string pId)
} }
/** context menu searchTablewidget2 **/ /** context menu searchTablewidget2 **/
void CreateForumMsg::forumMessageCostumPopupMenu( QPoint point ) void CreateForumMsg::forumMessageCostumPopupMenu( QPoint /*point*/ )
{ {
QMenu *contextMnu = ui.forumMessage->createStandardContextMenu(); QMenu *contextMnu = ui.forumMessage->createStandardContextMenu();
@ -179,7 +179,7 @@ void CreateForumMsg::createMsg()
} }
} }
void CreateForumMsg::closeEvent (QCloseEvent * event) void CreateForumMsg::closeEvent (QCloseEvent * /*event*/)
{ {
Settings->saveWidgetInformation(this); Settings->saveWidgetInformation(this);
} }

View File

@ -40,7 +40,7 @@ QSize IMHistoryItemPainter::sizeHint() const
return size; return size;
} }
void IMHistoryItemPainter::paint(QPainter *painter, const QStyleOptionViewItem &option, EditMode mode) const void IMHistoryItemPainter::paint(QPainter *painter, const QStyleOptionViewItem &option, EditMode /*mode*/) const
{ {
// if (mode == Editable) { // if (mode == Editable) {
// painter->setBrush(option.palette.highlight()); // painter->setBrush(option.palette.highlight());

View File

@ -376,7 +376,7 @@ void ImHistoryBrowser::itemSelectionChanged()
} }
} }
void ImHistoryBrowser::customContextMenuRequested(QPoint pos) void ImHistoryBrowser::customContextMenuRequested(QPoint /*pos*/)
{ {
QList<int> hiids; QList<int> hiids;
getSelectedItems(hiids); getSelectedItems(hiids);

View File

@ -226,7 +226,7 @@ QString MessageWidget::subject(bool noEmpty)
return subject; return subject;
} }
void MessageWidget::msgfilelistWidgetCostumPopupMenu( QPoint point ) void MessageWidget::msgfilelistWidgetCostumPopupMenu( QPoint /*point*/ )
{ {
QMenu contextMnu(this); QMenu contextMnu(this);

View File

@ -380,7 +380,7 @@ void NotifyQt::notifyListChange(int list, int type)
} }
void NotifyQt::notifyListPreChange(int list, int type) void NotifyQt::notifyListPreChange(int list, int /*type*/)
{ {
#ifdef NOTIFY_DEBUG #ifdef NOTIFY_DEBUG
std::cerr << "NotifyQt::notifyListPreChange()" << std::endl; std::cerr << "NotifyQt::notifyListPreChange()" << std::endl;

View File

@ -49,7 +49,7 @@ ProfileEdit::ProfileEdit(QWidget *parent)
#endif #endif
} }
void ProfileEdit::profileCustomPopupMenu( QPoint point ) void ProfileEdit::profileCustomPopupMenu( QPoint /*point*/ )
{ {
QMenu contextMnu( this ); QMenu contextMnu( this );

View File

@ -58,7 +58,7 @@ ProfileView::ProfileView(QWidget *parent)
} }
/** context popup menus */ /** context popup menus */
void ProfileView::imageCustomPopupMenu( QPoint point ) void ProfileView::imageCustomPopupMenu( QPoint /*point*/ )
{ {
if (!mIsOwnId) if (!mIsOwnId)
{ {
@ -80,7 +80,7 @@ void ProfileView::imageCustomPopupMenu( QPoint point )
} }
void ProfileView::profileCustomPopupMenu( QPoint point ) void ProfileView::profileCustomPopupMenu( QPoint /*point*/ )
{ {
if (!mIsOwnId) if (!mIsOwnId)
{ {
@ -97,7 +97,7 @@ void ProfileView::profileCustomPopupMenu( QPoint point )
contextMnu.exec(QCursor::pos()); contextMnu.exec(QCursor::pos());
} }
void ProfileView::fileCustomPopupMenu( QPoint point ) void ProfileView::fileCustomPopupMenu( QPoint /*point*/ )
{ {
QMenu contextMnu( this ); QMenu contextMnu( this );

View File

@ -59,7 +59,7 @@ void ProfileWidget::closeEvent (QCloseEvent * event)
QWidget::closeEvent(event); QWidget::closeEvent(event);
} }
void ProfileWidget::showEvent ( QShowEvent * event ) void ProfileWidget::showEvent ( QShowEvent * /*event*/ )
{ {
RsPeerDetails detail; RsPeerDetails detail;

View File

@ -93,7 +93,7 @@ ChatPage::ChatPage(QWidget * parent, Qt::WFlags flags)
/** Saves the changes on this page */ /** Saves the changes on this page */
bool bool
ChatPage::save(QString &errmsg) ChatPage::save(QString &/*errmsg*/)
{ {
Settings->beginGroup(QString("Chat")); Settings->beginGroup(QString("Chat"));
@ -331,17 +331,17 @@ void ChatPage::on_historyList_currentRowChanged(int currentRow)
fillPreview(ui.historyList, ui.historyComboBoxVariant, ui.historyPreview); fillPreview(ui.historyList, ui.historyComboBoxVariant, ui.historyPreview);
} }
void ChatPage::on_publicComboBoxVariant_currentIndexChanged(int index) void ChatPage::on_publicComboBoxVariant_currentIndexChanged(int /*index*/)
{ {
fillPreview(ui.publicList, ui.publicComboBoxVariant, ui.publicPreview); fillPreview(ui.publicList, ui.publicComboBoxVariant, ui.publicPreview);
} }
void ChatPage::on_privateComboBoxVariant_currentIndexChanged(int index) void ChatPage::on_privateComboBoxVariant_currentIndexChanged(int /*index*/)
{ {
fillPreview(ui.privateList, ui.privateComboBoxVariant, ui.privatePreview); fillPreview(ui.privateList, ui.privateComboBoxVariant, ui.privatePreview);
} }
void ChatPage::on_historyComboBoxVariant_currentIndexChanged(int index) void ChatPage::on_historyComboBoxVariant_currentIndexChanged(int /*index*/)
{ {
fillPreview(ui.historyList, ui.historyComboBoxVariant, ui.historyPreview); fillPreview(ui.historyList, ui.historyComboBoxVariant, ui.historyPreview);
} }

View File

@ -52,7 +52,7 @@ CryptoPage::~CryptoPage()
/** Saves the changes on this page */ /** Saves the changes on this page */
bool bool
CryptoPage::save(QString &errmsg) CryptoPage::save(QString &/*errmsg*/)
{ {
return true; return true;
} }

View File

@ -80,7 +80,7 @@ void DirectoriesPage::toggleRememberHashes()
} }
/** Saves the changes on this page */ /** Saves the changes on this page */
bool DirectoriesPage::save(QString &errmsg) bool DirectoriesPage::save(QString &/*errmsg*/)
{ {
rsFiles->setRememberHashFilesDuration(ui.rememberHashesSB->value()); rsFiles->setRememberHashFilesDuration(ui.rememberHashesSB->value());
rsFiles->setWatchPeriod(ui.autoCheckDirectoriesDelay_SB->value()); rsFiles->setWatchPeriod(ui.autoCheckDirectoriesDelay_SB->value());
@ -151,4 +151,4 @@ void DirectoriesPage::setPartialsDirectory()
} }
ui.partialsDir->setText(qdir); ui.partialsDir->setText(qdir);
} }

View File

@ -134,7 +134,7 @@ FileAssociationsPage::~FileAssociationsPage()
//============================================================================ //============================================================================
bool bool
FileAssociationsPage::save (QString &errmsg) FileAssociationsPage::save (QString &/*errmsg*/)
{ {
// RshareSettings settings; // RshareSettings settings;
@ -218,7 +218,6 @@ FileAssociationsPage::addnew()
{ {
AddFileAssociationDialog afad(false, this);//'add file assotiations' dialog AddFileAssociationDialog afad(false, this);//'add file assotiations' dialog
int currentRow = table->currentRow() ;
QTableWidgetItem* titem; QTableWidgetItem* titem;
int ti = afad.exec(); int ti = afad.exec();
@ -290,7 +289,7 @@ FileAssociationsPage::edit()
//============================================================================ //============================================================================
void void
FileAssociationsPage::tableCellActivated ( int row, int column ) FileAssociationsPage::tableCellActivated ( int row, int /*column*/ )
{ {
table->selectRow(row); table->selectRow(row);
} }

View File

@ -39,7 +39,7 @@ ForumPage::~ForumPage()
/** Saves the changes on this page */ /** Saves the changes on this page */
bool bool
ForumPage::save(QString &errmsg) ForumPage::save(QString &/*errmsg*/)
{ {
Settings->setForumMsgSetToReadOnActivate(ui.setMsgToReadOnActivate->isChecked()); Settings->setForumMsgSetToReadOnActivate(ui.setMsgToReadOnActivate->isChecked());
Settings->setExpandNewMessages(ui.expandNewMessages->isChecked()); Settings->setExpandNewMessages(ui.expandNewMessages->isChecked());

View File

@ -50,7 +50,7 @@ GeneralPage::~GeneralPage()
} }
/** Saves the changes on this page */ /** Saves the changes on this page */
bool GeneralPage::save(QString &errmsg) bool GeneralPage::save(QString &/*errmsg*/)
{ {
Settings->setStartMinimized(ui.checkStartMinimized->isChecked()); Settings->setStartMinimized(ui.checkStartMinimized->isChecked());
Settings->setValue("doQuit", ui.checkQuit->isChecked()); Settings->setValue("doQuit", ui.checkQuit->isChecked());

View File

@ -58,7 +58,7 @@ MessagePage::~MessagePage()
/** Saves the changes on this page */ /** Saves the changes on this page */
bool bool
MessagePage::save(QString &errmsg) MessagePage::save(QString &/*errmsg*/)
{ {
Settings->setMsgSetToReadOnActivate(ui.setMsgToReadOnActivate->isChecked()); Settings->setMsgSetToReadOnActivate(ui.setMsgToReadOnActivate->isChecked());
Settings->setMsgOpen((RshareSettings::enumMsgOpen) ui.openComboBox->itemData(ui.openComboBox->currentIndex()).toInt()); Settings->setMsgOpen((RshareSettings::enumMsgOpen) ui.openComboBox->itemData(ui.openComboBox->currentIndex()).toInt());

View File

@ -32,7 +32,7 @@ NetworkPage::NetworkPage(QWidget * parent, Qt::WFlags flags)
/** Saves the changes on this page */ /** Saves the changes on this page */
bool bool
NetworkPage::save(QString &errmsg) NetworkPage::save(QString &/*errmsg*/)
{ {
return true; return true;
} }

View File

@ -134,6 +134,6 @@ void NewTag::setTagColor()
void NewTag::showColor(QRgb color) void NewTag::showColor(QRgb color)
{ {
QPixmap pxm(16,16); QPixmap pxm(16,16);
pxm.fill(QColor(m_Color)); pxm.fill(QColor(color));
ui.colorButton->setIcon(pxm); ui.colorButton->setIcon(pxm);
} }

View File

@ -54,7 +54,7 @@ NotifyPage::~NotifyPage()
/** Saves the changes on this page */ /** Saves the changes on this page */
bool bool
NotifyPage::save(QString &errmsg) NotifyPage::save(QString &/*errmsg*/)
{ {
/* extract from rsNotify the flags */ /* extract from rsNotify the flags */

View File

@ -21,7 +21,7 @@
#include "PluginItem.h" #include "PluginItem.h"
PluginItem::PluginItem(int id, const QString& pluginTitle,const QString& pluginDescription,const QString& status, const QString& file_name, const QString& file_hash, const QString& error_string, const QIcon& icon) PluginItem::PluginItem(int id, const QString& pluginTitle,const QString& pluginDescription,const QString& status, const QString& file_name, const QString& file_hash, const QString& /*error_string*/, const QIcon& icon)
:QWidget(NULL) :QWidget(NULL)
{ {
setupUi(this) ; setupUi(this) ;

View File

@ -130,7 +130,7 @@ PluginsPage::~PluginsPage()
} }
/** Saves the changes on this page */ /** Saves the changes on this page */
bool PluginsPage::save(QString &errmsg) bool PluginsPage::save(QString &/*errmsg*/)
{ {
// nothing to save for now. // nothing to save for now.
return true; return true;

View File

@ -88,7 +88,7 @@ void ServerPage::toggleTunnelConnection(bool b)
/** Saves the changes on this page */ /** Saves the changes on this page */
bool bool
ServerPage::save(QString &errmsg) ServerPage::save(QString &/*errmsg*/)
{ {
Settings->setStatusBarFlag(STATUSBAR_DISC, ui.showDiscStatusBar->isChecked()); Settings->setStatusBarFlag(STATUSBAR_DISC, ui.showDiscStatusBar->isChecked());

View File

@ -54,7 +54,7 @@ SoundPage::~SoundPage()
/** Saves the changes on this page */ /** Saves the changes on this page */
bool bool
SoundPage::save(QString &errmsg) SoundPage::save(QString &/*errmsg*/)
{ {
Settings->beginGroup("Sound"); Settings->beginGroup("Sound");
Settings->beginGroup("Enable"); Settings->beginGroup("Enable");

View File

@ -36,7 +36,7 @@ class TransferPage: public ConfigPage
~TransferPage() {} ~TransferPage() {}
/** Saves the changes on this page */ /** Saves the changes on this page */
virtual bool save(QString &errmsg) { return true ; } virtual bool save(QString &/*errmsg*/) { return true ; }
/** Loads the settings for this page */ /** Loads the settings for this page */
virtual void load() {} virtual void load() {}

View File

@ -26,7 +26,7 @@ ConfigPage::ConfigPage(QWidget *parent, Qt::WFlags flags) : QWidget(parent, flag
loaded = false; loaded = false;
} }
void ConfigPage::showEvent(QShowEvent *event) void ConfigPage::showEvent(QShowEvent */*event*/)
{ {
if (loaded) { if (loaded) {
return; return;

View File

@ -477,10 +477,12 @@ RshareSettings::setRunRetroshareOnBoot(bool run, bool minimized)
#endif #endif
} }
#if defined(Q_WS_WIN)
static QString getAppPathForProtocol() static QString getAppPathForProtocol()
{ {
return "\"" + QDir::convertSeparators(QCoreApplication::applicationFilePath()) + "\" -r \"%1\""; return "\"" + QDir::convertSeparators(QCoreApplication::applicationFilePath()) + "\" -r \"%1\"";
} }
#endif
/** Returns true if retroshare:// is registered as protocol */ /** Returns true if retroshare:// is registered as protocol */
bool RshareSettings::getRetroShareProtocol() bool RshareSettings::getRetroShareProtocol()
@ -688,4 +690,4 @@ void RshareSettings::setMaxTimeBeforeIdle(uint nValue)
{ {
m_maxTimeBeforeIdle = nValue; m_maxTimeBeforeIdle = nValue;
setValue("maxTimeBeforeIdle", nValue); setValue("maxTimeBeforeIdle", nValue);
} }

View File

@ -117,6 +117,8 @@ bool EventReceiver::sendRetroShareLink(const QString& link)
result = false; result = false;
} }
#else #else
Q_UNUSED(link);
QMessageBox mb(QMessageBox::Critical, "RetroShare", QObject::tr("Start with a RetroShare link is only supported for Windows."), QMessageBox::Ok); QMessageBox mb(QMessageBox::Critical, "RetroShare", QObject::tr("Start with a RetroShare link is only supported for Windows."), QMessageBox::Ok);
mb.setWindowIcon(QIcon(":/images/rstray3.png")); mb.setWindowIcon(QIcon(":/images/rstray3.png"));
mb.exec(); mb.exec();

View File

@ -42,7 +42,7 @@ RetroStyleLabel::RetroStyleLabel(QWidget * parent, Mode mode, Qt::AlignmentFlag
RetroStyleLabel::~RetroStyleLabel() { RetroStyleLabel::~RetroStyleLabel() {
} }
void RetroStyleLabel::paintEvent(QPaintEvent * event) { void RetroStyleLabel::paintEvent(QPaintEvent * /*event*/) {
/* /*
qDebug() << "Paint event"; qDebug() << "Paint event";
QLabel::paintEvent( event ); QLabel::paintEvent( event );

View File

@ -42,7 +42,7 @@ RsAction::RsAction(const QIcon & icon, const QString & text, QObject * parent ,
} }
void RsAction::triggerEvent( bool checked ) void RsAction::triggerEvent( bool /*checked*/ )
{ {
triggeredId(RsId); triggeredId(RsId);
} }

View File

@ -1,7 +1,7 @@
/**************************************************************** /****************************************************************
* This file is distributed under the following license: * This file is distributed under the following license:
* *
* Copyright (c) 2006-2007, crypton * Copyright (c) 2006-2007, crypton
* Copyright (c) 2006, Matt Edman, Justin Hipple * Copyright (c) 2006, Matt Edman, Justin Hipple
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
@ -39,7 +39,7 @@
/** Finds the location of the "special" Windows folder using the given CSIDL /** Finds the location of the "special" Windows folder using the given CSIDL
* value. If the folder cannot be found, the given default path is used. */ * value. If the folder cannot be found, the given default path is used. */
QString QString
win32_get_folder_location(int folder, QString defaultPath) win32_get_folder_location(int /*folder*/, QString defaultPath)
{ {
#if 0 #if 0
TCHAR path[MAX_PATH+1]; TCHAR path[MAX_PATH+1];
@ -90,6 +90,9 @@ win32_registry_get_key_value(QString keyLocation, QString keyName)
return QString(data); return QString(data);
#else #else
Q_UNUSED(keyLocation);
Q_UNUSED(keyName);
return QString(); return QString();
#endif #endif
} }
@ -120,6 +123,10 @@ win32_registry_set_key_value(QString keyLocation, QString keyName, QString keyVa
/* Close the key */ /* Close the key */
RegCloseKey(key); RegCloseKey(key);
#else
Q_UNUSED(keyLocation);
Q_UNUSED(keyName);
Q_UNUSED(keyValue);
#endif #endif
} }
@ -141,6 +148,9 @@ win32_registry_remove_key(QString keyLocation, QString keyName)
/* Close anything that was opened */ /* Close anything that was opened */
RegCloseKey(key); RegCloseKey(key);
#else
Q_UNUSED(keyLocation);
Q_UNUSED(keyName);
#endif #endif
} }