From 70d02c718db89099584099fa2a377940bc3c6f86 Mon Sep 17 00:00:00 2001 From: thunder2 Date: Fri, 12 Aug 2011 14:06:29 +0000 Subject: [PATCH] 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 --- retroshare-gui/src/gui/ChannelFeed.cpp | 8 ++--- .../src/gui/FileTransferInfoWidget.cpp | 6 ++-- retroshare-gui/src/gui/ForumsDialog.cpp | 4 +-- retroshare-gui/src/gui/FriendsDialog.cpp | 6 ++-- retroshare-gui/src/gui/GenCertDialog.cpp | 2 +- retroshare-gui/src/gui/GetStartedDialog.cpp | 2 +- retroshare-gui/src/gui/MainWindow.cpp | 4 +-- retroshare-gui/src/gui/MessagesDialog.cpp | 6 ++-- retroshare-gui/src/gui/MessengerWindow.cpp | 4 +-- retroshare-gui/src/gui/NetworkDialog.cpp | 2 +- retroshare-gui/src/gui/NetworkView.cpp | 2 -- retroshare-gui/src/gui/NewsFeed.cpp | 8 +++-- retroshare-gui/src/gui/RemoteDirModel.cpp | 11 +++++-- retroshare-gui/src/gui/RsAutoUpdatePage.cpp | 2 +- retroshare-gui/src/gui/SearchDialog.cpp | 4 +-- retroshare-gui/src/gui/ShareManager.cpp | 2 +- retroshare-gui/src/gui/SharedFilesDialog.cpp | 4 +-- retroshare-gui/src/gui/StartDialog.cpp | 4 +-- retroshare-gui/src/gui/TransfersDialog.cpp | 2 +- .../src/gui/TurtleRouterStatistics.cpp | 6 ++-- retroshare-gui/src/gui/VoipStatistics.cpp | 6 ++-- .../src/gui/channels/CreateChannel.cpp | 2 +- .../src/gui/channels/CreateChannelMsg.cpp | 4 ++- retroshare-gui/src/gui/channels/ShareKey.cpp | 2 +- .../src/gui/chat/PopupChatDialog.cpp | 4 +-- .../src/gui/chat/PopupChatWindow.cpp | 4 +-- retroshare-gui/src/gui/dht/DhtWindow.cpp | 1 - retroshare-gui/src/gui/elastic/edge.cpp | 1 - .../src/gui/elastic/graphwidget.cpp | 5 ++- retroshare-gui/src/gui/elastic/node.cpp | 32 +++++++++---------- retroshare-gui/src/gui/feeds/ChanMsgItem.cpp | 2 +- .../src/gui/forums/CreateForumMsg.cpp | 4 +-- .../gui/im_history/IMHistoryItemPainter.cpp | 2 +- .../src/gui/im_history/ImHistoryBrowser.cpp | 2 +- retroshare-gui/src/gui/msgs/MessageWidget.cpp | 2 +- retroshare-gui/src/gui/notifyqt.cpp | 2 +- .../src/gui/profile/ProfileEdit.cpp | 2 +- .../src/gui/profile/ProfileView.cpp | 6 ++-- .../src/gui/profile/ProfileWidget.cpp | 2 +- retroshare-gui/src/gui/settings/ChatPage.cpp | 8 ++--- .../src/gui/settings/CryptoPage.cpp | 2 +- .../src/gui/settings/DirectoriesPage.cpp | 4 +-- .../src/gui/settings/FileAssociationsPage.cpp | 5 ++- retroshare-gui/src/gui/settings/ForumPage.cpp | 2 +- .../src/gui/settings/GeneralPage.cpp | 2 +- .../src/gui/settings/MessagePage.cpp | 2 +- .../src/gui/settings/NetworkPage.cpp | 2 +- retroshare-gui/src/gui/settings/NewTag.cpp | 2 +- .../src/gui/settings/NotifyPage.cpp | 2 +- .../src/gui/settings/PluginItem.cpp | 2 +- .../src/gui/settings/PluginsPage.cpp | 2 +- .../src/gui/settings/ServerPage.cpp | 2 +- retroshare-gui/src/gui/settings/SoundPage.cpp | 2 +- .../src/gui/settings/TransferPage.h | 2 +- .../src/gui/settings/configpage.cpp | 2 +- .../src/gui/settings/rsharesettings.cpp | 4 ++- retroshare-gui/src/util/EventReceiver.cpp | 2 ++ retroshare-gui/src/util/RetroStyleLabel.cpp | 2 +- retroshare-gui/src/util/RsAction.cpp | 2 +- retroshare-gui/src/util/win32.cpp | 18 ++++++++--- 60 files changed, 132 insertions(+), 113 deletions(-) diff --git a/retroshare-gui/src/gui/ChannelFeed.cpp b/retroshare-gui/src/gui/ChannelFeed.cpp index 73837dbe2..9af472775 100644 --- a/retroshare-gui/src/gui/ChannelFeed.cpp +++ b/retroshare-gui/src/gui/ChannelFeed.cpp @@ -126,7 +126,7 @@ void ChannelFeed::processSettings(bool load) Settings->endGroup(); } -void ChannelFeed::channelListCustomPopupMenu( QPoint point ) +void ChannelFeed::channelListCustomPopupMenu( QPoint /*point*/ ) { ChannelInfo 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()); } diff --git a/retroshare-gui/src/gui/FileTransferInfoWidget.cpp b/retroshare-gui/src/gui/FileTransferInfoWidget.cpp index d79d7e1a2..4aa2d7921 100644 --- a/retroshare-gui/src/gui/FileTransferInfoWidget.cpp +++ b/retroshare-gui/src/gui/FileTransferInfoWidget.cpp @@ -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 tab_size = 200 ;// size between tabulated entries -FileTransferInfoWidget::FileTransferInfoWidget(QWidget * parent, Qt::WFlags f ) +FileTransferInfoWidget::FileTransferInfoWidget(QWidget * /*parent*/, Qt::WFlags /*f*/ ) { QRect TaskGraphRect = geometry(); maxWidth = TaskGraphRect.width(); @@ -54,7 +54,7 @@ FileTransferInfoWidget::FileTransferInfoWidget(QWidget * parent, Qt::WFlags f ) setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding); } -void FileTransferInfoWidget::resizeEvent(QResizeEvent *event) +void FileTransferInfoWidget::resizeEvent(QResizeEvent */*event*/) { QRect TaskGraphRect = geometry(); maxWidth = TaskGraphRect.width(); @@ -97,7 +97,7 @@ void FileTransferInfoWidget::updateDisplay() pixmap2 = pixmap; } -void FileTransferInfoWidget::paintEvent(QPaintEvent *event) +void FileTransferInfoWidget::paintEvent(QPaintEvent */*event*/) { //std::cout << "In paint event" << std::endl ; QStylePainter painter(this); diff --git a/retroshare-gui/src/gui/ForumsDialog.cpp b/retroshare-gui/src/gui/ForumsDialog.cpp index c119bc7d3..ca342b2aa 100644 --- a/retroshare-gui/src/gui/ForumsDialog.cpp +++ b/retroshare-gui/src/gui/ForumsDialog.cpp @@ -275,7 +275,7 @@ void ForumsDialog::processSettings(bool bLoad) m_bProcessSettings = false; } -void ForumsDialog::forumListCustomPopupMenu( QPoint point ) +void ForumsDialog::forumListCustomPopupMenu( QPoint /*point*/ ) { QMenu contextMnu( this ); @@ -321,7 +321,7 @@ void ForumsDialog::forumListCustomPopupMenu( QPoint point ) contextMnu.exec(QCursor::pos()); } -void ForumsDialog::threadListCustomPopupMenu( QPoint point ) +void ForumsDialog::threadListCustomPopupMenu( QPoint /*point*/ ) { if (fillThread) { return; diff --git a/retroshare-gui/src/gui/FriendsDialog.cpp b/retroshare-gui/src/gui/FriendsDialog.cpp index e3de5efba..113b5d412 100644 --- a/retroshare-gui/src/gui/FriendsDialog.cpp +++ b/retroshare-gui/src/gui/FriendsDialog.cpp @@ -368,7 +368,7 @@ void FriendsDialog::pasteLink() ui.lineEdit->insertHtml(RSLinkClipboard::toHtml()) ; } -void FriendsDialog::contextMenu(QPoint point) +void FriendsDialog::contextMenu(QPoint /*point*/) { QMenu *contextMnu = ui.lineEdit->createStandardContextMenu(); @@ -380,7 +380,7 @@ void FriendsDialog::contextMenu(QPoint point) delete(contextMnu); } -void FriendsDialog::peertreeWidgetCostumPopupMenu( QPoint point ) +void FriendsDialog::peertreeWidgetCostumPopupMenu( QPoint /*point*/ ) { QTreeWidgetItem *c = getCurrentPeer(); @@ -1691,7 +1691,7 @@ void FriendsDialog::setColor() void FriendsDialog::colorChanged(const QColor &c) { QPixmap pxm(16,16); - pxm.fill(mCurrentColor); + pxm.fill(c); ui.colorChatButton->setIcon(pxm); } diff --git a/retroshare-gui/src/gui/GenCertDialog.cpp b/retroshare-gui/src/gui/GenCertDialog.cpp index 17794c6ae..fc3cf13f0 100644 --- a/retroshare-gui/src/gui/GenCertDialog.cpp +++ b/retroshare-gui/src/gui/GenCertDialog.cpp @@ -292,7 +292,7 @@ void GenCertDialog::selectFriend() } -void GenCertDialog::checkChanged(int i) +void GenCertDialog::checkChanged(int /*i*/) { #if 0 diff --git a/retroshare-gui/src/gui/GetStartedDialog.cpp b/retroshare-gui/src/gui/GetStartedDialog.cpp index d579e0f4b..bfbe65b00 100644 --- a/retroshare-gui/src/gui/GetStartedDialog.cpp +++ b/retroshare-gui/src/gui/GetStartedDialog.cpp @@ -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 */ if (RsAutoUpdatePage::eventsLocked() == true) diff --git a/retroshare-gui/src/gui/MainWindow.cpp b/retroshare-gui/src/gui/MainWindow.cpp index 2ecd2b014..b7ea70675 100644 --- a/retroshare-gui/src/gui/MainWindow.cpp +++ b/retroshare-gui/src/gui/MainWindow.cpp @@ -694,7 +694,7 @@ void MainWindow::updateForums() updateTrayCombine(); } -void MainWindow::updateChannels(int type) +void MainWindow::updateChannels(int /*type*/) { unsigned int newMessageCount = 0; unsigned int unreadMessageCount = 0; @@ -1174,7 +1174,7 @@ void MainWindow::doQuit() 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) ; } diff --git a/retroshare-gui/src/gui/MessagesDialog.cpp b/retroshare-gui/src/gui/MessagesDialog.cpp index b890952ee..766c4fbce 100644 --- a/retroshare-gui/src/gui/MessagesDialog.cpp +++ b/retroshare-gui/src/gui/MessagesDialog.cpp @@ -523,7 +523,7 @@ bool MessagesDialog::hasMessageStar(int nRow) return item->data(ROLE_MSGFLAGS).toInt() & RS_MSG_STAR; } -void MessagesDialog::messageslistWidgetCostumPopupMenu( QPoint point ) +void MessagesDialog::messageslistWidgetCostumPopupMenu( QPoint /*point*/ ) { std::string cid; std::string mid; @@ -621,7 +621,7 @@ void MessagesDialog::messageslistWidgetCostumPopupMenu( QPoint point ) contextMnu.exec(QCursor::pos()); } -void MessagesDialog::folderlistWidgetCostumPopupMenu(QPoint point) +void MessagesDialog::folderlistWidgetCostumPopupMenu(QPoint /*point*/) { if (ui.listWidget->currentRow() != ROW_TRASHBOX) { /* Context menu only neede for trash box */ @@ -1892,7 +1892,7 @@ void MessagesDialog::emptyTrash() // LockUpdate -> insertMessages(); } -void MessagesDialog::tabChanged(int tab) +void MessagesDialog::tabChanged(int /*tab*/) { connectActions(); updateInterface(); diff --git a/retroshare-gui/src/gui/MessengerWindow.cpp b/retroshare-gui/src/gui/MessengerWindow.cpp index 787631ec0..e16959700 100644 --- a/retroshare-gui/src/gui/MessengerWindow.cpp +++ b/retroshare-gui/src/gui/MessengerWindow.cpp @@ -285,7 +285,7 @@ void MessengerWindow::processSettings(bool bLoad) Settings->endGroup(); } -void MessengerWindow::messengertreeWidgetCostumPopupMenu( QPoint point ) +void MessengerWindow::messengertreeWidgetCostumPopupMenu( QPoint /*point*/ ) { QTreeWidgetItem *c = getCurrentPeer(); @@ -1045,7 +1045,7 @@ void MessengerWindow::pastePerson() //============================================================================ -void MessengerWindow::closeEvent (QCloseEvent * event) +void MessengerWindow::closeEvent (QCloseEvent * /*event*/) { /* save the expanded peers */ if (expandedPeers == NULL) { diff --git a/retroshare-gui/src/gui/NetworkDialog.cpp b/retroshare-gui/src/gui/NetworkDialog.cpp index 51773f390..f036e3011 100644 --- a/retroshare-gui/src/gui/NetworkDialog.cpp +++ b/retroshare-gui/src/gui/NetworkDialog.cpp @@ -197,7 +197,7 @@ void NetworkDialog::updateNewDiscoveryInfo() networkview->updateDisplay(); } -void NetworkDialog::connecttreeWidgetCostumPopupMenu( QPoint point ) +void NetworkDialog::connecttreeWidgetCostumPopupMenu( QPoint /*point*/ ) { //std::cerr << "NetworkDialog::connecttreeWidgetCostumPopupMenu( QPoint point ) called" << std::endl; QTreeWidgetItem *wi = getCurrentNeighbour(); diff --git a/retroshare-gui/src/gui/NetworkView.cpp b/retroshare-gui/src/gui/NetworkView.cpp index 006160060..cb964397b 100644 --- a/retroshare-gui/src/gui/NetworkView.cpp +++ b/retroshare-gui/src/gui/NetworkView.cpp @@ -124,8 +124,6 @@ void NetworkView::updateDisplay() std::cerr << "NetworkView::updateDisplay()" << std::endl; #endif - int i = 0; - std::deque nodes_to_treat ; // list of nodes to be treated. Used as a queue. The int is the level of friendness std::set nodes_considered ; // list of nodes already considered. Eases lookup. diff --git a/retroshare-gui/src/gui/NewsFeed.cpp b/retroshare-gui/src/gui/NewsFeed.cpp index 78d734d65..9f980ab37 100644 --- a/retroshare-gui/src/gui/NewsFeed.cpp +++ b/retroshare-gui/src/gui/NewsFeed.cpp @@ -471,6 +471,8 @@ void NewsFeed::addFeedItemBlogNew(RsFeedItem &fi) /* add to layout */ addFeedItem(bni); +#else + Q_UNUSED(fi); #endif #ifdef NEWS_DEBUG @@ -489,6 +491,8 @@ void NewsFeed::addFeedItemBlogMsg(RsFeedItem &fi) /* add to layout */ addFeedItem(bm); +#else + Q_UNUSED(fi); #endif #ifdef NEWS_DEBUG @@ -535,7 +539,7 @@ void NewsFeed::addFeedItemMessage(RsFeedItem &fi) #endif } -void NewsFeed::addFeedItemFilesNew(RsFeedItem &fi) +void NewsFeed::addFeedItemFilesNew(RsFeedItem &/*fi*/) { #ifdef NEWS_DEBUG std::cerr << "NewsFeed::addFeedItemFilesNew()"; @@ -544,7 +548,7 @@ void NewsFeed::addFeedItemFilesNew(RsFeedItem &fi) } /* FeedHolder Functions (for FeedItem functionality) */ -void NewsFeed::deleteFeedItem(QWidget *item, uint32_t type) +void NewsFeed::deleteFeedItem(QWidget *item, uint32_t /*type*/) { #ifdef NEWS_DEBUG std::cerr << "NewsFeed::deleteFeedItem()"; diff --git a/retroshare-gui/src/gui/RemoteDirModel.cpp b/retroshare-gui/src/gui/RemoteDirModel.cpp index 8dd2faa52..7da593bab 100644 --- a/retroshare-gui/src/gui/RemoteDirModel.cpp +++ b/retroshare-gui/src/gui/RemoteDirModel.cpp @@ -183,6 +183,8 @@ int TreeStyle_RDM::rowCount(const QModelIndex &parent) const int FlatStyle_RDM::rowCount(const QModelIndex &parent) const { + Q_UNUSED(parent); + #ifdef RDM_DEBUG std::cerr << "RetroshareDirModel::rowCount(): " << parent.internalPointer(); std::cerr << ": "; @@ -190,11 +192,11 @@ int FlatStyle_RDM::rowCount(const QModelIndex &parent) const return _ref_entries.size() ; } -int TreeStyle_RDM::columnCount(const QModelIndex &parent) const +int TreeStyle_RDM::columnCount(const QModelIndex &/*parent*/) const { return 5; } -int FlatStyle_RDM::columnCount(const QModelIndex &parent) const +int FlatStyle_RDM::columnCount(const QModelIndex &/*parent*/) const { return 5; } @@ -419,7 +421,7 @@ QVariant FlatStyle_RDM::displayRole(const DirDetails& details,int coln) const return QVariant(); } /* 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; @@ -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 { + Q_UNUSED(parent); #ifdef RDM_DEBUG std::cerr << "RetroshareDirModel::index(): " << parent.internalPointer(); 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 { + Q_UNUSED(index); + #ifdef RDM_DEBUG std::cerr << "RetroshareDirModel::parent(): " << index.internalPointer(); std::cerr << ": "; diff --git a/retroshare-gui/src/gui/RsAutoUpdatePage.cpp b/retroshare-gui/src/gui/RsAutoUpdatePage.cpp index 21a7505bb..d7a12702d 100644 --- a/retroshare-gui/src/gui/RsAutoUpdatePage.cpp +++ b/retroshare-gui/src/gui/RsAutoUpdatePage.cpp @@ -24,7 +24,7 @@ RsAutoUpdatePage::~RsAutoUpdatePage() _timer = NULL ; } -void RsAutoUpdatePage::showEvent(QShowEvent *event) +void RsAutoUpdatePage::showEvent(QShowEvent */*event*/) { //std::cout << "RsAutoUpdatePage::showEvent() In show event !!" << std::endl ; if(!_locked) diff --git a/retroshare-gui/src/gui/SearchDialog.cpp b/retroshare-gui/src/gui/SearchDialog.cpp index f9e8729af..4340684b8 100644 --- a/retroshare-gui/src/gui/SearchDialog.cpp +++ b/retroshare-gui/src/gui/SearchDialog.cpp @@ -278,7 +278,7 @@ void SearchDialog::initialiseFileTypeMappings() SearchDialog::initialised = true; } -void SearchDialog::searchtableWidgetCostumPopupMenu( QPoint point ) +void SearchDialog::searchtableWidgetCostumPopupMenu( QPoint /*point*/ ) { // block the popup if no results available if ((ui.searchResultWidget->selectedItems()).size() == 0) return; @@ -416,7 +416,7 @@ void SearchDialog::recommendtofriends() /** context menu searchTablewidget2 **/ -void SearchDialog::searchtableWidget2CostumPopupMenu( QPoint point ) +void SearchDialog::searchtableWidget2CostumPopupMenu( QPoint /*point*/ ) { // block the popup if no results available if ((ui.searchSummaryWidget->selectedItems()).size() == 0) return; diff --git a/retroshare-gui/src/gui/ShareManager.cpp b/retroshare-gui/src/gui/ShareManager.cpp index 4a5302c2a..e2182f32e 100644 --- a/retroshare-gui/src/gui/ShareManager.cpp +++ b/retroshare-gui/src/gui/ShareManager.cpp @@ -89,7 +89,7 @@ ShareManager::~ShareManager() Settings->saveWidgetInformation(this); } -void ShareManager::shareddirListCostumPopupMenu( QPoint point ) +void ShareManager::shareddirListCostumPopupMenu( QPoint /*point*/ ) { QMenu contextMnu( this ); diff --git a/retroshare-gui/src/gui/SharedFilesDialog.cpp b/retroshare-gui/src/gui/SharedFilesDialog.cpp index cb9b2aca4..49c433d97 100644 --- a/retroshare-gui/src/gui/SharedFilesDialog.cpp +++ b/retroshare-gui/src/gui/SharedFilesDialog.cpp @@ -789,7 +789,7 @@ void SharedFilesDialog::sharedDirTreeWidgetContextMenu( QPoint point ) //============================================================================ QAction* -SharedFilesDialog::fileAssotiationAction(const QString fileName) +SharedFilesDialog::fileAssotiationAction(const QString /*fileName*/) { QAction* result = 0; @@ -974,7 +974,7 @@ void SharedFilesDialog::FilterItems() 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)) { diff --git a/retroshare-gui/src/gui/StartDialog.cpp b/retroshare-gui/src/gui/StartDialog.cpp index c739064e1..10381bf72 100644 --- a/retroshare-gui/src/gui/StartDialog.cpp +++ b/retroshare-gui/src/gui/StartDialog.cpp @@ -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) @@ -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.exec (); diff --git a/retroshare-gui/src/gui/TransfersDialog.cpp b/retroshare-gui/src/gui/TransfersDialog.cpp index 196fe011e..9a941dea4 100644 --- a/retroshare-gui/src/gui/TransfersDialog.cpp +++ b/retroshare-gui/src/gui/TransfersDialog.cpp @@ -417,7 +417,7 @@ void TransfersDialog::processSettings(bool bLoad) // RsAutoUpdatePage::keyPressEvent(e) ; //} -void TransfersDialog::downloadListCostumPopupMenu( QPoint point ) +void TransfersDialog::downloadListCostumPopupMenu( QPoint /*point*/ ) { std::set items; std::set::iterator it; diff --git a/retroshare-gui/src/gui/TurtleRouterStatistics.cpp b/retroshare-gui/src/gui/TurtleRouterStatistics.cpp index 5c05923ef..1d0bc1bdf 100644 --- a/retroshare-gui/src/gui/TurtleRouterStatistics.cpp +++ b/retroshare-gui/src/gui/TurtleRouterStatistics.cpp @@ -267,8 +267,8 @@ TurtleRouterStatisticsWidget::TurtleRouterStatisticsWidget(QWidget *parent) maxHeight = 0 ; } -void TurtleRouterStatisticsWidget::updateTunnelStatistics(const std::vector >& hashes_info, - const std::vector >& tunnels_info, +void TurtleRouterStatisticsWidget::updateTunnelStatistics(const std::vector >& /*hashes_info*/, + const std::vector >& /*tunnels_info*/, const std::vector& search_reqs_info, const std::vector& tunnel_reqs_info) @@ -329,7 +329,7 @@ QString TurtleRouterStatisticsWidget::speedString(float f) 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); } diff --git a/retroshare-gui/src/gui/VoipStatistics.cpp b/retroshare-gui/src/gui/VoipStatistics.cpp index 395f72bf4..d8080a55a 100644 --- a/retroshare-gui/src/gui/VoipStatistics.cpp +++ b/retroshare-gui/src/gui/VoipStatistics.cpp @@ -312,8 +312,8 @@ VoipStatisticsWidget::VoipStatisticsWidget(QWidget *parent) void VoipStatisticsWidget::updateVoipStatistics(const std::map >& info, double maxRTT, double minTS, double maxTS) { - static const int cellx = 6 ; - static const int celly = 10+4 ; + //static const int cellx = 6 ; + //static const int celly = 10+4 ; QPixmap tmppixmap(maxWidth, maxHeight); tmppixmap.fill(this, 0, 0); @@ -375,7 +375,7 @@ QString VoipStatisticsWidget::speedString(float f) 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); } diff --git a/retroshare-gui/src/gui/channels/CreateChannel.cpp b/retroshare-gui/src/gui/channels/CreateChannel.cpp index f7acdfec1..b68e58036 100644 --- a/retroshare-gui/src/gui/channels/CreateChannel.cpp +++ b/retroshare-gui/src/gui/channels/CreateChannel.cpp @@ -208,7 +208,7 @@ void CreateChannel::createChannel() } -void CreateChannel::togglePersonItem( QTreeWidgetItem *item, int col ) +void CreateChannel::togglePersonItem( QTreeWidgetItem *item, int /*col*/ ) { /* extract id */ diff --git a/retroshare-gui/src/gui/channels/CreateChannelMsg.cpp b/retroshare-gui/src/gui/channels/CreateChannelMsg.cpp index 09730480f..d7f4013c2 100644 --- a/retroshare-gui/src/gui/channels/CreateChannelMsg.cpp +++ b/retroshare-gui/src/gui/channels/CreateChannelMsg.cpp @@ -402,7 +402,9 @@ bool CreateChannelMsg::setThumbNail(const std::string& path, int frame){ thumbnail_label->setPixmap(img); delete[] imageBuffer; - +#else + Q_UNUSED(path); + Q_UNUSED(frame); #endif return true; diff --git a/retroshare-gui/src/gui/channels/ShareKey.cpp b/retroshare-gui/src/gui/channels/ShareKey.cpp index c348a0467..7e20637ff 100644 --- a/retroshare-gui/src/gui/channels/ShareKey.cpp +++ b/retroshare-gui/src/gui/channels/ShareKey.cpp @@ -157,7 +157,7 @@ void ShareKey::setShareList(){ } -void ShareKey::togglePersonItem( QTreeWidgetItem *item, int col ) +void ShareKey::togglePersonItem( QTreeWidgetItem *item, int /*col*/ ) { /* extract id */ diff --git a/retroshare-gui/src/gui/chat/PopupChatDialog.cpp b/retroshare-gui/src/gui/chat/PopupChatDialog.cpp index 372f8f51a..d23941e47 100644 --- a/retroshare-gui/src/gui/chat/PopupChatDialog.cpp +++ b/retroshare-gui/src/gui/chat/PopupChatDialog.cpp @@ -429,7 +429,7 @@ void PopupChatDialog::pasteLink() ui.chattextEdit->insertHtml(RSLinkClipboard::toHtml()) ; } -void PopupChatDialog::contextMenu( QPoint point ) +void PopupChatDialog::contextMenu( QPoint /*point*/ ) { 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())) ; } -void PopupChatDialog::resizeEvent(QResizeEvent *event) +void PopupChatDialog::resizeEvent(QResizeEvent */*event*/) { // Workaround: now the scroll position is correct calculated QScrollBar *scrollbar = ui.textBrowser->verticalScrollBar(); diff --git a/retroshare-gui/src/gui/chat/PopupChatWindow.cpp b/retroshare-gui/src/gui/chat/PopupChatWindow.cpp index 3e05b51e4..a3f525624 100644 --- a/retroshare-gui/src/gui/chat/PopupChatWindow.cpp +++ b/retroshare-gui/src/gui/chat/PopupChatWindow.cpp @@ -124,7 +124,7 @@ void PopupChatWindow::saveSettings() } } -void PopupChatWindow::showEvent(QShowEvent *event) +void PopupChatWindow::showEvent(QShowEvent */*event*/) { if (firstShow) { 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); } diff --git a/retroshare-gui/src/gui/dht/DhtWindow.cpp b/retroshare-gui/src/gui/dht/DhtWindow.cpp index 5058e84a3..e5ff985e4 100644 --- a/retroshare-gui/src/gui/dht/DhtWindow.cpp +++ b/retroshare-gui/src/gui/dht/DhtWindow.cpp @@ -364,7 +364,6 @@ void DhtWindow::updateNetPeers() #endif peerTreeWidget->clear(); - time_t now = time(NULL); for(it = peerIds.begin(); it != peerIds.end(); it++) { /* find the entry */ diff --git a/retroshare-gui/src/gui/elastic/edge.cpp b/retroshare-gui/src/gui/elastic/edge.cpp index 220bb3b55..4fec24fe7 100644 --- a/retroshare-gui/src/gui/elastic/edge.cpp +++ b/retroshare-gui/src/gui/elastic/edge.cpp @@ -47,7 +47,6 @@ #include static const double Pi = 3.14159265358979323846264338327950288419717; -static double TwoPi = 2.0 * Pi; Edge::Edge(Node *sourceNode, Node *destNode) : arrowSize(10) diff --git a/retroshare-gui/src/gui/elastic/graphwidget.cpp b/retroshare-gui/src/gui/elastic/graphwidget.cpp index 7cc15642d..28def980c 100644 --- a/retroshare-gui/src/gui/elastic/graphwidget.cpp +++ b/retroshare-gui/src/gui/elastic/graphwidget.cpp @@ -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 ; @@ -269,7 +269,7 @@ static void convolveWithGaussian(double *forceMap,int S,int s) { int x = (i derivative is constant bf[2*(i+S*j)+1] = 0 ; } @@ -334,7 +334,6 @@ void GraphWidget::timerEvent(QTimerEvent *event) // compute convolution with 1/omega kernel. convolveWithGaussian(forceMap,S,20) ; - static int toto=0 ; static float speedf=1.0f; foreach (Node *node, _nodes) diff --git a/retroshare-gui/src/gui/elastic/node.cpp b/retroshare-gui/src/gui/elastic/node.cpp index c2af7019c..69b9c112f 100644 --- a/retroshare-gui/src/gui/elastic/node.cpp +++ b/retroshare-gui/src/gui/elastic/node.cpp @@ -92,23 +92,23 @@ const QList& Node::edges() const return edgeList; } -static double interpolate(const double *map,int W,int H,float x,float y) -{ - if(x>W-2) x=W-2 ; - if(y>H-2) y=H-2 ; - if(x<0 ) x=0 ; - if(y<0 ) y=0 ; +//static double interpolate(const double *map,int W,int H,float x,float y) +//{ +// if(x>W-2) x=W-2 ; +// if(y>H-2) y=H-2 ; +// if(x<0 ) x=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) ; - 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) +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) { diff --git a/retroshare-gui/src/gui/feeds/ChanMsgItem.cpp b/retroshare-gui/src/gui/feeds/ChanMsgItem.cpp index 6156f239a..491cf7a84 100644 --- a/retroshare-gui/src/gui/feeds/ChanMsgItem.cpp +++ b/retroshare-gui/src/gui/feeds/ChanMsgItem.cpp @@ -390,7 +390,7 @@ void ChanMsgItem::readToggled(bool checked) 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) { updateItemStatic(); diff --git a/retroshare-gui/src/gui/forums/CreateForumMsg.cpp b/retroshare-gui/src/gui/forums/CreateForumMsg.cpp index 7fd60c099..341440ea7 100644 --- a/retroshare-gui/src/gui/forums/CreateForumMsg.cpp +++ b/retroshare-gui/src/gui/forums/CreateForumMsg.cpp @@ -65,7 +65,7 @@ CreateForumMsg::CreateForumMsg(std::string fId, std::string pId) } /** context menu searchTablewidget2 **/ -void CreateForumMsg::forumMessageCostumPopupMenu( QPoint point ) +void CreateForumMsg::forumMessageCostumPopupMenu( QPoint /*point*/ ) { 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); } diff --git a/retroshare-gui/src/gui/im_history/IMHistoryItemPainter.cpp b/retroshare-gui/src/gui/im_history/IMHistoryItemPainter.cpp index c943205bd..9fb4b0245 100644 --- a/retroshare-gui/src/gui/im_history/IMHistoryItemPainter.cpp +++ b/retroshare-gui/src/gui/im_history/IMHistoryItemPainter.cpp @@ -40,7 +40,7 @@ QSize IMHistoryItemPainter::sizeHint() const 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) { // painter->setBrush(option.palette.highlight()); diff --git a/retroshare-gui/src/gui/im_history/ImHistoryBrowser.cpp b/retroshare-gui/src/gui/im_history/ImHistoryBrowser.cpp index 33794be46..3073fbeb2 100644 --- a/retroshare-gui/src/gui/im_history/ImHistoryBrowser.cpp +++ b/retroshare-gui/src/gui/im_history/ImHistoryBrowser.cpp @@ -376,7 +376,7 @@ void ImHistoryBrowser::itemSelectionChanged() } } -void ImHistoryBrowser::customContextMenuRequested(QPoint pos) +void ImHistoryBrowser::customContextMenuRequested(QPoint /*pos*/) { QList hiids; getSelectedItems(hiids); diff --git a/retroshare-gui/src/gui/msgs/MessageWidget.cpp b/retroshare-gui/src/gui/msgs/MessageWidget.cpp index d1a1ae6e6..d20118c42 100644 --- a/retroshare-gui/src/gui/msgs/MessageWidget.cpp +++ b/retroshare-gui/src/gui/msgs/MessageWidget.cpp @@ -226,7 +226,7 @@ QString MessageWidget::subject(bool noEmpty) return subject; } -void MessageWidget::msgfilelistWidgetCostumPopupMenu( QPoint point ) +void MessageWidget::msgfilelistWidgetCostumPopupMenu( QPoint /*point*/ ) { QMenu contextMnu(this); diff --git a/retroshare-gui/src/gui/notifyqt.cpp b/retroshare-gui/src/gui/notifyqt.cpp index 3f6ea3821..427d4814b 100644 --- a/retroshare-gui/src/gui/notifyqt.cpp +++ b/retroshare-gui/src/gui/notifyqt.cpp @@ -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 std::cerr << "NotifyQt::notifyListPreChange()" << std::endl; diff --git a/retroshare-gui/src/gui/profile/ProfileEdit.cpp b/retroshare-gui/src/gui/profile/ProfileEdit.cpp index e3f99d6ab..95be9580b 100644 --- a/retroshare-gui/src/gui/profile/ProfileEdit.cpp +++ b/retroshare-gui/src/gui/profile/ProfileEdit.cpp @@ -49,7 +49,7 @@ ProfileEdit::ProfileEdit(QWidget *parent) #endif } -void ProfileEdit::profileCustomPopupMenu( QPoint point ) +void ProfileEdit::profileCustomPopupMenu( QPoint /*point*/ ) { QMenu contextMnu( this ); diff --git a/retroshare-gui/src/gui/profile/ProfileView.cpp b/retroshare-gui/src/gui/profile/ProfileView.cpp index 76f0eaeba..48c6a6239 100644 --- a/retroshare-gui/src/gui/profile/ProfileView.cpp +++ b/retroshare-gui/src/gui/profile/ProfileView.cpp @@ -58,7 +58,7 @@ ProfileView::ProfileView(QWidget *parent) } /** context popup menus */ -void ProfileView::imageCustomPopupMenu( QPoint point ) +void ProfileView::imageCustomPopupMenu( QPoint /*point*/ ) { if (!mIsOwnId) { @@ -80,7 +80,7 @@ void ProfileView::imageCustomPopupMenu( QPoint point ) } -void ProfileView::profileCustomPopupMenu( QPoint point ) +void ProfileView::profileCustomPopupMenu( QPoint /*point*/ ) { if (!mIsOwnId) { @@ -97,7 +97,7 @@ void ProfileView::profileCustomPopupMenu( QPoint point ) contextMnu.exec(QCursor::pos()); } -void ProfileView::fileCustomPopupMenu( QPoint point ) +void ProfileView::fileCustomPopupMenu( QPoint /*point*/ ) { QMenu contextMnu( this ); diff --git a/retroshare-gui/src/gui/profile/ProfileWidget.cpp b/retroshare-gui/src/gui/profile/ProfileWidget.cpp index e9555f6b2..c4ceabaf9 100644 --- a/retroshare-gui/src/gui/profile/ProfileWidget.cpp +++ b/retroshare-gui/src/gui/profile/ProfileWidget.cpp @@ -59,7 +59,7 @@ void ProfileWidget::closeEvent (QCloseEvent * event) QWidget::closeEvent(event); } -void ProfileWidget::showEvent ( QShowEvent * event ) +void ProfileWidget::showEvent ( QShowEvent * /*event*/ ) { RsPeerDetails detail; diff --git a/retroshare-gui/src/gui/settings/ChatPage.cpp b/retroshare-gui/src/gui/settings/ChatPage.cpp index 4ea9ff6a0..451ee7983 100644 --- a/retroshare-gui/src/gui/settings/ChatPage.cpp +++ b/retroshare-gui/src/gui/settings/ChatPage.cpp @@ -93,7 +93,7 @@ ChatPage::ChatPage(QWidget * parent, Qt::WFlags flags) /** Saves the changes on this page */ bool -ChatPage::save(QString &errmsg) +ChatPage::save(QString &/*errmsg*/) { Settings->beginGroup(QString("Chat")); @@ -331,17 +331,17 @@ void ChatPage::on_historyList_currentRowChanged(int currentRow) 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); } -void ChatPage::on_privateComboBoxVariant_currentIndexChanged(int index) +void ChatPage::on_privateComboBoxVariant_currentIndexChanged(int /*index*/) { 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); } diff --git a/retroshare-gui/src/gui/settings/CryptoPage.cpp b/retroshare-gui/src/gui/settings/CryptoPage.cpp index 6a36e6b98..adbc54da6 100755 --- a/retroshare-gui/src/gui/settings/CryptoPage.cpp +++ b/retroshare-gui/src/gui/settings/CryptoPage.cpp @@ -52,7 +52,7 @@ CryptoPage::~CryptoPage() /** Saves the changes on this page */ bool -CryptoPage::save(QString &errmsg) +CryptoPage::save(QString &/*errmsg*/) { return true; } diff --git a/retroshare-gui/src/gui/settings/DirectoriesPage.cpp b/retroshare-gui/src/gui/settings/DirectoriesPage.cpp index 96f426273..d51f26ec1 100755 --- a/retroshare-gui/src/gui/settings/DirectoriesPage.cpp +++ b/retroshare-gui/src/gui/settings/DirectoriesPage.cpp @@ -80,7 +80,7 @@ void DirectoriesPage::toggleRememberHashes() } /** Saves the changes on this page */ -bool DirectoriesPage::save(QString &errmsg) +bool DirectoriesPage::save(QString &/*errmsg*/) { rsFiles->setRememberHashFilesDuration(ui.rememberHashesSB->value()); rsFiles->setWatchPeriod(ui.autoCheckDirectoriesDelay_SB->value()); @@ -151,4 +151,4 @@ void DirectoriesPage::setPartialsDirectory() } ui.partialsDir->setText(qdir); -} +} \ No newline at end of file diff --git a/retroshare-gui/src/gui/settings/FileAssociationsPage.cpp b/retroshare-gui/src/gui/settings/FileAssociationsPage.cpp index cba53d501..78a79463e 100755 --- a/retroshare-gui/src/gui/settings/FileAssociationsPage.cpp +++ b/retroshare-gui/src/gui/settings/FileAssociationsPage.cpp @@ -134,7 +134,7 @@ FileAssociationsPage::~FileAssociationsPage() //============================================================================ bool -FileAssociationsPage::save (QString &errmsg) +FileAssociationsPage::save (QString &/*errmsg*/) { // RshareSettings settings; @@ -218,7 +218,6 @@ FileAssociationsPage::addnew() { AddFileAssociationDialog afad(false, this);//'add file assotiations' dialog - int currentRow = table->currentRow() ; QTableWidgetItem* titem; int ti = afad.exec(); @@ -290,7 +289,7 @@ FileAssociationsPage::edit() //============================================================================ void -FileAssociationsPage::tableCellActivated ( int row, int column ) +FileAssociationsPage::tableCellActivated ( int row, int /*column*/ ) { table->selectRow(row); } diff --git a/retroshare-gui/src/gui/settings/ForumPage.cpp b/retroshare-gui/src/gui/settings/ForumPage.cpp index 98a49a124..c14548c6d 100644 --- a/retroshare-gui/src/gui/settings/ForumPage.cpp +++ b/retroshare-gui/src/gui/settings/ForumPage.cpp @@ -39,7 +39,7 @@ ForumPage::~ForumPage() /** Saves the changes on this page */ bool -ForumPage::save(QString &errmsg) +ForumPage::save(QString &/*errmsg*/) { Settings->setForumMsgSetToReadOnActivate(ui.setMsgToReadOnActivate->isChecked()); Settings->setExpandNewMessages(ui.expandNewMessages->isChecked()); diff --git a/retroshare-gui/src/gui/settings/GeneralPage.cpp b/retroshare-gui/src/gui/settings/GeneralPage.cpp index 0852809ec..2d96ec100 100755 --- a/retroshare-gui/src/gui/settings/GeneralPage.cpp +++ b/retroshare-gui/src/gui/settings/GeneralPage.cpp @@ -50,7 +50,7 @@ GeneralPage::~GeneralPage() } /** Saves the changes on this page */ -bool GeneralPage::save(QString &errmsg) +bool GeneralPage::save(QString &/*errmsg*/) { Settings->setStartMinimized(ui.checkStartMinimized->isChecked()); Settings->setValue("doQuit", ui.checkQuit->isChecked()); diff --git a/retroshare-gui/src/gui/settings/MessagePage.cpp b/retroshare-gui/src/gui/settings/MessagePage.cpp index b713daab0..7b50bb742 100644 --- a/retroshare-gui/src/gui/settings/MessagePage.cpp +++ b/retroshare-gui/src/gui/settings/MessagePage.cpp @@ -58,7 +58,7 @@ MessagePage::~MessagePage() /** Saves the changes on this page */ bool -MessagePage::save(QString &errmsg) +MessagePage::save(QString &/*errmsg*/) { Settings->setMsgSetToReadOnActivate(ui.setMsgToReadOnActivate->isChecked()); Settings->setMsgOpen((RshareSettings::enumMsgOpen) ui.openComboBox->itemData(ui.openComboBox->currentIndex()).toInt()); diff --git a/retroshare-gui/src/gui/settings/NetworkPage.cpp b/retroshare-gui/src/gui/settings/NetworkPage.cpp index 56025cefe..f04242f04 100755 --- a/retroshare-gui/src/gui/settings/NetworkPage.cpp +++ b/retroshare-gui/src/gui/settings/NetworkPage.cpp @@ -32,7 +32,7 @@ NetworkPage::NetworkPage(QWidget * parent, Qt::WFlags flags) /** Saves the changes on this page */ bool -NetworkPage::save(QString &errmsg) +NetworkPage::save(QString &/*errmsg*/) { return true; } diff --git a/retroshare-gui/src/gui/settings/NewTag.cpp b/retroshare-gui/src/gui/settings/NewTag.cpp index 21910c5af..949074ad3 100644 --- a/retroshare-gui/src/gui/settings/NewTag.cpp +++ b/retroshare-gui/src/gui/settings/NewTag.cpp @@ -134,6 +134,6 @@ void NewTag::setTagColor() void NewTag::showColor(QRgb color) { QPixmap pxm(16,16); - pxm.fill(QColor(m_Color)); + pxm.fill(QColor(color)); ui.colorButton->setIcon(pxm); } diff --git a/retroshare-gui/src/gui/settings/NotifyPage.cpp b/retroshare-gui/src/gui/settings/NotifyPage.cpp index bd5f948fd..96c81f625 100755 --- a/retroshare-gui/src/gui/settings/NotifyPage.cpp +++ b/retroshare-gui/src/gui/settings/NotifyPage.cpp @@ -54,7 +54,7 @@ NotifyPage::~NotifyPage() /** Saves the changes on this page */ bool -NotifyPage::save(QString &errmsg) +NotifyPage::save(QString &/*errmsg*/) { /* extract from rsNotify the flags */ diff --git a/retroshare-gui/src/gui/settings/PluginItem.cpp b/retroshare-gui/src/gui/settings/PluginItem.cpp index cb5a9a30e..82659c3eb 100644 --- a/retroshare-gui/src/gui/settings/PluginItem.cpp +++ b/retroshare-gui/src/gui/settings/PluginItem.cpp @@ -21,7 +21,7 @@ #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) { setupUi(this) ; diff --git a/retroshare-gui/src/gui/settings/PluginsPage.cpp b/retroshare-gui/src/gui/settings/PluginsPage.cpp index e26fac6bf..6204117b1 100644 --- a/retroshare-gui/src/gui/settings/PluginsPage.cpp +++ b/retroshare-gui/src/gui/settings/PluginsPage.cpp @@ -130,7 +130,7 @@ PluginsPage::~PluginsPage() } /** Saves the changes on this page */ -bool PluginsPage::save(QString &errmsg) +bool PluginsPage::save(QString &/*errmsg*/) { // nothing to save for now. return true; diff --git a/retroshare-gui/src/gui/settings/ServerPage.cpp b/retroshare-gui/src/gui/settings/ServerPage.cpp index 72499c012..902952e40 100755 --- a/retroshare-gui/src/gui/settings/ServerPage.cpp +++ b/retroshare-gui/src/gui/settings/ServerPage.cpp @@ -88,7 +88,7 @@ void ServerPage::toggleTunnelConnection(bool b) /** Saves the changes on this page */ bool -ServerPage::save(QString &errmsg) +ServerPage::save(QString &/*errmsg*/) { Settings->setStatusBarFlag(STATUSBAR_DISC, ui.showDiscStatusBar->isChecked()); diff --git a/retroshare-gui/src/gui/settings/SoundPage.cpp b/retroshare-gui/src/gui/settings/SoundPage.cpp index facbd18b7..05e03f51a 100644 --- a/retroshare-gui/src/gui/settings/SoundPage.cpp +++ b/retroshare-gui/src/gui/settings/SoundPage.cpp @@ -54,7 +54,7 @@ SoundPage::~SoundPage() /** Saves the changes on this page */ bool -SoundPage::save(QString &errmsg) +SoundPage::save(QString &/*errmsg*/) { Settings->beginGroup("Sound"); Settings->beginGroup("Enable"); diff --git a/retroshare-gui/src/gui/settings/TransferPage.h b/retroshare-gui/src/gui/settings/TransferPage.h index ddb2aaf7a..d4604b03e 100644 --- a/retroshare-gui/src/gui/settings/TransferPage.h +++ b/retroshare-gui/src/gui/settings/TransferPage.h @@ -36,7 +36,7 @@ class TransferPage: public ConfigPage ~TransferPage() {} /** 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 */ virtual void load() {} diff --git a/retroshare-gui/src/gui/settings/configpage.cpp b/retroshare-gui/src/gui/settings/configpage.cpp index cc7de9495..5f69ed525 100644 --- a/retroshare-gui/src/gui/settings/configpage.cpp +++ b/retroshare-gui/src/gui/settings/configpage.cpp @@ -26,7 +26,7 @@ ConfigPage::ConfigPage(QWidget *parent, Qt::WFlags flags) : QWidget(parent, flag loaded = false; } -void ConfigPage::showEvent(QShowEvent *event) +void ConfigPage::showEvent(QShowEvent */*event*/) { if (loaded) { return; diff --git a/retroshare-gui/src/gui/settings/rsharesettings.cpp b/retroshare-gui/src/gui/settings/rsharesettings.cpp index 2b1175e46..2cf57a631 100644 --- a/retroshare-gui/src/gui/settings/rsharesettings.cpp +++ b/retroshare-gui/src/gui/settings/rsharesettings.cpp @@ -477,10 +477,12 @@ RshareSettings::setRunRetroshareOnBoot(bool run, bool minimized) #endif } +#if defined(Q_WS_WIN) static QString getAppPathForProtocol() { return "\"" + QDir::convertSeparators(QCoreApplication::applicationFilePath()) + "\" -r \"%1\""; } +#endif /** Returns true if retroshare:// is registered as protocol */ bool RshareSettings::getRetroShareProtocol() @@ -688,4 +690,4 @@ void RshareSettings::setMaxTimeBeforeIdle(uint nValue) { m_maxTimeBeforeIdle = nValue; setValue("maxTimeBeforeIdle", nValue); -} +} \ No newline at end of file diff --git a/retroshare-gui/src/util/EventReceiver.cpp b/retroshare-gui/src/util/EventReceiver.cpp index bcc15932a..4a9674f58 100644 --- a/retroshare-gui/src/util/EventReceiver.cpp +++ b/retroshare-gui/src/util/EventReceiver.cpp @@ -117,6 +117,8 @@ bool EventReceiver::sendRetroShareLink(const QString& link) result = false; } #else + Q_UNUSED(link); + 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.exec(); diff --git a/retroshare-gui/src/util/RetroStyleLabel.cpp b/retroshare-gui/src/util/RetroStyleLabel.cpp index f10ba0b87..1a6d42d5e 100644 --- a/retroshare-gui/src/util/RetroStyleLabel.cpp +++ b/retroshare-gui/src/util/RetroStyleLabel.cpp @@ -42,7 +42,7 @@ RetroStyleLabel::RetroStyleLabel(QWidget * parent, Mode mode, Qt::AlignmentFlag RetroStyleLabel::~RetroStyleLabel() { } -void RetroStyleLabel::paintEvent(QPaintEvent * event) { +void RetroStyleLabel::paintEvent(QPaintEvent * /*event*/) { /* qDebug() << "Paint event"; QLabel::paintEvent( event ); diff --git a/retroshare-gui/src/util/RsAction.cpp b/retroshare-gui/src/util/RsAction.cpp index f873cc978..c5aea14ad 100644 --- a/retroshare-gui/src/util/RsAction.cpp +++ b/retroshare-gui/src/util/RsAction.cpp @@ -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); } diff --git a/retroshare-gui/src/util/win32.cpp b/retroshare-gui/src/util/win32.cpp index 5d2a87ac6..b92a46560 100644 --- a/retroshare-gui/src/util/win32.cpp +++ b/retroshare-gui/src/util/win32.cpp @@ -1,7 +1,7 @@ /**************************************************************** - * This file is distributed under the following license: - * - * Copyright (c) 2006-2007, crypton + * This file is distributed under the following license: + * + * Copyright (c) 2006-2007, crypton * Copyright (c) 2006, Matt Edman, Justin Hipple * * 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 * value. If the folder cannot be found, the given default path is used. */ QString -win32_get_folder_location(int folder, QString defaultPath) +win32_get_folder_location(int /*folder*/, QString defaultPath) { #if 0 TCHAR path[MAX_PATH+1]; @@ -90,6 +90,9 @@ win32_registry_get_key_value(QString keyLocation, QString keyName) return QString(data); #else + Q_UNUSED(keyLocation); + Q_UNUSED(keyName); + return QString(); #endif } @@ -120,6 +123,10 @@ win32_registry_set_key_value(QString keyLocation, QString keyName, QString keyVa /* Close the key */ RegCloseKey(key); +#else + Q_UNUSED(keyLocation); + Q_UNUSED(keyName); + Q_UNUSED(keyValue); #endif } @@ -141,6 +148,9 @@ win32_registry_remove_key(QString keyLocation, QString keyName) /* Close anything that was opened */ RegCloseKey(key); +#else + Q_UNUSED(keyLocation); + Q_UNUSED(keyName); #endif }