Merge story/release-validation-scope
Bring the validation-scope line (in-tree Jenkins CI copy, lcov coverage wiring, step-by-step release-scope README, TetraIF unit tests, the LogView runtime icon/resource fix, Dockerfile, rpmbuild and the new_docker_build.sh driver with the DEB output path) on top of the XmlPatterns branch pruned to the Release 2 scope. Conflict policy: - Out-of-scope targets/modules: keep the prune (deletion wins). - In-scope files that validation had deleted: restored from story/release-2-cleanup (the Release 2 closure, with the pruned-module guards). - In-scope sources carrying migration work: XmlPatterns versions (Qt XmlPatterns rework on QDomDocument, DDS member and logger fixes, first-build fixes). - Scope-aware CMakeLists (top level, PluginInterfaces, LtsWidgets) and .envrc: story/release-2-cleanup / ours versions.
This commit is contained in:
commit
cfe15c72c4
521 files changed
+37159
-36635
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,14 +18,19 @@
|
||||
|
||||
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,
|
||||
@@ -40,12 +45,16 @@ namespace N_LogView
|
||||
virtual ~LogViewXdrElement() = default;
|
||||
|
||||
protected:
|
||||
|
||||
|
||||
LogViewXdrElement(const QString& a_name, const E_ElementKind a_kind, const char *loggerName);
|
||||
/**
|
||||
* 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);
|
||||
|
||||
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;
|
||||
@@ -53,6 +62,7 @@ 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