Correct compile errorswith Qt6.7

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -269,7 +269,7 @@ int MessageForwarder::startJsonTargets(const QJsonObject& config)
if (!_jsonTargets.isEmpty()) 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); 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()) if (!_jsonTargets.isEmpty())
{ {
disconnect(_hyperion, &Hyperion::forwardJsonMessage, nullptr, nullptr); 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); 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()) 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); 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; _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); 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) if (_forwarder_enabled)
{ {
QTcpSocket client; QTcpSocket client;
for (const auto& targetHost : qAsConst(_jsonTargets)) for (const auto& targetHost : std::as_const(_jsonTargets))
{ {
client.connectToHost(targetHost.host, targetHost.port); client.connectToHost(targetHost.host, targetHost.port);
if (client.waitForConnected(CONNECT_TIMEOUT.count())) if (client.waitForConnected(CONNECT_TIMEOUT.count()))

View File

@ -1,4 +1,7 @@
#include <grabber/AudioGrabberWindows.h> #include <grabber/AudioGrabberWindows.h>
#include <climits>
#include <QImage> #include <QImage>
#include <QJsonObject> #include <QJsonObject>
#include <QJsonArray> #include <QJsonArray>
@ -61,7 +64,7 @@ bool AudioGrabberWindows::configureCaptureInterface()
// wFormatTag, nChannels, nSamplesPerSec, mAvgBytesPerSec, // wFormatTag, nChannels, nSamplesPerSec, mAvgBytesPerSec,
// nBlockAlign, wBitsPerSample, cbSize // 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; notificationSize -= notificationSize % audioFormat.nBlockAlign;
bufferCaptureSize = notificationSize * AUDIO_NOTIFICATION_COUNT; bufferCaptureSize = notificationSize * AUDIO_NOTIFICATION_COUNT;

View File

@ -103,7 +103,7 @@ bool QtGrabber::setupDisplay()
Info(_log, "Available Displays:"); Info(_log, "Available Displays:");
int index = 0; int index = 0;
for (auto* screen : qAsConst(screens)) for (auto* screen : std::as_const(screens))
{ {
const QRect geo = screen->geometry(); 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()); 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());

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -57,9 +57,9 @@ void showHelp(Option & option){
int getInstaneIdbyName(const QJsonObject & reply, const QString & name){ int getInstaneIdbyName(const QJsonObject & reply, const QString & name){
if(reply.contains("instance")){ 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(); const QJsonObject obj = entry.toObject();
if(obj["friendly_name"] == name && obj["running"].toBool()) if(obj["friendly_name"] == name && obj["running"].toBool())
{ {

View File

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