Skip to content

Commit 62ab321

Browse files
cpwrscpwrs
committed
network: fmt, lint, style
1 parent 8fee842 commit 62ab321

22 files changed

+156
-110
lines changed

‎src/network/device.cpp‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
#include "device.hpp"
22

3+
#include <qdebug.h>
34
#include <qlogging.h>
45
#include <qloggingcategory.h>
6+
#include <qobject.h>
7+
#include <qstringliteral.h>
58

69
#include "../core/logcat.hpp"
710

‎src/network/device.hpp‎

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
#pragma once
22

33
#include <qobject.h>
4+
#include <qproperty.h>
45
#include <qqmlintegration.h>
56
#include <qtmetamacros.h>
67
#include <qtypes.h>
@@ -43,27 +44,27 @@ class NetworkDevice: public QObject {
4344
Q_PROPERTY(qs::network::NMDeviceState::Enum nmState READ nmState NOTIFY nmStateChanged BINDABLE bindableNmState);
4445
// clang-format on
4546

46-
signals:
47-
void nameChanged();
48-
void addressChanged();
49-
void stateChanged();
50-
void nmStateChanged();
51-
void requestDisconnect();
52-
5347
public:
5448
explicit NetworkDevice(QObject* parent = nullptr);
5549

5650
/// Disconnects the device and prevents it from automatically activating further connections.
5751
Q_INVOKABLE void disconnect();
5852

59-
[[nodiscard]] QString name() const { return this->bName; };
60-
[[nodiscard]] QString address() const { return this->bAddress; };
61-
[[nodiscard]] NetworkConnectionState::Enum state() const { return this->bState; };
62-
[[nodiscard]] NMDeviceState::Enum nmState() const { return this->bNmState; };
6353
QBindable<QString> bindableName() { return &this->bName; };
54+
[[nodiscard]] QString name() const { return this->bName; };
6455
QBindable<QString> bindableAddress() { return &this->bAddress; };
56+
[[nodiscard]] QString address() const { return this->bAddress; };
6557
QBindable<NetworkConnectionState::Enum> bindableState() { return &this->bState; };
58+
[[nodiscard]] NetworkConnectionState::Enum state() const { return this->bState; };
6659
QBindable<NMDeviceState::Enum> bindableNmState() { return &this->bNmState; };
60+
[[nodiscard]] NMDeviceState::Enum nmState() const { return this->bNmState; };
61+
62+
signals:
63+
void requestDisconnect();
64+
void nameChanged();
65+
void addressChanged();
66+
void stateChanged();
67+
void nmStateChanged();
6768

6869
private:
6970
// clang-format off

‎src/network/network.cpp‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,11 @@
22

33
#include <qlogging.h>
44
#include <qloggingcategory.h>
5+
#include <qobject.h>
56

67
#include "../core/logcat.hpp"
78
#include "nm/backend.hpp"
9+
#include "wifi.hpp"
810

911
namespace qs::network {
1012

‎src/network/network.hpp‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
#pragma once
22

33
#include <qobject.h>
4+
#include <qproperty.h>
45
#include <qqmlintegration.h>
56
#include <qtmetamacros.h>
67
#include <qtypes.h>
@@ -38,8 +39,8 @@ class NetworkBackend: public QObject {
3839
/// which can be used to view, configure, and connect to various networks.
3940
class Network: public QObject {
4041
Q_OBJECT;
41-
QML_NAMED_ELEMENT(Network);
4242
QML_SINGLETON;
43+
QML_NAMED_ELEMENT(Network);
4344

4445
/// The wifi device service.
4546
Q_PROPERTY(qs::network::Wifi* wifi READ wifi CONSTANT);

‎src/network/nm/accesspoint.cpp‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,14 @@
33
#include <qdbusconnection.h>
44
#include <qlogging.h>
55
#include <qloggingcategory.h>
6+
#include <qnamespace.h>
67
#include <qobject.h>
78
#include <qstring.h>
9+
#include <qtypes.h>
810

911
#include "../../core/logcat.hpp"
1012
#include "../../dbus/properties.hpp"
13+
#include "enums.hpp"
1114
#include "nm/dbus_nm_accesspoint.h"
1215

1316
namespace qs::network {

‎src/network/nm/accesspoint.hpp‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
#include <qdbusextratypes.h>
44
#include <qobject.h>
5+
#include <qproperty.h>
56
#include <qtmetamacros.h>
67
#include <qtypes.h>
78

@@ -54,14 +55,14 @@ class NMAccessPoint: public QObject {
5455
[[nodiscard]] NM80211Mode::Enum mode() const { return this->bMode; };
5556

5657
signals:
58+
void ready();
59+
void disappeared();
5760
void ssidChanged(const QByteArray& ssid);
5861
void signalStrengthChanged(quint8 signal);
62+
void flagsChanged(NM80211ApFlags::Enum flags);
5963
void wpaFlagsChanged(NM80211ApSecurityFlags::Enum wpaFlags);
6064
void rsnFlagsChanged(NM80211ApSecurityFlags::Enum rsnFlags);
61-
void flagsChanged(NM80211ApFlags::Enum flags);
6265
void modeChanged(NM80211Mode::Enum mode);
63-
void ready();
64-
void disappeared();
6566

6667
private:
6768
bool mActive = false;

‎src/network/nm/backend.cpp‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,24 @@
11
#include "backend.hpp"
22

3+
#include <qdbusconnection.h>
34
#include <qdbusextratypes.h>
5+
#include <qdbusmetatype.h>
6+
#include <qdbuspendingcall.h>
7+
#include <qdbuspendingreply.h>
8+
#include <qlist.h>
9+
#include <qlogging.h>
10+
#include <qloggingcategory.h>
411
#include <qobject.h>
512
#include <qtmetamacros.h>
13+
#include <qxmlstream.h>
614

715
#include "../../core/logcat.hpp"
816
#include "../../dbus/properties.hpp"
17+
#include "../device.hpp"
918
#include "../network.hpp"
1019
#include "../wifi.hpp"
11-
#include "device.hpp"
20+
#include "dbus_types.hpp"
21+
#include "enums.hpp"
1222
#include "nm/dbus_nm_backend.h"
1323
#include "wireless.hpp"
1424

@@ -106,7 +116,7 @@ void NetworkManager::registerDevice(const QString& path) {
106116
xml.readNext();
107117

108118
if (xml.isStartElement() && xml.name() == "interface") {
109-
QString name = xml.attributes().value("name").toString();
119+
const QString name = xml.attributes().value("name").toString();
110120
if (name.startsWith("org.freedesktop.NetworkManager.Device.Wireless")) {
111121
this->registerWifiDevice(path);
112122
break;

‎src/network/nm/backend.hpp‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,32 +3,33 @@
33
#include <qdbusextratypes.h>
44
#include <qhash.h>
55
#include <qobject.h>
6+
#include <qproperty.h>
67
#include <qtmetamacros.h>
78
#include <qtypes.h>
89

910
#include "../../dbus/properties.hpp"
1011
#include "../network.hpp"
1112
#include "../wifi.hpp"
12-
#include "device.hpp"
1313
#include "nm/dbus_nm_backend.h"
1414

1515
namespace qs::network {
1616

1717
class NetworkManager: public NetworkBackend {
1818
Q_OBJECT;
1919

20-
signals:
21-
void wifiEnabledChanged(bool enabled);
22-
void wifiHardwareEnabledChanged(bool enabled);
23-
void wifiDeviceAdded(WifiDevice* device);
24-
void wifiDeviceRemoved(WifiDevice* device);
25-
2620
public:
2721
explicit NetworkManager(QObject* parent = nullptr);
22+
2823
[[nodiscard]] bool isAvailable() const override;
2924
[[nodiscard]] bool wifiEnabled() const { return this->bWifiEnabled; };
3025
[[nodiscard]] bool wifiHardwareEnabled() const { return this->bWifiHardwareEnabled; };
3126

27+
signals:
28+
void wifiDeviceAdded(WifiDevice* device);
29+
void wifiDeviceRemoved(WifiDevice* device);
30+
void wifiEnabledChanged(bool enabled);
31+
void wifiHardwareEnabledChanged(bool enabled);
32+
3233
public slots:
3334
void setWifiEnabled(bool enabled);
3435

@@ -43,11 +44,11 @@ private slots:
4344
);
4445

4546
private:
47+
static NetworkConnectionState::Enum toNetworkDeviceState(NMDeviceState::Enum state);
4648
void init();
4749
void registerDevices();
4850
void registerDevice(const QString& path);
4951
void registerWifiDevice(const QString& path);
50-
static NetworkConnectionState::Enum toNetworkDeviceState(NMDeviceState::Enum state);
5152

5253
QHash<QString, NetworkDevice*> mDeviceHash;
5354

‎src/network/nm/connection.cpp‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,23 @@
11
#include "connection.hpp"
22

33
#include <qdbusconnection.h>
4+
#include <qdbusmetatype.h>
5+
#include <qdbuspendingcall.h>
6+
#include <qdbuspendingreply.h>
47
#include <qlogging.h>
58
#include <qloggingcategory.h>
9+
#include <qnamespace.h>
610
#include <qobject.h>
711
#include <qstring.h>
12+
#include <qtmetamacros.h>
13+
#include <qtypes.h>
814

915
#include "../../core/logcat.hpp"
1016
#include "../../dbus/properties.hpp"
17+
#include "dbus_types.hpp"
18+
#include "enums.hpp"
19+
#include "nm/dbus_nm_active_connection.h"
20+
#include "nm/dbus_nm_connection_settings.h"
1121

1222
namespace qs::network {
1323
using namespace qs::dbus;

‎src/network/nm/connection.hpp‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
#pragma once
22

33
#include <qdbusextratypes.h>
4+
#include <qdbuspendingcall.h>
5+
#include <qdbuspendingreply.h>
46
#include <qobject.h>
7+
#include <qproperty.h>
58
#include <qtmetamacros.h>
69
#include <qtypes.h>
710

@@ -68,12 +71,12 @@ class NMActiveConnection: public QObject {
6871
[[nodiscard]] QString uuid() const { return this->bUuid; };
6972

7073
signals:
74+
void ready();
75+
void disappeared();
76+
void connectionChanged(QDBusObjectPath path);
7177
void stateChanged(NMConnectionState::Enum state);
7278
void stateReasonChanged(NMConnectionStateReason::Enum reason);
73-
void connectionChanged(QDBusObjectPath path);
7479
void uuidChanged(const QString& uuid);
75-
void ready();
76-
void disappeared();
7780

7881
private slots:
7982
void onStateChanged(quint32 state, quint32 reason);

0 commit comments

Comments
 (0)