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/FlowLayout.cpp | |
| 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/FlowLayout.cpp')
| -rw-r--r-- | Swift/QtUI/FlowLayout.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/Swift/QtUI/FlowLayout.cpp b/Swift/QtUI/FlowLayout.cpp index c42b7e1..8a12841 100644 --- a/Swift/QtUI/FlowLayout.cpp +++ b/Swift/QtUI/FlowLayout.cpp @@ -51,3 +51,2 @@ #include <QtWidgets> - #include "FlowLayout.h" @@ -110,3 +109,3 @@ QLayoutItem *FlowLayout::takeAt(int index) else - return 0; + return nullptr; } @@ -115,3 +114,3 @@ Qt::Orientations FlowLayout::expandingDirections() const { - return 0; + return nullptr; } @@ -194,3 +193,3 @@ int FlowLayout::smartSpacing(QStyle::PixelMetric pm) const QWidget *pw = static_cast<QWidget *>(parent); - return pw->style()->pixelMetric(pm, 0, pw); + return pw->style()->pixelMetric(pm, nullptr, pw); } else { |