From ab47c18c86232411c07f93e5dcf4946f19a80503 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20St=C3=BCrz?= Date: Tue, 17 Mar 2020 15:57:43 +0100 Subject: [PATCH] Make build using gcc 9 --- libnymea-zigbee/zigbeemanufacturer.h | 27 +++++++++++++++++++++++++++ libnymea-zigbee/zigbeenetworkkey.cpp | 5 +++++ libnymea-zigbee/zigbeenetworkkey.h | 1 + 3 files changed, 33 insertions(+) diff --git a/libnymea-zigbee/zigbeemanufacturer.h b/libnymea-zigbee/zigbeemanufacturer.h index 0a5dcaa..9e73f21 100644 --- a/libnymea-zigbee/zigbeemanufacturer.h +++ b/libnymea-zigbee/zigbeemanufacturer.h @@ -1,3 +1,30 @@ +/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * +* +* Copyright 2013 - 2020, nymea GmbH +* Contact: contact@nymea.io +* +* This file is part of nymea-zigbee. +* This project including source code and documentation is protected by copyright law, and +* remains the property of nymea GmbH. All rights, including reproduction, publication, +* editing and translation, are reserved. The use of this project is subject to the terms of a +* license agreement to be concluded with nymea GmbH in accordance with the terms +* of use of nymea GmbH, available under https://nymea.io/license +* +* GNU Lesser General Public License Usage +* Alternatively, this project may be redistributed and/or modified under the terms of the GNU +* Lesser General Public License as published by the Free Software Foundation; version 3. +* this project is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; +* without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +* See the GNU Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public License along with this project. +* If not, see . +* +* For any further details and any questions please contact us under contact@nymea.io +* or see our FAQ/Licensing Information on https://nymea.io/license/faq +* +* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ + #ifndef ZIGBEEMANUFACTURER_H #define ZIGBEEMANUFACTURER_H diff --git a/libnymea-zigbee/zigbeenetworkkey.cpp b/libnymea-zigbee/zigbeenetworkkey.cpp index 74600b9..e2ba46f 100644 --- a/libnymea-zigbee/zigbeenetworkkey.cpp +++ b/libnymea-zigbee/zigbeenetworkkey.cpp @@ -34,6 +34,11 @@ ZigbeeNetworkKey::ZigbeeNetworkKey() } +ZigbeeNetworkKey::ZigbeeNetworkKey(const ZigbeeNetworkKey &other) +{ + m_key = other.toByteArray(); +} + ZigbeeNetworkKey::ZigbeeNetworkKey(const QString &key) { QString rawKey = QString(key).remove(':'); diff --git a/libnymea-zigbee/zigbeenetworkkey.h b/libnymea-zigbee/zigbeenetworkkey.h index 99dc0a7..ce00781 100644 --- a/libnymea-zigbee/zigbeenetworkkey.h +++ b/libnymea-zigbee/zigbeenetworkkey.h @@ -37,6 +37,7 @@ class ZigbeeNetworkKey public: ZigbeeNetworkKey(); + ZigbeeNetworkKey(const ZigbeeNetworkKey &other); ZigbeeNetworkKey(const QString &key); ZigbeeNetworkKey(const QByteArray &keyString);