From 1bcdcbd4c8e1c6c971087f049422d3bd52be2a6b Mon Sep 17 00:00:00 2001 From: Kevin Smith Date: Fri, 27 Jul 2018 13:57:18 +0100 Subject: 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 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; -- cgit v0.10.2-6-g49f6