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
@@ -73,7 +73,6 @@ LogViewGui::LogViewGui(QWidget* a_parent)
|
||||
, m_InjectionThread(nullptr)
|
||||
, m_replayTimer(new QTimer(this))
|
||||
, m_currentReplayRow(-1)
|
||||
, m_logger(getLogger("LogViewGui"))
|
||||
{
|
||||
setWindowIcon(QIcon(QLatin1String(":icons/16x16/rde_16x16.png")));
|
||||
|
||||
@@ -528,7 +527,7 @@ void LogViewGui::onReplayTimerTimeout()
|
||||
return;
|
||||
|
||||
uint64_t nextSendTime = (tele->getLogTimeMsec() - curSendTime);
|
||||
DEBUG_LOG(m_logger) << "Next SendTime: " << nextSendTime
|
||||
DEBUG_LOG() << "Next SendTime: " << nextSendTime
|
||||
<< ", telId: " << tele->getTelId()
|
||||
<< ", next row: " << m_currentReplayRow
|
||||
<< ", equipNo: " << tele->getParticipantId();
|
||||
@@ -546,7 +545,7 @@ void LogViewGui::loadSpecificationFiles()
|
||||
|
||||
QString defString = QCoreApplication::applicationDirPath() + QLatin1String("/training_area_telegrams.h");
|
||||
QString filename = settings.value(LogViewOptionDialog::P0_FILENAME, defString).toString();
|
||||
INFO_LOG(m_logger) << "Load central-protocol spezification-file: " << filename.toStdString();
|
||||
INFO_LOG() << "Load central-protocol spezification-file: " << filename.toStdString();
|
||||
if (!QFile::exists(filename))
|
||||
{
|
||||
QMessageBox::warning(this, tr("LogView"), tr("Die Spezifikations-Datei \'%1\' fuer Zentral-Telegramme existiert nicht!<br><br>Werde die Default-Datei verwenden...").arg(filename));
|
||||
@@ -557,7 +556,7 @@ void LogViewGui::loadSpecificationFiles()
|
||||
|
||||
defString = QCoreApplication::applicationDirPath() + QLatin1String("/zsksxd_tetraForLogView.x");
|
||||
filename = settings.value(LogViewOptionDialog::P5_FILENAME, defString).toString();
|
||||
INFO_LOG(m_logger) << "Load tetra-protocol spezification-file: " << filename.toStdString();
|
||||
INFO_LOG() << "Load tetra-protocol spezification-file: " << filename.toStdString();
|
||||
if (!QFile::exists(filename))
|
||||
{
|
||||
QMessageBox::warning(this, tr("LogView"), tr("Die Spezifikations-Datei \'%1\' fuer TETRA-Telegramme existiert nicht!<br><br>Werde die Default-Datei verwenden...").arg(filename));
|
||||
@@ -566,7 +565,7 @@ void LogViewGui::loadSpecificationFiles()
|
||||
|
||||
LogViewTelegram::tetraParser()->parseX_File(filename);
|
||||
|
||||
INFO_LOG(m_logger) << "Browse telegram-log-file";
|
||||
INFO_LOG() << "Browse telegram-log-file";
|
||||
newTelegramFile();
|
||||
}
|
||||
|
||||
@@ -636,7 +635,7 @@ void LogViewGui::updateLogfile()
|
||||
}
|
||||
catch (const std::exception& e)
|
||||
{
|
||||
WARNING_LOG(m_logger) << "Error: " << e.what();
|
||||
WARNING_LOG() << "Error: " << e.what();
|
||||
|
||||
}
|
||||
}
|
||||
@@ -716,7 +715,7 @@ void LogViewGui::readTelegramsFromLogFile(const QString& a_fileName, const qint6
|
||||
|
||||
if (!telegram->isValid())
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Trying to read/parse unknown data from logfile '" << a_fileName
|
||||
ERROR_LOG() << "Trying to read/parse unknown data from logfile '" << a_fileName
|
||||
<< "' at position " << telegramFile.pos() - (telegramLength + sizeof(lh));
|
||||
continue;
|
||||
}
|
||||
@@ -729,7 +728,7 @@ void LogViewGui::readTelegramsFromLogFile(const QString& a_fileName, const qint6
|
||||
else
|
||||
{
|
||||
QMessageBox::warning(this, tr("Falsche Version"), tr("LogViewer kann Telegramm-Logs der Version %1 nicht einlesen").arg(lh.m_Version));
|
||||
ERROR_LOG(m_logger) << "Trying to read/parse unknown data from logfile '" << a_fileName
|
||||
ERROR_LOG() << "Trying to read/parse unknown data from logfile '" << a_fileName
|
||||
<< "' at position " << telegramFile.pos() - sizeof(lh);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user