ETM-Schurig/powersync-networkmanager
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Clean up library inline code warnings

Browse Source
This commit is contained in:
Simon Stürz 2018-10-29 09:47:44 +01:00
parent 34b79e91e1
commit 78146fa48f
3 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libnymea-networkmanager/networkmanager.cpp
View File

@ -258,8 +258,8 @@ bool NetworkManager::init()
// Init properties // Init properties
setVersion(m_networkManagerInterface->property("Version").toString()); setVersion(m_networkManagerInterface->property("Version").toString());
setState((NetworkManagerState)m_networkManagerInterface->property("State").toUInt()); setState(static_cast<NetworkManagerState>(m_networkManagerInterface->property("State").toUInt()));
setConnectivityState((NetworkManagerConnectivityState)m_networkManagerInterface->property("Connectivity").toUInt()); setConnectivityState(static_cast<NetworkManagerConnectivityState>(m_networkManagerInterface->property("Connectivity").toUInt()));
setNetworkingEnabled(m_networkManagerInterface->property("NetworkingEnabled").toBool()); setNetworkingEnabled(m_networkManagerInterface->property("NetworkingEnabled").toBool());
setWirelessEnabled(m_networkManagerInterface->property("WirelessEnabled").toBool()); setWirelessEnabled(m_networkManagerInterface->property("WirelessEnabled").toBool());
@ -486,7 +486,7 @@ void NetworkManager::onPropertiesChanged(const QVariantMap &properties)
setVersion(properties.value("Version").toString()); setVersion(properties.value("Version").toString());
if (properties.contains("State")) if (properties.contains("State"))
setState((NetworkManagerState)properties.value("State").toUInt()); setState(static_cast<NetworkManagerState>(properties.value("State").toUInt()));
if (properties.contains("Connectivity")) if (properties.contains("Connectivity"))
setConnectivityState(NetworkManagerConnectivityState(properties.value("Connectivity").toUInt())); setConnectivityState(NetworkManagerConnectivityState(properties.value("Connectivity").toUInt()));

9
libnymea-networkmanager/wirelessaccesspoint.cpp
View File

@ -43,8 +43,7 @@
/*! Constructs a new \l{WirelessAccessPoint} with the given dbus \a objectPath and \a parent. */ /*! Constructs a new \l{WirelessAccessPoint} with the given dbus \a objectPath and \a parent. */
WirelessAccessPoint::WirelessAccessPoint(const QDBusObjectPath &objectPath, QObject *parent) : WirelessAccessPoint::WirelessAccessPoint(const QDBusObjectPath &objectPath, QObject *parent) :
QObject(parent), QObject(parent),
m_objectPath(objectPath), m_objectPath(objectPath)
m_securityFlags(0)
{ {
QDBusInterface accessPointInterface(NetworkManagerUtils::networkManagerServiceString(), m_objectPath.path(), NetworkManagerUtils::accessPointInterfaceString(), QDBusConnection::systemBus()); QDBusInterface accessPointInterface(NetworkManagerUtils::networkManagerServiceString(), m_objectPath.path(), NetworkManagerUtils::accessPointInterfaceString(), QDBusConnection::systemBus());
if(!accessPointInterface.isValid()) { if(!accessPointInterface.isValid()) {
@ -56,9 +55,9 @@ WirelessAccessPoint::WirelessAccessPoint(const QDBusObjectPath &objectPath, QObj
setSsid(accessPointInterface.property("Ssid").toString()); setSsid(accessPointInterface.property("Ssid").toString());
setMacAddress(accessPointInterface.property("HwAddress").toString()); setMacAddress(accessPointInterface.property("HwAddress").toString());
setFrequency(accessPointInterface.property("Frequency").toDouble() / 1000); setFrequency(accessPointInterface.property("Frequency").toDouble() / 1000);
setSignalStrength(accessPointInterface.property("Strength").toUInt()); setSignalStrength(accessPointInterface.property("Strength").toInt());
setSecurityFlags(WirelessAccessPoint::ApSecurityModes(accessPointInterface.property("WpaFlags").toUInt())); setSecurityFlags(WirelessAccessPoint::ApSecurityModes(accessPointInterface.property("WpaFlags").toUInt()));
setIsProtected((bool)accessPointInterface.property("Flags").toUInt()); setIsProtected(static_cast<bool>(accessPointInterface.property("Flags").toUInt()));
QDBusConnection::systemBus().connect(NetworkManagerUtils::networkManagerServiceString(), objectPath.path(), NetworkManagerUtils::accessPointInterfaceString(), "PropertiesChanged", this, SLOT(onPropertiesChanged(QVariantMap))); QDBusConnection::systemBus().connect(NetworkManagerUtils::networkManagerServiceString(), objectPath.path(), NetworkManagerUtils::accessPointInterfaceString(), "PropertiesChanged", this, SLOT(onPropertiesChanged(QVariantMap)));
} }
@ -139,7 +138,7 @@ void WirelessAccessPoint::setSecurityFlags(const WirelessAccessPoint::ApSecurity
void WirelessAccessPoint::onPropertiesChanged(const QVariantMap &properties) void WirelessAccessPoint::onPropertiesChanged(const QVariantMap &properties)
{ {
if (properties.contains("Strength")) if (properties.contains("Strength"))
setSignalStrength(properties.value("Strength").toUInt()); setSignalStrength(properties.value("Strength").toInt());
} }

6
libnymea-networkmanager/wirelessaccesspoint.h
View File

@ -68,9 +68,9 @@ private:
QString m_ssid; QString m_ssid;
QString m_macAddress; QString m_macAddress;
double m_frequency; double m_frequency;
int m_signalStrength; int m_signalStrength = 0;
bool m_isProtected; bool m_isProtected = false;
WirelessAccessPoint::ApSecurityModes m_securityFlags; WirelessAccessPoint::ApSecurityModes m_securityFlags = ApSecurityModeNone;
void setSsid(const QString &ssid); void setSsid(const QString &ssid);
void setMacAddress(const QString &macAddress); void setMacAddress(const QString &macAddress);