summaryrefslogtreecommitdiffstats
path: root/src/networksettings
diff options
context:
space:
mode:
Diffstat (limited to 'src/networksettings')
-rw-r--r--src/networksettings/qnetworksettings.h48
-rw-r--r--src/networksettings/qnetworksettingsaddressmodel.h2
-rw-r--r--src/networksettings/qnetworksettingsinterface.h2
-rw-r--r--src/networksettings/qnetworksettingsservicemodel.h2
-rw-r--r--src/networksettings/qnetworksettingsuseragent.h2
-rw-r--r--src/networksettings/wpasupplicant/qnetworksettingsinterface_p.h2
-rw-r--r--src/networksettings/wpasupplicant/qwificontroller_p.h2
-rw-r--r--src/networksettings/wpasupplicant/qwifisupplicant_p.h2
8 files changed, 31 insertions, 31 deletions
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: