From 197bed092d8d88446d3708cd393c8f9c3a8d0491 Mon Sep 17 00:00:00 2001 From: Rainer Keller Date: Mon, 24 Oct 2016 15:52:03 +0200 Subject: Fix compile error: 0 is not allowed for pointer initialization anymore Change-Id: Ic8b789a46dafd379fdd48279d6eb138f978e80a5 Reviewed-by: Risto Avila Reviewed-by: Kimmo Ollila Reviewed-by: Teemu Holappa Reviewed-by: Samuli Piippo --- src/bluetoothsettings/bluetoothdevice.h | 2 +- src/bluetoothsettings/bluez/bluetoothdevice_p.h | 2 +- src/bluetoothsettings/discoverymodel.h | 4 ++-- src/displaysettings/displaysettings.h | 2 +- src/displaysettings/displaysettings_p.h | 2 +- src/localdevice/qlocaldevice.h | 2 +- src/localesettings/localemodel.h | 4 ++-- src/localesettings/systemlocale.h | 2 +- .../connman/qnetworksettingsinterface_p.h | 2 +- src/networksettings/connman/qnetworksettingsservice_p.h | 2 +- .../connman/qnetworksettingsuseragent_p.h | 2 +- src/networksettings/qnetworksettings.h | 16 ++++++++-------- src/networksettings/qnetworksettingsaddressmodel.h | 4 ++-- src/networksettings/qnetworksettingsinterface.h | 2 +- src/networksettings/qnetworksettingsinterfacemodel.h | 2 +- src/networksettings/qnetworksettingsmanager.h | 2 +- src/networksettings/qnetworksettingsservice.h | 2 +- src/networksettings/qnetworksettingsservicemodel.h | 4 ++-- src/networksettings/qnetworksettingsuseragent.h | 2 +- .../wpasupplicant/qnetworksettingsservice_p.h | 4 ++-- src/timedatesettings/systemtime.h | 2 +- src/timedatesettings/timezonemodel.h | 4 ++-- 22 files changed, 35 insertions(+), 35 deletions(-) (limited to 'src') diff --git a/src/bluetoothsettings/bluetoothdevice.h b/src/bluetoothsettings/bluetoothdevice.h index a38cde7..5a77d62 100644 --- a/src/bluetoothsettings/bluetoothdevice.h +++ b/src/bluetoothsettings/bluetoothdevice.h @@ -41,7 +41,7 @@ class Q_DECL_EXPORT BluetoothDevice : public QObject Q_PROPERTY(bool powered READ powered WRITE setPowered NOTIFY poweredChanged) Q_PROPERTY(QObject* deviceModel READ deviceModel CONSTANT) public: - explicit BluetoothDevice(QObject *parent = 0); + explicit BluetoothDevice(QObject *parent = Q_NULLPTR); bool powered() const; void setPowered(const bool& aPowered); QObject* deviceModel() const; diff --git a/src/bluetoothsettings/bluez/bluetoothdevice_p.h b/src/bluetoothsettings/bluez/bluetoothdevice_p.h index adc283b..84d1382 100644 --- a/src/bluetoothsettings/bluez/bluetoothdevice_p.h +++ b/src/bluetoothsettings/bluez/bluetoothdevice_p.h @@ -36,7 +36,7 @@ class OrgBluezDevice1Interface; class BluetoothDevicePrivate : public QObject { public: - explicit BluetoothDevicePrivate(const QString& address, QObject *parent=0); + explicit BluetoothDevicePrivate(const QString& address, QObject *parent = Q_NULLPTR); void connectDevice(); void disconnectDevice(); diff --git a/src/bluetoothsettings/discoverymodel.h b/src/bluetoothsettings/discoverymodel.h index d9678a3..61d0993 100644 --- a/src/bluetoothsettings/discoverymodel.h +++ b/src/bluetoothsettings/discoverymodel.h @@ -44,7 +44,7 @@ class Q_DECL_EXPORT BtDeviceItem : public QObject Q_PROPERTY(bool connected READ connected NOTIFY connectedChanged) Q_PROPERTY(DeviceType type READ type CONSTANT) public: - explicit BtDeviceItem(const QBluetoothDeviceInfo& id, QObject *parent=0); + explicit BtDeviceItem(const QBluetoothDeviceInfo& id, QObject *parent = Q_NULLPTR); //The list of device type we want to show the icon enum DeviceType { Phone, @@ -90,7 +90,7 @@ class Q_DECL_EXPORT DiscoveryModel : public QAbstractListModel Q_OBJECT Q_ENUMS(DeviceType) public: - explicit DiscoveryModel(QObject *parent=0); + explicit DiscoveryModel(QObject *parent = Q_NULLPTR); virtual ~DiscoveryModel(); // from QAbstractItemModel int rowCount(const QModelIndex & parent = QModelIndex()) const; diff --git a/src/displaysettings/displaysettings.h b/src/displaysettings/displaysettings.h index c0032d8..04cd3fd 100644 --- a/src/displaysettings/displaysettings.h +++ b/src/displaysettings/displaysettings.h @@ -42,7 +42,7 @@ class Q_DECL_EXPORT DisplaySettings : public QObject Q_PROPERTY(bool physicalScreenSizeOverride READ physicalScreenSizeOverride WRITE setPhysicalScreenSizeOverride NOTIFY physicalScreenSizeOverrideChanged) public: - DisplaySettings(QObject *parent = 0); + DisplaySettings(QObject *parent = Q_NULLPTR); ~DisplaySettings(); int displayBrightness(); diff --git a/src/displaysettings/displaysettings_p.h b/src/displaysettings/displaysettings_p.h index 672eb95..b1c0e4d 100644 --- a/src/displaysettings/displaysettings_p.h +++ b/src/displaysettings/displaysettings_p.h @@ -37,7 +37,7 @@ class PhysicalScreenSize : public QObject Q_OBJECT public: - explicit PhysicalScreenSize(QObject *parent=0); + explicit PhysicalScreenSize(QObject *parent = Q_NULLPTR); virtual ~PhysicalScreenSize(); void setSize(int inches); diff --git a/src/localdevice/qlocaldevice.h b/src/localdevice/qlocaldevice.h index 7376527..c9918f0 100644 --- a/src/localdevice/qlocaldevice.h +++ b/src/localdevice/qlocaldevice.h @@ -36,7 +36,7 @@ class Q_DECL_EXPORT QLocalDevice : public QObject Q_OBJECT public: - QLocalDevice(QObject *parent = 0); + QLocalDevice(QObject *parent = Q_NULLPTR); ~QLocalDevice(); public Q_SLOTS: diff --git a/src/localesettings/localemodel.h b/src/localesettings/localemodel.h index b77bea6..fe4289a 100644 --- a/src/localesettings/localemodel.h +++ b/src/localesettings/localemodel.h @@ -41,7 +41,7 @@ class LocaleItem : public QObject Q_PROPERTY(QString country READ country CONSTANT) Q_PROPERTY(QString language READ language CONSTANT) public: - explicit LocaleItem(const QLocale &locale, QObject *parent=0); + explicit LocaleItem(const QLocale &locale, QObject *parent = Q_NULLPTR); QString country() const; QString language() const; QString code() const; @@ -57,7 +57,7 @@ class Q_DECL_EXPORT LocaleModel : public QAbstractListModel Q_OBJECT public: - explicit LocaleModel(QObject *parent=0); + explicit LocaleModel(QObject *parent = Q_NULLPTR); virtual ~LocaleModel(); // from QAbstractItemModel int rowCount(const QModelIndex & parent = QModelIndex()) const; diff --git a/src/localesettings/systemlocale.h b/src/localesettings/systemlocale.h index bc2e9cd..a0cccec 100644 --- a/src/localesettings/systemlocale.h +++ b/src/localesettings/systemlocale.h @@ -38,7 +38,7 @@ class Q_DECL_EXPORT SystemLocale : public QObject Q_OBJECT Q_PROPERTY(QString locale READ locale WRITE setLocale NOTIFY localeChanged) public: - explicit SystemLocale(QObject *parent = 0); + explicit SystemLocale(QObject *parent = Q_NULLPTR); QString locale() const; void setLocale(const QString& aLocale); signals: diff --git a/src/networksettings/connman/qnetworksettingsinterface_p.h b/src/networksettings/connman/qnetworksettingsinterface_p.h index 275e751..eabe610 100644 --- a/src/networksettings/connman/qnetworksettingsinterface_p.h +++ b/src/networksettings/connman/qnetworksettingsinterface_p.h @@ -66,7 +66,7 @@ class ConnmanSettingsInterface : public QNetworkSettingsInterface { Q_OBJECT public: - ConnmanSettingsInterface(const QString& path, const QVariantMap& properties, QObject *parent=0) + ConnmanSettingsInterface(const QString& path, const QVariantMap& properties, QObject *parent = Q_NULLPTR) :QNetworkSettingsInterface(parent) { if (d_ptr) diff --git a/src/networksettings/connman/qnetworksettingsservice_p.h b/src/networksettings/connman/qnetworksettingsservice_p.h index 942a871..22cde5d 100644 --- a/src/networksettings/connman/qnetworksettingsservice_p.h +++ b/src/networksettings/connman/qnetworksettingsservice_p.h @@ -40,7 +40,7 @@ class QNetworkSettingsServicePrivate : public QObject Q_OBJECT Q_DECLARE_PUBLIC(QNetworkSettingsService) public: - QNetworkSettingsServicePrivate(const QString& aPath, QNetworkSettingsService *parent=0); + QNetworkSettingsServicePrivate(const QString& aPath, QNetworkSettingsService *parent = Q_NULLPTR); QNetworkSettingsService *q_ptr; private slots: diff --git a/src/networksettings/connman/qnetworksettingsuseragent_p.h b/src/networksettings/connman/qnetworksettingsuseragent_p.h index e05525b..ff8c1d0 100644 --- a/src/networksettings/connman/qnetworksettingsuseragent_p.h +++ b/src/networksettings/connman/qnetworksettingsuseragent_p.h @@ -50,7 +50,7 @@ class QNetworkSettingsUserAgentPrivate : public QDBusAbstractAdaptor Q_CLASSINFO("D-Bus Interface", "net.connman.Agent") Q_DECLARE_PUBLIC(QNetworkSettingsUserAgent) public: - QNetworkSettingsUserAgentPrivate(QNetworkSettingsUserAgent *parent=0); + QNetworkSettingsUserAgentPrivate(QNetworkSettingsUserAgent *parent = Q_NULLPTR); void setUserCredentials(const QString& aUsername, const QString& aPassword); void cancel(); void release(); diff --git a/src/networksettings/qnetworksettings.h b/src/networksettings/qnetworksettings.h index e5dbbc5..a507729 100644 --- a/src/networksettings/qnetworksettings.h +++ b/src/networksettings/qnetworksettings.h @@ -43,13 +43,13 @@ class Q_DECL_EXPORT QNetworkSettingsState : public QObject public: enum States {Idle, Failure, Association, Configuration, Ready, Disconnect, Online, Undefined}; - explicit QNetworkSettingsState(States state, QObject *parent = 0) + explicit QNetworkSettingsState(States state, QObject *parent = Q_NULLPTR) : QObject(parent) { m_state = state; } - explicit QNetworkSettingsState(QObject *parent = 0) + explicit QNetworkSettingsState(QObject *parent = Q_NULLPTR) : QObject(parent) { m_state = Undefined; @@ -85,13 +85,13 @@ public: Unknown }; - explicit QNetworkSettingsType(Types type, QObject *parent = 0) + explicit QNetworkSettingsType(Types type, QObject *parent = Q_NULLPTR) : QObject(parent) { m_type = type; } - explicit QNetworkSettingsType(QObject *parent = 0) + explicit QNetworkSettingsType(QObject *parent = Q_NULLPTR) : QObject(parent) { m_type = Unknown; @@ -124,7 +124,7 @@ class Q_DECL_EXPORT QNetworkSettingsIPv4 : public QObject Q_PROPERTY(QString mask READ mask WRITE setMask NOTIFY maskChanged) public: - explicit QNetworkSettingsIPv4(QObject *parent = 0) + explicit QNetworkSettingsIPv4(QObject *parent = Q_NULLPTR) : QObject(parent) { @@ -192,7 +192,7 @@ class Q_DECL_EXPORT QNetworkSettingsIPv6 : public QObject Q_PROPERTY(int prefixLength READ prefixLength WRITE setPrefixLength NOTIFY prefixLengthChanged) public: - explicit QNetworkSettingsIPv6(QObject *parent = 0) + explicit QNetworkSettingsIPv6(QObject *parent = Q_NULLPTR) : QObject(parent) { @@ -270,7 +270,7 @@ public: Q_PROPERTY(QAbstractItemModel* excludes READ excludes NOTIFY excludesChanged) Q_PROPERTY(MethodType method READ method WRITE setMethod NOTIFY methodChanged) - explicit QNetworkSettingsProxy(QObject *parent=NULL) + explicit QNetworkSettingsProxy(QObject *parent = Q_NULLPTR) : QObject(parent) { @@ -341,7 +341,7 @@ 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 = 0) : + explicit QNetworkSettingsWireless(QObject* parent = Q_NULLPTR) : QObject(parent) { } diff --git a/src/networksettings/qnetworksettingsaddressmodel.h b/src/networksettings/qnetworksettingsaddressmodel.h index 5164fc4..280a288 100644 --- a/src/networksettings/qnetworksettingsaddressmodel.h +++ b/src/networksettings/qnetworksettingsaddressmodel.h @@ -36,8 +36,8 @@ class Q_DECL_EXPORT QNetworkSettingsAddressModel : public QStringListModel Q_OBJECT Q_PROPERTY(int count READ count NOTIFY countChanged) public: - explicit QNetworkSettingsAddressModel(QObject *parent = 0); - explicit QNetworkSettingsAddressModel(const QStringList &strings, QObject *parent = 0); + explicit QNetworkSettingsAddressModel(QObject *parent = Q_NULLPTR); + explicit QNetworkSettingsAddressModel(const QStringList &strings, QObject *parent = Q_NULLPTR); Q_INVOKABLE void append(const QString& address); Q_INVOKABLE void remove(int index); Q_INVOKABLE void resetChanges(); diff --git a/src/networksettings/qnetworksettingsinterface.h b/src/networksettings/qnetworksettingsinterface.h index 385d1ed..4d39dfc 100644 --- a/src/networksettings/qnetworksettingsinterface.h +++ b/src/networksettings/qnetworksettingsinterface.h @@ -42,7 +42,7 @@ class Q_DECL_EXPORT QNetworkSettingsInterface : public QObject { Q_PROPERTY(bool powered READ powered WRITE setPowered NOTIFY poweredChanged) public: - explicit QNetworkSettingsInterface(QObject* parent=0); + explicit QNetworkSettingsInterface(QObject* parent = Q_NULLPTR); QString name() const; QNetworkSettingsState::States state(); QNetworkSettingsType::Types type(); diff --git a/src/networksettings/qnetworksettingsinterfacemodel.h b/src/networksettings/qnetworksettingsinterfacemodel.h index 7282657..2fc74bc 100644 --- a/src/networksettings/qnetworksettingsinterfacemodel.h +++ b/src/networksettings/qnetworksettingsinterfacemodel.h @@ -39,7 +39,7 @@ class Q_DECL_EXPORT QNetworkSettingsInterfaceModel : public QAbstractListModel Q_OBJECT public: - explicit QNetworkSettingsInterfaceModel(QObject *parent=0); + explicit QNetworkSettingsInterfaceModel(QObject *parent = Q_NULLPTR); // from QAbstractItemModel int rowCount(const QModelIndex & parent = QModelIndex()) const; QVariant data(const QModelIndex & index, int role = Qt::DisplayRole) const; diff --git a/src/networksettings/qnetworksettingsmanager.h b/src/networksettings/qnetworksettingsmanager.h index 5d2ad13..79918e2 100644 --- a/src/networksettings/qnetworksettingsmanager.h +++ b/src/networksettings/qnetworksettingsmanager.h @@ -46,7 +46,7 @@ class Q_DECL_EXPORT QNetworkSettingsManager : public QObject Q_PROPERTY(QNetworkSettingsUserAgent* userAgent READ getUserAgent CONSTANT) public: - explicit QNetworkSettingsManager(QObject* parent = 0); + explicit QNetworkSettingsManager(QObject* parent = Q_NULLPTR); QAbstractItemModel* services(); QAbstractItemModel* interfaces(); void setUserAgent(QNetworkSettingsUserAgent *agent); diff --git a/src/networksettings/qnetworksettingsservice.h b/src/networksettings/qnetworksettingsservice.h index 44c433a..89973a8 100644 --- a/src/networksettings/qnetworksettingsservice.h +++ b/src/networksettings/qnetworksettingsservice.h @@ -49,7 +49,7 @@ class Q_DECL_EXPORT QNetworkSettingsService : public QObject Q_PROPERTY(QAbstractItemModel* domains READ domains NOTIFY domainsChanged) Q_PROPERTY(QAbstractItemModel* nameservers READ nameservers NOTIFY nameserversChanged) public: - explicit QNetworkSettingsService(const QString& aServiceId, QObject* parent = 0); + explicit QNetworkSettingsService(const QString& aServiceId, QObject* parent = Q_NULLPTR); QString id() const; QString name() const; diff --git a/src/networksettings/qnetworksettingsservicemodel.h b/src/networksettings/qnetworksettingsservicemodel.h index 0cf1601..e1fdf90 100644 --- a/src/networksettings/qnetworksettingsservicemodel.h +++ b/src/networksettings/qnetworksettingsservicemodel.h @@ -37,7 +37,7 @@ class Q_DECL_EXPORT QNetworkSettingsServiceModel : public QAbstractListModel { Q_OBJECT public: - explicit QNetworkSettingsServiceModel(QObject *parent=0); + explicit QNetworkSettingsServiceModel(QObject *parent = Q_NULLPTR); virtual ~QNetworkSettingsServiceModel(); // from QAbstractItemModel int rowCount(const QModelIndex & parent = QModelIndex()) const; @@ -68,7 +68,7 @@ class QNetworkSettingsServiceFilter : public QSortFilterProxyModel Q_OBJECT Q_PROPERTY(QNetworkSettingsType::Types type READ type WRITE setType NOTIFY typeChanged) public: - explicit QNetworkSettingsServiceFilter(QObject* parent=0); + explicit QNetworkSettingsServiceFilter(QObject* parent = Q_NULLPTR); virtual ~QNetworkSettingsServiceFilter(); bool filterAcceptsRow( int source_row, const QModelIndex& source_parent ) const override; QNetworkSettingsType::Types type() const; diff --git a/src/networksettings/qnetworksettingsuseragent.h b/src/networksettings/qnetworksettingsuseragent.h index ff4c030..7a91524 100644 --- a/src/networksettings/qnetworksettingsuseragent.h +++ b/src/networksettings/qnetworksettingsuseragent.h @@ -37,7 +37,7 @@ class Q_DECL_EXPORT QNetworkSettingsUserAgent : public QObject { Q_OBJECT public: - explicit QNetworkSettingsUserAgent(QObject *parent = 0); + explicit QNetworkSettingsUserAgent(QObject *parent = Q_NULLPTR); Q_INVOKABLE void setUserCredentials(const QString& username, const QString& passphrase); Q_INVOKABLE void cancelInput(); QString passPhrase() const; diff --git a/src/networksettings/wpasupplicant/qnetworksettingsservice_p.h b/src/networksettings/wpasupplicant/qnetworksettingsservice_p.h index 3920f61..6ed6d5a 100644 --- a/src/networksettings/wpasupplicant/qnetworksettingsservice_p.h +++ b/src/networksettings/wpasupplicant/qnetworksettingsservice_p.h @@ -40,7 +40,7 @@ class QNetworkSettingsServicePrivate : public QObject Q_OBJECT Q_DECLARE_PUBLIC(QNetworkSettingsService) public: - QNetworkSettingsServicePrivate(const QString& aServiceId, QNetworkSettingsService *parent=0); + QNetworkSettingsServicePrivate(const QString& aServiceId, QNetworkSettingsService *parent = Q_NULLPTR); void setManager(QNetworkSettingsManagerPrivate *manager); QNetworkSettingsService *q_ptr; @@ -70,7 +70,7 @@ class WpaSupplicantService : public QNetworkSettingsService { Q_OBJECT public: - explicit WpaSupplicantService(QNetworkSettingsManagerPrivate* manager, QObject* parent=0); + explicit WpaSupplicantService(QNetworkSettingsManagerPrivate* manager, QObject* parent = Q_NULLPTR); void setId(const QString& aId); void setName(const QString& aName); void setFlags(const QString& aFlags); diff --git a/src/timedatesettings/systemtime.h b/src/timedatesettings/systemtime.h index 178e6a6..8ccd52e 100644 --- a/src/timedatesettings/systemtime.h +++ b/src/timedatesettings/systemtime.h @@ -41,7 +41,7 @@ class Q_DECL_EXPORT SystemTime : public QObject Q_PROPERTY(bool ntp READ ntp WRITE setNtp NOTIFY ntpChanged) Q_PROPERTY(QDateTime time READ time WRITE setTime NOTIFY timeChanged) public: - explicit SystemTime(QObject *parent = 0); + explicit SystemTime(QObject *parent = Q_NULLPTR); bool ntp() const; void setNtp(const bool aNtp); void setTime(const QDateTime& aTime); diff --git a/src/timedatesettings/timezonemodel.h b/src/timedatesettings/timezonemodel.h index efa0e22..0714317 100644 --- a/src/timedatesettings/timezonemodel.h +++ b/src/timedatesettings/timezonemodel.h @@ -41,7 +41,7 @@ class TimezoneItem : public QObject Q_PROPERTY(QString name READ name CONSTANT) Q_PROPERTY(QString country READ country CONSTANT) public: - explicit TimezoneItem(const QByteArray& id, QObject *parent=0); + explicit TimezoneItem(const QByteArray& id, QObject *parent = Q_NULLPTR); QString name() const; QString country() const; QString id() const; @@ -57,7 +57,7 @@ class Q_DECL_EXPORT TimezoneModel : public QAbstractListModel Q_OBJECT public: - explicit TimezoneModel(QObject *parent=0); + explicit TimezoneModel(QObject *parent = Q_NULLPTR); virtual ~TimezoneModel(); // from QAbstractItemModel int rowCount(const QModelIndex & parent = QModelIndex()) const; -- cgit v1.2.3 From c3007c5ecc24c43bb37e909298c73a3780bde1f9 Mon Sep 17 00:00:00 2001 From: Rainer Keller Date: Mon, 24 Oct 2016 15:54:18 +0200 Subject: Fix compile error: No Qt keywords allowed in header files Change-Id: I79dc9af286e6eca13524d29c478cac79e5d76707 Reviewed-by: Risto Avila Reviewed-by: Kimmo Ollila Reviewed-by: Teemu Holappa Reviewed-by: Samuli Piippo --- src/bluetoothsettings/bluetoothdevice.h | 4 +- src/bluetoothsettings/discoverymodel.h | 6 +-- src/displaysettings/displaysettings.h | 2 +- src/localesettings/localefiltermodel.h | 2 +- src/localesettings/localemodel.h | 4 +- src/localesettings/systemlocale.h | 4 +- src/networksettings/qnetworksettings.h | 48 +++++++++++----------- src/networksettings/qnetworksettingsaddressmodel.h | 2 +- src/networksettings/qnetworksettingsinterface.h | 2 +- src/networksettings/qnetworksettingsservicemodel.h | 2 +- src/networksettings/qnetworksettingsuseragent.h | 2 +- .../wpasupplicant/qnetworksettingsinterface_p.h | 2 +- .../wpasupplicant/qwificontroller_p.h | 2 +- .../wpasupplicant/qwifisupplicant_p.h | 2 +- src/timedatesettings/systemtime.h | 4 +- src/timedatesettings/timezonefiltermodel.h | 2 +- src/timedatesettings/timezonemodel.h | 2 +- 17 files changed, 46 insertions(+), 46 deletions(-) (limited to 'src') diff --git a/src/bluetoothsettings/bluetoothdevice.h b/src/bluetoothsettings/bluetoothdevice.h index 5a77d62..8519044 100644 --- a/src/bluetoothsettings/bluetoothdevice.h +++ b/src/bluetoothsettings/bluetoothdevice.h @@ -50,11 +50,11 @@ public: Q_INVOKABLE void requestPairing(const QString& address); Q_INVOKABLE void requestConnect(const QString& address); Q_INVOKABLE void requestDisconnect(const QString& address); -signals: +Q_SIGNALS: void poweredChanged(); void scanningChanged(); -public slots: +public Q_SLOTS: void deviceStateChanged(QBluetoothLocalDevice::HostMode state); void scanFinished(); //These are not yet signaled diff --git a/src/bluetoothsettings/discoverymodel.h b/src/bluetoothsettings/discoverymodel.h index 61d0993..12554d7 100644 --- a/src/bluetoothsettings/discoverymodel.h +++ b/src/bluetoothsettings/discoverymodel.h @@ -65,7 +65,7 @@ public: bool connected() const; void setConnected(bool aConnected); -signals: +Q_SIGNALS: void connectedChanged(); protected: @@ -106,10 +106,10 @@ public: Connected }; -signals: +Q_SIGNALS: void scanFinished(); -private slots: +private Q_SLOTS: void deviceDiscovered(const QBluetoothDeviceInfo &device); private: QList m_items; diff --git a/src/displaysettings/displaysettings.h b/src/displaysettings/displaysettings.h index 04cd3fd..1874357 100644 --- a/src/displaysettings/displaysettings.h +++ b/src/displaysettings/displaysettings.h @@ -54,7 +54,7 @@ public Q_SLOTS: void setPhysicalScreenSizeInch(int inches); void setPhysicalScreenSizeOverride(bool enable); -signals: +Q_SIGNALS: void displayBrightnessChanged(int newValue); void physicalScreenSizeInchChanged(int newInches); void physicalScreenSizeOverrideChanged(bool newValue); diff --git a/src/localesettings/localefiltermodel.h b/src/localesettings/localefiltermodel.h index c885dd3..6c839e4 100644 --- a/src/localesettings/localefiltermodel.h +++ b/src/localesettings/localefiltermodel.h @@ -42,7 +42,7 @@ public: QString filter() const; void setFilter(const QString& aFilter); Q_INVOKABLE QVariant itemFromRow(const int row) const; -signals: +Q_SIGNALS: void filterChanged(); private: QString m_filter; diff --git a/src/localesettings/localemodel.h b/src/localesettings/localemodel.h index fe4289a..4fb00a0 100644 --- a/src/localesettings/localemodel.h +++ b/src/localesettings/localemodel.h @@ -74,10 +74,10 @@ public: static void generateModel(LocaleModel* model); -signals: +Q_SIGNALS: void addItem(LocaleItem* item); -private slots: +private Q_SLOTS: void addNewItem(QObject* item); void modelReady(); diff --git a/src/localesettings/systemlocale.h b/src/localesettings/systemlocale.h index a0cccec..075d397 100644 --- a/src/localesettings/systemlocale.h +++ b/src/localesettings/systemlocale.h @@ -41,9 +41,9 @@ public: explicit SystemLocale(QObject *parent = Q_NULLPTR); QString locale() const; void setLocale(const QString& aLocale); -signals: +Q_SIGNALS: void localeChanged(); -public slots: +public Q_SLOTS: protected: SystemLocalePrivate *d_ptr; diff --git a/src/networksettings/qnetworksettings.h b/src/networksettings/qnetworksettings.h index a507729..31561f4 100644 --- a/src/networksettings/qnetworksettings.h +++ b/src/networksettings/qnetworksettings.h @@ -61,10 +61,10 @@ public: void setState(const States state) { m_state = state; - emit stateChanged(); + Q_EMIT stateChanged(); } -signals: +Q_SIGNALS: void stateChanged(); private: @@ -104,10 +104,10 @@ public: void setType(const Types type) { m_type = type; - emit typeChanged(); + Q_EMIT typeChanged(); } -signals: +Q_SIGNALS: void typeChanged(); private: @@ -137,7 +137,7 @@ public: } void setAddress(const QString& adderess) { m_address = adderess; - emit addressChanged(); + Q_EMIT addressChanged(); } QString gateway() const { @@ -146,7 +146,7 @@ public: void setGateway(const QString& gateway) { m_gateway = gateway; - emit gatewayChanged(); + Q_EMIT gatewayChanged(); } MethodType method() const { @@ -155,7 +155,7 @@ public: void setMethod(const MethodType method) { m_method = method; - emit methodChanged(); + Q_EMIT methodChanged(); } QString mask() const { @@ -164,10 +164,10 @@ public: void setMask(const QString& mask) { m_mask = mask; - emit maskChanged(); + Q_EMIT maskChanged(); } -signals: +Q_SIGNALS: void addressChanged(); void gatewayChanged(); void methodChanged(); @@ -206,7 +206,7 @@ public: } void setAddress(const QString& adderess) { m_address = adderess; - emit addressChanged(); + Q_EMIT addressChanged(); } QString gateway() const { @@ -215,7 +215,7 @@ public: void setGateway(const QString& gateway) { m_gateway = gateway; - emit gatewayChanged(); + Q_EMIT gatewayChanged(); } MethodType method() const { @@ -224,7 +224,7 @@ public: void setMethod(const MethodType method) { m_method = method; - emit methodChanged(); + Q_EMIT methodChanged(); } PrivacyType privacy() const { @@ -233,7 +233,7 @@ public: void setPrivacy(const PrivacyType privacy) { m_privacy = privacy; - emit privacyChanged(); + Q_EMIT privacyChanged(); } int prefixLength() const { @@ -242,10 +242,10 @@ public: void setPrefixLength(const int& prefixLength) { m_prefixLength = prefixLength; - emit prefixLengthChanged(); + Q_EMIT prefixLengthChanged(); } -signals: +Q_SIGNALS: void addressChanged(); void gatewayChanged(); void methodChanged(); @@ -284,7 +284,7 @@ public: void setUrl(const QUrl& url) { m_url = url; - emit urlChanged(); + Q_EMIT urlChanged(); } QAbstractItemModel* servers(void) { @@ -293,7 +293,7 @@ public: void setServers(const QStringList& servers) { m_servers.setStringList(servers); - emit serversChanged(); + Q_EMIT serversChanged(); } QStringList servers() const { @@ -310,7 +310,7 @@ public: void setExcludes(const QStringList& excludes) { m_excludes.setStringList(excludes); - emit excludesChanged(); + Q_EMIT excludesChanged(); } MethodType method(void) const { @@ -319,10 +319,10 @@ public: void setMethod(const MethodType& method) { m_method = method; - emit methodChanged(); + Q_EMIT methodChanged(); } -signals: +Q_SIGNALS: void urlChanged(); void serversChanged(); void excludesChanged(); @@ -360,7 +360,7 @@ public: void setHidden(const bool hidden) { m_hidden = hidden; - emit hiddenChanged(); + Q_EMIT hiddenChanged(); } int signalStrength() const { @@ -369,7 +369,7 @@ public: void setSignalStrength(const int signalStrength) { m_signalStrength = signalStrength; - emit signalStrengthChanged(); + Q_EMIT signalStrengthChanged(); } void setSecurity(const SecurityFlags security) { @@ -383,14 +383,14 @@ public: void setOutOfRange(const bool aOutOfRange) { m_isOutOfRange = aOutOfRange; - emit outOfRangeChanged(); + Q_EMIT outOfRangeChanged(); } bool outOfRange() const { return m_isOutOfRange; } -signals: +Q_SIGNALS: void hiddenChanged(); void signalStrengthChanged(); void passwordChanged(); diff --git a/src/networksettings/qnetworksettingsaddressmodel.h b/src/networksettings/qnetworksettingsaddressmodel.h index 280a288..16d601d 100644 --- a/src/networksettings/qnetworksettingsaddressmodel.h +++ b/src/networksettings/qnetworksettingsaddressmodel.h @@ -44,7 +44,7 @@ public: void setStringList(const QStringList &addresses); int count() const; -signals: +Q_SIGNALS: void countChanged(); private: QStringList m_addresses; diff --git a/src/networksettings/qnetworksettingsinterface.h b/src/networksettings/qnetworksettingsinterface.h index 4d39dfc..a87626d 100644 --- a/src/networksettings/qnetworksettingsinterface.h +++ b/src/networksettings/qnetworksettingsinterface.h @@ -50,7 +50,7 @@ public: void setPowered(const bool powered); Q_INVOKABLE void scanServices(); -signals: +Q_SIGNALS: void nameChanged(); void stateChanged(); void typeChanged(); diff --git a/src/networksettings/qnetworksettingsservicemodel.h b/src/networksettings/qnetworksettingsservicemodel.h index e1fdf90..3770775 100644 --- a/src/networksettings/qnetworksettingsservicemodel.h +++ b/src/networksettings/qnetworksettingsservicemodel.h @@ -74,7 +74,7 @@ public: QNetworkSettingsType::Types type() const; void setType(QNetworkSettingsType::Types type); Q_INVOKABLE QVariant itemFromRow(const int row) const; -signals: +Q_SIGNALS: void typeChanged(); private: QNetworkSettingsType::Types m_type; diff --git a/src/networksettings/qnetworksettingsuseragent.h b/src/networksettings/qnetworksettingsuseragent.h index 7a91524..89b4d18 100644 --- a/src/networksettings/qnetworksettingsuseragent.h +++ b/src/networksettings/qnetworksettingsuseragent.h @@ -43,7 +43,7 @@ public: QString passPhrase() const; QString userName() const; -signals: +Q_SIGNALS: void showUserCredentialsInput(); void error(); void ready(bool cancel); diff --git a/src/networksettings/wpasupplicant/qnetworksettingsinterface_p.h b/src/networksettings/wpasupplicant/qnetworksettingsinterface_p.h index 0cce23a..74ef765 100644 --- a/src/networksettings/wpasupplicant/qnetworksettingsinterface_p.h +++ b/src/networksettings/wpasupplicant/qnetworksettingsinterface_p.h @@ -46,7 +46,7 @@ public: void setManager(QNetworkSettingsManagerPrivate *manager); void scan(); -signals: +Q_SIGNALS: protected: QString m_name; diff --git a/src/networksettings/wpasupplicant/qwificontroller_p.h b/src/networksettings/wpasupplicant/qwificontroller_p.h index 0bb4c9a..a228fb5 100644 --- a/src/networksettings/wpasupplicant/qwificontroller_p.h +++ b/src/networksettings/wpasupplicant/qwificontroller_p.h @@ -96,7 +96,7 @@ public: bool resetSupplicantSocket(); QWifiSupplicant *supplicant() const { return m_supplicant; } -signals: +Q_SIGNALS: void backendStateChanged(BackendState backendState); void dhcpRequestFinished(const QString &status); void raiseError(const QString &error); diff --git a/src/networksettings/wpasupplicant/qwifisupplicant_p.h b/src/networksettings/wpasupplicant/qwifisupplicant_p.h index 713ab6d..5f6b31c 100644 --- a/src/networksettings/wpasupplicant/qwifisupplicant_p.h +++ b/src/networksettings/wpasupplicant/qwifisupplicant_p.h @@ -57,7 +57,7 @@ public: bool sendCommand(const QString &command, QByteArray *reply); static QString decodeSsid(const QString &encoded); -signals: +Q_SIGNALS: void raiseError(const QString& error); protected: diff --git a/src/timedatesettings/systemtime.h b/src/timedatesettings/systemtime.h index 8ccd52e..f7ad593 100644 --- a/src/timedatesettings/systemtime.h +++ b/src/timedatesettings/systemtime.h @@ -49,12 +49,12 @@ public: QDateTime time() const; void setTimeZone(const QString& aTimeZone); -signals: +Q_SIGNALS: void timeZoneChanged(); void ntpChanged(); void timeChanged(); -public slots: +public Q_SLOTS: protected: SystemTimePrivate *d_ptr; diff --git a/src/timedatesettings/timezonefiltermodel.h b/src/timedatesettings/timezonefiltermodel.h index 164f8c0..9585801 100644 --- a/src/timedatesettings/timezonefiltermodel.h +++ b/src/timedatesettings/timezonefiltermodel.h @@ -42,7 +42,7 @@ public: QString filter() const; void setFilter(const QString& aFilter); Q_INVOKABLE QVariant itemFromRow(const int row) const; -signals: +Q_SIGNALS: void filterChanged(); private: QString m_filter; diff --git a/src/timedatesettings/timezonemodel.h b/src/timedatesettings/timezonemodel.h index 0714317..485fd17 100644 --- a/src/timedatesettings/timezonemodel.h +++ b/src/timedatesettings/timezonemodel.h @@ -72,7 +72,7 @@ public: static void generateModel(TimezoneModel* model); -private slots: +private Q_SLOTS: void addNewItem(QObject* item); private: -- cgit v1.2.3 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 From 9b4b720346c9a18f9df0a282c12c683e6f0dc703 Mon Sep 17 00:00:00 2001 From: Rainer Keller Date: Mon, 24 Oct 2016 16:18:25 +0200 Subject: Qt does not name getter functions with 'get' Change-Id: Ic9614ef35fbec999494f122d65f5b3afa32c54aa Reviewed-by: Kimmo Ollila Reviewed-by: Teemu Holappa Reviewed-by: Samuli Piippo --- src/networksettings/connman/qnetworksettingsmanager_p.h | 2 +- src/networksettings/qnetworksettingsmanager.cpp | 4 ++-- src/networksettings/qnetworksettingsmanager.h | 4 ++-- src/networksettings/wpasupplicant/qnetworksettingsmanager_p.h | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) (limited to 'src') diff --git a/src/networksettings/connman/qnetworksettingsmanager_p.h b/src/networksettings/connman/qnetworksettingsmanager_p.h index cb42654..5eb5470 100644 --- a/src/networksettings/connman/qnetworksettingsmanager_p.h +++ b/src/networksettings/connman/qnetworksettingsmanager_p.h @@ -47,7 +47,7 @@ public: explicit QNetworkSettingsManagerPrivate(QNetworkSettingsManager *parent); QNetworkSettingsManager *q_ptr; void setUserAgent(QNetworkSettingsUserAgent *agent); - QNetworkSettingsUserAgent *getUserAgent() {return m_agent;} + QNetworkSettingsUserAgent *userAgent() {return m_agent;} public slots: void getServicesFinished(QDBusPendingCallWatcher *watcher); void getTechnologiesFinished(QDBusPendingCallWatcher *watcher); diff --git a/src/networksettings/qnetworksettingsmanager.cpp b/src/networksettings/qnetworksettingsmanager.cpp index 787a382..ceee7ad 100644 --- a/src/networksettings/qnetworksettingsmanager.cpp +++ b/src/networksettings/qnetworksettingsmanager.cpp @@ -69,8 +69,8 @@ void QNetworkSettingsManager::setUserAgent(QNetworkSettingsUserAgent *agent) d->setUserAgent(agent); } -QNetworkSettingsUserAgent* QNetworkSettingsManager::getUserAgent() +QNetworkSettingsUserAgent* QNetworkSettingsManager::userAgent() { Q_D(QNetworkSettingsManager); - return d->getUserAgent(); + return d->userAgent(); } diff --git a/src/networksettings/qnetworksettingsmanager.h b/src/networksettings/qnetworksettingsmanager.h index 79918e2..ba34974 100644 --- a/src/networksettings/qnetworksettingsmanager.h +++ b/src/networksettings/qnetworksettingsmanager.h @@ -43,14 +43,14 @@ class Q_DECL_EXPORT QNetworkSettingsManager : public QObject Q_ENUMS(StateTypes NetworkTypeTypes) Q_PROPERTY(QAbstractItemModel* services READ services NOTIFY servicesChanged) Q_PROPERTY(QAbstractItemModel* interfaces READ interfaces NOTIFY interfacesChanged) - Q_PROPERTY(QNetworkSettingsUserAgent* userAgent READ getUserAgent CONSTANT) + Q_PROPERTY(QNetworkSettingsUserAgent* userAgent READ userAgent CONSTANT) public: explicit QNetworkSettingsManager(QObject* parent = Q_NULLPTR); QAbstractItemModel* services(); QAbstractItemModel* interfaces(); void setUserAgent(QNetworkSettingsUserAgent *agent); - QNetworkSettingsUserAgent* getUserAgent(); + QNetworkSettingsUserAgent* userAgent(); Q_INVOKABLE QNetworkSettingsService* getService(const QString& name, const int type); diff --git a/src/networksettings/wpasupplicant/qnetworksettingsmanager_p.h b/src/networksettings/wpasupplicant/qnetworksettingsmanager_p.h index d042ece..ebb4667 100644 --- a/src/networksettings/wpasupplicant/qnetworksettingsmanager_p.h +++ b/src/networksettings/wpasupplicant/qnetworksettingsmanager_p.h @@ -51,7 +51,7 @@ public: void disconnectNetwork(); QString call(const QString &command); bool checkedCall(const QString &command); - QNetworkSettingsUserAgent *getUserAgent() {return m_agent;} + QNetworkSettingsUserAgent *userAgent() {return m_agent;} protected: bool event(QEvent *event); -- cgit v1.2.3 From 108293b6bb0db1d79676cc74fc4857db011c2d6c Mon Sep 17 00:00:00 2001 From: Rainer Keller Date: Tue, 25 Oct 2016 10:07:57 +0200 Subject: Fix deprecated QString warning Change-Id: I598777feeb23d0e6462c5825c7ae7793afa2dc6a Reviewed-by: Kimmo Ollila Reviewed-by: Teemu Holappa Reviewed-by: Samuli Piippo --- src/localesettings/systemlocale_p.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/localesettings/systemlocale_p.h b/src/localesettings/systemlocale_p.h index f5caed9..761c5cd 100644 --- a/src/localesettings/systemlocale_p.h +++ b/src/localesettings/systemlocale_p.h @@ -64,7 +64,7 @@ public: QStringList newLocale; QMap::iterator i; for (i = m_localeCache.begin(); i != m_localeCache.end(); ++i) { - QString val = i.key() + "=" + i.value(); + QString val = i.key() + QLatin1String("=") + i.value(); newLocale.append(val); } m_localeInterface->SetLocale(newLocale, true); -- cgit v1.2.3 From d8323e109e88afae5471d861e380996164db123e Mon Sep 17 00:00:00 2001 From: Rainer Keller Date: Tue, 25 Oct 2016 10:08:08 +0200 Subject: Fix unused variable warning Change-Id: I28641be6b1b73e152f865f236654f9ecfec63143 Reviewed-by: Kimmo Ollila Reviewed-by: Teemu Holappa Reviewed-by: Samuli Piippo --- src/displaysettings/displaysettings_p.cpp | 1 - 1 file changed, 1 deletion(-) (limited to 'src') diff --git a/src/displaysettings/displaysettings_p.cpp b/src/displaysettings/displaysettings_p.cpp index 7e4cb58..c7bbc9a 100644 --- a/src/displaysettings/displaysettings_p.cpp +++ b/src/displaysettings/displaysettings_p.cpp @@ -74,7 +74,6 @@ void DisplaySettingsPrivate::initLightDevices() bool DisplaySettingsPrivate::setDisplayBrightness(int v) { - Q_Q(DisplaySettings); quint8 value = qBound(0, v, 255); initLightDevices(); for (int i = 0; i < m_lightDevices.size(); i++) { -- cgit v1.2.3 From 918bdf10f8c82333fa7651c5db36ddf3f89f6aa9 Mon Sep 17 00:00:00 2001 From: Rainer Keller Date: Wed, 26 Oct 2016 14:38:54 +0200 Subject: Fix uninitialized variables Change-Id: I3bd9fb1254746f1bc0340db2b5b43fccfb356ce2 Reviewed-by: Teemu Holappa Reviewed-by: Samuli Piippo --- src/networksettings/connman/qnetworksettingsinterface_p.cpp | 1 + src/networksettings/connman/qnetworksettingsmanager_p.cpp | 5 +++++ 2 files changed, 6 insertions(+) (limited to 'src') diff --git a/src/networksettings/connman/qnetworksettingsinterface_p.cpp b/src/networksettings/connman/qnetworksettingsinterface_p.cpp index 3525aa7..83ab73a 100644 --- a/src/networksettings/connman/qnetworksettingsinterface_p.cpp +++ b/src/networksettings/connman/qnetworksettingsinterface_p.cpp @@ -33,6 +33,7 @@ QNetworkSettingsInterfacePrivate::QNetworkSettingsInterfacePrivate(QNetworkSettingsInterface* parent) : QObject(parent) + , m_technology(Q_NULLPTR) ,q_ptr(parent) { diff --git a/src/networksettings/connman/qnetworksettingsmanager_p.cpp b/src/networksettings/connman/qnetworksettingsmanager_p.cpp index 875be9b..19e70ab 100644 --- a/src/networksettings/connman/qnetworksettingsmanager_p.cpp +++ b/src/networksettings/connman/qnetworksettingsmanager_p.cpp @@ -37,6 +37,11 @@ QNetworkSettingsManagerPrivate::QNetworkSettingsManagerPrivate(QNetworkSettingsManager *parent) :QObject(parent) ,q_ptr(parent) + , m_interfaceModel(Q_NULLPTR) + , m_serviceModel(Q_NULLPTR) + , m_serviceFilter(Q_NULLPTR) + , m_manager(Q_NULLPTR) + , m_agent(Q_NULLPTR) { qDBusRegisterMetaType(); qDBusRegisterMetaType(); -- cgit v1.2.3 From 3f6a7993f5f8732f8be9b454c1e9a05c33666786 Mon Sep 17 00:00:00 2001 From: Rainer Keller Date: Wed, 26 Oct 2016 15:14:48 +0200 Subject: Use new style signals and slots connection Change-Id: I3df221be0f389a4193ab9c7856b8efc40eef026f Reviewed-by: Teemu Holappa Reviewed-by: Samuli Piippo --- src/networksettings/connman/qnetworksettingsmanager_p.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/networksettings/connman/qnetworksettingsmanager_p.cpp b/src/networksettings/connman/qnetworksettingsmanager_p.cpp index 19e70ab..6fecd86 100644 --- a/src/networksettings/connman/qnetworksettingsmanager_p.cpp +++ b/src/networksettings/connman/qnetworksettingsmanager_p.cpp @@ -59,13 +59,13 @@ QNetworkSettingsManagerPrivate::QNetworkSettingsManagerPrivate(QNetworkSettingsM //List technologies QDBusPendingReply reply = m_manager->GetTechnologies(); QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(reply, this); - connect(watcher, SIGNAL(finished(QDBusPendingCallWatcher*)), - this, SLOT(getTechnologiesFinished(QDBusPendingCallWatcher*))); + connect(watcher, &QDBusPendingCallWatcher::finished, + this, &QNetworkSettingsManagerPrivate::getTechnologiesFinished); reply = m_manager->GetServices(); watcher = new QDBusPendingCallWatcher(reply, this); - connect(watcher, SIGNAL(finished(QDBusPendingCallWatcher*)), - this, SLOT(getServicesFinished(QDBusPendingCallWatcher*))); + connect(watcher, &QDBusPendingCallWatcher::finished, + this, &QNetworkSettingsManagerPrivate::getServicesFinished); connect(m_manager, &NetConnmanManagerInterface::ServicesChanged, this, &QNetworkSettingsManagerPrivate::onServicesChanged); -- cgit v1.2.3 From e0bb21369cb639f440e49f02038c0764ffd349db Mon Sep 17 00:00:00 2001 From: Rainer Keller Date: Thu, 27 Oct 2016 11:03:59 +0200 Subject: Remove unneeded include Change-Id: I6cb029412dd3b3364c525e03414b6eeba3f02d69 Reviewed-by: Teemu Holappa Reviewed-by: Samuli Piippo --- src/networksettings/connman/qnetworksettingsservice_p.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/networksettings/connman/qnetworksettingsservice_p.h b/src/networksettings/connman/qnetworksettingsservice_p.h index 22cde5d..58adbb9 100644 --- a/src/networksettings/connman/qnetworksettingsservice_p.h +++ b/src/networksettings/connman/qnetworksettingsservice_p.h @@ -29,10 +29,11 @@ #ifndef QNETWORKSETTINGSSERVICEPRIVATE_H #define QNETWORKSETTINGSSERVICEPRIVATE_H -#include #include "qnetworksettingsservice.h" #include "qnetworksettings.h" +class QDBusPendingCallWatcher; +class QDBusVariant; class NetConnmanServiceInterface; class QNetworkSettingsServicePrivate : public QObject -- cgit v1.2.3 From 8847796a62699a715696e50b87b1f36e37e8ef50 Mon Sep 17 00:00:00 2001 From: Rainer Keller Date: Fri, 28 Oct 2016 09:39:47 +0200 Subject: Fix typo Change-Id: If85050fdd947cb5bcc4da606b693e94cce578805 Reviewed-by: Teemu Holappa Reviewed-by: Samuli Piippo --- src/networksettings/qnetworksettings.cpp | 8 ++++---- src/networksettings/qnetworksettings.h | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'src') diff --git a/src/networksettings/qnetworksettings.cpp b/src/networksettings/qnetworksettings.cpp index 18747e1..fae1b7d 100644 --- a/src/networksettings/qnetworksettings.cpp +++ b/src/networksettings/qnetworksettings.cpp @@ -79,8 +79,8 @@ QNetworkSettingsIPv4::QNetworkSettingsIPv4(QObject *parent) QString QNetworkSettingsIPv4::address() const { return m_address; } -void QNetworkSettingsIPv4::setAddress(const QString& adderess) { - m_address = adderess; +void QNetworkSettingsIPv4::setAddress(const QString& address) { + m_address = address; emit addressChanged(); } @@ -120,8 +120,8 @@ QString QNetworkSettingsIPv6::address() const { return m_address; } -void QNetworkSettingsIPv6::setAddress(const QString& adderess) { - m_address = adderess; +void QNetworkSettingsIPv6::setAddress(const QString& address) { + m_address = address; emit addressChanged(); } diff --git a/src/networksettings/qnetworksettings.h b/src/networksettings/qnetworksettings.h index c0a400b..da75acd 100644 --- a/src/networksettings/qnetworksettings.h +++ b/src/networksettings/qnetworksettings.h @@ -98,7 +98,7 @@ public: enum MethodType {Dhcp, Manual, Off}; QString address() const; - void setAddress(const QString& adderess); + void setAddress(const QString& address); QString gateway() const; void setGateway(const QString& gateway); MethodType method() const; @@ -137,7 +137,7 @@ public: enum PrivacyType {Disabled, Enabled, Preferred}; QString address() const; - void setAddress(const QString& adderess); + void setAddress(const QString& address); QString gateway() const; void setGateway(const QString& gateway); MethodType method() const; -- cgit v1.2.3 From 52aa422d12aad5603891d8296e3a41ca2cb63fc9 Mon Sep 17 00:00:00 2001 From: Rainer Keller Date: Tue, 1 Nov 2016 09:55:05 +0100 Subject: Make bluetooth support optional Change-Id: I33db4d7c8531be0b02f9550bb2d2fbb2c0de9af8 Reviewed-by: Michael Winkelmann Reviewed-by: Teemu Holappa Reviewed-by: Samuli Piippo --- src/imports/imports.pro | 3 ++- src/src.pro | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/imports/imports.pro b/src/imports/imports.pro index f34be18..8c10510 100644 --- a/src/imports/imports.pro +++ b/src/imports/imports.pro @@ -1,7 +1,8 @@ TEMPLATE = subdirs SUBDIRS += networksettings \ - bluetoothsettings \ localesettings \ timedatesettings \ localdevice \ displaysettings + +qtHaveModule(bluetooth): SUBDIRS += bluetoothsettings diff --git a/src/src.pro b/src/src.pro index faa9a6d..74ecfb0 100644 --- a/src/src.pro +++ b/src/src.pro @@ -2,7 +2,6 @@ TEMPLATE = subdirs CONFIG += ordered SUBDIRS += \ networksettings \ - bluetoothsettings \ localesettings \ displaysettings \ timedatesettings \ @@ -11,3 +10,5 @@ SUBDIRS += \ settingsui \ imports \ doc \ + +qtHaveModule(bluetooth): SUBDIRS += bluetoothsettings -- cgit v1.2.3 From e6475dfe5a4209ad6142c2400dec6b9fc4ef5f07 Mon Sep 17 00:00:00 2001 From: Teemu Holappa Date: Wed, 12 Oct 2016 10:17:34 +0300 Subject: Fix Wifi utils connection view Fixed the access point selection combobox to show the connected service properly. Fixed layout problems when Virtual Keyboard is active. Change-Id: Id1b05c4e12655eb93df91a78b979ad8fcf3361f5 Reviewed-by: Samuli Piippo --- .../qnetworksettingsservicemodel.cpp | 64 +++- src/networksettings/qnetworksettingsservicemodel.h | 8 + src/settingsui/network/ComboBoxEntry.qml | 4 + src/settingsui/network/NetworkSettings.qml | 6 +- src/settingsui/network/WifiSettings.qml | 334 +++++++++++---------- 5 files changed, 255 insertions(+), 161 deletions(-) (limited to 'src') diff --git a/src/networksettings/qnetworksettingsservicemodel.cpp b/src/networksettings/qnetworksettingsservicemodel.cpp index 2755eda..ce8ea86 100644 --- a/src/networksettings/qnetworksettingsservicemodel.cpp +++ b/src/networksettings/qnetworksettingsservicemodel.cpp @@ -78,6 +78,7 @@ QVariant QNetworkSettingsServiceModel::data(const QModelIndex & index, int role) void QNetworkSettingsServiceModel::append(QNetworkSettingsService* item) { item->setParent(this); + connectStateChanges(item); beginResetModel(); m_items.append(item); @@ -87,14 +88,24 @@ void QNetworkSettingsServiceModel::append(QNetworkSettingsService* item) void QNetworkSettingsServiceModel::insert(int row, QNetworkSettingsService* item) { item->setParent(this); - + connectStateChanges(item); beginInsertRows(QModelIndex(), row, row); m_items.insert(row, item); endInsertRows(); } +void QNetworkSettingsServiceModel::connectStateChanges(QNetworkSettingsService* item) +{ + connect(item, &QNetworkSettingsService::stateChanged, this, &QNetworkSettingsServiceModel::connectionStatusChanged); + QNetworkSettingsWireless* wireless = item->wirelessConfig(); + if (wireless) + connect(wireless, &QNetworkSettingsWireless::signalStrengthChanged, this, &QNetworkSettingsServiceModel::signalStrengthChanged); +} + void QNetworkSettingsServiceModel::remove(int row) { + QNetworkSettingsService* item = m_items.at(row); + item->deleteLater(); beginRemoveRows(QModelIndex(), row, row); m_items.removeAt(row); endRemoveRows(); @@ -123,6 +134,34 @@ QList QNetworkSettingsServiceModel::getModel() return m_items; } +void QNetworkSettingsServiceModel::connectionStatusChanged() +{ + QNetworkSettingsService *s = qobject_cast(sender()); + + int row = 0; + foreach (QNetworkSettingsService* item, m_items) { + if (item == s) { + updated(row); + break; + } + row++; + } + +} + +void QNetworkSettingsServiceModel::signalStrengthChanged() +{ + QNetworkSettingsWireless *s = qobject_cast(sender()); + int row = 0; + foreach (QNetworkSettingsService* item, m_items) { + if (item->wirelessConfig() == s) { + updated(row); + break; + } + row++; + } +} + //Filter model /*! @@ -200,3 +239,26 @@ QVariant QNetworkSettingsServiceFilter::itemFromRow(const int row) const return QVariant::fromValue(QStringLiteral("")); } +/*! + \qmlmethod int NetworkSettingsServiceFilter::activeRow() + + Returns the connected service index in the model. + Returns negative number if no active connection is available. +*/ +int QNetworkSettingsServiceFilter::activeRow() const +{ + QNetworkSettingsServiceModel* model = qobject_cast(sourceModel()); + QList data = model->getModel(); + int row = 0; + foreach (QNetworkSettingsService* item, data) { + if (item->type() == m_type && + (item->state() == QNetworkSettingsState::Ready || + item->state() == QNetworkSettingsState::Online)) { + QModelIndex idx = model->index(row, 0); + QModelIndex mapped = mapFromSource(idx); + return mapped.row(); + } + row++; + } + return -1; +} diff --git a/src/networksettings/qnetworksettingsservicemodel.h b/src/networksettings/qnetworksettingsservicemodel.h index 3770775..ab225bd 100644 --- a/src/networksettings/qnetworksettingsservicemodel.h +++ b/src/networksettings/qnetworksettingsservicemodel.h @@ -58,7 +58,14 @@ public: Connected }; + +private Q_SLOTS: + void connectionStatusChanged(); + void signalStrengthChanged(); + private: + void connectStateChanges(QNetworkSettingsService* item); + QList m_items; QHash m_roleNames; }; @@ -74,6 +81,7 @@ public: QNetworkSettingsType::Types type() const; void setType(QNetworkSettingsType::Types type); Q_INVOKABLE QVariant itemFromRow(const int row) const; + Q_INVOKABLE int activeRow() const; Q_SIGNALS: void typeChanged(); private: diff --git a/src/settingsui/network/ComboBoxEntry.qml b/src/settingsui/network/ComboBoxEntry.qml index 71b997c..91655ed 100644 --- a/src/settingsui/network/ComboBoxEntry.qml +++ b/src/settingsui/network/ComboBoxEntry.qml @@ -42,6 +42,8 @@ RowLayout { property alias model: cb.model property alias count: cb.count property int titleWidth: -1 + signal activated(var index) + signal highlighted(var index) Label { id: label @@ -53,5 +55,7 @@ RowLayout { id: cb textRole: "text" Layout.fillWidth: true + onActivated: root.activated(index) + onHighlightedIndexChanged: root.highlighted(index) } } diff --git a/src/settingsui/network/NetworkSettings.qml b/src/settingsui/network/NetworkSettings.qml index 52ab1af..9385ee1 100644 --- a/src/settingsui/network/NetworkSettings.qml +++ b/src/settingsui/network/NetworkSettings.qml @@ -33,13 +33,15 @@ import QtDeviceUtilities.NetworkSettings 1.0 Item { property string title: qsTr("Network Settings") + GroupBox { id: networkSelect anchors.rightMargin: parent.width * 0.618 + anchors.left: parent.left anchors.leftMargin: 20 + anchors.top: parent.top anchors.topMargin: 20 - anchors.bottomMargin: 20 - anchors.fill: parent + title: qsTr("Select Connection") function stateToStr(serviceState) { diff --git a/src/settingsui/network/WifiSettings.qml b/src/settingsui/network/WifiSettings.qml index 7a0735c..f7cf823 100644 --- a/src/settingsui/network/WifiSettings.qml +++ b/src/settingsui/network/WifiSettings.qml @@ -37,201 +37,219 @@ Item { Component.onCompleted: NetworkSettingsManager.services.type = NetworkSettingsType.Wifi; property bool connecting: false - GroupBox { - id: content - title: qsTr("Wireless Settings") + Flickable { anchors.fill: parent + contentHeight: content.height + contentWidth: width - ColumnLayout { - spacing: 20 + GroupBox { + title: qsTr("Wireless Settings") width: parent.width - RowLayout { - spacing: 10 - id: enableSwitch + ColumnLayout { + id: content + spacing: 20 width: parent.width - Label { - Layout.preferredWidth: root.width * 0.382 - Layout.alignment: Qt.AlignVCenter - horizontalAlignment: Text.AlignRight - text: selectedInterface.powered ? qsTr("Wi-Fi ON") : qsTr("Wi-Fi OFF") - } - Switch { - checked: selectedInterface.powered - onCheckedChanged: { - selectedInterface.powered = checked - root.connecting = false - connectView.visible = false - } - } - } - RowLayout { - spacing: 10 - width: parent.width - - visible: selectedInterface.powered && networkSelection.count > 0 - Label { - Layout.preferredWidth: root.width * 0.382 - text: qsTr("Current network") - horizontalAlignment: Text.AlignRight - Layout.alignment: Qt.AlignVCenter - - } - ComboBoxEntry { - id: networkSelection - model: NetworkSettingsManager.services - - textRole: "name" - Layout.fillWidth: true - onCurrentIndexChanged: { - if (currentIndex >= 0) { - connectView.visible = false + RowLayout { + spacing: 10 + id: enableSwitch + width: parent.width - var service = model.itemFromRow(currentIndex) - if (service) { - root.connecting = true - service.connectService(); - } - } + Label { + Layout.preferredWidth: root.width * 0.382 + Layout.alignment: Qt.AlignVCenter + horizontalAlignment: Text.AlignRight + text: selectedInterface.powered ? qsTr("Wi-Fi ON") : qsTr("Wi-Fi OFF") } - - onCountChanged: { - if (count === 0) { + Switch { + checked: selectedInterface.powered + onCheckedChanged: { + selectedInterface.powered = checked root.connecting = false connectView.visible = false } } + } + RowLayout { + spacing: 10 + width: parent.width + + visible: selectedInterface.powered && networkSelection.count > 0 + Label { + Layout.preferredWidth: root.width * 0.382 + text: qsTr("Current network") + horizontalAlignment: Text.AlignRight + Layout.alignment: Qt.AlignVCenter - delegate: WifiSelectorDelegate { - width: networkSelection.width - onConnectChanged: if (connect) networkSelection.currentIndex = index } - } - } + ComboBoxEntry { + id: networkSelection + model: NetworkSettingsManager.services - Row { - id: infoRow - spacing: 10 - width: parent.width - visible: selectedInterface.powered && selectedInterface.state !== NetworkSettingsState.Online && (networkSelection.count == 0 || root.connecting) - Label { - id: scanningText - text: root.connecting ? qsTr("Connecting to the network...") : qsTr("Searching for Wi-Fi networks...") - horizontalAlignment: Text.AlignLeft - } - WifiSignalMonitor { - id: scanningIcon - scanning: true - height: scanningText.height - width: height - } - } + textRole: "name" + Layout.fillWidth: true + onActivated: { + if (index >= 0) { + connectView.visible = false - GroupBox { - id: connectView - title: qsTr("Enter a password") - visible: false - Layout.fillWidth: true - ColumnLayout { - width: parent.width + var service = model.itemFromRow(index) + if (service) { + root.connecting = true + service.connectService(); + } + } + } - RowLayout { - id: errorView - visible: text.text !== "" - spacing: 10 - property alias text: text.text + onCountChanged: { + if (count === 0) { + root.connecting = false + connectView.visible = false + } + } - Image { - source: "../icons/Alert_yellow_1x.png" - Layout.alignment: Qt.AlignVCenter + Component.onCompleted: { + networkSelection.currentIndex = model.activeRow() } - Text { - id: text - color: "#face20" - text: "" - Layout.alignment: Qt.AlignVCenter + + delegate: WifiSelectorDelegate { + width: networkSelection.width + onConnectChanged: if (connect) networkSelection.currentIndex = index } } - RowLayout { - spacing: 10 - visible: false - width: parent.width + } - Label { - text: qsTr("User name:") - horizontalAlignment: Text.AlignRight - Layout.preferredWidth: root.width * 0.382 - Layout.alignment: Qt.AlignVCenter - } - TextField { - text: "" - inputMethodHints: Qt.ImhNoPredictiveText - Layout.alignment: Qt.AlignVCenter - Layout.fillWidth: true + Row { + id: infoRow + spacing: 10 + width: parent.width + visible: selectedInterface.powered && selectedInterface.state !== NetworkSettingsState.Online + Label { + id: scanningText + text: { + if (networkSelection.count == 0) + return qsTr("Searching for Wi-Fi networks...") + else if (root.connecting) + return qsTr("Connecting to the network...") + else + return "" } + horizontalAlignment: Text.AlignLeft + } + WifiSignalMonitor { + id: scanningIcon + scanning: true + visible: scanningText.text !== "" + height: scanningText.height + width: height } - RowLayout { - spacing: 10 + } + + GroupBox { + id: connectView + title: qsTr("Enter a password") + visible: false + Layout.fillWidth: true + ColumnLayout { width: parent.width - Label { - text: qsTr("Password:") - horizontalAlignment: Text.AlignRight - Layout.preferredWidth: root.width * 0.382 - Layout.alignment: Qt.AlignVCenter + RowLayout { + id: errorView + visible: text.text !== "" + spacing: 10 + property alias text: text.text + + Image { + source: "../icons/Alert_yellow_1x.png" + Layout.alignment: Qt.AlignVCenter + } + Text { + id: text + color: "#face20" + text: "" + Layout.alignment: Qt.AlignVCenter + } } - TextField { - id: password - text: "" - echoMode: TextInput.Password - inputMethodHints: Qt.ImhNoPredictiveText | Qt.ImhNoAutoUppercase | Qt.ImhPreferLowercase | Qt.ImhSensitiveData - Layout.alignment: Qt.AlignVCenter - Layout.fillWidth: true + RowLayout { + spacing: 10 + visible: false + width: parent.width + + Label { + text: qsTr("User name:") + horizontalAlignment: Text.AlignRight + Layout.preferredWidth: root.width * 0.382 + Layout.alignment: Qt.AlignVCenter + } + TextField { + text: "" + inputMethodHints: Qt.ImhNoPredictiveText + Layout.alignment: Qt.AlignVCenter + Layout.fillWidth: true + } } - } - RowLayout { - spacing: 10 + RowLayout { + spacing: 10 + width: parent.width - Button { - text: qsTr("Connect") - onClicked: { - connectView.visible = false - NetworkSettingsManager.userAgent.setUserCredentials("", password.text) + Label { + text: qsTr("Password:") + horizontalAlignment: Text.AlignRight + Layout.preferredWidth: root.width * 0.382 + Layout.alignment: Qt.AlignVCenter + } + TextField { + id: password + text: "" + echoMode: TextInput.Password + inputMethodHints: Qt.ImhNoPredictiveText | Qt.ImhNoAutoUppercase | Qt.ImhPreferLowercase | Qt.ImhSensitiveData + Layout.alignment: Qt.AlignVCenter + Layout.fillWidth: true } } - Button { - text: qsTr("Cancel") - onClicked: { - networkSelection.currentIndex = -1 - connectView.visible = false + RowLayout { + spacing: 10 + + Button { + text: qsTr("Connect") + onClicked: { + connectView.visible = false + NetworkSettingsManager.userAgent.setUserCredentials("", password.text) + } + } + Button { + text: qsTr("Cancel") + onClicked: { + networkSelection.currentIndex = -1 + connectView.visible = false + } } } } } - } - Button { - id: disconnect - text: qsTr("Disconnect") - visible: selectedInterface.state === NetworkSettingsState.Online || - selectedInterface.state === NetworkSettingsState.Ready - onClicked: { - console.log("disconnect"); - NetworkSettingsManager.services.itemFromRow(networkSelection.selectedIndex).disconnectService(); - networkSelection.selectedIndex = -1; + Button { + id: disconnect + text: qsTr("Disconnect") + visible: selectedInterface.state === NetworkSettingsState.Online || + selectedInterface.state === NetworkSettingsState.Ready + onClicked: { + NetworkSettingsManager.services.itemFromRow(networkSelection.currentIndex).disconnectService(); + networkSelection.currentIndex = -1; + root.connecting = false + } } } - } - Connections { - target: NetworkSettingsManager.userAgent - onShowUserCredentialsInput : { - connectView.visible = true - root.connecting = false - } - onError: { - errorView.visible = true - connectView.visible = true - root.connecting = false + Connections { + target: NetworkSettingsManager.userAgent + onShowUserCredentialsInput : { + connectView.visible = true + root.connecting = false + } + onError: { + errorView.visible = true + connectView.visible = true + root.connecting = false + } } } } -- cgit v1.2.3 From 1652f4a05d65cf410701e38c4334fba9cf81eb95 Mon Sep 17 00:00:00 2001 From: Teemu Holappa Date: Tue, 1 Nov 2016 13:02:10 +0200 Subject: Fix QNetworkSettingsManager usage from the C++ Fixed servicesChanged signal handling. Fixed services and interfaces functions return types in QNetworkSettingsManager. Task-number: QTBUG-56760 Change-Id: Iaade0d5c06e8ff8f8dea4b421e226ae6348a9fe5 Reviewed-by: Rainer Keller --- src/imports/networksettings/plugin.cpp | 9 +++- .../connman/qnetworksettingsmanager_p.cpp | 60 ++++++++++++++-------- .../connman/qnetworksettingsmanager_p.h | 5 +- .../connman/qnetworksettingsservice_p.cpp | 1 + src/networksettings/qnetworksettings.h | 4 +- src/networksettings/qnetworksettingsmanager.cpp | 6 +-- src/networksettings/qnetworksettingsmanager.h | 13 +++-- src/networksettings/qnetworksettingsservicemodel.h | 2 +- 8 files changed, 66 insertions(+), 34 deletions(-) (limited to 'src') diff --git a/src/imports/networksettings/plugin.cpp b/src/imports/networksettings/plugin.cpp index 245e952..c1dac53 100644 --- a/src/imports/networksettings/plugin.cpp +++ b/src/imports/networksettings/plugin.cpp @@ -31,6 +31,8 @@ #include #include #include +#include +#include #include #include @@ -44,7 +46,7 @@ \brief Provides singleton QML types for controlling network settings. Provides singleton QML types for controlling network settings in an - embedded device. + embedded device.QAbstractItemModel Import the module as follows: @@ -106,7 +108,7 @@ */ /*! - \qmlmethod NetworkService NetworkSettingsManager::getService(string name, int type) + \qmlmethod NetworkService NetworkSettingsManager::service(string name, int type) Returns the service with name \a name and type \a type. @@ -161,5 +163,8 @@ void NetworksettingspluginPlugin::registerTypes(const char *uri) qmlRegisterUncreatableType(uri, 1, 0, "NetworkSettingsState", "Cannot be instantiated directly."); qRegisterMetaType("QNetworkSettingsUserAgent*"); + qRegisterMetaType("QNetworkSettingsServiceFilter*"); + qRegisterMetaType("QNetworkSettingsInterfaceModel*"); + qmlRegisterSingletonType(uri, 1, 0, "NetworkSettingsManager", &instance); } diff --git a/src/networksettings/connman/qnetworksettingsmanager_p.cpp b/src/networksettings/connman/qnetworksettingsmanager_p.cpp index 6fecd86..22e8005 100644 --- a/src/networksettings/connman/qnetworksettingsmanager_p.cpp +++ b/src/networksettings/connman/qnetworksettingsmanager_p.cpp @@ -98,25 +98,7 @@ void QNetworkSettingsManagerPrivate::getServicesFinished(QDBusPendingCallWatcher foreach (const ConnmanMapStruct &object, reply.value()) { const QString servicePath = object.objectPath.path(); - QNetworkSettingsService *service = new QNetworkSettingsService(servicePath, this); - m_serviceModel->append(service); - - //Update status property - QString n = qdbus_cast(object.propertyMap[PropertyName]); - QString t = qdbus_cast(object.propertyMap[PropertyType]); - QString s = qdbus_cast(object.propertyMap[PropertyState]); - - QNetworkSettingsType type; - t >> type; - QNetworkSettingsState state; - s >> state; - - foreach (QNetworkSettingsInterface* item, m_interfaceModel.getModel()) { - ConnmanSettingsInterface* technology = qobject_cast(item); - if (technology->name() == n && technology->type() == type.type()) { - technology->setState(state.state()); - } - } + handleNewService(servicePath); } emit q->servicesChanged(); } @@ -161,9 +143,26 @@ void QNetworkSettingsManagerPrivate::onServicesChanged(ConnmanMapStructList chan if (!found) newServices.append(map.objectPath.path()); } + foreach (QString newService, newServices) { - QNetworkSettingsService *service = new QNetworkSettingsService(newService, this); + handleNewService(newService); + } +} + +void QNetworkSettingsManagerPrivate::handleNewService(const QString &servicePath) +{ + Q_Q(QNetworkSettingsManager); + + QNetworkSettingsService *service = new QNetworkSettingsService(servicePath, this); + + if (service->name().length() > 0 && service->type() != QNetworkSettingsType::Unknown) { m_serviceModel->append(service); + emit q->servicesChanged(); + } + else { + //Service name or type not set, wait for update + connect(service, &QNetworkSettingsService::nameChanged, this, &QNetworkSettingsManagerPrivate::serviceReady); + connect(service, &QNetworkSettingsService::typeChanged, this, &QNetworkSettingsManagerPrivate::serviceReady); } } @@ -171,3 +170,24 @@ void QNetworkSettingsManagerPrivate::setUserAgent(QNetworkSettingsUserAgent *age { m_agent = agent; } + +void QNetworkSettingsManagerPrivate::serviceReady() +{ + Q_Q(QNetworkSettingsManager); + + QNetworkSettingsService* service = qobject_cast(sender()); + if (service->name().length() > 0 && service->type() != QNetworkSettingsType::Unknown) { + service->disconnect(this); + m_serviceModel->append(service); + emit q->servicesChanged(); + + //Update the interface state accordingly + foreach (QNetworkSettingsInterface* item, m_interfaceModel.getModel()) { + ConnmanSettingsInterface* technology = qobject_cast(item); + if (technology->name() == service->name() && technology->type() == service->type()) { + technology->setState(technology->state()); + } + } + + } +} diff --git a/src/networksettings/connman/qnetworksettingsmanager_p.h b/src/networksettings/connman/qnetworksettingsmanager_p.h index 5eb5470..b6e23ab 100644 --- a/src/networksettings/connman/qnetworksettingsmanager_p.h +++ b/src/networksettings/connman/qnetworksettingsmanager_p.h @@ -38,6 +38,7 @@ class NetConnmanManagerInterface; class QNetworkSettingsServiceModel; class QNetworkSettingsServiceFilter; +class QNetworkSettingsService; class QNetworkSettingsManagerPrivate : public QObject { @@ -53,7 +54,9 @@ public slots: void getTechnologiesFinished(QDBusPendingCallWatcher *watcher); void requestInput(const QString& service, const QString& type); void onServicesChanged(ConnmanMapStructList changed, const QList &removed); - + void serviceReady(); +private: + void handleNewService(const QString& servicePath); protected: QNetworkSettingsInterfaceModel m_interfaceModel; QNetworkSettingsServiceModel *m_serviceModel; diff --git a/src/networksettings/connman/qnetworksettingsservice_p.cpp b/src/networksettings/connman/qnetworksettingsservice_p.cpp index 8a7b2cf..e8aabff 100644 --- a/src/networksettings/connman/qnetworksettingsservice_p.cpp +++ b/src/networksettings/connman/qnetworksettingsservice_p.cpp @@ -362,6 +362,7 @@ void QNetworkSettingsServicePrivate::updateProperty(const QString& key, const QV else if (key == PropertyType) { QString value = qdbus_cast(val); value >> m_type; + emit q->typeChanged(); } else if (key == PropertyStrength) { m_wifiConfig.setSignalStrength(val.toInt()); diff --git a/src/networksettings/qnetworksettings.h b/src/networksettings/qnetworksettings.h index da75acd..5323f98 100644 --- a/src/networksettings/qnetworksettings.h +++ b/src/networksettings/qnetworksettings.h @@ -166,12 +166,11 @@ class Q_DECL_EXPORT QNetworkSettingsProxy : public QObject { Q_OBJECT Q_ENUMS(MethodType) -public: Q_PROPERTY(QUrl url READ url WRITE setUrl NOTIFY urlChanged) Q_PROPERTY(QAbstractItemModel* servers READ servers NOTIFY serversChanged) Q_PROPERTY(QAbstractItemModel* excludes READ excludes NOTIFY excludesChanged) Q_PROPERTY(MethodType method READ method WRITE setMethod NOTIFY methodChanged) - +public: explicit QNetworkSettingsProxy(QObject *parent = Q_NULLPTR); enum MethodType {Direct, Auto, Manual}; @@ -202,6 +201,7 @@ private: class Q_DECL_EXPORT QNetworkSettingsWireless : public QObject { Q_OBJECT + Q_ENUMS(SecurityFlags) Q_PROPERTY(int signalStrength READ signalStrength WRITE setSignalStrength NOTIFY signalStrengthChanged) Q_PROPERTY(bool hidden READ hidden NOTIFY hiddenChanged) Q_PROPERTY(bool isOutOfRange READ outOfRange WRITE setOutOfRange NOTIFY outOfRangeChanged) diff --git a/src/networksettings/qnetworksettingsmanager.cpp b/src/networksettings/qnetworksettingsmanager.cpp index ceee7ad..caf6057 100644 --- a/src/networksettings/qnetworksettingsmanager.cpp +++ b/src/networksettings/qnetworksettingsmanager.cpp @@ -39,19 +39,19 @@ QNetworkSettingsManager::QNetworkSettingsManager(QObject *parent) : { } -QAbstractItemModel* QNetworkSettingsManager::services() +QNetworkSettingsServiceFilter *QNetworkSettingsManager::services() { Q_D(QNetworkSettingsManager); return d->m_serviceFilter; } -QAbstractItemModel* QNetworkSettingsManager::interfaces() +QNetworkSettingsInterfaceModel *QNetworkSettingsManager::interfaces() { Q_D(QNetworkSettingsManager); return &d->m_interfaceModel; } -QNetworkSettingsService* QNetworkSettingsManager::getService(const QString& name, const int type) +QNetworkSettingsService* QNetworkSettingsManager::service(const QString& name, const int type) { Q_D(QNetworkSettingsManager); diff --git a/src/networksettings/qnetworksettingsmanager.h b/src/networksettings/qnetworksettingsmanager.h index ba34974..86a60c4 100644 --- a/src/networksettings/qnetworksettingsmanager.h +++ b/src/networksettings/qnetworksettingsmanager.h @@ -35,24 +35,27 @@ QT_FORWARD_DECLARE_CLASS(QNetworkSettingsManagerPrivate) QT_FORWARD_DECLARE_CLASS(QNetworkSettingsService) +QT_FORWARD_DECLARE_CLASS(QNetworkSettingsServiceModel) QT_FORWARD_DECLARE_CLASS(QNetworkSettingsUserAgent) +QT_FORWARD_DECLARE_CLASS(QNetworkSettingsServiceFilter) +QT_FORWARD_DECLARE_CLASS(QNetworkSettingsInterfaceModel) class Q_DECL_EXPORT QNetworkSettingsManager : public QObject { Q_OBJECT Q_ENUMS(StateTypes NetworkTypeTypes) - Q_PROPERTY(QAbstractItemModel* services READ services NOTIFY servicesChanged) - Q_PROPERTY(QAbstractItemModel* interfaces READ interfaces NOTIFY interfacesChanged) + Q_PROPERTY(QNetworkSettingsServiceFilter* services READ services NOTIFY servicesChanged) + Q_PROPERTY(QNetworkSettingsInterfaceModel* interfaces READ interfaces NOTIFY interfacesChanged) Q_PROPERTY(QNetworkSettingsUserAgent* userAgent READ userAgent CONSTANT) public: explicit QNetworkSettingsManager(QObject* parent = Q_NULLPTR); - QAbstractItemModel* services(); - QAbstractItemModel* interfaces(); + QNetworkSettingsServiceFilter* services(); + QNetworkSettingsInterfaceModel* interfaces(); void setUserAgent(QNetworkSettingsUserAgent *agent); QNetworkSettingsUserAgent* userAgent(); - Q_INVOKABLE QNetworkSettingsService* getService(const QString& name, const int type); + Q_INVOKABLE QNetworkSettingsService* service(const QString& name, const int type); Q_SIGNALS: void servicesChanged(); diff --git a/src/networksettings/qnetworksettingsservicemodel.h b/src/networksettings/qnetworksettingsservicemodel.h index ab225bd..c158ec4 100644 --- a/src/networksettings/qnetworksettingsservicemodel.h +++ b/src/networksettings/qnetworksettingsservicemodel.h @@ -70,7 +70,7 @@ private: QHash m_roleNames; }; -class QNetworkSettingsServiceFilter : public QSortFilterProxyModel +class Q_DECL_EXPORT QNetworkSettingsServiceFilter : public QSortFilterProxyModel { Q_OBJECT Q_PROPERTY(QNetworkSettingsType::Types type READ type WRITE setType NOTIFY typeChanged) -- cgit v1.2.3 From 129e04b7aa0c73bedab3671d2de7599f7b9af9d6 Mon Sep 17 00:00:00 2001 From: Teemu Holappa Date: Thu, 17 Nov 2016 13:40:14 +0200 Subject: Fix compile error in qtdevicesettings Change-Id: Ibc1188da2729a39991b84a38bd121ded097d3362 Reviewed-by: Rainer Keller --- src/src.pro | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/src.pro b/src/src.pro index 74ecfb0..27a9700 100644 --- a/src/src.pro +++ b/src/src.pro @@ -1,5 +1,8 @@ TEMPLATE = subdirs CONFIG += ordered + +qtHaveModule(bluetooth): SUBDIRS += bluetoothsettings + SUBDIRS += \ networksettings \ localesettings \ @@ -10,5 +13,3 @@ SUBDIRS += \ settingsui \ imports \ doc \ - -qtHaveModule(bluetooth): SUBDIRS += bluetoothsettings -- cgit v1.2.3