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
+34
-35
@@ -68,7 +68,7 @@
|
||||
#endif
|
||||
|
||||
#ifndef ELOG
|
||||
#define ELOG ERROR_LOG(m_logger)
|
||||
#define ELOG ERROR_LOG()
|
||||
#endif
|
||||
|
||||
|
||||
@@ -374,7 +374,6 @@ USBDialog::USBDialog(LtsSession::LtsSession *session, QWidget *parent)
|
||||
|
||||
, m_exerciseId(m_session->exerciseId())
|
||||
, m_paths(0)
|
||||
, m_logger(getLogger("USBDialog"))
|
||||
{
|
||||
m_ui->setupUi(this);
|
||||
|
||||
@@ -432,7 +431,7 @@ void USBDialog::initUsbModel()
|
||||
if (!m_usbThpModel->init(m_usbRoot))
|
||||
{
|
||||
new LtsWidgets::LtsMessageDialogNew(this, tr("The directory '%1' doesn't contain valid THP data.").arg(m_usbRoot));
|
||||
ERROR_LOG(m_logger) << "cannot initialize usb thp model from usb root" << m_usbRoot;
|
||||
ERROR_LOG() << "cannot initialize usb thp model from usb root" << m_usbRoot;
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -520,14 +519,14 @@ void USBDialog::slotChangePath()
|
||||
if (!m_usbThpModel->createDataJson(m_usbRoot, exmDtc, asmDtc, m_exerciseId))
|
||||
{
|
||||
|
||||
ERROR_LOG(m_logger) << "Failed to initialize data.json";
|
||||
ERROR_LOG() << "Failed to initialize data.json";
|
||||
return;
|
||||
}
|
||||
|
||||
TMP_WARNING_LOG(m_logger) << "DONE!";
|
||||
TMP_WARNING_LOG() << "DONE!";
|
||||
}
|
||||
else
|
||||
TMP_WARNING_LOG(m_logger) << "Failed to get dtcs :( !";
|
||||
TMP_WARNING_LOG() << "Failed to get dtcs :( !";
|
||||
});
|
||||
|
||||
return;
|
||||
@@ -551,7 +550,7 @@ void USBDialog::slotCopyMaps()
|
||||
|
||||
if (!dstDir.exists())
|
||||
{
|
||||
ERROR_LOG(m_logger) << "dst dir " << m_usbRoot << " is not accessible";
|
||||
ERROR_LOG() << "dst dir " << m_usbRoot << " is not accessible";
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -560,7 +559,7 @@ void USBDialog::slotCopyMaps()
|
||||
return;
|
||||
|
||||
|
||||
DEBUG_LOG(m_logger) << "mil.size()" << mil.size();
|
||||
DEBUG_LOG() << "mil.size()" << mil.size();
|
||||
|
||||
|
||||
|
||||
@@ -603,13 +602,13 @@ void USBDialog::onNextMap()
|
||||
auto path = m_files.firstKey();
|
||||
{
|
||||
QString src(path);
|
||||
DEBUG_LOG(m_logger) << "src" << src;
|
||||
DEBUG_LOG() << "src" << src;
|
||||
|
||||
QDir srcDir(src);
|
||||
|
||||
if (!srcDir.exists())
|
||||
{
|
||||
ERROR_LOG(m_logger) << "src dir " << src << " is not accessible";
|
||||
ERROR_LOG() << "src dir " << src << " is not accessible";
|
||||
return;
|
||||
}
|
||||
QDir dstDir(getContentFolder(m_usbRoot) + QDir::separator() + QStringLiteral("Maps"));
|
||||
@@ -711,12 +710,12 @@ void USBDialog::generateLayerMappingXML()
|
||||
|
||||
if (!layersMapping.open(QIODevice::WriteOnly))
|
||||
{
|
||||
WARNING_LOG(m_logger) << "Couldn't open save file.";
|
||||
WARNING_LOG() << "Couldn't open save file.";
|
||||
return;
|
||||
}
|
||||
if (!layersMappingAtMaps.open(QIODevice::WriteOnly))
|
||||
{
|
||||
WARNING_LOG(m_logger) << "Couldn't open save file in folder Maps.";
|
||||
WARNING_LOG() << "Couldn't open save file in folder Maps.";
|
||||
return;
|
||||
}
|
||||
QJsonDocument doc(layers);
|
||||
@@ -764,13 +763,13 @@ void USBDialog::slotCopyWinBin()
|
||||
|
||||
if (!srcDir.exists())
|
||||
{
|
||||
ERROR_LOG(m_logger) << "src dir " << src << " is not accessible";
|
||||
ERROR_LOG() << "src dir " << src << " is not accessible";
|
||||
return;
|
||||
}
|
||||
|
||||
QFileInfoList fil;
|
||||
fil = prepareFileInfoListForFolder(src, fil);
|
||||
DEBUG_LOG(m_logger) << "XXXXXXXXXXX filsize is: " << fil.size();
|
||||
DEBUG_LOG() << "XXXXXXXXXXX filsize is: " << fil.size();
|
||||
|
||||
auto cp = new CopyProcess(srcDir, dstDir, fil, false, this);
|
||||
setOverlay(cp->process());
|
||||
@@ -805,19 +804,19 @@ void USBDialog::slotCopyWinBinP2()
|
||||
|
||||
if (initFilePath.isEmpty())
|
||||
{
|
||||
ERROR_LOG(m_logger) << "sitmap init is not accessible";
|
||||
ERROR_LOG() << "sitmap init is not accessible";
|
||||
return;
|
||||
}
|
||||
|
||||
QFileInfo fileInfo(initFilePath);
|
||||
QFileInfoList fil2;
|
||||
fil2.append(fileInfo);
|
||||
DEBUG_LOG(m_logger) << "XXXXXXXXXXX sitmap is: " << fileInfo.absoluteFilePath();
|
||||
ERROR_LOG(m_logger) << "XXXXXXXXXXX filsize is: " << fil2.size();
|
||||
DEBUG_LOG() << "XXXXXXXXXXX sitmap is: " << fileInfo.absoluteFilePath();
|
||||
ERROR_LOG() << "XXXXXXXXXXX filsize is: " << fil2.size();
|
||||
|
||||
|
||||
const QDir dstDir2(dstDir.absolutePath() + QDir::separator() + QStringLiteral("thp") + QDir::separator() + QStringLiteral("share") + QDir::separator() + QStringLiteral("LTS") + QDir::separator() + QStringLiteral("situation_Map")) ;
|
||||
DEBUG_LOG(m_logger) << "XXXXXXXXXXX sitmap dst is: " << dstDir2.absolutePath();
|
||||
DEBUG_LOG() << "XXXXXXXXXXX sitmap dst is: " << dstDir2.absolutePath();
|
||||
|
||||
auto cp2 = new CopyProcess(fileInfo.absoluteDir(), dstDir2, fil2, false, this);
|
||||
setOverlay(cp2->process());
|
||||
@@ -850,15 +849,15 @@ void USBDialog::slotCopyWinBinP3()
|
||||
const QString autorunFile = NGL::findFile(NGL::FileType::ConfigFile, QStringLiteral("autorun.inf"));
|
||||
if (autorunFile.isEmpty())
|
||||
{
|
||||
ERROR_LOG(m_logger) << "autorunFile init is not accessible";
|
||||
ERROR_LOG() << "autorunFile init is not accessible";
|
||||
return;
|
||||
}
|
||||
|
||||
QFileInfo fileInfo2(autorunFile);
|
||||
QFileInfoList fil;
|
||||
fil = prepareFileInfoListForFolder(fileInfo2.absoluteDir().path(), fil);
|
||||
DEBUG_LOG(m_logger) << "XXXXXXXXXXX autofinFile is: " << fileInfo2.absoluteDir().path();
|
||||
DEBUG_LOG(m_logger) << "XXXXXXXXXXX filsize is: " << fil.size();
|
||||
DEBUG_LOG() << "XXXXXXXXXXX autofinFile is: " << fileInfo2.absoluteDir().path();
|
||||
DEBUG_LOG() << "XXXXXXXXXXX filsize is: " << fil.size();
|
||||
|
||||
auto cp3 = new CopyProcess(fileInfo2.absoluteDir(), dstDir, fil, false, this);
|
||||
setOverlay(cp3->process());
|
||||
@@ -1207,7 +1206,7 @@ void USBDialog::scriptDeleted(int scriptId)
|
||||
const QFileInfoList fil(dir.entryInfoList());
|
||||
if (fil.isEmpty())
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "no scripts left";
|
||||
DEBUG_LOG() << "no scripts left";
|
||||
|
||||
|
||||
|
||||
@@ -1221,7 +1220,7 @@ void USBDialog::scriptDeleted(int scriptId)
|
||||
}
|
||||
catch (const QString &str)
|
||||
{
|
||||
ERROR_LOG(m_logger) << "ExerciseJsonHandler failed: " << str;
|
||||
ERROR_LOG() << "ExerciseJsonHandler failed: " << str;
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -1235,7 +1234,7 @@ void USBDialog::scriptDeleted(int scriptId)
|
||||
}
|
||||
catch (const QString &str)
|
||||
{
|
||||
ERROR_LOG(m_logger) << "DataJsonHandler failed: " << str;
|
||||
ERROR_LOG() << "DataJsonHandler failed: " << str;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1277,7 +1276,7 @@ void USBDialog::scriptCopied(int )
|
||||
}
|
||||
catch (const QString &str)
|
||||
{
|
||||
ERROR_LOG(m_logger) << "DataJsonHandler failed: " << str;
|
||||
ERROR_LOG() << "DataJsonHandler failed: " << str;
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -1320,7 +1319,7 @@ void USBDialog::slotCopy()
|
||||
|
||||
if (!dstDir.exists())
|
||||
{
|
||||
ERROR_LOG(m_logger) << "dst dir " << m_usbRoot << " is not accessible";
|
||||
ERROR_LOG() << "dst dir " << m_usbRoot << " is not accessible";
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -1328,7 +1327,7 @@ void USBDialog::slotCopy()
|
||||
|
||||
if (!dstDir.mkpath(dstDir.absolutePath()))
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Could not create destination path " << dstDir.absolutePath();
|
||||
ERROR_LOG() << "Could not create destination path " << dstDir.absolutePath();
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -1344,14 +1343,14 @@ void USBDialog::slotCopy()
|
||||
return;
|
||||
|
||||
QString src(getScriptFolder(esi.rootDirectory, esi.exerciseId, esi.scriptId));
|
||||
DEBUG_LOG(m_logger) << "src" << src;
|
||||
DEBUG_LOG() << "src" << src;
|
||||
|
||||
QDir srcDir(src);
|
||||
QDir bldgDir( QStringLiteral("%1/BuildingModels").arg(getContentFolder(esi.rootDirectory, esi.exerciseId)));
|
||||
|
||||
if (!srcDir.exists())
|
||||
{
|
||||
ERROR_LOG(m_logger) << "src dir " << src << " is not accessible";
|
||||
ERROR_LOG() << "src dir " << src << " is not accessible";
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -1373,7 +1372,7 @@ void USBDialog::slotCopy()
|
||||
|
||||
new LtsWidgets::LtsMessageDialogNew(this, tr("The files were copied successfully"));
|
||||
|
||||
TMP_WARNING_LOG(m_logger) << "GO GO GO";
|
||||
TMP_WARNING_LOG() << "GO GO GO";
|
||||
ExportedScriptInformation esi2(esi);
|
||||
esi2.rootDirectory = m_usbRoot;
|
||||
m_localThpModel->addDownloadData(esi2);
|
||||
@@ -1396,7 +1395,7 @@ void USBDialog::slotRemove()
|
||||
return;
|
||||
|
||||
|
||||
DEBUG_LOG(m_logger) << "mil.size()" << mil.size();
|
||||
DEBUG_LOG() << "mil.size()" << mil.size();
|
||||
|
||||
|
||||
for (const QModelIndex &idx : mil)
|
||||
@@ -1422,7 +1421,7 @@ void USBDialog::slotRemoveMaps()
|
||||
|
||||
if (!dir.exists())
|
||||
{
|
||||
ERROR_LOG(m_logger) << "dir " << m_usbRoot << " is not accessible";
|
||||
ERROR_LOG() << "dir " << m_usbRoot << " is not accessible";
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -1431,12 +1430,12 @@ void USBDialog::slotRemoveMaps()
|
||||
return;
|
||||
|
||||
|
||||
DEBUG_LOG(m_logger) << "mil.size()" << mil.size();
|
||||
DEBUG_LOG() << "mil.size()" << mil.size();
|
||||
|
||||
|
||||
for (const QModelIndex &idx : mil)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "rm" << idx.data().toString();
|
||||
DEBUG_LOG() << "rm" << idx.data().toString();
|
||||
QFile::remove(dir.absolutePath() + QDir::separator() + idx.data().toString());
|
||||
}
|
||||
|
||||
@@ -1516,7 +1515,7 @@ void USBDialog::retranslate()
|
||||
|
||||
void USBDialog::initModel()
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "(re)initModel !!";
|
||||
DEBUG_LOG() << "(re)initModel !!";
|
||||
|
||||
|
||||
|
||||
|
||||
-1
@@ -122,7 +122,6 @@ private:
|
||||
QMap<QString, QFileInfoList> m_files;
|
||||
|
||||
QString m_usbRoot;
|
||||
NGL::INGLLogger &m_logger;
|
||||
int m_finished_mapCopys;
|
||||
};
|
||||
}
|
||||
Reference in new issue
Block a user