Make built with gcc9 and fix compiler deprecated warnings

pull/7/head
Simon Stürz 2020-05-29 09:21:34 +02:00
parent 4c4f540f21
commit 9196ff83cf
5 changed files with 14 additions and 2 deletions

View File

@ -33,6 +33,11 @@ ZigbeeChannelMask::ZigbeeChannelMask()
}
ZigbeeChannelMask::ZigbeeChannelMask(const ZigbeeChannelMask &other)
{
m_channelMask = other.toUInt32();
}
ZigbeeChannelMask::ZigbeeChannelMask(quint32 channelMask) :
m_channelMask(channelMask)
{

View File

@ -46,6 +46,7 @@ public:
Q_ENUM(ChannelConfiguration)
ZigbeeChannelMask();
ZigbeeChannelMask(const ZigbeeChannelMask &other);
ZigbeeChannelMask(quint32 channelMask);
ZigbeeChannelMask(Zigbee::ZigbeeChannels channels);

View File

@ -36,6 +36,12 @@ ZigbeeDataType::ZigbeeDataType()
setDataType(Zigbee::NoData);
}
ZigbeeDataType::ZigbeeDataType(const ZigbeeDataType &other)
{
setDataType(other.dataType());
m_data = other.data();
}
ZigbeeDataType::ZigbeeDataType(Zigbee::DataType dataType, const QByteArray &data):
m_data(data)
{

View File

@ -35,6 +35,7 @@ class ZigbeeDataType
{
public:
ZigbeeDataType();
ZigbeeDataType(const ZigbeeDataType &other);
ZigbeeDataType(Zigbee::DataType dataType, const QByteArray &data = QByteArray());
// From uint

View File

@ -126,7 +126,7 @@ public:
} ServerMask;
typedef struct NodeDescriptor {
NodeType nodeType = NodeTypeRouter;
NodeType nodeType = NodeTypeEndDevice;
bool complexDescriptorAvailable = false;
bool userDescriptorAvailable = false;
FrequencyBand frequencyBand = FrequencyBand2400Mhz;
@ -288,7 +288,6 @@ private:
void readModelIdentifier(ZigbeeClusterBasic *basicCluster);
void readSoftwareBuildId(ZigbeeClusterBasic *basicCluster);
signals:
void stateChanged(State state);
void connectedChanged(bool connected);