diff options
| -rw-r--r-- | .qmake.conf | 2 | ||||
| -rw-r--r-- | src/networksettings/connman/qnetworksettingsmanager_p.cpp | 7 |
2 files changed, 4 insertions, 5 deletions
diff --git a/.qmake.conf b/.qmake.conf index c672f20..e578a2a 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -1,3 +1,3 @@ load(qt_build_config) -MODULE_VERSION=5.13.1 +MODULE_VERSION=5.14.0 CMAKE_MODULE_TESTS=- diff --git a/src/networksettings/connman/qnetworksettingsmanager_p.cpp b/src/networksettings/connman/qnetworksettingsmanager_p.cpp index ffcef49..5bea9e2 100644 --- a/src/networksettings/connman/qnetworksettingsmanager_p.cpp +++ b/src/networksettings/connman/qnetworksettingsmanager_p.cpp @@ -101,7 +101,7 @@ bool QNetworkSettingsManagerPrivate::initialize() m_initialized = true; } else { delete m_manager; - m_manager = NULL; + m_manager = nullptr; m_initialized = false; } return m_initialized; @@ -109,8 +109,8 @@ bool QNetworkSettingsManagerPrivate::initialize() void QNetworkSettingsManagerPrivate::requestInput(const QString& service, const QString& type) { - Q_UNUSED(service); - Q_UNUSED(type); + Q_UNUSED(service) + Q_UNUSED(type) emit m_agent->showUserCredentialsInput(); } @@ -192,7 +192,6 @@ void QNetworkSettingsManagerPrivate::onTechnologyRemoved(const QDBusObjectPath & void QNetworkSettingsManagerPrivate::getServicesFinished(QDBusPendingCallWatcher *watcher) { - Q_Q(QNetworkSettingsManager); QDBusPendingReply<ConnmanMapStructList> reply = *watcher; watcher->deleteLater(); |