diff --git a/vpn/l2tp/l2tpwidget.cpp b/vpn/l2tp/l2tpwidget.cpp
index da5725da..49e1e5cc 100644
--- a/vpn/l2tp/l2tpwidget.cpp
+++ b/vpn/l2tp/l2tpwidget.cpp
@@ -1,285 +1,285 @@
 /*
     Copyright 2013 Jan Grulich <jgrulich@redhat.com>
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Lesser General Public
     License as published by the Free Software Foundation; either
     version 2.1 of the License, or (at your option) version 3, or any
     later version accepted by the membership of KDE e.V. (or its
     successor approved by the membership of KDE e.V.), which shall
     act as a proxy defined in Section 6 of version 3 of the license.
 
     This library is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
     Lesser General Public License for more details.
 
     You should have received a copy of the GNU Lesser General Public
     License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "l2tpwidget.h"
 #include "l2tpadvancedwidget.h"
 #include "l2tppppwidget.h"
 #include "ui_l2tp.h"
 #include "nm-l2tp-service.h"
 
 #include <NetworkManagerQt/Setting>
 
 #include <QPointer>
 #include <QDBusMetaType>
 
 L2tpWidget::L2tpWidget(const NetworkManager::VpnSetting::Ptr &setting, QWidget* parent, Qt::WindowFlags f)
     : SettingWidget(setting, parent, f)
     , m_ui(new Ui::L2tpWidget)
     , m_setting(setting)
 {
     qDBusRegisterMetaType<NMStringMap>();
 
     m_ui->setupUi(this);
 
     m_ui->password->setPasswordOptionsEnabled(true);
 
     connect(m_ui->btnIPSecSettings, &QPushButton::clicked, this, &L2tpWidget::showAdvanced);
     connect(m_ui->btnPPPSettings, &QPushButton::clicked, this, &L2tpWidget::showPpp);
 
     // Connect for setting check
     watchChangedSetting();
 
     // Connect for validity check
     connect(m_ui->gateway, &QLineEdit::textChanged, this, &L2tpWidget::slotWidgetChanged);
     connect(m_ui->cbUseCertificate, &QCheckBox::stateChanged, this, &L2tpWidget::certStateChanged);
 
     KAcceleratorManager::manage(this);
 
     if (setting && !setting->isNull()) {
         loadConfig(setting);
     }
 }
 
 L2tpWidget::~L2tpWidget()
 {
     m_tmpAdvancedSetting.clear();
     m_tmpPppSetting.clear();
     delete m_ui;
 }
 
 void L2tpWidget::loadConfig(const NetworkManager::Setting::Ptr &setting)
 {
     Q_UNUSED(setting);
 
     const NMStringMap data = m_setting->data();
 
     if (data.contains(NM_L2TP_KEY_GATEWAY)) {
         m_ui->gateway->setText(data.value(NM_L2TP_KEY_GATEWAY));
     }
 
     if (data.contains(NM_L2TP_KEY_USER)) {
         m_ui->username->setText(data.value(NM_L2TP_KEY_USER));
     }
 
     const NetworkManager::Setting::SecretFlags userPassType = static_cast<NetworkManager::Setting::SecretFlags>(data.value(NM_L2TP_KEY_PASSWORD"-flags").toInt());
     if (userPassType.testFlag(NetworkManager::Setting::None)) {
         m_ui->password->setPasswordOption(PasswordField::StoreForAllUsers);
     } else if (userPassType.testFlag(NetworkManager::Setting::AgentOwned)) {
         m_ui->password->setPasswordOption(PasswordField::StoreForUser);
     } else {
         m_ui->password->setPasswordOption(PasswordField::AlwaysAsk);
     }
 
     if (data.contains(NM_L2TP_KEY_DOMAIN)) {
         m_ui->domain->setText(data.value(NM_L2TP_KEY_DOMAIN));
     }
 
     if (data.contains(NM_L2TP_KEY_CERT_CA)) {
         m_ui->urCACertificate->setText(data.value(NM_L2TP_KEY_CERT_CA));
     }
 
     if (data.contains(NM_L2TP_KEY_CERT_PUB)) {
         m_ui->urCertificate->setText(data.value(NM_L2TP_KEY_CERT_PUB));
     }
 
     if (data.contains(NM_L2TP_KEY_CERT_KEY)) {
         m_ui->urPrivateKey->setText(data.value(NM_L2TP_KEY_CERT_KEY));
     }
 
     if (data.value(NM_L2TP_KEY_USE_CERT) == QLatin1String("yes")) {
         m_ui->cbUseCertificate->setChecked(true);
     }
 
     loadSecrets(setting);
 }
 
 void L2tpWidget::loadSecrets(const NetworkManager::Setting::Ptr &setting)
 {
     NetworkManager::VpnSetting::Ptr vpnSetting = setting.staticCast<NetworkManager::VpnSetting>();
 
     if (vpnSetting) {
         const NMStringMap secrets = vpnSetting->secrets();
         const QString userPassword = secrets.value(NM_L2TP_KEY_PASSWORD);
         if (!userPassword.isEmpty()) {
             m_ui->password->setText(userPassword);
         }
     }
 }
 
 QVariantMap L2tpWidget::setting() const
 {
     NetworkManager::VpnSetting setting;
     setting.setServiceType(QLatin1String(NM_DBUS_SERVICE_L2TP));
     NMStringMap data;
     if (!m_tmpAdvancedSetting.isNull()) {
         data = m_tmpAdvancedSetting->data();
     } else {
         // retrieve the settings if the dialog has not been opened
-        QScopedPointer<L2tpAdvancedWidget> adv(new L2tpAdvancedWidget(m_setting, Q_NULLPTR));
+        QScopedPointer<L2tpAdvancedWidget> adv(new L2tpAdvancedWidget(m_setting, nullptr));
         data = adv->setting();
     }
 
     if (!m_tmpPppSetting.isNull()) {
         data.unite(m_tmpPppSetting->data());
     } else {
         // retrieve the settings if the dialog has not been opened
-        QScopedPointer<L2tpPPPWidget> ppp(new L2tpPPPWidget(m_setting, Q_NULLPTR));
+        QScopedPointer<L2tpPPPWidget> ppp(new L2tpPPPWidget(m_setting, nullptr));
         data.unite(ppp->setting());
     }
 
     NMStringMap secrets;
 
     if (!m_ui->gateway->text().isEmpty()) {
         data.insert(NM_L2TP_KEY_GATEWAY, m_ui->gateway->text());
     }
 
     if (m_ui->cbUseCertificate->isChecked()) {
         data.insert(NM_L2TP_KEY_USE_CERT, "yes");
 
         if (!m_ui->urCACertificate->text().isEmpty()) {
             data.insert(NM_L2TP_KEY_CERT_CA, m_ui->urCACertificate->text());
         }
 
         if (!m_ui->urCertificate->text().isEmpty()) {
             data.insert(NM_L2TP_KEY_CERT_PUB, m_ui->urCertificate->text());
         }
 
         if (!m_ui->urPrivateKey->text().isEmpty()) {
             data.insert(NM_L2TP_KEY_CERT_KEY, m_ui->urPrivateKey->text());
         }
 
         data.insert(NM_L2TP_KEY_PASSWORD"-flags", QString::number(NetworkManager::Setting::NotRequired));
 
     } else {
 
         if (!m_ui->username->text().isEmpty()) {
             data.insert(NM_L2TP_KEY_USER, m_ui->username->text());
         }
 
         if (m_ui->password->isEnabled() && !m_ui->password->text().isEmpty()) {
             secrets.insert(NM_L2TP_KEY_PASSWORD, m_ui->password->text());
         }
 
         switch (m_ui->password->passwordOption()) {
         case PasswordField::StoreForAllUsers:
             data.insert(NM_L2TP_KEY_PASSWORD"-flags", QString::number(NetworkManager::Setting::None));
             break;
         case PasswordField::StoreForUser:
             data.insert(NM_L2TP_KEY_PASSWORD"-flags", QString::number(NetworkManager::Setting::AgentOwned));
             break;
         default:
             data.insert(NM_L2TP_KEY_PASSWORD"-flags", QString::number(NetworkManager::Setting::NotSaved));
         };
 
         if (!m_ui->domain->text().isEmpty()) {
             data.insert(NM_L2TP_KEY_DOMAIN, m_ui->domain->text());
         }
     }
 
     setting.setData(data);
     setting.setSecrets(secrets);
     return setting.toMap();
 }
 
 
 void L2tpWidget::userPasswordTypeChanged(int index)
 {
     m_ui->password->setEnabled(index == SettingWidget::EnumPasswordStorageType::Store);
 }
 
 void L2tpWidget::showAdvanced()
 {
     QPointer<L2tpAdvancedWidget> adv;
     if (m_tmpAdvancedSetting.isNull()) {
         adv = new L2tpAdvancedWidget(m_setting, this);
     } else {
         adv = new L2tpAdvancedWidget(m_tmpAdvancedSetting, this);
     }
     connect(adv.data(), &L2tpAdvancedWidget::accepted,
             [adv, this] () {
                 NMStringMap advData = adv->setting();
                 if (!advData.isEmpty()) {
                     if (m_tmpAdvancedSetting.isNull()) {
                         m_tmpAdvancedSetting = NetworkManager::VpnSetting::Ptr(new NetworkManager::VpnSetting);
                     }
                     m_tmpAdvancedSetting->setData(advData);
                 }
             });
     connect(adv.data(), &L2tpAdvancedWidget::finished,
             [adv] () {
                 if (adv) {
                     adv->deleteLater();
                 }
             });
     adv->setModal(true);
     adv->show();
 }
 
 void L2tpWidget::showPpp()
 {
     QPointer<L2tpPPPWidget> adv;
     if (m_tmpPppSetting.isNull()) {
         adv = new L2tpPPPWidget(m_setting, this);
     } else {
         adv = new L2tpPPPWidget(m_tmpPppSetting, this);
     }
     connect(adv.data(), &L2tpPPPWidget::accepted,
             [adv, this] () {
                 NMStringMap advData = adv->setting();
                 if (!advData.isEmpty()) {
                     if (m_tmpPppSetting.isNull()) {
                         m_tmpPppSetting = NetworkManager::VpnSetting::Ptr(new NetworkManager::VpnSetting);
                     }
                     m_tmpPppSetting->setData(advData);
                 }
             });
     connect(adv.data(), &L2tpPPPWidget::finished,
             [adv] () {
                 if (adv) {
                     adv->deleteLater();
                 }
             });
     adv->setModal(true);
     adv->show();
 }
 
 bool L2tpWidget::isValid() const
 {
     return !m_ui->gateway->text().isEmpty();
 }
 
 void L2tpWidget::certStateChanged()
 {
     if (m_ui->cbUseCertificate->isChecked()) {
         m_ui->urCACertificate->setEnabled(true);
         m_ui->urCertificate->setEnabled(true);
         m_ui->urPrivateKey->setEnabled(true);
         m_ui->username->setEnabled(false);
         m_ui->password->setEnabled(false);
         m_ui->domain->setEnabled(false);
     } else {
         m_ui->urCACertificate->setEnabled(false);
         m_ui->urCertificate->setEnabled(false);
         m_ui->urPrivateKey->setEnabled(false);
         m_ui->username->setEnabled(true);
         m_ui->password->setEnabled(true);
         m_ui->domain->setEnabled(true);
     }
 }
diff --git a/vpn/openconnect/openconnectauthworkerthread.h b/vpn/openconnect/openconnectauthworkerthread.h
index bf944a45..1f539512 100644
--- a/vpn/openconnect/openconnectauthworkerthread.h
+++ b/vpn/openconnect/openconnectauthworkerthread.h
@@ -1,111 +1,111 @@
 /*
     Copyright 2011 Ilia Kats <ilia-kats@gmx.net>
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Lesser General Public
     License as published by the Free Software Foundation; either
     version 2.1 of the License, or (at your option) version 3, or any
     later version accepted by the membership of KDE e.V. (or its
     successor approved by the membership of KDE e.V.), which shall
     act as a proxy defined in Section 6 of version 3 of the license.
 
     This library is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
     Lesser General Public License for more details.
 
     You should have received a copy of the GNU Lesser General Public
     License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #ifndef OPENCONNECTAUTHWORKERTHREAD_H
 #define OPENCONNECTAUTHWORKERTHREAD_H
 
 extern "C" {
 #include <openconnect.h>
 }
 
 #if OPENCONNECT_API_VERSION_MAJOR == 1
 #define openconnect_vpninfo_new openconnect_vpninfo_new_with_cbdata
 #define openconnect_init_ssl openconnect_init_openssl
 #endif
 
 #ifndef OPENCONNECT_CHECK_VER
 #define OPENCONNECT_CHECK_VER(x,y) 0
 #endif
 
 #if !OPENCONNECT_CHECK_VER(1,5)
 struct x509_st;
 #define OPENCONNECT_X509 struct x509_st
 #define OPENCONNECT_OPENSSL
 #endif
 
 #if OPENCONNECT_CHECK_VER(3,0)
 #define NEWGROUP_SUPPORTED	1
 #define AUTHGROUP_OPT(form)	(void *)(form)->authgroup_opt
 #define AUTHGROUP_SELECTION(form) (form)->authgroup_selection
 #define FORMCHOICE(sopt, i)	((sopt)->choices[i])
 #define IGNORE_OPT(opt)		((opt)->flags & OC_FORM_OPT_IGNORE)
 #else
 #define NEWGROUP_SUPPORTED	0
-#define AUTHGROUP_OPT(form)	NULL
+#define AUTHGROUP_OPT(form)	nullptr
 #define AUTHGROUP_SELECTION(form) 0
 #define FORMCHOICE(sopt, i)	(&(sopt)->choices[i])
 #define IGNORE_OPT(opt)		0
 
 #define OC_FORM_RESULT_ERR	-1
 #define OC_FORM_RESULT_OK	0
 #define OC_FORM_RESULT_CANCELLED 1
 #define OC_FORM_RESULT_NEWGROUP	2
 #endif
 
 #if OPENCONNECT_CHECK_VER(4,0)
 #define OC3DUP(x)			(x)
 #else
 #define openconnect_set_option_value(opt, val) do { \
 		struct oc_form_opt *_o = (opt);				\
 		free(_o->value); _o->value = strdup(val);		\
 	} while (0)
 #define openconnect_free_cert_info(v, x) ::free(x)
 #define OC3DUP(x)			strdup(x)
 #endif
 
 #include <QThread>
 
 class QMutex;
 class QWaitCondition;
 struct openconnect_info;
 
 class OpenconnectAuthWorkerThread : public QThread
 {
     Q_OBJECT
     friend class OpenconnectAuthStaticWrapper;
 public:
     OpenconnectAuthWorkerThread(QMutex *, QWaitCondition *, bool *, bool *, int);
     ~OpenconnectAuthWorkerThread() override;
     struct openconnect_info* getOpenconnectInfo();
 
 Q_SIGNALS:
     void validatePeerCert(const QString &, const QString &, const QString &, bool*);
     void processAuthForm(struct oc_auth_form *);
     void updateLog(const QString &, const int&);
     void writeNewConfig(const QString &);
     void cookieObtained(const int&);
 
 protected:
     void run() override;
 
 private:
     int writeNewConfig(const char *, int);
     int validatePeerCert(void *, const char *);
     int processAuthFormP(struct oc_auth_form *);
     void writeProgress(int level, const char *, va_list);
 
     QMutex *m_mutex;
     QWaitCondition *m_waitForUserInput;
     bool *m_userDecidedToQuit;
     bool *m_formGroupChanged;
     struct openconnect_info *m_openconnectInfo;
 };
 
 #endif