[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [plasma-nm] /: Use nullptr
From: Friedrich W. H. Kossebau <null () kde ! org>
Date: 2018-06-30 14:04:21
Message-ID: E1fZGU9-0001Bd-9e () code ! kde ! org
[Download RAW message or body]
Git commit 6bfec59d82f3eb12c044c99c42ae39cbd4763ac5 by Friedrich W. H. Kossebau.
Committed on 30/06/2018 at 13:56.
Pushed by kossebau into branch 'master'.
Use nullptr
M +1 -1 kcm/kcm.cpp
M +1 -1 kded/bluetoothmonitor.cpp
M +2 -2 kded/modemmonitor.cpp
M +1 -1 kded/notification.h
M +2 -2 kded/passworddialog.cpp
M +1 -1 kded/passworddialog.h
M +1 -1 kded/pindialog.h
M +9 -9 kded/secretagent.cpp
M +2 -2 kded/secretagent.h
M +1 -1 libs/declarative/availabledevices.h
M +4 -4 libs/declarative/connectionicon.cpp
M +1 -1 libs/declarative/connectionicon.h
M +1 -1 libs/declarative/enabledconnections.h
M +1 -1 libs/declarative/enums.h
M +1 -1 libs/declarative/networkstatus.h
M +1 -1 libs/editor/connectioneditorbase.cpp
M +1 -1 libs/editor/settings/bondwidget.h
M +1 -1 libs/editor/settings/bridgewidget.h
M +1 -1 libs/editor/settings/btwidget.h
M +1 -1 libs/editor/settings/cdmawidget.h
M +1 -1 libs/editor/settings/connectionwidget.h
M +1 -1 libs/editor/settings/gsmwidget.h
M +1 -1 libs/editor/settings/infinibandwidget.h
M +1 -1 libs/editor/settings/ipv4widget.h
M +1 -1 libs/editor/settings/ipv6widget.h
M +1 -1 libs/editor/settings/pppoewidget.h
M +1 -1 libs/editor/settings/pppwidget.h
M +1 -1 libs/editor/settings/security802-1x.h
M +1 -1 libs/editor/settings/teamwidget.h
M +1 -1 libs/editor/settings/vlanwidget.h
M +1 -1 libs/editor/settings/wificonnectionwidget.h
M +1 -1 libs/editor/settings/wifisecurity.h
M +1 -1 libs/editor/settings/wiredconnectionwidget.h
M +1 -1 libs/editor/settings/wiredsecurity.h
M +1 -1 libs/editor/simpleipv4addressvalidator.cpp
M +1 -1 libs/editor/simpleipv6addressvalidator.cpp
M +3 -3 libs/editor/vpnuiplugin.h
M +2 -2 libs/editor/widgets/advancedpermissionswidget.h
M +1 -1 libs/editor/widgets/bssidcombobox.h
M +1 -1 libs/editor/widgets/delegate.h
M +1 -1 libs/editor/widgets/hwaddrcombobox.h
M +2 -2 libs/editor/widgets/intdelegate.h
M +1 -1 libs/editor/widgets/ipv4delegate.h
M +1 -1 libs/editor/widgets/ipv4routeswidget.h
M +1 -1 libs/editor/widgets/ipv6delegate.h
M +1 -1 libs/editor/widgets/ipv6routeswidget.h
M +2 -2 libs/editor/widgets/mobileconnectionwizard.cpp
M +1 -1 libs/editor/widgets/mobileconnectionwizard.h
M +1 -1 libs/editor/widgets/passwordfield.h
M +1 -1 libs/editor/widgets/settingwidget.h
M +1 -1 libs/editor/widgets/ssidcombobox.h
M +2 -2 libs/handler.cpp
M +1 -1 libs/handler.h
M +1 -1 libs/models/appletproxymodel.h
M +3 -3 libs/models/creatableconnectionsmodel.h
M +1 -1 libs/models/editorproxymodel.h
M +1 -1 libs/models/kcmidentitymodel.h
M +1 -1 libs/models/networkitemslist.h
M +1 -1 libs/models/networkmodel.cpp
M +1 -1 libs/models/networkmodel.h
M +2 -2 libs/models/networkmodelitem.h
M +2 -2 vpn/fortisslvpn/fortisslvpn.h
M +1 -1 vpn/fortisslvpn/fortisslvpnwidget.h
M +2 -2 vpn/iodine/iodine.h
M +1 -1 vpn/iodine/iodinewidget.h
M +3 -3 vpn/l2tp/l2tp.h
M +1 -1 vpn/l2tp/l2tpadvancedwidget.h
M +1 -1 vpn/l2tp/l2tpauth.h
M +2 -2 vpn/l2tp/l2tppppwidget.cpp
M +1 -1 vpn/l2tp/l2tppppwidget.h
M +1 -1 vpn/l2tp/l2tpwidget.h
M +2 -2 vpn/openconnect/openconnectauth.cpp
M +1 -1 vpn/openconnect/openconnectauth.h
M +1 -1 vpn/openconnect/openconnectauthworkerthread.cpp
M +3 -3 vpn/openconnect/openconnectui.h
M +1 -1 vpn/openconnect/openconnectwidget.h
M +3 -3 vpn/openswan/openswan.h
M +1 -1 vpn/openswan/openswanauth.h
M +1 -1 vpn/openswan/openswanwidget.h
M +21 -21 vpn/openvpn/openvpn.cpp
M +3 -3 vpn/openvpn/openvpn.h
M +2 -2 vpn/openvpn/openvpnadvancedwidget.cpp
M +1 -1 vpn/openvpn/openvpnadvancedwidget.h
M +1 -1 vpn/openvpn/openvpnauth.h
M +1 -1 vpn/openvpn/openvpnwidget.h
M +3 -3 vpn/pptp/pptp.h
M +1 -1 vpn/pptp/pptpauth.h
M +2 -2 vpn/pptp/pptpwidget.cpp
M +1 -1 vpn/pptp/pptpwidget.h
M +3 -3 vpn/ssh/ssh.h
M +1 -1 vpn/ssh/sshauth.h
M +1 -1 vpn/ssh/sshwidget.h
M +3 -3 vpn/sstp/sstp.h
M +1 -1 vpn/sstp/sstpauth.h
M +2 -2 vpn/sstp/sstpwidget.cpp
M +1 -1 vpn/sstp/sstpwidget.h
M +3 -3 vpn/strongswan/strongswan.h
M +1 -1 vpn/strongswan/strongswanauth.cpp
M +1 -1 vpn/strongswan/strongswanauth.h
M +1 -1 vpn/strongswan/strongswanwidget.h
M +4 -4 vpn/vpnc/vpnc.cpp
M +3 -3 vpn/vpnc/vpnc.h
M +1 -1 vpn/vpnc/vpncadvancedwidget.h
M +1 -1 vpn/vpnc/vpncauth.h
M +1 -1 vpn/vpnc/vpncwidget.h
https://commits.kde.org/plasma-nm/6bfec59d82f3eb12c044c99c42ae39cbd4763ac5
diff --git a/kcm/kcm.cpp b/kcm/kcm.cpp
index 88e9b244..a8ff4846 100755
--- a/kcm/kcm.cpp
+++ b/kcm/kcm.cpp
@@ -68,7 +68,7 @@ KCMNetworkmanagement::KCMNetworkmanagement(QWidget *parent, const \
QVariantList & QWidget *mainWidget = new QWidget(this);
m_ui->setupUi(mainWidget);
- m_quickView = new QQuickView(0);
+ m_quickView = new QQuickView(nullptr);
KDeclarative::KDeclarative kdeclarative;
kdeclarative.setDeclarativeEngine(m_quickView->engine());
kdeclarative.setTranslationDomain(QStringLiteral(TRANSLATION_DOMAIN));
diff --git a/kded/bluetoothmonitor.cpp b/kded/bluetoothmonitor.cpp
index 6e12e8e4..99d85fbc 100644
--- a/kded/bluetoothmonitor.cpp
+++ b/kded/bluetoothmonitor.cpp
@@ -79,7 +79,7 @@ void BluetoothMonitor::addBluetoothConnection(const QString \
&bdAddr, const QStri }
if (service != QLatin1String("dun") && service != QLatin1String("nap")) {
- KMessageBox::sorry(0, i18n("Only 'dun' and 'nap' services are supported."));
+ KMessageBox::sorry(nullptr, i18n("Only 'dun' and 'nap' services are \
supported.")); return;
}
diff --git a/kded/modemmonitor.cpp b/kded/modemmonitor.cpp
index 1075f168..27eee8a8 100644
--- a/kded/modemmonitor.cpp
+++ b/kded/modemmonitor.cpp
@@ -165,7 +165,7 @@ void ModemMonitor::requestPin(MMModemLock lock)
return;
}
- QDBusPendingCallWatcher *watcher = 0;
+ QDBusPendingCallWatcher *watcher = nullptr;
PinDialog::Type type = d->dialog.data()->type();
@@ -201,7 +201,7 @@ void ModemMonitor::onSendPinArrived(QDBusPendingCallWatcher * \
watcher)
// Automatically enabling this for cell phones with expensive data plans is \
not a good idea. //NetworkManager::setWwanEnabled(true);
} else {
- KMessageBox::error(0, i18nc("Text in GSM PIN/PUK unlock error dialog", \
"Error unlocking modem: %1", reply.error().message()), + \
KMessageBox::error(nullptr, i18nc("Text in GSM PIN/PUK unlock error dialog", "Error \
unlocking modem: %1", reply.error().message()),
i18nc("Title for GSM PIN/PUK unlock error dialog", \
"PIN/PUK unlock error")); }
diff --git a/kded/notification.h b/kded/notification.h
index e9f2ba40..07b7f2ad 100644
--- a/kded/notification.h
+++ b/kded/notification.h
@@ -36,7 +36,7 @@ class Notification : public QObject
{
Q_OBJECT
public:
- explicit Notification(QObject *parent = 0);
+ explicit Notification(QObject *parent = nullptr);
private Q_SLOTS:
void deviceAdded(const QString &uni);
diff --git a/kded/passworddialog.cpp b/kded/passworddialog.cpp
index 5db577c8..410d7085 100644
--- a/kded/passworddialog.cpp
+++ b/kded/passworddialog.cpp
@@ -41,13 +41,13 @@ using namespace NetworkManager;
PasswordDialog::PasswordDialog(const NetworkManager::ConnectionSettings::Ptr \
&connectionSettings, SecretAgent::GetSecretsFlags flags,
const QString &setting_name, QWidget *parent) :
QDialog(parent),
- m_ui(0),
+ m_ui(nullptr),
m_hasError(false),
m_settingName(setting_name),
m_connectionSettings(connectionSettings),
m_error(SecretAgent::NoSecrets),
m_flags(flags),
- m_vpnWidget(0)
+ m_vpnWidget(nullptr)
{
setWindowIcon(QIcon::fromTheme(QStringLiteral("dialog-password")));
diff --git a/kded/passworddialog.h b/kded/passworddialog.h
index 27293312..4f95f465 100644
--- a/kded/passworddialog.h
+++ b/kded/passworddialog.h
@@ -40,7 +40,7 @@ public:
explicit PasswordDialog(const NetworkManager::ConnectionSettings::Ptr \
&connectionSettings,
NetworkManager::SecretAgent::GetSecretsFlags flags,
const QString &setting_name,
- QWidget *parent = 0);
+ QWidget *parent = nullptr);
~PasswordDialog() override;
bool hasError() const;
diff --git a/kded/pindialog.h b/kded/pindialog.h
index fb813b76..9970a44c 100644
--- a/kded/pindialog.h
+++ b/kded/pindialog.h
@@ -56,7 +56,7 @@ public:
};
enum ErrorCode {PinCodeTooShort, PinCodesDoNotMatch, PukCodeTooShort};
- explicit PinDialog(ModemManager::Modem *modem, const Type type = SimPin, QWidget \
*parent=0); + explicit PinDialog(ModemManager::Modem *modem, const Type type = \
SimPin, QWidget *parent = nullptr); ~PinDialog() override;
Type type() const;
diff --git a/kded/secretagent.cpp b/kded/secretagent.cpp
index c53f7413..2f7d8092 100644
--- a/kded/secretagent.cpp
+++ b/kded/secretagent.cpp
@@ -46,8 +46,8 @@
SecretAgent::SecretAgent(QObject* parent)
: NetworkManager::SecretAgent("org.kde.plasma.networkmanagement", parent)
, m_openWalletFailed(false)
- , m_wallet(0)
- , m_dialog(0)
+ , m_wallet(nullptr)
+ , m_dialog(nullptr)
{
connect(NetworkManager::notifier(), \
&NetworkManager::Notifier::serviceDisappeared, this, &SecretAgent::killDialogs);
@@ -142,7 +142,7 @@ void SecretAgent::CancelGetSecrets(const QDBusObjectPath \
&connection_path, const SecretsRequest request = m_calls.at(i);
if (request.type == SecretsRequest::GetSecrets && callId == request.callId) \
{ if (m_dialog == request.dialog) {
- m_dialog = 0;
+ m_dialog = nullptr;
}
delete request.dialog;
sendError(SecretAgent::AgentCanceled,
@@ -256,7 +256,7 @@ void SecretAgent::dialogAccepted()
}
m_dialog->deleteLater();
- m_dialog = 0;
+ m_dialog = nullptr;
processNext();
}
@@ -275,7 +275,7 @@ void SecretAgent::dialogRejected()
}
m_dialog->deleteLater();
- m_dialog = 0;
+ m_dialog = nullptr;
processNext();
}
@@ -299,7 +299,7 @@ void SecretAgent::walletOpened(bool success)
if (!success) {
m_openWalletFailed = true;
m_wallet->deleteLater();
- m_wallet = 0;
+ m_wallet = nullptr;
} else {
m_openWalletFailed = false;
}
@@ -312,7 +312,7 @@ void SecretAgent::walletClosed()
if (m_wallet) {
m_wallet->deleteLater();
}
- m_wallet = 0;
+ m_wallet = nullptr;
}
void SecretAgent::processNext()
@@ -391,7 +391,7 @@ bool SecretAgent::processGetSecrets(SecretsRequest &request) \
const m_dialog->errorMessage(),
request.message);
delete m_dialog;
- m_dialog = 0;
+ m_dialog = nullptr;
return true;
} else {
request.dialog = m_dialog;
@@ -525,7 +525,7 @@ bool SecretAgent::useWallet() const
}
} else if (m_wallet) {
m_wallet->deleteLater();
- m_wallet = 0;
+ m_wallet = nullptr;
}
return false;
diff --git a/kded/secretagent.h b/kded/secretagent.h
index b632c642..4228f514 100644
--- a/kded/secretagent.h
+++ b/kded/secretagent.h
@@ -42,7 +42,7 @@ public:
type(_type),
flags(NetworkManager::SecretAgent::None),
saveSecretsWithoutReply(false),
- dialog(0)
+ dialog(nullptr)
{}
inline bool operator==(const QString &other) const {
return callId == other;
@@ -69,7 +69,7 @@ class Q_DECL_EXPORT SecretAgent : public \
NetworkManager::SecretAgent {
Q_OBJECT
public:
- explicit SecretAgent(QObject* parent = 0);
+ explicit SecretAgent(QObject* parent = nullptr);
~SecretAgent() override;
public Q_SLOTS:
diff --git a/libs/declarative/availabledevices.h \
b/libs/declarative/availabledevices.h index fbbdf397..7a65988f 100644
--- a/libs/declarative/availabledevices.h
+++ b/libs/declarative/availabledevices.h
@@ -47,7 +47,7 @@ Q_PROPERTY(bool modemDeviceAvailable READ isModemDeviceAvailable \
NOTIFY modemDev Q_PROPERTY(bool bluetoothDeviceAvailable READ \
isBluetoothDeviceAvailable NOTIFY bluetoothDeviceAvailableChanged) Q_OBJECT
public:
- explicit AvailableDevices(QObject* parent = 0);
+ explicit AvailableDevices(QObject* parent = nullptr);
~AvailableDevices() override;
public Q_SLOTS:
diff --git a/libs/declarative/connectionicon.cpp \
b/libs/declarative/connectionicon.cpp index b792f924..1d1c0a9e 100644
--- a/libs/declarative/connectionicon.cpp
+++ b/libs/declarative/connectionicon.cpp
@@ -39,13 +39,13 @@
ConnectionIcon::ConnectionIcon(QObject* parent)
: QObject(parent)
, m_signal(0)
- , m_wirelessNetwork(0)
+ , m_wirelessNetwork(nullptr)
, m_connecting(false)
, m_limited(false)
, m_vpn(false)
, m_airplaneMode(false)
#if WITH_MODEMMANAGER_SUPPORT
- , m_modemNetwork(0)
+ , m_modemNetwork(nullptr)
#endif
{
connect(NetworkManager::notifier(), \
&NetworkManager::Notifier::primaryConnectionChanged, this, \
&ConnectionIcon::primaryConnectionChanged); @@ -303,12 +303,12 @@ void \
ConnectionIcon::setIcons() m_signal = 0;
#if WITH_MODEMMANAGER_SUPPORT
if (m_modemNetwork) {
- disconnect(m_modemNetwork.data(), 0, this, 0);
+ disconnect(m_modemNetwork.data(), nullptr, this, nullptr);
m_modemNetwork.clear();
}
#endif
if (m_wirelessNetwork) {
- disconnect(m_wirelessNetwork.data(), 0, this, 0);
+ disconnect(m_wirelessNetwork.data(), nullptr, this, nullptr);
m_wirelessNetwork.clear();
}
diff --git a/libs/declarative/connectionicon.h b/libs/declarative/connectionicon.h
index 33b0c28e..742127df 100644
--- a/libs/declarative/connectionicon.h
+++ b/libs/declarative/connectionicon.h
@@ -38,7 +38,7 @@ Q_PROPERTY(QString connectionTooltipIcon READ connectionTooltipIcon \
NOTIFY conne Q_PROPERTY(bool airplaneMode READ airplaneMode WRITE setAirplaneMode \
NOTIFY airplaneModeChanged) Q_OBJECT
public:
- explicit ConnectionIcon(QObject* parent = 0);
+ explicit ConnectionIcon(QObject* parent = nullptr);
~ConnectionIcon() override;
bool connecting() const;
diff --git a/libs/declarative/enabledconnections.h \
b/libs/declarative/enabledconnections.h index ae64e3cf..bf461436 100644
--- a/libs/declarative/enabledconnections.h
+++ b/libs/declarative/enabledconnections.h
@@ -49,7 +49,7 @@ Q_PROPERTY(bool wwanEnabled READ isWwanEnabled NOTIFY wwanEnabled)
Q_PROPERTY(bool wwanHwEnabled READ isWwanHwEnabled NOTIFY wwanHwEnabled)
Q_OBJECT
public:
- explicit EnabledConnections(QObject* parent = 0);
+ explicit EnabledConnections(QObject* parent = nullptr);
~EnabledConnections() override;
bool isNetworkingEnabled() const;
diff --git a/libs/declarative/enums.h b/libs/declarative/enums.h
index 1c29fdc2..685a730b 100644
--- a/libs/declarative/enums.h
+++ b/libs/declarative/enums.h
@@ -31,7 +31,7 @@ Q_ENUMS(ConnectionType)
Q_ENUMS(SecurityType)
public:
- explicit Enums(QObject* parent = 0);
+ explicit Enums(QObject* parent = nullptr);
~Enums() override;
enum ConnectionStatus {
diff --git a/libs/declarative/networkstatus.h b/libs/declarative/networkstatus.h
index b20b7e56..8c03682f 100644
--- a/libs/declarative/networkstatus.h
+++ b/libs/declarative/networkstatus.h
@@ -52,7 +52,7 @@ public:
static SortedConnectionType \
connectionTypeToSortedType(NetworkManager::ConnectionSettings::ConnectionType type); \
- explicit NetworkStatus(QObject* parent = 0);
+ explicit NetworkStatus(QObject* parent = nullptr);
~NetworkStatus() override;
QString activeConnections() const;
diff --git a/libs/editor/connectioneditorbase.cpp \
b/libs/editor/connectioneditorbase.cpp index 6e423a53..8f9eb644 100644
--- a/libs/editor/connectioneditorbase.cpp
+++ b/libs/editor/connectioneditorbase.cpp
@@ -242,7 +242,7 @@ void ConnectionEditorBase::initialize()
addSettingWidget(teamWidget, i18n("Team"));
} else if (type == NetworkManager::ConnectionSettings::Vpn) { // VPN
QString error;
- VpnUiPlugin *vpnPlugin = 0;
+ VpnUiPlugin *vpnPlugin = nullptr;
NetworkManager::VpnSetting::Ptr vpnSetting =
m_connection->setting(NetworkManager::Setting::Vpn).staticCast<NetworkManager::VpnSetting>();
if (!vpnSetting) {
diff --git a/libs/editor/settings/bondwidget.h b/libs/editor/settings/bondwidget.h
index d58323bf..24a8cdfc 100644
--- a/libs/editor/settings/bondwidget.h
+++ b/libs/editor/settings/bondwidget.h
@@ -40,7 +40,7 @@ class Q_DECL_EXPORT BondWidget : public SettingWidget
Q_OBJECT
public:
explicit BondWidget(const QString & masterUuid, const \
NetworkManager::Setting::Ptr &setting = \
NetworkManager::Setting::Ptr(),
- QWidget* parent = 0, Qt::WindowFlags f = 0);
+ QWidget* parent = nullptr, Qt::WindowFlags f = {});
~BondWidget() override;
void loadConfig(const NetworkManager::Setting::Ptr &setting) override;
diff --git a/libs/editor/settings/bridgewidget.h \
b/libs/editor/settings/bridgewidget.h index 13e0e878..2e04b9e3 100644
--- a/libs/editor/settings/bridgewidget.h
+++ b/libs/editor/settings/bridgewidget.h
@@ -40,7 +40,7 @@ class Q_DECL_EXPORT BridgeWidget : public SettingWidget
Q_OBJECT
public:
explicit BridgeWidget(const QString & masterUuid, const \
NetworkManager::Setting::Ptr &setting = \
NetworkManager::Setting::Ptr(),
- QWidget* parent = 0, Qt::WindowFlags f = 0);
+ QWidget* parent = nullptr, Qt::WindowFlags f = {});
~BridgeWidget() override;
void loadConfig(const NetworkManager::Setting::Ptr &setting) override;
diff --git a/libs/editor/settings/btwidget.h b/libs/editor/settings/btwidget.h
index ed89b8f0..f3b53ed7 100644
--- a/libs/editor/settings/btwidget.h
+++ b/libs/editor/settings/btwidget.h
@@ -36,7 +36,7 @@ class Q_DECL_EXPORT BtWidget : public SettingWidget
{
Q_OBJECT
public:
- explicit BtWidget(const NetworkManager::Setting::Ptr &setting = \
NetworkManager::Setting::Ptr(), QWidget* parent = 0, Qt::WindowFlags f = 0); + \
explicit BtWidget(const NetworkManager::Setting::Ptr &setting = \
NetworkManager::Setting::Ptr(), QWidget* parent = nullptr, Qt::WindowFlags f = {}); \
~BtWidget() override;
void loadConfig(const NetworkManager::Setting::Ptr &setting) override;
diff --git a/libs/editor/settings/cdmawidget.h b/libs/editor/settings/cdmawidget.h
index ee7ebf6b..e9d259e0 100644
--- a/libs/editor/settings/cdmawidget.h
+++ b/libs/editor/settings/cdmawidget.h
@@ -36,7 +36,7 @@ class Q_DECL_EXPORT CdmaWidget : public SettingWidget
{
Q_OBJECT
public:
- explicit CdmaWidget(const NetworkManager::Setting::Ptr &setting = \
NetworkManager::Setting::Ptr(), QWidget *parent = 0, Qt::WindowFlags f = 0); + \
explicit CdmaWidget(const NetworkManager::Setting::Ptr &setting = \
NetworkManager::Setting::Ptr(), QWidget *parent = nullptr, Qt::WindowFlags f = {}); \
~CdmaWidget() override;
void loadConfig(const NetworkManager::Setting::Ptr &setting) override;
diff --git a/libs/editor/settings/connectionwidget.h \
b/libs/editor/settings/connectionwidget.h index 6f2be88b..3f3f9b2a 100644
--- a/libs/editor/settings/connectionwidget.h
+++ b/libs/editor/settings/connectionwidget.h
@@ -36,7 +36,7 @@ Q_OBJECT
public:
explicit ConnectionWidget(const NetworkManager::ConnectionSettings::Ptr \
&settings = NetworkManager::ConnectionSettings::Ptr(),
- QWidget* parent = 0, Qt::WindowFlags f = 0);
+ QWidget* parent = nullptr, Qt::WindowFlags f = {});
~ConnectionWidget() override;
void loadConfig(const NetworkManager::ConnectionSettings::Ptr &settings);
diff --git a/libs/editor/settings/gsmwidget.h b/libs/editor/settings/gsmwidget.h
index a99b4ee5..ea16c476 100644
--- a/libs/editor/settings/gsmwidget.h
+++ b/libs/editor/settings/gsmwidget.h
@@ -36,7 +36,7 @@ class Q_DECL_EXPORT GsmWidget : public SettingWidget
{
Q_OBJECT
public:
- explicit GsmWidget(const NetworkManager::Setting::Ptr &setting = \
NetworkManager::Setting::Ptr(), QWidget *parent = 0, Qt::WindowFlags f = 0); + \
explicit GsmWidget(const NetworkManager::Setting::Ptr &setting = \
NetworkManager::Setting::Ptr(), QWidget *parent = nullptr, Qt::WindowFlags f = {}); \
~GsmWidget() override;
void loadConfig(const NetworkManager::Setting::Ptr &setting) override;
diff --git a/libs/editor/settings/infinibandwidget.h \
b/libs/editor/settings/infinibandwidget.h index e060473e..9e8e90b7 100644
--- a/libs/editor/settings/infinibandwidget.h
+++ b/libs/editor/settings/infinibandwidget.h
@@ -36,7 +36,7 @@ class Q_DECL_EXPORT InfinibandWidget : public SettingWidget
{
Q_OBJECT
public:
- explicit InfinibandWidget(const NetworkManager::Setting::Ptr &setting = \
NetworkManager::Setting::Ptr(), QWidget* parent = 0, Qt::WindowFlags f = 0); + \
explicit InfinibandWidget(const NetworkManager::Setting::Ptr &setting = \
NetworkManager::Setting::Ptr(), QWidget* parent = nullptr, Qt::WindowFlags f = {}); \
~InfinibandWidget() override;
void loadConfig(const NetworkManager::Setting::Ptr &setting) override;
diff --git a/libs/editor/settings/ipv4widget.h b/libs/editor/settings/ipv4widget.h
index a4f28081..b88771ed 100644
--- a/libs/editor/settings/ipv4widget.h
+++ b/libs/editor/settings/ipv4widget.h
@@ -38,7 +38,7 @@ Q_OBJECT
public:
enum MethodIndex { Automatic = 0, AutomaticOnlyIP, LinkLocal, Manual, Shared, \
Disabled };
- explicit IPv4Widget(const NetworkManager::Setting::Ptr &setting = \
NetworkManager::Setting::Ptr(), QWidget* parent = 0, Qt::WindowFlags f = 0); + \
explicit IPv4Widget(const NetworkManager::Setting::Ptr &setting = \
NetworkManager::Setting::Ptr(), QWidget* parent = nullptr, Qt::WindowFlags f = {}); \
~IPv4Widget() override;
void loadConfig(const NetworkManager::Setting::Ptr &setting) override;
diff --git a/libs/editor/settings/ipv6widget.h b/libs/editor/settings/ipv6widget.h
index 3836cbc3..4dc80ba2 100644
--- a/libs/editor/settings/ipv6widget.h
+++ b/libs/editor/settings/ipv6widget.h
@@ -38,7 +38,7 @@ Q_OBJECT
public:
enum MethodIndex { Automatic = 0, AutomaticOnlyIP, AutomaticOnlyDHCP, LinkLocal, \
Manual, Disabled };
- explicit IPv6Widget(const NetworkManager::Setting::Ptr &setting = \
NetworkManager::Setting::Ptr(), QWidget* parent = 0, Qt::WindowFlags f = 0); + \
explicit IPv6Widget(const NetworkManager::Setting::Ptr &setting = \
NetworkManager::Setting::Ptr(), QWidget* parent = nullptr, Qt::WindowFlags f = {}); \
~IPv6Widget() override;
void loadConfig(const NetworkManager::Setting::Ptr &setting) override;
diff --git a/libs/editor/settings/pppoewidget.h b/libs/editor/settings/pppoewidget.h
index 382d1d52..a3ee7ba6 100644
--- a/libs/editor/settings/pppoewidget.h
+++ b/libs/editor/settings/pppoewidget.h
@@ -36,7 +36,7 @@ class Q_DECL_EXPORT PppoeWidget : public SettingWidget
{
Q_OBJECT
public:
- explicit PppoeWidget(const NetworkManager::Setting::Ptr &setting = \
NetworkManager::Setting::Ptr(), QWidget* parent = 0, Qt::WindowFlags f = 0); + \
explicit PppoeWidget(const NetworkManager::Setting::Ptr &setting = \
NetworkManager::Setting::Ptr(), QWidget* parent = nullptr, Qt::WindowFlags f = {}); \
~PppoeWidget() override;
void loadConfig(const NetworkManager::Setting::Ptr &setting) override;
diff --git a/libs/editor/settings/pppwidget.h b/libs/editor/settings/pppwidget.h
index 81d8bce2..bb6e0035 100644
--- a/libs/editor/settings/pppwidget.h
+++ b/libs/editor/settings/pppwidget.h
@@ -36,7 +36,7 @@ class Q_DECL_EXPORT PPPWidget : public SettingWidget
{
Q_OBJECT
public:
- explicit PPPWidget(const NetworkManager::Setting::Ptr &setting = \
NetworkManager::Setting::Ptr(), QWidget* parent = 0, Qt::WindowFlags f = 0); + \
explicit PPPWidget(const NetworkManager::Setting::Ptr &setting = \
NetworkManager::Setting::Ptr(), QWidget* parent = nullptr, Qt::WindowFlags f = {}); \
~PPPWidget() override;
void loadConfig(const NetworkManager::Setting::Ptr &setting) override;
diff --git a/libs/editor/settings/security802-1x.h \
b/libs/editor/settings/security802-1x.h index 74b43907..241900d3 100644
--- a/libs/editor/settings/security802-1x.h
+++ b/libs/editor/settings/security802-1x.h
@@ -37,7 +37,7 @@ class Q_DECL_EXPORT Security8021x: public SettingWidget
{
Q_OBJECT
public:
- Security8021x(const NetworkManager::Setting::Ptr &setting = \
NetworkManager::Setting::Ptr(), bool wifiMode = true, QWidget *parent = 0, \
Qt::WindowFlags f = 0); + Security8021x(const NetworkManager::Setting::Ptr \
&setting = NetworkManager::Setting::Ptr(), bool wifiMode = true, QWidget *parent = \
nullptr, Qt::WindowFlags f = {}); ~Security8021x() override;
void loadConfig(const NetworkManager::Setting::Ptr &setting) override;
diff --git a/libs/editor/settings/teamwidget.h b/libs/editor/settings/teamwidget.h
index 55a27ecb..aaea4e53 100644
--- a/libs/editor/settings/teamwidget.h
+++ b/libs/editor/settings/teamwidget.h
@@ -40,7 +40,7 @@ class Q_DECL_EXPORT TeamWidget : public SettingWidget
Q_OBJECT
public:
explicit TeamWidget(const QString & masterUuid, const \
NetworkManager::Setting::Ptr &setting = \
NetworkManager::Setting::Ptr(),
- QWidget* parent = 0, Qt::WindowFlags f = 0);
+ QWidget* parent = nullptr, Qt::WindowFlags f = {});
~TeamWidget() override;
void loadConfig(const NetworkManager::Setting::Ptr &setting) override;
diff --git a/libs/editor/settings/vlanwidget.h b/libs/editor/settings/vlanwidget.h
index bde0d596..5aad2dab 100644
--- a/libs/editor/settings/vlanwidget.h
+++ b/libs/editor/settings/vlanwidget.h
@@ -35,7 +35,7 @@ class Q_DECL_EXPORT VlanWidget : public SettingWidget
Q_OBJECT
public:
- explicit VlanWidget(const NetworkManager::Setting::Ptr &setting, QWidget* parent \
= 0, Qt::WindowFlags f = 0); + explicit VlanWidget(const \
NetworkManager::Setting::Ptr &setting, QWidget* parent = nullptr, Qt::WindowFlags f = \
{}); ~VlanWidget() override;
void loadConfig(const NetworkManager::Setting::Ptr &setting) override;
diff --git a/libs/editor/settings/wificonnectionwidget.h \
b/libs/editor/settings/wificonnectionwidget.h index 5450c317..f737ebae 100644
--- a/libs/editor/settings/wificonnectionwidget.h
+++ b/libs/editor/settings/wificonnectionwidget.h
@@ -37,7 +37,7 @@ class Q_DECL_EXPORT WifiConnectionWidget : public SettingWidget
Q_OBJECT
public:
- explicit WifiConnectionWidget(const NetworkManager::Setting::Ptr &setting = \
NetworkManager::Setting::Ptr(), QWidget* parent = 0, Qt::WindowFlags f = 0); + \
explicit WifiConnectionWidget(const NetworkManager::Setting::Ptr &setting = \
NetworkManager::Setting::Ptr(), QWidget* parent = nullptr, Qt::WindowFlags f = {}); \
~WifiConnectionWidget() override;
void loadConfig(const NetworkManager::Setting::Ptr &setting) override;
diff --git a/libs/editor/settings/wifisecurity.h \
b/libs/editor/settings/wifisecurity.h index 48dbacd6..24462c6c 100644
--- a/libs/editor/settings/wifisecurity.h
+++ b/libs/editor/settings/wifisecurity.h
@@ -44,7 +44,7 @@ public:
explicit WifiSecurity(const NetworkManager::Setting::Ptr &setting = \
NetworkManager::Setting::Ptr(),
const NetworkManager::Security8021xSetting::Ptr &setting8021x = \
NetworkManager::Security8021xSetting::Ptr(),
- QWidget *parent = 0, Qt::WindowFlags f = 0);
+ QWidget *parent = nullptr, Qt::WindowFlags f = {});
~WifiSecurity() override;
void loadConfig(const NetworkManager::Setting::Ptr &setting) override;
void loadSecrets(const NetworkManager::Setting::Ptr &setting) override;
diff --git a/libs/editor/settings/wiredconnectionwidget.h \
b/libs/editor/settings/wiredconnectionwidget.h index a53184ef..9dd12617 100644
--- a/libs/editor/settings/wiredconnectionwidget.h
+++ b/libs/editor/settings/wiredconnectionwidget.h
@@ -35,7 +35,7 @@ class Q_DECL_EXPORT WiredConnectionWidget : public SettingWidget
Q_OBJECT
public:
- explicit WiredConnectionWidget(const NetworkManager::Setting::Ptr &setting, \
QWidget* parent = 0, Qt::WindowFlags f = 0); + explicit \
WiredConnectionWidget(const NetworkManager::Setting::Ptr &setting, QWidget* parent = \
nullptr, Qt::WindowFlags f = {}); ~WiredConnectionWidget() override;
void loadConfig(const NetworkManager::Setting::Ptr &setting) override;
diff --git a/libs/editor/settings/wiredsecurity.h \
b/libs/editor/settings/wiredsecurity.h index 38835316..7c677cf6 100644
--- a/libs/editor/settings/wiredsecurity.h
+++ b/libs/editor/settings/wiredsecurity.h
@@ -37,7 +37,7 @@ class Q_DECL_EXPORT WiredSecurity : public SettingWidget
{
Q_OBJECT
public:
- explicit WiredSecurity(const NetworkManager::Security8021xSetting::Ptr \
&setting8021x = NetworkManager::Security8021xSetting::Ptr(), QWidget* parent = 0, \
Qt::WindowFlags f = 0); + explicit WiredSecurity(const \
NetworkManager::Security8021xSetting::Ptr &setting8021x = \
NetworkManager::Security8021xSetting::Ptr(), QWidget* parent = nullptr, \
Qt::WindowFlags f = {}); ~WiredSecurity() override;
void loadConfig(const NetworkManager::Setting::Ptr &setting) override;
void loadSecrets(const NetworkManager::Setting::Ptr &setting) override;
diff --git a/libs/editor/simpleipv4addressvalidator.cpp \
b/libs/editor/simpleipv4addressvalidator.cpp index 56c188d3..54c4c856 100644
--- a/libs/editor/simpleipv4addressvalidator.cpp
+++ b/libs/editor/simpleipv4addressvalidator.cpp
@@ -47,7 +47,7 @@ QValidator::State SimpleIpV4AddressValidator::validate(QString \
&address, int &po
QValidator::State SimpleIpV4AddressValidator::checkWithInputMask(QString &value, int \
&pos) const {
- QRegExpValidator v(QRegExp(QLatin1String("[0-9, ]{1,3}\\.[0-9, ]{1,3}\\.[0-9, \
]{1,3}\\.[0-9, ]{1,3}")), 0); + QRegExpValidator v(QRegExp(QLatin1String("[0-9, \
]{1,3}\\.[0-9, ]{1,3}\\.[0-9, ]{1,3}\\.[0-9, ]{1,3}")), nullptr);
return v.validate(value, pos);
}
diff --git a/libs/editor/simpleipv6addressvalidator.cpp \
b/libs/editor/simpleipv6addressvalidator.cpp index 99cb2911..8fe13629 100644
--- a/libs/editor/simpleipv6addressvalidator.cpp
+++ b/libs/editor/simpleipv6addressvalidator.cpp
@@ -42,7 +42,7 @@ QValidator::State SimpleIpV6AddressValidator::validate(QString \
&address, int &po
QValidator::State SimpleIpV6AddressValidator::checkWithInputMask(QString &value, int \
&pos) const {
- QRegExpValidator v(QRegExp(QLatin1String("([0-9a-fA-F]{1,4}|:)+")), 0);
+ QRegExpValidator v(QRegExp(QLatin1String("([0-9a-fA-F]{1,4}|:)+")), nullptr);
return v.validate(value, pos);
}
diff --git a/libs/editor/vpnuiplugin.h b/libs/editor/vpnuiplugin.h
index d783980a..a396d585 100644
--- a/libs/editor/vpnuiplugin.h
+++ b/libs/editor/vpnuiplugin.h
@@ -41,11 +41,11 @@ class Q_DECL_EXPORT VpnUiPlugin : public QObject
public:
enum ErrorType {NoError, NotImplemented, Error};
- explicit VpnUiPlugin(QObject * parent = 0, const QVariantList& = \
QVariantList()); + explicit VpnUiPlugin(QObject * parent = nullptr, const \
QVariantList& = QVariantList()); ~VpnUiPlugin() override;
- virtual SettingWidget * widget(const NetworkManager::VpnSetting::Ptr &setting, \
QWidget * parent = 0) = 0;
- virtual SettingWidget * askUser(const NetworkManager::VpnSetting::Ptr &setting, \
QWidget * parent = 0) = 0; + virtual SettingWidget * widget(const \
NetworkManager::VpnSetting::Ptr &setting, QWidget * parent = nullptr) = 0; + \
virtual SettingWidget * askUser(const NetworkManager::VpnSetting::Ptr &setting, \
QWidget * parent = nullptr) = 0;
/**
* Suggested file name to save the exported connection configuration.
diff --git a/libs/editor/widgets/advancedpermissionswidget.h \
b/libs/editor/widgets/advancedpermissionswidget.h index 71a95fd5..eae674b9 100644
--- a/libs/editor/widgets/advancedpermissionswidget.h
+++ b/libs/editor/widgets/advancedpermissionswidget.h
@@ -34,8 +34,8 @@ class AdvancedPermissionsWidget : public QDialog
Q_OBJECT
Q_DECLARE_PRIVATE(AdvancedPermissionsWidget)
public:
- explicit AdvancedPermissionsWidget(QWidget *parent=0);
- AdvancedPermissionsWidget(const QHash<QString,QString>&, QWidget *parent=0);
+ explicit AdvancedPermissionsWidget(QWidget *parent = nullptr);
+ AdvancedPermissionsWidget(const QHash<QString,QString>&, QWidget *parent = \
nullptr); ~AdvancedPermissionsWidget() override;
QHash<QString,QString> currentUsers() const;
diff --git a/libs/editor/widgets/bssidcombobox.h \
b/libs/editor/widgets/bssidcombobox.h index af9796c8..40ba4187 100644
--- a/libs/editor/widgets/bssidcombobox.h
+++ b/libs/editor/widgets/bssidcombobox.h
@@ -31,7 +31,7 @@ class Q_DECL_EXPORT BssidComboBox : public QComboBox
{
Q_OBJECT
public:
- explicit BssidComboBox(QWidget *parent = 0);
+ explicit BssidComboBox(QWidget *parent = nullptr);
QString bssid() const;
bool isValid() const;
diff --git a/libs/editor/widgets/delegate.h b/libs/editor/widgets/delegate.h
index be751a75..f5628a5e 100644
--- a/libs/editor/widgets/delegate.h
+++ b/libs/editor/widgets/delegate.h
@@ -28,7 +28,7 @@ class Delegate : public QStyledItemDelegate
{
Q_OBJECT
public:
- explicit Delegate(QObject * parent = 0);
+ explicit Delegate(QObject * parent = nullptr);
~Delegate() override;
QWidget * createEditor(QWidget *parent, const QStyleOptionViewItem &option,
diff --git a/libs/editor/widgets/hwaddrcombobox.h \
b/libs/editor/widgets/hwaddrcombobox.h index fc0b3ce0..2aef3938 100644
--- a/libs/editor/widgets/hwaddrcombobox.h
+++ b/libs/editor/widgets/hwaddrcombobox.h
@@ -29,7 +29,7 @@ class Q_DECL_EXPORT HwAddrComboBox : public QComboBox
{
Q_OBJECT
public:
- explicit HwAddrComboBox(QWidget *parent = 0);
+ explicit HwAddrComboBox(QWidget *parent = nullptr);
void init(const NetworkManager::Device::Type &deviceType, const QString \
&address);
diff --git a/libs/editor/widgets/intdelegate.h b/libs/editor/widgets/intdelegate.h
index d465985b..345bb1dc 100644
--- a/libs/editor/widgets/intdelegate.h
+++ b/libs/editor/widgets/intdelegate.h
@@ -31,8 +31,8 @@ class IntDelegate : public Delegate
{
Q_OBJECT
public:
- explicit IntDelegate(QObject * parent = 0);
- IntDelegate(int min, int max, QObject * parent = 0);
+ explicit IntDelegate(QObject * parent = nullptr);
+ IntDelegate(int min, int max, QObject * parent = nullptr);
~IntDelegate() override;
QWidget * createEditor(QWidget *parent, const QStyleOptionViewItem &option, \
const QModelIndex &index) const override;
diff --git a/libs/editor/widgets/ipv4delegate.h b/libs/editor/widgets/ipv4delegate.h
index c9d87460..c73d54aa 100644
--- a/libs/editor/widgets/ipv4delegate.h
+++ b/libs/editor/widgets/ipv4delegate.h
@@ -28,7 +28,7 @@ class IpV4Delegate : public Delegate
{
Q_OBJECT
public:
- explicit IpV4Delegate(QObject * parent = 0);
+ explicit IpV4Delegate(QObject * parent = nullptr);
~IpV4Delegate() override;
QWidget * createEditor(QWidget *parent, const QStyleOptionViewItem &option, \
const QModelIndex &index) const override;
diff --git a/libs/editor/widgets/ipv4routeswidget.h \
b/libs/editor/widgets/ipv4routeswidget.h index cdf1f0f7..272390bd 100644
--- a/libs/editor/widgets/ipv4routeswidget.h
+++ b/libs/editor/widgets/ipv4routeswidget.h
@@ -33,7 +33,7 @@ class IpV4RoutesWidget : public QDialog
{
Q_OBJECT
public:
- explicit IpV4RoutesWidget(QWidget * parent = 0);
+ explicit IpV4RoutesWidget(QWidget * parent = nullptr);
~IpV4RoutesWidget() override;
void setRoutes(const QList<NetworkManager::IpRoute> &list);
diff --git a/libs/editor/widgets/ipv6delegate.h b/libs/editor/widgets/ipv6delegate.h
index b26f1011..eb01d261 100644
--- a/libs/editor/widgets/ipv6delegate.h
+++ b/libs/editor/widgets/ipv6delegate.h
@@ -30,7 +30,7 @@ class IpV6Delegate : public Delegate
{
Q_OBJECT
public:
- explicit IpV6Delegate(QObject * parent = 0);
+ explicit IpV6Delegate(QObject * parent = nullptr);
~IpV6Delegate() override;
QWidget * createEditor(QWidget *parent, const QStyleOptionViewItem &option, \
const QModelIndex &index) const override;
diff --git a/libs/editor/widgets/ipv6routeswidget.h \
b/libs/editor/widgets/ipv6routeswidget.h index c6c6640e..79d75cec 100644
--- a/libs/editor/widgets/ipv6routeswidget.h
+++ b/libs/editor/widgets/ipv6routeswidget.h
@@ -33,7 +33,7 @@ class IpV6RoutesWidget : public QDialog
{
Q_OBJECT
public:
- explicit IpV6RoutesWidget(QWidget * parent = 0);
+ explicit IpV6RoutesWidget(QWidget * parent = nullptr);
~IpV6RoutesWidget() override;
void setRoutes(const QList<NetworkManager::IpRoute> &list);
diff --git a/libs/editor/widgets/mobileconnectionwizard.cpp \
b/libs/editor/widgets/mobileconnectionwizard.cpp index 8eff06c1..0497f92d 100644
--- a/libs/editor/widgets/mobileconnectionwizard.cpp
+++ b/libs/editor/widgets/mobileconnectionwizard.cpp
@@ -153,7 +153,7 @@ void MobileConnectionWizard::initializePage(int id)
lineEditProvider->setText(i18nc("Mobile Connection Wizard", "Unknown \
Provider")); }
} else {
- if (mProvidersList->currentItem() != 0) {
+ if (mProvidersList->currentItem() != nullptr) {
const QStringList mApns = \
mProviders->getApns(mProvidersList->currentItem()->text());
if (!mApns.isEmpty()) {
@@ -530,7 +530,7 @@ void MobileConnectionWizard::slotEnablePlanEditBox(const QString \
& text) userApn->clear();
userApn->setEnabled(true);
} else {
- if (mProvidersList->currentItem() != 0) {
+ if (mProvidersList->currentItem() != nullptr) {
int i = mPlanComboBox->currentIndex();
if (i>0) i=i-1; // Skiping the separator (i==1)
QStringList mApns = \
mProviders->getApns(mProvidersList->currentItem()->text());
diff --git a/libs/editor/widgets/mobileconnectionwizard.h \
b/libs/editor/widgets/mobileconnectionwizard.h index 3500c70e..bc22da02 100644
--- a/libs/editor/widgets/mobileconnectionwizard.h
+++ b/libs/editor/widgets/mobileconnectionwizard.h
@@ -44,7 +44,7 @@ public:
* or NetworkManager::ConnectionSettings::Cdma.
*/
explicit MobileConnectionWizard(NetworkManager::ConnectionSettings::ConnectionType \
connectionType = NetworkManager::ConnectionSettings::Unknown,
- QWidget * parent = 0);
+ QWidget * parent = nullptr);
~MobileConnectionWizard() override;
/*
diff --git a/libs/editor/widgets/passwordfield.h \
b/libs/editor/widgets/passwordfield.h index cc1c86b3..65bd04bc 100644
--- a/libs/editor/widgets/passwordfield.h
+++ b/libs/editor/widgets/passwordfield.h
@@ -38,7 +38,7 @@ public:
NotRequired
};
- explicit PasswordField(QWidget *parent = 0, Qt::WindowFlags f = \
Qt::WindowFlags()); + explicit PasswordField(QWidget *parent = nullptr, \
Qt::WindowFlags f = Qt::WindowFlags());
void setMaxLength(int maxLength);
void setPasswordModeEnabled(bool passwordMode);
diff --git a/libs/editor/widgets/settingwidget.h \
b/libs/editor/widgets/settingwidget.h index 6f7ce960..fd06e115 100644
--- a/libs/editor/widgets/settingwidget.h
+++ b/libs/editor/widgets/settingwidget.h
@@ -36,7 +36,7 @@ public:
enum PasswordStorageType {Store = 0, AlwaysAsk, NotRequired};
};
- explicit SettingWidget(const NetworkManager::Setting::Ptr &setting = \
NetworkManager::Setting::Ptr(), QWidget* parent = 0, Qt::WindowFlags f = 0); + \
explicit SettingWidget(const NetworkManager::Setting::Ptr &setting = \
NetworkManager::Setting::Ptr(), QWidget* parent = nullptr, Qt::WindowFlags f = {}); \
~SettingWidget() override;
virtual void loadConfig(const NetworkManager::Setting::Ptr &setting);
diff --git a/libs/editor/widgets/ssidcombobox.h b/libs/editor/widgets/ssidcombobox.h
index 056a1395..d7e9dd97 100644
--- a/libs/editor/widgets/ssidcombobox.h
+++ b/libs/editor/widgets/ssidcombobox.h
@@ -30,7 +30,7 @@ class Q_DECL_EXPORT SsidComboBox : public KComboBox
{
Q_OBJECT
public:
- explicit SsidComboBox(QWidget *parent = 0);
+ explicit SsidComboBox(QWidget *parent = nullptr);
void init(const QString & ssid);
diff --git a/libs/handler.cpp b/libs/handler.cpp
index 2ae3ec6f..8fdff90b 100644
--- a/libs/handler.cpp
+++ b/libs/handler.cpp
@@ -434,7 +434,7 @@ void Handler::replyFinished(QDBusPendingCallWatcher * watcher)
{
QDBusPendingReply<> reply = *watcher;
if (reply.isError() || !reply.isValid()) {
- KNotification *notification = 0;
+ KNotification *notification = nullptr;
QString error = reply.error().message();
Handler::HandlerAction action = \
(Handler::HandlerAction)watcher->property("action").toUInt(); switch (action) {
@@ -479,7 +479,7 @@ void Handler::replyFinished(QDBusPendingCallWatcher * watcher)
notification->sendEvent();
}
} else {
- KNotification *notification = 0;
+ KNotification *notification = nullptr;
Handler::HandlerAction action = \
(Handler::HandlerAction)watcher->property("action").toUInt();
switch (action) {
diff --git a/libs/handler.h b/libs/handler.h
index 7bf6f393..7083a5a0 100644
--- a/libs/handler.h
+++ b/libs/handler.h
@@ -44,7 +44,7 @@ public:
UpdateConnection
};
- explicit Handler(QObject* parent = 0);
+ explicit Handler(QObject* parent = nullptr);
~Handler() override;
public Q_SLOTS:
diff --git a/libs/models/appletproxymodel.h b/libs/models/appletproxymodel.h
index 40fba4a3..420d2080 100644
--- a/libs/models/appletproxymodel.h
+++ b/libs/models/appletproxymodel.h
@@ -30,7 +30,7 @@ class Q_DECL_EXPORT AppletProxyModel : public QSortFilterProxyModel
Q_OBJECT
Q_PROPERTY(QAbstractItemModel * sourceModel READ sourceModel WRITE setSourceModel)
public:
- explicit AppletProxyModel(QObject *parent = 0);
+ explicit AppletProxyModel(QObject *parent = nullptr);
~AppletProxyModel() override;
protected:
diff --git a/libs/models/creatableconnectionsmodel.h \
b/libs/models/creatableconnectionsmodel.h index dfdb841d..59eab537 100644
--- a/libs/models/creatableconnectionsmodel.h
+++ b/libs/models/creatableconnectionsmodel.h
@@ -35,8 +35,8 @@ public:
const QString &vpnType = QString(), \
// Properties needed for creating
const QString &specificType = QString(), \
// Properties needed for creating
bool shared = false, \
// Properties needed for creating
- QObject *parent = 0);
- explicit CreatableConnectionItem(QObject *parent = 0);
+ QObject *parent = nullptr);
+ explicit CreatableConnectionItem(QObject *parent = nullptr);
~CreatableConnectionItem() override;
NetworkManager::ConnectionSettings::ConnectionType connectionType() const;
@@ -79,7 +79,7 @@ class Q_DECL_EXPORT CreatableConnectionsModel : public \
QAbstractListModel {
Q_OBJECT
public:
- explicit CreatableConnectionsModel(QObject *parent = 0);
+ explicit CreatableConnectionsModel(QObject *parent = nullptr);
~CreatableConnectionsModel() override;
enum ItemRole {
diff --git a/libs/models/editorproxymodel.h b/libs/models/editorproxymodel.h
index e9a3f720..1b390e3a 100644
--- a/libs/models/editorproxymodel.h
+++ b/libs/models/editorproxymodel.h
@@ -30,7 +30,7 @@ class Q_DECL_EXPORT EditorProxyModel : public QSortFilterProxyModel
Q_OBJECT
Q_PROPERTY(QAbstractItemModel * sourceModel READ sourceModel WRITE setSourceModel)
public:
- explicit EditorProxyModel(QObject *parent = 0);
+ explicit EditorProxyModel(QObject *parent = nullptr);
~EditorProxyModel() override;
protected:
diff --git a/libs/models/kcmidentitymodel.h b/libs/models/kcmidentitymodel.h
index fab8b45d..3ee6382f 100644
--- a/libs/models/kcmidentitymodel.h
+++ b/libs/models/kcmidentitymodel.h
@@ -28,7 +28,7 @@ class Q_DECL_EXPORT KcmIdentityModel : public QIdentityProxyModel
{
Q_OBJECT
public:
- explicit KcmIdentityModel(QObject *parent = 0);
+ explicit KcmIdentityModel(QObject *parent = nullptr);
~KcmIdentityModel() override;
enum KcmItemRole {
diff --git a/libs/models/networkitemslist.h b/libs/models/networkitemslist.h
index 9a48063a..3c834406 100644
--- a/libs/models/networkitemslist.h
+++ b/libs/models/networkitemslist.h
@@ -41,7 +41,7 @@ public:
Type
};
- explicit NetworkItemsList(QObject *parent = 0);
+ explicit NetworkItemsList(QObject *parent = nullptr);
~NetworkItemsList() override;
bool contains(const FilterType type, const QString ¶meter) const;
diff --git a/libs/models/networkmodel.cpp b/libs/models/networkmodel.cpp
index 17bf24a3..62160daf 100644
--- a/libs/models/networkmodel.cpp
+++ b/libs/models/networkmodel.cpp
@@ -477,7 +477,7 @@ void NetworkModel::addWirelessNetwork(const \
NetworkManager::WirelessNetwork::Ptr void \
NetworkModel::checkAndCreateDuplicate(const QString &connection, const \
NetworkManager::Device::Ptr &device) {
bool createDuplicate = false;
- NetworkModelItem *originalItem = 0;
+ NetworkModelItem *originalItem = nullptr;
for (NetworkModelItem *item : m_list.returnItems(NetworkItemsList::Connection, \
connection)) { if (!item->duplicate()) {
diff --git a/libs/models/networkmodel.h b/libs/models/networkmodel.h
index 1a0e4d9f..4b2a3306 100644
--- a/libs/models/networkmodel.h
+++ b/libs/models/networkmodel.h
@@ -38,7 +38,7 @@ class Q_DECL_EXPORT NetworkModel : public QAbstractListModel
{
Q_OBJECT
public:
- explicit NetworkModel(QObject *parent = 0);
+ explicit NetworkModel(QObject *parent = nullptr);
~NetworkModel() override;
enum ItemRole {
diff --git a/libs/models/networkmodelitem.h b/libs/models/networkmodelitem.h
index ba38d487..24fef89a 100644
--- a/libs/models/networkmodelitem.h
+++ b/libs/models/networkmodelitem.h
@@ -36,8 +36,8 @@ public:
enum ItemType { UnavailableConnection, AvailableConnection, AvailableAccessPoint \
};
- explicit NetworkModelItem(QObject *parent = 0);
- explicit NetworkModelItem(const NetworkModelItem *item, QObject *parent = 0);
+ explicit NetworkModelItem(QObject *parent = nullptr);
+ explicit NetworkModelItem(const NetworkModelItem *item, QObject *parent = \
nullptr); ~NetworkModelItem() override;
QString activeConnectionPath() const;
diff --git a/vpn/fortisslvpn/fortisslvpn.h b/vpn/fortisslvpn/fortisslvpn.h
index 2240f80a..ed6b1c31 100644
--- a/vpn/fortisslvpn/fortisslvpn.h
+++ b/vpn/fortisslvpn/fortisslvpn.h
@@ -31,8 +31,8 @@ class Q_DECL_EXPORT FortisslvpnUiPlugin : public VpnUiPlugin
public:
explicit FortisslvpnUiPlugin(QObject *parent = nullptr, const QVariantList& = \
QVariantList()); ~FortisslvpnUiPlugin() override;
- SettingWidget *widget(const NetworkManager::VpnSetting::Ptr &setting, QWidget \
*parent = 0) override;
- SettingWidget *askUser(const NetworkManager::VpnSetting::Ptr &setting, QWidget \
*parent = 0) override; + SettingWidget *widget(const \
NetworkManager::VpnSetting::Ptr &setting, QWidget *parent = nullptr) override; + \
SettingWidget *askUser(const NetworkManager::VpnSetting::Ptr &setting, QWidget \
*parent = nullptr) override;
QString suggestedFileName(const NetworkManager::ConnectionSettings::Ptr \
&connection) const override; QString supportedFileExtensions() const override;
diff --git a/vpn/fortisslvpn/fortisslvpnwidget.h \
b/vpn/fortisslvpn/fortisslvpnwidget.h index 588f5b57..8a0fedc6 100644
--- a/vpn/fortisslvpn/fortisslvpnwidget.h
+++ b/vpn/fortisslvpn/fortisslvpnwidget.h
@@ -32,7 +32,7 @@ class FortisslvpnWidget : public SettingWidget
Q_OBJECT
Q_DECLARE_PRIVATE(FortisslvpnWidget)
public:
- explicit FortisslvpnWidget(const NetworkManager::VpnSetting::Ptr &setting, \
QWidget *parent = 0, Qt::WindowFlags f = 0); + explicit FortisslvpnWidget(const \
NetworkManager::VpnSetting::Ptr &setting, QWidget *parent = nullptr, Qt::WindowFlags \
f = {}); ~FortisslvpnWidget() override;
void loadConfig(const NetworkManager::Setting::Ptr &setting) override;
diff --git a/vpn/iodine/iodine.h b/vpn/iodine/iodine.h
index 9a658361..26d3337c 100644
--- a/vpn/iodine/iodine.h
+++ b/vpn/iodine/iodine.h
@@ -31,8 +31,8 @@ class Q_DECL_EXPORT IodineUiPlugin : public VpnUiPlugin
public:
explicit IodineUiPlugin(QObject *parent = nullptr, const QVariantList& = \
QVariantList()); ~IodineUiPlugin() override;
- SettingWidget * widget(const NetworkManager::VpnSetting::Ptr &setting, QWidget \
*parent = 0) override;
- SettingWidget * askUser(const NetworkManager::VpnSetting::Ptr &setting, QWidget \
*parent = 0) override; + SettingWidget * widget(const \
NetworkManager::VpnSetting::Ptr &setting, QWidget *parent = nullptr) override; + \
SettingWidget * askUser(const NetworkManager::VpnSetting::Ptr &setting, QWidget \
*parent = nullptr) override;
QString suggestedFileName(const NetworkManager::ConnectionSettings::Ptr \
&connection) const override; QString supportedFileExtensions() const override;
diff --git a/vpn/iodine/iodinewidget.h b/vpn/iodine/iodinewidget.h
index d61d2372..3ae35e41 100644
--- a/vpn/iodine/iodinewidget.h
+++ b/vpn/iodine/iodinewidget.h
@@ -34,7 +34,7 @@ class IodineWidget : public SettingWidget
{
Q_OBJECT
public:
- explicit IodineWidget(const NetworkManager::VpnSetting::Ptr &setting, QWidget \
*parent = 0, Qt::WindowFlags f = 0); + explicit IodineWidget(const \
NetworkManager::VpnSetting::Ptr &setting, QWidget *parent = nullptr, Qt::WindowFlags \
f = {}); ~IodineWidget() override;
void loadConfig(const NetworkManager::Setting::Ptr &setting) override;
diff --git a/vpn/l2tp/l2tp.h b/vpn/l2tp/l2tp.h
index f6c981d7..50e87720 100644
--- a/vpn/l2tp/l2tp.h
+++ b/vpn/l2tp/l2tp.h
@@ -29,10 +29,10 @@ class Q_DECL_EXPORT L2tpUiPlugin : public VpnUiPlugin
{
Q_OBJECT
public:
- explicit L2tpUiPlugin(QObject * parent = 0, const QVariantList& = \
QVariantList()); + explicit L2tpUiPlugin(QObject * parent = nullptr, const \
QVariantList& = QVariantList()); ~L2tpUiPlugin() override;
- SettingWidget * widget(const NetworkManager::VpnSetting::Ptr &setting, QWidget * \
parent = 0) override;
- SettingWidget * askUser(const NetworkManager::VpnSetting::Ptr &setting, QWidget \
* parent = 0) override; + SettingWidget * widget(const \
NetworkManager::VpnSetting::Ptr &setting, QWidget * parent = nullptr) override; + \
SettingWidget * askUser(const NetworkManager::VpnSetting::Ptr &setting, QWidget * \
parent = nullptr) override;
QString suggestedFileName(const NetworkManager::ConnectionSettings::Ptr \
&connection) const override; QString supportedFileExtensions() const override;
diff --git a/vpn/l2tp/l2tpadvancedwidget.h b/vpn/l2tp/l2tpadvancedwidget.h
index 5d7ed10d..420363b8 100644
--- a/vpn/l2tp/l2tpadvancedwidget.h
+++ b/vpn/l2tp/l2tpadvancedwidget.h
@@ -34,7 +34,7 @@ class L2tpAdvancedWidget : public QDialog
{
Q_OBJECT
public:
- explicit L2tpAdvancedWidget(const NetworkManager::VpnSetting::Ptr &setting, \
QWidget *parent = 0); + explicit L2tpAdvancedWidget(const \
NetworkManager::VpnSetting::Ptr &setting, QWidget *parent = nullptr); \
~L2tpAdvancedWidget() override;
NMStringMap setting() const;
diff --git a/vpn/l2tp/l2tpauth.h b/vpn/l2tp/l2tpauth.h
index 0988b35a..c0f3c91f 100644
--- a/vpn/l2tp/l2tpauth.h
+++ b/vpn/l2tp/l2tpauth.h
@@ -32,7 +32,7 @@ class L2tpAuthDialog : public SettingWidget
Q_OBJECT
Q_DECLARE_PRIVATE(L2tpAuthDialog)
public:
- explicit L2tpAuthDialog(const NetworkManager::VpnSetting::Ptr &setting, QWidget \
*parent = 0); + explicit L2tpAuthDialog(const NetworkManager::VpnSetting::Ptr \
&setting, QWidget *parent = nullptr); ~L2tpAuthDialog() override;
virtual void readSecrets();
QVariantMap setting() const override;
diff --git a/vpn/l2tp/l2tppppwidget.cpp b/vpn/l2tp/l2tppppwidget.cpp
index ba9c554d..f047a6ef 100644
--- a/vpn/l2tp/l2tppppwidget.cpp
+++ b/vpn/l2tp/l2tppppwidget.cpp
@@ -56,7 +56,7 @@ void L2tpPPPWidget::loadConfig(const \
NetworkManager::VpnSetting::Ptr &setting)
bool refuse_mschapv2 = (dataMap[NM_L2TP_KEY_REFUSE_MSCHAPV2] == yesString);
bool refuse_eap = (dataMap[NM_L2TP_KEY_REFUSE_EAP] == yesString);
- QListWidgetItem * item = 0;
+ QListWidgetItem * item = nullptr;
item = m_ui->listWidget->item(0); // PAP
item->setCheckState(refuse_pap ? Qt::Unchecked : Qt::Checked);
item = m_ui->listWidget->item(1); // CHAP
@@ -118,7 +118,7 @@ NMStringMap L2tpPPPWidget::setting() const
{
NMStringMap result;
- QListWidgetItem * item = 0;
+ QListWidgetItem * item = nullptr;
item = m_ui->listWidget->item(0); // PAP
const QString yesString = QLatin1String("yes");
if (item->checkState() == Qt::Unchecked) {
diff --git a/vpn/l2tp/l2tppppwidget.h b/vpn/l2tp/l2tppppwidget.h
index 4de042ce..76c7ac07 100644
--- a/vpn/l2tp/l2tppppwidget.h
+++ b/vpn/l2tp/l2tppppwidget.h
@@ -34,7 +34,7 @@ class L2tpPPPWidget : public QDialog
{
Q_OBJECT
public:
- explicit L2tpPPPWidget(const NetworkManager::VpnSetting::Ptr &setting, QWidget \
*parent = 0); + explicit L2tpPPPWidget(const NetworkManager::VpnSetting::Ptr \
&setting, QWidget *parent = nullptr); ~L2tpPPPWidget() override;
NMStringMap setting() const;
diff --git a/vpn/l2tp/l2tpwidget.h b/vpn/l2tp/l2tpwidget.h
index 56f97910..147e8792 100644
--- a/vpn/l2tp/l2tpwidget.h
+++ b/vpn/l2tp/l2tpwidget.h
@@ -34,7 +34,7 @@ class L2tpWidget : public SettingWidget
{
Q_OBJECT
public:
- explicit L2tpWidget(const NetworkManager::VpnSetting::Ptr &setting, QWidget* \
parent = 0, Qt::WindowFlags f = 0); + explicit L2tpWidget(const \
NetworkManager::VpnSetting::Ptr &setting, QWidget* parent = nullptr, Qt::WindowFlags \
f = {}); ~L2tpWidget() override;
void loadConfig(const NetworkManager::Setting::Ptr &setting) override;
diff --git a/vpn/openconnect/openconnectauth.cpp \
b/vpn/openconnect/openconnectauth.cpp index 82c01dcc..c7c3e3bc 100644
--- a/vpn/openconnect/openconnectauth.cpp
+++ b/vpn/openconnect/openconnectauth.cpp
@@ -173,7 +173,7 @@ void OpenconnectAuthWidget::readConfig()
}
if (dataMap[NM_OPENCONNECT_KEY_CSD_ENABLE] == "yes") {
char *wrapper;
- wrapper = 0;
+ wrapper = nullptr;
if (!dataMap[NM_OPENCONNECT_KEY_CSD_WRAPPER].isEmpty()) {
const QByteArray wrapperScript = \
QFile::encodeName(dataMap[NM_OPENCONNECT_KEY_CSD_WRAPPER]); wrapper = \
strdup(wrapperScript.data()); @@ -449,7 +449,7 @@ void \
OpenconnectAuthWidget::processAuthForm(struct oc_auth_form *form) QLabel *text = new \
QLabel(this);
text->setAlignment(Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter);
text->setText(QString(opt->label));
- QWidget *widget = 0;
+ QWidget *widget = nullptr;
const QString key = \
QString("form:%1:%2").arg(QLatin1String(form->auth_id)).arg(QLatin1String(opt->name));
const QString value = d->secrets.value(key);
if (opt->type == OC_FORM_OPT_PASSWORD || opt->type == OC_FORM_OPT_TEXT) {
diff --git a/vpn/openconnect/openconnectauth.h b/vpn/openconnect/openconnectauth.h
index c391546c..e5f5cfd8 100644
--- a/vpn/openconnect/openconnectauth.h
+++ b/vpn/openconnect/openconnectauth.h
@@ -39,7 +39,7 @@ class OpenconnectAuthWidget : public SettingWidget
Q_OBJECT
Q_DECLARE_PRIVATE(OpenconnectAuthWidget)
public:
- explicit OpenconnectAuthWidget(const NetworkManager::VpnSetting::Ptr &setting, \
QWidget *parent = 0); + explicit OpenconnectAuthWidget(const \
NetworkManager::VpnSetting::Ptr &setting, QWidget *parent = nullptr); \
~OpenconnectAuthWidget() override; virtual void readSecrets();
void readConfig();
diff --git a/vpn/openconnect/openconnectauthworkerthread.cpp \
b/vpn/openconnect/openconnectauthworkerthread.cpp index b720a87e..41041623 100644
--- a/vpn/openconnect/openconnectauthworkerthread.cpp
+++ b/vpn/openconnect/openconnectauthworkerthread.cpp
@@ -53,7 +53,7 @@ public:
static int validatePeerCert(void *obj, const char *str)
{
if (obj)
- return static_cast<OpenconnectAuthWorkerThread*>(obj)->validatePeerCert(NULL, \
str); + return \
static_cast<OpenconnectAuthWorkerThread*>(obj)->validatePeerCert(nullptr, str); \
return -1; }
#else
diff --git a/vpn/openconnect/openconnectui.h b/vpn/openconnect/openconnectui.h
index 7fa5e386..e42d1d9b 100644
--- a/vpn/openconnect/openconnectui.h
+++ b/vpn/openconnect/openconnectui.h
@@ -31,10 +31,10 @@ class Q_DECL_EXPORT OpenconnectUiPlugin : public VpnUiPlugin
{
Q_OBJECT
public:
- explicit OpenconnectUiPlugin(QObject * parent = 0, const QVariantList& = \
QVariantList()); + explicit OpenconnectUiPlugin(QObject * parent = nullptr, const \
QVariantList& = QVariantList()); ~OpenconnectUiPlugin() override;
- SettingWidget * widget(const NetworkManager::VpnSetting::Ptr &setting, QWidget * \
parent = 0) override;
- SettingWidget * askUser(const NetworkManager::VpnSetting::Ptr &setting, QWidget \
* parent = 0) override; + SettingWidget * widget(const \
NetworkManager::VpnSetting::Ptr &setting, QWidget * parent = nullptr) override; + \
SettingWidget * askUser(const NetworkManager::VpnSetting::Ptr &setting, QWidget * \
parent = nullptr) override;
QString suggestedFileName(const NetworkManager::ConnectionSettings::Ptr \
&connection) const override; QString supportedFileExtensions() const override;
diff --git a/vpn/openconnect/openconnectwidget.h \
b/vpn/openconnect/openconnectwidget.h index e8eea3a8..f5e06fe2 100644
--- a/vpn/openconnect/openconnectwidget.h
+++ b/vpn/openconnect/openconnectwidget.h
@@ -33,7 +33,7 @@ class OpenconnectSettingWidget : public SettingWidget
Q_OBJECT
Q_DECLARE_PRIVATE(OpenconnectSettingWidget)
public:
- explicit OpenconnectSettingWidget(const NetworkManager::VpnSetting::Ptr \
&setting, QWidget *parent = 0); + explicit OpenconnectSettingWidget(const \
NetworkManager::VpnSetting::Ptr &setting, QWidget *parent = nullptr); \
~OpenconnectSettingWidget() override;
void loadConfig(const NetworkManager::Setting::Ptr &setting) override;
QVariantMap setting() const override;
diff --git a/vpn/openswan/openswan.h b/vpn/openswan/openswan.h
index 3044827a..440e2d1e 100644
--- a/vpn/openswan/openswan.h
+++ b/vpn/openswan/openswan.h
@@ -29,10 +29,10 @@ class Q_DECL_EXPORT OpenswanUiPlugin : public VpnUiPlugin
{
Q_OBJECT
public:
- explicit OpenswanUiPlugin(QObject * parent = 0, const QVariantList& = \
QVariantList()); + explicit OpenswanUiPlugin(QObject * parent = nullptr, const \
QVariantList& = QVariantList()); ~OpenswanUiPlugin() override;
- SettingWidget * widget(const NetworkManager::VpnSetting::Ptr &setting, QWidget * \
parent = 0) override;
- SettingWidget * askUser(const NetworkManager::VpnSetting::Ptr &setting, QWidget \
* parent = 0) override; + SettingWidget * widget(const \
NetworkManager::VpnSetting::Ptr &setting, QWidget * parent = nullptr) override; + \
SettingWidget * askUser(const NetworkManager::VpnSetting::Ptr &setting, QWidget * \
parent = nullptr) override;
QString suggestedFileName(const NetworkManager::ConnectionSettings::Ptr \
&connection) const override; QString supportedFileExtensions() const override;
diff --git a/vpn/openswan/openswanauth.h b/vpn/openswan/openswanauth.h
index 4a8282b3..2e0f1183 100644
--- a/vpn/openswan/openswanauth.h
+++ b/vpn/openswan/openswanauth.h
@@ -32,7 +32,7 @@ class OpenswanAuthDialog : public SettingWidget
Q_OBJECT
Q_DECLARE_PRIVATE(OpenswanAuthDialog)
public:
- explicit OpenswanAuthDialog(const NetworkManager::VpnSetting::Ptr &setting, \
QWidget *parent = 0); + explicit OpenswanAuthDialog(const \
NetworkManager::VpnSetting::Ptr &setting, QWidget *parent = nullptr); \
~OpenswanAuthDialog() override; virtual void readSecrets();
QVariantMap setting() const override;
diff --git a/vpn/openswan/openswanwidget.h b/vpn/openswan/openswanwidget.h
index d8edacbc..c6c50c09 100644
--- a/vpn/openswan/openswanwidget.h
+++ b/vpn/openswan/openswanwidget.h
@@ -34,7 +34,7 @@ class OpenswanWidget : public SettingWidget
{
Q_OBJECT
public:
- explicit OpenswanWidget(const NetworkManager::VpnSetting::Ptr &setting, QWidget \
*parent = 0, Qt::WindowFlags f = 0); + explicit OpenswanWidget(const \
NetworkManager::VpnSetting::Ptr &setting, QWidget *parent = nullptr, Qt::WindowFlags \
f = {}); ~OpenswanWidget() override;
void loadConfig(const NetworkManager::Setting::Ptr &setting) override;
diff --git a/vpn/openvpn/openvpn.cpp b/vpn/openvpn/openvpn.cpp
index 1fe7f6c7..d74ba27b 100644
--- a/vpn/openvpn/openvpn.cpp
+++ b/vpn/openvpn/openvpn.cpp
@@ -187,7 +187,7 @@ NMVariantMapMap OpenVpnUiPlugin::importConnectionSettings(const \
QString &fileNam bool copyCertificates;
KMessageBox::ButtonCode buttonCode;
if (KMessageBox::shouldBeShownYesNo(QLatin1String("copyCertificatesDialog"), \
buttonCode)) {
- copyCertificates = KMessageBox::questionYesNo(0, i18n("Do you want to copy \
your certificates to %1?", KStandardDirs::locateLocal("data", \
"networkmanagement/certificates/")), + copyCertificates = \
KMessageBox::questionYesNo(nullptr, i18n("Do you want to copy your certificates to \
%1?", KStandardDirs::locateLocal("data", "networkmanagement/certificates/")), \
i18n("Copy certificates"), KStandardGuiItem::yes(), KStandardGuiItem::no(), \
QLatin1String("copyCertificatesDialog")) == KMessageBox::Yes; } else {
copyCertificates = buttonCode == KMessageBox::Yes;
@@ -236,10 +236,10 @@ NMVariantMapMap OpenVpnUiPlugin::importConnectionSettings(const \
QString &fileNam
} else if (key_value[1].startsWith(QLatin1String("tap"))) {
dataMap.insert(QLatin1String(NM_OPENVPN_KEY_TAP_DEV), "yes");
} else {
- KMessageBox::information(0, i18n("Unknown option: %1", line));
+ KMessageBox::information(nullptr, i18n("Unknown option: %1", \
line)); }
} else {
- KMessageBox::information(0, i18n("Invalid number of arguments \
(expected 1) in option: %1", line)); + \
KMessageBox::information(nullptr, i18n("Invalid number of arguments (expected 1) in \
option: %1", line)); }
continue;
}
@@ -254,10 +254,10 @@ NMVariantMapMap OpenVpnUiPlugin::importConnectionSettings(const \
QString &fileNam
} else if (key_value[1] == "tcp-client" || key_value[1] == \
"tcp-server" || key_value[1] == "tcp") {
dataMap.insert(QLatin1String(NM_OPENVPN_KEY_PROTO_TCP), "yes");
} else {
- KMessageBox::information(0, i18n("Unknown option: %1", line));
+ KMessageBox::information(nullptr, i18n("Unknown option: %1", \
line)); }
} else {
- KMessageBox::information(0, i18n("Invalid number of arguments \
(expected 1) in option: %1", line)); + \
KMessageBox::information(nullptr, i18n("Invalid number of arguments (expected 1) in \
option: %1", line)); }
continue;
}
@@ -270,10 +270,10 @@ NMVariantMapMap OpenVpnUiPlugin::importConnectionSettings(const \
QString &fileNam
if (key_value[1].toLong() >= 0 && key_value[1].toLong() < 0xFFFF ) {
dataMap.insert(QLatin1String(NM_OPENVPN_KEY_TUNNEL_MTU), \
key_value[1]); } else {
- KMessageBox::information(0, i18n("Invalid size (should be \
between 0 and 0xFFFF) in option: %1", line)); + \
KMessageBox::information(nullptr, i18n("Invalid size (should be between 0 and 0xFFFF) \
in option: %1", line)); }
} else {
- KMessageBox::information(0, i18n("Invalid number of arguments \
(expected 1) in option: %1", line)); + \
KMessageBox::information(nullptr, i18n("Invalid number of arguments (expected 1) in \
option: %1", line)); }
continue;
}
@@ -282,10 +282,10 @@ NMVariantMapMap OpenVpnUiPlugin::importConnectionSettings(const \
QString &fileNam
if (key_value[1].toLong() >= 0 && key_value[1].toLong() < 0xFFFF ) {
dataMap.insert(QLatin1String(NM_OPENVPN_KEY_FRAGMENT_SIZE), \
key_value[1]); } else {
- KMessageBox::information(0, i18n("Invalid size (should be \
between 0 and 0xFFFF) in option: %1", line)); + \
KMessageBox::information(nullptr, i18n("Invalid size (should be between 0 and 0xFFFF) \
in option: %1", line)); }
} else {
- KMessageBox::information(0, i18n("Invalid number of arguments \
(expected 1) in option: %1", line)); + \
KMessageBox::information(nullptr, i18n("Invalid number of arguments (expected 1) in \
option: %1", line)); }
continue;
}
@@ -298,10 +298,10 @@ NMVariantMapMap OpenVpnUiPlugin::importConnectionSettings(const \
QString &fileNam
if (key_value[1].toLong() >= 0 && key_value[1].toLong() <= 604800 ) \
{
dataMap.insert(QLatin1String(NM_OPENVPN_KEY_RENEG_SECONDS), \
key_value[1]); } else {
- KMessageBox::information(0, i18n("Invalid size (should be \
between 0 and 604800) in option: %1", line)); + \
KMessageBox::information(nullptr, i18n("Invalid size (should be between 0 and 604800) \
in option: %1", line)); }
} else {
- KMessageBox::information(0, i18n("Invalid number of arguments \
(expected 1) in option: %1", line)); + \
KMessageBox::information(nullptr, i18n("Invalid number of arguments (expected 1) in \
option: %1", line)); }
continue;
}
@@ -355,7 +355,7 @@ NMVariantMapMap OpenVpnUiPlugin::importConnectionSettings(const \
QString &fileNam proxy_set = true;
}
if (!success) {
- KMessageBox::information(0, i18n("Invalid proxy option: %1", line));
+ KMessageBox::information(nullptr, i18n("Invalid proxy option: %1", \
line)); }
continue;
}
@@ -384,10 +384,10 @@ NMVariantMapMap OpenVpnUiPlugin::importConnectionSettings(const \
QString &fileNam
if (key_value[1].toLong() > 0 && key_value[1].toLong() < 65536) \
{
dataMap.insert(QLatin1String(NM_OPENVPN_KEY_PORT), \
key_value[1]); } else {
- KMessageBox::information(0, i18n("Invalid port (should be \
between 1 and 65535) in option: %1", line)); + \
KMessageBox::information(nullptr, i18n("Invalid port (should be between 1 and 65535) \
in option: %1", line)); }
} else
- KMessageBox::information(0, i18n("Invalid number of arguments \
(expected 1) in option: %1", line)); + \
KMessageBox::information(nullptr, i18n("Invalid number of arguments (expected 1) in \
option: %1", line)); }
continue;
}
@@ -483,7 +483,7 @@ NMVariantMapMap OpenVpnUiPlugin::importConnectionSettings(const \
QString &fileNam if (key_value.count() == 2) {
dataMap.insert(QLatin1String(NM_OPENVPN_KEY_CIPHER), key_value[1]);
} else {
- KMessageBox::information(0, i18n("Invalid number of arguments \
(expected 1) in option: %1", line)); + \
KMessageBox::information(nullptr, i18n("Invalid number of arguments (expected 1) in \
option: %1", line)); }
continue;
}
@@ -491,7 +491,7 @@ NMVariantMapMap OpenVpnUiPlugin::importConnectionSettings(const \
QString &fileNam if (!unQuote(key_value[1], fileName).isEmpty()) {
dataMap.insert(QLatin1String(NM_OPENVPN_KEY_TLS_REMOTE), \
key_value[1]); } else {
- KMessageBox::information(0, i18n("Unknown option: %1", line));
+ KMessageBox::information(nullptr, i18n("Unknown option: %1", line));
}
continue;
}
@@ -500,7 +500,7 @@ NMVariantMapMap OpenVpnUiPlugin::importConnectionSettings(const \
QString &fileNam
dataMap.insert(QLatin1String(NM_OPENVPN_KEY_LOCAL_IP), \
key_value[1]);
dataMap.insert(QLatin1String(NM_OPENVPN_KEY_REMOTE_IP), \
key_value[2]); } else {
- KMessageBox::information(0, i18n("Invalid number of arguments \
(expected 2) in option: %1", line)); + \
KMessageBox::information(nullptr, i18n("Invalid number of arguments (expected 2) in \
option: %1", line)); }
continue;
}
@@ -511,7 +511,7 @@ NMVariantMapMap OpenVpnUiPlugin::importConnectionSettings(const \
QString &fileNam if (key_value.count() == 2) {
dataMap.insert(QLatin1String(NM_OPENVPN_KEY_AUTH), key_value[1]);
} else {
- KMessageBox::information(0, i18n("Invalid number of arguments \
(expected 1) in option: %1", line)); + \
KMessageBox::information(nullptr, i18n("Invalid number of arguments (expected 1) in \
option: %1", line)); }
continue;
}
@@ -522,7 +522,7 @@ NMVariantMapMap OpenVpnUiPlugin::importConnectionSettings(const \
QString &fileNam }
if (key_direction != 0 && key_direction != 1) {
- KMessageBox::information(0, i18n("Invalid argument in option: %1", \
line)); + KMessageBox::information(nullptr, i18n("Invalid argument in \
option: %1", line)); key_direction = -1;
}
continue;
@@ -666,7 +666,7 @@ QString OpenVpnUiPlugin::saveFile(QTextStream &in, const QString \
&endTag, const
QDir().mkpath(certificatesDirectory);
if (!outFile.open(QFile::WriteOnly | QFile::Text)) {
- KMessageBox::information(0, i18n("Error saving file %1: %2", \
absoluteFilePath, outFile.errorString())); + KMessageBox::information(nullptr, \
i18n("Error saving file %1: %2", absoluteFilePath, outFile.errorString())); return \
QString(); }
@@ -694,7 +694,7 @@ QString OpenVpnUiPlugin::tryToCopyToCertificatesDirectory(const \
QString &connect
QDir().mkpath(certificatesDirectory);
if (!sourceFile.copy(absoluteFilePath)) {
- KMessageBox::information(0, i18n("Error copying certificate to %1: %2", \
absoluteFilePath, sourceFile.errorString())); + \
KMessageBox::information(nullptr, i18n("Error copying certificate to %1: %2", \
absoluteFilePath, sourceFile.errorString())); return sourceFilePath;
}
diff --git a/vpn/openvpn/openvpn.h b/vpn/openvpn/openvpn.h
index da127bfc..69f8c6ee 100644
--- a/vpn/openvpn/openvpn.h
+++ b/vpn/openvpn/openvpn.h
@@ -33,10 +33,10 @@ class Q_DECL_EXPORT OpenVpnUiPlugin : public VpnUiPlugin
{
Q_OBJECT
public:
- explicit OpenVpnUiPlugin(QObject * parent = 0, const QVariantList& = \
QVariantList()); + explicit OpenVpnUiPlugin(QObject * parent = nullptr, const \
QVariantList& = QVariantList()); ~OpenVpnUiPlugin() override;
- SettingWidget * widget(const NetworkManager::VpnSetting::Ptr &setting, QWidget * \
parent = 0) override;
- SettingWidget * askUser(const NetworkManager::VpnSetting::Ptr &setting, QWidget \
* parent = 0) override; + SettingWidget * widget(const \
NetworkManager::VpnSetting::Ptr &setting, QWidget * parent = nullptr) override; + \
SettingWidget * askUser(const NetworkManager::VpnSetting::Ptr &setting, QWidget * \
parent = nullptr) override;
QString suggestedFileName(const NetworkManager::ConnectionSettings::Ptr \
&connection) const override; QString supportedFileExtensions() const override;
diff --git a/vpn/openvpn/openvpnadvancedwidget.cpp \
b/vpn/openvpn/openvpnadvancedwidget.cpp index 2689d554..2cfaa13a 100644
--- a/vpn/openvpn/openvpnadvancedwidget.cpp
+++ b/vpn/openvpn/openvpnadvancedwidget.cpp
@@ -164,7 +164,7 @@ void OpenVpnAdvancedWidget::openVpnCipherFinished(int exitCode, \
QProcess::ExitSt
m_ui->cboCipher->addItem(i18nc("@item:inlistbox Item added when OpenVPN \
cipher lookup failed", "OpenVPN cipher lookup failed")); }
delete d->openvpnCipherProcess;
- d->openvpnCipherProcess = 0;
+ d->openvpnCipherProcess = nullptr;
d->openvpnCiphers = QByteArray();
d->gotOpenVpnCiphers = true;
@@ -209,7 +209,7 @@ void OpenVpnAdvancedWidget::openVpnVersionFinished(int exitCode, \
QProcess::ExitS }
delete d->openvpnVersionProcess;
- d->openvpnVersionProcess = 0;
+ d->openvpnVersionProcess = nullptr;
d->openVpnVersion = QByteArray();
d->gotOpenVpnVersion = true;
diff --git a/vpn/openvpn/openvpnadvancedwidget.h \
b/vpn/openvpn/openvpnadvancedwidget.h index a3f62357..c25fd934 100644
--- a/vpn/openvpn/openvpnadvancedwidget.h
+++ b/vpn/openvpn/openvpnadvancedwidget.h
@@ -47,7 +47,7 @@ class OpenVpnAdvancedWidget : public QDialog
};
public:
- explicit OpenVpnAdvancedWidget(const NetworkManager::VpnSetting::Ptr &setting, \
QWidget *parent = 0); + explicit OpenVpnAdvancedWidget(const \
NetworkManager::VpnSetting::Ptr &setting, QWidget *parent = nullptr); \
~OpenVpnAdvancedWidget() override; void init();
diff --git a/vpn/openvpn/openvpnauth.h b/vpn/openvpn/openvpnauth.h
index e9609399..9fa6c3cb 100644
--- a/vpn/openvpn/openvpnauth.h
+++ b/vpn/openvpn/openvpnauth.h
@@ -33,7 +33,7 @@ class OpenVpnAuthWidget : public SettingWidget
Q_OBJECT
Q_DECLARE_PRIVATE(OpenVpnAuthWidget)
public:
- explicit OpenVpnAuthWidget(const NetworkManager::VpnSetting::Ptr &setting, \
QWidget *parent = 0); + explicit OpenVpnAuthWidget(const \
NetworkManager::VpnSetting::Ptr &setting, QWidget *parent = nullptr); \
~OpenVpnAuthWidget() override; virtual void readSecrets();
QVariantMap setting() const override;
diff --git a/vpn/openvpn/openvpnwidget.h b/vpn/openvpn/openvpnwidget.h
index 9440debd..f3e7b11b 100644
--- a/vpn/openvpn/openvpnwidget.h
+++ b/vpn/openvpn/openvpnwidget.h
@@ -37,7 +37,7 @@ class OpenVpnSettingWidget : public SettingWidget
{
Q_OBJECT
public:
- explicit OpenVpnSettingWidget(const NetworkManager::VpnSetting::Ptr &setting, \
QWidget *parent = 0); + explicit OpenVpnSettingWidget(const \
NetworkManager::VpnSetting::Ptr &setting, QWidget *parent = nullptr); \
~OpenVpnSettingWidget() override;
void loadConfig(const NetworkManager::Setting::Ptr &setting) override;
diff --git a/vpn/pptp/pptp.h b/vpn/pptp/pptp.h
index 99071be3..e6d28762 100644
--- a/vpn/pptp/pptp.h
+++ b/vpn/pptp/pptp.h
@@ -30,10 +30,10 @@ class Q_DECL_EXPORT PptpUiPlugin : public VpnUiPlugin
{
Q_OBJECT
public:
- explicit PptpUiPlugin(QObject * parent = 0, const QVariantList& = \
QVariantList()); + explicit PptpUiPlugin(QObject * parent = nullptr, const \
QVariantList& = QVariantList()); ~PptpUiPlugin() override;
- SettingWidget * widget(const NetworkManager::VpnSetting::Ptr &setting, QWidget * \
parent = 0) override;
- SettingWidget * askUser(const NetworkManager::VpnSetting::Ptr &setting, QWidget \
* parent = 0) override; + SettingWidget * widget(const \
NetworkManager::VpnSetting::Ptr &setting, QWidget * parent = nullptr) override; + \
SettingWidget * askUser(const NetworkManager::VpnSetting::Ptr &setting, QWidget * \
parent = nullptr) override;
QString suggestedFileName(const NetworkManager::ConnectionSettings::Ptr \
&connection) const override; QString supportedFileExtensions() const override;
diff --git a/vpn/pptp/pptpauth.h b/vpn/pptp/pptpauth.h
index a1fb136a..dc0dd2a8 100644
--- a/vpn/pptp/pptpauth.h
+++ b/vpn/pptp/pptpauth.h
@@ -33,7 +33,7 @@ class PptpAuthWidget : public SettingWidget
Q_OBJECT
Q_DECLARE_PRIVATE(PptpAuthWidget)
public:
- explicit PptpAuthWidget(const NetworkManager::VpnSetting::Ptr &setting, QWidget \
*parent = 0); + explicit PptpAuthWidget(const NetworkManager::VpnSetting::Ptr \
&setting, QWidget *parent = nullptr); ~PptpAuthWidget() override;
QVariantMap setting() const override;
diff --git a/vpn/pptp/pptpwidget.cpp b/vpn/pptp/pptpwidget.cpp
index ecca0666..556c4ab4 100644
--- a/vpn/pptp/pptpwidget.cpp
+++ b/vpn/pptp/pptpwidget.cpp
@@ -125,7 +125,7 @@ void PptpSettingWidget::loadConfig(const \
NetworkManager::Setting::Ptr &setting)
bool refuse_mschapv2 = (dataMap[NM_PPTP_KEY_REFUSE_MSCHAPV2] == yesString);
bool refuse_eap = (dataMap[NM_PPTP_KEY_REFUSE_EAP] == yesString);
- QListWidgetItem * item = 0;
+ QListWidgetItem * item = nullptr;
item = d->advUi.listWidget->item(0); // PAP
item->setCheckState(refuse_pap ? Qt::Unchecked : Qt::Checked);
item = d->advUi.listWidget->item(1); // CHAP
@@ -216,7 +216,7 @@ QVariantMap PptpSettingWidget::setting() const
// Advanced dialog settings
// Authenfication options
- QListWidgetItem * item = 0;
+ QListWidgetItem * item = nullptr;
item = d->advUi.listWidget->item(0); // PAP
const QString yesString = QLatin1String("yes");
if (item->checkState() == Qt::Unchecked) {
diff --git a/vpn/pptp/pptpwidget.h b/vpn/pptp/pptpwidget.h
index 696ed9b5..5a065dbe 100644
--- a/vpn/pptp/pptpwidget.h
+++ b/vpn/pptp/pptpwidget.h
@@ -34,7 +34,7 @@ class PptpSettingWidget : public SettingWidget
Q_OBJECT
Q_DECLARE_PRIVATE(PptpSettingWidget)
public:
- explicit PptpSettingWidget(const NetworkManager::VpnSetting::Ptr &setting, \
QWidget *parent = 0); + explicit PptpSettingWidget(const \
NetworkManager::VpnSetting::Ptr &setting, QWidget *parent = nullptr); \
~PptpSettingWidget() override;
void loadConfig(const NetworkManager::Setting::Ptr &setting) override;
diff --git a/vpn/ssh/ssh.h b/vpn/ssh/ssh.h
index 715d3b96..d2f722a5 100644
--- a/vpn/ssh/ssh.h
+++ b/vpn/ssh/ssh.h
@@ -27,10 +27,10 @@ class Q_DECL_EXPORT SshUiPlugin : public VpnUiPlugin
{
Q_OBJECT
public:
- explicit SshUiPlugin(QObject * parent = 0, const QVariantList& = \
QVariantList()); + explicit SshUiPlugin(QObject * parent = nullptr, const \
QVariantList& = QVariantList()); ~SshUiPlugin() override;
- SettingWidget * widget(const NetworkManager::VpnSetting::Ptr &setting, QWidget * \
parent = 0) override;
- SettingWidget * askUser(const NetworkManager::VpnSetting::Ptr &setting, QWidget \
* parent = 0) override; + SettingWidget * widget(const \
NetworkManager::VpnSetting::Ptr &setting, QWidget * parent = nullptr) override; + \
SettingWidget * askUser(const NetworkManager::VpnSetting::Ptr &setting, QWidget * \
parent = nullptr) override;
QString suggestedFileName(const NetworkManager::ConnectionSettings::Ptr \
&connection) const override; QString supportedFileExtensions() const override;
diff --git a/vpn/ssh/sshauth.h b/vpn/ssh/sshauth.h
index 7abc6476..2c7ef5b6 100644
--- a/vpn/ssh/sshauth.h
+++ b/vpn/ssh/sshauth.h
@@ -32,7 +32,7 @@ class SshAuthWidget : public SettingWidget
Q_OBJECT
Q_DECLARE_PRIVATE(SshAuthWidget)
public:
- explicit SshAuthWidget(const NetworkManager::VpnSetting::Ptr &setting, QWidget \
*parent = 0); + explicit SshAuthWidget(const NetworkManager::VpnSetting::Ptr \
&setting, QWidget *parent = nullptr); ~SshAuthWidget() override;
QVariantMap setting() const override;
diff --git a/vpn/ssh/sshwidget.h b/vpn/ssh/sshwidget.h
index 51112325..1f151701 100644
--- a/vpn/ssh/sshwidget.h
+++ b/vpn/ssh/sshwidget.h
@@ -33,7 +33,7 @@ class SshSettingWidget : public SettingWidget
Q_OBJECT
Q_DECLARE_PRIVATE(SshSettingWidget)
public:
- explicit SshSettingWidget(const NetworkManager::VpnSetting::Ptr &setting, \
QWidget *parent = 0); + explicit SshSettingWidget(const \
NetworkManager::VpnSetting::Ptr &setting, QWidget *parent = nullptr); \
~SshSettingWidget() override;
void loadConfig(const NetworkManager::Setting::Ptr &setting) override;
diff --git a/vpn/sstp/sstp.h b/vpn/sstp/sstp.h
index 46108c80..3447bff5 100644
--- a/vpn/sstp/sstp.h
+++ b/vpn/sstp/sstp.h
@@ -27,10 +27,10 @@ class Q_DECL_EXPORT SstpUiPlugin : public VpnUiPlugin
{
Q_OBJECT
public:
- explicit SstpUiPlugin(QObject *parent = 0, const QVariantList& = \
QVariantList()); + explicit SstpUiPlugin(QObject *parent = nullptr, const \
QVariantList& = QVariantList()); ~SstpUiPlugin() override;
- SettingWidget * widget(const NetworkManager::VpnSetting::Ptr &setting, QWidget \
*parent = 0) override;
- SettingWidget * askUser(const NetworkManager::VpnSetting::Ptr &setting, QWidget \
*parent = 0) override; + SettingWidget * widget(const \
NetworkManager::VpnSetting::Ptr &setting, QWidget *parent = nullptr) override; + \
SettingWidget * askUser(const NetworkManager::VpnSetting::Ptr &setting, QWidget \
*parent = nullptr) override;
QString suggestedFileName(const NetworkManager::ConnectionSettings::Ptr \
&connection) const override; QString supportedFileExtensions() const override;
diff --git a/vpn/sstp/sstpauth.h b/vpn/sstp/sstpauth.h
index c253f879..bfff6e25 100644
--- a/vpn/sstp/sstpauth.h
+++ b/vpn/sstp/sstpauth.h
@@ -32,7 +32,7 @@ class SstpAuthWidget : public SettingWidget
Q_OBJECT
Q_DECLARE_PRIVATE(SstpAuthWidget)
public:
- explicit SstpAuthWidget(const NetworkManager::VpnSetting::Ptr &setting, QWidget \
*parent = 0); + explicit SstpAuthWidget(const NetworkManager::VpnSetting::Ptr \
&setting, QWidget *parent = nullptr); ~SstpAuthWidget() override;
QVariantMap setting() const override;
diff --git a/vpn/sstp/sstpwidget.cpp b/vpn/sstp/sstpwidget.cpp
index b5d4a14b..208dca6d 100644
--- a/vpn/sstp/sstpwidget.cpp
+++ b/vpn/sstp/sstpwidget.cpp
@@ -129,7 +129,7 @@ void SstpSettingWidget::loadConfig(const \
NetworkManager::Setting::Ptr &setting)
bool refuse_mschapv2 = (dataMap[QLatin1String(NM_SSTP_KEY_REFUSE_MSCHAPV2)] == \
yesString);
bool refuse_eap = (dataMap[QLatin1String(NM_SSTP_KEY_REFUSE_EAP)] == yesString);
- QListWidgetItem *item = 0;
+ QListWidgetItem *item = nullptr;
item = d->advUi.listWidget->item(0); // PAP
item->setCheckState(refuse_pap ? Qt::Unchecked : Qt::Checked);
item = d->advUi.listWidget->item(1); // CHAP
@@ -253,7 +253,7 @@ QVariantMap SstpSettingWidget::setting() const
}
// Advanced configuration
- QListWidgetItem *item = 0;
+ QListWidgetItem *item = nullptr;
item = d->advUi.listWidget->item(0); // PAP
if (item->checkState() == Qt::Unchecked) {
data.insert(QLatin1String(NM_SSTP_KEY_REFUSE_PAP), yesString);
diff --git a/vpn/sstp/sstpwidget.h b/vpn/sstp/sstpwidget.h
index 8351a751..b61d325b 100644
--- a/vpn/sstp/sstpwidget.h
+++ b/vpn/sstp/sstpwidget.h
@@ -34,7 +34,7 @@ class SstpSettingWidget : public SettingWidget
Q_OBJECT
Q_DECLARE_PRIVATE(SstpSettingWidget)
public:
- explicit SstpSettingWidget(const NetworkManager::VpnSetting::Ptr &setting, \
QWidget *parent = 0); + explicit SstpSettingWidget(const \
NetworkManager::VpnSetting::Ptr &setting, QWidget *parent = nullptr); \
~SstpSettingWidget() override;
void loadConfig(const NetworkManager::Setting::Ptr &setting) override;
diff --git a/vpn/strongswan/strongswan.h b/vpn/strongswan/strongswan.h
index c4a36989..3ed24d62 100644
--- a/vpn/strongswan/strongswan.h
+++ b/vpn/strongswan/strongswan.h
@@ -31,10 +31,10 @@ class Q_DECL_EXPORT StrongswanUiPlugin : public VpnUiPlugin
{
Q_OBJECT
public:
- explicit StrongswanUiPlugin(QObject * parent = 0, const QVariantList& = \
QVariantList()); + explicit StrongswanUiPlugin(QObject * parent = nullptr, const \
QVariantList& = QVariantList()); ~StrongswanUiPlugin() override;
- SettingWidget * widget(const NetworkManager::VpnSetting::Ptr &setting, QWidget * \
parent = 0) override;
- SettingWidget * askUser(const NetworkManager::VpnSetting::Ptr &setting, QWidget \
* parent = 0) override; + SettingWidget * widget(const \
NetworkManager::VpnSetting::Ptr &setting, QWidget * parent = nullptr) override; + \
SettingWidget * askUser(const NetworkManager::VpnSetting::Ptr &setting, QWidget * \
parent = nullptr) override;
QString suggestedFileName(const NetworkManager::ConnectionSettings::Ptr \
&connection) const override; QString supportedFileExtensions() const override;
diff --git a/vpn/strongswan/strongswanauth.cpp b/vpn/strongswan/strongswanauth.cpp
index af327b84..a064351e 100644
--- a/vpn/strongswan/strongswanauth.cpp
+++ b/vpn/strongswan/strongswanauth.cpp
@@ -115,7 +115,7 @@ QVariantMap StrongswanAuthWidget::setting() const
if (!agent.isEmpty()) {
secrets.insert(NM_STRONGSWAN_AUTH_AGENT, agent);
} else {
- KMessageBox::error(0, i18nc("@label:textbox error message while saving \
configuration", "Configuration uses ssh-agent for authentication, but no ssh-agent \
found running.")); + KMessageBox::error(nullptr, i18nc("@label:textbox \
error message while saving configuration", "Configuration uses ssh-agent for \
authentication, but no ssh-agent found running.")); }
} else {
secrets.insert(NM_STRONGSWAN_SECRET, d->ui.password->text());
diff --git a/vpn/strongswan/strongswanauth.h b/vpn/strongswan/strongswanauth.h
index 32a92092..2bdfbe66 100644
--- a/vpn/strongswan/strongswanauth.h
+++ b/vpn/strongswan/strongswanauth.h
@@ -33,7 +33,7 @@ class StrongswanAuthWidget : public SettingWidget
Q_OBJECT
Q_DECLARE_PRIVATE(StrongswanAuthWidget)
public:
- explicit StrongswanAuthWidget(const NetworkManager::VpnSetting::Ptr &setting, \
QWidget * parent = 0); + explicit StrongswanAuthWidget(const \
NetworkManager::VpnSetting::Ptr &setting, QWidget * parent = nullptr); \
~StrongswanAuthWidget() override;
virtual void readSecrets();
diff --git a/vpn/strongswan/strongswanwidget.h b/vpn/strongswan/strongswanwidget.h
index 0a9a142e..c8322d54 100644
--- a/vpn/strongswan/strongswanwidget.h
+++ b/vpn/strongswan/strongswanwidget.h
@@ -36,7 +36,7 @@ class StrongswanSettingWidget : public SettingWidget
Q_OBJECT
Q_DECLARE_PRIVATE(StrongswanSettingWidget)
public:
- explicit StrongswanSettingWidget(const NetworkManager::VpnSetting::Ptr &setting, \
QWidget *parent = 0); + explicit StrongswanSettingWidget(const \
NetworkManager::VpnSetting::Ptr &setting, QWidget *parent = nullptr); \
~StrongswanSettingWidget() override;
void loadConfig(const NetworkManager::Setting::Ptr &setting) override;
diff --git a/vpn/vpnc/vpnc.cpp b/vpn/vpnc/vpnc.cpp
index 840a1323..7ff82145 100644
--- a/vpn/vpnc/vpnc.cpp
+++ b/vpn/vpnc/vpnc.cpp
@@ -46,7 +46,7 @@
VpncUiPluginPrivate::VpncUiPluginPrivate()
{
decryptedPasswd.clear();
- ciscoDecrypt = 0;
+ ciscoDecrypt = nullptr;
}
VpncUiPluginPrivate::~VpncUiPluginPrivate()
@@ -86,7 +86,7 @@ void VpncUiPluginPrivate::ciscoDecryptError(QProcess::ProcessError \
pError) {
if (!pError) {
qCWarning(PLASMA_NM) << "Error in executing cisco-decrypt";
- KMessageBox::error(0, i18n("Error decrypting the obfuscated password"), \
i18n("Error"), KMessageBox::Notify); + KMessageBox::error(nullptr, i18n("Error \
decrypting the obfuscated password"), i18n("Error"), KMessageBox::Notify); }
decryptedPasswd.clear();
}
@@ -131,7 +131,7 @@ NMVariantMapMap VpncUiPlugin::importConnectionSettings(const \
QString &fileName) {
// qCDebug(PLASMA_NM) << "Importing Cisco VPN connection from " << fileName;
- VpncUiPluginPrivate * decrPlugin = 0;
+ VpncUiPluginPrivate * decrPlugin = nullptr;
NMVariantMapMap result;
if (!fileName.endsWith(QLatin1String(".pcf"), Qt::CaseInsensitive)) {
@@ -265,7 +265,7 @@ NMVariantMapMap VpncUiPlugin::importConnectionSettings(const \
QString &fileName)
data.insert(NM_VPNC_KEY_DHGROUP, \
decrPlugin->readStringKeyValue(cg,"DHGroup")); // Tunneling Mode - not supported by \
vpnc if (cg.readEntry("TunnelingMode").toInt() == 1) {
- KMessageBox::error(0, i18n("The VPN settings file '%1' specifies that \
VPN traffic should be tunneled through TCP which is currently not supported in the \
vpnc software.\n\nThe connection can still be created, with TCP tunneling disabled, \
however it may not work as expected.", fileName), i18n("Not supported"), \
KMessageBox::Notify); + KMessageBox::error(nullptr, i18n("The VPN settings \
file '%1' specifies that VPN traffic should be tunneled through TCP which is \
currently not supported in the vpnc software.\n\nThe connection can still be created, \
with TCP tunneling disabled, however it may not work as expected.", fileName), \
i18n("Not supported"), KMessageBox::Notify); }
// EnableLocalLAN and X-NM-Routes are to be added to IPv4Setting
if (!cg.readEntry("EnableLocalLAN").isEmpty()) {
diff --git a/vpn/vpnc/vpnc.h b/vpn/vpnc/vpnc.h
index ddd8e7ab..0c3891bd 100644
--- a/vpn/vpnc/vpnc.h
+++ b/vpn/vpnc/vpnc.h
@@ -52,10 +52,10 @@ class Q_DECL_EXPORT VpncUiPlugin : public VpnUiPlugin
Q_OBJECT
public:
- explicit VpncUiPlugin(QObject * parent = 0, const QVariantList& = \
QVariantList()); + explicit VpncUiPlugin(QObject * parent = nullptr, const \
QVariantList& = QVariantList()); ~VpncUiPlugin() override;
- SettingWidget * widget(const NetworkManager::VpnSetting::Ptr &setting, QWidget * \
parent = 0) override;
- SettingWidget * askUser(const NetworkManager::VpnSetting::Ptr &setting, QWidget \
* parent = 0) override; + SettingWidget * widget(const \
NetworkManager::VpnSetting::Ptr &setting, QWidget * parent = nullptr) override; + \
SettingWidget * askUser(const NetworkManager::VpnSetting::Ptr &setting, QWidget * \
parent = nullptr) override;
QString suggestedFileName(const NetworkManager::ConnectionSettings::Ptr \
&connection) const override; QString supportedFileExtensions() const override;
diff --git a/vpn/vpnc/vpncadvancedwidget.h b/vpn/vpnc/vpncadvancedwidget.h
index b0bc6d16..31372506 100644
--- a/vpn/vpnc/vpncadvancedwidget.h
+++ b/vpn/vpnc/vpncadvancedwidget.h
@@ -34,7 +34,7 @@ class VpncAdvancedWidget : public QDialog
{
Q_OBJECT
public:
- explicit VpncAdvancedWidget(const NetworkManager::VpnSetting::Ptr &setting, \
QWidget *parent = 0); + explicit VpncAdvancedWidget(const \
NetworkManager::VpnSetting::Ptr &setting, QWidget *parent = nullptr); \
~VpncAdvancedWidget() override;
NMStringMap setting() const;
diff --git a/vpn/vpnc/vpncauth.h b/vpn/vpnc/vpncauth.h
index cc2c3546..6b66bd48 100644
--- a/vpn/vpnc/vpncauth.h
+++ b/vpn/vpnc/vpncauth.h
@@ -33,7 +33,7 @@ class VpncAuthDialog : public SettingWidget
Q_OBJECT
Q_DECLARE_PRIVATE(VpncAuthDialog)
public:
- explicit VpncAuthDialog(const NetworkManager::VpnSetting::Ptr &setting, QWidget \
*parent = 0); + explicit VpncAuthDialog(const NetworkManager::VpnSetting::Ptr \
&setting, QWidget *parent = nullptr); ~VpncAuthDialog() override;
virtual void readSecrets();
diff --git a/vpn/vpnc/vpncwidget.h b/vpn/vpnc/vpncwidget.h
index ea208b8b..ce15b8fd 100644
--- a/vpn/vpnc/vpncwidget.h
+++ b/vpn/vpnc/vpncwidget.h
@@ -37,7 +37,7 @@ class VpncWidget : public SettingWidget
{
Q_OBJECT
public:
- explicit VpncWidget(const NetworkManager::VpnSetting::Ptr &setting, QWidget \
*parent = 0, Qt::WindowFlags f = 0); + explicit VpncWidget(const \
NetworkManager::VpnSetting::Ptr &setting, QWidget *parent = nullptr, Qt::WindowFlags \
f = {}); ~VpncWidget() override;
void loadConfig(const NetworkManager::Setting::Ptr &setting) override;
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic