From 0538c45fef79a9e9f7cd91b188cf9d10e641183d Mon Sep 17 00:00:00 2001 From: thunder2 Date: Mon, 20 Feb 2012 00:24:40 +0000 Subject: [PATCH] Fixed compiler warnings. Fixed tab order in config pages Directories and Server. git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4972 b45a01b8-16f6-495d-af2f-9b41ad6348cc --- .../src/gui/settings/DirectoriesPage.ui | 9 +++++++++ retroshare-gui/src/gui/settings/ServerPage.ui | 20 +++++++++++++++---- .../src/retroshare-gui/configpage.h | 4 ++-- 3 files changed, 27 insertions(+), 6 deletions(-) diff --git a/retroshare-gui/src/gui/settings/DirectoriesPage.ui b/retroshare-gui/src/gui/settings/DirectoriesPage.ui index 79238f049..da870cf76 100755 --- a/retroshare-gui/src/gui/settings/DirectoriesPage.ui +++ b/retroshare-gui/src/gui/settings/DirectoriesPage.ui @@ -730,8 +730,17 @@ you plug it in. + shareDownloadDirectoryCB + editShareButton + rememberHashesCB + rememberHashesSB + cleanHashCachePB + autoCheckDirectories_CB + autoCheckDirectoriesDelay_SB incomingDir incomingButton + partialsDir + partialButton diff --git a/retroshare-gui/src/gui/settings/ServerPage.ui b/retroshare-gui/src/gui/settings/ServerPage.ui index 28e473875..c80702b6f 100755 --- a/retroshare-gui/src/gui/settings/ServerPage.ui +++ b/retroshare-gui/src/gui/settings/ServerPage.ui @@ -842,10 +842,10 @@ behind a firewall or a VPN. <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">Warning</span></p> -<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-weight:600;"></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;"> </span>This tab contains hard-core parameters which are unlikely to need modification. Dont change them unless you really know what you're doing. </p></body></html> +</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:11pt; font-weight:600;">Warning</span></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Ubuntu'; font-size:11pt; font-weight:600;"></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:11pt; font-weight:600;"> </span><span style=" font-family:'Ubuntu'; font-size:11pt;">This tab contains hard-core parameters which are unlikely to need modification. Dont change them unless you really know what you're doing. </span></p></body></html> @@ -905,10 +905,22 @@ The default value is 20. + netModeComboBox + discComboBox + tabWidget localAddress localPort + extAddress extPort + dynDNS + allowTunnelConnectionCB + showDiscStatusBar totalDownloadRate + totalUploadRate + allowIpDeterminationCB + IPServersLV + textBrowser + _max_tr_up_per_sec_SB diff --git a/retroshare-gui/src/retroshare-gui/configpage.h b/retroshare-gui/src/retroshare-gui/configpage.h index a6245e1d3..8a4aa4545 100644 --- a/retroshare-gui/src/retroshare-gui/configpage.h +++ b/retroshare-gui/src/retroshare-gui/configpage.h @@ -29,7 +29,7 @@ class ConfigPage : public QWidget { public: /** Default Constructor */ - ConfigPage(QWidget *parent = 0, Qt::WFlags flags = 0) : loaded(false) {} + ConfigPage(QWidget *parent = 0, Qt::WFlags flags = 0) : QWidget(parent, flags), loaded(false) {} /** Pure virtual method. Subclassed pages load their config settings here. */ virtual void load() = 0; @@ -50,7 +50,7 @@ class ConfigPage : public QWidget virtual QString pageName() const = 0 ; protected: - virtual void showEvent(QShowEvent * event) + virtual void showEvent(QShowEvent * /*event*/) { if(!loaded) {