From 3dfe4e1288fcd970f19a3b158a9e5ce0a90abd86 Mon Sep 17 00:00:00 2001 From: thunder2 Date: Mon, 3 Jan 2022 00:37:49 +0100 Subject: [PATCH 1/7] Fixed unused variable warning --- retroshare-gui/src/gui/Circles/CreateCircleDialog.cpp | 1 - retroshare-gui/src/gui/HomePage.cpp | 2 +- retroshare-gui/src/gui/Posted/PostedGroupDialog.cpp | 2 +- retroshare-gui/src/gui/common/RSFeedWidget.cpp | 3 +-- retroshare-gui/src/gui/feeds/GxsChannelPostItem.cpp | 2 +- retroshare-gui/src/gui/gxs/GxsCreateCommentDialog.cpp | 1 - retroshare-gui/src/gui/gxs/GxsGroupFeedItem.cpp | 4 ++-- retroshare-gui/src/gui/gxs/GxsUserNotify.cpp | 2 +- retroshare-gui/src/gui/notifyqt.cpp | 2 +- retroshare-gui/src/gui/settings/JsonApiPage.cc | 1 - retroshare-gui/src/gui/settings/rsettingswin.cpp | 1 - retroshare-gui/src/gui/statistics/Histogram.cpp | 2 +- retroshare-gui/src/util/ClickableLabel.cpp | 4 ++-- 13 files changed, 11 insertions(+), 16 deletions(-) diff --git a/retroshare-gui/src/gui/Circles/CreateCircleDialog.cpp b/retroshare-gui/src/gui/Circles/CreateCircleDialog.cpp index b8ee868ad..c5c58cb14 100644 --- a/retroshare-gui/src/gui/Circles/CreateCircleDialog.cpp +++ b/retroshare-gui/src/gui/Circles/CreateCircleDialog.cpp @@ -830,7 +830,6 @@ void CreateCircleDialog::fillIdentitiesList(const std::vector& id_ bool isSignedByFriendNode = isSigned && rsPeers->isPgpFriend(idGroup.mPgpId); /* do filtering */ - bool ok = false; if(!(acceptAll ||(acceptOnlySignedIdentities && isSigned) ||(acceptOnlyIdentitiesSignedByFriend && isSignedByFriendNode))) { diff --git a/retroshare-gui/src/gui/HomePage.cpp b/retroshare-gui/src/gui/HomePage.cpp index 3caba0ca1..6c1737076 100644 --- a/retroshare-gui/src/gui/HomePage.cpp +++ b/retroshare-gui/src/gui/HomePage.cpp @@ -145,7 +145,7 @@ void HomePage::handleEvent(std::shared_ptr e) break; } } -void HomePage::certContextMenu(QPoint point) +void HomePage::certContextMenu(QPoint /*point*/) { QMenu menu(this) ; diff --git a/retroshare-gui/src/gui/Posted/PostedGroupDialog.cpp b/retroshare-gui/src/gui/Posted/PostedGroupDialog.cpp index c516f7520..6414db7cd 100644 --- a/retroshare-gui/src/gui/Posted/PostedGroupDialog.cpp +++ b/retroshare-gui/src/gui/Posted/PostedGroupDialog.cpp @@ -136,7 +136,7 @@ bool PostedGroupDialog::service_updateGroup(const RsGroupMetaData& editedMeta) return rsPosted->editBoard(grp); } -bool PostedGroupDialog::service_loadGroup(const RsGxsGenericGroupData *data, Mode mode, QString& description) +bool PostedGroupDialog::service_loadGroup(const RsGxsGenericGroupData *data, Mode /*mode*/, QString& description) { const RsPostedGroup *pgroup = dynamic_cast(data); diff --git a/retroshare-gui/src/gui/common/RSFeedWidget.cpp b/retroshare-gui/src/gui/common/RSFeedWidget.cpp index 3293e3fae..7be4020b2 100644 --- a/retroshare-gui/src/gui/common/RSFeedWidget.cpp +++ b/retroshare-gui/src/gui/common/RSFeedWidget.cpp @@ -130,7 +130,7 @@ bool RSFeedWidget::eventFilter(QObject *object, QEvent *event) return QWidget::eventFilter(object, event); } -void RSFeedWidget::feedAdded(FeedItem *feedItem, QTreeWidgetItem *treeItem) +void RSFeedWidget::feedAdded(FeedItem */*feedItem*/, QTreeWidgetItem */*treeItem*/) { } @@ -433,7 +433,6 @@ void RSFeedWidget::feedItemDestroyed(qulonglong id) QTreeWidgetItem *RSFeedWidget::findTreeWidgetItem(const FeedItem *w) { QTreeWidgetItemIterator it(ui->treeWidget); - QTreeWidgetItem *treeItem=NULL; // this search could probably be automatised by giving the tree items the identifier as data for some specific role, then calling QTreeWidget::findItems() #warning TODO diff --git a/retroshare-gui/src/gui/feeds/GxsChannelPostItem.cpp b/retroshare-gui/src/gui/feeds/GxsChannelPostItem.cpp index f95c9bcb3..962ee5327 100644 --- a/retroshare-gui/src/gui/feeds/GxsChannelPostItem.cpp +++ b/retroshare-gui/src/gui/feeds/GxsChannelPostItem.cpp @@ -487,7 +487,7 @@ void GxsChannelPostItem::fill() /* subject */ ui->titleLabel->setText(QString::fromUtf8(mPost.mMeta.mMsgName.c_str())); - uint32_t autorized_lines = (int)floor((ui->logoLabel->height() - ui->titleLabel->height() - ui->buttonHLayout->sizeHint().height())/QFontMetricsF(ui->subjectLabel->font()).height()); + //uint32_t autorized_lines = (int)floor((ui->logoLabel->height() - ui->titleLabel->height() - ui->buttonHLayout->sizeHint().height())/QFontMetricsF(ui->subjectLabel->font()).height()); // fill first 4 lines of message. (csoler) Disabled the replacement of smileys and links, because the cost is too crazy //ui->subjectLabel->setText(RsHtml().formatText(NULL, RsStringUtil::CopyLines(QString::fromUtf8(mPost.mMsg.c_str()), autorized_lines), RSHTML_FORMATTEXT_EMBED_SMILEYS | RSHTML_FORMATTEXT_EMBED_LINKS)); diff --git a/retroshare-gui/src/gui/gxs/GxsCreateCommentDialog.cpp b/retroshare-gui/src/gui/gxs/GxsCreateCommentDialog.cpp index 67a538a94..6585941c4 100644 --- a/retroshare-gui/src/gui/gxs/GxsCreateCommentDialog.cpp +++ b/retroshare-gui/src/gui/gxs/GxsCreateCommentDialog.cpp @@ -99,7 +99,6 @@ void GxsCreateCommentDialog::createComment() return; } - uint32_t token; mCommentService->createComment(comment); close(); } diff --git a/retroshare-gui/src/gui/gxs/GxsGroupFeedItem.cpp b/retroshare-gui/src/gui/gxs/GxsGroupFeedItem.cpp index fb530a3ef..b4fe2273f 100644 --- a/retroshare-gui/src/gui/gxs/GxsGroupFeedItem.cpp +++ b/retroshare-gui/src/gui/gxs/GxsGroupFeedItem.cpp @@ -31,7 +31,7 @@ * #define DEBUG_ITEM 1 **/ -GxsGroupFeedItem::GxsGroupFeedItem(FeedHolder *feedHolder, uint32_t feedId, const RsGxsGroupId &groupId, bool isHome, RsGxsIfaceHelper *iface, bool autoUpdate) : +GxsGroupFeedItem::GxsGroupFeedItem(FeedHolder *feedHolder, uint32_t feedId, const RsGxsGroupId &groupId, bool isHome, RsGxsIfaceHelper *iface, bool /*autoUpdate*/) : FeedItem(feedHolder,feedId,NULL) { #ifdef DEBUG_ITEM @@ -102,7 +102,7 @@ void GxsGroupFeedItem::copyGroupLink() } } -void GxsGroupFeedItem::fillDisplaySlot(bool complete) +void GxsGroupFeedItem::fillDisplaySlot(bool /*complete*/) { requestGroup(); } diff --git a/retroshare-gui/src/gui/gxs/GxsUserNotify.cpp b/retroshare-gui/src/gui/gxs/GxsUserNotify.cpp index bc1afa1c1..1784a6f8c 100644 --- a/retroshare-gui/src/gui/gxs/GxsUserNotify.cpp +++ b/retroshare-gui/src/gui/gxs/GxsUserNotify.cpp @@ -26,7 +26,7 @@ #define TOKEN_TYPE_STATISTICS 1 -GxsUserNotify::GxsUserNotify(RsGxsIfaceHelper *ifaceImpl, const GxsGroupFrameDialog *g,QObject *parent) : UserNotify(parent), mGroupFrameDialog(g) +GxsUserNotify::GxsUserNotify(RsGxsIfaceHelper */*ifaceImpl*/, const GxsGroupFrameDialog *g,QObject *parent) : UserNotify(parent), mGroupFrameDialog(g) { mNewThreadMessageCount = 0; mNewChildMessageCount = 0; diff --git a/retroshare-gui/src/gui/notifyqt.cpp b/retroshare-gui/src/gui/notifyqt.cpp index 380f2382c..7d2e9a207 100644 --- a/retroshare-gui/src/gui/notifyqt.cpp +++ b/retroshare-gui/src/gui/notifyqt.cpp @@ -477,7 +477,7 @@ void NotifyQt::notifyChatCleared(const ChatId& chat_id) emit chatCleared(chat_id); } -void NotifyQt::notifyTurtleSearchResult(uint32_t search_id,const std::list& found_groups) +void NotifyQt::notifyTurtleSearchResult(uint32_t /*search_id*/,const std::list& /*found_groups*/) { std::cerr << "(EE) missing code to handle GXS turtle search result." << std::endl; } diff --git a/retroshare-gui/src/gui/settings/JsonApiPage.cc b/retroshare-gui/src/gui/settings/JsonApiPage.cc index 5f1bb225f..a824a5fa0 100644 --- a/retroshare-gui/src/gui/settings/JsonApiPage.cc +++ b/retroshare-gui/src/gui/settings/JsonApiPage.cc @@ -80,7 +80,6 @@ void JsonApiPage::enableJsonApi(bool checked) bool JsonApiPage::updateParams() { bool ok = true; - bool changed = false; uint16_t port = static_cast(ui.portSpinBox->value()); QString listenAddress = ui.listenAddressLineEdit->text(); diff --git a/retroshare-gui/src/gui/settings/rsettingswin.cpp b/retroshare-gui/src/gui/settings/rsettingswin.cpp index deb82c9ad..03494a8b2 100644 --- a/retroshare-gui/src/gui/settings/rsettingswin.cpp +++ b/retroshare-gui/src/gui/settings/rsettingswin.cpp @@ -177,7 +177,6 @@ SettingsPage::initStackedWidget() addPage(new SoundPage() ); // SOUND addPage(new ServicePermissionsPage() ); // PERMISSIONS #ifdef RS_JSONAPI - JsonApiPage *jsonapi_p = new JsonApiPage() ; addPage(new JsonApiPage()); #ifdef RS_WEBUI WebuiPage *webui_p = new WebuiPage() ; diff --git a/retroshare-gui/src/gui/statistics/Histogram.cpp b/retroshare-gui/src/gui/statistics/Histogram.cpp index 6cd1c4906..5884d8306 100644 --- a/retroshare-gui/src/gui/statistics/Histogram.cpp +++ b/retroshare-gui/src/gui/statistics/Histogram.cpp @@ -33,7 +33,7 @@ Histogram::Histogram(double start, double end, int bins) std::cerr << "Null histogram created! Please check your parameters" << std::endl; } -void Histogram::draw(QPainter *painter) const +void Histogram::draw(QPainter */*painter*/) const { } diff --git a/retroshare-gui/src/util/ClickableLabel.cpp b/retroshare-gui/src/util/ClickableLabel.cpp index e12e01c8d..6bbd5ca4a 100644 --- a/retroshare-gui/src/util/ClickableLabel.cpp +++ b/retroshare-gui/src/util/ClickableLabel.cpp @@ -22,7 +22,7 @@ /** Constructor */ ClickableLabel::ClickableLabel(QWidget* parent, Qt::WindowFlags f) - : QLabel(parent) { + : QLabel(parent, f) { } @@ -30,6 +30,6 @@ ClickableLabel::~ClickableLabel() { } -void ClickableLabel::mousePressEvent(QMouseEvent* event) { +void ClickableLabel::mousePressEvent(QMouseEvent* /*event*/) { emit clicked(); } From 088d6f63f0cd4cb70918f8b7dea07155f42fdd89 Mon Sep 17 00:00:00 2001 From: thunder2 Date: Mon, 3 Jan 2022 00:38:41 +0100 Subject: [PATCH 2/7] Fixed unused function warning --- retroshare-gui/src/gui/statistics/GxsIdStatistics.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/retroshare-gui/src/gui/statistics/GxsIdStatistics.cpp b/retroshare-gui/src/gui/statistics/GxsIdStatistics.cpp index c7fe1068c..3037839c2 100644 --- a/retroshare-gui/src/gui/statistics/GxsIdStatistics.cpp +++ b/retroshare-gui/src/gui/statistics/GxsIdStatistics.cpp @@ -44,6 +44,7 @@ #include "util/misc.h" #include "util/qtthreadsutils.h" +#ifdef TODO static QColor colorScale(float f) { if(f == 0) @@ -51,6 +52,7 @@ static QColor colorScale(float f) else return QColor::fromHsv((int)((1.0-f)*280),200,255) ; } +#endif GxsIdStatistics::GxsIdStatistics(QWidget *parent) : RsAutoUpdatePage(4000,parent) From 6f3d8971568d692ef41fd83cf8dc0c63fe1d2413 Mon Sep 17 00:00:00 2001 From: thunder2 Date: Mon, 3 Jan 2022 00:49:49 +0100 Subject: [PATCH 3/7] Fixed "initialized after (-Wreorder)" warning --- retroshare-gui/src/gui/feeds/FeedItem.cpp | 2 +- retroshare-gui/src/gui/gxs/GxsMessageFramePostWidget.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/retroshare-gui/src/gui/feeds/FeedItem.cpp b/retroshare-gui/src/gui/feeds/FeedItem.cpp index 83c97eb3b..e9991e6d0 100644 --- a/retroshare-gui/src/gui/feeds/FeedItem.cpp +++ b/retroshare-gui/src/gui/feeds/FeedItem.cpp @@ -23,7 +23,7 @@ #include "FeedHolder.h" /** Constructor */ -FeedItem::FeedItem(FeedHolder *fh, uint32_t feedId, QWidget *parent) : QWidget(parent), mHash(0),mFeedHolder(fh),mFeedId(feedId) +FeedItem::FeedItem(FeedHolder *fh, uint32_t feedId, QWidget *parent) : QWidget(parent),mFeedHolder(fh),mFeedId(feedId),mHash(0) { mWasExpanded = false; } diff --git a/retroshare-gui/src/gui/gxs/GxsMessageFramePostWidget.cpp b/retroshare-gui/src/gui/gxs/GxsMessageFramePostWidget.cpp index 1eb52356a..0f7c6dc0b 100644 --- a/retroshare-gui/src/gui/gxs/GxsMessageFramePostWidget.cpp +++ b/retroshare-gui/src/gui/gxs/GxsMessageFramePostWidget.cpp @@ -371,7 +371,7 @@ void GxsMessageFramePostWidget::loadPosts(const std::set& msgIds /**************************************************************/ GxsMessageFramePostThread::GxsMessageFramePostThread(const std::vector& posts,GxsMessageFramePostWidget *parent) - : mPosts(posts),QThread(parent), mParent(parent) + : QThread(parent), mPosts(posts), mParent(parent) { mStopped = false; } From 864269b0cf7d6f085ce39def5d22bc2a928455fe Mon Sep 17 00:00:00 2001 From: thunder2 Date: Mon, 3 Jan 2022 00:51:37 +0100 Subject: [PATCH 4/7] Fixed "statement may fall through (-Wimplicit-fallthrough)" warning --- retroshare-gui/src/gui/gxschannels/GxsChannelDialog.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/retroshare-gui/src/gui/gxschannels/GxsChannelDialog.cpp b/retroshare-gui/src/gui/gxschannels/GxsChannelDialog.cpp index e18a161a3..5c6d1ae31 100644 --- a/retroshare-gui/src/gui/gxschannels/GxsChannelDialog.cpp +++ b/retroshare-gui/src/gui/gxschannels/GxsChannelDialog.cpp @@ -66,6 +66,7 @@ void GxsChannelDialog::handleEvent_main_thread(std::shared_ptr ev { case RsChannelEventCode::STATISTICS_CHANGED: // [[fallthrough]]; updateDisplay(true); // no breaks, on purpose! + Q_FALLTHROUGH(); case RsChannelEventCode::NEW_MESSAGE: // [[fallthrough]]; case RsChannelEventCode::UPDATED_MESSAGE: // [[fallthrough]]; From 126500aac70e9ba956749719e13c77808808a663 Mon Sep 17 00:00:00 2001 From: thunder2 Date: Mon, 3 Jan 2022 00:53:37 +0100 Subject: [PATCH 5/7] Fixed duplicate name warning in ui --- retroshare-gui/src/gui/msgs/MessageComposer.ui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/retroshare-gui/src/gui/msgs/MessageComposer.ui b/retroshare-gui/src/gui/msgs/MessageComposer.ui index 64f8b1332..46aa5b6e7 100644 --- a/retroshare-gui/src/gui/msgs/MessageComposer.ui +++ b/retroshare-gui/src/gui/msgs/MessageComposer.ui @@ -350,7 +350,7 @@ Qt::Vertical - + From 98f7b815f7056b4e879cd390636397e5f28d5f9b Mon Sep 17 00:00:00 2001 From: thunder2 Date: Mon, 3 Jan 2022 00:54:46 +0100 Subject: [PATCH 6/7] Removed unnecessary define WIN32_LEAN_AND_MEAN --- retroshare-gui/src/util/retroshareWin32.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/retroshare-gui/src/util/retroshareWin32.cpp b/retroshare-gui/src/util/retroshareWin32.cpp index 2e025a354..5693ef514 100644 --- a/retroshare-gui/src/util/retroshareWin32.cpp +++ b/retroshare-gui/src/util/retroshareWin32.cpp @@ -21,7 +21,6 @@ #ifdef WIN32 -#define WIN32_LEAN_AND_MEAN #include #endif From b350070d9d907ee1fe9f0cef1860005c75f09bd0 Mon Sep 17 00:00:00 2001 From: thunder2 Date: Mon, 3 Jan 2022 01:31:37 +0100 Subject: [PATCH 7/7] Fixed "forbids converting a string constant (-Wwrite-strings)" warning --- retroshare-gui/src/gui/gxschannels/GxsChannelPostThumbnail.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/retroshare-gui/src/gui/gxschannels/GxsChannelPostThumbnail.h b/retroshare-gui/src/gui/gxschannels/GxsChannelPostThumbnail.h index 7e8bab4b0..7ee928f9e 100644 --- a/retroshare-gui/src/gui/gxschannels/GxsChannelPostThumbnail.h +++ b/retroshare-gui/src/gui/gxschannels/GxsChannelPostThumbnail.h @@ -107,7 +107,7 @@ public: static const int THUMBNAIL_W = 4; static const int THUMBNAIL_H = 6; - static constexpr char *CHAN_DEFAULT_IMAGE = ":images/thumb-default-video.png"; + static constexpr const char *CHAN_DEFAULT_IMAGE = ":images/thumb-default-video.png"; virtual ~ChannelPostThumbnailView(); ChannelPostThumbnailView(QWidget *parent=NULL,uint32_t flags=FLAG_ALLOW_PAN | FLAG_SHOW_TEXT | FLAG_SCALE_FONT);