Make build using gcc 9

pull/6/head
Simon Stürz 2020-03-17 15:57:43 +01:00
parent ae5edf1d66
commit ab47c18c86
3 changed files with 33 additions and 0 deletions

View File

@ -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 <https://www.gnu.org/licenses/>.
*
* 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

View File

@ -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(':');

View File

@ -37,6 +37,7 @@ class ZigbeeNetworkKey
public:
ZigbeeNetworkKey();
ZigbeeNetworkKey(const ZigbeeNetworkKey &other);
ZigbeeNetworkKey(const QString &key);
ZigbeeNetworkKey(const QByteArray &keyString);