summaryrefslogtreecommitdiffstats
path: root/Swift
diff options
context:
space:
mode:
authorKevin Smith <git@kismith.co.uk>2018-07-27 12:57:18 (GMT)
committerKevin Smith <git@kismith.co.uk>2018-07-27 12:58:12 (GMT)
commit1bcdcbd4c8e1c6c971087f049422d3bd52be2a6b (patch)
tree17e396e018cb3c6f9725d631342475f0ae212fc5 /Swift
parent18c30e6bdd219dc34963d8145d14ab8f81c5d3f8 (diff)
downloadswift-1bcdcbd4c8e1c6c971087f049422d3bd52be2a6b.zip
swift-1bcdcbd4c8e1c6c971087f049422d3bd52be2a6b.tar.bz2
Fix compiler warnings
This doesn't address the issue in ChattablesTest that the checks against 0 are being reported as checking null against 0 literals. Test-Information: Fewer warnings after the change (macOS). Change-Id: I24330f0ab99d6eb267e03a46983ced75e42c22cc
Diffstat (limited to 'Swift')
-rw-r--r--Swift/Controllers/Chat/UnitTest/ChattablesTest.cpp2
-rw-r--r--Swift/QtUI/QtFdpFormSubmitWindow.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/Swift/Controllers/Chat/UnitTest/ChattablesTest.cpp b/Swift/Controllers/Chat/UnitTest/ChattablesTest.cpp
index 6339ad9..e052aff 100644
--- a/Swift/Controllers/Chat/UnitTest/ChattablesTest.cpp
+++ b/Swift/Controllers/Chat/UnitTest/ChattablesTest.cpp
@@ -112,7 +112,7 @@ TEST_F(ChattablesTest, testSetState) {
JID returnedJID;
int returnedIndex;
int callsToChanged = 0;
- chattables_.onChanged.connect([this, &returnedJID, &returnedIndex, &callsToChanged](const JID& jid, int index){
+ chattables_.onChanged.connect([&returnedJID, &returnedIndex, &callsToChanged](const JID& jid, int index){
returnedJID = jid;
returnedIndex = index;
callsToChanged++;
diff --git a/Swift/QtUI/QtFdpFormSubmitWindow.h b/Swift/QtUI/QtFdpFormSubmitWindow.h
index c178a5b..b429927 100644
--- a/Swift/QtUI/QtFdpFormSubmitWindow.h
+++ b/Swift/QtUI/QtFdpFormSubmitWindow.h
@@ -32,7 +32,7 @@ namespace Swift {
public:
QtFdpFormSubmitWindow(QWidget* parent = nullptr);
- virtual ~QtFdpFormSubmitWindow();
+ virtual ~QtFdpFormSubmitWindow() override;
protected:
virtual void closeEvent(QCloseEvent* event) override;