Qt6 Migration: DDS-Stubs, Logger-Fixes, Export-Header Korrekturen
- NGL_ADD_LIBRARY2: 87 CMakeLists.txt konvertiert für Export-Header Generierung - 44 Export-Header Include-Pfade korrigiert (_export.h) - 81 DDS-Stub-Header generiert (*_dtc.h, *_fts.h, *_dts.h, *_ftc.h) - INGLLogger: Duplikat gelöscht, m_logger Member entfernt, variadische Makros - Q_FUNC_INFO Redefinition behoben (Qt6 definiert bereits) - FATAL_LOG Makro hinzugefügt - InfrastructureManagement DDS-Stubs (ism.hpp, ism_enums.hpp, ism_ftc.h) - FilterManagement DDS-Stubs (flt_ftc.h, flt_dts.h) - AreaEffectSimulation DDS-Stubs (aes.hpp, aes_enums.hpp) - SymbolAppearance Klasse vollständig definiert mit content() Methode - BuildingComponentFilter Klasse definiert mit Copy-Konstruktor - Ftc Factory: nullptr Return (abstract class) - AesFilter Klasse in aes.hpp hinzugefügt - Dtc Klasse in ppm.hpp mit participantChanged Signal - AesType Enum: alle 15 At* Werte definiert - AesEffectState_def: EsReceived hinzugefügt - DataModification Enum: eAdded/eModified/eRemoved - function_reply_object.h → core_types.h Include-Pfad (72 Dateien) - Enum-Class-Streaming Template-Operator in INGLLogger.h - ism_mounting_point.h: QImage → QtGui/QImage, QGuiApplication/QScreen - ism_data_plugin_interface.h: QSet Include, Include-Reihenfolge - QRegExp → QRegularExpression in tpm_js_parser.cpp - .underlying() Aufrufe zu direktem Enum-Vergleich korrigiert - Include-Pfade: aes.hpp in symbol_appearance_settings_impl.h und aes_display_filter_impl.h Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This commit is contained in:
2785 files changed
+18754
-18316
No files matched your search
+200
-200
File diff suppressed because it is too large.
Load diff
-1
@@ -223,7 +223,6 @@ private:
|
||||
Ui::SymbolEditor *m_ui;
|
||||
SymbolEditorPrivate *m_internal;
|
||||
LtsSession::LtsSession *m_session;
|
||||
NGL::INGLLogger &m_logger;
|
||||
};
|
||||
|
||||
}
|
||||
+35
-35
@@ -105,7 +105,7 @@ FlmSubscriber::FlmSubscriber(const std::shared_ptr<FileManagement::Interface::Dt
|
||||
: m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger().getNGLLogger("AdvSymbology.FlmSubscriber"))
|
||||
, d(new Private())
|
||||
{
|
||||
INFO_LOG(m_logger) << LOGFUNCTION << " m_counter =" << ++d->m_counter;
|
||||
INFO_LOG() << Q_FUNC_INFO << " m_counter =" << ++d->m_counter;
|
||||
d->m_flmDtc = flmDtc;
|
||||
d->m_flmFtc = flmFtc;
|
||||
d->m_opmDtc = opmDtc;
|
||||
@@ -122,7 +122,7 @@ FlmSubscriber::FlmSubscriber(const std::shared_ptr<FileManagement::Interface::Dt
|
||||
|
||||
FlmSubscriber::~FlmSubscriber()
|
||||
{
|
||||
INFO_LOG(m_logger) << LOGFUNCTION << " m_counter =" << d->m_counter--;
|
||||
INFO_LOG() << Q_FUNC_INFO << " m_counter =" << d->m_counter--;
|
||||
|
||||
if (d->m_reFetchTimer)
|
||||
d->m_reFetchTimer->stop();
|
||||
@@ -154,9 +154,9 @@ bool FlmSubscriber::createFlmSymbolProxy(int type_placeholder)
|
||||
updateFileContentMap(data);
|
||||
};
|
||||
if (!d->m_flmDtc->fileContents(cb))
|
||||
ERROR_LOG(m_logger) << LOGFUNCTION << " Error performing fileContents";
|
||||
ERROR_LOG() << Q_FUNC_INFO << " Error performing fileContents";
|
||||
|
||||
INFO_LOG(m_logger) << LOGFUNCTION << " m_fileContentMap.size()=" << d->m_fileContentMap.size() ;
|
||||
INFO_LOG() << Q_FUNC_INFO << " m_fileContentMap.size()=" << d->m_fileContentMap.size() ;
|
||||
|
||||
|
||||
|
||||
@@ -181,7 +181,7 @@ bool FlmSubscriber::createFlmSymbolProxy(int type_placeholder)
|
||||
fcsRef.monitoring.replyState = FileContentStruct::Requested;
|
||||
} else {
|
||||
fcsRef.monitoring.replyState = FileContentStruct::RequestFailure;
|
||||
ERROR_LOG(m_logger) << "Error requesting FileContentData, fileContentId=" << fileContentId;
|
||||
ERROR_LOG() << "Error requesting FileContentData, fileContentId=" << fileContentId;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -192,7 +192,7 @@ bool FlmSubscriber::createFlmSymbolProxy(int type_placeholder)
|
||||
const int randomOffset = rand() % 10 + 5;
|
||||
QTimer::singleShot(randomOffset, this , [this]()
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "start ReFetchingTimer";
|
||||
DEBUG_LOG() << "start ReFetchingTimer";
|
||||
d->m_reFetchTimer->start();
|
||||
});
|
||||
|
||||
@@ -204,11 +204,11 @@ void FlmSubscriber::onGetFileContentDataReply(const FileManagement::GetFileConte
|
||||
{
|
||||
const int32_t fileContentId = reply.id();
|
||||
|
||||
TRACE_LOG(m_logger) << LOGFUNCTION << " START, " << fileContentId;
|
||||
TRACE_LOG() << Q_FUNC_INFO << " START, " << fileContentId;
|
||||
|
||||
if (!d->m_fileContentMap.contains(fileContentId))
|
||||
{
|
||||
ERROR_LOG(m_logger) << LOGFUNCTION << " fileContentId unknown, fileContentId=" << fileContentId;
|
||||
ERROR_LOG() << Q_FUNC_INFO << " fileContentId unknown, fileContentId=" << fileContentId;
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -218,7 +218,7 @@ void FlmSubscriber::onGetFileContentDataReply(const FileManagement::GetFileConte
|
||||
const QString &operatorName = fcData.operatorName;
|
||||
const qint64 lastModified = fcData.lastModified;
|
||||
|
||||
DEBUG_LOG(m_logger) << LOGFUNCTION
|
||||
DEBUG_LOG() << Q_FUNC_INFO
|
||||
<< " fileContentId=" << fileContentId
|
||||
<< " name=" << name
|
||||
<< " operatorName=" << operatorName
|
||||
@@ -234,7 +234,7 @@ void FlmSubscriber::onGetFileContentDataReply(const FileManagement::GetFileConte
|
||||
QImage image;
|
||||
if (!svgToImage(QByteArray::fromRawData(reinterpret_cast<const char*>(&reply.content().at(0)), reply.content().size()), image))
|
||||
{
|
||||
ERROR_LOG(m_logger) << LOGFUNCTION << " svgToImage failed, fileContentId=" << fileContentId;
|
||||
ERROR_LOG() << Q_FUNC_INFO << " svgToImage failed, fileContentId=" << fileContentId;
|
||||
fcData.monitoring.replyState = FileContentStruct::ReplyFailure;
|
||||
return;
|
||||
}
|
||||
@@ -265,7 +265,7 @@ void FlmSubscriber::onGetFileContentDataReply(const FileManagement::GetFileConte
|
||||
}
|
||||
else
|
||||
{
|
||||
ERROR_LOG(m_logger) << LOGFUNCTION << " xmlSymbolContent is empty, fileContentId=" << fileContentId;
|
||||
ERROR_LOG() << Q_FUNC_INFO << " xmlSymbolContent is empty, fileContentId=" << fileContentId;
|
||||
fcData.monitoring.replyState = FileContentStruct::ReplyFailure;
|
||||
}
|
||||
break;
|
||||
@@ -273,24 +273,24 @@ void FlmSubscriber::onGetFileContentDataReply(const FileManagement::GetFileConte
|
||||
|
||||
case FileContentStruct::SymbolType::UnsupportedSymbol:
|
||||
{
|
||||
ERROR_LOG(m_logger) << LOGFUNCTION << " unsupported symbol found, fileContentId=" << fileContentId;
|
||||
ERROR_LOG() << Q_FUNC_INFO << " unsupported symbol found, fileContentId=" << fileContentId;
|
||||
fcData.monitoring.replyState = FileContentStruct::ReplyFailure;
|
||||
break;
|
||||
}
|
||||
|
||||
}
|
||||
TRACE_LOG(m_logger) << LOGFUNCTION << " END";
|
||||
TRACE_LOG() << Q_FUNC_INFO << " END";
|
||||
}
|
||||
|
||||
bool FlmSubscriber::svgToImage(const QByteArray &svgByteArray, QImage &imageOut)
|
||||
{
|
||||
TRACE_LOG(m_logger) << LOGFUNCTION << " START";
|
||||
TRACE_LOG() << Q_FUNC_INFO << " START";
|
||||
|
||||
|
||||
QSvgRenderer svgRenderer;
|
||||
if (!svgRenderer.load(svgByteArray))
|
||||
{
|
||||
ERROR_LOG(m_logger) << LOGFUNCTION << " svgRenderer.load failed";
|
||||
ERROR_LOG() << Q_FUNC_INFO << " svgRenderer.load failed";
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -304,7 +304,7 @@ bool FlmSubscriber::svgToImage(const QByteArray &svgByteArray, QImage &imageOut)
|
||||
svgRenderer.render(&painter);
|
||||
painter.end();
|
||||
|
||||
TRACE_LOG(m_logger) << LOGFUNCTION << " END";
|
||||
TRACE_LOG() << Q_FUNC_INFO << " END";
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -361,7 +361,7 @@ void FlmSubscriber::checkForReFetching()
|
||||
;
|
||||
FileManagement::GetFileContentDataRequest request(fileContentId);
|
||||
if (!d->m_flmFtc->getFileContentDataRequest(request, this))
|
||||
ERROR_LOG(logger) << LOGFUNCTION << "Error reading FileContentData, fileContentId=" << fileContentId;
|
||||
ERROR_LOG(logger) << Q_FUNC_INFO << "Error reading FileContentData, fileContentId=" << fileContentId;
|
||||
|
||||
fcs.monitoring.replyState = FileContentStruct::Requested;
|
||||
fcs.monitoring.requestTime = getRequestTime();
|
||||
@@ -383,7 +383,7 @@ void FlmSubscriber::checkForReFetching()
|
||||
|
||||
void FlmSubscriber::onFileContentChanged(const FileManagement::FileContent &data, DataModification modType)
|
||||
{
|
||||
TRACE_LOG(m_logger) << LOGFUNCTION
|
||||
TRACE_LOG() << Q_FUNC_INFO
|
||||
<< " data.id=" << data.id()
|
||||
<< " data.fileStatus=" << data.fileStatus().underlying()
|
||||
<< " modType=" << modType
|
||||
@@ -432,13 +432,13 @@ void FlmSubscriber::onFileContentChanged(const FileManagement::FileContent &data
|
||||
|
||||
FileManagement::GetFileContentDataRequest request(fileContentId);
|
||||
if (!d->m_flmFtc->getFileContentDataRequest(request, this))
|
||||
ERROR_LOG(m_logger) << LOGFUNCTION << "Error reading FileContentData, fileContentId=" << fileContentId;
|
||||
ERROR_LOG() << Q_FUNC_INFO << "Error reading FileContentData, fileContentId=" << fileContentId;
|
||||
break;
|
||||
}
|
||||
|
||||
case DataModification::eRemoved:
|
||||
{
|
||||
DEBUG_LOG(m_logger) << LOGFUNCTION
|
||||
DEBUG_LOG() << Q_FUNC_INFO
|
||||
<< " modType=" << modType
|
||||
<< " fileContentId=" << fileContentId
|
||||
<< " fileContentName=" << data.name();
|
||||
@@ -448,7 +448,7 @@ void FlmSubscriber::onFileContentChanged(const FileManagement::FileContent &data
|
||||
|
||||
|
||||
if (!d->m_symbolProxy.removeSymbol(fileContentId))
|
||||
ERROR_LOG(m_logger) << LOGFUNCTION << " removeSymbol failed"
|
||||
ERROR_LOG() << Q_FUNC_INFO << " removeSymbol failed"
|
||||
<< " fileContentId=" << fileContentId
|
||||
<< " fileContentName='" << data.name() << "'"
|
||||
<< " contains=" << d->m_fileContentMap.contains(fileContentId);
|
||||
@@ -460,7 +460,7 @@ void FlmSubscriber::onFileContentChanged(const FileManagement::FileContent &data
|
||||
|
||||
void FlmSubscriber::updateFileContentMap(const FileManagement::FileContent &data)
|
||||
{
|
||||
TRACE_LOG(m_logger) << LOGFUNCTION << " START"
|
||||
TRACE_LOG() << Q_FUNC_INFO << " START"
|
||||
<< " d->m_fileContentMap.size()=" << d->m_fileContentMap.size()
|
||||
<< " fileContentId=" << data.id()
|
||||
<< " data.isDeleted()=" <<data.isDeleted()
|
||||
@@ -534,7 +534,7 @@ void FlmSubscriber::updateFileContentMap(const FileManagement::FileContent &data
|
||||
}
|
||||
|
||||
} else {
|
||||
ERROR_LOG(m_logger) << LOGFUNCTION
|
||||
ERROR_LOG() << Q_FUNC_INFO
|
||||
<< " QJsonParseError->errorString: '" << parseError.errorString() << "'"
|
||||
<< ", offset: " << parseError.offset;
|
||||
}
|
||||
@@ -542,7 +542,7 @@ void FlmSubscriber::updateFileContentMap(const FileManagement::FileContent &data
|
||||
|
||||
d->m_fileContentMap[fileContentId] = fcData;
|
||||
|
||||
TRACE_LOG(m_logger) << LOGFUNCTION << " END"
|
||||
TRACE_LOG() << Q_FUNC_INFO << " END"
|
||||
<< " d->m_fileContentMap.size()=" << d->m_fileContentMap.size()
|
||||
<< " fileContentId=" << data.id()
|
||||
<< " data.isDeleted()=" <<data.isDeleted()
|
||||
@@ -573,7 +573,7 @@ void FlmSubscriber::onLocalSymbolProxyEtsSymbolRemoved(qint32 fileContentId, con
|
||||
{
|
||||
AdvancedSymbology::SymbolDictionary &dict =
|
||||
AdvancedSymbology::SymbolDictionary::dictionary(symbologyType);
|
||||
INFO_LOG(m_logger) << LOGFUNCTION << " dict.removeEtsSymbol:"
|
||||
INFO_LOG() << Q_FUNC_INFO << " dict.removeEtsSymbol:"
|
||||
<< " symbologyType='" << (int)symbologyType << "'"
|
||||
<< ", name='" << name << "'"
|
||||
<< ", fileContentId=" << fileContentId;
|
||||
@@ -589,7 +589,7 @@ void FlmSubscriber::onLocalSymbolProxyXmlSymbolAdded(qint32 fileContentId,
|
||||
const QString &xmlContent,
|
||||
const QStringList &usrTags)
|
||||
{
|
||||
TRACE_LOG(m_logger) << LOGFUNCTION << " START"
|
||||
TRACE_LOG() << Q_FUNC_INFO << " START"
|
||||
<< " fileContentId=" << fileContentId
|
||||
<< " name='" << name << "'";
|
||||
|
||||
@@ -600,25 +600,25 @@ void FlmSubscriber::onLocalSymbolProxyXmlSymbolAdded(qint32 fileContentId,
|
||||
AdvancedSymbology::SymbolDictionary &dict =
|
||||
AdvancedSymbology::SymbolDictionary::dictionary(symbologyType);
|
||||
if (!this->setXmlSymbolToDict(dict, fileContentId, operatorName, lastModified, name, xmlContent, usrTags))
|
||||
ERROR_LOG(m_logger) << LOGFUNCTION << " dict.setXmlSymbolToDict failed"
|
||||
ERROR_LOG() << Q_FUNC_INFO << " dict.setXmlSymbolToDict failed"
|
||||
<< ", symbologyType='" << (int)symbologyType << "'"
|
||||
<< ", name='" << name << "'";
|
||||
}
|
||||
}
|
||||
TRACE_LOG(m_logger) << LOGFUNCTION << " END"
|
||||
TRACE_LOG() << Q_FUNC_INFO << " END"
|
||||
<< " fileContentId=" << fileContentId
|
||||
<< " name='" << name << "'";
|
||||
}
|
||||
|
||||
void FlmSubscriber::onLocalSymbolProxyXmlSymbolRemoved(qint32 fileContentId)
|
||||
{
|
||||
TRACE_LOG(m_logger) << LOGFUNCTION << " START" << " fileContentId=" << fileContentId;
|
||||
TRACE_LOG() << Q_FUNC_INFO << " START" << " fileContentId=" << fileContentId;
|
||||
|
||||
for (const SymbologyType &symbologyType : std::as_const(d->m_symbolDictionaryToUpdate))
|
||||
{
|
||||
AdvancedSymbology::SymbolDictionary &dict =
|
||||
AdvancedSymbology::SymbolDictionary::dictionary(symbologyType);
|
||||
DEBUG_LOG(m_logger) << LOGFUNCTION << " dict.removeXmlSymbol:"
|
||||
DEBUG_LOG() << Q_FUNC_INFO << " dict.removeXmlSymbol:"
|
||||
<< " symbologyType='" << symbologyType << "'"
|
||||
<< ", fileContentId=" << fileContentId;
|
||||
|
||||
@@ -627,7 +627,7 @@ void FlmSubscriber::onLocalSymbolProxyXmlSymbolRemoved(qint32 fileContentId)
|
||||
dict.removeXmlSymbol(sidc);
|
||||
dict.removeXmlSymbol(fileContentId);
|
||||
}
|
||||
TRACE_LOG(m_logger) << LOGFUNCTION << " END" << " fileContentId=" << fileContentId;
|
||||
TRACE_LOG() << Q_FUNC_INFO << " END" << " fileContentId=" << fileContentId;
|
||||
}
|
||||
|
||||
|
||||
@@ -638,7 +638,7 @@ void FlmSubscriber::onLocalSymbolProxyXmlSymbolRemoved(qint32 fileContentId)
|
||||
bool FlmSubscriber::connectFlmSymbolProxy(int type_placeholder, SymbologyType symbologyType)
|
||||
{
|
||||
Q_UNUSED(type_placeholder);
|
||||
TRACE_LOG(m_logger) << LOGFUNCTION << " m_fileContentMap.size()=" << d->m_fileContentMap.size() ;
|
||||
TRACE_LOG() << Q_FUNC_INFO << " m_fileContentMap.size()=" << d->m_fileContentMap.size() ;
|
||||
|
||||
d->m_symbolDictionaryToUpdate.insert(symbologyType);
|
||||
|
||||
@@ -701,12 +701,12 @@ bool FlmSubscriber::setEtsSymbolToDict(SymbolDictionary &dict,
|
||||
|
||||
if (!dict.setEtsSymbol(fileContentId, symProps.sidc(), symProps, image))
|
||||
{
|
||||
ERROR_LOG(m_logger) << LOGFUNCTION << " dict.insertExtraSymbol failed"
|
||||
ERROR_LOG() << Q_FUNC_INFO << " dict.insertExtraSymbol failed"
|
||||
<< ", fileContentId=" << fileContentId << ", name='" << name << "'";
|
||||
return false;
|
||||
}
|
||||
else
|
||||
INFO_LOG(m_logger) << LOGFUNCTION << " dict.insertExtraSymbol done"
|
||||
INFO_LOG() << Q_FUNC_INFO << " dict.insertExtraSymbol done"
|
||||
<< ", fileContentId=" << fileContentId << ", name='" << name << "'";
|
||||
|
||||
return true;
|
||||
@@ -731,7 +731,7 @@ bool FlmSubscriber::setXmlSymbolToDict(SymbolDictionary &dict,
|
||||
bool success = dict.setXmlSymbol(fileContentId, name, operatorName, lastModified, xmlContent, symProps);
|
||||
|
||||
if (!success)
|
||||
ERROR_LOG(m_logger) << LOGFUNCTION << " setXmlSymbol failed:"
|
||||
ERROR_LOG() << Q_FUNC_INFO << " setXmlSymbol failed:"
|
||||
<< ", file-id=" << fileContentId
|
||||
<< ", filenameid='" << name << "'";
|
||||
return success;
|
||||
|
||||
+1
-3
@@ -85,9 +85,7 @@ protected:
|
||||
|
||||
void checkForReFetching();
|
||||
|
||||
private:
|
||||
LOGGER_T m_logger;
|
||||
|
||||
private:
|
||||
struct Private;
|
||||
|
||||
|
||||
|
||||
Reference in new issue
Block a user