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:
torstenandCopilot committed
1 parent
c143ff8a4f
commit
d5af8b9764
1244 files changed
+4266
-4633
No files matched your search
@@ -32,13 +32,12 @@ CODEGEN_TOPIC_TYPEDEFS(SRCS_common ${xml_FILE})
|
||||
# generate cod_[d|f]tc.h
|
||||
CODEGEN_CLIENT_TOPICS_IFC(SRCS_common ${xml_FILE})
|
||||
|
||||
NGL_ADD_LIBRARY2(AAR SV WS svcCodCommon SHARED ${SRCS_common})
|
||||
NGL_ADD_LIBRARY(AAR SV WS svcCodCommon SHARED ${SRCS_common})
|
||||
NGL_TARGET_INCLUDE_DIRECTORIES(svcCodCommon
|
||||
PUBLIC
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/../
|
||||
${CMAKE_CURRENT_BINARY_DIR}/../
|
||||
)
|
||||
IF(BUILD_RTI)
|
||||
NGL_TARGET_LINK_LIBRARIES(svcCodCommon
|
||||
PRIVATE
|
||||
RTI::nddscpp2
|
||||
@@ -48,7 +47,6 @@ NGL_TARGET_LINK_LIBRARIES(svcCodCommon
|
||||
ngldb
|
||||
NGLLogger
|
||||
)
|
||||
ENDIF(BUILD_RTI)
|
||||
NGL_INSTALL_TARGET(svcCodCommon)
|
||||
|
||||
#
|
||||
@@ -60,14 +58,13 @@ SET(SRCS_client
|
||||
# generate cod_[d|f]tc_impl.[cpp|h]
|
||||
CODEGEN_CLIENT_TOPICS_IMPL(SRCS_client ${xml_FILE})
|
||||
|
||||
NGL_ADD_LIBRARY2(AAR SV WS svcCodClient SHARED ${SRCS_client})
|
||||
NGL_ADD_LIBRARY(AAR SV WS svcCodClient SHARED ${SRCS_client})
|
||||
NGL_TARGET_INCLUDE_DIRECTORIES(svcCodClient
|
||||
PUBLIC
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/../
|
||||
${CMAKE_CURRENT_BINARY_DIR}/../
|
||||
)
|
||||
|
||||
IF(BUILD_RTI)
|
||||
NGL_TARGET_LINK_LIBRARIES(svcCodClient
|
||||
PRIVATE
|
||||
RTI::nddscpp2
|
||||
@@ -76,7 +73,6 @@ NGL_TARGET_LINK_LIBRARIES(svcCodClient
|
||||
svcCodCommon
|
||||
ddsftc
|
||||
)
|
||||
ENDIF(BUILD_RTI)
|
||||
NGL_INSTALL_TARGET(svcCodClient)
|
||||
|
||||
#
|
||||
@@ -101,14 +97,13 @@ CODEGEN_SERVER_TOPICS(SRCS_server ${xml_FILE})
|
||||
# Generate cod.sql, cod.xml
|
||||
CODEGEN_SQL(SRCS_server ${xml_FILE})
|
||||
|
||||
NGL_ADD_LIBRARY2(AAR SV svcCodServer SHARED ${SRCS_server})
|
||||
NGL_ADD_LIBRARY(AAR SV svcCodServer SHARED ${SRCS_server})
|
||||
NGL_TARGET_INCLUDE_DIRECTORIES(svcCodServer
|
||||
PUBLIC
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/../
|
||||
${CMAKE_CURRENT_BINARY_DIR}/../
|
||||
)
|
||||
|
||||
IF(BUILD_RTI)
|
||||
NGL_TARGET_LINK_LIBRARIES(svcCodServer
|
||||
PRIVATE
|
||||
RTI::nddscpp2
|
||||
@@ -125,7 +120,6 @@ NGL_TARGET_LINK_LIBRARIES(svcCodServer
|
||||
NGLLogger
|
||||
ngltools
|
||||
)
|
||||
ENDIF(BUILD_RTI)
|
||||
NGL_INSTALL_TARGET(svcCodServer)
|
||||
|
||||
#
|
||||
|
||||
@@ -12,6 +12,7 @@ using namespace CodificationManagement;
|
||||
|
||||
DdsHandler::DdsHandler(const std::shared_ptr<DDSConnector::DdsConnector> &ddsConnector)
|
||||
: m_ddsConnector(ddsConnector)
|
||||
, m_logger(getLogger("DdsHandler"))
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "DdsHandler(" << m_ddsConnector->getDomainId() << ") for partition: " << m_ddsConnector->getDefaultPartition();
|
||||
} // end of ctor()
|
||||
|
||||
@@ -33,11 +33,12 @@ public:
|
||||
int exerciseId() const;
|
||||
|
||||
private:
|
||||
NGL::INGLLogger &m_logger;
|
||||
std::shared_ptr<DDSConnector::DdsConnector> m_ddsConnector;
|
||||
std::shared_ptr<Core::TopicLockMaster> m_topicLockMaster;
|
||||
std::shared_ptr<CodificationManagement::Interface::Dts> m_ddsDts;
|
||||
std::shared_ptr<CodificationManagement::Interface::Fts> m_ddsFts;
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
};
|
||||
|
||||
} // Namespace CodificationManagement
|
||||
+2
-2
@@ -7,7 +7,6 @@
|
||||
*/
|
||||
|
||||
#include "handler_codification_data.h"
|
||||
#include <utility>
|
||||
#include "object_codification_data.h"
|
||||
|
||||
using namespace CodificationManagement;
|
||||
@@ -18,6 +17,7 @@ HandlerCodificationData::HandlerCodificationData(const std::shared_ptr<DdsHandle
|
||||
, Interface::Fts::CodificationDataRemoveRequestHandler(ddsHandler->fts())
|
||||
, m_ddsHandler(ddsHandler)
|
||||
, m_dbHandler(dbHandler)
|
||||
, m_logger(getLogger("HandlerCodificationData"))
|
||||
{
|
||||
} // end of ctor()
|
||||
//-----------------------------------------------------------------------------
|
||||
@@ -39,7 +39,7 @@ bool HandlerCodificationData::init()
|
||||
}
|
||||
|
||||
// create objects
|
||||
for (const Database::CodCodificationTable &data : std::as_const(dataVec))
|
||||
for (const Database::CodCodificationTable &data : qAsConst(dataVec))
|
||||
{
|
||||
CodificationManagement::CodificationData ddsData = ObjectCodificationData::toDdsData(data);
|
||||
ObjectCodificationData *ifs(new ObjectCodificationData(m_ddsHandler, m_dbHandler));
|
||||
|
||||
+2
-4
@@ -7,7 +7,7 @@
|
||||
*/
|
||||
#pragma once
|
||||
|
||||
#include <QtCore/QMap>
|
||||
#include <QMap>
|
||||
|
||||
#include "dds_handler.h"
|
||||
#include "initialization.h"
|
||||
@@ -30,9 +30,6 @@ public:
|
||||
|
||||
|
||||
private: // FTS methods
|
||||
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
void onCodificationDataModifyRequest(const rti::core::SampleIdentity &cookie,
|
||||
const CodificationData &request) override final;
|
||||
Core::FunctionReplyObject codificationDataCreateRequest(const CodificationData &request);
|
||||
@@ -45,5 +42,6 @@ private: // attributes
|
||||
std::shared_ptr<DdsHandler> m_ddsHandler;
|
||||
std::shared_ptr<DbHandler> m_dbHandler;
|
||||
QMap<int, ObjectCodificationData *> m_codificationdataObjMap;
|
||||
NGL::INGLLogger &m_logger;
|
||||
};
|
||||
}
|
||||
@@ -9,7 +9,7 @@
|
||||
|
||||
#include <DDS/DDSConnector/dds_connector.h>
|
||||
#include <ngldb/db_service_handler.h>
|
||||
#include "svccodserver_export.h"
|
||||
#include <CodificationManagement/cod_export.h>
|
||||
#include <CodificationManagement/logger.h>
|
||||
|
||||
class QSqlDatabase;
|
||||
@@ -30,13 +30,11 @@ public:
|
||||
bool loadFromDatabase();
|
||||
|
||||
private: // attributes
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
std::shared_ptr<DdsHandler> m_ddsHandler; ///< Pointer to DDS handler
|
||||
std::shared_ptr<DbHandler> m_dbHandler; ///< Pointer to DB handler
|
||||
std::shared_ptr<HandlerCodificationData> m_handlerCodificationData; ///< Pointer to codification data handler
|
||||
|
||||
|
||||
NGL::INGLLogger &m_logger; ///< Interface to the Logging-Facility
|
||||
|
||||
};
|
||||
} // namespace CodificationManagement
|
||||
@@ -9,7 +9,7 @@
|
||||
#pragma once
|
||||
|
||||
#include <NGLLogger/INGLLogger.h>
|
||||
#include "svccodcommon_export.h"
|
||||
#include "cod_export.h"
|
||||
|
||||
namespace CodificationManagement
|
||||
{
|
||||
|
||||
+1
@@ -15,6 +15,7 @@ ObjectCodificationData::ObjectCodificationData(const std::shared_ptr<DdsHandler>
|
||||
const std::shared_ptr<DbHandler> &dbHandler)
|
||||
: m_ddsHandler(ddsHandler)
|
||||
, m_dbHandler(dbHandler)
|
||||
, m_logger(getLogger("ObjectCodificationData"))
|
||||
{
|
||||
} // end of ctor()
|
||||
//-----------------------------------------------------------------------------
|
||||
|
||||
+2
-1
@@ -40,12 +40,13 @@ public:
|
||||
static Database::CodCodificationTable toDbData(const CodificationManagement::CodificationData &ddsData); // dds -> db
|
||||
|
||||
protected:
|
||||
NGL::INGLLogger &m_logger;
|
||||
void onPublishData();
|
||||
|
||||
private:
|
||||
std::shared_ptr<DdsHandler> m_ddsHandler;
|
||||
std::shared_ptr<DbHandler> m_dbHandler;
|
||||
CodificationData m_ddsData;
|
||||
NGL::INGLLogger &m_logger;
|
||||
|
||||
};
|
||||
}
|
||||
@@ -7,8 +7,8 @@
|
||||
*/
|
||||
|
||||
#pragma once
|
||||
#include <QtCore/QString>
|
||||
#include "svccodserver_export.h"
|
||||
#include <QString>
|
||||
#include <CodificationManagement/cod_export.h>
|
||||
|
||||
namespace NGL
|
||||
{
|
||||
|
||||
Reference in new issue
Block a user