frodovdr/hyperion.ng
1
0
Fork 0
mirror of https://github.com/hyperion-project/hyperion.ng.git synced 2025-03-01 10:33:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Correct compile errorswith Qt6.7

Browse Source
This commit is contained in:
Lord-Grey 2023-09-09 22:10:22 +02:00
parent 013587d1fd
commit a2f6271832
17 changed files with 57 additions and 49 deletions

2
include/grabber/AudioGrabberWindows.h

@ -64,7 +64,7 @@ static BOOL CALLBACK DirectSoundEnumProcessor(LPGUID deviceIdGuid, LPCTSTR devic
CoTaskMemFree(deviceIdStr);
// Process Device Information
QString deviceName = QString::fromLocal8Bit(deviceDescStr);
QString deviceName = QString::fromWCharArray(deviceDescStr);
Debug(Logger::getInstance("AUDIOGRABBER"), "Found Audio Device: %s", deviceDescStr);

10
include/hyperion/ImageToLedsMap.h

@ -413,9 +413,13 @@ namespace hyperion
}
// Compute the average of each color channel
const uint8_t avgRed = uint8_t(std::min(std::lround(sqrt(static_cast<double>(cummRed/pixelNum))), 255L));
const uint8_t avgGreen = uint8_t(std::min(std::lround(sqrt(static_cast<double>(cummGreen/pixelNum))), 255L));
const uint8_t avgBlue = uint8_t(std::min(std::lround(sqrt(static_cast<double>(cummBlue/pixelNum))), 255L));
#ifdef WIN32
#undef min
#endif
const uint8_t avgRed = static_cast<uint8_t>(std::min(std::lround(std::sqrt(static_cast<double>(cummRed / pixelNum))), 255L));
const uint8_t avgGreen = static_cast<uint8_t>(std::min(std::lround(sqrt(static_cast<double>(cummGreen / pixelNum))), 255L));
const uint8_t avgBlue = static_cast<uint8_t>(std::min(std::lround(sqrt(static_cast<double>(cummBlue / pixelNum))), 255L));
// Return the computed color
return {avgRed, avgGreen, avgBlue};

4
libsrc/api/JsonAPI.cpp

@ -404,7 +404,7 @@ void JsonAPI::handleServerInfoCommand(const QJsonObject &message, const QString
activePriorities.removeAll(PriorityMuxer::LOWEST_PRIORITY);
int currentPriority = _hyperion->getCurrentPriority();
for(int priority : qAsConst(activePriorities))
for(int priority : std::as_const(activePriorities))
{
const Hyperion::InputInfo &priorityInfo = _hyperion->getPriorityInfo(priority);
@ -1387,7 +1387,7 @@ void JsonAPI::handleAuthorizeCommand(const QJsonObject &message, const QString &
if (API::getPendingTokenRequests(vec))
{
QJsonArray arr;
for (const auto &entry : qAsConst(vec))
for (const auto &entry : std::as_const(vec))
{
QJsonObject obj;
obj["comment"] = entry.comment;

2
libsrc/api/JsonCB.cpp

@ -199,7 +199,7 @@ void JsonCB::handlePriorityUpdate(int currentPriority, const PriorityMuxer::Inpu
activePriorities.removeAll(PriorityMuxer::LOWEST_PRIORITY);
for (int priority : qAsConst(activePriorities)) {
for (int priority : std::as_const(activePriorities)) {
const Hyperion::InputInfo& priorityInfo = activeInputs[priority];

11
libsrc/db/DBManager.cpp

@ -7,6 +7,7 @@
#include <QThreadStorage>
#include <QUuid>
#include <QDir>
#include <QMetaType>
#ifdef _WIN32
#include <stdexcept>
@ -425,15 +426,15 @@ void DBManager::doAddBindValue(QSqlQuery& query, const QVariantList& variants) c
auto t = variant.userType();
switch(t)
{
case QVariant::UInt:
case QVariant::Int:
case QVariant::Bool:
case QMetaType::UInt:
case QMetaType::Int:
case QMetaType::Bool:
query.addBindValue(variant.toInt());
break;
case QVariant::Double:
case QMetaType::Double:
query.addBindValue(variant.toFloat());
break;
case QVariant::ByteArray:
case QMetaType::QByteArray:
query.addBindValue(variant.toByteArray());
break;
default:

12
libsrc/effectengine/EffectFileHandler.cpp

@ -224,7 +224,7 @@ void EffectFileHandler::updateEffects()
}
QMap<QString, EffectDefinition> availableEffects;
for (const QString& path : qAsConst(efxPathList))
for (const QString& path : std::as_const(efxPathList))
{
QDir directory(path);
if (!directory.exists())
@ -241,8 +241,8 @@ void EffectFileHandler::updateEffects()
else
{
int efxCount = 0;
QStringList filenames = directory.entryList(QStringList() << "*.json", QDir::Files, QDir::Name | QDir::IgnoreCase);
for (const QString& filename : qAsConst(filenames))
const QStringList filenames = directory.entryList(QStringList() << "*.json", QDir::Files, QDir::Name | QDir::IgnoreCase);
for (const QString& filename : filenames)
{
EffectDefinition def;
if (loadEffectDefinition(path, filename, def))
@ -268,8 +268,8 @@ void EffectFileHandler::updateEffects()
QString schemaPath = path + "schema" + '/';
directory.setPath(schemaPath);
QStringList schemaFileNames = directory.entryList(QStringList() << "*.json", QDir::Files, QDir::Name | QDir::IgnoreCase);
for (const QString& schemaFileName : qAsConst(schemaFileNames))
const QStringList schemaFileNames = directory.entryList(QStringList() << "*.json", QDir::Files, QDir::Name | QDir::IgnoreCase);
for (const QString& schemaFileName : schemaFileNames)
{
EffectSchema pyEffect;
if (loadEffectSchema(path, directory.filePath(schemaFileName), pyEffect))
@ -282,7 +282,7 @@ void EffectFileHandler::updateEffects()
}
}
for (const auto& item : qAsConst(availableEffects))
for (const auto& item : std::as_const(availableEffects))
{
_availableEffects.push_back(item);
}

10
libsrc/forwarder/MessageForwarder.cpp

@ -269,7 +269,7 @@ int MessageForwarder::startJsonTargets(const QJsonObject& config)
if (!_jsonTargets.isEmpty())
{
for (const auto& targetHost : qAsConst(_jsonTargets))
for (const auto& targetHost : std::as_const(_jsonTargets))
{
Info(_log, "Forwarding now to JSON-target host: %s port: %u", QSTRING_CSTR(targetHost.host.toString()), targetHost.port);
}
@ -286,7 +286,7 @@ void MessageForwarder::stopJsonTargets()
if (!_jsonTargets.isEmpty())
{
disconnect(_hyperion, &Hyperion::forwardJsonMessage, nullptr, nullptr);
for (const auto& targetHost : qAsConst(_jsonTargets))
for (const auto& targetHost : std::as_const(_jsonTargets))
{
Info(_log, "Stopped forwarding to JSON-target host: %s port: %u", QSTRING_CSTR(targetHost.host.toString()), targetHost.port);
}
@ -373,7 +373,7 @@ int MessageForwarder::startFlatbufferTargets(const QJsonObject& config)
if (!_flatbufferTargets.isEmpty())
{
for (const auto& targetHost : qAsConst(_flatbufferTargets))
for (const auto& targetHost : std::as_const(_flatbufferTargets))
{
Info(_log, "Forwarding now to Flatbuffer-target host: %s port: %u", QSTRING_CSTR(targetHost.host.toString()), targetHost.port);
}
@ -399,7 +399,7 @@ void MessageForwarder::stopFlatbufferTargets()
_messageForwarderFlatBufHelper = nullptr;
}
for (const auto& targetHost : qAsConst(_flatbufferTargets))
for (const auto& targetHost : std::as_const(_flatbufferTargets))
{
Info(_log, "Stopped forwarding to Flatbuffer-target host: %s port: %u", QSTRING_CSTR(targetHost.host.toString()), targetHost.port);
}
@ -412,7 +412,7 @@ void MessageForwarder::forwardJsonMessage(const QJsonObject& message)
if (_forwarder_enabled)
{
QTcpSocket client;
for (const auto& targetHost : qAsConst(_jsonTargets))
for (const auto& targetHost : std::as_const(_jsonTargets))
{
client.connectToHost(targetHost.host, targetHost.port);
if (client.waitForConnected(CONNECT_TIMEOUT.count()))

5
libsrc/grabber/audio/AudioGrabberWindows.cpp

@ -1,4 +1,7 @@
#include <grabber/AudioGrabberWindows.h>
#include <climits>
#include <QImage>
#include <QJsonObject>
#include <QJsonArray>
@ -61,7 +64,7 @@ bool AudioGrabberWindows::configureCaptureInterface()
// wFormatTag, nChannels, nSamplesPerSec, mAvgBytesPerSec,
// nBlockAlign, wBitsPerSample, cbSize
notificationSize = max(1024, audioFormat.nAvgBytesPerSec / 8);
notificationSize = std::max(static_cast<DWORD>(1024), static_cast<DWORD>(audioFormat.nAvgBytesPerSec / 8));
notificationSize -= notificationSize % audioFormat.nBlockAlign;
bufferCaptureSize = notificationSize * AUDIO_NOTIFICATION_COUNT;

2
libsrc/grabber/qt/QtGrabber.cpp

@ -103,7 +103,7 @@ bool QtGrabber::setupDisplay()
Info(_log, "Available Displays:");
int index = 0;
for (auto* screen : qAsConst(screens))
for (auto* screen : std::as_const(screens))
{
const QRect geo = screen->geometry();
Info(_log, "Display %d: Name: %s Resolution: [%dx%d], Geometry: (L,T,R,B) %d,%d,%d,%d Depth:%dbit", index, QSTRING_CSTR(screen->name()), geo.width(), geo.height(), geo.x(), geo.y(), geo.x() + geo.width(), geo.y() + geo.height(), screen->depth());

2
libsrc/hyperion/ComponentRegister.cpp

@ -61,7 +61,7 @@ ComponentRegister::ComponentRegister(Hyperion* hyperion)
vect << COMP_FORWARDER;
#endif
for(auto e : qAsConst(vect))
for(auto e : std::as_const(vect))
{
_componentStates.emplace(e, (e == COMP_ALL));
}

22
libsrc/hyperion/SettingsManager.cpp

@ -58,9 +58,9 @@ SettingsManager::SettingsManager(quint8 instance, QObject* parent, bool readonly
}
// transform json to string lists
QStringList keyList = defaultConfig.keys();
const QStringList keyList = defaultConfig.keys();
QStringList defValueList;
for (const auto& key : qAsConst(keyList))
for (const auto& key : keyList)
{
if (defaultConfig[key].isObject())
{
@ -73,7 +73,7 @@ SettingsManager::SettingsManager(quint8 instance, QObject* parent, bool readonly
}
// fill database with default data if required
for (const auto& key : qAsConst(keyList))
for (const auto& key : keyList)
{
QString val = defValueList.takeFirst();
// prevent overwrite
@ -86,7 +86,7 @@ SettingsManager::SettingsManager(quint8 instance, QObject* parent, bool readonly
// need to validate all data in database construct the entire data object
// TODO refactor schemaChecker to accept QJsonArray in validate(); QJsonDocument container? To validate them per entry...
QJsonObject dbConfig;
for (const auto& key : qAsConst(keyList))
for (const auto& key : keyList)
{
QJsonDocument doc = _sTable->getSettingsRecord(key);
if (doc.isArray())
@ -242,9 +242,9 @@ bool SettingsManager::saveSettings(QJsonObject config, bool correct)
_qconfig = config;
// extract keys and data
QStringList keyList = config.keys();
const QStringList keyList = config.keys();
QStringList newValueList;
for (const auto& key : qAsConst(keyList))
for (const auto& key : keyList)
{
if (config[key].isObject())
{
@ -258,7 +258,7 @@ bool SettingsManager::saveSettings(QJsonObject config, bool correct)
bool rc = true;
// compare database data with new data to emit/save changes accordingly
for (const auto& key : qAsConst(keyList))
for (const auto& key : keyList)
{
QString data = newValueList.takeFirst();
if (_sTable->getSettingsRecordString(key) != data)
@ -618,10 +618,10 @@ bool SettingsManager::handleConfigUpgrade(QJsonObject& config)
QJsonArray json;
if (newForwarderConfig.contains("json"))
{
QJsonArray oldJson = newForwarderConfig["json"].toArray();
const QJsonArray oldJson = newForwarderConfig["json"].toArray();
QJsonObject newJsonConfig;
for (const QJsonValue& value : qAsConst(oldJson))
for (const QJsonValue& value : oldJson)
{
if (value.isString())
{
@ -661,10 +661,10 @@ bool SettingsManager::handleConfigUpgrade(QJsonObject& config)
QJsonArray flatbuffer;
if (newForwarderConfig.contains("flat"))
{
QJsonArray oldFlatbuffer = newForwarderConfig["flat"].toArray();
const QJsonArray oldFlatbuffer = newForwarderConfig["flat"].toArray();
QJsonObject newFlattbufferConfig;
for (const QJsonValue& value : qAsConst(oldFlatbuffer))
for (const QJsonValue& value : oldFlatbuffer)
{
if (value.isString())
{

2
libsrc/leddevice/dev_net/LedDevicePhilipsHue.cpp

@ -1126,7 +1126,7 @@ bool LedDevicePhilipsHue::setLights()
if( !lArray.empty() )
{
for (const QJsonValue &id : qAsConst(lArray))
for (const QJsonValue &id : std::as_const(lArray))
{
int lightId = id.toString().toInt();
if( lightId > 0 )

8
libsrc/leddevice/dev_net/LedDeviceWled.cpp

@ -352,12 +352,12 @@ bool LedDeviceWled::powerOn()
}
else
{
QJsonArray propertiesSegments = _originalStateProperties[STATE_SEG].toArray();
const QJsonArray propertiesSegments = _originalStateProperties[STATE_SEG].toArray();
bool isStreamSegmentIdFound { false };
QJsonArray segments;
for (const auto& segmentItem : qAsConst(propertiesSegments))
for (const auto& segmentItem : propertiesSegments)
{
QJsonObject segmentObj = segmentItem.toObject();
@ -505,9 +505,9 @@ bool LedDeviceWled::restoreState()
if (_isStreamToSegment)
{
QJsonArray propertiesSegments = _originalStateProperties[STATE_SEG].toArray();
const QJsonArray propertiesSegments = _originalStateProperties[STATE_SEG].toArray();
QJsonArray segments;
for (const auto& segmentItem : qAsConst(propertiesSegments))
for (const auto& segmentItem : propertiesSegments)
{
QJsonObject segmentObj = segmentItem.toObject();

2
libsrc/utils/Logger.cpp

@ -65,7 +65,7 @@ void Logger::deleteInstance(const QString & name, const QString & subName)
if (name.isEmpty())
{
for (auto *logger : qAsConst(LoggerMap)) {
for (auto *logger : std::as_const(LoggerMap)) {
delete logger;
}

4
libsrc/utils/jsonschema/QJsonSchemaChecker.cpp

@ -59,13 +59,13 @@ QPair<bool, bool> QJsonSchemaChecker::validate(const QJsonObject& value, bool ig
QJsonObject QJsonSchemaChecker::getAutoCorrectedConfig(const QJsonObject& value, bool ignoreRequired)
{
_ignoreRequired = ignoreRequired;
QStringList sequence = QStringList() << "remove" << "modify" << "create";
const QStringList sequence = QStringList() << "remove" << "modify" << "create";
_error = false;
_schemaError = false;
_messages.clear();
_autoCorrected = value;
for (const QString& correct : qAsConst(sequence))
for (const QString& correct : sequence)
{
_correct = correct;
_currentPath.clear();

4
src/hyperion-remote/hyperion-remote.cpp

@ -57,9 +57,9 @@ void showHelp(Option & option){
int getInstaneIdbyName(const QJsonObject & reply, const QString & name){
if(reply.contains("instance")){
QJsonArray list = reply.value("instance").toArray();
const QJsonArray list = reply.value("instance").toArray();
for ( const auto &entry : qAsConst(list) ) {
for ( const auto &entry : list ) {
const QJsonObject obj = entry.toObject();
if(obj["friendly_name"] == name && obj["running"].toBool())
{

4
src/hyperiond/main.cpp

@ -268,9 +268,9 @@ int main(int argc, char** argv)
if (directory.exists() && destDir.exists())
{
std::cout << "Extract to folder: " << destDir.absolutePath().toStdString() << std::endl;
QStringList filenames = directory.entryList(QStringList() << "*", QDir::Files, QDir::Name | QDir::IgnoreCase);
const QStringList filenames = directory.entryList(QStringList() << "*", QDir::Files, QDir::Name | QDir::IgnoreCase);
QString destFileName;
for (const QString & filename : qAsConst(filenames))
for (const QString & filename : filenames)
{
destFileName = destDir.dirName()+"/"+filename;
if (QFile::exists(destFileName))