Fix LogView consistency and LtsUtilsGuiDds link after the merge

- LogView: take the complete XmlPatterns (d327c66c4) file set - the
  auto-merged mix (XmlPatterns .cpp + validation .hpp) left duplicated
  m_logger members and constructor signature mismatches, because the
  two lineages reworked the module differently.
- LogView CMakeLists: the cleanup version (separate LogViewLogger
  static library, required by tabPluginTetraJson and present in the
  Release 2 target list).
- LtsUtilsGuiDds: link ddscore (BUILD_RTI) for the Core::FunctionReply
  symbols, as in story/release-2-cleanup.

Full-scope ninja all is green; ctest 20/22 (the two failures,
GrantleeParserSmoke and utils_test, are out of the driver's 46-target
scope and 'Not Run' in the official baseline).
This commit is contained in:
berrux-dev committed 2026-11-16 20:24:04 +01:00
1 parent edd5e3ba81
commit 473462cbdb
42 files changed
+2779 -3251

No files matched your search

@@ -1,21 +1,20 @@
// **************************************************************************
//
// (C) Copyright 2009 Swiss SIMTEC AG
//
// **************************************************************************
//
// $HeadURL$
// $LastChangedBy$
// $LastChangedDate$
// $LastChangedRevision$
//
// **************************************************************************
#pragma once
#include <QtWidgets/QTabWidget>
#include "LogViewWidget.hpp"
#include "logger.h"
namespace N_LogView
@@ -23,35 +22,28 @@ namespace N_LogView
class LogViewTelegramDialog;
class LogViewSpinBox;
/**
* Used for arrays of structures
*
* @author alois.wismer
* @version 1.0
* @created 26-Mai-2010 17:12:30
*/
class LogViewTabWidget
: public QTabWidget
, public LogViewWidget
class LogViewTabWidget : public QTabWidget, public LogViewWidget
{
Q_OBJECT
public:
LogViewTabWidget(LogViewField *a_field, LogViewTelegramDialog *a_parent, LogViewSpinBox *a_spinBox, NGL::INGLLogger &logger);
bool saveContent(LogViewTelegram *a_telegram) override;
void addTab(LogViewField *a_field, const bool a_isEmpty, int arrayIdx);
LogViewTabWidget(LogViewField* a_field, LogViewTelegramDialog* a_parent, LogViewSpinBox* a_spinBox);
bool saveContent(LogViewTelegram* a_telegram) override;
void addTab(LogViewField* a_field, const bool a_isEmpty, int arrayIdx);
public slots:
/**
*
* @param a_newSize
*/
void changeSize(const int a_newSize);
protected:
LogViewTelegramDialog *m_TelegramDialog;
LogViewSpinBox *m_SpinBox;
NGL::INGLLogger &m_logger;
LogViewTelegramDialog* m_TelegramDialog;
LogViewSpinBox* m_SpinBox;
};
}