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
@@ -14,7 +14,6 @@
|
||||
NGLMainWindow::NGLMainWindow(QWidget *parent)
|
||||
: QMainWindow(parent)
|
||||
, m_helpProcess(nullptr)
|
||||
, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger().getNGLLogger("NGLMainWindow"))
|
||||
, m_versionView(nullptr)
|
||||
, m_menuBar(new QMenuBar(this))
|
||||
{
|
||||
@@ -46,7 +45,7 @@ void NGLMainWindow::onHelpIndex()
|
||||
void NGLMainWindow::onInvokeHelp(const QString &helpContext)
|
||||
{
|
||||
|
||||
DEBUG_LOG(m_logger) << "onInvokeHelp " << helpContext ;
|
||||
DEBUG_LOG() << "onInvokeHelp " << helpContext ;
|
||||
|
||||
if (!m_helpProcess)
|
||||
{
|
||||
@@ -61,11 +60,11 @@ void NGLMainWindow::onInvokeHelp(const QString &helpContext)
|
||||
args << QLatin1String("-collectionFile")
|
||||
<< QCoreApplication::applicationDirPath() + QLatin1String("/../help/scms/") + fn
|
||||
<< QLatin1String("-enableRemoteControl");
|
||||
DEBUG_LOG(m_logger) << "Attempting to invoke help at URL: " << args.join(QLatin1String(" ")) ;
|
||||
DEBUG_LOG() << "Attempting to invoke help at URL: " << args.join(QLatin1String(" ")) ;
|
||||
m_helpProcess->start(QLibraryInfo::path(QLibraryInfo::BinariesPath) + QLatin1String("/assistant"), args);
|
||||
if (!m_helpProcess->waitForStarted())
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Could not start help browser (error: "
|
||||
ERROR_LOG() << "Could not start help browser (error: "
|
||||
<< m_helpProcess->error()
|
||||
<< " )" ;
|
||||
delete m_helpProcess;
|
||||
@@ -85,7 +84,7 @@ void NGLMainWindow::onHelpFinished(int exitCode, QProcess::ExitStatus exitStatus
|
||||
{
|
||||
if (exitStatus != QProcess::NormalExit)
|
||||
{
|
||||
WARNING_LOG(m_logger) << "help browser exited with status "
|
||||
WARNING_LOG() << "help browser exited with status "
|
||||
<< exitStatus << " code "
|
||||
<< exitCode << "!" ;
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user