Complete Qt6 migration: full clean build green across groups G1-G12 incl. runtime plugin set
new_docker_build.sh gains Group 12 (212 GUI/Data plugins); fixes LtsUtilsGuiDds visibility (LTO-stripped exports), LtsProjectionWorkstation unity name shadow, 6 unity-off dirs (dup file-scope statics, ddsftc INTERFACE sources) and reconfigures BUILD_FILTERMANAGEMENT/BUILD_PLUGINS_SERVICEMONITOR=ON
This commit is contained in:
1718 files changed
+126739
-18495
No files matched your search
+34
-34
@@ -6,7 +6,7 @@
|
||||
|
||||
#include <LtsUtils/LtsUtilsCore/dds_vector.h>
|
||||
#include <NGLLogger/NGLLoggerBootstrap.h>
|
||||
#include <flm_data_plugin_interface.h>
|
||||
#include <Plugins/FileManagement/flm_data_plugin_interface.h>
|
||||
#include <OperatorManagement/opm_data_plugin_interface.h>
|
||||
#include <QtXml/QDomDocument>
|
||||
#include <QtGui/QImage>
|
||||
@@ -152,7 +152,7 @@ bool FlmSubscriber::createFlmSymbolProxy(int type_placeholder)
|
||||
|
||||
#ifdef SKIP_SOME_TO_TEST_REFETCHING
|
||||
if (fileContentId >= 98)
|
||||
request.fileContentId(-1);
|
||||
request.fileContentId = -1;
|
||||
#endif
|
||||
#endif
|
||||
|
||||
@@ -179,7 +179,7 @@ bool FlmSubscriber::createFlmSymbolProxy(int type_placeholder)
|
||||
|
||||
void FlmSubscriber::onGetFileContentDataReply(const FileManagement::GetFileContentDataReply& reply)
|
||||
{
|
||||
const int32_t fileContentId = reply.id();
|
||||
const int32_t fileContentId = reply.id;
|
||||
|
||||
TRACE_LOG(m_logger) << Q_FUNC_INFO << " START, " << fileContentId;
|
||||
|
||||
@@ -197,16 +197,16 @@ void FlmSubscriber::onGetFileContentDataReply(const FileManagement::GetFileConte
|
||||
|
||||
DEBUG_LOG(m_logger) << Q_FUNC_INFO << " fileContentId=" << fileContentId << " name=" << name
|
||||
<< " operatorName=" << operatorName << " lastModified=" << lastModified
|
||||
<< " #bytes =" << reply.content().size();
|
||||
<< " #bytes =" << reply.content.size();
|
||||
|
||||
fcData.monitoring.replyContentSize = reply.content().size();
|
||||
fcData.monitoring.replyContentSize = reply.content.size();
|
||||
|
||||
switch (fcData.type)
|
||||
{
|
||||
case FileContentStruct::SymbolType::EtsSymbol: {
|
||||
QImage image;
|
||||
if (!svgToImage(QByteArray::fromRawData(reinterpret_cast<const char*>(&reply.content().at(0)),
|
||||
reply.content().size()),
|
||||
if (!svgToImage(QByteArray::fromRawData(reinterpret_cast<const char*>(&reply.content.at(0)),
|
||||
reply.content.size()),
|
||||
image))
|
||||
{
|
||||
ERROR_LOG(m_logger) << Q_FUNC_INFO << " svgToImage failed, fileContentId=" << fileContentId;
|
||||
@@ -225,7 +225,7 @@ void FlmSubscriber::onGetFileContentDataReply(const FileManagement::GetFileConte
|
||||
|
||||
case FileContentStruct::SymbolType::XmlSymbol: {
|
||||
FlmSymbolProxy::SymbolData symbolData(name, operatorName, lastModified,
|
||||
LtsUtils::toQByteArray(reply.content()));
|
||||
LtsUtils::toQByteArray(reply.content));
|
||||
|
||||
if (symbolData.isXmlSymbol())
|
||||
{
|
||||
@@ -277,7 +277,7 @@ bool FlmSubscriber::svgToImage(const QByteArray& svgByteArray, QImage& imageOut)
|
||||
QString FlmSubscriber::operatorName(int operatorId)
|
||||
{
|
||||
if (d->m_opmDtc)
|
||||
return QString::fromStdString(d->m_opmDtc->user(operatorId).name());
|
||||
return QString::fromStdString(d->m_opmDtc->user(operatorId).name);
|
||||
return QStringLiteral("unknown user<%1>").arg(operatorId);
|
||||
}
|
||||
|
||||
@@ -339,20 +339,20 @@ void FlmSubscriber::checkForReFetching()
|
||||
|
||||
void FlmSubscriber::onFileContentChanged(const FileManagement::FileContent& data, DataModification modType)
|
||||
{
|
||||
TRACE_LOG(m_logger) << Q_FUNC_INFO << " data.id=" << data.id()
|
||||
<< " data.fileStatus=" << data.fileStatus().underlying() << " modType=" << modType
|
||||
<< " data.name='" << data.name().c_str() << "'";
|
||||
TRACE_LOG(m_logger) << Q_FUNC_INFO << " data.id=" << data.id
|
||||
<< " data.fileStatus=" << data.fileStatus << " modType=" << modType
|
||||
<< " data.name='" << data.name.c_str() << "'";
|
||||
|
||||
if (!d->m_flmFtc)
|
||||
return;
|
||||
|
||||
if (data.isDeleted())
|
||||
if (data.isDeleted)
|
||||
return;
|
||||
|
||||
if (data.fileType().underlying() != FileManagement::FileType::OperatorDefinedSymbol)
|
||||
if (data.fileType != FileManagement::FileType::OperatorDefinedSymbol)
|
||||
return;
|
||||
|
||||
if (data.fileStatus().underlying() == FileManagement::FileStatus::Deleted)
|
||||
if (data.fileStatus == FileManagement::FileStatus::Deleted)
|
||||
{
|
||||
switch (modType)
|
||||
{
|
||||
@@ -367,7 +367,7 @@ void FlmSubscriber::onFileContentChanged(const FileManagement::FileContent& data
|
||||
}
|
||||
}
|
||||
|
||||
const int32_t fileContentId = data.id();
|
||||
const int32_t fileContentId = data.id;
|
||||
switch (modType)
|
||||
{
|
||||
case DataModification::eAdded:
|
||||
@@ -383,13 +383,13 @@ void FlmSubscriber::onFileContentChanged(const FileManagement::FileContent& data
|
||||
|
||||
case DataModification::eRemoved: {
|
||||
DEBUG_LOG(m_logger) << Q_FUNC_INFO << " modType=" << modType << " fileContentId=" << fileContentId
|
||||
<< " fileContentName=" << data.name();
|
||||
<< " fileContentName=" << data.name;
|
||||
|
||||
d->m_fileContentMap.remove(fileContentId);
|
||||
|
||||
if (!d->m_symbolProxy.removeSymbol(fileContentId))
|
||||
ERROR_LOG(m_logger) << Q_FUNC_INFO << " removeSymbol failed"
|
||||
<< " fileContentId=" << fileContentId << " fileContentName='" << data.name() << "'"
|
||||
<< " fileContentId=" << fileContentId << " fileContentName='" << data.name << "'"
|
||||
<< " contains=" << d->m_fileContentMap.contains(fileContentId);
|
||||
break;
|
||||
}
|
||||
@@ -400,35 +400,35 @@ void FlmSubscriber::updateFileContentMap(const FileManagement::FileContent& data
|
||||
{
|
||||
TRACE_LOG(m_logger) << Q_FUNC_INFO << " START"
|
||||
<< " d->m_fileContentMap.size()=" << d->m_fileContentMap.size()
|
||||
<< " fileContentId=" << data.id() << " data.isDeleted()=" << data.isDeleted()
|
||||
<< " data.fileStatus().underlying()=" << data.fileStatus().underlying() << " data.name='"
|
||||
<< QString::fromStdString(data.name()) << "'";
|
||||
<< " fileContentId=" << data.id << " data.isDeleted=" << data.isDeleted
|
||||
<< " data.fileStatus=" << data.fileStatus << " data.name='"
|
||||
<< QString::fromStdString(data.name) << "'";
|
||||
|
||||
if (data.isDeleted())
|
||||
if (data.isDeleted)
|
||||
return;
|
||||
|
||||
if (data.fileStatus().underlying() == FileManagement::FileStatus::Deleted)
|
||||
if (data.fileStatus == FileManagement::FileStatus::Deleted)
|
||||
return;
|
||||
|
||||
if (data.fileType() != FileManagement::FileType::OperatorDefinedSymbol)
|
||||
if (data.fileType != FileManagement::FileType::OperatorDefinedSymbol)
|
||||
return;
|
||||
|
||||
const int32_t fileContentId = data.id();
|
||||
const int32_t fileContentId = data.id;
|
||||
|
||||
FileContentStruct fcData;
|
||||
|
||||
fcData.name = QString::fromStdString(data.name());
|
||||
fcData.name = QString::fromStdString(data.name);
|
||||
fcData.type = FileContentStruct::SymbolType::UnsupportedSymbol;
|
||||
fcData.operatorName = operatorName(data.operatorId());
|
||||
fcData.lastModified = data.lastModified();
|
||||
fcData.operatorName = operatorName(data.operatorId);
|
||||
fcData.lastModified = data.lastModified;
|
||||
|
||||
fcData.usrTags << QStringLiteral("file-id=%1").arg(fileContentId);
|
||||
fcData.usrTags << QStringLiteral("exercise-id=%1").arg(data.exerciseId().is_set() ? data.exerciseId().get() : -1);
|
||||
fcData.usrTags << QStringLiteral("exercise-id=%1").arg(data.exerciseId.has_value() ? data.exerciseId.get() : -1);
|
||||
fcData.usrTags << fcData.operatorName;
|
||||
|
||||
if (data.properties().size() != 0)
|
||||
if (data.properties.size() != 0)
|
||||
{
|
||||
const QByteArray attributesJson(QByteArray::fromRawData(data.properties().c_str(), data.properties().size()));
|
||||
const QByteArray attributesJson(QByteArray::fromRawData(data.properties.c_str(), data.properties.size()));
|
||||
QJsonParseError parseError;
|
||||
QJsonDocument jDoc(QJsonDocument::fromJson(attributesJson, &parseError));
|
||||
|
||||
@@ -476,9 +476,9 @@ void FlmSubscriber::updateFileContentMap(const FileManagement::FileContent& data
|
||||
|
||||
TRACE_LOG(m_logger) << Q_FUNC_INFO << " END"
|
||||
<< " d->m_fileContentMap.size()=" << d->m_fileContentMap.size()
|
||||
<< " fileContentId=" << data.id() << " data.isDeleted()=" << data.isDeleted()
|
||||
<< " data.fileStatus().underlying()=" << data.fileStatus().underlying() << " data.name='"
|
||||
<< QString::fromStdString(data.name()) << "'";
|
||||
<< " fileContentId=" << data.id << " data.isDeleted=" << data.isDeleted
|
||||
<< " data.fileStatus=" << data.fileStatus << " data.name='"
|
||||
<< QString::fromStdString(data.name) << "'";
|
||||
}
|
||||
|
||||
void FlmSubscriber::onLocalSymbolProxyEtsSymbolAdded(qint32 fileContentId, const QString& name, const QImage& image,
|
||||
|
||||
+1
-1
@@ -6,7 +6,7 @@
|
||||
#include <Lts/Services/FileManagement/flm.hpp>
|
||||
#include <LtsUtils/LtsUtilsCore/data_modification_enum.h>
|
||||
#include <PluginInterfaces/gui_plugin_interface.h>
|
||||
#include <flm_data_plugin_interface.h>
|
||||
#include <Plugins/FileManagement/flm_data_plugin_interface.h>
|
||||
#include <OperatorManagement/opm_data_plugin_interface.h>
|
||||
#include <memory>
|
||||
|
||||
|
||||
+1
-1
@@ -10,7 +10,7 @@
|
||||
#include <Symbology/sidc_codec.h>
|
||||
#include "flm_symbol_proxy.h"
|
||||
|
||||
#include <flm_data_plugin_interface.h>
|
||||
#include <Plugins/FileManagement/flm_data_plugin_interface.h>
|
||||
#include <OperatorManagement/opm_data_plugin_interface.h>
|
||||
|
||||
namespace AdvancedSymbology
|
||||
|
||||
+1
@@ -9,6 +9,7 @@
|
||||
#include <QtCore/QHash>
|
||||
#include <QtCore/QString>
|
||||
#include <QtGui/QImage>
|
||||
#include <QtCore/QObject>
|
||||
|
||||
|
||||
|
||||
|
||||
Reference in new issue
Block a user