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
@@ -1,17 +1,17 @@
 /*
  * Copyright (c) 2012 Tobias Markmann
  * Licensed under the simplified BSD license.
  * See Documentation/Licenses/BSD-simplified.txt for more information.
  */
 
 /*
- * Copyright (c) 2016 Isode Limited.
+ * Copyright (c) 2016-2018 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
 #include <typeinfo>
 
 #include <QGridLayout>
@@ -30,19 +30,19 @@
             virtual int getAllowedInstances() const { \
                 return ALLOWED_INSTANCES; \
             } \
     \
             virtual QWidget* createFieldInstance(QWidget* parent, QGridLayout* layout, bool editable) const { \
                 return new FIELD_CLASS(parent, layout, editable); \
             } \
     \
             virtual bool testInstance(QWidget* widget) const { \
-                return dynamic_cast<FIELD_CLASS*>(widget) != 0; \
+                return dynamic_cast<FIELD_CLASS*>(widget) != nullptr; \
             } \
     };
 
 class QWidget;
 
 namespace Swift {
 
     class QtVCardFieldInfo {
         public:
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
@@ -1,17 +1,17 @@
 /*
  * Copyright (c) 2012 Tobias Markmann
  * Licensed under the simplified BSD license.
  * See Documentation/Licenses/BSD-simplified.txt for more information.
  */
 
 /*
- * Copyright (c) 2014-2016 Isode Limited.
+ * Copyright (c) 2014-2018 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #include <Swift/QtUI/QtVCardWidget/QtVCardWidget.h>
 
 #include <QLineEdit>
 #include <QMenu>
 
@@ -352,19 +352,19 @@ void QtVCardWidget::addFieldType(QMenu* menu, std::shared_ptr<QtVCardFieldInfo>
 
 int QtVCardWidget::fieldTypeInstances(std::shared_ptr<QtVCardFieldInfo> fieldType) {
     int instances = 0;
     for (int n = 0; n < ui->cardFields->count(); n++) {
         if (fieldType->testInstance(ui->cardFields->itemAt(n)->widget())) instances++;
     }
     return instances;
 }
 
-void layoutDeleteChildren(QLayout *layout) {
+static void layoutDeleteChildren(QLayout *layout) {
     while(layout->count() > 0) {
         QLayoutItem* child;
         if ((child = layout->takeAt(0)) != nullptr) {
             if (child->layout()) {
                 layoutDeleteChildren(child->layout());
             }
             if (dynamic_cast<QToolButton*>(child->widget())) {
                 delete child;
                 break;