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/QThread>
|
||||
@@ -24,15 +24,13 @@ namespace N_LogView
|
||||
{
|
||||
class LogViewTelegram;
|
||||
|
||||
/**
|
||||
* @author alois.wismer
|
||||
* @version 1.0
|
||||
* @created 05-Aug-2010 16:02:15
|
||||
*/
|
||||
|
||||
|
||||
class LogViewInjectionThread : public QThread
|
||||
{
|
||||
Q_OBJECT
|
||||
public:
|
||||
|
||||
LogViewInjectionThread();
|
||||
|
||||
void run();
|
||||
@@ -41,15 +39,12 @@ namespace N_LogView
|
||||
|
||||
bool isSendingPossible() const;
|
||||
|
||||
/**
|
||||
*
|
||||
* @param a_telegram
|
||||
* @param a_doSendAsCentralTelegram
|
||||
*/
|
||||
void sendTelegram(LogViewTelegram *a_telegram, const bool a_doSendAsCentralTelegram);
|
||||
|
||||
|
||||
void sendTelegram(LogViewTelegram* a_telegram, const bool a_doSendAsCentralTelegram);
|
||||
|
||||
protected:
|
||||
NGL::INGLLogger &m_logger;
|
||||
|
||||
bool m_DoStartConnection;
|
||||
bool m_SendingPossible;
|
||||
QString m_Hostname;
|
||||
@@ -72,12 +67,10 @@ namespace N_LogView
|
||||
|
||||
public:
|
||||
signals:
|
||||
/**
|
||||
*
|
||||
* @param a_picName
|
||||
* @param a_toolTipText
|
||||
*/
|
||||
void updateStatus(const QString &a_picName, const QString &a_toolTipText);
|
||||
|
||||
|
||||
void updateStatus(const QString& a_picName, const QString& a_toolTipText);
|
||||
|
||||
};
|
||||
|
||||
}
|
||||
Reference in new issue
Block a user