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,16 +7,15 @@
|
||||
*/
|
||||
|
||||
#include "handler_operator.h"
|
||||
#include <utility>
|
||||
#include "handler_locked_topics.h"
|
||||
#include "handler_active_apps.h"
|
||||
#include "object_operator.h"
|
||||
#include "handler_group.h"
|
||||
#include "opm_db.h"
|
||||
#include <QtCore/QCryptographicHash>
|
||||
#include <QtCore/QSet>
|
||||
#include <QtCore/QTimer>
|
||||
#include <LtsUtils/LtsUtilsCore/dds_vector.h>
|
||||
#include <QCryptographicHash>
|
||||
#include <QSet>
|
||||
#include <QTimer>
|
||||
#include <LtsUtilsCore/dds_vector.h>
|
||||
|
||||
namespace OperatorManagement
|
||||
{
|
||||
@@ -32,6 +31,7 @@ HandlerOperator::HandlerOperator(MainHandler *mainHandler)
|
||||
, Interface::Fts::OperatorUpdateVisiblePartiesByExerciseRequestHandler(mainHandler->fts())
|
||||
, m_aliveCheckTimer(new QTimer(this))
|
||||
, m_mainHandler(mainHandler)
|
||||
, m_logger(getLogger("HandlerOperator"))
|
||||
{
|
||||
connect(m_aliveCheckTimer, &QTimer::timeout, this, &HandlerOperator::onCheckAliveTimeout);
|
||||
m_aliveCheckTimer->setInterval(10000);
|
||||
@@ -75,7 +75,7 @@ bool HandlerOperator::init()
|
||||
|
||||
OperatorManagement::OperatorWorkstationAlive alive;
|
||||
alive.lastAlive(QDateTime::currentMSecsSinceEpoch());
|
||||
for (const Database::OpmOperator &op : std::as_const(dataVec))
|
||||
for (const Database::OpmOperator &op : qAsConst(dataVec))
|
||||
{
|
||||
ObjectOperator *ifs(new ObjectOperator(m_mainHandler));
|
||||
Core::FunctionReplyObject ret = ifs->createObject(op, opMap[op.id]);
|
||||
@@ -299,7 +299,7 @@ Core::FunctionReplyObject HandlerOperator::operatorModifyRequest(const OperatorC
|
||||
{
|
||||
op.name = QString::fromStdString(request.name().get());
|
||||
|
||||
for (const ObjectOperator *o : std::as_const(m_operatorObjMap))
|
||||
for (const ObjectOperator *o : qAsConst(m_operatorObjMap))
|
||||
{
|
||||
if (o == ifs)
|
||||
continue;
|
||||
@@ -589,7 +589,7 @@ Core::FunctionReplyObject HandlerOperator::operatorApplyForeignAclsRequest(const
|
||||
void HandlerOperator::onOperatorUpdateVisiblePartiesByExerciseRequest(const rti::core::SampleIdentity &cookie,
|
||||
const OperatorUpdateVisiblePartiesByExerciseRequest &request)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << Q_FUNC_INFO << request;
|
||||
DEBUG_LOG(m_logger) << LOGFUNCTION << request;
|
||||
// DEBUG_LOG(m_logger) << "onOperatorUpdateVisiblePartiesByExerciseRequest: " << request;
|
||||
Core::FunctionReplyObject reply = operatorUpdateVisiblePartiesByExerciseRequest(request);
|
||||
if (reply.error())
|
||||
@@ -619,7 +619,7 @@ Core::FunctionReplyObject HandlerOperator::operatorUpdateVisiblePartiesByExercis
|
||||
|
||||
void HandlerOperator::reloadAcls()
|
||||
{
|
||||
for (ObjectOperator *ifs : std::as_const(m_operatorObjMap))
|
||||
for (ObjectOperator *ifs : qAsConst(m_operatorObjMap))
|
||||
ifs->reloadAcls();
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user