Port to qt6

src/items/auxitem.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include "item.h"
-#include "../microcontroller.h"
+#include "src/microcontroller.h"
 
 class AuxItem: public Item
 {

src/items/itemstore.h

@@ -2,7 +2,7 @@
 #include <vector>
 #include <memory>
 #include "item.h"
-#include "../sensors/sensor.h"
+#include "src/sensors/sensor.h"
 
 #include <QJsonObject>
 

src/items/messageitem.cpp

@@ -1,20 +1,18 @@
 #include "messageitem.h"
 
 #include <QTimer>
-#include <QSound>
-
-BroadCast* MessageItem::broadCast = nullptr;
+#include <QSoundEffect>
 
 MessageItem::MessageItem(uint32_t itemIdIn, QString name, uint8_t value,  QObject *parent):
 	Item(itemIdIn, name, value, parent)
 {
-
+	alertSound.setVolume(1.0);
 }
 
 MessageItem::MessageItem(const ItemData& itemData,  QObject *parent):
 	Item(itemData, parent)
 {
-
+	alertSound.setVolume(1.0);
 }
 
 MessageItem::~MessageItem()
@@ -27,8 +25,8 @@ void MessageItem::setValue(uint8_t value)
 	Item::setValue(value);
 	if(value && !messageBox_)
 	{
-		if(broadCast) broadCast->sendMessage(name_, message_);
-		if(!alertSoundFileName.isEmpty()) QSound::play(alertSoundFileName);
+		if(!alertSoundFileName.isEmpty())
+			alertSound.play();
 		messageBox_ = new QMessageBox(QMessageBox::NoIcon, name_, message_);
 		messageBox_->setModal(false);
 		connect(messageBox_, &QMessageBox::finished, this, &MessageItem::closeMessageBox);
@@ -60,6 +58,7 @@ QString MessageItem::getAlert()
 void MessageItem::setAlert(const QString &in)
 {
 	alertSoundFileName = in;
+	alertSound.setSource(QUrl::fromLocalFile(alertSoundFileName));
 }
 
 void MessageItem::setMessage(const QString& in)
@@ -77,7 +76,8 @@ void MessageItem::store(QJsonObject &json)
 	json["Type"] = "Message";
 	Item::store(json);
 	json["Message"] = message_;
-	if(!alertSoundFileName.isEmpty()) json["Alert"] = alertSoundFileName;
+	if(!alertSoundFileName.isEmpty())
+		json["Alert"] = alertSoundFileName;
 }
 
 void MessageItem::load(const QJsonObject &json, const bool preserve)
@@ -85,4 +85,6 @@ void MessageItem::load(const QJsonObject &json, const bool preserve)
 	Item::load(json,preserve);
 	message_ = json["Message"].toString("Invalid Message");
 	alertSoundFileName = json["Alert"].toString("");
+	if(!alertSoundFileName.isEmpty())
+		alertSound.setSource(QUrl::fromLocalFile(alertSoundFileName));
 }

src/items/messageitem.h

@@ -2,9 +2,9 @@
 #define MESSAGEITEM_H
 
 #include <QMessageBox>
+#include <QSoundEffect>
 
 #include "item.h"
-#include "../broadcast.h"
 
 class MessageItem : public Item
 {
@@ -14,9 +14,7 @@ private:
 	QString message_;
 	QMessageBox* messageBox_ = nullptr;
 	QString alertSoundFileName = "";
-
-public:
-	static BroadCast* broadCast;
+	QSoundEffect alertSound;
 
 private slots:
 

src/items/poweritem.h

@@ -1,8 +1,8 @@
 #pragma once
 
 #include "item.h"
-#include "../sensors/sensor.h"
-#include "../microcontroller.h"
+#include "src/sensors/sensor.h"
+#include "src/microcontroller.h"
 
 #include <QTimer>
 

src/items/relay.h

@@ -4,7 +4,7 @@
 #include<stdint.h>
 #include<QObject>
 
-#include "../sensors/sensor.h"
+#include "src/sensors/sensor.h"
 #include "item.h"
 
 class Microcontroller;

src/items/rgbitem.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../microcontroller.h"
+#include "src/microcontroller.h"
 #include "item.h"
 
 class RgbItem: public Item

src/items/systemitem.h

@@ -1,7 +1,6 @@
 #ifndef SYSTEMITEM_H
 #define SYSTEMITEM_H
 
-
 #include "item.h"
 
 class SystemItem : public Item