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
@@ -40,7 +40,7 @@ bool CopyDatabase::doCopy()
|
||||
{
|
||||
if (!runPgDump())
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Error running pg_dump";
|
||||
ERROR_LOG() << "Error running pg_dump";
|
||||
emit copyDbFailed();
|
||||
return false;
|
||||
}
|
||||
@@ -74,7 +74,7 @@ void CopyDatabase::onDropDbFinished(int exitCode, QProcess::ExitStatus exitStatu
|
||||
|
||||
if (exitCode > 0)
|
||||
{
|
||||
ERROR_LOG(m_logger) << "DropDb failed";
|
||||
ERROR_LOG() << "DropDb failed";
|
||||
emit dropDatabaseFailed();
|
||||
return;
|
||||
}
|
||||
@@ -129,7 +129,7 @@ void CopyDatabase::onCreateDbFinished(int exitCode, QProcess::ExitStatus exitSta
|
||||
|
||||
if (exitCode > 0)
|
||||
{
|
||||
ERROR_LOG(m_logger) << "CreateDB failed";
|
||||
ERROR_LOG() << "CreateDB failed";
|
||||
emit copyDbFailed();
|
||||
return;
|
||||
}
|
||||
@@ -179,7 +179,7 @@ void CopyDatabase::onPgLoadFinished(int exitCode, QProcess::ExitStatus exitStatu
|
||||
|
||||
if (exitCode > 0)
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Loading db failed";
|
||||
ERROR_LOG() << "Loading db failed";
|
||||
emit copyDbFailed();
|
||||
return;
|
||||
}
|
||||
@@ -207,7 +207,7 @@ void CopyDatabase::onPgSetGrantFinished(int exitCode, QProcess::ExitStatus exitS
|
||||
|
||||
if (exitCode > 0)
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Set grants to ets_admin failed";
|
||||
ERROR_LOG() << "Set grants to ets_admin failed";
|
||||
emit copyDbFailed();
|
||||
return;
|
||||
}
|
||||
@@ -241,7 +241,7 @@ void CopyDatabase::handleProcFinished(int exitCode, QProcess::ExitStatus exitSta
|
||||
if (!out.isEmpty())
|
||||
out += '\n';
|
||||
out += m_proc->readAllStandardOutput();
|
||||
ERROR_LOG(m_logger) << "Process finished - exitCode: " << exitCode << ", exitStatus = " << exitStatus << ", " << out;
|
||||
ERROR_LOG() << "Process finished - exitCode: " << exitCode << ", exitStatus = " << exitStatus << ", " << out;
|
||||
}
|
||||
m_proc->disconnect(this);
|
||||
m_proc->deleteLater();
|
||||
@@ -250,7 +250,7 @@ void CopyDatabase::handleProcFinished(int exitCode, QProcess::ExitStatus exitSta
|
||||
|
||||
void CopyDatabase::onErrorOccured(QProcess::ProcessError error)
|
||||
{
|
||||
ERROR_LOG(m_logger) << "error: " << error << ", " << m_proc->readAllStandardOutput() << ", " << m_proc->readAllStandardError();
|
||||
ERROR_LOG() << "error: " << error << ", " << m_proc->readAllStandardOutput() << ", " << m_proc->readAllStandardError();
|
||||
}
|
||||
|
||||
QString CopyDatabase::getDumpFile() const
|
||||
@@ -263,7 +263,7 @@ QString CopyDatabase::executablePath(const QString &program)
|
||||
QString errStr;
|
||||
const QString ret = NGL::postgresExecutablePath(program, errStr);
|
||||
if (!errStr.isEmpty())
|
||||
WARNING_LOG(m_logger) << errStr;
|
||||
WARNING_LOG() << errStr;
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user