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
@@ -10,10 +10,9 @@
|
||||
namespace Evaluations
|
||||
{
|
||||
|
||||
class DataPlugin final : public QObject, public DataPluginBase::Plugin
|
||||
class DataPlugin final : public DataPluginBase::Plugin
|
||||
{
|
||||
Q_PLUGIN_METADATA(IID "data:3:evl")
|
||||
Q_INTERFACES(DataPluginBase::Plugin)
|
||||
|
||||
Q_OBJECT
|
||||
public:
|
||||
|
||||
+1
-1
@@ -12,7 +12,7 @@ namespace Evaluations
|
||||
|
||||
TopicEditorEvaluationModel::TopicEditorEvaluationModel(QObject* parent)
|
||||
: NGLTreeModel(parent, new NGLTreeItem(QVariant()), ,
|
||||
m_logger(NGL::NGLLoggerBootstrap::getLogger()){tr("Id"), tr("Name"), tr("Weight"), tr("Start Time"),
|
||||
m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()){tr("Id"), tr("Name"), tr("Weight"), tr("Start Time"),
|
||||
tr("Situation"), tr("Video"), tr("Audio")})
|
||||
{
|
||||
}
|
||||
|
||||
+1
-1
@@ -11,7 +11,7 @@ namespace Evaluations
|
||||
{
|
||||
EvlNewCommentDialog::EvlNewCommentDialog(const std::shared_ptr<OperatorManagement::Interface::Dtc>& opmDtc,
|
||||
QWidget* parent)
|
||||
: QDialog(parent), m_ui(new Ui::EvlNewCommentDialog), m_logger(NGL::NGLLoggerBootstrap::getLogger())
|
||||
: QDialog(parent), m_ui(new Ui::EvlNewCommentDialog), m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
|
||||
{
|
||||
m_ui->setupUi(this);
|
||||
setWindowFlags(Qt::Tool);
|
||||
|
||||
Reference in new issue
Block a user