network monitor: sync mode and register type
This commit is contained in:
parent
1a4037f232
commit
889a52959f
@ -73,7 +73,15 @@ NetworkDeviceInfo::MonitorMode NetworkDeviceMonitorImpl::monitorMode() const
|
|||||||
|
|
||||||
void NetworkDeviceMonitorImpl::setMonitorMode(NetworkDeviceInfo::MonitorMode monitorMode)
|
void NetworkDeviceMonitorImpl::setMonitorMode(NetworkDeviceInfo::MonitorMode monitorMode)
|
||||||
{
|
{
|
||||||
|
if (m_monitorMode == monitorMode)
|
||||||
|
return;
|
||||||
|
|
||||||
m_monitorMode = monitorMode;
|
m_monitorMode = monitorMode;
|
||||||
|
|
||||||
|
if (m_networkDeviceInfo.monitorMode() != monitorMode) {
|
||||||
|
m_networkDeviceInfo.setMonitorMode(monitorMode);
|
||||||
|
emit networkDeviceInfoChanged(m_networkDeviceInfo);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
NetworkDeviceInfo NetworkDeviceMonitorImpl::networkDeviceInfo() const
|
NetworkDeviceInfo NetworkDeviceMonitorImpl::networkDeviceInfo() const
|
||||||
@ -163,7 +171,7 @@ bool NetworkDeviceMonitorImpl::isMyNetworkDeviceInfo(const NetworkDeviceInfo &ne
|
|||||||
|
|
||||||
break;
|
break;
|
||||||
case NetworkDeviceInfo::MonitorModeHostName:
|
case NetworkDeviceInfo::MonitorModeHostName:
|
||||||
if (!m_hostName.isEmpty() && networkDeviceInfo.hostName() == m_hostName)
|
if (!m_hostName.isEmpty() && networkDeviceInfo.hostName().compare(m_hostName, Qt::CaseInsensitive) == 0)
|
||||||
myNetworkDevice = true;
|
myNetworkDevice = true;
|
||||||
|
|
||||||
break;
|
break;
|
||||||
|
|||||||
@ -31,6 +31,10 @@
|
|||||||
#include "networkdeviceinfo.h"
|
#include "networkdeviceinfo.h"
|
||||||
#include "macaddress.h"
|
#include "macaddress.h"
|
||||||
|
|
||||||
|
#include <QMetaType>
|
||||||
|
|
||||||
|
static const int networkDeviceInfoMetaTypeId = qRegisterMetaType<NetworkDeviceInfo>("NetworkDeviceInfo");
|
||||||
|
|
||||||
NetworkDeviceInfo::NetworkDeviceInfo()
|
NetworkDeviceInfo::NetworkDeviceInfo()
|
||||||
{
|
{
|
||||||
|
|
||||||
|
|||||||
@ -36,6 +36,7 @@
|
|||||||
#include <QDateTime>
|
#include <QDateTime>
|
||||||
#include <QHostAddress>
|
#include <QHostAddress>
|
||||||
#include <QNetworkInterface>
|
#include <QNetworkInterface>
|
||||||
|
#include <QMetaType>
|
||||||
|
|
||||||
#include "libnymea.h"
|
#include "libnymea.h"
|
||||||
#include "macaddressinfos.h"
|
#include "macaddressinfos.h"
|
||||||
@ -104,4 +105,6 @@ private:
|
|||||||
|
|
||||||
QDebug operator<<(QDebug debug, const NetworkDeviceInfo &networkDeviceInfo);
|
QDebug operator<<(QDebug debug, const NetworkDeviceInfo &networkDeviceInfo);
|
||||||
|
|
||||||
|
Q_DECLARE_METATYPE(NetworkDeviceInfo)
|
||||||
|
|
||||||
#endif // NETWORKDEVICEINFO_H
|
#endif // NETWORKDEVICEINFO_H
|
||||||
|
|||||||
Reference in New Issue
Block a user