From c4c34efada04666de48718561b4083adfc4ae561 Mon Sep 17 00:00:00 2001 From: Rainer Keller Date: Mon, 24 Oct 2016 16:16:51 +0200 Subject: =?UTF-8?q?Fix=20compile=20errors:=20declaration=20of=20=E2=80=98=E2=80=99=20shadows=20a=20member=20of=20'this'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I2e4ca1a308a491deb1ef2d9ea716e8b47a4b8898 Reviewed-by: Kimmo Ollila Reviewed-by: Teemu Holappa Reviewed-by: Samuli Piippo --- src/networksettings/networksettings.pro | 1 + src/networksettings/qnetworksettings.cpp | 259 +++++++++++++++++++++++++++++ src/networksettings/qnetworksettings.h | 269 ++++++------------------------- 3 files changed, 309 insertions(+), 220 deletions(-) create mode 100644 src/networksettings/qnetworksettings.cpp (limited to 'src') diff --git a/src/networksettings/networksettings.pro b/src/networksettings/networksettings.pro index 9ae1bb3..db2ce06 100644 --- a/src/networksettings/networksettings.pro +++ b/src/networksettings/networksettings.pro @@ -19,6 +19,7 @@ else { # Input SOURCES += \ qnetworksettingsinterfacemodel.cpp \ + qnetworksettings.cpp \ qnetworksettingsmanager.cpp \ qnetworksettingsaddressmodel.cpp \ qnetworksettingsservicemodel.cpp \ diff --git a/src/networksettings/qnetworksettings.cpp b/src/networksettings/qnetworksettings.cpp new file mode 100644 index 0000000..18747e1 --- /dev/null +++ b/src/networksettings/qnetworksettings.cpp @@ -0,0 +1,259 @@ +/**************************************************************************** +** +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the Device Utilities module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:GPL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ +#include "qnetworksettings.h" + +QNetworkSettingsState::QNetworkSettingsState(States state, QObject *parent) + : QObject(parent) + , m_state(state) +{ +} + +QNetworkSettingsState::QNetworkSettingsState(QObject *parent) + : QObject(parent) + , m_state(Undefined) +{ +} + +QNetworkSettingsState::States QNetworkSettingsState::state() const { + return m_state; +} + +void QNetworkSettingsState::setState(const States state) { + m_state = state; + emit stateChanged(); +} + +QNetworkSettingsType::QNetworkSettingsType(Types type, QObject *parent) + : QObject(parent) + , m_type(type) +{ + m_type = type; +} + +QNetworkSettingsType::QNetworkSettingsType(QObject *parent) + : QObject(parent) +{ + m_type = Unknown; +} + +QNetworkSettingsType::Types QNetworkSettingsType::type() const { + return m_type; +} + +void QNetworkSettingsType::setType(const Types type) { + m_type = type; + emit typeChanged(); +} + +QNetworkSettingsIPv4::QNetworkSettingsIPv4(QObject *parent) + : QObject(parent) +{ +} + +QString QNetworkSettingsIPv4::address() const { + return m_address; +} +void QNetworkSettingsIPv4::setAddress(const QString& adderess) { + m_address = adderess; + emit addressChanged(); +} + +QString QNetworkSettingsIPv4::gateway() const { + return m_gateway; +} + +void QNetworkSettingsIPv4::setGateway(const QString& gateway) { + m_gateway = gateway; + emit gatewayChanged(); +} + +QNetworkSettingsIPv4::MethodType QNetworkSettingsIPv4::method() const { + return m_method; +} + +void QNetworkSettingsIPv4::setMethod(const MethodType method) { + m_method = method; + emit methodChanged(); +} + +QString QNetworkSettingsIPv4::mask() const { + return m_mask; +} + +void QNetworkSettingsIPv4::setMask(const QString& mask) { + m_mask = mask; + emit maskChanged(); +} + +QNetworkSettingsIPv6::QNetworkSettingsIPv6(QObject *parent) + : QObject(parent) +{ +} + +QString QNetworkSettingsIPv6::address() const { + return m_address; +} + +void QNetworkSettingsIPv6::setAddress(const QString& adderess) { + m_address = adderess; + emit addressChanged(); +} + +QString QNetworkSettingsIPv6::gateway() const { + return m_gateway; +} + +void QNetworkSettingsIPv6::setGateway(const QString& gateway) { + m_gateway = gateway; + emit gatewayChanged(); +} + +QNetworkSettingsIPv6::MethodType QNetworkSettingsIPv6::method() const { + return m_method; +} + +void QNetworkSettingsIPv6::setMethod(const MethodType method) { + m_method = method; + emit methodChanged(); +} + +QNetworkSettingsIPv6::PrivacyType QNetworkSettingsIPv6::privacy() const { + return m_privacy; +} + +void QNetworkSettingsIPv6::setPrivacy(const PrivacyType privacy) { + m_privacy = privacy; + emit privacyChanged(); +} + +int QNetworkSettingsIPv6::prefixLength() const { + return m_prefixLength; +} + +void QNetworkSettingsIPv6::setPrefixLength(const int& prefixLength) { + m_prefixLength = prefixLength; + emit prefixLengthChanged(); +} + +QNetworkSettingsProxy::QNetworkSettingsProxy(QObject *parent) + : QObject(parent) +{ + +} + +QUrl QNetworkSettingsProxy::url() const { + return m_url; +} + +void QNetworkSettingsProxy::setUrl(const QUrl& url) { + m_url = url; + emit urlChanged(); +} + +QAbstractItemModel* QNetworkSettingsProxy::servers(void) { + return &m_servers; +} + +void QNetworkSettingsProxy::setServers(const QStringList& servers) { + m_servers.setStringList(servers); + emit serversChanged(); +} + +QStringList QNetworkSettingsProxy::servers() const { + return m_servers.stringList(); +} + +QAbstractItemModel* QNetworkSettingsProxy::excludes(void) { + return &m_excludes; +} + +QStringList QNetworkSettingsProxy::excludes() const { + return m_excludes.stringList(); +} + +void QNetworkSettingsProxy::setExcludes(const QStringList& excludes) { + m_excludes.setStringList(excludes); + emit excludesChanged(); +} + +QNetworkSettingsProxy::MethodType QNetworkSettingsProxy::method(void) const { + return m_method; +} + +void QNetworkSettingsProxy::setMethod(const MethodType& method) { + m_method = method; + emit methodChanged(); +} + +QNetworkSettingsWireless::QNetworkSettingsWireless(QObject* parent) + : QObject(parent) { +} + +bool QNetworkSettingsWireless::supportsSecurity(SecurityFlags security) { + if (m_securityFlags & security) { + return true; + } + return false; +} + +bool QNetworkSettingsWireless::hidden() const { + return m_hidden; +} + +void QNetworkSettingsWireless::setHidden(const bool hidden) { + m_hidden = hidden; + emit hiddenChanged(); +} + +int QNetworkSettingsWireless::signalStrength() const { + return m_signalStrength; +} + +void QNetworkSettingsWireless::setSignalStrength(const int signalStrength) { + m_signalStrength = signalStrength; + emit signalStrengthChanged(); +} + +void QNetworkSettingsWireless::setSecurity(const SecurityFlags security) { + if (security == None) { + m_securityFlags = None; + } else { + m_securityFlags |= security; + } +} + +void QNetworkSettingsWireless::setOutOfRange(const bool aOutOfRange) { + m_isOutOfRange = aOutOfRange; + emit outOfRangeChanged(); +} + +bool QNetworkSettingsWireless::outOfRange() const { + return m_isOutOfRange; +} + diff --git a/src/networksettings/qnetworksettings.h b/src/networksettings/qnetworksettings.h index 31561f4..c0a400b 100644 --- a/src/networksettings/qnetworksettings.h +++ b/src/networksettings/qnetworksettings.h @@ -43,26 +43,11 @@ class Q_DECL_EXPORT QNetworkSettingsState : public QObject public: enum States {Idle, Failure, Association, Configuration, Ready, Disconnect, Online, Undefined}; - explicit QNetworkSettingsState(States state, QObject *parent = Q_NULLPTR) - : QObject(parent) - { - m_state = state; - } - - explicit QNetworkSettingsState(QObject *parent = Q_NULLPTR) - : QObject(parent) - { - m_state = Undefined; - } - - States state() const { - return m_state; - } - - void setState(const States state) { - m_state = state; - Q_EMIT stateChanged(); - } + explicit QNetworkSettingsState(States state, QObject *parent = Q_NULLPTR); + explicit QNetworkSettingsState(QObject *parent = Q_NULLPTR); + + States state() const; + void setState(const States state); Q_SIGNALS: void stateChanged(); @@ -85,27 +70,11 @@ public: Unknown }; - explicit QNetworkSettingsType(Types type, QObject *parent = Q_NULLPTR) - : QObject(parent) - { - m_type = type; - } - - explicit QNetworkSettingsType(QObject *parent = Q_NULLPTR) - : QObject(parent) - { - m_type = Unknown; - } - - - Types type() const { - return m_type; - } + explicit QNetworkSettingsType(Types type, QObject *parent = Q_NULLPTR); + explicit QNetworkSettingsType(QObject *parent = Q_NULLPTR); - void setType(const Types type) { - m_type = type; - Q_EMIT typeChanged(); - } + Types type() const; + void setType(const Types type); Q_SIGNALS: void typeChanged(); @@ -124,48 +93,18 @@ class Q_DECL_EXPORT QNetworkSettingsIPv4 : public QObject Q_PROPERTY(QString mask READ mask WRITE setMask NOTIFY maskChanged) public: - explicit QNetworkSettingsIPv4(QObject *parent = Q_NULLPTR) - : QObject(parent) - { - - } + explicit QNetworkSettingsIPv4(QObject *parent = Q_NULLPTR); enum MethodType {Dhcp, Manual, Off}; - QString address() const { - return m_address; - } - void setAddress(const QString& adderess) { - m_address = adderess; - Q_EMIT addressChanged(); - } - - QString gateway() const { - return m_gateway; - } - - void setGateway(const QString& gateway) { - m_gateway = gateway; - Q_EMIT gatewayChanged(); - } - - MethodType method() const { - return m_method; - } - - void setMethod(const MethodType method) { - m_method = method; - Q_EMIT methodChanged(); - } - - QString mask() const { - return m_mask; - } - - void setMask(const QString& mask) { - m_mask = mask; - Q_EMIT maskChanged(); - } + QString address() const; + void setAddress(const QString& adderess); + QString gateway() const; + void setGateway(const QString& gateway); + MethodType method() const; + void setMethod(const MethodType method); + QString mask() const; + void setMask(const QString& mask); Q_SIGNALS: void addressChanged(); @@ -192,58 +131,21 @@ class Q_DECL_EXPORT QNetworkSettingsIPv6 : public QObject Q_PROPERTY(int prefixLength READ prefixLength WRITE setPrefixLength NOTIFY prefixLengthChanged) public: - explicit QNetworkSettingsIPv6(QObject *parent = Q_NULLPTR) - : QObject(parent) - { - - } + explicit QNetworkSettingsIPv6(QObject *parent = Q_NULLPTR); enum MethodType {Auto, Manual, Off}; enum PrivacyType {Disabled, Enabled, Preferred}; - QString address() const { - return m_address; - } - void setAddress(const QString& adderess) { - m_address = adderess; - Q_EMIT addressChanged(); - } - - QString gateway() const { - return m_gateway; - } - - void setGateway(const QString& gateway) { - m_gateway = gateway; - Q_EMIT gatewayChanged(); - } - - MethodType method() const { - return m_method; - } - - void setMethod(const MethodType method) { - m_method = method; - Q_EMIT methodChanged(); - } - - PrivacyType privacy() const { - return m_privacy; - } - - void setPrivacy(const PrivacyType privacy) { - m_privacy = privacy; - Q_EMIT privacyChanged(); - } - - int prefixLength() const { - return m_prefixLength; - } - - void setPrefixLength(const int& prefixLength) { - m_prefixLength = prefixLength; - Q_EMIT prefixLengthChanged(); - } + QString address() const; + void setAddress(const QString& adderess); + QString gateway() const; + void setGateway(const QString& gateway); + MethodType method() const; + void setMethod(const MethodType method); + PrivacyType privacy() const; + void setPrivacy(const PrivacyType privacy); + int prefixLength() const; + void setPrefixLength(const int& prefixLength); Q_SIGNALS: void addressChanged(); @@ -270,57 +172,20 @@ public: Q_PROPERTY(QAbstractItemModel* excludes READ excludes NOTIFY excludesChanged) Q_PROPERTY(MethodType method READ method WRITE setMethod NOTIFY methodChanged) - explicit QNetworkSettingsProxy(QObject *parent = Q_NULLPTR) - : QObject(parent) - { - - } + explicit QNetworkSettingsProxy(QObject *parent = Q_NULLPTR); enum MethodType {Direct, Auto, Manual}; - QUrl url() const { - return m_url; - } - - void setUrl(const QUrl& url) { - m_url = url; - Q_EMIT urlChanged(); - } - - QAbstractItemModel* servers(void) { - return &m_servers; - } - - void setServers(const QStringList& servers) { - m_servers.setStringList(servers); - Q_EMIT serversChanged(); - } - - QStringList servers() const { - return m_servers.stringList(); - } - - QAbstractItemModel* excludes(void) { - return &m_excludes; - } - - QStringList excludes() const { - return m_excludes.stringList(); - } - - void setExcludes(const QStringList& excludes) { - m_excludes.setStringList(excludes); - Q_EMIT excludesChanged(); - } - - MethodType method(void) const { - return m_method; - } - - void setMethod(const MethodType& method) { - m_method = method; - Q_EMIT methodChanged(); - } + QUrl url() const; + void setUrl(const QUrl& url); + QAbstractItemModel* servers(); + void setServers(const QStringList& servers); + QStringList servers() const; + QAbstractItemModel* excludes(); + QStringList excludes() const; + void setExcludes(const QStringList& excludes); + MethodType method() const; + void setMethod(const MethodType& method); Q_SIGNALS: void urlChanged(); @@ -341,54 +206,18 @@ class Q_DECL_EXPORT QNetworkSettingsWireless : public QObject Q_PROPERTY(bool hidden READ hidden NOTIFY hiddenChanged) Q_PROPERTY(bool isOutOfRange READ outOfRange WRITE setOutOfRange NOTIFY outOfRangeChanged) public: - explicit QNetworkSettingsWireless(QObject* parent = Q_NULLPTR) : - QObject(parent) { - } + explicit QNetworkSettingsWireless(QObject* parent = Q_NULLPTR); enum SecurityFlags {None=1, WEP=2, WPA=4, WPA2=8}; - Q_INVOKABLE bool supportsSecurity(SecurityFlags security) { - if (m_securityFlags & security) { - return true; - } - return false; - } - - bool hidden() const { - return m_hidden; - } - - void setHidden(const bool hidden) { - m_hidden = hidden; - Q_EMIT hiddenChanged(); - } - - int signalStrength() const { - return m_signalStrength; - } - - void setSignalStrength(const int signalStrength) { - m_signalStrength = signalStrength; - Q_EMIT signalStrengthChanged(); - } - - void setSecurity(const SecurityFlags security) { - if (security == None) { - m_securityFlags = None; - } - else { - m_securityFlags |= security; - } - } - - void setOutOfRange(const bool aOutOfRange) { - m_isOutOfRange = aOutOfRange; - Q_EMIT outOfRangeChanged(); - } - - bool outOfRange() const { - return m_isOutOfRange; - } + Q_INVOKABLE bool supportsSecurity(SecurityFlags security); + bool hidden() const; + void setHidden(const bool hidden); + int signalStrength() const; + void setSignalStrength(const int signalStrength); + void setSecurity(const SecurityFlags security); + void setOutOfRange(const bool aOutOfRange); + bool outOfRange() const; Q_SIGNALS: void hiddenChanged(); -- cgit v1.2.3