From e4dbc46b346d560492f2b9e5d799f4f8c963d0f9 Mon Sep 17 00:00:00 2001 From: Phenom Date: Mon, 27 Feb 2017 22:12:48 +0100 Subject: [PATCH] Fiw New Warnings --- libretroshare/src/file_sharing/p3filelists.cc | 2 +- retroshare-gui/src/gui/AboutWidget.cpp | 8 +- retroshare-gui/src/gui/MainWindow.cpp | 2 +- .../src/gui/common/StyledElidedLabel.h | 3 +- .../src/gui/connect/FriendRecommendDialog.ui | 6 +- .../src/gui/msgs/MessageComposer.cpp | 2 +- .../src/gui/settings/AppearancePage.cpp | 6 +- retroshare-gui/src/gui/settings/ServerPage.ui | 719 +++++++++--------- .../src/gui/settings/rsettingswin.cpp | 2 +- .../src/retroshare-gui/configpage.h | 2 +- 10 files changed, 374 insertions(+), 378 deletions(-) diff --git a/libretroshare/src/file_sharing/p3filelists.cc b/libretroshare/src/file_sharing/p3filelists.cc index 71daca231..35725e412 100644 --- a/libretroshare/src/file_sharing/p3filelists.cc +++ b/libretroshare/src/file_sharing/p3filelists.cc @@ -179,7 +179,7 @@ int p3FileDatabase::tick() #endif last_print_time = now ; -#warning mr-alice 2016-08-19: This should be removed, but it's necessary atm for updating the GUI +#warning mr-alice 2016-08-19: "This should be removed, but it's necessary atm for updating the GUI" RsServer::notify()->notifyListChange(NOTIFY_LIST_DIRLIST_LOCAL, 0); } diff --git a/retroshare-gui/src/gui/AboutWidget.cpp b/retroshare-gui/src/gui/AboutWidget.cpp index 94b50aa5b..b97fb6f9e 100644 --- a/retroshare-gui/src/gui/AboutWidget.cpp +++ b/retroshare-gui/src/gui/AboutWidget.cpp @@ -200,7 +200,7 @@ void AWidget::switchState() } -void AWidget::resizeEvent(QResizeEvent *e) +void AWidget::resizeEvent(QResizeEvent */*e*/) { mImagesReady = false ; } @@ -289,12 +289,14 @@ void AWidget::drawBitField() for(int i=0;i= mMaxStep) + { + if (mStep >= mMaxStep) p.fillRect(QRect(i*s+1,j*s+1,s-1,s-1),QBrush(QColor(50,50,50))); else p.fillRect(QRect(i*s,j*s,s,s),QBrush(QColor(50,50,50))); + } - p.end(); + p.end() ; } AWidget::AWidget() { diff --git a/retroshare-gui/src/gui/MainWindow.cpp b/retroshare-gui/src/gui/MainWindow.cpp index 9b56a267b..6981e5caf 100644 --- a/retroshare-gui/src/gui/MainWindow.cpp +++ b/retroshare-gui/src/gui/MainWindow.cpp @@ -771,7 +771,7 @@ void MainWindow::updateFriends() if (sysTrayStatus) sysTrayStatus->setIcon(icon); } -void MainWindow::postModDirectories(bool update_local) +void MainWindow::postModDirectories(bool /*update_local*/) { //RSettingsPage::postModDirectories(update_local); diff --git a/retroshare-gui/src/gui/common/StyledElidedLabel.h b/retroshare-gui/src/gui/common/StyledElidedLabel.h index dea9ccd51..f2f300989 100644 --- a/retroshare-gui/src/gui/common/StyledElidedLabel.h +++ b/retroshare-gui/src/gui/common/StyledElidedLabel.h @@ -27,13 +27,14 @@ class StyledElidedLabel : public ElidedLabel { Q_OBJECT - Q_PROPERTY(int fontSizeFactor WRITE setFontSizeFactor) + Q_PROPERTY(int fontSizeFactor READ fontSizeFactor WRITE setFontSizeFactor) public: StyledElidedLabel(QWidget *parent = NULL); StyledElidedLabel(const QString &text, QWidget *parent = NULL); void setFontSizeFactor(int factor); + int fontSizeFactor() {return _lastFactor;} private: int _lastFactor; diff --git a/retroshare-gui/src/gui/connect/FriendRecommendDialog.ui b/retroshare-gui/src/gui/connect/FriendRecommendDialog.ui index d91172f6f..567d24e92 100644 --- a/retroshare-gui/src/gui/connect/FriendRecommendDialog.ui +++ b/retroshare-gui/src/gui/connect/FriendRecommendDialog.ui @@ -13,9 +13,9 @@ Dialog - + - + @@ -69,8 +69,6 @@ buttonBox frec_label frec_messageEdit - layoutWidget - frec_recommendList diff --git a/retroshare-gui/src/gui/msgs/MessageComposer.cpp b/retroshare-gui/src/gui/msgs/MessageComposer.cpp index a0b2c2e86..6fe265092 100644 --- a/retroshare-gui/src/gui/msgs/MessageComposer.cpp +++ b/retroshare-gui/src/gui/msgs/MessageComposer.cpp @@ -2770,7 +2770,7 @@ QString MessageComposer::inviteMessage() return tr("Hi,
I want to be friends with you on RetroShare.
"); } -void MessageComposer::sendInvite(const RsGxsId &to, const QString &msg, bool autoSend) +void MessageComposer::sendInvite(const RsGxsId &to, const QString &/*msg*/, bool autoSend) { /* create a message */ MessageComposer *composer = MessageComposer::newMsg(); diff --git a/retroshare-gui/src/gui/settings/AppearancePage.cpp b/retroshare-gui/src/gui/settings/AppearancePage.cpp index 67b61aa8d..99ef552bd 100755 --- a/retroshare-gui/src/gui/settings/AppearancePage.cpp +++ b/retroshare-gui/src/gui/settings/AppearancePage.cpp @@ -117,12 +117,12 @@ void AppearancePage::switch_status(MainWindow::StatusElement s,const QString& ke { MainWindow *pMainWindow = MainWindow::getInstance(); - if(!pMainWindow) - return ; + if (!pMainWindow) + return; Settings->setValueToGroup("StatusBar", key, QVariant(b)); - pMainWindow->switchVisibilityStatus(s,b) ; + pMainWindow->switchVisibilityStatus(s,b); } void AppearancePage::updateLanguageCode() { Settings->setLanguageCode(LanguageSupport::languageCode(ui.cmboLanguage->currentText())); } diff --git a/retroshare-gui/src/gui/settings/ServerPage.ui b/retroshare-gui/src/gui/settings/ServerPage.ui index faaac14d6..c8d043f5d 100755 --- a/retroshare-gui/src/gui/settings/ServerPage.ui +++ b/retroshare-gui/src/gui/settings/ServerPage.ui @@ -35,390 +35,386 @@ + + 6 + + + 6 + + + 6 + - + + + + + Network Mode + + + + + + + Nat + + + + + + + Local Address + + + + + + + External Address + + + + + + + Dynamic DNS + + + + + + + + 50 + false + + + + Download limit (KB/s) + + + + + + + + 50 + false + + + + Upload limit (KB/s) + + + + + + + 6 - - 6 - - - 6 - - - + + + + + 0 + 0 + + + + <html><head/><body><p>This download limit covers the whole application. However, in some situations, such as when transfering many small files at once, the estimated bandwidth becomes unreliable and the total value reported by Retroshare might exceed that limit. </p></body></html> + + + kB/s + + + 1 + + + 100000 + + + 1 + + + + + + + + + + Port: + + + + + + + Acceptable ports range from 10 to 65535. Normally Ports below 1024 are reserved by your system. + + + 1024 + + + 65535 + + + 7812 + + + + + + + + + + Port: + + + + + + + Acceptable ports range from 10 to 65535. Normally ports below 1024 are reserved by your system. + + + 1024 + + + 65535 + + + 7812 + + + + + + + + - + + Automatic (UPnP) + + + + + Firewalled + + + + + Manually Forwarded Port + + + + + + + + + 200 + 0 + + + + <html><head/><body><p>The DHT allows you to answer connection requests from your friends using BitTorrent's DHT. It greatly improves the connectivity. No information is actually stored in the DHT. It is only used as a proxy system to get in touch with other Retroshare nodes.</p><p>The Discovery service sends node name and ids of your trusted contacts to connected peers, to help them choose new friends. The friendship is never automatic however, and both peers still need to trust each other to allow connection. </p></body></html> + + + + Public: DHT & Discovery + + + + + Private: Discovery Only + + + + + Inverted: DHT Only + + + + + Dark Net: None + + + + + + + + 6 + + + 6 + + + + + + 16 + 16 + + - Network Mode + + + + :/images/ledoff1.png - - - - Nat - - - - - - - Local Address - - - - - - - External Address - - - - - - - Dynamic DNS - - - - - - - - 50 - false - + + + + <html><head/><body><p>The bullet turns green as soon as Retroshare manages to get your own IP from the websites listed below, if you enabled that action. Retroshare will also use other means to find out your own IP.</p></body></html> - Download limit (KB/s) - - - - - - - - 50 - false - - - - Upload limit (KB/s) + External ip address finder - - - + + + + 6 + + 6 - - - - - 0 - 0 - - - - <html><head/><body><p>This download limit covers the whole application. However, in some situations, such as when transfering many small files at once, the estimated bandwidth becomes unreliable and the total value reported by Retroshare might exceed that limit. </p></body></html> - - - kB/s - - - 1 - - - 100000 - - - 1 - - - - - - - - - - Port: - - - - - - - Acceptable ports range from 10 to 65535. Normally Ports below 1024 are reserved by your system. - - - 1024 - - - 65535 - - - 7812 - - - - - - - - - - Port: - - - - - - - Acceptable ports range from 10 to 65535. Normally ports below 1024 are reserved by your system. - - - 1024 - - - 65535 - - - 7812 - - - - - - - - - - - Automatic (UPnP) - - - - - Firewalled - - - - - Manually Forwarded Port - - - - - - + + - 200 - 0 + 16 + 16 - - <html><head/><body><p>The DHT allows you to answer connection requests from your friends using BitTorrent's DHT. It greatly improves the connectivity. No information is actually stored in the DHT. It is only used as a proxy system to get in touch with other Retroshare nodes.</p><p>The Discovery service sends node name and ids of your trusted contacts to connected peers, to help them choose new friends. The friendship is never automatic however, and both peers still need to trust each other to allow connection. </p></body></html> - - - - Public: DHT & Discovery - - - - - Private: Discovery Only - - - - - Inverted: DHT Only - - - - - Dark Net: None - - - - - - - - 6 - - - 6 - - - - - - 16 - 16 - - - - - - - :/images/ledoff1.png - - - - - - - <html><head/><body><p>The bullet turns green as soon as Retroshare manages to get your own IP from the websites listed below, if you enabled that action. Retroshare will also use other means to find out your own IP.</p></body></html> - - - External ip address finder - - - - - - - - - 6 - - - 6 - - - - - - 16 - 16 - - - - - - - :/images/ledoff1.png - - - - - - - Local network - - - - - - - - - - 0 - 0 - - - - <html><head/><body><p>The upload limit covers the entire software. Too small an upload limit might eventually block low priority services (forums, channels). A minimum recommended value is 50KB/s. </p></body></html> - - - kB/s - - + - - 1 - - - 100000 - - - 1 + + :/images/ledoff1.png - - - - 6 + + + + Local network - - 6 - - - - - - 16 - 16 - - - - - - - :/images/ledoff1.png - - - - - - - UPnP - - - - + - - - - 6 + + + + + + + 0 + 0 + + + + <html><head/><body><p>The upload limit covers the entire software. Too small an upload limit might eventually block low priority services (forums, channels). A minimum recommended value is 50KB/s. </p></body></html> + + + kB/s + + + + + + 1 + + + 100000 + + + 1 + + + + + + + 6 + + + 6 + + + + + + 16 + 16 + - - 6 + + - - - - - 16 - 16 - - - - - - - :/images/ledoff1.png - - - - - - - - 75 - true - - - - <html><head/><body><p>The bullet turns green as soon as Retroshare manages to get your own IP from the websites listed below, if you enabled that action. Retroshare will also use other means to find out your own IP.</p></body></html> - - - [Hidden mode] - - - - + + :/images/ledoff1.png + + + + + + + UPnP + + + + + + + + + 6 + + + 6 + + + + + + 16 + 16 + + + + + + + :/images/ledoff1.png + + + + + + + + 75 + true + + + + <html><head/><body><p>The bullet turns green as soon as Retroshare manages to get your own IP from the websites listed below, if you enabled that action. Retroshare will also use other means to find out your own IP.</p></body></html> + + + [Hidden mode] + + @@ -507,7 +503,7 @@ behind a firewall or a VPN. - + Qt::Vertical @@ -524,7 +520,6 @@ behind a firewall or a VPN. allowIpDeterminationCB IPServersLV ipAddressList - verticalSpacer @@ -543,11 +538,11 @@ behind a firewall or a VPN. 0 - + IP blacklist - + @@ -616,7 +611,7 @@ behind a firewall or a VPN. - + @@ -641,7 +636,7 @@ behind a firewall or a VPN. - + Qt::Horizontal @@ -657,11 +652,11 @@ behind a firewall or a VPN. - + IP whitelist - + @@ -780,7 +775,7 @@ behind a firewall or a VPN. - + Qt::Vertical diff --git a/retroshare-gui/src/gui/settings/rsettingswin.cpp b/retroshare-gui/src/gui/settings/rsettingswin.cpp index 3474de139..4d94a511b 100644 --- a/retroshare-gui/src/gui/settings/rsettingswin.cpp +++ b/retroshare-gui/src/gui/settings/rsettingswin.cpp @@ -92,7 +92,7 @@ SettingsPage::~SettingsPage() // } //} -/*static*/ void SettingsPage::showYourself(QWidget *parent, PageType page /* = LastPage*/) +/*static*/ void SettingsPage::showYourself(QWidget */*parent*/, PageType /*page = LastPage*/) { #ifdef TODO if(_instance == NULL) { diff --git a/retroshare-gui/src/retroshare-gui/configpage.h b/retroshare-gui/src/retroshare-gui/configpage.h index ecb292740..ca289bfe6 100644 --- a/retroshare-gui/src/retroshare-gui/configpage.h +++ b/retroshare-gui/src/retroshare-gui/configpage.h @@ -53,7 +53,7 @@ class ConfigPage : public QWidget virtual QString helpText() const = 0; private: - virtual bool save(QString &errmsg) { std::cerr << "(EE) save() shoud not be called!" << std::endl; return true;} + virtual bool save(QString &errmsg) { std::cerr << "(EE) save() shoud not be called!" << errmsg.toStdString() << std::endl; return true;} protected: virtual void showEvent(QShowEvent * /*event*/) {