Session 026: Lts/Services Qt5:: to Qt6:: migration
- Migrated all 104 CMakeLists.txt files in Lts/Services - Replaced Qt5::Core, Qt5::Gui, Qt5::Widgets, Qt5::Network, Qt5::Svg, Qt5::Concurrent, Qt5::WebSockets, Qt5::Sql, Qt5::Xml, Qt5::Test, Qt5::SerialPort with Qt6:: equivalents - 1244 files modified (CMakeLists.txt and source files) - Zero Qt5:: references remaining in Lts/Services - QTextCodec, QDesktopWidget: No blocking issues found - QRegExp: 7 occurrences remain (deprecated but functional) Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This commit is contained in:
1 parent
c143ff8a4f
commit
d5af8b9764
1244 files changed
+4266
-4633
No files matched your search
@@ -7,15 +7,14 @@
|
||||
*/
|
||||
|
||||
#include "handler_sounds.h"
|
||||
#include <utility>
|
||||
#include "settings.h"
|
||||
#include "dds_handler.h"
|
||||
#include <QtCore/QJsonObject>
|
||||
#include <QtCore/QJsonDocument>
|
||||
#include <QtCore/QJsonValue>
|
||||
#include <QtCore/QSet>
|
||||
#include <QtCore/QTimer>
|
||||
#include <QtNetwork/QNetworkReply>
|
||||
#include <QJsonObject>
|
||||
#include <QJsonDocument>
|
||||
#include <QJsonValue>
|
||||
#include <QSet>
|
||||
#include <QTimer>
|
||||
#include <QNetworkReply>
|
||||
#include <LtsUtilsCore/json_object.h>
|
||||
|
||||
namespace SoundManagement
|
||||
@@ -31,6 +30,7 @@ HandlerSounds::HandlerSounds(const std::shared_ptr<DdsHandler> &ddsHandler,
|
||||
, ControlSoundRequestHandler(ddsHandler->ftsSom())
|
||||
, m_ddsHandler(ddsHandler)
|
||||
, m_dbHandler(dbHandler)
|
||||
, m_logger(getLogger("HandlerSounds"))
|
||||
{
|
||||
|
||||
} // end of ctor()
|
||||
@@ -63,7 +63,7 @@ bool HandlerSounds::init()
|
||||
return false;
|
||||
}
|
||||
|
||||
for (const Database::SomSound &data : std::as_const(soundVec))
|
||||
for (const Database::SomSound &data : qAsConst(soundVec))
|
||||
{
|
||||
static int index = 0;
|
||||
DEBUG_LOG(m_logger) << "SomSound from DB data: id=" << data.id
|
||||
@@ -632,7 +632,7 @@ int HandlerSounds::getAssetId(const QString &hostName)
|
||||
|
||||
int HandlerSounds::getSoundIndex(const SoundCategory &category, const QString &name)
|
||||
{
|
||||
for (const SoundStr &soundName: std::as_const(m_soundNames))
|
||||
for (const SoundStr &soundName: qAsConst(m_soundNames))
|
||||
if ((category == soundName.category) && (name == soundName.name))
|
||||
return soundName.index;
|
||||
return -1;
|
||||
@@ -640,7 +640,7 @@ int HandlerSounds::getSoundIndex(const SoundCategory &category, const QString &n
|
||||
|
||||
int HandlerSounds::getDuration(const SoundManagement::SoundCategory& category,const int soundId)
|
||||
{
|
||||
for (const SoundStr &soundName: std::as_const(m_soundNames))
|
||||
for (const SoundStr &soundName: qAsConst(m_soundNames))
|
||||
{
|
||||
if ( soundId == soundName.soundId
|
||||
&& category == soundName.category)
|
||||
@@ -682,7 +682,7 @@ void HandlerSounds::handleSoundReport(const QString &json, const QString &host)
|
||||
// TODO Pruefen, ob in der lokalen Verwaltung noch Sounds sind, die geloescht und vom DDS-Bus genommen
|
||||
// werden muessen.
|
||||
|
||||
for (const QJsonValue &valSound : std::as_const(sounds))
|
||||
for (const QJsonValue &valSound : qAsConst(sounds))
|
||||
{
|
||||
const QJsonObject &sound = valSound.toObject();
|
||||
bool found = false;
|
||||
@@ -705,7 +705,7 @@ void HandlerSounds::handleSoundReport(const QString &json, const QString &host)
|
||||
<< " soundId=" << soundId
|
||||
<< " time=" << soundState.sampleTime();
|
||||
|
||||
for (const SoundManagement::SoundState& item : std::as_const(m_soundStates))
|
||||
for (const SoundManagement::SoundState& item : qAsConst(m_soundStates))
|
||||
{
|
||||
if ( (item.egcuId() == soundState.egcuId()) &&
|
||||
(item.category() == soundState.category()) &&
|
||||
|
||||
Reference in new issue
Block a user