diff 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/QtEmojisSelector.h | |
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/QtEmojisSelector.h')
-rw-r--r-- | Swift/QtUI/QtEmojisSelector.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Swift/QtUI/QtEmojisSelector.h b/Swift/QtUI/QtEmojisSelector.h index 7ac11d0..1a64cf4 100644 --- a/Swift/QtUI/QtEmojisSelector.h +++ b/Swift/QtUI/QtEmojisSelector.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2017 Isode Limited. + * Copyright (c) 2016-2018 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ @@ -20,7 +20,7 @@ namespace Swift { class QtEmojisSelector : public QTabWidget { Q_OBJECT public: - QtEmojisSelector(QSettings* settings, const std::map<std::string, std::string>& emoticonsMap, QWidget * parent = 0); + QtEmojisSelector(QSettings* settings, const std::map<std::string, std::string>& emoticonsMap, QWidget* parent = nullptr); ~QtEmojisSelector(); public slots: |