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
+3
-23
@@ -9,35 +9,24 @@
|
||||
#include "dds_handler.h"
|
||||
#include "handler_minelayer_data.h"
|
||||
|
||||
#if BUILD_RTI
|
||||
#include <DDS/DDSConnector/dds_connector.h>
|
||||
#endif
|
||||
|
||||
using namespace GuezMinelayerProcessing;
|
||||
|
||||
Initialization::Initialization()
|
||||
: m_logger(getLogger("GuezMinelayerProcessing.Initialization"))
|
||||
, m_ddsHandler(nullptr)
|
||||
#if BUILD_RTI
|
||||
: m_ddsHandler(nullptr)
|
||||
, m_handlerMinelayerData(nullptr)
|
||||
#endif
|
||||
, m_logger(getLogger("Initialization"))
|
||||
{}
|
||||
|
||||
Initialization::~Initialization()
|
||||
{
|
||||
#if BUILD_RTI
|
||||
m_handlerMinelayerData = nullptr;
|
||||
#endif
|
||||
m_ddsHandler = nullptr;
|
||||
}
|
||||
|
||||
bool Initialization::initialize(
|
||||
#if BUILD_RTI
|
||||
const std::shared_ptr<DDSConnector::DdsConnector> &ddsConnector
|
||||
#endif
|
||||
)
|
||||
bool Initialization::initialize(const std::shared_ptr<DDSConnector::DdsConnector> &ddsConnector)
|
||||
{
|
||||
#if BUILD_RTI
|
||||
if (m_handlerMinelayerData)
|
||||
return true;
|
||||
|
||||
@@ -56,15 +45,6 @@ bool Initialization::initialize(
|
||||
ERROR_LOG(m_logger) << "Initialisation m_handlerMinelayerData failed.";
|
||||
return false;
|
||||
}
|
||||
#else
|
||||
// initialize DDS stub
|
||||
m_ddsHandler.reset(new DdsHandler());
|
||||
if (!m_ddsHandler->init())
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Initialisation ddsHandler failed.";
|
||||
return false;
|
||||
}
|
||||
#endif
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user