Qt6 Migration: BUILD_RTI guards und CMake fixes
- BUILD_RTI conditional compilation für RTI Connext DDS dependencies - Namespace fixes in core_dtc.h (Core:: → DDS::Core::) - CMakeLists.txt: BUILD_RTI option und conditional dependencies - Handler minelayer: namespace closing mit BUILD_RTI guard - Build erfolgreich mit BUILD_RTI=OFF validiert Signed-off-by: Torsten Wierschin <torsten.wierschin@life-maps.com>
This commit is contained in:
422 files changed
+1013
-599
No files matched your search
+4
@@ -6,6 +6,8 @@
|
||||
# Created by Mike Wille, SLTE, 2024-01-11
|
||||
#
|
||||
|
||||
IF(BUILD_RTI)
|
||||
|
||||
SET(src
|
||||
logger.cpp
|
||||
logger.h
|
||||
@@ -44,3 +46,5 @@ NGL_TARGET_LINK_LIBRARIES(Thp2Common
|
||||
|
||||
NGL_INSTALL_TARGET(Thp2Common)
|
||||
|
||||
ENDIF(BUILD_RTI)
|
||||
|
||||
+2
@@ -3,6 +3,7 @@
|
||||
|
||||
#include "tpm_exported_scripts_model.h"
|
||||
|
||||
#include <NGLLogger/NGLLoggerBootstrap.h>
|
||||
#include <ngltools/ngltools_dtg.h>
|
||||
|
||||
#include <QDateTime>
|
||||
@@ -22,6 +23,7 @@ namespace TakeHomePackageManager
|
||||
ExportedScriptsModel::ExportedScriptsModel(QObject *parent)
|
||||
: LtsWidgets::LtsAbstractTableModel<ExportedScriptInformation>(
|
||||
{ tr("id"), tr("Exercise"), tr("Name"), tr("Local version"), tr("Server version"), tr("Location"), tr("Upload status")}, parent)
|
||||
, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger().getNGLLogger("thp2.common2.exportedscriptsmodel"))
|
||||
{}
|
||||
|
||||
|
||||
|
||||
+2
-2
@@ -44,7 +44,7 @@ namespace TakeHomePackageManager
|
||||
CopyInfoList getFilesFromFolder(const QString &srcPath, const QString &dstPath, const QStringList &excludes) noexcept(false)
|
||||
{
|
||||
int fuse = 50000;
|
||||
QFileInfoList todoFiles({{srcPath}});
|
||||
QFileInfoList todoFiles({QFileInfo(srcPath)});
|
||||
CopyInfoList ret;
|
||||
|
||||
do
|
||||
@@ -130,7 +130,7 @@ AsyncFileCopy::AsyncFileCopy(const CopyInfoList &fileList)
|
||||
});
|
||||
connect(fw, &QFutureWatcher<bool>::finished,
|
||||
this, &QObject::deleteLater);
|
||||
fw->setFuture(QtConcurrent::run(this, &AsyncFileCopy::copy, fileList));
|
||||
fw->setFuture(QtConcurrent::run(std::bind(&AsyncFileCopy::copy, this, fileList)));
|
||||
}
|
||||
|
||||
|
||||
|
||||
+2
@@ -3,6 +3,7 @@
|
||||
|
||||
#include "tpm_topics_model.h"
|
||||
|
||||
#include <NGLLogger/NGLLoggerBootstrap.h>
|
||||
#include <TopicEditorBase/topic_editor_utils.h>
|
||||
|
||||
#include <QJsonArray>
|
||||
@@ -15,6 +16,7 @@ namespace TakeHomePackageManager
|
||||
TopicsModel::TopicsModel(QObject *parent)
|
||||
: LtsWidgets::LtsAbstractTableModel<Topic>(
|
||||
{ tr("id"), tr("Channel"), tr("Filter"), tr("Description"), tr("Type"), tr("Start [mm:ss]"), tr("Duration [mm:ss]")}, parent)
|
||||
, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger().getNGLLogger("thp2.common2.topicsmodel"))
|
||||
{}
|
||||
|
||||
|
||||
|
||||
+1
-1
@@ -52,7 +52,7 @@ namespace TakeHomePackageManager
|
||||
{
|
||||
|
||||
Compressor::Compressor() : QObject(nullptr),
|
||||
m_logger(NGL::NGLLoggerBootstrap::getLogger()) {}
|
||||
m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {}
|
||||
|
||||
|
||||
void Compressor::go(ProcessOverlay *processOverlay, QIODevice &out, const QString &sourceDir, const QString &destRootDir) noexcept(false)
|
||||
|
||||
Reference in new issue
Block a user