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:
1 parent
edd5e3ba81
commit
473462cbdb
42 files changed
+2779
-3251
No files matched your search
@@ -1,16 +1,16 @@
|
||||
// **************************************************************************
|
||||
//
|
||||
// (C) Copyright 2009 Swiss SIMTEC AG
|
||||
//
|
||||
// **************************************************************************
|
||||
//
|
||||
// $HeadURL$
|
||||
// $LastChangedBy$
|
||||
// $LastChangedDate$
|
||||
// $LastChangedRevision$
|
||||
//
|
||||
// **************************************************************************
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <QtCore/QString>
|
||||
@@ -18,19 +18,14 @@
|
||||
|
||||
namespace N_LogView
|
||||
{
|
||||
/**
|
||||
* @author alois.wismer
|
||||
* @version 1.0
|
||||
* @created 05-Feb-2010 11:24:56
|
||||
*/
|
||||
|
||||
|
||||
class LogViewXdrElement
|
||||
{
|
||||
public:
|
||||
/**
|
||||
* @author alois.wismer
|
||||
* @version 1.0
|
||||
* @created 10-Feb-2010 11:34:47
|
||||
*/
|
||||
|
||||
|
||||
|
||||
enum E_ElementKind
|
||||
{
|
||||
e_KindStandardType,
|
||||
@@ -45,16 +40,12 @@ namespace N_LogView
|
||||
virtual ~LogViewXdrElement() = default;
|
||||
|
||||
protected:
|
||||
/**
|
||||
* Constructor of a struct or enum
|
||||
*
|
||||
* @param a_name
|
||||
* @param a_kind
|
||||
*/
|
||||
LogViewXdrElement(const QString &a_name, const E_ElementKind a_kind, const char *loggerName);
|
||||
|
||||
|
||||
LogViewXdrElement(const QString& a_name, const E_ElementKind a_kind, const char *loggerName);
|
||||
|
||||
public:
|
||||
const QString &getName() const { return m_Name; }
|
||||
const QString& getName() const { return m_Name; }
|
||||
LogViewXdrElement::E_ElementKind getKind() const { return m_Kind; }
|
||||
|
||||
virtual void dump() const;
|
||||
@@ -62,7 +53,6 @@ namespace N_LogView
|
||||
protected:
|
||||
QString m_Name;
|
||||
E_ElementKind m_Kind;
|
||||
LOGGER_T m_logger;
|
||||
QString getKindName() const;
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
|
||||
Reference in new issue
Block a user