Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2018-05-03 19:03:38 (GMT) |
|---|---|---|
| committer | Kevin Smith <kevin.smith@isode.com> | 2018-05-04 09:01:08 (GMT) |
| commit | 202c114d6b1daa1ea1d4693c434bd8daabd41ad1 (patch) | |
| tree | f00855f5d3bb2aee0e420b0b848b31ec69dbed44 /Swift/QtUI/QtVCardWidget | |
| parent | a74aa7d27f6f5b1ddcb152fb69d00044594374af (diff) | |
| download | swift-202c114d6b1daa1ea1d4693c434bd8daabd41ad1.zip swift-202c114d6b1daa1ea1d4693c434bd8daabd41ad1.tar.bz2 | |
Fix issues raised by some warnings and reenable them in Swift
Test-Information:
Builds and test pass on macOS 10.13.4 with clang trunk.
Change-Id: Ib4826c38a85fd2097137c09014ba4da6c98879da
Diffstat (limited to 'Swift/QtUI/QtVCardWidget')
| -rw-r--r-- | Swift/QtUI/QtVCardWidget/QtVCardFieldInfo.h | 4 | ||||
| -rw-r--r-- | Swift/QtUI/QtVCardWidget/QtVCardWidget.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/Swift/QtUI/QtVCardWidget/QtVCardFieldInfo.h b/Swift/QtUI/QtVCardWidget/QtVCardFieldInfo.h index 093357a..fa42c49 100644 --- a/Swift/QtUI/QtVCardWidget/QtVCardFieldInfo.h +++ b/Swift/QtUI/QtVCardWidget/QtVCardFieldInfo.h @@ -5,7 +5,7 @@ */ /* - * Copyright (c) 2016 Isode Limited. + * Copyright (c) 2016-2018 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ @@ -36,7 +36,7 @@ } \ \ virtual bool testInstance(QWidget* widget) const { \ - return dynamic_cast<FIELD_CLASS*>(widget) != 0; \ + return dynamic_cast<FIELD_CLASS*>(widget) != nullptr; \ } \ }; diff --git a/Swift/QtUI/QtVCardWidget/QtVCardWidget.cpp b/Swift/QtUI/QtVCardWidget/QtVCardWidget.cpp index 290feca..1cd5505 100644 --- a/Swift/QtUI/QtVCardWidget/QtVCardWidget.cpp +++ b/Swift/QtUI/QtVCardWidget/QtVCardWidget.cpp @@ -5,7 +5,7 @@ */ /* - * Copyright (c) 2014-2016 Isode Limited. + * Copyright (c) 2014-2018 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ @@ -358,7 +358,7 @@ int QtVCardWidget::fieldTypeInstances(std::shared_ptr<QtVCardFieldInfo> fieldTyp return instances; } -void layoutDeleteChildren(QLayout *layout) { +static void layoutDeleteChildren(QLayout *layout) { while(layout->count() > 0) { QLayoutItem* child; if ((child = layout->takeAt(0)) != nullptr) { |