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
@@ -22,6 +22,7 @@ SET(avm_SRCS
|
||||
)
|
||||
|
||||
NGL_ADD_LIBRARY(WS AvmDataPlugin MODULE ${avm_SRCS})
|
||||
set_target_properties(AvmDataPlugin PROPERTIES AUTOMOC ON)
|
||||
NGL_TARGET_LINK_LIBRARIES(AvmDataPlugin
|
||||
NGLLogger
|
||||
ngltranslator
|
||||
|
||||
+1
-2
@@ -23,10 +23,9 @@ class PlaybackApp;
|
||||
class PluginSettings;
|
||||
class StreamNameMapping;
|
||||
|
||||
class DataPlugin final : public QObject, public DataPluginBase::Plugin
|
||||
class DataPlugin final : public DataPluginBase::Plugin
|
||||
{
|
||||
Q_PLUGIN_METADATA(IID "data:3:avm")
|
||||
Q_INTERFACES(DataPluginBase::Plugin)
|
||||
|
||||
Q_OBJECT
|
||||
public:
|
||||
|
||||
+1
-1
@@ -48,7 +48,7 @@ AvailableStreamsModel::AvailableStreamsModel(const std::shared_ptr<Interface::Dt
|
||||
LtsSession::LtsSession* session, StreamNameMapping* streamNameMapping,
|
||||
QObject* parent, bool isAudio)
|
||||
: NGLTreeModel(parent, new NGLTreeItem(QVariant(), QIcon()), ,
|
||||
m_logger(NGL::NGLLoggerBootstrap::getLogger()){tr("Available Streams")}),
|
||||
m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()){tr("Available Streams")}),
|
||||
m_isAudio(isAudio), m_avmDtc(avmDtc), m_ismDtc(ismDtc), m_session(session), m_streamNameMapping(streamNameMapping)
|
||||
{
|
||||
Q_ASSERT(ismDtc);
|
||||
|
||||
+1
-1
@@ -258,7 +258,7 @@ class AvmPlaybackMenu::TimeControl : public QObject
|
||||
|
||||
QueryTimeline::QueryTimeline(const AvaStream& stream, const AvaTimePoint& start, const AvaTimePoint& end,
|
||||
AvaControl* control)
|
||||
: QObject(), m_logger(NGL::NGLLoggerBootstrap::getLogger())
|
||||
: QObject(), m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
|
||||
{
|
||||
connect(control, &AvaControl::queryTimelineResponse, this, &QueryTimeline::signalTimelineComplete);
|
||||
connect(control, &AvaControl::queryTimelineResponse, this, &QObject::deleteLater);
|
||||
|
||||
+1
-1
@@ -843,7 +843,7 @@ QSet<int> EditFrequencyPlanningFrequencyDataModel::getAllocatedFrequencyPlanning
|
||||
return result;
|
||||
}
|
||||
|
||||
FPFDelegate::FPFDelegate(QObject* parent) : QStyledItemDelegate(parent), m_logger(NGL::NGLLoggerBootstrap::getLogger())
|
||||
FPFDelegate::FPFDelegate(QObject* parent) : QStyledItemDelegate(parent), m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
|
||||
{
|
||||
}
|
||||
|
||||
|
||||
+1
-1
@@ -19,7 +19,7 @@ namespace AudioVideoManagement
|
||||
FrequencyPlanningWidget::FrequencyPlanningWidget(const std::shared_ptr<Interface::Dtc>& avmDtc,
|
||||
QSet<int>& allocatedDataSets, QWidget* parent)
|
||||
: QWidget(parent), m_ui(new Ui::FrequencyPlanningWidget), m_assignedFrequencySetDataIds(allocatedDataSets),
|
||||
m_avmDtc(avmDtc), m_logger(NGL::NGLLoggerBootstrap::getLogger())
|
||||
m_avmDtc(avmDtc), m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
|
||||
{
|
||||
m_ui->setupUi(this);
|
||||
|
||||
|
||||
+1
-1
@@ -857,7 +857,7 @@ LoadFrequencyPlanningDialogModel::searchCnrConfig(const NGLTreeItem* parentItem,
|
||||
}
|
||||
|
||||
DrawDelegate::DrawDelegate(QObject* parent)
|
||||
: QStyledItemDelegate(parent), m_logger(NGL::NGLLoggerBootstrap::getLogger())
|
||||
: QStyledItemDelegate(parent), m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
|
||||
{
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user