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
+1
-1
@@ -21,7 +21,7 @@ ELSE(WIN32)
|
||||
XDR_DirHandler_linux.h
|
||||
)
|
||||
ENDIF(WIN32)
|
||||
NGL_ADD_LIBRARY(AAR SV xdr_qthandler_dir SHARED ${xdr_dh_SRCS} ${xdr_dh_HDRS})
|
||||
NGL_ADD_LIBRARY2(AAR SV xdr_qthandler_dir SHARED ${xdr_dh_SRCS} ${xdr_dh_HDRS})
|
||||
NGL_TARGET_LINK_LIBRARIES(xdr_qthandler_dir
|
||||
PRIVATE
|
||||
NGLLogger
|
||||
|
||||
-1
@@ -68,7 +68,6 @@ protected:
|
||||
protected:
|
||||
bool m_bRetvalOnError;
|
||||
QString m_txDir;
|
||||
NGL::INGLLogger &m_logger;
|
||||
};
|
||||
|
||||
}
|
||||
+6
-6
@@ -44,7 +44,7 @@ void DirectoryCleaner::doInitialCleanup(const QString &directory)
|
||||
QDir d(directory);
|
||||
if (!d.exists())
|
||||
{
|
||||
WARNING_LOG(m_logger) << "Directory " << directory
|
||||
WARNING_LOG() << "Directory " << directory
|
||||
<< " does not exist - can not cleanup directory";
|
||||
return;
|
||||
}
|
||||
@@ -113,7 +113,7 @@ void DirectoryCleanerWorker::doCleanup()
|
||||
if (!d.exists())
|
||||
{
|
||||
if (!m_bWarnedOnce)
|
||||
WARNING_LOG(m_logger) << "Directory " << m_directory
|
||||
WARNING_LOG() << "Directory " << m_directory
|
||||
<< " does not exist - can not cleanup directory";
|
||||
m_bWarnedOnce = true;
|
||||
return;
|
||||
@@ -127,12 +127,12 @@ void DirectoryCleanerWorker::doCleanup()
|
||||
const QString filename(it.fileName());
|
||||
bool bOk = false;
|
||||
qint64 timestampUSec = filename.toLongLong(&bOk);
|
||||
TRACE_LOG(m_logger) << "File: " << filename
|
||||
TRACE_LOG() << "File: " << filename
|
||||
<< " timestamp: " << timestampUSec
|
||||
<< " remove time: " << tRemoveTimeMSec * 1000;
|
||||
if (!bOk)
|
||||
{
|
||||
WARNING_LOG(m_logger) << "Found file with name '" << filepath
|
||||
WARNING_LOG() << "Found file with name '" << filepath
|
||||
<< " which is not a valid xdr filename"
|
||||
<< " - removing this file when mtime older than "
|
||||
<< m_maxAgeSec << "seconds";
|
||||
@@ -146,9 +146,9 @@ void DirectoryCleanerWorker::doCleanup()
|
||||
if (timestampMSec < tRemoveTimeMSec)
|
||||
{
|
||||
if (!QFile::remove(filepath))
|
||||
WARNING_LOG(m_logger) << "Could not remove " << filepath;
|
||||
WARNING_LOG() << "Could not remove " << filepath;
|
||||
else
|
||||
TRACE_LOG(m_logger) << "Removed " << filepath;
|
||||
TRACE_LOG() << "Removed " << filepath;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
-2
@@ -23,7 +23,6 @@ private:
|
||||
bool teleShouldBeRemoved(int teleId);
|
||||
QThread *m_cleanerThread;
|
||||
DirectoryCleanerWorker *m_worker;
|
||||
NGL::INGLLogger &m_logger;
|
||||
};
|
||||
|
||||
class DirectoryCleanerWorker: public QObject
|
||||
@@ -40,6 +39,5 @@ private:
|
||||
QString m_directory;
|
||||
qint64 m_maxAgeSec;
|
||||
bool m_bWarnedOnce;
|
||||
NGL::INGLLogger &m_logger;
|
||||
};
|
||||
}
|
||||
+1
-1
@@ -5,7 +5,7 @@
|
||||
|
||||
#include <QObject>
|
||||
#include <TrainingAreaBase/tab_plugin_interface.h>
|
||||
#include <DDS/Core/function_reply_object.h>
|
||||
#include <DDS/Core/core_types.h>
|
||||
#include "../TetraJson/convert_from_json.h"
|
||||
#include "convert_to_json_file.h"
|
||||
|
||||
|
||||
Reference in new issue
Block a user