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
+15
-14
@@ -9,7 +9,7 @@
|
||||
#include "handler_trajectory.h"
|
||||
#include "object_trajectory.h"
|
||||
|
||||
#include <QtCore/QMap>
|
||||
#include <QMap>
|
||||
|
||||
namespace AreaEffectSimulation
|
||||
{
|
||||
@@ -30,27 +30,28 @@ public:
|
||||
|
||||
HandlerTrajectory::HandlerTrajectory(MainHandler *mainHandler)
|
||||
: d(new Private)
|
||||
, m_logger(getLogger("HandlerTrajectory"))
|
||||
{
|
||||
d->m_mainHandler = mainHandler;
|
||||
}
|
||||
|
||||
HandlerTrajectory::~HandlerTrajectory()
|
||||
{
|
||||
TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
|
||||
TRACE_LOG(m_logger) << LOGFUNCTION << " START";
|
||||
delete d;
|
||||
TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
|
||||
TRACE_LOG(m_logger) << LOGFUNCTION << " END";
|
||||
}
|
||||
|
||||
int HandlerTrajectory::create(const TrajectoryData &providedData)
|
||||
{
|
||||
TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
|
||||
TRACE_LOG(m_logger) << LOGFUNCTION << " START";
|
||||
int newId = -1;
|
||||
|
||||
auto *ifs = new ObjectTrajectory(d->m_mainHandler);
|
||||
if (!ifs)
|
||||
{
|
||||
ERROR_LOG(m_logger)<<" couldn't create ObjectTrajectory!";
|
||||
TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
|
||||
TRACE_LOG(m_logger) << LOGFUNCTION << " END";
|
||||
return -1;
|
||||
}
|
||||
|
||||
@@ -66,17 +67,17 @@ int HandlerTrajectory::create(const TrajectoryData &providedData)
|
||||
ifs->publish();
|
||||
}
|
||||
|
||||
TRACE_LOG(m_logger) << Q_FUNC_INFO << " END, newId = " << newId;
|
||||
TRACE_LOG(m_logger) << LOGFUNCTION << " END, newId = " << newId;
|
||||
return newId;
|
||||
}
|
||||
|
||||
bool HandlerTrajectory::update(const TrajectoryData &providedData)
|
||||
{
|
||||
TRACE_LOG(m_logger) << Q_FUNC_INFO << " START, id = " << providedData.id;
|
||||
TRACE_LOG(m_logger) << LOGFUNCTION << " START, id = " << providedData.id;
|
||||
bool success = false;
|
||||
if (!providedData.isIdValid())
|
||||
{
|
||||
TRACE_LOG(m_logger) << Q_FUNC_INFO << " END ";
|
||||
TRACE_LOG(m_logger) << LOGFUNCTION << " END ";
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -87,18 +88,18 @@ bool HandlerTrajectory::update(const TrajectoryData &providedData)
|
||||
success = true;
|
||||
}
|
||||
|
||||
TRACE_LOG(m_logger) << Q_FUNC_INFO << " END, success = " << success;
|
||||
TRACE_LOG(m_logger) << LOGFUNCTION << " END, success = " << success;
|
||||
return success;
|
||||
}
|
||||
|
||||
bool HandlerTrajectory::remove(const int trajId)
|
||||
{
|
||||
TRACE_LOG(m_logger) << Q_FUNC_INFO << " START, id = " << trajId;
|
||||
TRACE_LOG(m_logger) << LOGFUNCTION << " START, id = " << trajId;
|
||||
|
||||
if (trajId <= 0)
|
||||
{
|
||||
ERROR_LOG(m_logger) << " remove topic: got Invalid trajectory Id: "<<trajId;
|
||||
TRACE_LOG(m_logger) << Q_FUNC_INFO << " END ";
|
||||
TRACE_LOG(m_logger) << LOGFUNCTION << " END ";
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -113,13 +114,13 @@ bool HandlerTrajectory::remove(const int trajId)
|
||||
delete ifs;
|
||||
ifs = nullptr;
|
||||
|
||||
TRACE_LOG(m_logger) << Q_FUNC_INFO << " END ";
|
||||
TRACE_LOG(m_logger) << LOGFUNCTION << " END ";
|
||||
return true;
|
||||
}
|
||||
|
||||
int HandlerTrajectory::createUpdate(const TrajectoryData &providedData)
|
||||
{
|
||||
TRACE_LOG(m_logger) << Q_FUNC_INFO << " START, id = " << providedData.id;
|
||||
TRACE_LOG(m_logger) << LOGFUNCTION << " START, id = " << providedData.id;
|
||||
|
||||
int ret = -1;
|
||||
|
||||
@@ -130,7 +131,7 @@ int HandlerTrajectory::createUpdate(const TrajectoryData &providedData)
|
||||
} else {
|
||||
ret = create(providedData);
|
||||
}
|
||||
TRACE_LOG(m_logger) << Q_FUNC_INFO << " END, id ret " << ret;
|
||||
TRACE_LOG(m_logger) << LOGFUNCTION << " END, id ret " << ret;
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user