DDF fix build on Ubuntu Xenial

Author: manup

device.cpp

@@ -123,7 +123,7 @@ class DevicePrivate
     /*! The currently active state handler function(s).
         Indexes >0 represent sub states of StateLevel0 running in parallel.
     */
-    std::array<DeviceStateHandler, StateLevelMax> state{0};
+    std::array<DeviceStateHandler, StateLevelMax> state{};
 
     std::array<QBasicTimer, StateLevelMax> timer; //! internal single shot timer one for each state level
     QElapsedTimer awake; //! time to track when an end-device was last awake

device.h

@@ -11,6 +11,7 @@
 #ifndef DEVICE_H
 #define DEVICE_H
 
+#include <memory>
 #include <QObject>
 #include "resource.h"
 

device_ddf_init.cpp

@@ -134,7 +134,7 @@ bool DEV_InitDeviceFromDescription(Device *device, const DeviceDescription &ddf)
         subCount++;
 
         auto *mf = rsub->item(RAttrManufacturerName);
-        if (mf && mf->toLatin1String().isEmpty())
+        if (mf && mf->toLatin1String().size() == 0)
         {
             mf->setValue(DeviceDescriptions::instance()->constantToString(device->item(RAttrManufacturerName)->toString()));
         }

device_descriptions.cpp

@@ -1026,7 +1026,7 @@ static DeviceDescription::Item DDF_ParseItem(const QJsonObject &obj)
     }
     else
     {
-        DBG_Printf(DBG_INFO, "DDF: failed to load resource item descriptor: %s\n", qPrintable(result.name));
+        DBG_Printf(DBG_INFO, "DDF: failed to load resource item descriptor: %s\n", result.name.c_str());
     }
 
     return result;

device_js/device_js.cpp

@@ -28,8 +28,9 @@ class DeviceJsPrivate
 DeviceJs::DeviceJs() :
     d(new DeviceJsPrivate)
 {
+#if QT_VERSION > 0x050700
     d->engine.installExtensions(QJSEngine::ConsoleExtension);
-
+#endif
     d->jsResource = new JsResource(&d->engine);
     auto jsR = d->engine.newQObject(d->jsResource);
     d->engine.globalObject().setProperty("R", jsR);

event.cpp

@@ -27,6 +27,9 @@ quint16 allocDataBuffer()
  */
 Event::Event()
 {
+    m_num = 0;
+    m_numPrev = 0;
+    m_hasData = 0;
 }
 
 Event::Event(const char *resource, const char *what, const QString &id, ResourceItem *item, DeviceKey deviceKey) :
@@ -98,6 +101,8 @@ Event::Event(const char *resource, const char *what, const void *data, size_t si
 {
     Q_ASSERT(data);
     Q_ASSERT(size > 0 && size <= MaxEventDataSize);
+    m_num = 0;
+    m_numPrev = 0;
     m_dataIndex = allocDataBuffer();
     m_dataId = _eventData[m_dataIndex].id;
     m_dataSize = size;

event.h

@@ -38,8 +38,8 @@ class Event
     {
         struct
         {
-            int m_num = 0;
-            int m_numPrev = 0;
+            int m_num;
+            int m_numPrev;
         };
 
         struct

resource.cpp

@@ -836,7 +836,7 @@ QLatin1String ResourceItem::toLatin1String() const
         return QLatin1String(&m_strHandle.base->buf[0], m_strHandle.base->length);
     }
 
-    return QLatin1String();
+    return QLatin1String("");
 }
 
 const char *ResourceItem::toCString() const

ui/ddf_bindingeditor.cpp

@@ -76,8 +76,8 @@ DDF_ZclReportWidget::DDF_ZclReportWidget(QWidget *parent, DDF_ZclReport *rep, co
     connect(mfCode, &QLineEdit::textChanged, this, &DDF_ZclReportWidget::mfCodeChanged);
     connect(dataType, &QLineEdit::textChanged, this, &DDF_ZclReportWidget::dataTypeChanged);
     connect(reportableChange, &QLineEdit::textChanged, this, &DDF_ZclReportWidget::reportableChangeChanged);
-    connect(minInterval, QOverload<int>::of(&QSpinBox::valueChanged), this, &DDF_ZclReportWidget::minMaxChanged);
-    connect(maxInterval, QOverload<int>::of(&QSpinBox::valueChanged), this, &DDF_ZclReportWidget::minMaxChanged);
+    connect(minInterval, SIGNAL(valueChanged(int)), this, SLOT(minMaxChanged(int)));
+    connect(maxInterval, SIGNAL(valueChanged(int)), this, SLOT(minMaxChanged(int)));
 
     auto *lay = new QFormLayout;
 
@@ -185,8 +185,9 @@ void DDF_ZclReportWidget::reportableChangeChanged()
     }
 }
 
-void DDF_ZclReportWidget::minMaxChanged()
+void DDF_ZclReportWidget::minMaxChanged(int val)
 {
+    Q_UNUSED(val)
     if (report)
     {
         report->minInterval = minInterval->value();

ui/ddf_bindingeditor.h

@@ -43,7 +43,7 @@ public Q_SLOTS:
     void mfCodeChanged();
     void dataTypeChanged();
     void reportableChangeChanged();
-    void minMaxChanged();
+    void minMaxChanged(int val);
 };
 
 class DDF_BindingEditor : public QWidget

ui/ddf_itemeditor.cpp

@@ -379,7 +379,7 @@ DDF_ItemEditor::DDF_ItemEditor(QWidget *parent) :
         d->readInterval = new QSpinBox(this);
         d->readInterval->setSuffix(" s");
         d->readInterval->setRange(0, 84000 * 2);
-        connect(d->readInterval, QOverload<int>::of(&QSpinBox::valueChanged), this, &DDF_ItemEditor::attributeChanged);
+        connect(d->readInterval, SIGNAL(valueChanged(int)), this, SLOT(attributeChanged()));
         readLay->addRow(new QLabel(tr("Interval")), d->readInterval);
     }
 
@@ -713,11 +713,11 @@ void DDF_ItemEditor::attributeChanged()
 
             case QVariant::Bool:
             {
-                if (d->defaultValue->text() == QLatin1String("true") || d->defaultValue->text() == QLatin1Char('1'))
+                if (d->defaultValue->text() == QLatin1String("true") || d->defaultValue->text() == QLatin1String("1"))
                 {
                     d->editItem.defaultValue = true;
                 }
-                else if (d->defaultValue->text() == QLatin1String("false") || d->defaultValue->text() == QLatin1Char('0'))
+                else if (d->defaultValue->text() == QLatin1String("false") || d->defaultValue->text() == QLatin1String("0"))
                 {
                     d->editItem.defaultValue = false;
                 }

ui/device_widget.cpp

@@ -47,8 +47,7 @@ DDF_EditorDialog::DDF_EditorDialog(DeviceWidget *parent) :
     connect(editor, &DDF_Editor::windowTitleChanged, this, &DDF_EditorDialog::setWindowTitle);
 
     QMenu *fileMenu = menuBar()->addMenu(tr("&File"));
-    fileMenu->addAction(tr("&New"));
-
+    //fileMenu->addAction(tr("&New"));
 
     QAction *open = fileMenu->addAction(tr("&Open"));
     open->setShortcut(QKeySequence::Open);

utils/bufstring.h

@@ -16,6 +16,8 @@
 #include <cstring>
 #include <cassert>
 
+bool startsWith(QLatin1String str, QLatin1String needle);
+
 constexpr size_t BufStringOverHead = 2; // length + null termintor
 
 /*! The data part in each BufString starts with \c BufStringBase.
@@ -152,7 +154,7 @@ class BufString
     {
         if (str.size() <= int(size()))
         {
-            return QLatin1String(c_str(), int(size())).startsWith(str);
+            return startsWith(QLatin1String(c_str(), int(size())), str);
         }
         return false;
     }
@@ -189,7 +191,7 @@ inline bool operator!=(const BufString<Size> &lhs, const std::string &rhs)
 template <size_t Size>
 inline bool operator==(const BufString<Size> &lhs, const QLatin1String &rhs)
 {
-    return !rhs.isEmpty() && strcmp(lhs.c_str(), rhs.data()) == 0;
+    return rhs.size() != 0 && strcmp(lhs.c_str(), rhs.data()) == 0;
 }
 
 template <size_t Size>

zcl/zcl.cpp

@@ -70,8 +70,8 @@ ZCL_Result ZCL_ReadAttributes(const ZCL_Param &param, quint64 extAddress, quint1
     zclFrame.setSequenceNumber(zclNextSequenceNumber());
     zclFrame.setCommandId(deCONZ::ZclReadAttributesId);
 
-    DBG_Printf(DBG_INFO, "ZCL read attr, ep: 0x%02X, cl: 0x%04X, attr: 0x%04X, mfcode: 0x%04X, aps.id: %u, zcl.seq: %u\n",
-               param.endpoint, param.clusterId, param.attributes.front(), param.manufacturerCode, req.id(), zclFrame.sequenceNumber());
+    DBG_Printf(DBG_INFO, "ZCL read attr 0x%016llX, ep: 0x%02X, cl: 0x%04X, attr: 0x%04X, mfcode: 0x%04X, aps.id: %u, zcl.seq: %u\n",
+               extAddress, param.endpoint, param.clusterId, param.attributes.front(), param.manufacturerCode, req.id(), zclFrame.sequenceNumber());
 
     result.sequenceNumber = zclFrame.sequenceNumber();