diff options
Diffstat (limited to 'src')
27 files changed, 80 insertions, 81 deletions
diff --git a/src/bluetoothsettings/bluetoothdevice.h b/src/bluetoothsettings/bluetoothdevice.h index a38cde7..84d1615 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 = nullptr); bool powered() const; void setPowered(const bool& aPowered); QObject* deviceModel() const; @@ -50,11 +50,12 @@ 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/bluez/bluetoothdevice_p.h b/src/bluetoothsettings/bluez/bluetoothdevice_p.h index adc283b..7c8a78a 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 = nullptr); void connectDevice(); void disconnectDevice(); diff --git a/src/bluetoothsettings/discoverymodel.h b/src/bluetoothsettings/discoverymodel.h index d9678a3..e32ad9b 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 = nullptr); //The list of device type we want to show the icon enum DeviceType { Phone, @@ -65,7 +65,7 @@ public: bool connected() const; void setConnected(bool aConnected); -signals: +Q_SIGNALS: void connectedChanged(); protected: @@ -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 = nullptr); virtual ~DiscoveryModel(); // from QAbstractItemModel int rowCount(const QModelIndex & parent = QModelIndex()) const; @@ -106,11 +106,12 @@ public: Connected }; -signals: +Q_SIGNALS: void scanFinished(); -private slots: +private Q_SLOTS: void deviceDiscovered(const QBluetoothDeviceInfo &device); + private: QList<BtDeviceItem*> m_items; QHash<int, QByteArray> m_roleNames; diff --git a/src/displaysettings/displaysettings.h b/src/displaysettings/displaysettings.h index c0032d8..c6f4bab 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 = nullptr); ~DisplaySettings(); int displayBrightness(); @@ -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/displaysettings/displaysettings_p.h b/src/displaysettings/displaysettings_p.h index 672eb95..48f7048 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 = nullptr); virtual ~PhysicalScreenSize(); void setSize(int inches); diff --git a/src/localdevice/qlocaldevice.h b/src/localdevice/qlocaldevice.h index 7376527..7695866 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 = nullptr); ~QLocalDevice(); public Q_SLOTS: 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 b77bea6..61a42c4 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 = 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 = nullptr); virtual ~LocaleModel(); // from QAbstractItemModel int rowCount(const QModelIndex & parent = QModelIndex()) const; @@ -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 bc2e9cd..e942974 100644 --- a/src/localesettings/systemlocale.h +++ b/src/localesettings/systemlocale.h @@ -38,12 +38,11 @@ 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 = nullptr); QString locale() const; void setLocale(const QString& aLocale); -signals: +Q_SIGNALS: void localeChanged(); -public slots: protected: SystemLocalePrivate *d_ptr; diff --git a/src/networksettings/connman/qnetworksettingsinterface_p.h b/src/networksettings/connman/qnetworksettingsinterface_p.h index 275e751..7f5ee7b 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 = nullptr) :QNetworkSettingsInterface(parent) { if (d_ptr) diff --git a/src/networksettings/connman/qnetworksettingsservice_p.h b/src/networksettings/connman/qnetworksettingsservice_p.h index 942a871..e9166d7 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 = nullptr); QNetworkSettingsService *q_ptr; private slots: diff --git a/src/networksettings/connman/qnetworksettingsuseragent_p.h b/src/networksettings/connman/qnetworksettingsuseragent_p.h index e05525b..ecce5ae 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 = 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..858e7e9 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 = nullptr) : QObject(parent) { m_state = state; } - explicit QNetworkSettingsState(QObject *parent = 0) + explicit QNetworkSettingsState(QObject *parent = nullptr) : QObject(parent) { m_state = Undefined; @@ -61,10 +61,10 @@ public: void setState(const States state) { m_state = state; - emit stateChanged(); + Q_EMIT stateChanged(); } -signals: +Q_SIGNALS: void stateChanged(); private: @@ -85,13 +85,13 @@ public: Unknown }; - explicit QNetworkSettingsType(Types type, QObject *parent = 0) + explicit QNetworkSettingsType(Types type, QObject *parent = nullptr) : QObject(parent) { m_type = type; } - explicit QNetworkSettingsType(QObject *parent = 0) + explicit QNetworkSettingsType(QObject *parent = nullptr) : QObject(parent) { m_type = Unknown; @@ -104,10 +104,10 @@ public: void setType(const Types type) { m_type = type; - emit typeChanged(); + Q_EMIT typeChanged(); } -signals: +Q_SIGNALS: void typeChanged(); private: @@ -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 = nullptr) : QObject(parent) { @@ -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(); @@ -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 = nullptr) : QObject(parent) { @@ -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(); @@ -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 = nullptr) : QObject(parent) { } @@ -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 5164fc4..e6ceb16 100644 --- a/src/networksettings/qnetworksettingsaddressmodel.h +++ b/src/networksettings/qnetworksettingsaddressmodel.h @@ -36,15 +36,15 @@ 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 = nullptr); + explicit QNetworkSettingsAddressModel(const QStringList &strings, QObject *parent = nullptr); Q_INVOKABLE void append(const QString& address); Q_INVOKABLE void remove(int index); Q_INVOKABLE void resetChanges(); 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 385d1ed..7531c6f 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 = nullptr); QString name() const; QNetworkSettingsState::States state(); QNetworkSettingsType::Types type(); @@ -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/qnetworksettingsinterfacemodel.h b/src/networksettings/qnetworksettingsinterfacemodel.h index 7282657..2be5280 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 = 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..6f80ec0 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 = nullptr); QAbstractItemModel* services(); QAbstractItemModel* interfaces(); void setUserAgent(QNetworkSettingsUserAgent *agent); diff --git a/src/networksettings/qnetworksettingsservice.h b/src/networksettings/qnetworksettingsservice.h index 44c433a..0a37cd7 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 = nullptr); QString id() const; QString name() const; diff --git a/src/networksettings/qnetworksettingsservicemodel.h b/src/networksettings/qnetworksettingsservicemodel.h index 0cf1601..a540ff5 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 = nullptr); virtual ~QNetworkSettingsServiceModel(); // from QAbstractItemModel int rowCount(const QModelIndex & parent = QModelIndex()) const; @@ -68,13 +68,13 @@ 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 = nullptr); virtual ~QNetworkSettingsServiceFilter(); bool filterAcceptsRow( int source_row, const QModelIndex& source_parent ) const override; 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 ff4c030..e857fec 100644 --- a/src/networksettings/qnetworksettingsuseragent.h +++ b/src/networksettings/qnetworksettingsuseragent.h @@ -37,13 +37,13 @@ class Q_DECL_EXPORT QNetworkSettingsUserAgent : public QObject { Q_OBJECT public: - explicit QNetworkSettingsUserAgent(QObject *parent = 0); + explicit QNetworkSettingsUserAgent(QObject *parent = nullptr); Q_INVOKABLE void setUserCredentials(const QString& username, const QString& passphrase); Q_INVOKABLE void cancelInput(); 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/qnetworksettingsservice_p.h b/src/networksettings/wpasupplicant/qnetworksettingsservice_p.h index 3920f61..06fb132 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 = 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 = nullptr); void setId(const QString& aId); void setName(const QString& aName); void setFlags(const QString& aFlags); 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 178e6a6..6003238 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 = nullptr); bool ntp() const; void setNtp(const bool aNtp); void setTime(const QDateTime& aTime); @@ -49,13 +49,11 @@ public: QDateTime time() const; void setTimeZone(const QString& aTimeZone); -signals: +Q_SIGNALS: void timeZoneChanged(); void ntpChanged(); void timeChanged(); -public 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 efa0e22..e8f15bf 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 = 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 = nullptr); virtual ~TimezoneModel(); // from QAbstractItemModel int rowCount(const QModelIndex & parent = QModelIndex()) const; @@ -72,7 +72,7 @@ public: static void generateModel(TimezoneModel* model); -private slots: +private Q_SLOTS: void addNewItem(QObject* item); private: |