diff --git a/qt6-after/qt6-migrated-legatus/AlarmManagement/alm_dtc.h b/qt6-after/qt6-migrated-legatus/AlarmManagement/alm_dtc.h new file mode 100644 index 000000000..e0e3e8edc --- /dev/null +++ b/qt6-after/qt6-migrated-legatus/AlarmManagement/alm_dtc.h @@ -0,0 +1,12 @@ +#pragma once +// STUB-HEADER: Diese Datei wird normalerweise von ddsdtc generiert +// Für die Migration erstellen wir minimale Forward-Declarations + +namespace AlarmManagement +{ +namespace Interface +{ + class Dtc; + class Ftc; +} +} diff --git a/qt6-after/qt6-migrated-legatus/AreaEffectSimulation/aes_dtc.h b/qt6-after/qt6-migrated-legatus/AreaEffectSimulation/aes_dtc.h new file mode 100644 index 000000000..f2053458c --- /dev/null +++ b/qt6-after/qt6-migrated-legatus/AreaEffectSimulation/aes_dtc.h @@ -0,0 +1,12 @@ +#pragma once +// STUB-HEADER: Diese Datei wird normalerweise von ddsdtc generiert +// Für die Migration erstellen wir minimale Forward-Declarations + +namespace AreaEffectSimulation +{ +namespace Interface +{ + class Dtc; + class Ftc; +} +} diff --git a/qt6-after/qt6-migrated-legatus/AreaEffectSimulation/aes_enums.hpp b/qt6-after/qt6-migrated-legatus/AreaEffectSimulation/aes_enums.hpp new file mode 100644 index 000000000..050c7d259 --- /dev/null +++ b/qt6-after/qt6-migrated-legatus/AreaEffectSimulation/aes_enums.hpp @@ -0,0 +1,24 @@ +#pragma once +// STUB-HEADER: Diese Datei wird normalerweise von ddsdtc generiert +// Für die Migration erstellen wir minimale Typ-Definitionen + +namespace AreaEffectSimulation +{ +// Placeholder enums - werden durch echte DDS-Typen ersetzt +enum class SymbolAppearance : int { + Solid = 0, + Dashed = 1, + Dotted = 2 +}; + +enum class SymbolVisibility : int { + Visible = 0, + Hidden = 1 +}; + +struct UnitSymbolPosition { + double x = 0.0; + double y = 0.0; + double z = 0.0; +}; +} diff --git a/qt6-after/qt6-migrated-legatus/AssetManagement/asm_dtc.h b/qt6-after/qt6-migrated-legatus/AssetManagement/asm_dtc.h new file mode 100644 index 000000000..b2e40ee30 --- /dev/null +++ b/qt6-after/qt6-migrated-legatus/AssetManagement/asm_dtc.h @@ -0,0 +1,12 @@ +#pragma once +// STUB-HEADER: Diese Datei wird normalerweise von ddsdtc generiert +// Für die Migration erstellen wir minimale Forward-Declarations + +namespace AssetManagement +{ +namespace Interface +{ + class Dtc; + class Ftc; +} +} diff --git a/qt6-after/qt6-migrated-legatus/AssetManagement/asm_enums.hpp b/qt6-after/qt6-migrated-legatus/AssetManagement/asm_enums.hpp new file mode 100644 index 000000000..69ea7aa9b --- /dev/null +++ b/qt6-after/qt6-migrated-legatus/AssetManagement/asm_enums.hpp @@ -0,0 +1,24 @@ +#pragma once +// STUB-HEADER: Diese Datei wird normalerweise von ddsdtc generiert +// Für die Migration erstellen wir minimale Typ-Definitionen + +namespace AssetManagement +{ +// Placeholder enums - werden durch echte DDS-Typen ersetzt +enum class SymbolAppearance : int { + Solid = 0, + Dashed = 1, + Dotted = 2 +}; + +enum class SymbolVisibility : int { + Visible = 0, + Hidden = 1 +}; + +struct UnitSymbolPosition { + double x = 0.0; + double y = 0.0; + double z = 0.0; +}; +} diff --git a/qt6-after/qt6-migrated-legatus/AudioVideoManagement/avm_dtc.h b/qt6-after/qt6-migrated-legatus/AudioVideoManagement/avm_dtc.h new file mode 100644 index 000000000..5bcb2e6e6 --- /dev/null +++ b/qt6-after/qt6-migrated-legatus/AudioVideoManagement/avm_dtc.h @@ -0,0 +1,12 @@ +#pragma once +// STUB-HEADER: Diese Datei wird normalerweise von ddsdtc generiert +// Für die Migration erstellen wir minimale Forward-Declarations + +namespace AudioVideoManagement +{ +namespace Interface +{ + class Dtc; + class Ftc; +} +} diff --git a/qt6-after/qt6-migrated-legatus/AudioVideoManagement/avm_enums.hpp b/qt6-after/qt6-migrated-legatus/AudioVideoManagement/avm_enums.hpp new file mode 100644 index 000000000..81e092b64 --- /dev/null +++ b/qt6-after/qt6-migrated-legatus/AudioVideoManagement/avm_enums.hpp @@ -0,0 +1,24 @@ +#pragma once +// STUB-HEADER: Diese Datei wird normalerweise von ddsdtc generiert +// Für die Migration erstellen wir minimale Typ-Definitionen + +namespace AudioVideoManagement +{ +// Placeholder enums - werden durch echte DDS-Typen ersetzt +enum class SymbolAppearance : int { + Solid = 0, + Dashed = 1, + Dotted = 2 +}; + +enum class SymbolVisibility : int { + Visible = 0, + Hidden = 1 +}; + +struct UnitSymbolPosition { + double x = 0.0; + double y = 0.0; + double z = 0.0; +}; +} diff --git a/qt6-after/qt6-migrated-legatus/Buildings/bld_dtc.h b/qt6-after/qt6-migrated-legatus/Buildings/bld_dtc.h new file mode 100644 index 000000000..4544b5be1 --- /dev/null +++ b/qt6-after/qt6-migrated-legatus/Buildings/bld_dtc.h @@ -0,0 +1,12 @@ +#pragma once +// STUB-HEADER: Diese Datei wird normalerweise von ddsdtc generiert +// Für die Migration erstellen wir minimale Forward-Declarations + +namespace Buildings +{ +namespace Interface +{ + class Dtc; + class Ftc; +} +} diff --git a/qt6-after/qt6-migrated-legatus/Buildings/bld_enums.hpp b/qt6-after/qt6-migrated-legatus/Buildings/bld_enums.hpp new file mode 100644 index 000000000..9341ea232 --- /dev/null +++ b/qt6-after/qt6-migrated-legatus/Buildings/bld_enums.hpp @@ -0,0 +1,24 @@ +#pragma once +// STUB-HEADER: Diese Datei wird normalerweise von ddsdtc generiert +// Für die Migration erstellen wir minimale Typ-Definitionen + +namespace Buildings +{ +// Placeholder enums - werden durch echte DDS-Typen ersetzt +enum class SymbolAppearance : int { + Solid = 0, + Dashed = 1, + Dotted = 2 +}; + +enum class SymbolVisibility : int { + Visible = 0, + Hidden = 1 +}; + +struct UnitSymbolPosition { + double x = 0.0; + double y = 0.0; + double z = 0.0; +}; +} diff --git a/qt6-after/qt6-migrated-legatus/CentralEffectSimulation/ces_dtc.h b/qt6-after/qt6-migrated-legatus/CentralEffectSimulation/ces_dtc.h new file mode 100644 index 000000000..f5df78efd --- /dev/null +++ b/qt6-after/qt6-migrated-legatus/CentralEffectSimulation/ces_dtc.h @@ -0,0 +1,12 @@ +#pragma once +// STUB-HEADER: Diese Datei wird normalerweise von ddsdtc generiert +// Für die Migration erstellen wir minimale Forward-Declarations + +namespace CentralEffectSimulation +{ +namespace Interface +{ + class Dtc; + class Ftc; +} +} diff --git a/qt6-after/qt6-migrated-legatus/CodificationManagement/cod_dtc.h b/qt6-after/qt6-migrated-legatus/CodificationManagement/cod_dtc.h new file mode 100644 index 000000000..b86da2200 --- /dev/null +++ b/qt6-after/qt6-migrated-legatus/CodificationManagement/cod_dtc.h @@ -0,0 +1,12 @@ +#pragma once +// STUB-HEADER: Diese Datei wird normalerweise von ddsdtc generiert +// Für die Migration erstellen wir minimale Forward-Declarations + +namespace CodificationManagement +{ +namespace Interface +{ + class Dtc; + class Ftc; +} +} diff --git a/qt6-after/qt6-migrated-legatus/ComponentMonitor/cmo_dtc.h b/qt6-after/qt6-migrated-legatus/ComponentMonitor/cmo_dtc.h new file mode 100644 index 000000000..9ce661211 --- /dev/null +++ b/qt6-after/qt6-migrated-legatus/ComponentMonitor/cmo_dtc.h @@ -0,0 +1,12 @@ +#pragma once +// STUB-HEADER: Diese Datei wird normalerweise von ddsdtc generiert +// Für die Migration erstellen wir minimale Forward-Declarations + +namespace ComponentMonitor +{ +namespace Interface +{ + class Dtc; + class Ftc; +} +} diff --git a/qt6-after/qt6-migrated-legatus/Core/core_dtc.h b/qt6-after/qt6-migrated-legatus/Core/core_dtc.h new file mode 100644 index 000000000..0a13b7ce3 --- /dev/null +++ b/qt6-after/qt6-migrated-legatus/Core/core_dtc.h @@ -0,0 +1,12 @@ +#pragma once +// STUB-HEADER: Diese Datei wird normalerweise von ddsdtc generiert +// Für die Migration erstellen wir minimale Forward-Declarations + +namespace Core +{ +namespace Interface +{ + class Dtc; + class Ftc; +} +} diff --git a/qt6-after/qt6-migrated-legatus/Core/core_enums.hpp b/qt6-after/qt6-migrated-legatus/Core/core_enums.hpp new file mode 100644 index 000000000..620e6c95e --- /dev/null +++ b/qt6-after/qt6-migrated-legatus/Core/core_enums.hpp @@ -0,0 +1,24 @@ +#pragma once +// STUB-HEADER: Diese Datei wird normalerweise von ddsdtc generiert +// Für die Migration erstellen wir minimale Typ-Definitionen + +namespace Core +{ +// Placeholder enums - werden durch echte DDS-Typen ersetzt +enum class SymbolAppearance : int { + Solid = 0, + Dashed = 1, + Dotted = 2 +}; + +enum class SymbolVisibility : int { + Visible = 0, + Hidden = 1 +}; + +struct UnitSymbolPosition { + double x = 0.0; + double y = 0.0; + double z = 0.0; +}; +} diff --git a/qt6-after/qt6-migrated-legatus/DDS/Core/core_dtc.h b/qt6-after/qt6-migrated-legatus/DDS/Core/core_dtc.h new file mode 100644 index 000000000..0a13b7ce3 --- /dev/null +++ b/qt6-after/qt6-migrated-legatus/DDS/Core/core_dtc.h @@ -0,0 +1,12 @@ +#pragma once +// STUB-HEADER: Diese Datei wird normalerweise von ddsdtc generiert +// Für die Migration erstellen wir minimale Forward-Declarations + +namespace Core +{ +namespace Interface +{ + class Dtc; + class Ftc; +} +} diff --git a/qt6-after/qt6-migrated-legatus/DDS/Core/core_enums.hpp b/qt6-after/qt6-migrated-legatus/DDS/Core/core_enums.hpp new file mode 100644 index 000000000..620e6c95e --- /dev/null +++ b/qt6-after/qt6-migrated-legatus/DDS/Core/core_enums.hpp @@ -0,0 +1,24 @@ +#pragma once +// STUB-HEADER: Diese Datei wird normalerweise von ddsdtc generiert +// Für die Migration erstellen wir minimale Typ-Definitionen + +namespace Core +{ +// Placeholder enums - werden durch echte DDS-Typen ersetzt +enum class SymbolAppearance : int { + Solid = 0, + Dashed = 1, + Dotted = 2 +}; + +enum class SymbolVisibility : int { + Visible = 0, + Hidden = 1 +}; + +struct UnitSymbolPosition { + double x = 0.0; + double y = 0.0; + double z = 0.0; +}; +} diff --git a/qt6-after/qt6-migrated-legatus/DDS/DTC/generic_dtc.h b/qt6-after/qt6-migrated-legatus/DDS/DTC/generic_dtc.h new file mode 100644 index 000000000..787f7f1cb --- /dev/null +++ b/qt6-after/qt6-migrated-legatus/DDS/DTC/generic_dtc.h @@ -0,0 +1,12 @@ +#pragma once +// STUB-HEADER: Diese Datei wird normalerweise von ddsdtc generiert +// Für die Migration erstellen wir minimale Forward-Declarations + +namespace DDS +{ +namespace Interface +{ + class Dtc; + class Ftc; +} +} diff --git a/qt6-after/qt6-migrated-legatus/EffectShowClient/esc_dtc.h b/qt6-after/qt6-migrated-legatus/EffectShowClient/esc_dtc.h new file mode 100644 index 000000000..bf5409eb5 --- /dev/null +++ b/qt6-after/qt6-migrated-legatus/EffectShowClient/esc_dtc.h @@ -0,0 +1,12 @@ +#pragma once +// STUB-HEADER: Diese Datei wird normalerweise von ddsdtc generiert +// Für die Migration erstellen wir minimale Forward-Declarations + +namespace EffectShowClient +{ +namespace Interface +{ + class Dtc; + class Ftc; +} +} diff --git a/qt6-after/qt6-migrated-legatus/EffectShowManagement/esm_dtc.h b/qt6-after/qt6-migrated-legatus/EffectShowManagement/esm_dtc.h new file mode 100644 index 000000000..15dfc2d81 --- /dev/null +++ b/qt6-after/qt6-migrated-legatus/EffectShowManagement/esm_dtc.h @@ -0,0 +1,12 @@ +#pragma once +// STUB-HEADER: Diese Datei wird normalerweise von ddsdtc generiert +// Für die Migration erstellen wir minimale Forward-Declarations + +namespace EffectShowManagement +{ +namespace Interface +{ + class Dtc; + class Ftc; +} +} diff --git a/qt6-after/qt6-migrated-legatus/Evaluations/evl_dtc.h b/qt6-after/qt6-migrated-legatus/Evaluations/evl_dtc.h new file mode 100644 index 000000000..589171637 --- /dev/null +++ b/qt6-after/qt6-migrated-legatus/Evaluations/evl_dtc.h @@ -0,0 +1,12 @@ +#pragma once +// STUB-HEADER: Diese Datei wird normalerweise von ddsdtc generiert +// Für die Migration erstellen wir minimale Forward-Declarations + +namespace Evaluations +{ +namespace Interface +{ + class Dtc; + class Ftc; +} +} diff --git a/qt6-after/qt6-migrated-legatus/ExerciseEventManagement/eem_dtc.h b/qt6-after/qt6-migrated-legatus/ExerciseEventManagement/eem_dtc.h new file mode 100644 index 000000000..35b8fc6bf --- /dev/null +++ b/qt6-after/qt6-migrated-legatus/ExerciseEventManagement/eem_dtc.h @@ -0,0 +1,12 @@ +#pragma once +// STUB-HEADER: Diese Datei wird normalerweise von ddsdtc generiert +// Für die Migration erstellen wir minimale Forward-Declarations + +namespace ExerciseEventManagement +{ +namespace Interface +{ + class Dtc; + class Ftc; +} +} diff --git a/qt6-after/qt6-migrated-legatus/ExerciseManagement/exm_dtc.h b/qt6-after/qt6-migrated-legatus/ExerciseManagement/exm_dtc.h new file mode 100644 index 000000000..d7f5e5ac9 --- /dev/null +++ b/qt6-after/qt6-migrated-legatus/ExerciseManagement/exm_dtc.h @@ -0,0 +1,12 @@ +#pragma once +// STUB-HEADER: Diese Datei wird normalerweise von ddsdtc generiert +// Für die Migration erstellen wir minimale Forward-Declarations + +namespace ExerciseManagement +{ +namespace Interface +{ + class Dtc; + class Ftc; +} +} diff --git a/qt6-after/qt6-migrated-legatus/ExerciseManagement/exm_enums.hpp b/qt6-after/qt6-migrated-legatus/ExerciseManagement/exm_enums.hpp new file mode 100644 index 000000000..97c15d67f --- /dev/null +++ b/qt6-after/qt6-migrated-legatus/ExerciseManagement/exm_enums.hpp @@ -0,0 +1,24 @@ +#pragma once +// STUB-HEADER: Diese Datei wird normalerweise von ddsdtc generiert +// Für die Migration erstellen wir minimale Typ-Definitionen + +namespace ExerciseManagement +{ +// Placeholder enums - werden durch echte DDS-Typen ersetzt +enum class SymbolAppearance : int { + Solid = 0, + Dashed = 1, + Dotted = 2 +}; + +enum class SymbolVisibility : int { + Visible = 0, + Hidden = 1 +}; + +struct UnitSymbolPosition { + double x = 0.0; + double y = 0.0; + double z = 0.0; +}; +} diff --git a/qt6-after/qt6-migrated-legatus/FileManagement/flm_dtc.h b/qt6-after/qt6-migrated-legatus/FileManagement/flm_dtc.h new file mode 100644 index 000000000..83888f40a --- /dev/null +++ b/qt6-after/qt6-migrated-legatus/FileManagement/flm_dtc.h @@ -0,0 +1,12 @@ +#pragma once +// STUB-HEADER: Diese Datei wird normalerweise von ddsdtc generiert +// Für die Migration erstellen wir minimale Forward-Declarations + +namespace FileManagement +{ +namespace Interface +{ + class Dtc; + class Ftc; +} +} diff --git a/qt6-after/qt6-migrated-legatus/FileManagement/flm_enums.hpp b/qt6-after/qt6-migrated-legatus/FileManagement/flm_enums.hpp new file mode 100644 index 000000000..b773bcb54 --- /dev/null +++ b/qt6-after/qt6-migrated-legatus/FileManagement/flm_enums.hpp @@ -0,0 +1,24 @@ +#pragma once +// STUB-HEADER: Diese Datei wird normalerweise von ddsdtc generiert +// Für die Migration erstellen wir minimale Typ-Definitionen + +namespace FileManagement +{ +// Placeholder enums - werden durch echte DDS-Typen ersetzt +enum class SymbolAppearance : int { + Solid = 0, + Dashed = 1, + Dotted = 2 +}; + +enum class SymbolVisibility : int { + Visible = 0, + Hidden = 1 +}; + +struct UnitSymbolPosition { + double x = 0.0; + double y = 0.0; + double z = 0.0; +}; +} diff --git a/qt6-after/qt6-migrated-legatus/GuezIedManagement/gim_dtc.h b/qt6-after/qt6-migrated-legatus/GuezIedManagement/gim_dtc.h new file mode 100644 index 000000000..fc33757be --- /dev/null +++ b/qt6-after/qt6-migrated-legatus/GuezIedManagement/gim_dtc.h @@ -0,0 +1,12 @@ +#pragma once +// STUB-HEADER: Diese Datei wird normalerweise von ddsdtc generiert +// Für die Migration erstellen wir minimale Forward-Declarations + +namespace GuezIedManagement +{ +namespace Interface +{ + class Dtc; + class Ftc; +} +} diff --git a/qt6-after/qt6-migrated-legatus/GuezNasat/gna_dtc.h b/qt6-after/qt6-migrated-legatus/GuezNasat/gna_dtc.h new file mode 100644 index 000000000..5bb435ce5 --- /dev/null +++ b/qt6-after/qt6-migrated-legatus/GuezNasat/gna_dtc.h @@ -0,0 +1,12 @@ +#pragma once +// STUB-HEADER: Diese Datei wird normalerweise von ddsdtc generiert +// Für die Migration erstellen wir minimale Forward-Declarations + +namespace GuezNasat +{ +namespace Interface +{ + class Dtc; + class Ftc; +} +} diff --git a/qt6-after/qt6-migrated-legatus/InfrastructureManagement/ism_dtc.h b/qt6-after/qt6-migrated-legatus/InfrastructureManagement/ism_dtc.h new file mode 100644 index 000000000..726a7a246 --- /dev/null +++ b/qt6-after/qt6-migrated-legatus/InfrastructureManagement/ism_dtc.h @@ -0,0 +1,12 @@ +#pragma once +// STUB-HEADER: Diese Datei wird normalerweise von ddsdtc generiert +// Für die Migration erstellen wir minimale Forward-Declarations + +namespace InfrastructureManagement +{ +namespace Interface +{ + class Dtc; + class Ftc; +} +} diff --git a/qt6-after/qt6-migrated-legatus/InfrastructureManagement/ism_enums.hpp b/qt6-after/qt6-migrated-legatus/InfrastructureManagement/ism_enums.hpp new file mode 100644 index 000000000..21423f23b --- /dev/null +++ b/qt6-after/qt6-migrated-legatus/InfrastructureManagement/ism_enums.hpp @@ -0,0 +1,24 @@ +#pragma once +// STUB-HEADER: Diese Datei wird normalerweise von ddsdtc generiert +// Für die Migration erstellen wir minimale Typ-Definitionen + +namespace InfrastructureManagement +{ +// Placeholder enums - werden durch echte DDS-Typen ersetzt +enum class SymbolAppearance : int { + Solid = 0, + Dashed = 1, + Dotted = 2 +}; + +enum class SymbolVisibility : int { + Visible = 0, + Hidden = 1 +}; + +struct UnitSymbolPosition { + double x = 0.0; + double y = 0.0; + double z = 0.0; +}; +} diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/CMakeLists.txt index 6d6dc7bfc..eb3fa088d 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/CMakeLists.txt +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/CMakeLists.txt @@ -7,7 +7,7 @@ FIND_PACKAGE(RTI) FIND_PACKAGE(Grantlee5 REQUIRED COMPONENTS Templates) -NGL_ADD_LIBRARY(ALL codegen_base SHARED +NGL_ADD_LIBRARY2(ALL codegen_base SHARED codegen_export.h SqlGenerator.cpp SqlGenerator.h diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/CppTopicGeneratorGrantlee.h b/qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/CppTopicGeneratorGrantlee.h index 6688a3fa6..34282bbb9 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/CppTopicGeneratorGrantlee.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/CppTopicGeneratorGrantlee.h @@ -6,7 +6,6 @@ #include "GeneratorGrantleeBase.h" #include "StructBuilder.h" #include "GrantleeWrappers.h" -#include "codegen_export.h" namespace CodeGen { diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/DaoGeneratorGrantlee.h b/qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/DaoGeneratorGrantlee.h index 4dc87bec4..b1ff86dce 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/DaoGeneratorGrantlee.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/DaoGeneratorGrantlee.h @@ -6,7 +6,6 @@ #include "GeneratorGrantleeBase.h" #include "StructBuilder.h" #include "GrantleeWrappers.h" -#include "codegen_export.h" namespace CodeGen { diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/DatabaseGeneratorGrantlee.h b/qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/DatabaseGeneratorGrantlee.h index f8387e658..cac90c380 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/DatabaseGeneratorGrantlee.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/DatabaseGeneratorGrantlee.h @@ -6,7 +6,6 @@ #include "GeneratorGrantleeBase.h" #include "StructBuilder.h" #include "GrantleeWrappers.h" -#include "codegen_export.h" namespace CodeGen { diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/GeneratorGrantleeBase.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/GeneratorGrantleeBase.cpp index 908977750..2750ec42b 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/GeneratorGrantleeBase.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/GeneratorGrantleeBase.cpp @@ -48,7 +48,7 @@ bool GeneratorGrantleeBase::setTemplate(const QString &templateName, const QStri m_template = m_engine->newTemplate(tmpl, QStringLiteral("myTemplate")); if (m_template->error()) { - WARNING_LOG(m_logger) << "Error parsing template '" << templateName + WARNING_LOG() << "Error parsing template '" << templateName << "': " << m_template->errorString(); return false; } @@ -88,7 +88,7 @@ bool GeneratorGrantleeBase::generateData(const QString &templateName, QFile f(outDirectory + QLatin1Char('/') + outFilename); if (!f.open(QIODevice::WriteOnly)) { - ERROR_LOG(m_logger) << "Error opening file '" << f.fileName() << "' for writing: " + ERROR_LOG() << "Error opening file '" << f.fileName() << "' for writing: " << f.errorString() << "(" << f.error() << ")"; return false; } @@ -96,7 +96,7 @@ bool GeneratorGrantleeBase::generateData(const QString &templateName, f.write(outData); f.close(); - DEBUG_LOG(m_logger) << "Written data to " << f.fileName(); + DEBUG_LOG() << "Written data to " << f.fileName(); return true; } @@ -105,7 +105,7 @@ bool GeneratorGrantleeBase::readFile(const QString &filename, QString &data) con QFile f(filename); if (!f.open(QIODevice::ReadOnly)) { - ERROR_LOG(m_logger) << "Error opening file " << filename + ERROR_LOG() << "Error opening file " << filename << " - error: " << f.errorString(); return false; } @@ -121,7 +121,7 @@ bool GeneratorGrantleeBase::getFilenameFromData(const QString &dataToParse, QStr int idx = dataToParse.indexOf(filenameMarker); if (idx < 0) { - ERROR_LOG(m_logger) << "Could not find marker '" << filenameMarker + ERROR_LOG() << "Could not find marker '" << filenameMarker << "' in data!"; return false; } @@ -129,7 +129,7 @@ bool GeneratorGrantleeBase::getFilenameFromData(const QString &dataToParse, QStr int endIdx = dataToParse.indexOf(QLatin1Char('\n'), idx); if (endIdx < 0) { - ERROR_LOG(m_logger) << "Could not find end marker '\\n' in data!"; + ERROR_LOG() << "Could not find end marker '\\n' in data!"; return false; } filename = dataToParse.mid(idx, endIdx - idx).trimmed(); @@ -160,12 +160,12 @@ void GeneratorGrantleeBase::addCustomFunctions(const QVectorinsert(QStringLiteral("custom_dtc_procs"), vlCustomDtcFunctions); m_ctx->insert(QStringLiteral("custom_db_procs"), vlCustomDbFunctions); @@ -185,17 +185,17 @@ void GeneratorGrantleeBase::exportUsedServices(const XmlReader *reader) const int idx = fullPath.lastIndexOf(QLatin1Char('.')); if (idx < 0) { - ERROR_LOG(m_logger) << "Could not parse file path: " << fullPath; + ERROR_LOG() << "Could not parse file path: " << fullPath; continue; } const QString idlFile = fullPath.left(idx); if (idlFile.isEmpty()) { - WARNING_LOG(m_logger) << "Could not find idl file for service " << svc; + WARNING_LOG() << "Could not find idl file for service " << svc; continue; } idlServicesWrapper->addService(svc, idlFile); - DEBUG_LOG(m_logger) << "Added service " << svc; + DEBUG_LOG() << "Added service " << svc; } m_ctx->insert(QStringLiteral("ext_services"), idlServicesWrapper); } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/GeneratorGrantleeBase.h b/qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/GeneratorGrantleeBase.h index a06998d91..54b5d19fa 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/GeneratorGrantleeBase.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/GeneratorGrantleeBase.h @@ -2,7 +2,6 @@ #pragma once -#include "codegen_export.h" #include "XmlReader.h" #include #include @@ -48,6 +47,5 @@ protected: Grantlee::Context *m_ctx; Grantlee::Template m_template; StructBuilder *m_structBuilder; - NGL::INGLLogger &m_logger; }; } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/SqlGenerator.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/SqlGenerator.cpp index bd5b72b9f..bf50b87d6 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/SqlGenerator.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/SqlGenerator.cpp @@ -25,7 +25,6 @@ SqlGenerator::SqlGenerator(XmlReader *xmlReader, StructBuilder *structBuilder) , m_createdByXmlFile(false) , m_isValid(true) , m_exerciseId(0) - , m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger().getNGLLogger("CodeGen.SqlGenerator")) {} SqlGenerator::SqlGenerator(const QString &xmlFile) @@ -34,7 +33,6 @@ SqlGenerator::SqlGenerator(const QString &xmlFile) , m_createdByXmlFile(true) , m_isValid(false) , m_exerciseId(0) - , m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger().getNGLLogger("CodeGen.SqlGenerator")) { m_isValid = m_xmlReader->readServiceFile(xmlFile, QString()) && m_structBuilder->buildStructures(); } @@ -51,7 +49,7 @@ SqlGenerator::~SqlGenerator() bool SqlGenerator::generateData(int exerciseId) { - DEBUG_LOG(m_logger) << "Generating SQL data for service " << getServiceAbbr() << " in exercise " << exerciseId << ", this: " << this; + DEBUG_LOG() << "Generating SQL data for service " << getServiceAbbr() << " in exercise " << exerciseId << ", this: " << this; m_exerciseId = exerciseId; m_sqlGlobal = SqlStatements(); @@ -136,11 +134,11 @@ bool SqlGenerator::handleViews() bool SqlGenerator::handleView(const ViewInformation &vi) { - DEBUG_LOG(m_logger) << "Handle view " << vi.name; + DEBUG_LOG() << "Handle view " << vi.name; const QString parent = vi.baseTable; - DEBUG_LOG(m_logger) << "Parent = " << parent; + DEBUG_LOG() << "Parent = " << parent; if (!parent.isEmpty()) { @@ -148,7 +146,7 @@ bool SqlGenerator::handleView(const ViewInformation &vi) const QString createViewStmt(QStringLiteral("CREATE OR REPLACE VIEW %1 AS SELECT %2\nFROM %3\nWHERE %4;\n")); const QString dropViewStmt(QStringLiteral("DROP VIEW IF EXISTS %1;")); - DEBUG_LOG(m_logger) << "csi.primaryTable = " << csi.primaryTable.data()->name; + DEBUG_LOG() << "csi.primaryTable = " << csi.primaryTable.data()->name; if (!csi.primaryTable.isNull()) { @@ -168,7 +166,7 @@ bool SqlGenerator::handleView(const ViewInformation &vi) fqColumnNames += mi.db.table + QLatin1Char('.') + mi.db.columnName + QLatin1String(" AS ") + mi.db.getColumnNameView(); } - DEBUG_LOG(m_logger) << "fqColumnNames = " << fqColumnNames.join(QStringLiteral(", ")); + DEBUG_LOG() << "fqColumnNames = " << fqColumnNames.join(QStringLiteral(", ")); if (!whereConditions.isEmpty()) @@ -187,11 +185,11 @@ bool SqlGenerator::handleView(const ViewInformation &vi) bool SqlGenerator::handleTable(const CompleteTableInformation &cti) { - DEBUG_LOG(m_logger) << "Handle table " << cti.name; + DEBUG_LOG() << "Handle table " << cti.name; if (cti.columns.isEmpty()) { - WARNING_LOG(m_logger) << "Table " << cti.name + WARNING_LOG() << "Table " << cti.name << " has no DatabaseServiceStruct - not generating anything for this!"; return true; } @@ -534,11 +532,11 @@ bool SqlGenerator::handleEnumeration(const EnumInformation &ei) QStringList SqlGenerator::handleEnumeration(const EnumInformation &ei, const QString &dbSchema) const { - DEBUG_LOG(m_logger) << "Handle enumeration " << ei.enumName; + DEBUG_LOG() << "Handle enumeration " << ei.enumName; if (ei.tableName.isEmpty()) { - INFO_LOG(m_logger) << "No table for enumeration " << ei.enumName << " - not creating inserts for this enum"; + INFO_LOG() << "No table for enumeration " << ei.enumName << " - not creating inserts for this enum"; return QStringList(); } @@ -567,7 +565,7 @@ bool SqlGenerator::generateDbNotifications(const QString &tableName, if (notification.paramNames.isEmpty() || notification.paramNames.size() > 1) { - ERROR_LOG(m_logger) << "Can not handle more than one parameter"; + ERROR_LOG() << "Can not handle more than one parameter"; continue; } generateDbNotification(notification, ed); @@ -707,7 +705,7 @@ QStringList SqlGenerator::getDbSettings(const QString &dbSchema) const QStringList SqlGenerator::getAllSqlStmts(const QString &dbSchema, ExerciseDependency ed) const { - DEBUG_LOG(m_logger) << "Creating statements for service " << getServiceAbbr() << " in exercise " << m_exerciseId << ", this: " << this; + DEBUG_LOG() << "Creating statements for service " << getServiceAbbr() << " in exercise " << m_exerciseId << ", this: " << this; QStringList data; @@ -798,7 +796,7 @@ bool SqlGenerator::writeSql(const QString &filePath, ExerciseDependency ed) const SqlStatements &sql = getStatements(ed); if (sql.isEmpty()) { - DEBUG_LOG(m_logger) << "Sql file is emtpy: " << sqlFile; + DEBUG_LOG() << "Sql file is emtpy: " << sqlFile; return writeFile(sqlFile, QString()); } @@ -808,7 +806,7 @@ bool SqlGenerator::writeSql(const QString &filePath, ExerciseDependency ed) getExerciseSchemaName(m_exerciseId) : getServiceAbbr()); - INFO_LOG(m_logger) << "Creating sql-stmt for schema (" << dbSchema << ")"; + INFO_LOG() << "Creating sql-stmt for schema (" << dbSchema << ")"; return writeSqlToFile(dbSchema, sqlFile, ed); } @@ -931,7 +929,7 @@ bool SqlGenerator::writeFile(const QString &fn, const QString &content) const QFile f(fn); if (!f.open(QIODevice::WriteOnly | QIODevice::Truncate)) { - ERROR_LOG(m_logger) << "Error opening file '" << f.fileName() << "' for writing: " + ERROR_LOG() << "Error opening file '" << f.fileName() << "' for writing: " << f.errorString(); return false; } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/SqlGenerator.h b/qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/SqlGenerator.h index 409949df5..0d467f203 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/SqlGenerator.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/SqlGenerator.h @@ -5,7 +5,7 @@ #include #include #include "StructBuilder.h" -#include "codegen_export.h" +#include "codegen_base_export.h" namespace NGL { @@ -168,8 +168,6 @@ private: bool m_isValid; int m_exerciseId; - - NGL::INGLLogger &m_logger; }; } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/StructBuilder.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/StructBuilder.cpp index d41c638e1..a7f6f755b 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/StructBuilder.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/StructBuilder.cpp @@ -200,8 +200,6 @@ StructBuilder::StructBuilder(XmlReader *xmlReader) : m_needPoint3d(false) , m_needPgArrayInclude(false) , m_xmlReader(xmlReader) - , m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger().getNGLLogger("CodeGen.StructBuilder")) - , m_loggerCSV(NGL::NGLLoggerBootstrap::getNGLRootLogger().getNGLLogger("fileCSV")) {} bool StructBuilder::buildStructures() @@ -268,7 +266,7 @@ bool StructBuilder::buildStructures() const ServiceTypeStruct sts = extractServiceAndTypeFromTypename(tti.name); if (!sts.isExternalType()) { - ERROR_LOG(m_logger) << "Invalid external topic type name: '" << tti.name << "'"; + ERROR_LOG() << "Invalid external topic type name: '" << tti.name << "'"; return false; } if (!handleIdlStructInfo(tti, m_externalTopicTypes, sts.service)) @@ -289,7 +287,7 @@ bool StructBuilder::handleEnum(const EnumInformation &ei) QSharedPointer ti = m_xmlReader->getTable(ei.tableName); if (ti.isNull()) { - WARNING_LOG(m_logger) << "Could not find table information for enum: " + WARNING_LOG() << "Could not find table information for enum: " << ei.enumName << ", table: " << ei.tableName; return false; } @@ -325,12 +323,12 @@ EnumInformation StructBuilder::enumInformationByType(const QString &type, bool c { if (!checkExternals) { - ERROR_LOG(m_logger) << "Could not find enumeration '" << type << "'"; + ERROR_LOG() << "Could not find enumeration '" << type << "'"; return EnumInformation(); } if (extInfo.type.isEmpty()) { - WARNING_LOG(m_logger) << "Could not parse external enumeration '" << type << "'"; + WARNING_LOG() << "Could not parse external enumeration '" << type << "'"; return EnumInformation(); } return m_xmlReader->getExternalEnumeration(extInfo.service, extInfo.type, verbose); @@ -342,13 +340,13 @@ EnumInformation StructBuilder::enumInformationByType(const QString &type, bool c return ei; } if (verbose) - ERROR_LOG(m_logger) << "Could not find enumeration '" << type << "'"; + ERROR_LOG() << "Could not find enumeration '" << type << "'"; return EnumInformation(); } CompleteTopicTypeInformation StructBuilder::topicTypeInformationByStructType(const QString &type, bool checkExternals) { - DEBUG_LOG(m_logger) << "topicTypeInformationByStructType(" << type << ")"; + DEBUG_LOG() << "topicTypeInformationByStructType(" << type << ")"; if (type.isEmpty()) return CompleteTopicTypeInformation(); @@ -366,26 +364,26 @@ CompleteTopicTypeInformation StructBuilder::topicTypeInformationByStructType(con return csi; } - DEBUG_LOG(m_logger) << "Type '" << type << "' not found in idlStructs - maybe not yet exported or an enum"; + DEBUG_LOG() << "Type '" << type << "' not found in idlStructs - maybe not yet exported or an enum"; const QVector idlStructsToGenerate = m_xmlReader->getIdlStructToGenerate(); for (const TopicTypeInformation &tti : idlStructsToGenerate) { if (tti.name == type) { - DEBUG_LOG(m_logger) << "Found not yet exported type " << type; + DEBUG_LOG() << "Found not yet exported type " << type; if (!handleIdlStructInfo(tti, m_topicTypeInfos)) return CompleteTopicTypeInformation(); return topicTypeInformationByStructType(type); } } - ERROR_LOG(m_logger) << "Could not find type '" << type << "' in idlStructs"; + ERROR_LOG() << "Could not find type '" << type << "' in idlStructs"; return CompleteTopicTypeInformation(); } CompleteTopicTypeInformation StructBuilder::externalTopicTypeByStructType(const ServiceTypeStruct &sts) { const QString typeToSearch = sts.fqType(); - DEBUG_LOG(m_logger) << "externalTopicTypeByStructType " << typeToSearch; + DEBUG_LOG() << "externalTopicTypeByStructType " << typeToSearch; for (const CompleteTopicTypeInformation &ctti : std::as_const(m_externalTopicTypes)) { if (ctti.name == typeToSearch) @@ -398,13 +396,13 @@ CompleteTopicTypeInformation StructBuilder::externalTopicTypeByStructType(const bool StructBuilder::loadExternalTopicType(const ServiceTypeStruct &sts) { - DEBUG_LOG(m_logger) << "loadExternalTopicType(" << sts.fqType() << ")"; + DEBUG_LOG() << "loadExternalTopicType(" << sts.fqType() << ")"; const TopicTypeInformation tti = m_xmlReader->loadExternalTopicType(sts.service, sts.type); if (!tti.isValid()) { - DEBUG_LOG(m_logger) << "Could not find external topic '" << sts.fqType() << "'"; + DEBUG_LOG() << "Could not find external topic '" << sts.fqType() << "'"; return false; } @@ -475,11 +473,11 @@ bool StructBuilder::handleTable(const ServiceStructInformation &ssi) QVector tableNames; if (!getColumnsFromTable(ssi.primaryTable, columns, tableNames)) { - WARNING_LOG(m_logger) << "Could not retrieve columns from table " + WARNING_LOG() << "Could not retrieve columns from table " << ssi.primaryTable; return false; } - DEBUG_LOG(m_logger) << "Got " << columns.size() << " columns for table " + DEBUG_LOG() << "Got " << columns.size() << " columns for table " << ssi.primaryTable; QSet sqlTables; @@ -489,12 +487,12 @@ bool StructBuilder::handleTable(const ServiceStructInformation &ssi) MemberInformation miPkFirstTable, miPkLastTable; for (const ColumnInformationEx &ci : std::as_const(columns)) { - DEBUG_LOG(m_logger) << "handling column " << ci.columnName; + DEBUG_LOG() << "handling column " << ci.columnName; const QSharedPointer ti = ci.table; if (ti.isNull()) { - WARNING_LOG(m_logger) << "Could not find table for column " << ci.columnName + WARNING_LOG() << "Could not find table for column " << ci.columnName << " primary table is " << ssi.primaryTable.data(); return false; } @@ -562,14 +560,14 @@ bool StructBuilder::handleTable(const ServiceStructInformation &ssi) camelCaseString(fki->destination.tableName, true); EnumInformation ei = enumInformationByType(enumType, true, false); - DEBUG_LOG(m_logger) << "Checking if " << enumType << " is an enum: " << ei.isValid(); + DEBUG_LOG() << "Checking if " << enumType << " is an enum: " << ei.isValid(); if (!ei.isValid() && fki->destination.tableName.contains(QLatin1Char('_'))) { enumType = fki->destination.service + QStringLiteral("::") + camelCaseString(fki->destination.tableName.section(QLatin1Char('_'), 1), true); ei = enumInformationByType(enumType, true, false); - DEBUG_LOG(m_logger) << "Checking if " << enumType << " is an enum: " << ei.isValid(); + DEBUG_LOG() << "Checking if " << enumType << " is an enum: " << ei.isValid(); } if (ei.isValid() && ei.tableName == fki->destination.tableName) @@ -678,8 +676,8 @@ bool StructBuilder::handleIdlStructInfo(const TopicTypeInformation &tti, if (idlData.isKey && idlData.isOptional) { - ERROR_LOG(m_logger) << "Column option isKey & isOptional are mutually exclusive!"; - ERROR_LOG(m_logger) << "Change column '" << tti.name << "." + ERROR_LOG() << "Column option isKey & isOptional are mutually exclusive!"; + ERROR_LOG() << "Change column '" << tti.name << "." << idlData.name << "'' to have either key or optional parameter "; return false; } @@ -1047,7 +1045,7 @@ bool StructBuilder::fixupQVariantConversions(MemberInformation &mi) const } else { - ERROR_LOG(m_logger) << "Unknown cpp datatype: " << mi.cpp.type; + ERROR_LOG() << "Unknown cpp datatype: " << mi.cpp.type; return false; } return true; @@ -1082,7 +1080,7 @@ QVector StructBuilder::buildDbTableInformationFromIdlData(con const CompleteTopicTypeInformation cttiChild = topicTypeInformationByStructType(member.type); if (!cttiChild.isValid()) { - ERROR_LOG(m_logger) << "Can not find structure '" << member.type << "'"; + ERROR_LOG() << "Can not find structure '" << member.type << "'"; continue; } QString pre; @@ -1102,7 +1100,7 @@ QVector StructBuilder::buildDbTableInformationFromIdlData(con const CompleteTopicTypeInformation &cttiChild = topicTypeInformationByStructType(member.dataTypeInfo->innerDataType()->idlType()); if (!cttiChild.isValid()) { - ERROR_LOG(m_logger) << "Can not find structure '" << member.type << "'"; + ERROR_LOG() << "Can not find structure '" << member.type << "'"; continue; } buildDbTableInformationFromIdlData(cttiChild, @@ -1196,7 +1194,7 @@ bool StructBuilder::buildJSonStructureInformationFromIdlData(const CompleteTopic const CompleteTopicTypeInformation cttiChild = topicTypeInformationByStructType(member.type); if (!cttiChild.isValid()) { - ERROR_LOG(m_logger) << "Can not find structure '" << member.type << "'"; + ERROR_LOG() << "Can not find structure '" << member.type << "'"; continue; } if (!buildJSonStructureInformationFromIdlData(cttiChild)) @@ -1223,7 +1221,7 @@ bool StructBuilder::buildJSonStructureInformationFromIdlData(const CompleteTopic return false; } else - WARNING_LOG(m_logger) << "Can not find structure '" << member.type << "'"; + WARNING_LOG() << "Can not find structure '" << member.type << "'"; } @@ -1318,11 +1316,11 @@ QMap StructBuilder::getRecordingTopicTables() continue; if (!ctti.isDataObject) { - WARNING_LOG(m_logger) << "Trying to record topic '" << ctti.name + WARNING_LOG() << "Trying to record topic '" << ctti.name << "' which is not directly published - ignoring!"; continue; } - DEBUG_LOG(m_logger) << "Rec table: " << ctti.name; + DEBUG_LOG() << "Rec table: " << ctti.name; miPrimaryKey.db.table = ctti.name; ret.insert(ctti.name, getRecordingTopicTable(ctti, miPrimaryKey)); } @@ -1404,7 +1402,7 @@ StructBuilder::ServiceTypeStruct StructBuilder::extractServiceAndTypeFromTypenam extTypeRef = sl.at(1); } else - WARNING_LOG(m_logger) << "Error parsing type: " << type; + WARNING_LOG() << "Error parsing type: " << type; StructBuilder::ServiceTypeStruct ret; if (!extServiceRef.isEmpty()) { diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/StructBuilder.h b/qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/StructBuilder.h index 595da91a9..bd36f0fe2 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/StructBuilder.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/StructBuilder.h @@ -4,7 +4,7 @@ #include #include "XmlReader.h" -#include "codegen_export.h" +#include "codegen_base_export.h" namespace NGL { @@ -335,7 +335,5 @@ private: bool m_needPgArrayInclude; XmlReader *m_xmlReader; - NGL::INGLLogger &m_logger; - NGL::INGLLogger &m_loggerCSV; }; } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/XmlReader.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/XmlReader.cpp index fc5435f2c..e46339942 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/XmlReader.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/XmlReader.cpp @@ -32,7 +32,6 @@ private: }; XmlReader::XmlReader() - : m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger().getNGLLogger("CodeGen.XmlReader")) {} bool XmlReader::readServiceFile(const QString &svcFile, @@ -80,18 +79,18 @@ bool XmlReader::readServiceFile(const QString &svcFile, QFile f(svcFile); if (!f.exists()) { - ERROR_LOG(m_logger) << "Service file '" << svcFile << "' not found!"; + ERROR_LOG() << "Service file '" << svcFile << "' not found!"; return false; } if (!f.open(QIODevice::ReadOnly)) { m_errorString = QLatin1String("Can not open service file '") + svcFile + QLatin1String("' for reading: ") + f.errorString(); - ERROR_LOG(m_logger) << m_errorString; + ERROR_LOG() << m_errorString; return false; } - INFO_LOG(m_logger) << "SvcFile: " << svcFile; + INFO_LOG() << "SvcFile: " << svcFile; QString errMsg; @@ -103,7 +102,7 @@ bool XmlReader::readServiceFile(const QString &svcFile, m_errorString = QLatin1String("Error parsing service file '") + svcFile + QLatin1String("': ") + errMsg + QLatin1String(" at ") + QString::number(errLine) + QLatin1Char(':') + QString::number(errColumn); - ERROR_LOG(m_logger) << m_errorString; + ERROR_LOG() << m_errorString; return false; } @@ -119,7 +118,7 @@ bool XmlReader::readServiceFile(const QString &svcFile, { m_errorString = QLatin1String("Xml file '") + svcFile + QLatin1String("' is not a valid service file: service name/namespace is missing"); - ERROR_LOG(m_logger) << m_errorString; + ERROR_LOG() << m_errorString; return false; } m_svcNamespace = getAttribute(domRoot, QStringLiteral("namespace")); @@ -130,13 +129,13 @@ bool XmlReader::readServiceFile(const QString &svcFile, QString devModeStr = getAttribute(domRoot, QStringLiteral("devMode"), true); m_svcDevMode = devModeStr == QStringLiteral("1") || devModeStr == QStringLiteral("true"); - INFO_LOG(m_logger) << "devMode: " << m_svcDevMode; + INFO_LOG() << "devMode: " << m_svcDevMode; const QString groupNamesString = getAttribute(domRoot, QStringLiteral("groups"), true); if (!groupNamesString.isEmpty()) { m_groupNames = groupNamesString.split(QLatin1Char(','), Qt::SkipEmptyParts); - INFO_LOG(m_logger) << "groups: " << groupNamesString; + INFO_LOG() << "groups: " << groupNamesString; } else m_groupNames.clear(); @@ -151,12 +150,12 @@ bool XmlReader::readServiceFile(const QString &svcFile, if (m_exerciseDependency != ExerciseDependency::Global && m_exerciseDependency != ExerciseDependency::GlobalAndExercise) { - WARNING_LOG(m_logger) << "Service " << getServiceNamespace() + WARNING_LOG() << "Service " << getServiceNamespace() << " is not marked as exercise independent but should be started in group Core/Master"; } } - INFO_LOG(m_logger) << "exerciseDependency: " << (int)m_exerciseDependency; + INFO_LOG() << "exerciseDependency: " << (int)m_exerciseDependency; if ( domRoot.hasAttribute(QStringLiteral("prio"))) { m_prio = getAttribute(domRoot, QStringLiteral("prio"), 0).toInt(); @@ -168,7 +167,7 @@ bool XmlReader::readServiceFile(const QString &svcFile, catch (const XmlReaderException &ex) { m_errorString = QLatin1String("Error parsing dbServiceStructs: ") + QLatin1String(ex.what()); - ERROR_LOG(m_logger) << m_errorString; + ERROR_LOG() << m_errorString; return false; } @@ -179,7 +178,7 @@ bool XmlReader::readServiceFile(const QString &svcFile, catch (const XmlReaderException &ex) { m_errorString = QLatin1String("Error parsing dbtables: ") + QLatin1String(ex.what()); - ERROR_LOG(m_logger) << m_errorString; + ERROR_LOG() << m_errorString; return false; } @@ -190,7 +189,7 @@ bool XmlReader::readServiceFile(const QString &svcFile, catch (const XmlReaderException &ex) { m_errorString = QLatin1String("Error parsing dbviews: ") + QLatin1String(ex.what()); - ERROR_LOG(m_logger) << m_errorString; + ERROR_LOG() << m_errorString; return false; } @@ -201,7 +200,7 @@ bool XmlReader::readServiceFile(const QString &svcFile, catch (const XmlReaderException &ex) { m_errorString = QLatin1String("Error parsing enumerations: ") + QLatin1String(ex.what()); - ERROR_LOG(m_logger) << m_errorString; + ERROR_LOG() << m_errorString; return false; } @@ -212,7 +211,7 @@ bool XmlReader::readServiceFile(const QString &svcFile, catch (const XmlReaderException &ex) { m_errorString = QLatin1String("Error parsing custom dtc functions: ") + QLatin1String(ex.what()); - ERROR_LOG(m_logger) << m_errorString; + ERROR_LOG() << m_errorString; return false; } @@ -223,7 +222,7 @@ bool XmlReader::readServiceFile(const QString &svcFile, catch (const XmlReaderException &ex) { m_errorString = QLatin1String("Error parsing idl strucs: ") + QLatin1String(ex.what()); - ERROR_LOG(m_logger) << m_errorString; + ERROR_LOG() << m_errorString; return false; } @@ -234,7 +233,7 @@ bool XmlReader::readServiceFile(const QString &svcFile, catch (const XmlReaderException &ex) { m_errorString = QLatin1String("Error parsing function topics: ") + QLatin1String(ex.what()); - ERROR_LOG(m_logger) << m_errorString; + ERROR_LOG() << m_errorString; return false; } @@ -332,7 +331,7 @@ void XmlReader::parseDBSserviceStructs(const QDomElement &rootElement) domDbStruct = domDbStruct.nextSiblingElement(domDbStruct.tagName()); } - INFO_LOG(m_logger) << "Read " << m_structsToGenerate.size() << " database service struct(s)"; + INFO_LOG() << "Read " << m_structsToGenerate.size() << " database service struct(s)"; } void XmlReader::parseDBTables(const QDomElement &rootElement) @@ -374,7 +373,7 @@ void XmlReader::parseDBTables(const QDomElement &rootElement) domDbTable = domDbTable.nextSiblingElement(domDbTable.tagName()); } - INFO_LOG(m_logger) << "Read " << m_tables.size() << " database table(s)"; + INFO_LOG() << "Read " << m_tables.size() << " database table(s)"; } void XmlReader::parseDBViews(const QDomElement &rootElement) @@ -394,7 +393,7 @@ void XmlReader::parseDBViews(const QDomElement &rootElement) vi->filter = getAttribute(domDbView, QStringLiteral("filter")); vi->exerciseDependency = string2ExerciseDependency(getAttribute(domDbView, QStringLiteral("exerciseDependency"), true)); - DEBUG_LOG(m_logger) << "Base table = " << vi->baseTable; + DEBUG_LOG() << "Base table = " << vi->baseTable; m_views.insert(vi->name, vi); @@ -402,7 +401,7 @@ void XmlReader::parseDBViews(const QDomElement &rootElement) domDbView = domDbView.nextSiblingElement(domDbView.tagName()); } - INFO_LOG(m_logger) << "Read " << m_views.size() << " database view(s)"; + INFO_LOG() << "Read " << m_views.size() << " database view(s)"; } void XmlReader::parseEnumerations(const QDomElement &rootElement) @@ -433,7 +432,7 @@ void XmlReader::parseEnumerations(const QDomElement &rootElement) domEnum = domEnum.nextSiblingElement(domEnum.tagName()); } - INFO_LOG(m_logger) << "Read " << m_enumerations.size() << " enumeration(s)"; + INFO_LOG() << "Read " << m_enumerations.size() << " enumeration(s)"; } void XmlReader::parseCustomDtcFunctions(const QDomElement &rootElement) @@ -453,7 +452,7 @@ void XmlReader::parseCustomDtcFunctions(const QDomElement &rootElement) } domElement = domElement.nextSiblingElement(domElement.tagName()); } - INFO_LOG(m_logger) << "Read " << m_enumerations.size() << " customDtcFunction(s)"; + INFO_LOG() << "Read " << m_enumerations.size() << " customDtcFunction(s)"; } @@ -511,7 +510,7 @@ void XmlReader::parseTopicTypes(const QDomElement &rootElement) } - INFO_LOG(m_logger) << "Read " << m_idlStructsToGenerate.size() << " idl struct(s)"; + INFO_LOG() << "Read " << m_idlStructsToGenerate.size() << " idl struct(s)"; } void XmlReader::parseFunctionTopics(const QDomElement &rootElement) @@ -567,7 +566,7 @@ ColumnInformation XmlReader::parseTableColumn(const QDomElement &column, const Q } if (ci.columnName.toLower() != ci.columnName) - WARNING_LOG(m_logger) << "Column " << ci.columnName << " in Table " + WARNING_LOG() << "Column " << ci.columnName << " in Table " << tableName << " has has upper-case chars which is not allowed!"; return ci; @@ -727,18 +726,18 @@ DbNotifcationInformation XmlReader::parseDbNotification(const QDomElement &custo TopicTypeInformation XmlReader::loadExternalTopicType(const QString &externalServiceName, const QString &topicTypeName) { - DEBUG_LOG(m_logger) << "externalServiceName: " << externalServiceName << ", topicTypeName: " << topicTypeName; + DEBUG_LOG() << "externalServiceName: " << externalServiceName << ", topicTypeName: " << topicTypeName; if (!loadExternalService(externalServiceName)) { - WARNING_LOG(m_logger) << "Could not find service " << externalServiceName + WARNING_LOG() << "Could not find service " << externalServiceName << " referenced by external topic " << topicTypeName; return TopicTypeInformation(); } auto extXmlReader = m_externalXmlInformations.value(externalServiceName); if (!extXmlReader) { - ERROR_LOG(m_logger) << "Could not find service xml file for service '" << externalServiceName << "'"; + ERROR_LOG() << "Could not find service xml file for service '" << externalServiceName << "'"; return TopicTypeInformation(); } @@ -750,7 +749,7 @@ TopicTypeInformation XmlReader::loadExternalTopicType(const QString &externalSer m_usedServices[externalServiceName] = true; return tti; } - WARNING_LOG(m_logger) << "Could not find topic " << topicTypeName + WARNING_LOG() << "Could not find topic " << topicTypeName << " in external service definition for service " << externalServiceName; return TopicTypeInformation(); @@ -758,18 +757,18 @@ TopicTypeInformation XmlReader::loadExternalTopicType(const QString &externalSer EnumInformation XmlReader::getExternalEnumeration(const QString &externalServiceName, const QString &enumName, bool verbose) { - DEBUG_LOG(m_logger) << "externalServiceName: " << externalServiceName << ", topicTypeName: " << enumName; + DEBUG_LOG() << "externalServiceName: " << externalServiceName << ", topicTypeName: " << enumName; if (!loadExternalService(externalServiceName)) { - WARNING_LOG(m_logger) << "Could not find service '" << externalServiceName << "'" + WARNING_LOG() << "Could not find service '" << externalServiceName << "'" << " referenced by external enumeration " << enumName; return EnumInformation(); } auto extXmlReader = m_externalXmlInformations.value(externalServiceName); if (!extXmlReader) { - ERROR_LOG(m_logger) << "Could not find service xml file for service '" << externalServiceName << "'"; + ERROR_LOG() << "Could not find service xml file for service '" << externalServiceName << "'"; return EnumInformation(); } @@ -784,7 +783,7 @@ EnumInformation XmlReader::getExternalEnumeration(const QString &externalService } if (verbose) { - WARNING_LOG(m_logger) << "Could not find enumeration " << enumName + WARNING_LOG() << "Could not find enumeration " << enumName << " in external service definition for '" << externalServiceName << "'"; } @@ -822,11 +821,11 @@ bool XmlReader::loadExternalService(const QString &serviceName) if (fileName.isEmpty()) return false; - DEBUG_LOG(m_logger) << "xml file for " << serviceName << ": " << fileName; + DEBUG_LOG() << "xml file for " << serviceName << ": " << fileName; auto extXmlReader = QSharedPointer(new XmlReader); if (!extXmlReader->readServiceFile(fileName, QString(), this)) { - WARNING_LOG(m_logger) << "Error reading service file " << fileName + WARNING_LOG() << "Error reading service file " << fileName << " for service " << serviceName; return false; } @@ -843,7 +842,7 @@ void XmlReader::loadIdlInfofile(const QString &idlServiceInfoFile) QFile f(idlServiceInfoFile); if (!f.open(QIODevice::ReadOnly)) { - WARNING_LOG(m_logger) << "Could not read idl service info file " << idlServiceInfoFile; + WARNING_LOG() << "Could not read idl service info file " << idlServiceInfoFile; return; } const QList files = f.readAll().split('\n'); @@ -860,7 +859,7 @@ void XmlReader::loadIdlInfofile(const QString &idlServiceInfoFile) { const auto svcAbbreveation = fn.split(QLatin1Char('.')).at(0).split(QLatin1Char('_')).at(0); m_xmlFiles[svcAbbreveation] = fileName; - DEBUG_LOG(m_logger) << "xml: " << svcAbbreveation << " = " << fileName; + DEBUG_LOG() << "xml: " << svcAbbreveation << " = " << fileName; } else { @@ -868,7 +867,7 @@ void XmlReader::loadIdlInfofile(const QString &idlServiceInfoFile) if (svcAbbreveation.endsWith(QLatin1String("_enums"))) continue; m_idlFiles[svcAbbreveation] = fileName; - DEBUG_LOG(m_logger) << "idl: " << svcAbbreveation << " = " << fileName; + DEBUG_LOG() << "idl: " << svcAbbreveation << " = " << fileName; } } } @@ -894,7 +893,7 @@ void XmlReader::getServiceNameInfoFromFilePath(const QStringList &parts) const QString abbreviation = parts.last().split(QLatin1Char('.')).first().split(QLatin1Char('_')).first(); const QString serviceName = parts.at(parts.size() - 2); - DEBUG_LOG(m_logger) << "serviceName: " << serviceName << " = " << abbreviation; + DEBUG_LOG() << "serviceName: " << serviceName << " = " << abbreviation; m_fullServiceName2Abbreviation[serviceName] = abbreviation; } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/XmlReader.h b/qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/XmlReader.h index f2afdd4e1..a39f4c596 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/XmlReader.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/XmlReader.h @@ -20,7 +20,7 @@ #endif #endif -#include "codegen_export.h" +#include "codegen_base_export.h" namespace NGL { @@ -434,7 +434,5 @@ private: QStringList m_groupNames; int m_prio; bool m_svcDevMode{false}; - - NGL::INGLLogger &m_logger; }; } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/codegen_simple.py b/qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/codegen_simple.py index a6d08ee58..d5e8c243f 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/codegen_simple.py +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/codegen_simple.py @@ -343,7 +343,7 @@ class OperatorRights(object): outfile.write('\n') outfile.write('enum Groups_%s\n' % parser.module_name) outfile.write('{\n') - pattern = re.compile('[\W]+') + pattern = re.compile(r'\W+') for r in parser.op_rights: offsetPlugin = globalOffset + (r.offset << 16) for group in r.groups: diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/main_grantlee.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/main_grantlee.cpp index 3ee571270..293a61b24 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/main_grantlee.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/main_grantlee.cpp @@ -77,20 +77,20 @@ int main(int argc, char **argv) QScopedPointer reader(new CodeGen::XmlReader); - DEBUG_LOG(m_logger) << "ServiceFile: " << options.serviceFile(); - DEBUG_LOG(m_logger) << "IdlInfoFile: " << options.idlInfoFile(); + DEBUG_LOG() << "ServiceFile: " << options.serviceFile(); + DEBUG_LOG() << "IdlInfoFile: " << options.idlInfoFile(); if (!reader->readServiceFile(options.serviceFile(), options.idlInfoFile())) { - ERROR_LOG(m_logger) << "Error parsing service file '" << options.serviceFile() + ERROR_LOG() << "Error parsing service file '" << options.serviceFile() << ": " << reader->errorString(); return 2; } QDir dir(options.outDir()); - DEBUG_LOG(m_logger) << "Directory: " << options.outDir(); + DEBUG_LOG() << "Directory: " << options.outDir(); if (!dir.exists() && !dir.mkpath(options.outDir())) { - ERROR_LOG(m_logger) << "Directory '" << options.outDir() + ERROR_LOG() << "Directory '" << options.outDir() << "' does not exist and can not be created!"; return 3; } @@ -98,7 +98,7 @@ int main(int argc, char **argv) QScopedPointer structBuilder(new CodeGen::StructBuilder(reader.data())); if (!structBuilder->buildStructures()) { - ERROR_LOG(m_logger) << "Error building up structures"; + ERROR_LOG() << "Error building up structures"; return 4; } @@ -123,7 +123,7 @@ int main(int argc, char **argv) if (!sql.writeSql(dir.absolutePath() + QLatin1Char('/'), CodeGen::ExerciseDependency::Exercise)) { - ERROR_LOG(m_logger) << "Error while writing sql information for service " << sql.getServiceAbbr(); + ERROR_LOG() << "Error while writing sql information for service " << sql.getServiceAbbr(); return 10; } @@ -133,7 +133,7 @@ int main(int argc, char **argv) if (!sql.writeSql(dir.absolutePath() + QLatin1Char('/'), CodeGen::ExerciseDependency::Exercise)) { - ERROR_LOG(m_logger) << "Error while writing sql information for service " << sql.getServiceAbbr(); + ERROR_LOG() << "Error while writing sql information for service " << sql.getServiceAbbr(); return 10; } @@ -141,20 +141,20 @@ int main(int argc, char **argv) sql.generateData(0); if (!sql.writeSql(dir.absolutePath() + QLatin1Char('/'), CodeGen::ExerciseDependency::Global)) { - ERROR_LOG(m_logger) << "Error while writing sql information for service " << sql.getServiceAbbr(); + ERROR_LOG() << "Error while writing sql information for service " << sql.getServiceAbbr(); return 10; } return 0; } else { - ERROR_LOG(m_logger) << "Invalid action '" << options.action() << "' given!"; + ERROR_LOG() << "Invalid action '" << options.action() << "' given!"; return 5; } if (!generator->init(reader.data(), structBuilder.data())) { - ERROR_LOG(m_logger) << "Error initializing generator!"; + ERROR_LOG() << "Error initializing generator!"; return 6; } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsAppDescriptor/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsAppDescriptor/CMakeLists.txt index e3796f366..11e81c22f 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsAppDescriptor/CMakeLists.txt +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsAppDescriptor/CMakeLists.txt @@ -13,7 +13,7 @@ SET(LtsAppDescriptor_SRCS lts_app_descriptor.h ) -NGL_ADD_LIBRARY(WS LtsAppDescriptor SHARED ${LtsAppDescriptor_SRCS}) +NGL_ADD_LIBRARY2(WS LtsAppDescriptor SHARED ${LtsAppDescriptor_SRCS}) NGL_TARGET_INCLUDE_DIRECTORIES(LtsAppDescriptor PUBLIC @@ -57,7 +57,7 @@ NGL_TARGET_LINK_LIBRARIES(LtsAppDescriptorChecker # lts_app_descriptor_editor.ui #) -#NGL_ADD_LIBRARY(WS NO_TRANSLATION LtsAppDescriptorEditor SHARED ${LtsAppDescriptorEditor_SRCS}) +#NGL_ADD_LIBRARY2(WS NO_TRANSLATION LtsAppDescriptorEditor SHARED ${LtsAppDescriptorEditor_SRCS}) #NGL_TARGET_INCLUDE_DIRECTORIES(LtsAppDescriptorEditor # PUBLIC diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsAppManager/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsAppManager/CMakeLists.txt index 7f75f9b8d..7161c42bc 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsAppManager/CMakeLists.txt +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsAppManager/CMakeLists.txt @@ -21,7 +21,7 @@ NGL_WRAP_UI(LtsAppManager_SRCS ) IF(BUILD_RTI) -NGL_ADD_LIBRARY(WS LtsAppManager SHARED ${LtsAppManager_SRCS}) +NGL_ADD_LIBRARY2(WS LtsAppManager SHARED ${LtsAppManager_SRCS}) NGL_TARGET_INCLUDE_DIRECTORIES(LtsAppManager PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../ diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsCommandLineParser/LtsCommandLineParser.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsCommandLineParser/LtsCommandLineParser.h index 69d80a1c3..494860f4a 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsCommandLineParser/LtsCommandLineParser.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsCommandLineParser/LtsCommandLineParser.h @@ -4,7 +4,7 @@ #pragma once #include -#include +#include "ltscommandlineparser_export.h" class QUrl; namespace LtsCommandLineParser diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsCoordTrans/lts_coord_widget.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsCoordTrans/lts_coord_widget.h index edac57c18..f72e042a3 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsCoordTrans/lts_coord_widget.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsCoordTrans/lts_coord_widget.h @@ -3,7 +3,7 @@ #pragma once #include -#include +#include "sv_export.h" #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsCoordinate/UnitTest_Coordinate/lts_coordinate_unit_test.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsCoordinate/UnitTest_Coordinate/lts_coordinate_unit_test.h index db466a97c..a0cf5ade7 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsCoordinate/UnitTest_Coordinate/lts_coordinate_unit_test.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsCoordinate/UnitTest_Coordinate/lts_coordinate_unit_test.h @@ -77,5 +77,4 @@ private Q_SLOTS: private: - LOGGER_T m_logger; }; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsCoordinate/lts_coord_vector.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsCoordinate/lts_coord_vector.h index e54920b56..166fcf8b9 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsCoordinate/lts_coord_vector.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsCoordinate/lts_coord_vector.h @@ -3,7 +3,7 @@ #pragma once -#include +#include "ltscoordinate_export.h" #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsCoordinate/lts_coordinate.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsCoordinate/lts_coordinate.h index 40ca279d0..ca4c0dbb1 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsCoordinate/lts_coordinate.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsCoordinate/lts_coordinate.h @@ -3,7 +3,7 @@ #pragma once -#include +#include "ltscoordinate_export.h" #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsElevation/UnitTest_Elevation/elevation_unit_test.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsElevation/UnitTest_Elevation/elevation_unit_test.h index 6588b58b3..5bf447da1 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsElevation/UnitTest_Elevation/elevation_unit_test.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsElevation/UnitTest_Elevation/elevation_unit_test.h @@ -53,5 +53,4 @@ private Q_SLOTS: private: - LOGGER_T m_logger; }; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsElevation/lts_elevation_manager.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsElevation/lts_elevation_manager.cpp index c044807f4..8f8c0585c 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsElevation/lts_elevation_manager.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsElevation/lts_elevation_manager.cpp @@ -78,19 +78,18 @@ public: LtsElevationManager::LtsElevationManager() : QObject(nullptr) , d(new Private) - , m_logger(getLogger("LtsElevationManager")) { ++s_counter; - TRACE_LOG(m_logger) << LOGFUNCTION << " START, s_counter=" << s_counter << " this=" << this; - TRACE_LOG(m_logger) << LOGFUNCTION << " END, s_counter=" << s_counter << " this=" << this; + TRACE_LOG() << Q_FUNC_INFO << " START, s_counter=" << s_counter << " this=" << this; + TRACE_LOG() << Q_FUNC_INFO << " END, s_counter=" << s_counter << " this=" << this; } LtsElevationManager::~LtsElevationManager() { --s_counter; - TRACE_LOG(m_logger) << LOGFUNCTION << " START, s_counter=" << s_counter << " this=" << this; + TRACE_LOG() << Q_FUNC_INFO << " START, s_counter=" << s_counter << " this=" << this; delete d; - TRACE_LOG(m_logger) << LOGFUNCTION << " END, s_counter=" << s_counter << " this=" << this; + TRACE_LOG() << Q_FUNC_INFO << " END, s_counter=" << s_counter << " this=" << this; } LTS_ELEVATION_MANAGER_TYPE LtsElevationManager::createInstance(int exerciseId, @@ -98,11 +97,11 @@ LTS_ELEVATION_MANAGER_TYPE LtsElevationManager::createInstance(int exerciseId, const std::shared_ptr &asmDtc) { LOGGER_T logger = getLogger("LtsElevationManager"); - TRACE_LOG(logger) << LOGFUNCTION << " START, exerciseId=" << exerciseId; + TRACE_LOG(logger) << Q_FUNC_INFO << " START, exerciseId=" << exerciseId; if (exerciseId < 0) { - ERROR_LOG(logger) << LOGFUNCTION << " exerciseId invalid, exerciseId=" << exerciseId; + ERROR_LOG(logger) << Q_FUNC_INFO << " exerciseId invalid, exerciseId=" << exerciseId; return nullptr; } @@ -127,7 +126,7 @@ LTS_ELEVATION_MANAGER_TYPE LtsElevationManager::createInstance(int exerciseId, if (!exmDtc || !asmDtc) { - ERROR_LOG(logger) << LOGFUNCTION << " no dtcs for exerciseId=" << exerciseId + ERROR_LOG(logger) << Q_FUNC_INFO << " no dtcs for exerciseId=" << exerciseId << ", asmDtc=" << asmDtc << ", exmDtc=" << exmDtc; return nullptr; @@ -137,7 +136,7 @@ LTS_ELEVATION_MANAGER_TYPE LtsElevationManager::createInstance(int exerciseId, trainingAreaId = exerciseIdToTrainingAreaId(exerciseId, exmDtc); if (trainingAreaId <= 0) { - ERROR_LOG(logger) << LOGFUNCTION << " Error getting trainingAreaId" + ERROR_LOG(logger) << Q_FUNC_INFO << " Error getting trainingAreaId" << ", exerciseId=" << exerciseId << ", trainingAreaId=" << trainingAreaId; return nullptr; @@ -154,7 +153,7 @@ LTS_ELEVATION_MANAGER_TYPE LtsElevationManager::createInstance(int exerciseId, LTS_ELEVATION_MANAGER_TYPE temp = createInstanceForTrainingAreaId(trainingAreaId, asmDtc); if (!temp) { - ERROR_LOG(logger) << LOGFUNCTION << " Error on createInstanceForTrainingAreaId" + ERROR_LOG(logger) << Q_FUNC_INFO << " Error on createInstanceForTrainingAreaId" << ", exerciseId=" << exerciseId << ", trainingAreaId=" << trainingAreaId; return nullptr; @@ -163,7 +162,7 @@ LTS_ELEVATION_MANAGER_TYPE LtsElevationManager::createInstance(int exerciseId, temp->initDDS(exmDtc, asmDtc); - TRACE_LOG(logger) << LOGFUNCTION << " END, exerciseId=" << exerciseId; + TRACE_LOG(logger) << Q_FUNC_INFO << " END, exerciseId=" << exerciseId; return temp; } @@ -176,11 +175,11 @@ LTS_ELEVATION_MANAGER_TYPE LtsElevationManager::createInstanceForTrainingAreaId( const std::shared_ptr &asmDtc) { LOGGER_T logger = getLogger("LtsElevationManager"); - TRACE_LOG(logger) << LOGFUNCTION << " START, trainingAreaId=" << trainingAreaId; + TRACE_LOG(logger) << Q_FUNC_INFO << " START, trainingAreaId=" << trainingAreaId; if (trainingAreaId < 0) { - ERROR_LOG(logger) << LOGFUNCTION << " trainingAreaId invalid, trainingAreaId=" << trainingAreaId; + ERROR_LOG(logger) << Q_FUNC_INFO << " trainingAreaId invalid, trainingAreaId=" << trainingAreaId; return nullptr; } @@ -198,7 +197,7 @@ LTS_ELEVATION_MANAGER_TYPE LtsElevationManager::createInstanceForTrainingAreaId( if (!asmDtc) { - ERROR_LOG(logger) << LOGFUNCTION << " no dtcs for trainingAreaId=" << trainingAreaId + ERROR_LOG(logger) << Q_FUNC_INFO << " no dtcs for trainingAreaId=" << trainingAreaId << ", asmDtc=" << asmDtc; return nullptr; } @@ -211,7 +210,7 @@ LTS_ELEVATION_MANAGER_TYPE LtsElevationManager::createInstanceForTrainingAreaId( const QStringList &filenames = temp->getFilenamesForTrainingArea(trainingAreaId); if (filenames.isEmpty()) { - ERROR_LOG(logger) << LOGFUNCTION << " no filenames for trainingAreaId=" << trainingAreaId; + ERROR_LOG(logger) << Q_FUNC_INFO << " no filenames for trainingAreaId=" << trainingAreaId; delete temp; return nullptr; } @@ -220,7 +219,7 @@ LTS_ELEVATION_MANAGER_TYPE LtsElevationManager::createInstanceForTrainingAreaId( bool bInitFilenames = temp->init(filenames); if (!bInitFilenames) { - ERROR_LOG(logger) << LOGFUNCTION << " bInitFilenames failed for trainingAreaId=" << trainingAreaId; + ERROR_LOG(logger) << Q_FUNC_INFO << " bInitFilenames failed for trainingAreaId=" << trainingAreaId; delete temp; return nullptr; } @@ -229,7 +228,7 @@ LTS_ELEVATION_MANAGER_TYPE LtsElevationManager::createInstanceForTrainingAreaId( DEBUG_LOG(logger) << " LtsElevationMgrMap contains instances now: " << map.size(); - TRACE_LOG(logger) << LOGFUNCTION << " END, trainingAreaId=" << trainingAreaId; + TRACE_LOG(logger) << Q_FUNC_INFO << " END, trainingAreaId=" << trainingAreaId; return map[trainingAreaId]; } @@ -257,7 +256,7 @@ LTS_ELEVATION_MANAGER_TYPE LtsElevationManager::createInstanceUnitTest(int id, c bool bInitFilenames = temp->init(filePaths_rough_to_fine); if (!bInitFilenames) { - ERROR_LOG(logger) << LOGFUNCTION << " bInitFilenames failed for id=" << id; + ERROR_LOG(logger) << Q_FUNC_INFO << " bInitFilenames failed for id=" << id; delete temp; return nullptr; } @@ -266,7 +265,7 @@ LTS_ELEVATION_MANAGER_TYPE LtsElevationManager::createInstanceUnitTest(int id, c DEBUG_LOG(logger) << " LtsElevationMgrMap contains instances now: " << map.size(); - TRACE_LOG(logger) << LOGFUNCTION << " END, trainingAreaId=" << id; + TRACE_LOG(logger) << Q_FUNC_INFO << " END, trainingAreaId=" << id; return map[id]; @@ -277,14 +276,14 @@ LTS_ELEVATION_MANAGER_TYPE LtsElevationManager::createInstanceUnitTest(int id, c void LtsElevationManager::cleanupAll() { LOGGER_T logger = getLogger("LtsElevationManager"); - TRACE_LOG(logger) << LOGFUNCTION << " START"; + TRACE_LOG(logger) << Q_FUNC_INFO << " START"; cleanupLtsElevatioMgrMapTrainingAreaId(); - TRACE_LOG(logger) << LOGFUNCTION << " END"; + TRACE_LOG(logger) << Q_FUNC_INFO << " END"; } void LtsElevationManager::initDDS(const std::shared_ptr &exmDtc, const std::shared_ptr &asmDtc) { - TRACE_LOG(m_logger) << LOGFUNCTION << " START"; + TRACE_LOG() << Q_FUNC_INFO << " START"; d->m_exmDtc = exmDtc; if (d->m_exmDtc) @@ -294,16 +293,16 @@ void LtsElevationManager::initDDS(const std::shared_ptrm_asmDtc) d->m_asmDtc->waitForHistoricalDataTrainingArea(1000); - TRACE_LOG(m_logger) << LOGFUNCTION << " END"; + TRACE_LOG() << Q_FUNC_INFO << " END"; } QStringList LtsElevationManager::getFilenamesForExercise(int exerciseId) { - TRACE_LOG(m_logger) << LOGFUNCTION << " START"; + TRACE_LOG() << Q_FUNC_INFO << " START"; if (!d->m_exmDtc || !d->m_asmDtc) { - ERROR_LOG(m_logger) << LOGFUNCTION << " no dtcs" + ERROR_LOG() << Q_FUNC_INFO << " no dtcs" << ", exerciseId=" << exerciseId; return {}; } @@ -312,7 +311,7 @@ QStringList LtsElevationManager::getFilenamesForExercise(int exerciseId) int trainingAreaId = exerciseIdToTrainingAreaId(exerciseId, d->m_exmDtc); if (trainingAreaId <= 0) { - ERROR_LOG(m_logger) << LOGFUNCTION << " Error getting trainingAreaId" + ERROR_LOG() << Q_FUNC_INFO << " Error getting trainingAreaId" << ", exerciseId=" << exerciseId << ", trainingAreaId=" << trainingAreaId; return {}; @@ -320,17 +319,17 @@ QStringList LtsElevationManager::getFilenamesForExercise(int exerciseId) QStringList filePaths_rough_to_fine = getFilenamesForTrainingArea(trainingAreaId); - TRACE_LOG(m_logger) << LOGFUNCTION << " END, filePaths_rough_to_fine=" << filePaths_rough_to_fine.join(QStringLiteral(";")); + TRACE_LOG() << Q_FUNC_INFO << " END, filePaths_rough_to_fine=" << filePaths_rough_to_fine.join(QStringLiteral(";")); return filePaths_rough_to_fine; } QStringList LtsElevationManager::getFilenamesForTrainingArea(int trainingAreaId) { - TRACE_LOG(m_logger) << LOGFUNCTION << " START"; + TRACE_LOG() << Q_FUNC_INFO << " START"; if (!d->m_asmDtc) { - ERROR_LOG(m_logger) << LOGFUNCTION << " no dtcs" + ERROR_LOG() << Q_FUNC_INFO << " no dtcs" << ", trainingAreaId=" << trainingAreaId; return {}; } @@ -342,7 +341,7 @@ QStringList LtsElevationManager::getFilenamesForTrainingArea(int trainingAreaId) const AssetManagement::TrainingArea &ta = d->m_asmDtc->trainingArea(trainingAreaId); if (ta.id() != trainingAreaId) { - ERROR_LOG(m_logger) << LOGFUNCTION << " Error on s_asmDtc->trainingArea" + ERROR_LOG() << Q_FUNC_INFO << " Error on s_asmDtc->trainingArea" << ", trainingAreaId=" << trainingAreaId; return {}; } @@ -360,7 +359,7 @@ QStringList LtsElevationManager::getFilenamesForTrainingArea(int trainingAreaId) filePaths_rough_to_fine.append(filePathAbs); } } - TRACE_LOG(m_logger) << LOGFUNCTION << " END, filePaths_rough_to_fine=" << filePaths_rough_to_fine.join(QStringLiteral(";")); + TRACE_LOG() << Q_FUNC_INFO << " END, filePaths_rough_to_fine=" << filePaths_rough_to_fine.join(QStringLiteral(";")); return filePaths_rough_to_fine; } @@ -373,13 +372,13 @@ bool LtsElevationManager::init(const QStringList &filePaths_rough_to_fine) if (cnt != filePaths_rough_to_fine.size()) { - FATAL_LOG(m_logger) << LOGFUNCTION << " ERROR, not all files could be loaded !!!"; - FATAL_LOG(m_logger) << LOGFUNCTION << " ERROR, not all files could be loaded !!!"; - FATAL_LOG(m_logger) << LOGFUNCTION << " ERROR, not all files could be loaded !!!"; - FATAL_LOG(m_logger) << LOGFUNCTION << " ERROR, not all files could be loaded !!!"; - FATAL_LOG(m_logger) << LOGFUNCTION << " ERROR, not all files could be loaded !!!"; - FATAL_LOG(m_logger) << LOGFUNCTION << " ERROR, not all files could be loaded !!!"; - FATAL_LOG(m_logger) << LOGFUNCTION << " ERROR, not all files could be loaded !!!"; + FATAL_LOG(m_logger) << Q_FUNC_INFO << " ERROR, not all files could be loaded !!!"; + FATAL_LOG(m_logger) << Q_FUNC_INFO << " ERROR, not all files could be loaded !!!"; + FATAL_LOG(m_logger) << Q_FUNC_INFO << " ERROR, not all files could be loaded !!!"; + FATAL_LOG(m_logger) << Q_FUNC_INFO << " ERROR, not all files could be loaded !!!"; + FATAL_LOG(m_logger) << Q_FUNC_INFO << " ERROR, not all files could be loaded !!!"; + FATAL_LOG(m_logger) << Q_FUNC_INFO << " ERROR, not all files could be loaded !!!"; + FATAL_LOG(m_logger) << Q_FUNC_INFO << " ERROR, not all files could be loaded !!!"; return false; } return true; @@ -391,7 +390,7 @@ int LtsElevationManager::exerciseIdToTrainingAreaId(int exerciseId, const std::s if (!exmDtc) { - ERROR_LOG(logger) << LOGFUNCTION << " no dtcs" + ERROR_LOG(logger) << Q_FUNC_INFO << " no dtcs" << ", exerciseId=" << exerciseId; return {}; } @@ -404,7 +403,7 @@ int LtsElevationManager::exerciseIdToTrainingAreaId(int exerciseId, const std::s const ExerciseManagement::Exercise &exm = exmDtc->exercise(exerciseId); if (exm.id() != exerciseId) { - ERROR_LOG(logger) << LOGFUNCTION << " Error on m_exmDtc->exercise" + ERROR_LOG(logger) << Q_FUNC_INFO << " Error on m_exmDtc->exercise" << ", exerciseId=" << exerciseId; return {}; } @@ -412,7 +411,7 @@ int LtsElevationManager::exerciseIdToTrainingAreaId(int exerciseId, const std::s if (trainingAreaId <= 0) { - ERROR_LOG(logger) << LOGFUNCTION << " Error getting trainingAreaId" + ERROR_LOG(logger) << Q_FUNC_INFO << " Error getting trainingAreaId" << ", exerciseId=" << exerciseId << ", trainingAreaId=" << trainingAreaId; return -1; @@ -445,11 +444,11 @@ double LtsElevationManager::elevation(double lon_rad, double lat_rad, double def LineOfSight LtsElevationManager::lineOfSightCalculation(const LtsUtils::QPoint3D &startPointGeo_absZ, const LtsUtils::QPoint3D &endPointGeo_absZ) { - TRACE_LOG(m_logger) << LOGFUNCTION << " START" << ", startPointGeo_absZ = " << startPointGeo_absZ << ", endPointGeo_absZ = " << endPointGeo_absZ; + TRACE_LOG() << Q_FUNC_INFO << " START" << ", startPointGeo_absZ = " << startPointGeo_absZ << ", endPointGeo_absZ = " << endPointGeo_absZ; if (!isValid()) { - ERROR_LOG(m_logger) << LOGFUNCTION << " Error, LtsElevationManager not valid"; + ERROR_LOG() << Q_FUNC_INFO << " Error, LtsElevationManager not valid"; return LineOfSight::LOS_ERROR; } @@ -459,14 +458,14 @@ LineOfSight LtsElevationManager::lineOfSightCalculation(const LtsUtils::QPoint3D LtsElevation::LineOfSight result = static_cast(eleMapMgrResult); - TRACE_LOG(m_logger) << LOGFUNCTION << " END" << ", startPointGeo = " << startPointGeo_absZ << ", endPointGeo = " << endPointGeo_absZ + TRACE_LOG() << Q_FUNC_INFO << " END" << ", startPointGeo = " << startPointGeo_absZ << ", endPointGeo = " << endPointGeo_absZ << " -> LineOfSight " << result; return result; } LineOfSight LtsElevationManager::lineOfSightCalculation(const QPointF &startPointGeo, double startHat, const QPointF &endPointGeo, double endHat) { - TRACE_LOG(m_logger) << LOGFUNCTION << " START" + TRACE_LOG() << Q_FUNC_INFO << " START" << ", startPointGeo = " << startPointGeo << ", startHat = " << startHat << ", endPointGeo = " << endPointGeo << ", endHat = " << endHat; @@ -477,7 +476,7 @@ LineOfSight LtsElevationManager::lineOfSightCalculation(const QPointF &startPoin LtsElevation::LineOfSight result = static_cast(eleMapMgrResult); - TRACE_LOG(m_logger) << LOGFUNCTION << " END" + TRACE_LOG() << Q_FUNC_INFO << " END" << ", startPointGeo = " << startPointGeo << ", startHat = " << startHat << ", endPointGeo = " << endPointGeo << ", endHat = " << endHat << " -> LineOfSight " << static_cast(eleMapMgrResult); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsElevation/lts_elevation_manager.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsElevation/lts_elevation_manager.h index 85c73fbe8..d409a8f9e 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsElevation/lts_elevation_manager.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsElevation/lts_elevation_manager.h @@ -4,7 +4,7 @@ #pragma once #include "logger.h" -#include +#include "ltselevation_export.h" #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsLicence/aes_crypt.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsLicence/aes_crypt.h index 45fd7dc90..ca3ec5991 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsLicence/aes_crypt.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsLicence/aes_crypt.h @@ -4,7 +4,7 @@ #pragma once #include -#include +#include "ltslicence_export.h" namespace LtsLicence { diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsLicence/lts_licence.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsLicence/lts_licence.h index d996756f2..a4f2fca02 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsLicence/lts_licence.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsLicence/lts_licence.h @@ -3,7 +3,7 @@ #pragma once -#include +#include "ltslicence_export.h" #include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsLogin/lts_login.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsLogin/lts_login.h index d22b7e1c9..e887d0f89 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsLogin/lts_login.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsLogin/lts_login.h @@ -2,7 +2,7 @@ -#include +#include #include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsMultiMonitor/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsMultiMonitor/CMakeLists.txt index 9dd4661c5..2e4d45c1a 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsMultiMonitor/CMakeLists.txt +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsMultiMonitor/CMakeLists.txt @@ -28,7 +28,7 @@ SET(LtsMultiMonitor_SRCS ) IF(BUILD_RTI) -NGL_ADD_LIBRARY(WS LtsMultiMonitor SHARED ${LtsMultiMonitor_SRCS}) +NGL_ADD_LIBRARY2(WS LtsMultiMonitor SHARED ${LtsMultiMonitor_SRCS}) NGL_TARGET_INCLUDE_DIRECTORIES(LtsMultiMonitor PUBLIC diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsMultiMonitor/lts_dummy_widget.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsMultiMonitor/lts_dummy_widget.h index 9b656587f..cd5ddc0b7 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsMultiMonitor/lts_dummy_widget.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsMultiMonitor/lts_dummy_widget.h @@ -1,7 +1,7 @@ #pragma once #include -#include +#include "ltsmultimonitor_export.h" #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsMultiMonitor/lts_multi_monitor.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsMultiMonitor/lts_multi_monitor.h index 88c0cbb6b..e5bb7afb4 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsMultiMonitor/lts_multi_monitor.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsMultiMonitor/lts_multi_monitor.h @@ -1,6 +1,6 @@ #pragma once -#include "lts_multi_monitor_export.h" +#include "ltsmultimonitor_export.h" #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsMultiMonitor/lts_screen_base.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsMultiMonitor/lts_screen_base.h index 81648a340..b09a86b22 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsMultiMonitor/lts_screen_base.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsMultiMonitor/lts_screen_base.h @@ -1,7 +1,7 @@ #pragma once #include -#include "lts_multi_monitor_export.h" +#include "ltsmultimonitor_export.h" #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsMultiMonitor/lts_screen_container.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsMultiMonitor/lts_screen_container.h index 0d123233f..6e008d30f 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsMultiMonitor/lts_screen_container.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsMultiMonitor/lts_screen_container.h @@ -3,7 +3,7 @@ #include "lts_screen_base.h" -#include +#include "ltsmultimonitor_export.h" #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsMultiMonitor/lts_screen_normal.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsMultiMonitor/lts_screen_normal.h index 0a9908582..4e2378bab 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsMultiMonitor/lts_screen_normal.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsMultiMonitor/lts_screen_normal.h @@ -3,7 +3,7 @@ #include "lts_screen_base.h" -#include +#include "ltsmultimonitor_export.h" #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsMultiMonitor/lts_screen_wide.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsMultiMonitor/lts_screen_wide.h index 0c1c80e9c..c17248967 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsMultiMonitor/lts_screen_wide.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsMultiMonitor/lts_screen_wide.h @@ -3,7 +3,7 @@ #include "lts_screen_base.h" -#include +#include "ltsmultimonitor_export.h" #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsNotification/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsNotification/CMakeLists.txt index c4a2c1c27..d3d248a5b 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsNotification/CMakeLists.txt +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsNotification/CMakeLists.txt @@ -15,7 +15,7 @@ SET(LtsNoti_SRCS lts_notification_export.h ) -NGL_ADD_LIBRARY(WS LtsNotification SHARED ${LtsNoti_SRCS}) +NGL_ADD_LIBRARY2(WS LtsNotification SHARED ${LtsNoti_SRCS}) NGL_TARGET_INCLUDE_DIRECTORIES(LtsNotification PUBLIC diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsNotification/lts_notification.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsNotification/lts_notification.h index 05be741ca..a6487e3f0 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsNotification/lts_notification.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsNotification/lts_notification.h @@ -2,7 +2,7 @@ #pragma once -#include "lts_notification_export.h" +#include "ltsnotification_export.h" #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsNotification/lts_notification_ctl.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsNotification/lts_notification_ctl.h index a179afccf..106d447d8 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsNotification/lts_notification_ctl.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsNotification/lts_notification_ctl.h @@ -2,7 +2,7 @@ #pragma once -#include "lts_notification_export.h" +#include "ltsnotification_export.h" #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsPluginManager/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsPluginManager/CMakeLists.txt index 525e29f46..8ccc77a6d 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsPluginManager/CMakeLists.txt +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsPluginManager/CMakeLists.txt @@ -7,7 +7,7 @@ # LtsPluginLoader -NGL_ADD_LIBRARY(ALL LtsPluginLoader SHARED lts_plugin_loader.cpp lts_plugin_loader.h) +NGL_ADD_LIBRARY2(ALL LtsPluginLoader SHARED lts_plugin_loader.cpp lts_plugin_loader.h) NGL_TARGET_INCLUDE_DIRECTORIES(LtsPluginLoader PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../ @@ -38,7 +38,7 @@ NGL_WRAP_UI(ltspluginmanager_SRCS ) IF(BUILD_RTI) -NGL_ADD_LIBRARY(WS LtsPluginManager SHARED ${ltspluginmanager_SRCS}) +NGL_ADD_LIBRARY2(WS LtsPluginManager SHARED ${ltspluginmanager_SRCS}) NGL_TARGET_INCLUDE_DIRECTORIES(LtsPluginManager PUBLIC diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsPluginManager/Ui/lts_plugin_manager_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsPluginManager/Ui/lts_plugin_manager_dialog.h index dbc510337..f1f03f9eb 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsPluginManager/Ui/lts_plugin_manager_dialog.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsPluginManager/Ui/lts_plugin_manager_dialog.h @@ -3,7 +3,7 @@ #pragma once #include -#include +#include "ltspluginmanager_export.h" #include "lts_plugin_manager_widget.h" #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsPluginManager/lts_plugin_manager.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsPluginManager/lts_plugin_manager.cpp index 9ad219aea..154e25806 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsPluginManager/lts_plugin_manager.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsPluginManager/lts_plugin_manager.cpp @@ -122,7 +122,7 @@ bool LtsPluginManager::startApp(const LtsAppDescriptor::AppDescription &app, boo if (!pluginLoader->loadPlugins(PluginType::DATA, cb)) { - WARNING_LOG(m_logger) << "PluginLoader failed to load data plugins - abort!"; + WARNING_LOG() << "PluginLoader failed to load data plugins - abort!"; return false; } @@ -137,7 +137,7 @@ bool LtsPluginManager::startApp(const LtsAppDescriptor::AppDescription &app, boo if (!pluginLoader->loadPlugins(PluginType::GUI, cbLoadPlugins)) { - WARNING_LOG(m_logger) << "PluginLoader failed to load gui plugins - abort!"; + WARNING_LOG() << "PluginLoader failed to load gui plugins - abort!"; return false; } @@ -255,7 +255,7 @@ bool LtsPluginManager::startApp(const LtsAppDescriptor::AppDescription &app, boo LtsSession::DdsConnectionParams connParamsNew(connParams); if (!connParamsNew.isValid()) { - INFO_LOG(m_logger) << "Invalid connection params given - using default parameter"; + INFO_LOG() << "Invalid connection params given - using default parameter"; connParamsNew.domainId = LtsSessionData::LtsSessionData::getInstance()->getDomainIdPreset(); connParamsNew.partitionId = 0; @@ -277,7 +277,7 @@ bool LtsPluginManager::startApp(const LtsAppDescriptor::AppDescription &app, boo headless, hidden)) { - ERROR_LOG(m_logger) << "Could not create Global Session - abort."; + ERROR_LOG() << "Could not create Global Session - abort."; return false; } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsPluginManager/lts_plugin_manager.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsPluginManager/lts_plugin_manager.h index bcb09d776..f4284ebf5 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsPluginManager/lts_plugin_manager.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsPluginManager/lts_plugin_manager.h @@ -3,7 +3,7 @@ #pragma once -#include "lts_plugin_manager_export.h" +#include "ltspluginmanager_export.h" #include #include @@ -88,7 +88,6 @@ private: friend class DeveloperTools::DevDialog; LtsAppDescriptor::AppDescription m_app; - NGL::INGLLogger &m_logger; bool m_initialized = false; bool m_markedForDeletion; QString m_description; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsPrinting/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsPrinting/CMakeLists.txt index 3c1d27778..45e3c2efa 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsPrinting/CMakeLists.txt +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsPrinting/CMakeLists.txt @@ -16,7 +16,7 @@ SET(SRCS ) if (KDReports_FOUND AND BUILD_RTI) - NGL_ADD_LIBRARY(WS LtsPrinting SHARED ${SRCS}) + NGL_ADD_LIBRARY2(WS LtsPrinting SHARED ${SRCS}) NGL_TARGET_INCLUDE_DIRECTORIES(LtsPrinting PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../ diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsPrinting/printing_base.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsPrinting/printing_base.cpp index 36d959708..19bb89a64 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsPrinting/printing_base.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsPrinting/printing_base.cpp @@ -159,7 +159,7 @@ void Base::setPrintToFile(bool printToFile) QPrinter *Base::printer() { - DEBUG_LOG(m_logger) << "Base::printer" ; + DEBUG_LOG() << "Base::printer" ; return m_printer; } @@ -392,7 +392,7 @@ bool Base::printTableData(QString &str, } str += QLatin1String(""); - DEBUG_LOG(m_logger) << qPrintable(str) ; + DEBUG_LOG() << qPrintable(str) ; return true; } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsPrinting/printing_base.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsPrinting/printing_base.h index b7e59bb7d..2753c8234 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsPrinting/printing_base.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsPrinting/printing_base.h @@ -291,7 +291,6 @@ private: private: NGL::Settings *m_settings; - NGL::INGLLogger &m_logger; QString m_exerciseName; QString m_operatorName; int m_currentPage; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsProjectionWorkstation/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsProjectionWorkstation/CMakeLists.txt index 29c6d0eda..210ef125c 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsProjectionWorkstation/CMakeLists.txt +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsProjectionWorkstation/CMakeLists.txt @@ -26,7 +26,7 @@ SET(LtsProjectionWorkstation_SRCS ) IF(BUILD_RTI) -NGL_ADD_LIBRARY(WS LtsProjectionWorkstation SHARED ${LtsProjectionWorkstation_SRCS}) +NGL_ADD_LIBRARY2(WS LtsProjectionWorkstation SHARED ${LtsProjectionWorkstation_SRCS}) NGL_TARGET_INCLUDE_DIRECTORIES(LtsProjectionWorkstation PUBLIC diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsProjectionWorkstation/WebSocket/message_factory.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsProjectionWorkstation/WebSocket/message_factory.h index 9155b5e8f..635487422 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsProjectionWorkstation/WebSocket/message_factory.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsProjectionWorkstation/WebSocket/message_factory.h @@ -3,7 +3,7 @@ #include #include -#include +#include "ltsprojectionworkstation_export.h" namespace LtsProjectionWorkstation { diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsProjectionWorkstation/WebSocket/messages.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsProjectionWorkstation/WebSocket/messages.h index 84b793157..5c0b0e860 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsProjectionWorkstation/WebSocket/messages.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsProjectionWorkstation/WebSocket/messages.h @@ -8,7 +8,7 @@ #include #include -#include +#include "ltsprojectionworkstation_export.h" #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsProjectionWorkstation/logger.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsProjectionWorkstation/logger.h index 5c34eddf4..d5021abd1 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsProjectionWorkstation/logger.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsProjectionWorkstation/logger.h @@ -4,7 +4,7 @@ #pragma once #include -#include "lts_projection_workstation_export.h" +#include "ltsprojectionworkstation_export.h" namespace LtsProjectionWorkstation { diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsProjectionWorkstation/lts_projection_workstation.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsProjectionWorkstation/lts_projection_workstation.cpp index 08962cbca..5bc878fbc 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsProjectionWorkstation/lts_projection_workstation.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsProjectionWorkstation/lts_projection_workstation.cpp @@ -44,7 +44,6 @@ bool LtsProjectionWorkstation::hasInstance() LtsProjectionWorkstation::LtsProjectionWorkstation(QObject *parent) : QObject(parent) - , m_logger(getLogger("LtsProjetionWorkstation")) , m_messageFactory(new MessageFactory(this, m_logger)) , m_webSocketServer(new LtsWebSocket::LtsWebSocketServer(m_messageFactory, this)) , m_pendingLoginRequest(nullptr) @@ -78,7 +77,7 @@ LoginInformation LtsProjectionWorkstation::pendingLoginRequest() LoginInformation result = *m_pendingLoginRequest; - INFO_LOG(m_logger) << " reset pendingLoginRequest.."; + INFO_LOG() << " reset pendingLoginRequest.."; delete m_pendingLoginRequest; m_pendingLoginRequest = nullptr; @@ -91,7 +90,7 @@ void LtsProjectionWorkstation::handleMessage(LtsWebSocket::AbstractClientMessage CTS::LoginRequest *login = dynamic_cast(message); if (login) { - INFO_LOG(m_logger) << "Login request received!" + INFO_LOG() << "Login request received!" << ", login->userId()=" << login->userId() << " with login->priority()=" << login->priority() << " ;;; m_lastLoginRequest.m_userId=" << m_lastLoginRequest.m_userId @@ -109,16 +108,16 @@ void LtsProjectionWorkstation::handleMessage(LtsWebSocket::AbstractClientMessage - DEBUG_LOG(m_logger) << "Login request received and DedicatedDisconnect distributed, wait some seconds..."; + DEBUG_LOG() << "Login request received and DedicatedDisconnect distributed, wait some seconds..."; int i=0; while(i<20) { - DEBUG_LOG(m_logger) << "Login request received and DedicatedDisconnect distributed, wait some seconds...i=" << i; + DEBUG_LOG() << "Login request received and DedicatedDisconnect distributed, wait some seconds...i=" << i; qApp->processEvents(QEventLoop::AllEvents, 50); QThread::msleep(50); ++i; } - INFO_LOG(m_logger) << "Login request received and DedicatedDisconnect distributed, wait some seconds... done"; + INFO_LOG() << "Login request received and DedicatedDisconnect distributed, wait some seconds... done"; login->addReply((new STC::LoginRequestReply(QUuid::createUuid().toString(), @@ -134,10 +133,10 @@ void LtsProjectionWorkstation::handleMessage(LtsWebSocket::AbstractClientMessage slotLoginRequestReceived(login->userId(), login->exerciseId()); - INFO_LOG(m_logger) << "Valid login request received -> userId: " << login->userId() + INFO_LOG() << "Valid login request received -> userId: " << login->userId() << " priority: " << login->priority() << " exerciseId: " << login->exerciseId(); - DEBUG_LOG(m_logger) << "Logging in now!"; + DEBUG_LOG() << "Logging in now!"; } else @@ -148,17 +147,17 @@ void LtsProjectionWorkstation::handleMessage(LtsWebSocket::AbstractClientMessage QVector()) )->toReplyMessage()); - DEBUG_LOG(m_logger) << "Higher prioritized login received -> userId: " << login->userId() + DEBUG_LOG() << "Higher prioritized login received -> userId: " << login->userId() << " priority: " << login->priority() << " exerciseId: " << login->exerciseId(); - DEBUG_LOG(m_logger) << "Last login data was -> userId: " << m_lastLoginRequest.m_userId + DEBUG_LOG() << "Last login data was -> userId: " << m_lastLoginRequest.m_userId << " priority: " << m_lastLoginRequest.m_priority << " exerciseId: " << m_lastLoginRequest.m_exerciseId; } } else - ERROR_LOG(m_logger) << "invalid login request received -> userId: " << login->userId() + ERROR_LOG() << "invalid login request received -> userId: " << login->userId() << " priority: " << login->priority() << " exerciseId: " << login->exerciseId(); @@ -168,7 +167,7 @@ void LtsProjectionWorkstation::handleMessage(LtsWebSocket::AbstractClientMessage CTS::LogoutRequest *logout = dynamic_cast(message); if (logout) { - DEBUG_LOG(m_logger) << "Logging out now!"; + DEBUG_LOG() << "Logging out now!"; slotLogoutRequestReceived(); return; } @@ -185,7 +184,7 @@ void LtsProjectionWorkstation::handleMessage(LtsWebSocket::AbstractClientMessage int disconnectingUserId = discon->userId(); - INFO_LOG(m_logger) << "Disconnecting now! " + INFO_LOG() << "Disconnecting now! " << ", disconnectingUserId=" << disconnectingUserId << ", m_pendingLoginRequest=" << m_pendingLoginRequest; m_lastLoginRequest = LoginInformation(); @@ -195,7 +194,7 @@ void LtsProjectionWorkstation::handleMessage(LtsWebSocket::AbstractClientMessage void LtsProjectionWorkstation::slotLoginRequestReceived(int userId, int exerciseId) { - INFO_LOG(m_logger) << "slotLoginRequestReceived.." + INFO_LOG() << "slotLoginRequestReceived.." << ", userId=" << userId << ", exerciseId=" << exerciseId; delete m_pendingLoginRequest; @@ -220,17 +219,17 @@ void LtsProjectionWorkstation::slotLogoffDone() void LtsProjectionWorkstation::clientDisconnected(LtsWebSocket::ClientConnection *client) { - INFO_LOG(m_logger) << LOGFUNCTION << " START" + INFO_LOG() << Q_FUNC_INFO << " START" << ", m_connections.size = " << m_connections.size(); m_connections.removeOne(client); if ( m_connections.size() == 0 && (m_lastLoginRequest.m_userId != 0 || m_lastLoginRequest.m_priority != 0)) { - INFO_LOG(m_logger) << LOGFUNCTION << " reset m_lastLoginRequest"; + INFO_LOG() << Q_FUNC_INFO << " reset m_lastLoginRequest"; m_lastLoginRequest = LoginInformation(); } - INFO_LOG(m_logger) << LOGFUNCTION << " END" + INFO_LOG() << Q_FUNC_INFO << " END" << ", m_connections.size = " << m_connections.size(); } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsProjectionWorkstation/lts_projection_workstation.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsProjectionWorkstation/lts_projection_workstation.h index aedeb160a..d5cfe7a48 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsProjectionWorkstation/lts_projection_workstation.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsProjectionWorkstation/lts_projection_workstation.h @@ -3,7 +3,7 @@ #pragma once -#include "lts_projection_workstation_export.h" +#include "ltsprojectionworkstation_export.h" #include "vnc_server_manager.h" #include "WebSocket/messages.h" #include "logger.h" diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsProjectionWorkstation/vnc_server_manager.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsProjectionWorkstation/vnc_server_manager.cpp index 50dfa8724..5d3cf22f5 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsProjectionWorkstation/vnc_server_manager.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsProjectionWorkstation/vnc_server_manager.cpp @@ -48,7 +48,7 @@ bool VncServerManager::init(const QList &screens) const auto sortedScreens = sortScreen(screens); - DEBUG_LOG(m_logger) << "Setup VNCScreens with " << screens.size() << " screens"; + DEBUG_LOG() << "Setup VNCScreens with " << screens.size() << " screens"; int count = 1; @@ -77,13 +77,13 @@ bool VncServerManager::init(const QList &screens) count++; } - DEBUG_LOG(m_logger) << m_vncScreens.size() << " VNCScreen(s) created - Setup completed."; + DEBUG_LOG() << m_vncScreens.size() << " VNCScreen(s) created - Setup completed."; return true; } void VncServerManager::startScreens() { - DEBUG_LOG(m_logger) << "Starting " << m_vncScreens.size() << " VNCScreen(s) ... "; + DEBUG_LOG() << "Starting " << m_vncScreens.size() << " VNCScreen(s) ... "; for (const VncScreen &s : std::as_const(m_vncScreens)) { connect(s.proc, &QProcess::readyReadStandardOutput, @@ -95,16 +95,16 @@ void VncServerManager::startScreens() for (const VncScreen &s : std::as_const(m_vncScreens)) { if (!s.proc->waitForStarted(2000)) - ERROR_LOG(m_logger) << "Can not start process '" << s.proc->program() << "': " + ERROR_LOG() << "Can not start process '" << s.proc->program() << "': " << s.proc->errorString(); } - DEBUG_LOG(m_logger) << "Done"; + DEBUG_LOG() << "Done"; } void VncServerManager::stopScreens() { - DEBUG_LOG(m_logger) << "Stopping " << m_vncScreens.size() << " VNCScreen(s) ..."; + DEBUG_LOG() << "Stopping " << m_vncScreens.size() << " VNCScreen(s) ..."; for (const VncScreen &s : std::as_const(m_vncScreens)) { @@ -116,28 +116,28 @@ void VncServerManager::stopScreens() if (!s.proc->waitForFinished(2000)) s.proc->kill(); } - DEBUG_LOG(m_logger) << "Done"; + DEBUG_LOG() << "Done"; } void VncServerManager::killScreens() { - DEBUG_LOG(m_logger) << "Killing all exisiting x11vnc processes ..."; + DEBUG_LOG() << "Killing all exisiting x11vnc processes ..."; SingleShotProcess ssp(QStringLiteral("killall x11vnc")); ssp.execute(); - DEBUG_LOG(m_logger) << "Done"; + DEBUG_LOG() << "Done"; } void VncServerManager::createPwdFile() { - DEBUG_LOG(m_logger) << "(Re)creating x11vnc password-file ..."; + DEBUG_LOG() << "(Re)creating x11vnc password-file ..."; SingleShotProcess ssp(QStringLiteral("x11vnc -storepasswd ctc11de %1/.vnc/passwd") .arg(QDir::home().absolutePath())); ssp.execute(); - DEBUG_LOG(m_logger) << "Done"; + DEBUG_LOG() << "Done"; } @@ -151,7 +151,7 @@ void VncServerManager::slotReadStandardOutput() QRegularExpressionMatch match = QRegularExpression(QStringLiteral("PORT=(.*?)\\s")).match(stdOut); if (!match.hasMatch()) { - WARNING_LOG(m_logger) << "Could not retrieve port information from stdout of " << p->program(); + WARNING_LOG() << "Could not retrieve port information from stdout of " << p->program(); return; } const quint16 port = match.capturedRef(1).toInt(); @@ -172,7 +172,7 @@ void VncServerManager::slotErrorOccured() { QProcess *p = qobject_cast(QObject::sender()); if (p) - ERROR_LOG(m_logger) << p->errorString(); + ERROR_LOG() << p->errorString(); } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsScriptTimeline/filter_track_widget.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsScriptTimeline/filter_track_widget.h index 1c83774c1..f4224d71c 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsScriptTimeline/filter_track_widget.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsScriptTimeline/filter_track_widget.h @@ -1,7 +1,7 @@ #pragma once #include -#include +#include "ltsscripttimeline_export.h" #include "track_entry_painters.h" #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsScriptTimeline/script_timeline.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsScriptTimeline/script_timeline.h index 83b7c8523..376fcc88f 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsScriptTimeline/script_timeline.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsScriptTimeline/script_timeline.h @@ -1,7 +1,7 @@ #pragma once #include -#include +#include "ltsscripttimeline_export.h" #include "track_entry_painters.h" #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsScriptTimeline/track_content_widget.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsScriptTimeline/track_content_widget.h index fd89a1fe9..f5791db67 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsScriptTimeline/track_content_widget.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsScriptTimeline/track_content_widget.h @@ -1,7 +1,7 @@ #pragma once #include -#include +#include "ltsscripttimeline_export.h" #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsScriptTimeline/track_drag_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsScriptTimeline/track_drag_handler.h index 185db4c25..968e08b5b 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsScriptTimeline/track_drag_handler.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsScriptTimeline/track_drag_handler.h @@ -1,6 +1,6 @@ #pragma once -#include +#include "ltsscripttimeline_export.h" #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsScriptTimeline/track_entry.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsScriptTimeline/track_entry.h index 98ca84186..1d45b4fc5 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsScriptTimeline/track_entry.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsScriptTimeline/track_entry.h @@ -1,6 +1,6 @@ #pragma once -#include +#include "ltsscripttimeline_export.h" #include "track_entry_painters.h" #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsScriptTimeline/track_entry_painters.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsScriptTimeline/track_entry_painters.h index 0a19597b4..3d3ef5afc 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsScriptTimeline/track_entry_painters.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsScriptTimeline/track_entry_painters.h @@ -3,7 +3,7 @@ #pragma once -#include +#include "ltsscripttimeline_export.h" #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsScriptTimeline/track_entry_preview_widget.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsScriptTimeline/track_entry_preview_widget.h index 115d1ec66..3e7c5d6fd 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsScriptTimeline/track_entry_preview_widget.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsScriptTimeline/track_entry_preview_widget.h @@ -1,7 +1,7 @@ #pragma once #include -#include +#include "ltsscripttimeline_export.h" #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsScriptTimeline/track_resize_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsScriptTimeline/track_resize_handler.h index c8133dcd2..570044775 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsScriptTimeline/track_resize_handler.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsScriptTimeline/track_resize_handler.h @@ -1,6 +1,6 @@ #pragma once -#include +#include "ltsscripttimeline_export.h" #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsScriptTimeline/track_select_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsScriptTimeline/track_select_handler.h index 044ee4cb7..589ebf2be 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsScriptTimeline/track_select_handler.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsScriptTimeline/track_select_handler.h @@ -2,7 +2,7 @@ #include -#include +#include "ltsscripttimeline_export.h" class QMouseEvent; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsScriptTimeline/track_widget.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsScriptTimeline/track_widget.h index 75ab437a4..91c367329 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsScriptTimeline/track_widget.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsScriptTimeline/track_widget.h @@ -1,7 +1,7 @@ #pragma once #include -#include +#include "ltsscripttimeline_export.h" #include "track_entry_painters.h" #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsSerialPortQuerry/lts_comport_querry.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsSerialPortQuerry/lts_comport_querry.h index e6ecd3a50..6dd71ca0b 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsSerialPortQuerry/lts_comport_querry.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsSerialPortQuerry/lts_comport_querry.h @@ -1,6 +1,6 @@ #pragma once -#include "lts_serial_port_querry_export.h" +#include "ltsserialportquerry_export.h" #include "lts_seri" #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsSerialPortQuerry/lts_serial_port_querry.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsSerialPortQuerry/lts_serial_port_querry.cpp index daa9b81b4..01f367208 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsSerialPortQuerry/lts_serial_port_querry.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsSerialPortQuerry/lts_serial_port_querry.cpp @@ -15,7 +15,6 @@ LtsSerialPortQuerry::LtsSerialPortQuerry(QObject *parent) , m_parity(QSerialPort::NoParity) , m_stopBits(QSerialPort::OneStop) , m_currentSerialPort(nullptr) - , m_logger(getLogger("LtsSerialPortQuerry")) { @@ -50,7 +49,7 @@ void LtsSerialPortQuerry::continueQuerry() void LtsSerialPortQuerry::restartQuerry() { - DEBUG_LOG(m_logger) << "restart querry "; + DEBUG_LOG() << "restart querry "; m_serialPortInfos = QSerialPortInfo::availablePorts(); m_currentQuerry = 0; if (m_serialPortInfos.size()) @@ -74,20 +73,20 @@ void LtsSerialPortQuerry::querrySerialPort(const QSerialPortInfo &info) m_currentSerialPort->setStopBits(m_stopBits); m_currentSerialPort->setFlowControl(m_flowControll); - DEBUG_LOG(m_logger) << "Try opening Comport:" << m_currentSerialPort->portName() << " index is: " << m_currentQuerry; + DEBUG_LOG() << "Try opening Comport:" << m_currentSerialPort->portName() << " index is: " << m_currentQuerry; if (!m_currentSerialPort->open(QSerialPort::ReadWrite)) { - DEBUG_LOG(m_logger) << "Oppening failed query next"; + DEBUG_LOG() << "Oppening failed query next"; continueQuerry(); }else { connect(m_currentSerialPort, &QSerialPort::errorOccurred, this, &LtsSerialPortQuerry::onSerialPortError, Qt::UniqueConnection); - DEBUG_LOG(m_logger) << "Oppened comport" << m_currentSerialPort->portName(); + DEBUG_LOG() << "Oppened comport" << m_currentSerialPort->portName(); emit connectionEstablished(); } } @@ -111,7 +110,7 @@ void LtsSerialPortQuerry::onSerialPortError(QSerialPort::SerialPortError serialP if (!m_currentSerialPort) return; - DEBUG_LOG(m_logger) << "Spontaneous error " << serialPortError << " doesn't have to be an error ..."; + DEBUG_LOG() << "Spontaneous error " << serialPortError << " doesn't have to be an error ..."; const QString errStr(QStringLiteral("QSerialPort::SerialPortError ") + QString::number(serialPortError) + QStringLiteral(" from serial port ") + m_currentSerialPort->portName() + @@ -130,19 +129,19 @@ void LtsSerialPortQuerry::onSerialPortError(QSerialPort::SerialPortError serialP case QSerialPort::SerialPortError::NotOpenError: case QSerialPort::SerialPortError::UnknownError: { - ERROR_LOG(m_logger) << "Closing port and try to reopen it. " << m_currentSerialPort->portName(); + ERROR_LOG() << "Closing port and try to reopen it. " << m_currentSerialPort->portName(); continueQuerry(); Q_FALLTHROUGH(); } case QSerialPort::SerialPortError::UnsupportedOperationError: { - ERROR_LOG(m_logger) << errStr; + ERROR_LOG() << errStr; break; } default: { - ERROR_LOG(m_logger) << "Got an Error> " << errStr << "restarting"; + ERROR_LOG() << "Got an Error> " << errStr << "restarting"; continueQuerry(); break; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsSerialPortQuerry/lts_serial_port_querry.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsSerialPortQuerry/lts_serial_port_querry.h index c8e4965d5..4cd81291e 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsSerialPortQuerry/lts_serial_port_querry.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsSerialPortQuerry/lts_serial_port_querry.h @@ -1,6 +1,6 @@ #pragma once -#include +#include "ltsserialportquerry_export.h" #include "logger.h" @@ -49,8 +49,6 @@ private: QSerialPort::Parity m_parity; QSerialPort::StopBits m_stopBits; QSerialPort *m_currentSerialPort; - - LOGGER_T m_logger; }; } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsSession/lts_session.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsSession/lts_session.h index ffe40bfbf..a611d6dfc 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsSession/lts_session.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsSession/lts_session.h @@ -7,7 +7,7 @@ #include "lts_session_data_dds.h" #include "lts_session_manager.h" -#include +#include "ltssession_export.h" #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsSession/lts_session_data.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsSession/lts_session_data.h index a79f5e812..78d00e7e7 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsSession/lts_session_data.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsSession/lts_session_data.h @@ -1,6 +1,6 @@ #pragma once -#include +#include "ltssessiondata_export.h" #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsSession/lts_session_data_dds.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsSession/lts_session_data_dds.cpp index 71e29f4bf..4a6c2541b 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsSession/lts_session_data_dds.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsSession/lts_session_data_dds.cpp @@ -341,7 +341,7 @@ bool LtsSessionDataDds::initInternal() { if (!m_ddsConnector || !m_ddsConnector->init(m_qosFileList)) { - ERROR_LOG(m_logger) << "DDS connector could not be initialized - session aborted!"; + ERROR_LOG() << "DDS connector could not be initialized - session aborted!"; m_ddsConnector = nullptr; return false; } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsSession/lts_session_data_dds.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsSession/lts_session_data_dds.h index e9e3fbbb5..6a96edb68 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsSession/lts_session_data_dds.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsSession/lts_session_data_dds.h @@ -11,7 +11,7 @@ #include #include -#include +#include "ltssessiondatadds_export.h" namespace DataPluginBase { class Interface; } @@ -123,7 +123,7 @@ public: if ( bEnableAll && !member->enableAll()) { member = nullptr; - ERROR_LOG(m_logger) << "Error initializing dtc/ftc for service " << T::identifier(); + ERROR_LOG() << "Error initializing dtc/ftc for service " << T::identifier(); return false; } return true; @@ -138,7 +138,7 @@ public: { dtc = nullptr; ftc = nullptr; - ERROR_LOG(m_logger) << "Error initializing dtc/ftc for service " << T::identifier(); + ERROR_LOG() << "Error initializing dtc/ftc for service " << T::identifier(); return false; } return true; @@ -157,7 +157,7 @@ public: } } val.reset(); - DEBUG_LOG(m_logger) << "Trying to load dtc " << typeid(T).name() << " - " << typeid(S).name() << " failed!" + DEBUG_LOG() << "Trying to load dtc " << typeid(T).name() << " - " << typeid(S).name() << " failed!" << ", m_dataPluginInterfaces.size() = " << m_dataPluginInterfaces.size() << " - " << this; return false; } @@ -176,7 +176,7 @@ public: } } val.reset(); - DEBUG_LOG(m_logger) << "Trying to load ftc " << typeid(T).name() << " - " << typeid(S).name() << " failed!" + DEBUG_LOG() << "Trying to load ftc " << typeid(T).name() << " - " << typeid(S).name() << " failed!" << ", m_dataPluginInterfaces.size() = " << m_dataPluginInterfaces.size() << " - " << this; return false; } @@ -198,7 +198,7 @@ public: } } val.reset(); - DEBUG_LOG(m_logger) << "Trying to load foreign data ifc " << typeid(T).name() << " - " << typeid(S).name() << " failed!" + DEBUG_LOG() << "Trying to load foreign data ifc " << typeid(T).name() << " - " << typeid(S).name() << " failed!" << ", m_dataPluginInterfaces.size() = " << m_dataPluginInterfaces.size() << " - " << this; return false; } @@ -220,7 +220,7 @@ public: return true; } val.reset(); - DEBUG_LOG(m_logger) << "Trying to load foreign data ifc " << typeid(S).name() << " failed!" + DEBUG_LOG() << "Trying to load foreign data ifc " << typeid(S).name() << " failed!" << ", m_guiPluginInterfaces.size() = " << m_guiPluginInterfaces.size() << " - " << this; return false; } @@ -238,7 +238,7 @@ public: return true; } val.reset(); - DEBUG_LOG(m_logger) << "Cannot find foreign gui ifc " << typeid(S).name() << " in " << toString(); + DEBUG_LOG() << "Cannot find foreign gui ifc " << typeid(S).name() << " in " << toString(); return false; } @@ -254,7 +254,7 @@ public: return true; } val.reset(); - DEBUG_LOG(m_logger) << "Trying to load foreign gui ifc #2 " << typeid(S).name() << " failed!" + DEBUG_LOG() << "Trying to load foreign gui ifc #2 " << typeid(S).name() << " failed!" << ", m_guiPluginInterfaces.size() = " << m_guiPluginInterfaces.size() << " - " << this; return false; } @@ -285,7 +285,6 @@ protected: QMap> m_initializeThesePlugins; Fetcher *m_fetcher; QStringList m_qosFileList; - NGL::INGLLogger &m_logger; }; @@ -306,7 +305,6 @@ public: bool m_errors; QString m_caller; QString m_whatWillNotWork; - NGL::INGLLogger &m_logger; bool m_optional; QString m_resultType; QString m_getterFunctionType; @@ -337,11 +335,11 @@ public: if (m_optional) { - INFO_LOG(m_logger) << msg.arg(m_caller, m_resultType, m_sessionDataDds->toString(), QStringLiteral("' - optional but %1 will not work").arg(m_whatWillNotWork)); + INFO_LOG() << msg.arg(m_caller, m_resultType, m_sessionDataDds->toString(), QStringLiteral("' - optional but %1 will not work").arg(m_whatWillNotWork)); } else { - ERROR_LOG(m_logger) << msg.arg(m_caller, m_resultType, m_sessionDataDds->toString(), QStringLiteral(" which is required")); + ERROR_LOG() << msg.arg(m_caller, m_resultType, m_sessionDataDds->toString(), QStringLiteral(" which is required")); } } }; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsSession/lts_session_lock_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsSession/lts_session_lock_handler.cpp index 7099cf1c3..f5e824279 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsSession/lts_session_lock_handler.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsSession/lts_session_lock_handler.cpp @@ -15,42 +15,42 @@ TopicLockHandler::TopicLockHandler() : QObject() , m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger().getNGLLogger("LtsSession.TopicLockHandler")) { - TRACE_LOG(m_logger) << LOGFUNCTION << " START"; - TRACE_LOG(m_logger) << LOGFUNCTION << " END"; + TRACE_LOG() << Q_FUNC_INFO << " START"; + TRACE_LOG() << Q_FUNC_INFO << " END"; } TopicLockHandler::~TopicLockHandler() { - TRACE_LOG(m_logger) << LOGFUNCTION << " START"; - TRACE_LOG(m_logger) << LOGFUNCTION << " END"; + TRACE_LOG() << Q_FUNC_INFO << " START"; + TRACE_LOG() << Q_FUNC_INFO << " END"; } bool TopicLockHandler::init(const std::shared_ptr &coreFtc, int exerciseId) { - TRACE_LOG(m_logger) << LOGFUNCTION << " START"; + TRACE_LOG() << Q_FUNC_INFO << " START"; if (coreFtc == nullptr) return false; coreFtc->enableAll(); m_exerciseId = exerciseId; m_coreFtc = coreFtc; - TRACE_LOG(m_logger) << LOGFUNCTION << " END"; + TRACE_LOG() << Q_FUNC_INFO << " END"; return true; } bool TopicLockHandler::lock() { - INFO_LOG(m_logger) << "LOCK " << m_topicInfo.topicName(); - TRACE_LOG(m_logger) << LOGFUNCTION << objStateAsString(); + INFO_LOG() << "LOCK " << m_topicInfo.topicName(); + TRACE_LOG() << Q_FUNC_INFO << objStateAsString(); if (m_coreFtc == nullptr) return false; if (m_locked) { - ERROR_LOG(m_logger) << LOGFUNCTION << ": called lock while still locked! " << m_lockEntityId; + ERROR_LOG() << Q_FUNC_INFO << ": called lock while still locked! " << m_lockEntityId; Q_ASSERT(false); return false; } @@ -71,13 +71,13 @@ bool TopicLockHandler::lock() { const Core::TryLockEntityReply reply(m_coreFtc->tryLockEntityRequest(req)); - TRACE_LOG(m_logger) << LOGFUNCTION << ": Reply received - state=" << objStateAsString() + TRACE_LOG() << Q_FUNC_INFO << ": Reply received - state=" << objStateAsString() << " - reply=" << reply; if (reply.alreadyLocked().is_set()) { const Core::LockEntityError &alreadyLocked = reply.alreadyLocked().get(); - INFO_LOG(m_logger) << LOGFUNCTION << ": Topic already locked by ws " << alreadyLocked.workstationName() << " and op " << alreadyLocked.operatorName(); + INFO_LOG() << Q_FUNC_INFO << ": Topic already locked by ws " << alreadyLocked.workstationName() << " and op " << alreadyLocked.operatorName(); @@ -88,7 +88,7 @@ bool TopicLockHandler::lock() } else { - DEBUG_LOG(m_logger) << LOGFUNCTION << ": Topic NOT already locked"; + DEBUG_LOG() << Q_FUNC_INFO << ": Topic NOT already locked"; Q_ASSERT(reply.id() > 0); m_locked = true; @@ -97,7 +97,7 @@ bool TopicLockHandler::lock() } catch (const std::runtime_error &err) { - ERROR_LOG(m_logger) << LOGFUNCTION << ": Failed to lock topic! " << err.what(); + ERROR_LOG() << Q_FUNC_INFO << ": Failed to lock topic! " << err.what(); Q_ASSERT(false); return false; } @@ -107,15 +107,15 @@ bool TopicLockHandler::lock() bool TopicLockHandler::unlock() { - INFO_LOG(m_logger) << "UNLOCK " << m_topicInfo.topicName() << " - " << m_lockEntityId; - TRACE_LOG(m_logger) << LOGFUNCTION << objStateAsString(); + INFO_LOG() << "UNLOCK " << m_topicInfo.topicName() << " - " << m_lockEntityId; + TRACE_LOG() << Q_FUNC_INFO << objStateAsString(); if (m_coreFtc == nullptr) return false; if (!m_locked) { - ERROR_LOG(m_logger) << LOGFUNCTION << ": Tried to unlock while unlocked.. " << objStateAsString(); + ERROR_LOG() << Q_FUNC_INFO << ": Tried to unlock while unlocked.. " << objStateAsString(); Q_ASSERT(false); return false; } @@ -132,14 +132,14 @@ bool TopicLockHandler::unlock() { const auto reply(m_coreFtc->tryUnlockEntityRequest(req)); - TRACE_LOG(m_logger) << LOGFUNCTION << ": Reply received - state=" << objStateAsString() + TRACE_LOG() << Q_FUNC_INFO << ": Reply received - state=" << objStateAsString() << " - reply=" << reply; - DEBUG_LOG(m_logger) << LOGFUNCTION << ": Topic unlocked!"; + DEBUG_LOG() << Q_FUNC_INFO << ": Topic unlocked!"; } catch (const std::runtime_error &err) { - ERROR_LOG(m_logger) << LOGFUNCTION << ": Failed to unlock topic! " << err.what(); + ERROR_LOG() << Q_FUNC_INFO << ": Failed to unlock topic! " << err.what(); return false; } @@ -168,31 +168,31 @@ std::string TopicLockHandler::objStateAsString() const bool TopicLockHandler::slotUnlock() { - TRACE_LOG(m_logger) << LOGFUNCTION << " slotUnlock" << objStateAsString(); + TRACE_LOG() << Q_FUNC_INFO << " slotUnlock" << objStateAsString(); return unlock(); } void TopicLockHandler::slotTryLock(const LtsWidgets::TopicInfo &topicInfo) { - TRACE_LOG(m_logger) << LOGFUNCTION << " START " << objStateAsString(); + TRACE_LOG() << Q_FUNC_INFO << " START " << objStateAsString(); m_topicInfo = topicInfo; if (m_topicInfo.topicName().isEmpty() || !topicInfo.isValid()) { - DEBUG_LOG(m_logger) << LOGFUNCTION << " no lockable topic, that's okay"; + DEBUG_LOG() << Q_FUNC_INFO << " no lockable topic, that's okay"; return; } lock(); - TRACE_LOG(m_logger) << LOGFUNCTION << " END " << objStateAsString(); + TRACE_LOG() << Q_FUNC_INFO << " END " << objStateAsString(); } void TopicLockHandler::slotFinalize() { - TRACE_LOG(m_logger) << LOGFUNCTION << " START " << objStateAsString(); + TRACE_LOG() << Q_FUNC_INFO << " START " << objStateAsString(); if (m_locked) { @@ -201,7 +201,7 @@ void TopicLockHandler::slotFinalize() deleteLater(); - TRACE_LOG(m_logger) << LOGFUNCTION << " END " << objStateAsString(); + TRACE_LOG() << Q_FUNC_INFO << " END " << objStateAsString(); } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsSession/lts_session_lock_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsSession/lts_session_lock_handler.h index aa591ef34..8cd8fdf0b 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsSession/lts_session_lock_handler.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsSession/lts_session_lock_handler.h @@ -1,7 +1,7 @@ #pragma once #include -#include +#include "ltssession_export.h" #include #include @@ -51,8 +51,6 @@ private: bool m_locked{false}; bool m_askedForLock{false}; bool m_deleteAfterAnswer{false}; - - NGL::INGLLogger &m_logger; }; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsSession/lts_session_manager.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsSession/lts_session_manager.cpp index 6b3563617..f95f32cf2 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsSession/lts_session_manager.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsSession/lts_session_manager.cpp @@ -108,7 +108,7 @@ LtsSession *LtsSessionManager::createSession(const DdsConnectionParams &connPara if (session != nullptr) { - WARNING_LOG(m_logger) << "Tried to create a Session that already exists"; + WARNING_LOG() << "Tried to create a Session that already exists"; return nullptr; } @@ -140,7 +140,7 @@ LtsSession *LtsSessionManager::createSession(const DdsConnectionParams &connPara return; } - WARNING_LOG(m_logger) << "Previously deleted Session " << session->partitionId() << "/" + WARNING_LOG() << "Previously deleted Session " << session->partitionId() << "/" << session->partitionType() << " is still alive!"; }); #endif diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsSession/lts_session_manager.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsSession/lts_session_manager.h index 74477c3c7..32d989d95 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsSession/lts_session_manager.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsSession/lts_session_manager.h @@ -3,7 +3,7 @@ #pragma once -#include +#include "ltssession_export.h" #include #include #include @@ -86,8 +86,6 @@ private: QVector m_guiPluginList; LtsAppDescriptor::App m_appId; bool m_headless; - NGL::INGLLogger &m_logger; - private slots: void slotCloseSession(); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/item.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/item.h index 955c56e20..759133f4c 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/item.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/item.h @@ -3,7 +3,7 @@ #pragma once -#include +#include "ltstimeline_export.h" #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/item_delegate.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/item_delegate.h index 2955c036d..674281038 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/item_delegate.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/item_delegate.h @@ -4,7 +4,7 @@ #pragma once #include -#include +#include "ltstimeline_export.h" #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/timeline_header_view.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/timeline_header_view.h index 38e4d6d78..a80af95b3 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/timeline_header_view.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/timeline_header_view.h @@ -4,7 +4,7 @@ #include "timeline_header_view_mouse_handler.h" #include "timeline_utils.h" -#include +#include "ltstimeline_export.h" #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/timeline_header_view_mouse_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/timeline_header_view_mouse_handler.h index 8ca858f9f..fc7dda80d 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/timeline_header_view_mouse_handler.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/timeline_header_view_mouse_handler.h @@ -1,6 +1,6 @@ #pragma once -#include +#include "ltstimeline_export.h" #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/timeline_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/timeline_model.cpp index c7adeb3f3..a4cb527b6 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/timeline_model.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/timeline_model.cpp @@ -339,12 +339,12 @@ QModelIndex TimelineModel::index(int row, int column, const QModelIndex &parent) } catch (const QString &msg) { - DEBUG_LOG(m_logger) << Q_FUNC_INFO << "cannot get parent track " << msg; + DEBUG_LOG() << Q_FUNC_INFO << "cannot get parent track " << msg; return {}; } catch (const std::out_of_range &oor) { - DEBUG_LOG(m_logger) << Q_FUNC_INFO << "cannot get child track " << QString::fromUtf8(oor.what()); + DEBUG_LOG() << Q_FUNC_INFO << "cannot get child track " << QString::fromUtf8(oor.what()); return {}; } @@ -455,7 +455,7 @@ QModelIndex TimelineModel::parent(const QModelIndex &index) const } catch (const QString &msg) { - DEBUG_LOG(m_logger) << Q_FUNC_INFO << "cannot get parent of track with id" << trackId << msg; + DEBUG_LOG() << Q_FUNC_INFO << "cannot get parent of track with id" << trackId << msg; return {}; } @@ -473,13 +473,13 @@ QModelIndex TimelineModel::parent(const QModelIndex &index) const } catch (const QString &msg) { - DEBUG_LOG(m_logger) << Q_FUNC_INFO << "row of track for parent not found for parent id" << parentId << "-" << msg; + DEBUG_LOG() << Q_FUNC_INFO << "row of track for parent not found for parent id" << parentId << "-" << msg; return {}; } } catch (const QString &msg) { - DEBUG_LOG(m_logger) << Q_FUNC_INFO << "super parent not found for super parent id" << superParentId << "-" << msg; + DEBUG_LOG() << Q_FUNC_INFO << "super parent not found for super parent id" << superParentId << "-" << msg; return {}; } @@ -722,11 +722,11 @@ void TimelineModel::setMinimumDuration(int duration) { if (duration < 0) { - WARNING_LOG(m_logger) << "negative duration is not possible -> setting minimum duration to 0"; + WARNING_LOG() << "negative duration is not possible -> setting minimum duration to 0"; duration = 0; } if (duration % 1000 && m_isSnapEnabled) - WARNING_LOG(m_logger) << "Snapping to 1000ms enabled, yet minimum duration is not a multiple of 1000ms: " << duration; + WARNING_LOG() << "Snapping to 1000ms enabled, yet minimum duration is not a multiple of 1000ms: " << duration; m_minItemDuration = duration; } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/timeline_model.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/timeline_model.h index 51c881f50..3dc8c9bec 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/timeline_model.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/timeline_model.h @@ -7,7 +7,7 @@ #include "item.h" #include "track.h" -#include +#include "ltstimeline_export.h" #include #include @@ -241,8 +241,6 @@ protected: std::map m_itemCache; Items m_clipboard; - - NGL::INGLLogger &m_logger; }; } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/timeline_utils.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/timeline_utils.h index 2b710c471..9b1374eac 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/timeline_utils.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/timeline_utils.h @@ -1,6 +1,6 @@ #pragma once -#include +#include "ltstimeline_export.h" #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/timeline_view.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/timeline_view.cpp index 00fd9ce1a..c2b192c3b 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/timeline_view.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/timeline_view.cpp @@ -76,7 +76,7 @@ void TimelineView::setHeader(QHeaderView *header) } catch (...) { - ERROR_LOG(m_logger) << "header view should be of type TimelineHeaderView"; + ERROR_LOG() << "header view should be of type TimelineHeaderView"; } } @@ -125,7 +125,7 @@ void TimelineView::setItemDelegate(QAbstractItemDelegate *delegate) } catch (...) { - ERROR_LOG(m_logger) << "item delegate for TimelineView must be derived from ItemDelegate"; + ERROR_LOG() << "item delegate for TimelineView must be derived from ItemDelegate"; } } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/timeline_view.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/timeline_view.h index cc8487315..ef97962b2 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/timeline_view.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/timeline_view.h @@ -11,7 +11,7 @@ #include "timeline_header_view.h" #include "timeline_model.h" -#include +#include "ltstimeline_export.h" #include @@ -168,9 +168,6 @@ private: QPoint m_cursorPosition; QVector m_selectedItemIds; - - NGL::INGLLogger &m_logger; - }; } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/timeline_view_drag_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/timeline_view_drag_handler.h index 409c1d3c9..9ba2cac01 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/timeline_view_drag_handler.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/timeline_view_drag_handler.h @@ -2,7 +2,7 @@ #include "timeline_view.h" -#include +#include "ltstimeline_export.h" #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/timeline_view_resize_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/timeline_view_resize_handler.h index 7fcaff9b5..e400fce44 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/timeline_view_resize_handler.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/timeline_view_resize_handler.h @@ -1,6 +1,6 @@ #pragma once -#include +#include "ltstimeline_export.h" #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/timeline_view_selection_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/timeline_view_selection_handler.h index 354a2cc55..d16deb15d 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/timeline_view_selection_handler.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/timeline_view_selection_handler.h @@ -2,7 +2,7 @@ #include "timeline_view.h" -#include +#include "ltstimeline_export.h" #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/timeline_view_track_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/timeline_view_track_handler.h index 16b108291..467fcd4fc 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/timeline_view_track_handler.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/timeline_view_track_handler.h @@ -1,6 +1,6 @@ #pragma once -#include +#include "ltstimeline_export.h" #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/timeline_widget.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/timeline_widget.h index 4b7fd8890..5bed5d4b1 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/timeline_widget.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/timeline_widget.h @@ -6,7 +6,7 @@ #include "timeline_utils.h" -#include +#include "ltstimeline_export.h" #include #include @@ -108,8 +108,6 @@ signals: private: Ui::Timeline *m_ui{nullptr}; - NGL::INGLLogger &m_logger; - }; } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/track.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/track.h index 6ef03320d..07c91f8c9 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/track.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/track.h @@ -5,7 +5,7 @@ #include "item.h" -#include +#include "ltstimeline_export.h" #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimelineClassic/AbstractTimelineModel.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimelineClassic/AbstractTimelineModel.h index c1d32525f..5d09ebfc2 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimelineClassic/AbstractTimelineModel.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimelineClassic/AbstractTimelineModel.h @@ -6,7 +6,7 @@ #include "Event.h" #include "Item.h" -#include +#include "ltstimelineclassic_export.h" #include #include @@ -45,9 +45,6 @@ public: protected: - NGL::INGLLogger &m_logger; - - protected: diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimelineClassic/Event.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimelineClassic/Event.h index 45001518f..0b8e5ea4d 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimelineClassic/Event.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimelineClassic/Event.h @@ -3,7 +3,7 @@ #pragma once -#include +#include "ltstimelineclassic_export.h" #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimelineClassic/EventGraphic.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimelineClassic/EventGraphic.h index 969ce88c7..b92ef62bc 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimelineClassic/EventGraphic.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimelineClassic/EventGraphic.h @@ -6,7 +6,7 @@ #include "EventList.h" #include "Event.h" -#include +#include "ltstimelineclassic_export.h" namespace LtsTimelineClassic { diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimelineClassic/EventTools.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimelineClassic/EventTools.h index 0919c108b..3d32fcf39 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimelineClassic/EventTools.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimelineClassic/EventTools.h @@ -5,7 +5,7 @@ #include "EventList.h" -#include +#include "ltstimelineclassic_export.h" #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimelineClassic/Item.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimelineClassic/Item.h index 346351095..e9df8c18f 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimelineClassic/Item.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimelineClassic/Item.h @@ -3,7 +3,7 @@ #pragma once -#include +#include "ltstimelineclassic_export.h" #include "EventList.h" #include "PassiveEventContainer.h" diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimelineClassic/TimelineIndicator.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimelineClassic/TimelineIndicator.cpp index 4247b90e9..70d91fcf1 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimelineClassic/TimelineIndicator.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimelineClassic/TimelineIndicator.cpp @@ -380,7 +380,7 @@ void TimelineIndicator::refreshData() if (steps > 60000 || steps < 1) { - ERROR_LOG(m_logger) << "More than 60000 ("< -#include +#include "ltstimelineclassic_export.h" #include "Range.h" #include @@ -60,8 +60,6 @@ private: void setTimelineRange(qint64 min, qint64 max); void refreshData(); - - NGL::INGLLogger &m_logger; Ui::Timeline *m_timelineUi; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsCore/dds_vector_to_pixmap.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsCore/dds_vector_to_pixmap.h index f94966b45..6684acf46 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsCore/dds_vector_to_pixmap.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsCore/dds_vector_to_pixmap.h @@ -3,7 +3,7 @@ #pragma once -#include +#include "ltsutilscore_export.h" #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsCore/lts_portrange.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsCore/lts_portrange.h index 43d8f364a..003990a53 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsCore/lts_portrange.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsCore/lts_portrange.h @@ -1,6 +1,6 @@ #pragma once -#include +#include "ltsutilscore_export.h" #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsCore/lts_translatable_identifier.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsCore/lts_translatable_identifier.h index 84a4a3bec..0f990dc2e 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsCore/lts_translatable_identifier.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsCore/lts_translatable_identifier.h @@ -3,7 +3,7 @@ -#include +#include "ltsutilscore_export.h" #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsCore/promise.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsCore/promise.h index 7bb4e2c2c..f26084536 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsCore/promise.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsCore/promise.h @@ -3,7 +3,7 @@ -#include +#include "ltsutilscore_export.h" #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsCore/qplane3d.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsCore/qplane3d.h index f9abd932c..12478a8fe 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsCore/qplane3d.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsCore/qplane3d.h @@ -5,7 +5,7 @@ #include "qpoint3d.h" -#include +#include "ltsutilscore_export.h" #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsCore/qpoint3d.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsCore/qpoint3d.h index e0398a44f..6d461a339 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsCore/qpoint3d.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsCore/qpoint3d.h @@ -6,7 +6,7 @@ #include #include -#include +#include "ltsutilscore_export.h" #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsCore/scoped_connection.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsCore/scoped_connection.h index 74e6e98af..ecd8fd3e6 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsCore/scoped_connection.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsCore/scoped_connection.h @@ -3,7 +3,7 @@ #pragma once -#include +#include "ltsutilscore_export.h" #include namespace LtsUtils diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsCore/sfm_bytemessage_converter.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsCore/sfm_bytemessage_converter.h index 94dc41b4d..9ff01ae4c 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsCore/sfm_bytemessage_converter.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsCore/sfm_bytemessage_converter.h @@ -3,7 +3,7 @@ #pragma once -#include +#include "ltsutilscore_export.h" #include namespace LtsUtils diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsGui/ConnectDialog/connect_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsGui/ConnectDialog/connect_dialog.h index 337383228..78efa3967 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsGui/ConnectDialog/connect_dialog.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsGui/ConnectDialog/connect_dialog.h @@ -4,7 +4,7 @@ #pragma once #include -#include +#include "ltsutilsguiconnectdialog_export.h" #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsGui/ConnectDialog/connect_dialog_nt.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsGui/ConnectDialog/connect_dialog_nt.h index ebf694b86..91bc75a68 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsGui/ConnectDialog/connect_dialog_nt.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsGui/ConnectDialog/connect_dialog_nt.h @@ -4,7 +4,7 @@ #pragma once #include -#include +#include "ltsutilsguiconnectdialog_export.h" #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/dds_vector_to_pixmap.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/dds_vector_to_pixmap.h index 80cccc1d5..a0c225416 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/dds_vector_to_pixmap.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/dds_vector_to_pixmap.h @@ -3,7 +3,7 @@ #pragma once -#include +#include "ltsutilsguidds_export.h" #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/request_helper.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/request_helper.h index 9557aeb1b..1e7c605e9 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/request_helper.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/request_helper.h @@ -4,14 +4,14 @@ #pragma once #ifdef REQUEST_HELPER_WITH_GUI -#include +#include "ltsutilsdds_export.h" #define LTSUTILSGUIDDS_INTERNAL_EXPORT LTSUTILSGUIDDS_EXPORT #else -#include +#include "ltsutilsdds_export.h" #define LTSUTILSGUIDDS_INTERNAL_EXPORT LTSUTILSDDS_EXPORT #endif -#include +#include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsGui/StyleManager/style_manager.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsGui/StyleManager/style_manager.h index 6b6233f7d..c1cf3df57 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsGui/StyleManager/style_manager.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsGui/StyleManager/style_manager.h @@ -3,7 +3,7 @@ #pragma once -#include +#include "ltsutilsguistylemanager_export.h" #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsSettings/settings.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsSettings/settings.h index b1563de7a..8ba86ac49 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsSettings/settings.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsSettings/settings.h @@ -4,7 +4,7 @@ #include #include #include -#include +#include "ltsutilssettings_export.h" class QJsonObject; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsVirtualKeyboard/LtsKeyPushButton.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsVirtualKeyboard/LtsKeyPushButton.h index 43cad3b0b..abbbb83a2 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsVirtualKeyboard/LtsKeyPushButton.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsVirtualKeyboard/LtsKeyPushButton.h @@ -4,7 +4,7 @@ #pragma once #include #include -#include +#include "ltsvirtualkeyboard_export.h" #define DEFAULT_BACKGROUND_BUTTON "background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,stop: 0 #8C8F8C, stop: 1 #333831);" #define CHANGED_BACKGROUND_BUTTON "background:lightgray;color:darkred;" diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsVirtualKeyboard/LtsVirtualKeyboard.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsVirtualKeyboard/LtsVirtualKeyboard.h index 1fe804747..4f4dccae3 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsVirtualKeyboard/LtsVirtualKeyboard.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsVirtualKeyboard/LtsVirtualKeyboard.h @@ -5,7 +5,7 @@ #include #include "LtsKeyPushButton.h" -#include +#include "ltsvirtualkeyboard_export.h" #include class QClipboard; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWebSocket/client_connection.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWebSocket/client_connection.cpp index 1b8bdf8d1..eb83053e6 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWebSocket/client_connection.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWebSocket/client_connection.cpp @@ -10,13 +10,12 @@ namespace LtsWebSocket ClientConnection::ClientConnection(QWebSocket *socket, QObject *parent) : QThread(parent) , m_socket(socket ? socket : new QWebSocket) - , m_logger(getLogger("ClientConnection")) { } ClientConnection::~ClientConnection() { - DEBUG_LOG(m_logger) << "Thread closed" << this; + DEBUG_LOG() << "Thread closed" << this; delete m_socket; qDeleteAll(m_messageQueue); } @@ -25,11 +24,11 @@ bool ClientConnection::init() { if (m_socket == nullptr) { - ERROR_LOG(m_logger) << "Initialisation failed due to an invalid socket"; + ERROR_LOG() << "Initialisation failed due to an invalid socket"; return false; } - DEBUG_LOG(m_logger) << "Started new thread" << this; + DEBUG_LOG() << "Started new thread" << this; connect(m_socket, &QWebSocket::textMessageReceived, this, &ClientConnection::onNewTextMessageFromSocket, Qt::DirectConnection); connect(m_socket, &QWebSocket::connected, this, &ClientConnection::sendMessagesFromQueue); connect(m_socket, &QWebSocket::disconnected, this, &ClientConnection::onSocketDisconnect); @@ -42,24 +41,24 @@ void ClientConnection::addReply(ReplyMessage *message) if (!m_socket || m_socket->state() != QAbstractSocket::ConnectedState) { m_messageQueue.enqueue(message); - DEBUG_LOG(m_logger) << "Adding message to queue, size: " << m_messageQueue.size(); + DEBUG_LOG() << "Adding message to queue, size: " << m_messageQueue.size(); return; } const QString msg(message->toJsonString()); - DEBUG_LOG(m_logger) << "Sending message: " << msg ; + DEBUG_LOG() << "Sending message: " << msg ; m_socket->sendTextMessage(msg); delete message; } void ClientConnection::onNewTextMessageFromSocket(const QString &message) { - DEBUG_LOG(m_logger) << "Recv msg: " << message << this; + DEBUG_LOG() << "Recv msg: " << message << this; emit newTextMessage(this, message); } void ClientConnection::sendMessagesFromQueue() { - INFO_LOG(m_logger) << "Client connected ip: " << m_socket->peerAddress().toString() << ":" << m_socket->peerPort(); + INFO_LOG() << "Client connected ip: " << m_socket->peerAddress().toString() << ":" << m_socket->peerPort(); if (m_socket->state() != QAbstractSocket::ConnectedState) return; @@ -67,16 +66,16 @@ void ClientConnection::sendMessagesFromQueue() { ReplyMessage *message = m_messageQueue.dequeue(); const QString msg(message->toJsonString()); - TRACE_LOG(m_logger) << "Send msg: " << msg; + TRACE_LOG() << "Send msg: " << msg; m_socket->sendTextMessage(msg); delete message; - DEBUG_LOG(m_logger) << "Sent message from queue, new size: " << m_messageQueue.size(); + DEBUG_LOG() << "Sent message from queue, new size: " << m_messageQueue.size(); } } void ClientConnection::onSocketDisconnect() { - DEBUG_LOG(m_logger) << "Client disconnected ip: " << m_socket->peerAddress().toString() << ":" << m_socket->peerPort(); + DEBUG_LOG() << "Client disconnected ip: " << m_socket->peerAddress().toString() << ":" << m_socket->peerPort(); exit(0); emit disconnected(this); } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWebSocket/client_connection.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWebSocket/client_connection.h index 1c1321d3d..c136aa8b6 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWebSocket/client_connection.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWebSocket/client_connection.h @@ -8,7 +8,7 @@ #include "reply_message.h" #include "logger.h" -#include +#include "ltswebsocketserver_export.h" class QWebSocket; @@ -63,9 +63,5 @@ private: private: QWebSocket *m_socket; QQueue m_messageQueue; - - LOGGER_T m_logger; - - }; } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWebSocket/client_message.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWebSocket/client_message.h index fdd47d7df..65d4c4b96 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWebSocket/client_message.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWebSocket/client_message.h @@ -2,7 +2,7 @@ #pragma once -#include +#include "ltswebsocketcommon_export.h" #include "reply_message.h" #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWebSocket/client_message_factory.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWebSocket/client_message_factory.h index e262e704d..dd78d7ee3 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWebSocket/client_message_factory.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWebSocket/client_message_factory.h @@ -4,7 +4,7 @@ #include "client_message.h" #include "reply_message.h" -#include +#include "ltswebsocketcommon_export.h" #include #include @@ -46,8 +46,6 @@ protected: int m_typeId; QString m_uuid; QJsonValue m_data; - NGL::INGLLogger &m_logger; - }; class PongMessage final : public ReplyMessage diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWebSocket/connection_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWebSocket/connection_handler.cpp index d39e8d5fa..253b38409 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWebSocket/connection_handler.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWebSocket/connection_handler.cpp @@ -12,7 +12,6 @@ using namespace LtsWebSocket; ConnectionHandler::ConnectionHandler(QObject *parent) : QObject(parent) , m_server(nullptr) - , m_logger(getLogger("ConnectionHandler")) {} ConnectionHandler::~ConnectionHandler() @@ -34,13 +33,13 @@ bool ConnectionHandler::init(const QString &serviceName, unsigned short port) connect(m_server, &QWebSocketServer::newConnection, this, &ConnectionHandler::onNewConnection); connect(m_server, &QWebSocketServer::serverError, this, &ConnectionHandler::onServerError); - DEBUG_LOG(m_logger) << "Trying to listen "; + DEBUG_LOG() << "Trying to listen "; if (!m_server->listen(QHostAddress::Any, port)) { - ERROR_LOG(m_logger) << "Not possible to listen to port " << port; + ERROR_LOG() << "Not possible to listen to port " << port; return false; } - DEBUG_LOG(m_logger) << "... ok, port " << m_server->serverPort(); + DEBUG_LOG() << "... ok, port " << m_server->serverPort(); return true; } @@ -55,7 +54,7 @@ void ConnectionHandler::sendToAllClients(ReplyMessage *message) void ConnectionHandler::onServerError(QWebSocketProtocol::CloseCode closeCode) { - ERROR_LOG(m_logger) << "Got server error with close code " << closeCode; + ERROR_LOG() << "Got server error with close code " << closeCode; } void ConnectionHandler::onNewConnection() @@ -72,7 +71,7 @@ void ConnectionHandler::onNewConnection() if (!newConnection->init()) { - ERROR_LOG(m_logger) << "Failed to initialise new client"; + ERROR_LOG() << "Failed to initialise new client"; delete newConnection; newConnection = nullptr; continue; @@ -85,6 +84,6 @@ void ConnectionHandler::onNewConnection() m_connections.insert(newConnection); emit clientConnected(newConnection); - INFO_LOG(m_logger) << "New client connected ip: " << socket->localAddress().toString() << ":" << socket->localPort(); + INFO_LOG() << "New client connected ip: " << socket->localAddress().toString() << ":" << socket->localPort(); } } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWebSocket/connection_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWebSocket/connection_handler.h index 085da866b..7ef182bb0 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWebSocket/connection_handler.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWebSocket/connection_handler.h @@ -59,7 +59,5 @@ private slots: private: QWebSocketServer *m_server; QSet m_connections; - LOGGER_T m_logger; - }; } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWebSocket/data_manager_base_dl.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWebSocket/data_manager_base_dl.h index d2abfd609..49e11775b 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWebSocket/data_manager_base_dl.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWebSocket/data_manager_base_dl.h @@ -31,7 +31,7 @@ protected: if (!m_dbInterface->select(dataVec)) { const QString errorMessage = QStringLiteral("Error reading data from database!"); - ERROR_LOG(m_logger) << errorMessage; + ERROR_LOG() << errorMessage; ErrorMessage::ErrorData errData; errData.errorMessage = errorMessage; errData.uuid = uuid; @@ -41,8 +41,7 @@ protected: return new MessageType (m_dbInterface->template toJson(dataVec), uuid); } -protected: - NGL::INGLLogger &m_logger; +protected: std::shared_ptr m_dbInterface; }; } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWebSocket/logger.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWebSocket/logger.h index 0e1cb1771..64879c47e 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWebSocket/logger.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWebSocket/logger.h @@ -3,7 +3,7 @@ #pragma once -#include +#include "ltswebsocketcommon_export.h" #include namespace LtsWebSocket diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWebSocket/lts_web_socket_client.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWebSocket/lts_web_socket_client.cpp index 31d1d13b6..4547c7898 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWebSocket/lts_web_socket_client.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWebSocket/lts_web_socket_client.cpp @@ -37,7 +37,6 @@ private: AbstractClientMessageFactory *m_messageFactory; LtsWebSocketClient *m_webSocketClient; QWebSocket *m_socket; - NGL::INGLLogger &m_logger; }; WebSocketHelper::WebSocketHelper(AbstractClientMessageFactory *messageFactory, @@ -72,18 +71,18 @@ void WebSocketHelper::doOpen(const QString &hostname, const unsigned short port) doClose(); else { - INFO_LOG(m_logger) << "Web socket to url: " << url.toDisplayString() << " is already open."; + INFO_LOG() << "Web socket to url: " << url.toDisplayString() << " is already open."; return; } } - INFO_LOG(m_logger) << "Opening web socket to url: " << url.toDisplayString(); + INFO_LOG() << "Opening web socket to url: " << url.toDisplayString(); m_socket->open(url); } void WebSocketHelper::doClose() { - INFO_LOG(m_logger) << "Closing web socket to url:" << m_socket->requestUrl().toDisplayString(); + INFO_LOG() << "Closing web socket to url:" << m_socket->requestUrl().toDisplayString(); m_socket->close(); } @@ -91,29 +90,29 @@ void WebSocketHelper::doSendTextMessage(const QString &msg) { if (!m_socket || m_socket->state() != QAbstractSocket::ConnectedState) { - ERROR_LOG(m_logger) << "Message could not be send, socket is not connected."; + ERROR_LOG() << "Message could not be send, socket is not connected."; return; } - DEBUG_LOG(m_logger) << "Sending message: " << msg; + DEBUG_LOG() << "Sending message: " << msg; m_socket->sendTextMessage(msg); } void WebSocketHelper::onConnected() { - INFO_LOG(m_logger) << "Connected to server url: " << m_socket->requestUrl().toDisplayString() + INFO_LOG() << "Connected to server url: " << m_socket->requestUrl().toDisplayString() << " using local port: " << m_socket->localPort(); emit connected(); } void WebSocketHelper::onDisconnected() { - INFO_LOG(m_logger) << "Disconnected from server url: " << m_socket->requestUrl().toDisplayString(); + INFO_LOG() << "Disconnected from server url: " << m_socket->requestUrl().toDisplayString(); emit disconnected(); } void WebSocketHelper::onError(QAbstractSocket::SocketError error) { - ERROR_LOG(m_logger) << "Error occured: " << error << " closing socket."; + ERROR_LOG() << "Error occured: " << error << " closing socket."; m_socket->close(); } @@ -132,7 +131,7 @@ void WebSocketHelper::parseMessage(const QString &message) clientMessage = m_messageFactory->createMessage(m_webSocketClient, message); else { - WARNING_LOG(m_logger) << "Could not parse incoming message: '" << message + WARNING_LOG() << "Could not parse incoming message: '" << message << "', error: " << result.errorString(); clientMessage = new InvalidMessage(m_webSocketClient, QString(), QStringLiteral("Got message which is not JSON conform (%1)").arg(result.errorString())); @@ -148,7 +147,6 @@ LtsWebSocketClient::LtsWebSocketClient(AbstractClientMessageFactory *messageFact : QObject(parent) , m_messageFactory(messageFactory) , m_webSocketHelperThread(new QThread(this)) - , m_logger(getLogger("LtsWebSocketClient")) { m_webSocketHelper = new WebSocketHelper(m_messageFactory, this, m_logger); m_webSocketHelper->moveToThread(m_webSocketHelperThread); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWebSocket/lts_web_socket_client.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWebSocket/lts_web_socket_client.h index e61fa3269..96862619e 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWebSocket/lts_web_socket_client.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWebSocket/lts_web_socket_client.h @@ -5,7 +5,7 @@ #include #include -#include +#include "ltswebsocketclient_export.h" #include "client_message_factory.h" #include "logger.h" @@ -60,8 +60,5 @@ private: QThread *m_webSocketHelperThread; WebSocketHelper *m_webSocketHelper; - - - LOGGER_T m_logger; }; } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWebSocket/lts_web_socket_server.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWebSocket/lts_web_socket_server.cpp index ff38eec0a..08c03ea41 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWebSocket/lts_web_socket_server.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWebSocket/lts_web_socket_server.cpp @@ -14,7 +14,6 @@ LtsWebSocketServer::LtsWebSocketServer(AbstractClientMessageFactory *messageFact , m_queueTimer(new QTimer(this)) , m_messageFactory(messageFactory) , m_connectionHandler(nullptr) - , m_logger(getLogger("LtsWebSocketServer")) { connect(m_queueTimer, &QTimer::timeout, this, &LtsWebSocketServer::onQueueTimerTimeout); @@ -30,7 +29,7 @@ bool LtsWebSocketServer::init(const QString &serviceName, const unsigned short p if (!m_connectionHandler->init(serviceName, port)) { - ERROR_LOG(m_logger) << "Could not init m_connectionHandler with servicename: " << serviceName << ((port == 0) ? QStringLiteral(" random port") : QStringLiteral(" port: ") + QString::number(port)); + ERROR_LOG() << "Could not init m_connectionHandler with servicename: " << serviceName << ((port == 0) ? QStringLiteral(" random port") : QStringLiteral(" port: ") + QString::number(port)); m_connectionHandler.reset(); return false; } @@ -60,7 +59,7 @@ bool LtsWebSocketServer::init(const QString &serviceName, const QPairtoJsonString(); + DEBUG_LOG() << "Sending message to all clients: " << message->toJsonString(); m_connectionHandler->sendToAllClients(message); } @@ -82,7 +81,7 @@ void LtsWebSocketServer::onNewTextMessage(ReplyHandler *client, const QString &m client->addReply(new PongMessage(message.mid(pingMsg.size()))); return; } - DEBUG_LOG(m_logger) << "Got new message: " << message; + DEBUG_LOG() << "Got new message: " << message; m_messageQueue.append({client, message}); @@ -103,7 +102,7 @@ void LtsWebSocketServer::onQueueTimerTimeout() clientMessage = m_messageFactory->createMessage(credentials.client, credentials.message); else { - WARNING_LOG(m_logger) << "Could not parse incoming message: '" << credentials.message << "', error: " << result.errorString(); + WARNING_LOG() << "Could not parse incoming message: '" << credentials.message << "', error: " << result.errorString(); clientMessage = new InvalidMessage(credentials.client, QString(), QStringLiteral("Got message which is not JSON conform")); } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWebSocket/lts_web_socket_server.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWebSocket/lts_web_socket_server.h index 1f3728cf6..ce944cfd4 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWebSocket/lts_web_socket_server.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWebSocket/lts_web_socket_server.h @@ -5,7 +5,7 @@ #include -#include +#include "ltswebsocketserver_export.h" #include "client_message_factory.h" #include "logger.h" #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWebSocket/reply_message.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWebSocket/reply_message.h index 197b993c1..8cff9c00c 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWebSocket/reply_message.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWebSocket/reply_message.h @@ -2,7 +2,7 @@ #pragma once -#include +#include "ltswebsocketcommon_export.h" #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/CMakeLists.txt index f236f0171..e2b1d3eb0 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/CMakeLists.txt +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/CMakeLists.txt @@ -153,7 +153,7 @@ MESSAGE(STATUS "DEBUG BEFORE IF: BUILD_RTI=${BUILD_RTI}, BUILD_WS=${BUILD_WS}") IF(BUILD_RTI) MESSAGE(STATUS "DEBUG: BUILD_RTI=${BUILD_RTI}, BUILD_WS=${BUILD_WS}, building LtsWidgets") - NGL_ADD_LIBRARY(WS TOOLSWS TOOLSSV LtsWidgets SHARED ${ltswidgets_SRCS}) + NGL_ADD_LIBRARY2(WS TOOLSWS TOOLSSV LtsWidgets SHARED ${ltswidgets_SRCS}) NGL_TARGET_INCLUDE_DIRECTORIES(LtsWidgets PUBLIC diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/LtsImageCropper/lts_image_cropper.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/LtsImageCropper/lts_image_cropper.h index 42d7d5b4a..30b365843 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/LtsImageCropper/lts_image_cropper.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/LtsImageCropper/lts_image_cropper.h @@ -4,7 +4,7 @@ #pragma once #include -#include "lts_widgets_export.h" +#include "ltswidgets_export.h" #include namespace LtsWidgets diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_abstract_sequence_widget.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_abstract_sequence_widget.h index b0f8cf3e2..86510be1c 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_abstract_sequence_widget.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_abstract_sequence_widget.h @@ -10,7 +10,7 @@ #include #include -#include "lts_widgets_export.h" +#include "ltswidgets_export.h" class QToolButton; namespace LtsWidgets diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_angle_edit.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_angle_edit.h index 518920925..ce11ea890 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_angle_edit.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_angle_edit.h @@ -7,7 +7,7 @@ #include #include #include -#include +#include "ltswidgets_export.h" class Ui_LtsAngleEdit; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_background_widget.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_background_widget.h index 4d0f63e3d..98011be57 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_background_widget.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_background_widget.h @@ -4,7 +4,7 @@ #pragma once #include -#include "lts_widgets_export.h" +#include "ltswidgets_export.h" #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_base.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_base.h index 1a2ce8900..7929997cd 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_base.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_base.h @@ -3,7 +3,7 @@ #pragma once -#include "lts_widgets_export.h" +#include "ltswidgets_export.h" #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_base_layout_widget.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_base_layout_widget.h index 7dc9a5832..60e09c779 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_base_layout_widget.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_base_layout_widget.h @@ -5,7 +5,7 @@ #include #include "lts_base.h" -#include "lts_widgets_export.h" +#include "ltswidgets_export.h" #include "lts_notification_box.h" #include "qevent.h" diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_bitfield_widget.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_bitfield_widget.h index 2edfd4172..21eac20cf 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_bitfield_widget.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_bitfield_widget.h @@ -7,7 +7,7 @@ #include #include -#include "lts_widgets_export.h" +#include "ltswidgets_export.h" namespace LtsWidgets diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_column_filter_proxy_model.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_column_filter_proxy_model.h index ec3da298f..864de9ff8 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_column_filter_proxy_model.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_column_filter_proxy_model.h @@ -4,7 +4,7 @@ #pragma once #include -#include +#include "ltswidgets_export.h" #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_combo_box.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_combo_box.h index b0e611418..9c6691c22 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_combo_box.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_combo_box.h @@ -4,7 +4,7 @@ #pragma once #include -#include "lts_widgets_export.h" +#include "ltswidgets_export.h" #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_date_time_edit.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_date_time_edit.h index 3631e3577..4a9468e61 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_date_time_edit.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_date_time_edit.h @@ -5,7 +5,7 @@ #include -#include "lts_widgets_export.h" +#include "ltswidgets_export.h" #include "qcheckbox.h" #include "qpushbutton.h" diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_date_time_edit_rc.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_date_time_edit_rc.h index 895574cb0..0ef46aabc 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_date_time_edit_rc.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_date_time_edit_rc.h @@ -5,7 +5,7 @@ #include -#include "lts_widgets_export.h" +#include "ltswidgets_export.h" #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_date_time_edit_touch.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_date_time_edit_touch.h index 539288ca6..611d23159 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_date_time_edit_touch.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_date_time_edit_touch.h @@ -4,7 +4,7 @@ #pragma once #include -#include "lts_widgets_export.h" +#include "ltswidgets_export.h" #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_dialog.cpp index a03c1085e..9eb026d3e 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_dialog.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_dialog.cpp @@ -486,13 +486,13 @@ void LtsDialog::showEvent(QShowEvent *event) void LtsDialog::tryLockTopic() { - TRACE_LOG(m_logger) << LOGFUNCTION << " START"; + TRACE_LOG() << Q_FUNC_INFO << " START"; if (!m_topicInfo.isValid()) return; if (m_topicInfo.isLocked()) { - WARNING_LOG(m_logger) << LOGFUNCTION << " tried to lock with an already locked topic info, return"; + WARNING_LOG() << Q_FUNC_INFO << " tried to lock with an already locked topic info, return"; return; } @@ -508,7 +508,7 @@ void LtsDialog::tryLockTopic() bool bIsConnected = isSignalConnected(QMetaMethod::fromSignal(&LtsDialog::signalLockTopic)); - DEBUG_LOG(m_logger) << LOGFUNCTION + DEBUG_LOG() << Q_FUNC_INFO << " signalLockTopic(): " << ", TopicName =" << m_topicInfo.topicName() << ", entity =" << m_topicInfo.entityId() @@ -520,7 +520,7 @@ void LtsDialog::tryLockTopic() m_topicInfo.setLocked(); } - TRACE_LOG(m_logger) << LOGFUNCTION << " END"; + TRACE_LOG() << Q_FUNC_INFO << " END"; } void LtsDialog::initTopicLockHandler(const QString &topicName, int entityId) @@ -535,14 +535,14 @@ void LtsDialog::initTopicLockHandler(const QString &topicName, int entityId) void LtsDialog::tryLockTopicNew() { - TRACE_LOG(m_logger) << LOGFUNCTION << " START"; + TRACE_LOG() << Q_FUNC_INFO << " START"; tryLockTopic(); - TRACE_LOG(m_logger) << LOGFUNCTION << " END"; + TRACE_LOG() << Q_FUNC_INFO << " END"; } void LtsDialog::tryLockTopicNew(const QString &topicName, int entityId) { - TRACE_LOG(m_logger) << LOGFUNCTION << " START" + TRACE_LOG() << Q_FUNC_INFO << " START" << ", topicName='" << topicName << "'" << ", entityId=" << entityId; @@ -550,7 +550,7 @@ void LtsDialog::tryLockTopicNew(const QString &topicName, int entityId) if (m_topicInfo.entityId() != entityId) { - DEBUG_LOG(m_logger) << LOGFUNCTION << " topicName='" << topicName << "'" + DEBUG_LOG() << Q_FUNC_INFO << " topicName='" << topicName << "'" << " change from " << m_topicInfo.entityId() << " to " << entityId; m_topicInfo.setLocked(false); } @@ -561,16 +561,16 @@ void LtsDialog::tryLockTopicNew(const QString &topicName, int entityId) m_topicInfo.setValid(); tryLockTopic(); - TRACE_LOG(m_logger) << LOGFUNCTION << " END" + TRACE_LOG() << Q_FUNC_INFO << " END" << ", topicName='" << topicName << "'" << ", entityId=" << entityId; } void LtsDialog::triggerTopicLock() { - TRACE_LOG(m_logger) << LOGFUNCTION << " START" << " !!trigger!!"; + TRACE_LOG() << Q_FUNC_INFO << " START" << " !!trigger!!"; tryLockTopic(); - TRACE_LOG(m_logger) << LOGFUNCTION << " END"; + TRACE_LOG() << Q_FUNC_INFO << " END"; } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_dialog.h index 8e47be53d..aedb37ba2 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_dialog.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_dialog.h @@ -5,7 +5,7 @@ #include #include "lts_base.h" -#include "lts_widgets_export.h" +#include "ltswidgets_export.h" #include "requirement_widget.h" #include "lts_dialog_button_box.h" @@ -412,8 +412,6 @@ protected: LtsDialogButtonBox *m_buttonBox; UiRequirementList *m_uiRequirements; - - NGL::INGLLogger &m_logger; }; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_dialog_button_box.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_dialog_button_box.h index 08785d099..fc24e2c0b 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_dialog_button_box.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_dialog_button_box.h @@ -4,7 +4,7 @@ #pragma once #include -#include "lts_widgets_export.h" +#include "ltswidgets_export.h" #include "lts_message_dialog.h" #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_drag_icon.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_drag_icon.h index 4bdfc50f0..84289ae8f 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_drag_icon.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_drag_icon.h @@ -6,7 +6,7 @@ #include "lts_base.h" #include "lts_drop_handler.h" -#include "lts_widgets_export.h" +#include "ltswidgets_export.h" #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_elided_label.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_elided_label.h index 679d867e2..7623f9010 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_elided_label.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_elided_label.h @@ -5,7 +5,7 @@ #include #include -#include +#include "ltswidgets_export.h" namespace LtsWidgets { diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_events.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_events.h index b4128e8dd..9f759a990 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_events.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_events.h @@ -3,7 +3,7 @@ #pragma once -#include "lts_widgets_export.h" +#include "ltswidgets_export.h" #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_frameless_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_frameless_dialog.h index e98a1e1ac..a1ef0b7f5 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_frameless_dialog.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_frameless_dialog.h @@ -7,7 +7,7 @@ #include #include "lts_base.h" -#include "lts_widgets_export.h" +#include "ltswidgets_export.h" namespace LtsWidgets diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_global_wait_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_global_wait_dialog.h index 67b689981..2a3232d5f 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_global_wait_dialog.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_global_wait_dialog.h @@ -3,7 +3,7 @@ #pragma once -#include "lts_widgets_export.h" +#include "ltswidgets_export.h" #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_grid_layout.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_grid_layout.h index 296fad08c..99995c6f5 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_grid_layout.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_grid_layout.h @@ -6,7 +6,7 @@ #include #include -#include "lts_widgets_export.h" +#include "ltswidgets_export.h" #include "lts_base.h" class QWidget; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_height_plot_widget.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_height_plot_widget.h index 0db4e2c37..8c0d1ddf7 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_height_plot_widget.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_height_plot_widget.h @@ -9,7 +9,7 @@ #include #include -#include "lts_widgets_export.h" +#include "ltswidgets_export.h" class LTSWIDGETS_EXPORT LtsHeightPlotWidget final : public QWidget { diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_image_editor.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_image_editor.h index b78667a31..6ed8571fa 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_image_editor.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_image_editor.h @@ -4,7 +4,7 @@ #pragma once #include -#include "lts_widgets_export.h" +#include "ltswidgets_export.h" #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_info_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_info_dialog.h index 553d2e65a..be790fb05 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_info_dialog.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_info_dialog.h @@ -5,7 +5,7 @@ #include #include "lts_frameless_dialog.h" -#include "lts_widgets_export.h" +#include "ltswidgets_export.h" namespace Ui diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_led_widget.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_led_widget.h index 182e14013..e1723488f 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_led_widget.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_led_widget.h @@ -4,7 +4,7 @@ #include #include -#include "lts_widgets_export.h" +#include "ltswidgets_export.h" namespace LtsWidgets { diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_message_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_message_dialog.h index 06de1fd41..9de10b3c2 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_message_dialog.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_message_dialog.h @@ -1,6 +1,6 @@ #pragma once -#include "lts_widgets_export.h" +#include "ltswidgets_export.h" #include "lts_frameless_dialog.h" #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_msec_date_time_edit.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_msec_date_time_edit.h index 90826dc09..aa8e92291 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_msec_date_time_edit.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_msec_date_time_edit.h @@ -3,7 +3,7 @@ #include -#include "lts_widgets_export.h" +#include "ltswidgets_export.h" namespace LtsWidgets { diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_multi_range_spinbox.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_multi_range_spinbox.h index 1df4791d8..b39cff581 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_multi_range_spinbox.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_multi_range_spinbox.h @@ -4,7 +4,7 @@ #pragma once #include -#include "lts_widgets_export.h" +#include "ltswidgets_export.h" #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_notification_box.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_notification_box.h index 5c0624f91..56d93d0ed 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_notification_box.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_notification_box.h @@ -1,7 +1,7 @@ #pragma once #include -#include "lts_widgets_export.h" +#include "ltswidgets_export.h" #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_operator_menu.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_operator_menu.h index da89123f0..18168db62 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_operator_menu.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_operator_menu.h @@ -5,7 +5,7 @@ #include #include "lts_frameless_dialog.h" -#include "lts_widgets_export.h" +#include "ltswidgets_export.h" namespace Ui { diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_overlay_loading.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_overlay_loading.h index ab3a56a63..ace18a577 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_overlay_loading.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_overlay_loading.h @@ -4,7 +4,7 @@ #pragma once #include -#include "lts_widgets_export.h" +#include "ltswidgets_export.h" #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_picture_view.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_picture_view.h index fe55c9327..a688ffa49 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_picture_view.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_picture_view.h @@ -4,7 +4,7 @@ #pragma once #include -#include "lts_widgets_export.h" +#include "ltswidgets_export.h" #include class QRubberBand; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_profile_button.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_profile_button.h index b91a93372..33cde37a3 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_profile_button.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_profile_button.h @@ -4,7 +4,7 @@ #pragma once #include -#include "lts_widgets_export.h" +#include "ltswidgets_export.h" #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_progress_dialog_helper.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_progress_dialog_helper.h index d402c1038..de38e064b 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_progress_dialog_helper.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_progress_dialog_helper.h @@ -3,7 +3,7 @@ #pragma once -#include "lts_widgets_export.h" +#include "ltswidgets_export.h" #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_range_slider.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_range_slider.h index 67cd5d1df..29631f0ff 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_range_slider.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_range_slider.h @@ -6,7 +6,7 @@ #pragma once #include -#include "lts_widgets_export.h" +#include "ltswidgets_export.h" #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_selection_popup.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_selection_popup.h index 85f8eefc9..e9128b524 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_selection_popup.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_selection_popup.h @@ -5,7 +5,7 @@ #include #include "lts_frameless_dialog.h" -#include "lts_widgets_export.h" +#include "ltswidgets_export.h" namespace Ui diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_spinbox.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_spinbox.h index 38cce77e2..ce07d7771 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_spinbox.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_spinbox.h @@ -4,7 +4,7 @@ #pragma once #include -#include "lts_widgets_export.h" +#include "ltswidgets_export.h" #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_splash.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_splash.h index 34598fe7c..32442e9d3 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_splash.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_splash.h @@ -1,6 +1,6 @@ #pragma once -#include +#include "ltswidgets_export.h" #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_splitter.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_splitter.h index 56ecaff04..c03becbc9 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_splitter.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_splitter.h @@ -5,7 +5,7 @@ #include #include "lts_base.h" -#include "lts_widgets_export.h" +#include "ltswidgets_export.h" #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_splitter_handle.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_splitter_handle.h index 5ecea66c2..8c4e32263 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_splitter_handle.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_splitter_handle.h @@ -5,7 +5,7 @@ #include #include "lts_base.h" -#include "lts_widgets_export.h" +#include "ltswidgets_export.h" #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_tab_bar.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_tab_bar.h index 07103aed4..1107b848a 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_tab_bar.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_tab_bar.h @@ -5,7 +5,7 @@ #include #include -#include "lts_widgets_export.h" +#include "ltswidgets_export.h" namespace LtsWidgets { diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_tab_sequence_widget.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_tab_sequence_widget.h index baa4ae19e..68f9b1e56 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_tab_sequence_widget.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_tab_sequence_widget.h @@ -7,7 +7,7 @@ #include #include "lts_abstract_sequence_widget.h" -#include "lts_widgets_export.h" +#include "ltswidgets_export.h" class QTabWidget; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_tab_widget.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_tab_widget.h index ceba60e83..7df6cbd49 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_tab_widget.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_tab_widget.h @@ -5,7 +5,7 @@ #include #include "lts_base.h" -#include "lts_widgets_export.h" +#include "ltswidgets_export.h" #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_text_editor.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_text_editor.h index 9d3be4fe5..b1b3b897e 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_text_editor.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_text_editor.h @@ -1,7 +1,7 @@ #pragma once #include -#include +#include "ltswidgets_export.h" #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_text_editor2.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_text_editor2.h index f23fd8820..509a11335 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_text_editor2.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_text_editor2.h @@ -4,7 +4,7 @@ #include -#include +#include "ltswidgets_export.h" #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_tool_bar.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_tool_bar.h index d8ab50d9c..a6042aabc 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_tool_bar.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_tool_bar.h @@ -5,7 +5,7 @@ #include #include -#include "lts_widgets_export.h" +#include "ltswidgets_export.h" namespace LtsWidgets { diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_tool_bar_area.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_tool_bar_area.h index 04be1f963..59436453a 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_tool_bar_area.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_tool_bar_area.h @@ -4,7 +4,7 @@ #pragma once #include -#include "lts_widgets_export.h" +#include "ltswidgets_export.h" #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_tool_box.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_tool_box.h index 2dbd2f892..7f79f41e5 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_tool_box.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_tool_box.h @@ -5,7 +5,7 @@ #include #include "lts_base.h" -#include "lts_widgets_export.h" +#include "ltswidgets_export.h" #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_wait_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_wait_dialog.h index c8ce363e8..0be84a8f0 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_wait_dialog.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_wait_dialog.h @@ -1,6 +1,6 @@ #pragma once -#include "lts_widgets_export.h" +#include "ltswidgets_export.h" #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/requirement_widget.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/requirement_widget.h index b104c3728..52358733e 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/requirement_widget.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/requirement_widget.h @@ -3,7 +3,7 @@ #pragma once -#include "lts_widgets_export.h" +#include "ltswidgets_export.h" #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/PluginInterfaces/gui_plugin_interface.h b/qt6-after/qt6-migrated-legatus/Lts/Common/PluginInterfaces/gui_plugin_interface.h index 258fc6105..526dfb7f8 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/PluginInterfaces/gui_plugin_interface.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/PluginInterfaces/gui_plugin_interface.h @@ -85,8 +85,6 @@ public: protected: LtsSession::LtsSession *m_session; - NGL::INGLLogger &m_logger; - private: QFlags m_flags; QStringList m_options; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/TopicEditorBase/topic_editor_base.h b/qt6-after/qt6-migrated-legatus/Lts/Common/TopicEditorBase/topic_editor_base.h index 1b5e1a9ee..398449802 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/TopicEditorBase/topic_editor_base.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/TopicEditorBase/topic_editor_base.h @@ -6,7 +6,7 @@ #include "topic_editor_utils.h" -#include +#include "topiceditorbase_export.h" #include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/TopicEditorBase/topic_editor_utils.h b/qt6-after/qt6-migrated-legatus/Lts/Common/TopicEditorBase/topic_editor_utils.h index d5a587808..6cb1f100a 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/TopicEditorBase/topic_editor_utils.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/TopicEditorBase/topic_editor_utils.h @@ -1,6 +1,6 @@ #pragma once -#include +#include "topiceditorbase_export.h" #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/TopicEditorBase/topic_preview_widget.h b/qt6-after/qt6-migrated-legatus/Lts/Common/TopicEditorBase/topic_preview_widget.h index 935ed5ba4..3066ad629 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/TopicEditorBase/topic_preview_widget.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/TopicEditorBase/topic_preview_widget.h @@ -3,7 +3,7 @@ #include "topic_editor_utils.h" -#include +#include "topiceditorbase_export.h" #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/TopicEditorBase/topic_previewer.h b/qt6-after/qt6-migrated-legatus/Lts/Common/TopicEditorBase/topic_previewer.h index b01c10688..f3cd2fc4c 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/TopicEditorBase/topic_previewer.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/TopicEditorBase/topic_previewer.h @@ -3,7 +3,7 @@ #include "topic_editor_utils.h" -#include +#include "topiceditorbase_export.h" #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/httq/include/httq/AbstractServer.h b/qt6-after/qt6-migrated-legatus/Lts/Common/httq/include/httq/AbstractServer.h index a56924183..3341d7cd3 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/httq/include/httq/AbstractServer.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/httq/include/httq/AbstractServer.h @@ -1,6 +1,6 @@ #pragma once -#include +#include "httq_export.h" #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/httq/include/httq/DataStream.h b/qt6-after/qt6-migrated-legatus/Lts/Common/httq/include/httq/DataStream.h index 03f7ecc2c..025cf1c3c 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/httq/include/httq/DataStream.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/httq/include/httq/DataStream.h @@ -1,6 +1,6 @@ #pragma once -#include +#include "httq_export.h" #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/httq/include/httq/HttpRequest.h b/qt6-after/qt6-migrated-legatus/Lts/Common/httq/include/httq/HttpRequest.h index 96f647e13..10f76f27d 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/httq/include/httq/HttpRequest.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/httq/include/httq/HttpRequest.h @@ -1,6 +1,6 @@ #pragma once -#include +#include "httq_export.h" #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/httq/include/httq/Logger.h b/qt6-after/qt6-migrated-legatus/Lts/Common/httq/include/httq/Logger.h index 0f12d33c5..3e0b8440d 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/httq/include/httq/Logger.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/httq/include/httq/Logger.h @@ -1,6 +1,6 @@ #pragma once -#include +#include "httq_export.h" #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/DDS/Core/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Lts/DDS/Core/CMakeLists.txt index dbc871d04..40a327b88 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/DDS/Core/CMakeLists.txt +++ b/qt6-after/qt6-migrated-legatus/Lts/DDS/Core/CMakeLists.txt @@ -37,7 +37,7 @@ CODEGEN_TOPIC_TYPEDEFS(SRCS_common ${xml_FILE}) # generate core_[d|f]tc.h CODEGEN_CLIENT_TOPICS_IFC(SRCS_common ${xml_FILE}) -NGL_ADD_LIBRARY(WS AAR HLA SV ddscore SHARED ${SRCS_common}) +NGL_ADD_LIBRARY2(WS AAR HLA SV ddscore SHARED ${SRCS_common}) NGL_TARGET_INCLUDE_DIRECTORIES(ddscore PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../../ @@ -73,7 +73,7 @@ SET(SRCS_client # generate core_[d|f]tc_impl.[cpp|h] CODEGEN_CLIENT_TOPICS_IMPL(SRCS_client ${xml_FILE}) -NGL_ADD_LIBRARY(AAR SV WS HLA svcCoreClient SHARED ${SRCS_client}) +NGL_ADD_LIBRARY2(AAR SV WS HLA svcCoreClient SHARED ${SRCS_client}) NGL_TARGET_INCLUDE_DIRECTORIES(svcCoreClient PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../../ diff --git a/qt6-after/qt6-migrated-legatus/Lts/DDS/Core/function_reply_object.h b/qt6-after/qt6-migrated-legatus/Lts/DDS/Core/function_reply_object.h index d9129b28e..c86ad63bb 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/DDS/Core/function_reply_object.h +++ b/qt6-after/qt6-migrated-legatus/Lts/DDS/Core/function_reply_object.h @@ -5,7 +5,7 @@ #include #include -#include "core_export.h" +#include "ddscore_export.h" #ifndef tr_lts #define tr_lts(ctx, t) (t) diff --git a/qt6-after/qt6-migrated-legatus/Lts/DDS/Core/logger.h b/qt6-after/qt6-migrated-legatus/Lts/DDS/Core/logger.h index 510142300..627c2ac13 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/DDS/Core/logger.h +++ b/qt6-after/qt6-migrated-legatus/Lts/DDS/Core/logger.h @@ -4,7 +4,7 @@ #pragma once #include -#include "core_export.h" +#include "ddscore_export.h" namespace Core { diff --git a/qt6-after/qt6-migrated-legatus/Lts/DDS/Core/pacemaker.cpp b/qt6-after/qt6-migrated-legatus/Lts/DDS/Core/pacemaker.cpp index 2aaba01dd..7ffe01ea3 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/DDS/Core/pacemaker.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/DDS/Core/pacemaker.cpp @@ -78,7 +78,7 @@ void Pacemaker::init(DDSConnector::DdsConnector *ddsConnector) m_dtsCurrentRunningState = ddsConnector->createDTS(); if (!m_dtsCurrentRunningState) { - WARNING_LOG(m_logger) << "Can not initialize DTS::CurrentRunningState!"; + WARNING_LOG() << "Can not initialize DTS::CurrentRunningState!"; return; } m_state.pid(QCoreApplication::applicationPid()); diff --git a/qt6-after/qt6-migrated-legatus/Lts/DDS/Core/pacemaker.h b/qt6-after/qt6-migrated-legatus/Lts/DDS/Core/pacemaker.h index 1c6367cab..17834ae9d 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/DDS/Core/pacemaker.h +++ b/qt6-after/qt6-migrated-legatus/Lts/DDS/Core/pacemaker.h @@ -6,7 +6,7 @@ #include #include #include -#include "core_export.h" +#include "svccoreclient_export.h" namespace DDSConnector { @@ -52,6 +52,5 @@ private: QThread *m_paceThread = nullptr; DTS::CurrentRunningStateImpl *m_dtsCurrentRunningState; - NGL::INGLLogger &m_logger; }; } diff --git a/qt6-after/qt6-migrated-legatus/Lts/DDS/DDSConnector/dds_connector.cpp b/qt6-after/qt6-migrated-legatus/Lts/DDS/DDSConnector/dds_connector.cpp index 47f9b3388..97ab2fd7c 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/DDS/DDSConnector/dds_connector.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/DDS/DDSConnector/dds_connector.cpp @@ -33,7 +33,7 @@ DdsConnector::DdsConnector(int domainId, , m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger().getNGLLogger("Common.DDSConnector")) { initInternal(); - DEBUG_LOG(m_logger) << "DdsConnector ctor: " << m_domainId << "," << m_partitionId << ","<< m_exerciseId << "," << static_cast(m_defaultPartitionType); + DEBUG_LOG() << "DdsConnector ctor: " << m_domainId << "," << m_partitionId << ","<< m_exerciseId << "," << static_cast(m_defaultPartitionType); } DdsConnector::DdsConnector(int domainId, @@ -108,7 +108,7 @@ bool DdsConnector::init(const QStringList &qosFileList) QUrl DdsConnector::getTcpConnectionUrl() const { - DEBUG_LOG(m_logger) << this << " gettcpConnectionUrl: " << m_tcpConnectionUrl.toString(); + DEBUG_LOG() << this << " gettcpConnectionUrl: " << m_tcpConnectionUrl.toString(); return m_tcpConnectionUrl; } @@ -180,7 +180,7 @@ std::string DdsConnector::getPartitionString(IDL::PartitionType pt, int partitio } NGL::INGLLogger &m_logger = NGL::NGLLoggerBootstrap::getNGLRootLogger().getNGLLogger("Common.DDSConnector"); - ERROR_LOG(m_logger) << "Invalid partition type: " << static_cast(pt); + ERROR_LOG() << "Invalid partition type: " << static_cast(pt); return std::string(); } @@ -204,7 +204,7 @@ void DdsConnector::setDomainParticipant(const dds::domain::DomainParticipant &pa } catch (const dds::core::Exception &ex) { - WARNING_LOG(m_logger) << "Could not enable DomainParticipant: " << ex.what(); + WARNING_LOG() << "Could not enable DomainParticipant: " << ex.what(); exit(1); } } @@ -213,7 +213,7 @@ void DdsConnector::setPublisher(Publisher *publisher) { if (m_publisher && publisher != m_publisher) { - WARNING_LOG(m_logger) << "Trying to set publisher but there is already a publisher set - overwriting!"; + WARNING_LOG() << "Trying to set publisher but there is already a publisher set - overwriting!"; delete m_publisher; } m_publisher = publisher; @@ -232,7 +232,7 @@ void DdsConnector::setSubscriber(Subscriber *subscriber) { if (m_subscriber && subscriber != m_subscriber) { - WARNING_LOG(m_logger) << "Trying to set subscriber but there is already a subscriber set - overwriting!"; + WARNING_LOG() << "Trying to set subscriber but there is already a subscriber set - overwriting!"; delete m_subscriber; } m_subscriber = subscriber; @@ -257,13 +257,13 @@ void DdsConnector::initInternal() m_defaultPartitionType == IDL::PartitionType::AllExercises) m_partitionId = -1; if (m_defaultPartitionType == IDL::PartitionType::Exercise && m_partitionId < 0) - WARNING_LOG(m_logger) << "Want to subscribe to an exercise, but no exercise Id is given!"; + WARNING_LOG() << "Want to subscribe to an exercise, but no exercise Id is given!"; if (m_defaultPartitionType == IDL::PartitionType::Global) { m_partitionId = 0; m_exerciseId = 0; } - INFO_LOG(m_logger) << "DDSConnector(" << m_domainId << ") for partition: " << m_partitionId + INFO_LOG() << "DDSConnector(" << m_domainId << ") for partition: " << m_partitionId << " with partition type " << static_cast(m_defaultPartitionType); diff --git a/qt6-after/qt6-migrated-legatus/Lts/DDS/DDSConnector/dds_connector.h b/qt6-after/qt6-migrated-legatus/Lts/DDS/DDSConnector/dds_connector.h index a91700e9c..4766399c7 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/DDS/DDSConnector/dds_connector.h +++ b/qt6-after/qt6-migrated-legatus/Lts/DDS/DDSConnector/dds_connector.h @@ -8,7 +8,7 @@ #include #include -#include +#include #include #include @@ -196,7 +196,6 @@ private: DDSConnector::Publisher *m_publisher; DDSConnector::Subscriber *m_subscriber; DDSGeneric::WaitSetHandler *m_wsHandler; - NGL::INGLLogger &m_logger; }; diff --git a/qt6-after/qt6-migrated-legatus/Lts/DDS/DDSConnector/pub_sub_base.h b/qt6-after/qt6-migrated-legatus/Lts/DDS/DDSConnector/pub_sub_base.h index eaaf3bba9..748576430 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/DDS/DDSConnector/pub_sub_base.h +++ b/qt6-after/qt6-migrated-legatus/Lts/DDS/DDSConnector/pub_sub_base.h @@ -2,7 +2,7 @@ #pragma once -#include +#include #include #include @@ -34,6 +34,5 @@ protected: protected: dds::domain::DomainParticipant m_domainParticipant; std::vector m_partitions; - NGL::INGLLogger &m_logger; }; } diff --git a/qt6-after/qt6-migrated-legatus/Lts/DDS/DTC/generic_dtc_impl.h b/qt6-after/qt6-migrated-legatus/Lts/DDS/DTC/generic_dtc_impl.h index 6c7c8c4dd..0a7af6968 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/DDS/DTC/generic_dtc_impl.h +++ b/qt6-after/qt6-migrated-legatus/Lts/DDS/DTC/generic_dtc_impl.h @@ -81,12 +81,12 @@ public: { if (m_subscriberCallback) { - WARNING_LOG(m_logger) << "Can not set subscriber callback - already set ..."; + WARNING_LOG() << "Can not set subscriber callback - already set ..."; return false; } if (!m_subscriberListener) { - WARNING_LOG(m_logger) << "Can not set subscriber callback - no subscriber listener ..."; + WARNING_LOG() << "Can not set subscriber callback - no subscriber listener ..."; return false; } @@ -94,7 +94,7 @@ public: if (!m_dataReaderObject) { - WARNING_LOG(m_logger) << "Can not set subscriber callback - no data reader object ..."; + WARNING_LOG() << "Can not set subscriber callback - no data reader object ..."; return false; } @@ -193,7 +193,7 @@ protected: Q_UNUSED(topicType); if (m_writerState.testAndSetRelaxed(1, 0)) { - DEBUG_LOG(m_logger) << "Recreate Reader for topic " << topicName + DEBUG_LOG() << "Recreate Reader for topic " << topicName << ", type name " << DDS::topic_type_name::value(); if (m_subscriberListener) m_subscriberListener->removeCallback(m_dataReaderObject->getDataReader(), this); @@ -202,7 +202,7 @@ protected: m_subscriberListener->addCallback(m_dataReaderObject->getDataReader(), this); } - DEBUG_LOG(m_logger) << "IN droDataAvailable(), topic name: " << topicName + DEBUG_LOG() << "IN droDataAvailable(), topic name: " << topicName << ", type name " << DDS::topic_type_name::value() << ", this: " << this << ", m_dataReaderObject: " << m_dataReaderObject @@ -235,7 +235,7 @@ protected: { if (!droInitOk) { - ERROR_LOG(m_logger) << "Error initializing DRO for type " << DDS::topic_type_name::value(); + ERROR_LOG() << "Error initializing DRO for type " << DDS::topic_type_name::value(); delete m_dataReaderObject; m_dataReaderObject = nullptr; return false; @@ -243,13 +243,13 @@ protected: if (m_subscriberListener) { - DEBUG_LOG(m_logger) << "subscriberListener exists, adding type " + DEBUG_LOG() << "subscriberListener exists, adding type " << DDS::topic_type_name::value(); m_subscriberListener->addCallback(m_dataReaderObject->getDataReader(), this); } else { - DEBUG_LOG(m_logger) << "Cannot add DTC to subscriberListener callback - type: " + DEBUG_LOG() << "Cannot add DTC to subscriberListener callback - type: " << DDS::topic_type_name::value(); } m_dataReaderObject->setHaveSubscriberCallback(m_subscriberListener != nullptr); @@ -266,8 +266,6 @@ private: SubscriberCallback m_subscriberCallback; QAtomicInt m_writerState; - - NGL::INGLLogger &m_logger; }; diff --git a/qt6-after/qt6-migrated-legatus/Lts/DDS/DTS/generic_dts_impl.h b/qt6-after/qt6-migrated-legatus/Lts/DDS/DTS/generic_dts_impl.h index 747dca462..c554e1e4d 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/DDS/DTS/generic_dts_impl.h +++ b/qt6-after/qt6-migrated-legatus/Lts/DDS/DTS/generic_dts_impl.h @@ -36,7 +36,7 @@ namespace DTS bool write(const TopicType &data, const dds::core::optional &si = dds::core::optional()) override final { - DEBUG_LOG(m_logger) << "IN write (" + DEBUG_LOG() << "IN write (" << DDS::topic_type_name::value() << ")"; @@ -45,11 +45,11 @@ namespace DTS if (!m_dataWriterObject->write(data, si)) { - ERROR_LOG(m_logger) << "Error writing for " + ERROR_LOG() << "Error writing for " << DDS::topic_type_name::value(); return false; } - DEBUG_LOG(m_logger) << "TopicData (" + DEBUG_LOG() << "TopicData (" << DDS::topic_type_name::value() << ") written"; @@ -58,7 +58,7 @@ namespace DTS bool remove(const TopicType &data, bool errorMsgIfNotExists = true) override final { - DEBUG_LOG(m_logger) << "IN remove (" + DEBUG_LOG() << "IN remove (" << DDS::topic_type_name::value() << ")"; @@ -68,11 +68,11 @@ namespace DTS if (!m_dataWriterObject->remove(data, errorMsgIfNotExists)) { if (errorMsgIfNotExists) - ERROR_LOG(m_logger) << "Error removing for " + ERROR_LOG() << "Error removing for " << DDS::topic_type_name::value(); return false; } - DEBUG_LOG(m_logger) << "TopicData (" + DEBUG_LOG() << "TopicData (" << DDS::topic_type_name::value() << ") removed"; @@ -82,7 +82,6 @@ namespace DTS private: DataWriterObject *m_dataWriterObject; - NGL::INGLLogger &m_logger; }; } diff --git a/qt6-after/qt6-migrated-legatus/Lts/DDS/DdsUnitTests/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Lts/DDS/DdsUnitTests/CMakeLists.txt index 5a430cefb..87cb539ff 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/DDS/DdsUnitTests/CMakeLists.txt +++ b/qt6-after/qt6-migrated-legatus/Lts/DDS/DdsUnitTests/CMakeLists.txt @@ -21,7 +21,7 @@ CODEGEN_TOPIC_TYPEDEFS(SRCS_common ${xml_FILE}) # generate ddsut_[d|f]tc.h CODEGEN_CLIENT_TOPICS_IFC(SRCS_common ${xml_FILE}) -NGL_ADD_LIBRARY(ALL ddsut_common SHARED ${SRCS_common}) +NGL_ADD_LIBRARY2(ALL ddsut_common SHARED ${SRCS_common}) IF(BUILD_RTI) NGL_TARGET_LINK_LIBRARIES(ddsut_common PRIVATE diff --git a/qt6-after/qt6-migrated-legatus/Lts/DDS/DdsUnitTests/data_topic_tests.cpp b/qt6-after/qt6-migrated-legatus/Lts/DDS/DdsUnitTests/data_topic_tests.cpp index 6b0bea676..14a3a1df3 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/DDS/DdsUnitTests/data_topic_tests.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/DDS/DdsUnitTests/data_topic_tests.cpp @@ -29,9 +29,9 @@ DataTopicTests::DataTopicTests() , m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger().getNGLLogger("UnitTests.DataTopicTests")) { if (!DDS::QosProfile::setDefault()) - ERROR_LOG(m_logger) << "Error setting default QoS from xml-file "; + ERROR_LOG() << "Error setting default QoS from xml-file "; - DEBUG_LOG(m_logger) << "Main thread ID is " << m_mainThreadId; + DEBUG_LOG() << "Main thread ID is " << m_mainThreadId; } DataTopicTests::~DataTopicTests() @@ -65,7 +65,7 @@ bool DataTopicTests::initPublisher() partitionQos.name( { partition.toStdString() } ); publisherQos << partitionQos; - DEBUG_LOG(m_logger) << "Publish on partition " << partition; + DEBUG_LOG() << "Publish on partition " << partition; m_ddsPublisher = dds::pub::Publisher(m_domainParticipantPub, publisherQos); m_testPart = new DTS::TestParticipantImpl(m_domainParticipantPub, m_ddsPublisher); @@ -75,8 +75,8 @@ bool DataTopicTests::initPublisher() bool DataTopicTests::write(const DdsUnitTests::TestParticipant &data) { - INFO_LOG(m_logger) << "Publish topic TestParticipant "; - DEBUG_LOG(m_logger) << "ParticipantId: " << data.location().participantId() + INFO_LOG() << "Publish topic TestParticipant "; + DEBUG_LOG() << "ParticipantId: " << data.location().participantId() << ", equipNo = " << data.location().equipNo(); return m_testPart->write(data); @@ -88,7 +88,7 @@ bool DataTopicTests::write(const DdsUnitTests::TestParticipant &data) bool DataTopicTests::initSubscriber() { - DEBUG_LOG(m_logger) << "Initialisation DDS (Subscriber/Reader)"; + DEBUG_LOG() << "Initialisation DDS (Subscriber/Reader)"; m_domainParticipantSub = dds::domain::DomainParticipant(m_domainId, @@ -108,7 +108,7 @@ bool DataTopicTests::initSubscriber() partitionQos.name( partitions ); subscriberQos << partitionQos; - DEBUG_LOG(m_logger) << "Initialise DTC::SubscriberListener"; + DEBUG_LOG() << "Initialise DTC::SubscriberListener"; m_subscriberListener = new DDSGeneric::SubscriberListener(); m_ddsSubscriber = dds::sub::Subscriber(m_domainParticipantSub, subscriberQos, @@ -142,10 +142,10 @@ void DataTopicTests::deleteSubscriber() void DataTopicTests::processData(const DdsUnitTests::TestParticipant &instance, const dds::sub::SampleInfo &si) { - INFO_LOG(m_logger) << "process data in topic TestParticipant, Sampleinfo: " << si.source_timestamp().sec(); + INFO_LOG() << "process data in topic TestParticipant, Sampleinfo: " << si.source_timestamp().sec(); - DEBUG_LOG(m_logger) << "participantId: " << instance.location().participantId(); - DEBUG_LOG(m_logger) << "equipNo: " << instance.location().equipNo(); + DEBUG_LOG() << "participantId: " << instance.location().participantId(); + DEBUG_LOG() << "equipNo: " << instance.location().equipNo(); m_receivedParticipantData = instance; diff --git a/qt6-after/qt6-migrated-legatus/Lts/DDS/DdsUnitTests/data_topic_tests.h b/qt6-after/qt6-migrated-legatus/Lts/DDS/DdsUnitTests/data_topic_tests.h index b0c48ba04..0449855c9 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/DDS/DdsUnitTests/data_topic_tests.h +++ b/qt6-after/qt6-migrated-legatus/Lts/DDS/DdsUnitTests/data_topic_tests.h @@ -58,8 +58,6 @@ private: Qt::HANDLE m_mainThreadId; DdsUnitTests::TestParticipant m_receivedParticipantData; - - NGL::INGLLogger& m_logger; }; diff --git a/qt6-after/qt6-migrated-legatus/Lts/DDS/DdsUnitTests/data_topic_tests_main.cpp b/qt6-after/qt6-migrated-legatus/Lts/DDS/DdsUnitTests/data_topic_tests_main.cpp index feb2260a9..a6337f9e5 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/DDS/DdsUnitTests/data_topic_tests_main.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/DDS/DdsUnitTests/data_topic_tests_main.cpp @@ -33,7 +33,7 @@ DataTopicTestsMain::DataTopicTestsMain() void DataTopicTestsMain::initTestCase() { - DEBUG_LOG(m_logger) <<"DataTopicTestsMain: initTestCase"; + DEBUG_LOG() <<"DataTopicTestsMain: initTestCase"; m_dtTest = new DataTopicTests(); QVERIFY2(m_dtTest, "Initialisation of DataTopicTest failed"); @@ -46,20 +46,20 @@ void DataTopicTestsMain::initTestCase() void DataTopicTestsMain::publishTestCase() { - DEBUG_LOG(m_logger) <<"DataTopicTestsMain: publish TestParticipant"; + DEBUG_LOG() <<"DataTopicTestsMain: publish TestParticipant"; m_sentParticipantData.location().participantId(100); m_sentParticipantData.location().equipNo(1010); m_sentParticipantData.testId(100); QVERIFY2(m_dtTest->write(m_sentParticipantData), "Publishing Topic TestParticipant failed"); - DEBUG_LOG(m_logger) <<"DataTopicTestsMain: publish ready"; + DEBUG_LOG() <<"DataTopicTestsMain: publish ready"; } void DataTopicTestsMain::subscribeTestCase() { - DEBUG_LOG(m_logger) << "IN subscribeTestCase"; + DEBUG_LOG() << "IN subscribeTestCase"; QTRY_COMPARE(m_participantDataArrivedSpy->count(), 1); @@ -95,7 +95,7 @@ void DataTopicTestsMain::deleteDataReaderTestCase() void DataTopicTestsMain::cleanupTestCase() { - DEBUG_LOG(m_logger) <<"DataTopicTestsMain: cleanupTestCase"; + DEBUG_LOG() <<"DataTopicTestsMain: cleanupTestCase"; delete m_dtTest; m_dtTest = nullptr; delete m_participantDataArrivedSpy; m_participantDataArrivedSpy = nullptr; } diff --git a/qt6-after/qt6-migrated-legatus/Lts/DDS/DdsUnitTests/data_topic_tests_main.h b/qt6-after/qt6-migrated-legatus/Lts/DDS/DdsUnitTests/data_topic_tests_main.h index fcc77d794..242958b1e 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/DDS/DdsUnitTests/data_topic_tests_main.h +++ b/qt6-after/qt6-migrated-legatus/Lts/DDS/DdsUnitTests/data_topic_tests_main.h @@ -34,5 +34,4 @@ private: DdsUnitTests::TestParticipant m_sentParticipantData; QSignalSpy *m_participantDataArrivedSpy = nullptr; DataTopicTests *m_dtTest = nullptr; - NGL::INGLLogger &m_logger; }; diff --git a/qt6-after/qt6-migrated-legatus/Lts/DDS/DdsUnitTests/function_topic_tests.cpp b/qt6-after/qt6-migrated-legatus/Lts/DDS/DdsUnitTests/function_topic_tests.cpp index 7ca2e9c6a..55d020f90 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/DDS/DdsUnitTests/function_topic_tests.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/DDS/DdsUnitTests/function_topic_tests.cpp @@ -38,7 +38,7 @@ FunctionTopicTests::FunctionTopicTests() void FunctionTopicTests::initTestCase() { - DEBUG_LOG(m_logger) <<"FunctionTopicTests: initTestCase"; + DEBUG_LOG() <<"FunctionTopicTests: initTestCase"; const int domainId = 0; @@ -97,7 +97,7 @@ void FunctionTopicTests::requestWithState() QSignalSpy spyRequest(this, &FunctionTopicTests::functionTopicRequestFinished); QSignalSpy spyReply(this, &FunctionTopicTests::functionTopicReply); - DEBUG_LOG(m_logger) <<"FunctionTopicTests: request"; + DEBUG_LOG() <<"FunctionTopicTests: request"; DdsUnitTests::FunctionRequestWithState data; @@ -125,7 +125,7 @@ void FunctionTopicTests::requestTestCase2() QSignalSpy spyRequest(this, &FunctionTopicTests::functionTopicRequestFinished); QSignalSpy spyReply(this, &FunctionTopicTests::functionTopicReply); - DEBUG_LOG(m_logger) <<"FunctionTopicTests: request"; + DEBUG_LOG() <<"FunctionTopicTests: request"; DdsUnitTests::FunctionRequest data; @@ -149,7 +149,7 @@ void FunctionTopicTests::requestTestCase2() void FunctionTopicTests::cleanupTestCase() { - DEBUG_LOG(m_logger) <<"FunctionTopicTests: cleanupTestCase"; + DEBUG_LOG() <<"FunctionTopicTests: cleanupTestCase"; m_fts = nullptr; m_ftc = nullptr; @@ -165,7 +165,7 @@ void FunctionTopicTests::onFunctionTopicRequest(const rti::core::SampleIdentity { QCOMPARE(m_mainThreadId, QThread::currentThreadId()); - INFO_LOG(m_logger) << "Got function topic request (with status member)"; + INFO_LOG() << "Got function topic request (with status member)"; m_requestTopicWithState = request; QCOMPARE(m_requestTopicWithState.id(), 1); QCOMPARE(m_requestTopicWithState.info().get(), std::string("Test request")); @@ -173,7 +173,7 @@ void FunctionTopicTests::onFunctionTopicRequest(const rti::core::SampleIdentity DdsUnitTests::FunctionReplyWithState reply; - DEBUG_LOG(m_logger) << "Send sample with status REPLY_COMPLETED"; + DEBUG_LOG() << "Send sample with status REPLY_COMPLETED"; reply.id(1); reply.errorString("Hello"); reply.replyState(Core::FtReplyState::Completed); @@ -191,7 +191,7 @@ void FunctionTopicTests::onFunctionTopicRequest(const rti::core::SampleIdentity { QCOMPARE(m_mainThreadId, QThread::currentThreadId()); - INFO_LOG(m_logger) << "Got function topic request (without status member)"; + INFO_LOG() << "Got function topic request (without status member)"; m_requestTopic = request; @@ -214,7 +214,7 @@ void FunctionTopicTests::slotRequestedData(const DdsUnitTests::FunctionTopicTest Q_UNUSED(seqNo); QCOMPARE(m_mainThreadId, QThread::currentThreadId()); - INFO_LOG(m_logger) << "Got reply from FTS: " << reply.replyState(); + INFO_LOG() << "Got reply from FTS: " << reply.replyState(); m_replyTopicWithState = reply; diff --git a/qt6-after/qt6-migrated-legatus/Lts/DDS/DdsUnitTests/function_topic_tests.h b/qt6-after/qt6-migrated-legatus/Lts/DDS/DdsUnitTests/function_topic_tests.h index b9cfe128c..41014a3bd 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/DDS/DdsUnitTests/function_topic_tests.h +++ b/qt6-after/qt6-migrated-legatus/Lts/DDS/DdsUnitTests/function_topic_tests.h @@ -68,6 +68,4 @@ private: DdsUnitTests::FunctionReplyWithState m_replyTopicWithState; Qt::HANDLE m_mainThreadId; - - NGL::INGLLogger& m_logger; }; diff --git a/qt6-after/qt6-migrated-legatus/Lts/DDS/DdsUnitTests/generic_data_tests.cpp b/qt6-after/qt6-migrated-legatus/Lts/DDS/DdsUnitTests/generic_data_tests.cpp index f220f0c23..6655cd8bc 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/DDS/DdsUnitTests/generic_data_tests.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/DDS/DdsUnitTests/generic_data_tests.cpp @@ -38,7 +38,7 @@ GenericDataTests::GenericDataTests() void GenericDataTests::initTestCase() { - DEBUG_LOG(m_logger) <<"GenericDataTests: initTestCase"; + DEBUG_LOG() <<"GenericDataTests: initTestCase"; m_init = new Initialisation(); @@ -81,7 +81,7 @@ void GenericDataTests::initDWTestCase() void GenericDataTests::dataWriterTestCase() { - DEBUG_LOG(m_logger) <<"GenericDataTests: dataWriter"; + DEBUG_LOG() <<"GenericDataTests: dataWriter"; DdsUnitTests::SpatialData data; @@ -125,7 +125,7 @@ void GenericDataTests::dataWriterTestCase() void GenericDataTests::dataReaderTestCase() { - DEBUG_LOG(m_logger) << "GenericDataTests: dataReader"; + DEBUG_LOG() << "GenericDataTests: dataReader"; QTRY_COMPARE(m_spatialData.equipNo(), 999); @@ -136,7 +136,7 @@ void GenericDataTests::dataReaderTestCase() bool bSeenUnreadSamples = false; dds::sub::LoanedSamples vecTp = m_dataReader->readAlive(bSeenUnreadSamples); - INFO_LOG(m_logger) <<"vecTp size: " << vecTp.length(); + INFO_LOG() <<"vecTp size: " << vecTp.length(); QCOMPARE(vecTp.length(), static_cast(5)); QCOMPARE(vecTp[0].data().id(), 10000); QCOMPARE(vecTp[1].data().id(), 11000); @@ -145,7 +145,7 @@ void GenericDataTests::dataReaderTestCase() QCOMPARE(vecTp[4].data().id(), 11111); dds::sub::LoanedSamples vecTpLoaned = m_dataReader->takeAlive(bSeenUnreadSamples); - INFO_LOG(m_logger) <<"vecTpLoaned size: " << vecTp.length(); + INFO_LOG() <<"vecTpLoaned size: " << vecTp.length(); QCOMPARE(vecTpLoaned.length(), static_cast(5)); QCOMPARE(vecTpLoaned[0].data().id(), 10000); QCOMPARE(vecTpLoaned[1].data().id(), 11000); @@ -177,7 +177,7 @@ void GenericDataTests::deleteDataReaderTestCase() void GenericDataTests::cleanupTestCase() { - DEBUG_LOG(m_logger) <<"GenericDataTests: cleanupTestCase"; + DEBUG_LOG() <<"GenericDataTests: cleanupTestCase"; if (m_dataReader) { m_init->getSubscriberListener()->removeCallback(m_dataReader->getDataReader(), this); @@ -198,21 +198,21 @@ void GenericDataTests::cleanupTestCase() void GenericDataTests::processData(const DdsUnitTests::SpatialData &data, DataModification modType) { - DEBUG_LOG(m_logger) << "SpatialData: equipNo = " << data.equipNo() << " modType: " << modType; + DEBUG_LOG() << "SpatialData: equipNo = " << data.equipNo() << " modType: " << modType; m_spatialData = data; } void GenericDataTests::processData(const DdsUnitTests::TestParticipant &data, const dds::sub::SampleInfo &si) { Q_UNUSED(si); - DEBUG_LOG(m_logger) << "TestParticipant: equipNo = " << data.location().equipNo(); + DEBUG_LOG() << "TestParticipant: equipNo = " << data.location().equipNo(); m_testPart = data; } void GenericDataTests::droDataAvailable(const std::string &topicType, const std::string &topicName) { Q_UNUSED(topicName) - DEBUG_LOG(m_logger) << "IN droDataAvailable: type = " << topicType; + DEBUG_LOG() << "IN droDataAvailable: type = " << topicType; if (topicType == "DdsUnitTests::TestParticipant") { m_init->getSubscriberListener()->enableCallback(m_dataReader->getDataReader(), this); diff --git a/qt6-after/qt6-migrated-legatus/Lts/DDS/DdsUnitTests/generic_data_tests.h b/qt6-after/qt6-migrated-legatus/Lts/DDS/DdsUnitTests/generic_data_tests.h index c0323194d..1f45f88e3 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/DDS/DdsUnitTests/generic_data_tests.h +++ b/qt6-after/qt6-migrated-legatus/Lts/DDS/DdsUnitTests/generic_data_tests.h @@ -61,9 +61,6 @@ private: DdsUnitTests::SpatialData m_spatialData; DdsUnitTests::TestParticipant m_testPart; - - NGL::INGLLogger &m_logger; - }; diff --git a/qt6-after/qt6-migrated-legatus/Lts/DDS/DdsUnitTests/initialisation.cpp b/qt6-after/qt6-migrated-legatus/Lts/DDS/DdsUnitTests/initialisation.cpp index b33ca1d2d..f0ed3aefb 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/DDS/DdsUnitTests/initialisation.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/DDS/DdsUnitTests/initialisation.cpp @@ -19,7 +19,7 @@ Initialisation::Initialisation() , m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger().getNGLLogger("UnitTests.Initialisation")) { if (!DDS::QosProfile::setDefault()) - ERROR_LOG(m_logger) << "Error setting default QoS from xml-file "; + ERROR_LOG() << "Error setting default QoS from xml-file "; } @@ -52,7 +52,7 @@ bool Initialisation::initDDS(int domainId, int exerciseId, PubSub pubsub) { dds::pub::qos::PublisherQos publisherQos = m_domainParticipant.default_publisher_qos(); - DEBUG_LOG(m_logger) << "Publish on partition " << IDL::exercisePartition(exerciseId); + DEBUG_LOG() << "Publish on partition " << IDL::exercisePartition(exerciseId); dds::core::policy::Partition partitionQos; @@ -74,7 +74,7 @@ bool Initialisation::initDDS(int domainId, int exerciseId, PubSub pubsub) dds::sub::qos::SubscriberQos subscriberQos = domainPart.default_subscriber_qos(); - DEBUG_LOG(m_logger) << "Subsribing on partition " << IDL::exercisePartition(exerciseId); + DEBUG_LOG() << "Subsribing on partition " << IDL::exercisePartition(exerciseId); dds::core::policy::Partition partitionQos; diff --git a/qt6-after/qt6-migrated-legatus/Lts/DDS/DdsUnitTests/initialisation.h b/qt6-after/qt6-migrated-legatus/Lts/DDS/DdsUnitTests/initialisation.h index 017f7ca76..44165ef7f 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/DDS/DdsUnitTests/initialisation.h +++ b/qt6-after/qt6-migrated-legatus/Lts/DDS/DdsUnitTests/initialisation.h @@ -40,7 +40,6 @@ private: dds::pub::Publisher m_ddsPublisher; dds::sub::Subscriber m_ddsSubscriber; DDSGeneric::SubscriberListener *m_subListener; - NGL::INGLLogger &m_logger; }; diff --git a/qt6-after/qt6-migrated-legatus/Lts/DDS/FTC/abstract_requester.h b/qt6-after/qt6-migrated-legatus/Lts/DDS/FTC/abstract_requester.h index 11cf5dda9..8f83ad775 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/DDS/FTC/abstract_requester.h +++ b/qt6-after/qt6-migrated-legatus/Lts/DDS/FTC/abstract_requester.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/DDS/FTC/generic_ftc_impl.h b/qt6-after/qt6-migrated-legatus/Lts/DDS/FTC/generic_ftc_impl.h index 3128c6af5..b72f46f7a 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/DDS/FTC/generic_ftc_impl.h +++ b/qt6-after/qt6-migrated-legatus/Lts/DDS/FTC/generic_ftc_impl.h @@ -100,7 +100,7 @@ public: DDS::QosProfile::print(m_requesterParams.datareader_qos(), m_logger); DDS::QosProfile::print(m_requesterParams.datawriter_qos(), m_logger); - DEBUG_LOG(m_logger) << "=> Static request using request/reply topic names: " + DEBUG_LOG() << "=> Static request using request/reply topic names: " << TopicNameHelper::requestTopicName() << ", reply: " << TopicNameHelper::replyTopicName(); @@ -395,13 +395,13 @@ private: bool inProgress = true; while (inProgress && isRun()) { - DEBUG_LOG(m_logger) << "Waiting for reply "; + DEBUG_LOG() << "Waiting for reply "; connext::Sample reply; if (!requester.receive_reply(reply, MAX_WAIT)) { - WARNING_LOG(m_logger) << "Timed out waiting for reply"; + WARNING_LOG() << "Timed out waiting for reply"; sendError(request, 3); return; } @@ -412,14 +412,14 @@ private: if (request.sample.info().identity() != reply.info()->related_original_publication_virtual_sample_identity()) { - INFO_LOG(m_logger) << "#receiveReply - outdated. sample id: " << connext::DebugInfo::toReadable(request.sample.info().identity()) + INFO_LOG() << "#receiveReply - outdated. sample id: " << connext::DebugInfo::toReadable(request.sample.info().identity()) << ", virutal sample id: " << connext::DebugInfo::toReadable(reply.info()->related_original_publication_virtual_sample_identity()); continue; } inProgress = isInProgress(reply); if (request.replySlot.isValid()) { - INFO_LOG(m_logger) << "#receiveReply for " << TopicNameHelper::replyTopicTypeName(); + INFO_LOG() << "#receiveReply for " << TopicNameHelper::replyTopicTypeName(); request.replySlot.invoke(m_objToInform, Qt::QueuedConnection, QArgument(TopicNameHelper::replyTopicTypeName(), reply.data()), @@ -428,13 +428,13 @@ private: } else { - WARNING_LOG(m_logger) << "reply slot doesn't exist for " << dds::topic::topic_type_name::value(); + WARNING_LOG() << "reply slot doesn't exist for " << dds::topic::topic_type_name::value(); } if (!inProgress) return; } else - WARNING_LOG(m_logger) << "No valid data available "; + WARNING_LOG() << "No valid data available "; @@ -457,7 +457,7 @@ private: if (!requester.receive_reply(reply, MAX_WAIT)) { - WARNING_LOG(m_logger) << "Timeout while waiting for reply!"; + WARNING_LOG() << "Timeout while waiting for reply!"; throw std::runtime_error("Timeout while waiting for reply!"); } @@ -465,7 +465,7 @@ private: if (!reply.info().valid()) { - WARNING_LOG(m_logger) << "No valid data available!"; + WARNING_LOG() << "No valid data available!"; throw std::runtime_error("No valid data available!"); } @@ -473,7 +473,7 @@ private: if (request.sample.info().identity() != reply.info()->related_original_publication_virtual_sample_identity()) { - INFO_LOG(m_logger) << "#receiveReply - outdated. sample id: " << connext::DebugInfo::toReadable(request.sample.info().identity()) + INFO_LOG() << "#receiveReply - outdated. sample id: " << connext::DebugInfo::toReadable(request.sample.info().identity()) << ", virutal sample id: " << connext::DebugInfo::toReadable(reply.info()->related_original_publication_virtual_sample_identity()); continue; } @@ -481,10 +481,10 @@ private: Q_ASSERT(!isInProgress(reply)); if (isInProgress(reply)) { - ERROR_LOG(m_logger) << "Used ModernRequest for a request with FtReplyState! Your data will most likely be imcomplete!"; + ERROR_LOG() << "Used ModernRequest for a request with FtReplyState! Your data will most likely be imcomplete!"; } - INFO_LOG(m_logger) << "#receiveReply for " << TopicNameHelper::replyTopicTypeName(); + INFO_LOG() << "#receiveReply for " << TopicNameHelper::replyTopicTypeName(); request.promise.set_value(reply.data()); @@ -561,7 +561,6 @@ private: std::string m_partitionType; int m_partitionId; std::mutex m_requestMutex; - NGL::INGLLogger &m_logger; }; } diff --git a/qt6-after/qt6-migrated-legatus/Lts/DDS/FTS/connext.h b/qt6-after/qt6-migrated-legatus/Lts/DDS/FTS/connext.h index 8c2b425c3..a4d0d5b32 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/DDS/FTS/connext.h +++ b/qt6-after/qt6-migrated-legatus/Lts/DDS/FTS/connext.h @@ -312,7 +312,7 @@ public: m_contentFilteredTopic->filter(dds::topic::Filter(filterContent.data())); } - DEBUG_LOG(m_logger) << "content filter for topic " + DEBUG_LOG() << "content filter for topic " << ReplyRequestBase::m_requestTopic.name() << " - related_sample_identity should be: " << writerGuid; @@ -349,7 +349,7 @@ public: m_dataWriter->write(request.data(), request.info()); const rti::core::SampleIdentity currentSampleIdentity = request.info().identity(); - DEBUG_LOG(m_logger) << "send_request for topic " + DEBUG_LOG() << "send_request for topic " << ReplyRequestBase::m_requestTopic.name() << ", m_currentSampleIdentity: " << DebugInfo::toReadable(currentSampleIdentity); @@ -369,12 +369,12 @@ public: if (m_dataReader->take(reply.data(), reply.info()) && reply.info().valid()) { - DEBUG_LOG(m_logger) << "receive_reply for topic " + DEBUG_LOG() << "receive_reply for topic " << ReplyRequestBase::m_requestTopic.name() << ", SampleIdentity - original publication virtual: " << DebugInfo::toReadable(reply.info()->original_publication_virtual_sample_identity()); - DEBUG_LOG(m_logger) << "receive_reply for topic " + DEBUG_LOG() << "receive_reply for topic " << ReplyRequestBase::m_requestTopic.name() << ", SampleIdentity - related original: " << DebugInfo::toReadable(reply.info()->related_original_publication_virtual_sample_identity()); @@ -387,7 +387,7 @@ public: dds::core::cond::WaitSet::ConditionSeq activeConditionsSeq = waitset.wait(duration); if (activeConditionsSeq.empty()) { - ERROR_LOG(m_logger) << "Bailing out!"; + ERROR_LOG() << "Bailing out!"; break; } } @@ -398,7 +398,7 @@ public: if (!m_curInstanceHandle.is_nil()) { - DEBUG_LOG(m_logger) << "Keyed topic - disposing instance: " + DEBUG_LOG() << "Keyed topic - disposing instance: " << ReplyRequestBase::m_requestTopic.name(); m_dataWriter.dispose_instance(m_curInstanceHandle); } @@ -416,7 +416,6 @@ private: dds::sub::DataReader m_dataReader; dds::topic::ContentFilteredTopic m_contentFilteredTopic; dds::core::InstanceHandle m_curInstanceHandle; - NGL::INGLLogger &m_logger; }; template @@ -449,7 +448,7 @@ public: const rti::core::SampleIdentity &identity, bool bLastSample = true) { - DEBUG_LOG(m_logger) << "send_reply for topic " + DEBUG_LOG() << "send_reply for topic " << ReplyRequestBase::m_requestTopic.name() << ", sampleIdentity: " << DebugInfo::toReadable(identity); @@ -460,7 +459,7 @@ public: sf |= rti::core::SampleFlag::intermediate_reply_sequence(); reply.info().flag(sf); reply.info().related_sample_identity(identity); - DEBUG_LOG(m_logger) << "send_reply for topic " + DEBUG_LOG() << "send_reply for topic " << ReplyRequestBase::m_requestTopic.name() << ", related sampleIdentity: " << DebugInfo::toReadable(reply.info().related_sample_identity()); @@ -474,7 +473,7 @@ public: if (request.info().valid()) { - DEBUG_LOG(m_logger) << "receive_request for topic " + DEBUG_LOG() << "receive_request for topic " << ReplyRequestBase::m_requestTopic.name() << ", sampleIdentity publication_virtual_sample_identity: " << DebugInfo::toReadable(request.info()->publication_virtual_sample_identity()) @@ -496,7 +495,6 @@ private: connext::ReplierParams m_replierParams; dds::pub::DataWriter m_dataWriter; dds::sub::DataReader m_dataReader; - NGL::INGLLogger &m_logger; }; } diff --git a/qt6-after/qt6-migrated-legatus/Lts/DDS/FTS/generic_fts_impl.h b/qt6-after/qt6-migrated-legatus/Lts/DDS/FTS/generic_fts_impl.h index ee084ee2a..a34b52ac1 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/DDS/FTS/generic_fts_impl.h +++ b/qt6-after/qt6-migrated-legatus/Lts/DDS/FTS/generic_fts_impl.h @@ -131,7 +131,7 @@ public: { if (m_subscriberCallback) { - WARNING_LOG(m_logger) << "Can not set subscriber callback - already set ..."; + WARNING_LOG() << "Can not set subscriber callback - already set ..."; return false; } @@ -157,7 +157,7 @@ public: bool sendReply(const rti::core::SampleIdentity &requestIdentity, const QVector &replyData) override final { - DEBUG_LOG(m_logger) << TopicNameHelper::requestTopicName() << " - IN sendReply"; + DEBUG_LOG() << TopicNameHelper::requestTopicName() << " - IN sendReply"; for(int i = 0; i < replyData.size(); ++i) { @@ -184,7 +184,7 @@ protected: void processRequest(const connext::Sample &request) { - DEBUG_LOG(m_logger) << TopicNameHelper::requestTopicName() << " - processRequest: " + DEBUG_LOG() << TopicNameHelper::requestTopicName() << " - processRequest: " << connext::DebugInfo::toReadable(request.identity()); qint64 age = qAbs(qint64(request.info().source_timestamp().to_secs()) - time(nullptr)); @@ -203,7 +203,7 @@ protected: s.append("..."); } - DEBUG_LOG(m_logger) << "received a request for topic " + DEBUG_LOG() << "received a request for topic " << TopicNameHelper::requestTopicName() << " but it was outdated - ignoring. " << " local time: " << (time(nullptr) - 10) << "[s], source timestamp: " @@ -226,7 +226,7 @@ protected: void processRequests() override { - DEBUG_LOG(m_logger) << TopicNameHelper::requestTopicName() << " - processRequests"; + DEBUG_LOG() << TopicNameHelper::requestTopicName() << " - processRequests"; while (true) { @@ -235,21 +235,21 @@ protected: std::lock_guard l(m_requestMutex); if (m_requests.empty()) { - DEBUG_LOG(m_logger) << "No more requests"; + DEBUG_LOG() << "No more requests"; return; } - DEBUG_LOG(m_logger) << TopicNameHelper::requestTopicName() << " - read one request for "; + DEBUG_LOG() << TopicNameHelper::requestTopicName() << " - read one request for "; request = m_requests.front(); m_requests.pop(); } if (!request.info().valid()) { - WARNING_LOG(m_logger) << TopicNameHelper::requestTopicName() << " - No valid data"; + WARNING_LOG() << TopicNameHelper::requestTopicName() << " - No valid data"; continue; } processRequest(request); } - DEBUG_LOG(m_logger) << TopicNameHelper::requestTopicName() << " - processRequests finished"; + DEBUG_LOG() << TopicNameHelper::requestTopicName() << " - processRequests finished"; } bool enqueueRequests() override @@ -280,8 +280,6 @@ private: SubscriberCallback m_subscriberCallback; - - NGL::INGLLogger &m_logger; }; } diff --git a/qt6-after/qt6-migrated-legatus/Lts/DDS/FTS/generic_fts_internal.h b/qt6-after/qt6-migrated-legatus/Lts/DDS/FTS/generic_fts_internal.h index a6d3be80c..d1b8397ed 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/DDS/FTS/generic_fts_internal.h +++ b/qt6-after/qt6-migrated-legatus/Lts/DDS/FTS/generic_fts_internal.h @@ -3,7 +3,7 @@ #pragma once #include "generic_fts.h" -#include +#include #include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/DDS/Generic/dynamic_data_reader.h b/qt6-after/qt6-migrated-legatus/Lts/DDS/Generic/dynamic_data_reader.h index 472aca2a1..e3fb1d03b 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/DDS/Generic/dynamic_data_reader.h +++ b/qt6-after/qt6-migrated-legatus/Lts/DDS/Generic/dynamic_data_reader.h @@ -53,19 +53,19 @@ public: const std::string &specialTopicName, const StructType &structType) { - DEBUG_LOG(m_logger) << "IN DynamicDataReader::create (" + DEBUG_LOG() << "IN DynamicDataReader::create (" << m_structType->name() << ")"; if (domainParticipant == nullptr) { - ERROR_LOG(m_logger) << "DomainParticipant does not exist "; + ERROR_LOG() << "DomainParticipant does not exist "; return false; } if (m_ddsTopic != nullptr) { - ERROR_LOG(m_logger) << "Type '" + ERROR_LOG() << "Type '" << m_structType->name() << "' already created"; return false; @@ -84,7 +84,7 @@ public: DDS::Helper::getShortTopicName(m_structType->name()) : specialTopicName; - DEBUG_LOG(m_logger) << "Creating topic " << topicName << " with type: " + DEBUG_LOG() << "Creating topic " << topicName << " with type: " << m_structType->name(); m_ddsTopic = dds::topic::find>(domainParticipant, topicName); @@ -97,16 +97,16 @@ public: m_ddsTopic = dds::topic::Topic(domainParticipant, topicName, structType); } - DEBUG_LOG(m_logger) << "m_ddsTopic created: " << m_ddsTopic.name(); + DEBUG_LOG() << "m_ddsTopic created: " << m_ddsTopic.name(); if (m_logger.isDebugEnabled()) { dds::sub::qos::SubscriberQos subscriberQoS = ddsSubscriber.qos(); dds::core::policy::Partition partition = subscriberQoS.policy(); dds::core::StringSeq parititionNames = partition.name(); - DEBUG_LOG(m_logger) << "Subscribing partitions: " << parititionNames.size(); + DEBUG_LOG() << "Subscribing partitions: " << parititionNames.size(); for (const std::string &name : parititionNames) - DEBUG_LOG(m_logger) << "SubscriberQoS: partition name = " << name; + DEBUG_LOG() << "SubscriberQoS: partition name = " << name; } dds::sub::qos::DataReaderQos dataReaderQos = ddsSubscriber.default_datareader_qos(); @@ -129,7 +129,7 @@ public: if (m_dataReader == nullptr) { - ERROR_LOG(m_logger) << "Creating dataReader for '" << topicName << "' with type: '" + ERROR_LOG() << "Creating dataReader for '" << topicName << "' with type: '" << m_structType->name() << "' failed"; return false; @@ -138,11 +138,11 @@ public: } catch (const dds::core::Exception &ex) { - ERROR_LOG(m_logger) << ex.what(); + ERROR_LOG() << ex.what(); return false; } - DEBUG_LOG(m_logger) << "dataReader created (" + DEBUG_LOG() << "dataReader created (" << m_structType->name() << ")"; @@ -153,7 +153,7 @@ public: bool hasSamples() const { qint64 sampleSize = m_dataReader->datareader_cache_status().sample_count(); - DEBUG_LOG(m_logger) << "sampleSize = " << sampleSize; + DEBUG_LOG() << "sampleSize = " << sampleSize; return sampleSize > 0; } @@ -162,7 +162,7 @@ public: { dds::sub::LoanedSamples samples = m_dataReader.select().state(dds::sub::status::InstanceState::alive()).read(); - TRACE_LOG(m_logger) << "readAlive for " << DDS::topic_type_name::value() + TRACE_LOG() << "readAlive for " << DDS::topic_type_name::value() << ", count: " << samples.length() << ", this: " << this << ", instance handle " << m_dataReader.instance_handle(); @@ -175,7 +175,7 @@ public: { dds::sub::LoanedSamples samples = m_dataReader.select().state(dds::sub::status::InstanceState::alive()).take(); - TRACE_LOG(m_logger) << "takeAlive for " << DDS::topic_type_name::value() + TRACE_LOG() << "takeAlive for " << DDS::topic_type_name::value() << ", count: " << samples.length() << ", this: " << this << ", instance handle " << m_dataReader.instance_handle(); @@ -187,7 +187,7 @@ public: { dds::sub::LoanedSamples samples = m_dataReader.select().state(dds::sub::status::InstanceState::not_alive_disposed()).take(); - TRACE_LOG(m_logger) << "takeDisposed for " << DDS::topic_type_name::value() + TRACE_LOG() << "takeDisposed for " << DDS::topic_type_name::value() << ", count: " << samples.length() << ", this: " << this << ", instance handle " << m_dataReader.instance_handle(); return samples; @@ -196,18 +196,18 @@ public: template bool read(C callbackFunc) { - DEBUG_LOG(m_logger) << "IN read (" + DEBUG_LOG() << "IN read (" << DDS::topic_type_name::value() << "), this: " << this << ", instance handle " << m_dataReader.instance_handle(); if (m_dataReader == nullptr || m_ddsTopic == nullptr) { - ERROR_LOG(m_logger) << "No dataReader initialised "; + ERROR_LOG() << "No dataReader initialised "; return false; } if (!isValid(callbackFunc)) { - ERROR_LOG(m_logger) << "No subscriber set for " + ERROR_LOG() << "No subscriber set for " << DDS::topic_type_name::value(); return false; } @@ -216,7 +216,7 @@ public: dds::sub::LoanedSamples samples = m_dataReader.select().state(dds::sub::status::DataState::new_data()).read(); - DEBUG_LOG(m_logger) << "got " << samples.length() + m_newSamplesDuringRead.size() << " samples from reader for " + DEBUG_LOG() << "got " << samples.length() + m_newSamplesDuringRead.size() << " samples from reader for " << DDS::topic_type_name::value(); for (const auto &sample : samples) @@ -297,7 +297,7 @@ private: if (samples.length() == 0) return false; - DEBUG_LOG(m_logger) << "got " << samples.length() << " disposed instances from reader for " + DEBUG_LOG() << "got " << samples.length() << " disposed instances from reader for " << m_ddsTopic.name(); for (const auto &sample : samples) @@ -348,7 +348,6 @@ private: }; std::vector m_newSamplesDuringRead; bool m_bHaveSubscriberCallback; - NGL::INGLLogger &m_logger; }; } diff --git a/qt6-after/qt6-migrated-legatus/Lts/DDS/Generic/generic_base.h b/qt6-after/qt6-migrated-legatus/Lts/DDS/Generic/generic_base.h index 7bdb38daa..363980d90 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/DDS/Generic/generic_base.h +++ b/qt6-after/qt6-migrated-legatus/Lts/DDS/Generic/generic_base.h @@ -8,7 +8,7 @@ #include #include -#include +#include class QObject; class QMetaMethod; diff --git a/qt6-after/qt6-migrated-legatus/Lts/DDS/Generic/generic_data_reader.h b/qt6-after/qt6-migrated-legatus/Lts/DDS/Generic/generic_data_reader.h index 757cb542e..ba11436ea 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/DDS/Generic/generic_data_reader.h +++ b/qt6-after/qt6-migrated-legatus/Lts/DDS/Generic/generic_data_reader.h @@ -47,19 +47,19 @@ public: const std::string &topicName = DDS::Helper::getShortTopicName(DDS::topic_type_name::value()), bool bCreateDataReader = true) { - DEBUG_LOG(m_logger) << "IN GenericDataReader::create (" + DEBUG_LOG() << "IN GenericDataReader::create (" << DDS::topic_type_name::value() << "), this: " << this; if (domainParticipant == nullptr) { - ERROR_LOG(m_logger) << "DomainParticipant does not exist "; + ERROR_LOG() << "DomainParticipant does not exist "; return false; } if (m_ddsTopic != nullptr) { - ERROR_LOG(m_logger) << "Type '" + ERROR_LOG() << "Type '" << DDS::topic_type_name::value() << "' already created"; return false; @@ -67,7 +67,7 @@ public: try { - DEBUG_LOG(m_logger) << "Creating read topic " << topicName << " with type: " + DEBUG_LOG() << "Creating read topic " << topicName << " with type: " << DDS::topic_type_name::value(); m_ddsTopic = dds::topic::find(domainParticipant, topicName); @@ -79,9 +79,9 @@ public: dds::sub::qos::SubscriberQos subscriberQoS = ddsSubscriber.qos(); dds::core::policy::Partition partition = subscriberQoS.policy(); dds::core::StringSeq parititionNames = partition.name(); - DEBUG_LOG(m_logger) << "Subscribing partitions: " << parititionNames.size(); + DEBUG_LOG() << "Subscribing partitions: " << parititionNames.size(); for (const std::string &name : parititionNames) - DEBUG_LOG(m_logger) << " partition name = " << name; + DEBUG_LOG() << " partition name = " << name; } if (bCreateDataReader) @@ -90,7 +90,7 @@ public: m_dataReader = DataReader(ddsSubscriber, m_ddsTopic, drQos); if (m_dataReader == nullptr) { - ERROR_LOG(m_logger) << "Creating dataReader for '" << topicName << "' with type: '" + ERROR_LOG() << "Creating dataReader for '" << topicName << "' with type: '" << DDS::topic_type_name::value() << "' failed"; return false; @@ -99,11 +99,11 @@ public: } catch (const dds::core::Exception &ex) { - ERROR_LOG(m_logger) << ex.what(); + ERROR_LOG() << ex.what(); return false; } - DEBUG_LOG(m_logger) << "dataReader created (" + DEBUG_LOG() << "dataReader created (" << DDS::topic_type_name::value() << ")"; @@ -114,7 +114,7 @@ public: bool hasSamples() const { qint64 sampleSize = m_dataReader->datareader_cache_status().sample_count(); - DEBUG_LOG(m_logger) << "sampleSize = " << sampleSize; + DEBUG_LOG() << "sampleSize = " << sampleSize; return sampleSize > 0; } @@ -124,7 +124,7 @@ public: { dds::sub::LoanedSamples samples = m_dataReader.select().state(dds::sub::status::InstanceState::alive()).read(); - TRACE_LOG(m_logger) << "readAlive for " << DDS::topic_type_name::value() + TRACE_LOG() << "readAlive for " << DDS::topic_type_name::value() << ", count: " << samples.length() << ", this: " << this << ", instance handle " << m_dataReader.instance_handle(); @@ -138,7 +138,7 @@ public: { dds::sub::LoanedSamples samples = m_dataReader.select().state(dds::sub::status::InstanceState::alive()).take(); - TRACE_LOG(m_logger) << "takeAlive for " << DDS::topic_type_name::value() + TRACE_LOG() << "takeAlive for " << DDS::topic_type_name::value() << ", count: " << samples.length() << ", this: " << this << ", instance handle " << m_dataReader.instance_handle(); @@ -150,7 +150,7 @@ public: { dds::sub::LoanedSamples samples = m_dataReader.select().state(dds::sub::status::InstanceState::not_alive_disposed()).take(); - TRACE_LOG(m_logger) << "takeDisposed for " << DDS::topic_type_name::value() + TRACE_LOG() << "takeDisposed for " << DDS::topic_type_name::value() << ", count: " << samples.length() << ", this: " << this << ", instance handle " << m_dataReader.instance_handle(); return samples; @@ -159,18 +159,18 @@ public: template bool read(C callbackFunc) { - DEBUG_LOG(m_logger) << "IN read (" + DEBUG_LOG() << "IN read (" << DDS::topic_type_name::value() << "), this: " << this << ", instance handle " << m_dataReader.instance_handle(); if (m_dataReader == nullptr) { - ERROR_LOG(m_logger) << "No dataReader initialised "; + ERROR_LOG() << "No dataReader initialised "; return false; } if (!isValid(callbackFunc)) { - ERROR_LOG(m_logger) << "No subscriber set for " + ERROR_LOG() << "No subscriber set for " << DDS::topic_type_name::value(); return false; } @@ -189,7 +189,7 @@ public: } } - DEBUG_LOG(m_logger) << "got " << samples.size() + m_newSamplesDuringRead.size() << " samples from reader for " + DEBUG_LOG() << "got " << samples.size() + m_newSamplesDuringRead.size() << " samples from reader for " << DDS::topic_type_name::value(); for (const SampleStruct &ss : samples) @@ -265,7 +265,7 @@ private: if (samples.length() == 0) return false; - DEBUG_LOG(m_logger) << "got " << samples.length() << " disposed instances from reader for " + DEBUG_LOG() << "got " << samples.length() << " disposed instances from reader for " << DDS::topic_type_name::value(); for (const auto &sample : samples) @@ -322,7 +322,6 @@ protected: }; std::vector m_newSamplesDuringRead; bool m_bHaveSubscriberCallback; - NGL::INGLLogger &m_logger; }; template diff --git a/qt6-after/qt6-migrated-legatus/Lts/DDS/Generic/generic_data_writer.h b/qt6-after/qt6-migrated-legatus/Lts/DDS/Generic/generic_data_writer.h index 58126eebd..178aae114 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/DDS/Generic/generic_data_writer.h +++ b/qt6-after/qt6-migrated-legatus/Lts/DDS/Generic/generic_data_writer.h @@ -32,19 +32,19 @@ public: const dds::pub::Publisher &ddsPublisher, const std::string &topicName = DDS::Helper::getShortTopicName(DDS::topic_type_name::value())) { - DEBUG_LOG(m_logger) << "IN GenericDataWriter::create (" + DEBUG_LOG() << "IN GenericDataWriter::create (" << DDS::topic_type_name::value() << ")"; if (participant == nullptr) { - ERROR_LOG(m_logger) << "Participant not available, aborting. "; + ERROR_LOG() << "Participant not available, aborting. "; return false; } if (m_ddsTopic != nullptr) { - ERROR_LOG(m_logger) << "Type '" + ERROR_LOG() << "Type '" << DDS::topic_type_name::value() << "' already created"; return false; @@ -52,7 +52,7 @@ public: try { - DEBUG_LOG(m_logger) << "Creating write topic " << topicName << " with type: " + DEBUG_LOG() << "Creating write topic " << topicName << " with type: " << DDS::topic_type_name::value(); m_ddsTopic = dds::topic::find(participant, topicName); @@ -65,7 +65,7 @@ public: if (m_dataWriter == nullptr) { - ERROR_LOG(m_logger) << "Initialisation of " + ERROR_LOG() << "Initialisation of " << DDS::topic_type_name::value() << " failed "; return false; @@ -74,11 +74,11 @@ public: } catch ( const dds::core::Exception &ex ) { - ERROR_LOG(m_logger) << ex.what(); + ERROR_LOG() << ex.what(); return false; } - DEBUG_LOG(m_logger) << "dataWriter created (" + DEBUG_LOG() << "dataWriter created (" << DDS::topic_type_name::value() << ")"; @@ -88,12 +88,12 @@ public: bool write(const TopicType &data, const dds::core::optional &si = dds::core::optional()) { - DEBUG_LOG(m_logger) << "IN write (" + DEBUG_LOG() << "IN write (" << DDS::topic_type_name::value() << ") "; if (m_dataWriter == nullptr) { - ERROR_LOG(m_logger) << "No dataWriter initialised "; + ERROR_LOG() << "No dataWriter initialised "; return false; } @@ -112,18 +112,18 @@ public: bool remove(const TopicType &data, bool errorMsgIfNotExists = true) { - DEBUG_LOG(m_logger) << "IN remove (" + DEBUG_LOG() << "IN remove (" << DDS::topic_type_name::value() << ") "; if (m_dataWriter == nullptr) { - ERROR_LOG(m_logger) << "No dataWriter initialised "; + ERROR_LOG() << "No dataWriter initialised "; return false; } const dds::core::InstanceHandle ih = m_dataWriter.lookup_instance(data); if (ih.is_nil()) { if (errorMsgIfNotExists) - ERROR_LOG(m_logger) << "Could not find instance for topic " + ERROR_LOG() << "Could not find instance for topic " << DDS::topic_type_name::value() << " for unregistering!"; return false; @@ -137,7 +137,6 @@ public: private: DataWriter m_dataWriter; DataTopic m_ddsTopic; - NGL::INGLLogger &m_logger; }; } diff --git a/qt6-after/qt6-migrated-legatus/Lts/DDS/Generic/generic_logger.h b/qt6-after/qt6-migrated-legatus/Lts/DDS/Generic/generic_logger.h index 7e7594a76..35ac11fec 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/DDS/Generic/generic_logger.h +++ b/qt6-after/qt6-migrated-legatus/Lts/DDS/Generic/generic_logger.h @@ -4,7 +4,7 @@ #pragma once #include -#include +#include namespace DDS { diff --git a/qt6-after/qt6-migrated-legatus/Lts/DDS/Generic/subscriber_listener.cpp b/qt6-after/qt6-migrated-legatus/Lts/DDS/Generic/subscriber_listener.cpp index 6cc2140b8..c641c0291 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/DDS/Generic/subscriber_listener.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/DDS/Generic/subscriber_listener.cpp @@ -13,7 +13,7 @@ SubscriberListener::SubscriberListener() , m_logger(DDS::getLogger("SubscriberListener", DDS::DataType::DATA_TOPIC_CLIENT)) { qRegisterMetaType("std::string"); - DEBUG_LOG(m_logger) << "SubscriberListener initialized, this " << this; + DEBUG_LOG() << "SubscriberListener initialized, this " << this; } void SubscriberListener::addCallback(const std::string &topicName, @@ -21,7 +21,7 @@ void SubscriberListener::addCallback(const std::string &topicName, const dds::sub::AnyDataReader &dataReader, SubscriberListenerCallback *cb) { - DEBUG_LOG(m_logger) << "addSubscriberCallback for " << topicName << ", type " << topicTypeName + DEBUG_LOG() << "addSubscriberCallback for " << topicName << ", type " << topicTypeName << ", cb " << cb << ", this " << this; QWriteLocker l(&m_accessLock); if (m_bPrepareForShutdown) @@ -34,7 +34,7 @@ void SubscriberListener::removeCallback(const std::string &topicName, const dds::sub::AnyDataReader &dataReader, SubscriberListenerCallback *cb) { - DEBUG_LOG(m_logger) << "IN removeSubscriberCallback for " << topicName << ", type " << topicTypeName + DEBUG_LOG() << "IN removeSubscriberCallback for " << topicName << ", type " << topicTypeName << ", cb " << cb << ", this " << this; QWriteLocker l(&m_accessLock); m_droCallbacks.remove(std::make_pair(topicName, topicTypeName), fillData(dataReader, cb)); @@ -68,7 +68,7 @@ void SubscriberListener::enaDisaCallback(const std::string &topicName, } if (!bFound) - WARNING_LOG(m_logger) << "Can not " << (bEnable ? "enable" : "disable") + WARNING_LOG() << "Can not " << (bEnable ? "enable" : "disable") << " callback for " << topicName << ", type " << topicTypeName << ", cb " << cb << ", this " << this << " - not found!"; } @@ -91,7 +91,7 @@ void SubscriberListener::on_data_available(dds::sub::AnyDataReader &reader) QReadLocker l(&m_accessLock); if (m_droCallbacks.isEmpty() || m_bPrepareForShutdown) return; - DEBUG_LOG(m_logger) << "Data available for " << topicName << ", type " << topicTypeName << ", this " << this; + DEBUG_LOG() << "Data available for " << topicName << ", type " << topicTypeName << ", this " << this; QMultiMap, cbData>::iterator cbIt = m_droCallbacks.find(key); const QMultiMap, cbData>::iterator cbEnd = m_droCallbacks.end(); for( ; cbIt != cbEnd && cbIt.key() == key; ++cbIt) @@ -122,7 +122,7 @@ void SubscriberListener::on_liveliness_changed(dds::sub::AnyDataReader &reader, const std::string &topicName = reader.topic_name(); const std::string &topicTypeName = reader.type_name(); - DEBUG_LOG(m_logger) << "on_liveliness_changed: " << livelinessStatus.alive_count() + DEBUG_LOG() << "on_liveliness_changed: " << livelinessStatus.alive_count() << ", " << livelinessStatus.not_alive_count() << ", " << livelinessStatus.alive_count_change() << ", " << livelinessStatus.not_alive_count_change() @@ -154,7 +154,7 @@ void SubscriberListener::on_liveliness_changed(dds::sub::AnyDataReader &reader, if (bNoWritersAnymore) { - DEBUG_LOG(m_logger) << "bNoWritersAnymore for " << topicName << ", type " << topicTypeName; + DEBUG_LOG() << "bNoWritersAnymore for " << topicName << ", type " << topicTypeName; data.cb->noWriterAnymore(topicTypeName, topicName); } else if (bNewWriters) @@ -164,7 +164,7 @@ void SubscriberListener::on_liveliness_changed(dds::sub::AnyDataReader &reader, continue; if (data.methodToCall.isValid()) { - DEBUG_LOG(m_logger) << "methodcall is valid for " << topicName << ", type " << topicTypeName; + DEBUG_LOG() << "methodcall is valid for " << topicName << ", type " << topicTypeName; data.methodToCall.invoke(data.cb, Qt::QueuedConnection, Q_ARG(std::string, topicTypeName), Q_ARG(std::string, topicName)); diff --git a/qt6-after/qt6-migrated-legatus/Lts/DDS/Generic/subscriber_listener.h b/qt6-after/qt6-migrated-legatus/Lts/DDS/Generic/subscriber_listener.h index 385b47cdd..9fa8bf67f 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/DDS/Generic/subscriber_listener.h +++ b/qt6-after/qt6-migrated-legatus/Lts/DDS/Generic/subscriber_listener.h @@ -3,7 +3,7 @@ #pragma once -#include +#include #include #include #include @@ -134,7 +134,6 @@ private: QMultiMap, cbData> m_droCallbacks; QReadWriteLock m_accessLock; bool m_bPrepareForShutdown; - NGL::INGLLogger &m_logger; }; } diff --git a/qt6-after/qt6-migrated-legatus/Lts/DDS/Generic/wait_set_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/DDS/Generic/wait_set_handler.cpp index 61811ae97..e69159b15 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/DDS/Generic/wait_set_handler.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/DDS/Generic/wait_set_handler.cpp @@ -24,7 +24,7 @@ WaitSetHandler::~WaitSetHandler() bool WaitSetHandler::attachWaitSet(const dds::core::cond::Condition &cond, CallbackInterface *cb) { - DEBUG_LOG(m_logger) << "AttachWaitSet with callback " << cb; + DEBUG_LOG() << "AttachWaitSet with callback " << cb; WaitSetData wsd(cond, cb); @@ -33,7 +33,7 @@ bool WaitSetHandler::attachWaitSet(const dds::core::cond::Condition &cond, Callb auto it = m_waitSetData.find(wsd.condition->native_condition()); if (it != m_waitSetData.end()) { - WARNING_LOG(m_logger) << "Waitset " << cb << " already registered"; + WARNING_LOG() << "Waitset " << cb << " already registered"; return false; } @@ -47,7 +47,7 @@ bool WaitSetHandler::attachWaitSet(const dds::core::cond::Condition &cond, Callb bool WaitSetHandler::detachWaitSet(const dds::core::cond::Condition &cond, CallbackInterface *cb) { - DEBUG_LOG(m_logger) << "DetachWaitSet with callback " << cb; + DEBUG_LOG() << "DetachWaitSet with callback " << cb; WaitSetData wsd(cond, cb); @@ -56,7 +56,7 @@ bool WaitSetHandler::detachWaitSet(const dds::core::cond::Condition &cond, Callb auto it = m_waitSetData.find(wsd.condition->native_condition()); if (it == m_waitSetData.end()) { - WARNING_LOG(m_logger) << "Waitset for " << cb << " not registered"; + WARNING_LOG() << "Waitset for " << cb << " not registered"; return false; } @@ -67,7 +67,7 @@ bool WaitSetHandler::detachWaitSet(const dds::core::cond::Condition &cond, Callb bool WaitSetHandler::enableWaitSet(const dds::core::cond::Condition &cond, CallbackInterface *cb) { - DEBUG_LOG(m_logger) << "EnableWaitSet with callback " << cb; + DEBUG_LOG() << "EnableWaitSet with callback " << cb; WaitSetData wsd(cond, cb); @@ -75,7 +75,7 @@ bool WaitSetHandler::enableWaitSet(const dds::core::cond::Condition &cond, Callb auto it = m_waitSetData.find(wsd.condition->native_condition()); if (it == m_waitSetData.end()) { - ERROR_LOG(m_logger) << "Could not find WaitSetData - cannot enable waitSet for " << cb; + ERROR_LOG() << "Could not find WaitSetData - cannot enable waitSet for " << cb; return false; } @@ -88,7 +88,7 @@ bool WaitSetHandler::enableWaitSet(const dds::core::cond::Condition &cond, Callb bool WaitSetHandler::disableWaitSet(const dds::core::cond::Condition &cond, CallbackInterface *cb) { - DEBUG_LOG(m_logger) << "DisableWaitSet with callback " << cb; + DEBUG_LOG() << "DisableWaitSet with callback " << cb; WaitSetData wsd(cond, cb); @@ -96,7 +96,7 @@ bool WaitSetHandler::disableWaitSet(const dds::core::cond::Condition &cond, Call auto it = m_waitSetData.find(wsd.condition->native_condition()); if (it == m_waitSetData.end()) { - ERROR_LOG(m_logger) << "Could not find WaitSetData - cannot disable waitSet for " << cb; + ERROR_LOG() << "Could not find WaitSetData - cannot disable waitSet for " << cb; return false; } @@ -133,7 +133,7 @@ void WaitSetHandler::waitSetTask() WaitSetData &wsd = it->second; if (wsd.enabled) { - DEBUG_LOG(m_logger) << "Condition triggered for " << wsd.callback; + DEBUG_LOG() << "Condition triggered for " << wsd.callback; wsd.callback->dataAvailable(); } ++it; diff --git a/qt6-after/qt6-migrated-legatus/Lts/DDS/Generic/wait_set_handler.h b/qt6-after/qt6-migrated-legatus/Lts/DDS/Generic/wait_set_handler.h index 9b936432d..f6bdd807c 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/DDS/Generic/wait_set_handler.h +++ b/qt6-after/qt6-migrated-legatus/Lts/DDS/Generic/wait_set_handler.h @@ -9,7 +9,7 @@ #include #include -#include +#include namespace NGL { @@ -60,6 +60,5 @@ private: std::future m_task; std::mutex m_accessMutex; std::map m_waitSetData; - NGL::INGLLogger &m_logger; }; } diff --git a/qt6-after/qt6-migrated-legatus/Lts/DDS/QosProfile/DDS_DefaultQos.h b/qt6-after/qt6-migrated-legatus/Lts/DDS/QosProfile/DDS_DefaultQos.h index e5731788c..f1417a37d 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/DDS/QosProfile/DDS_DefaultQos.h +++ b/qt6-after/qt6-migrated-legatus/Lts/DDS/QosProfile/DDS_DefaultQos.h @@ -6,7 +6,7 @@ #include #include #include -#include +#include "ddsqos_export.h" namespace NGL { diff --git a/qt6-after/qt6-migrated-legatus/Lts/DDS/Routing/routing_plugin.h b/qt6-after/qt6-migrated-legatus/Lts/DDS/Routing/routing_plugin.h index 16148acc9..9e4d622e6 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/DDS/Routing/routing_plugin.h +++ b/qt6-after/qt6-migrated-legatus/Lts/DDS/Routing/routing_plugin.h @@ -132,7 +132,7 @@ public: void writeSamples() override { - TRACE_LOG(m_logger) << "Writing samples for " << DDS::topic_type_name::value() + TRACE_LOG() << "Writing samples for " << DDS::topic_type_name::value() << ", sample count: " << m_loanedSamples.length(); rti::pub::WriteParams writeParams; for (const auto &sample : m_loanedSamples) @@ -148,7 +148,7 @@ public: - TRACE_LOG(m_logger) << "identity: " << DebugInfo::toReadable(writeParams.identity()) + TRACE_LOG() << "identity: " << DebugInfo::toReadable(writeParams.identity()) << ", related_sample_identity: " << DebugInfo::toReadable(writeParams.related_sample_identity()); const auto &state = sample.info().state(); @@ -159,20 +159,20 @@ public: } else if (instanceState == dds::sub::status::InstanceState::not_alive_disposed()) { - TRACE_LOG(m_logger) << " - is disposed"; + TRACE_LOG() << " - is disposed"; m_dataWriter->dispose_instance(writeParams); } else if (instanceState == dds::sub::status::InstanceState::not_alive_no_writers()) { - TRACE_LOG(m_logger) << " - is unregistered"; + TRACE_LOG() << " - is unregistered"; m_dataWriter->unregister_instance(writeParams); } else - WARNING_LOG(m_logger) << "Unknown instance state: " << instanceState; + WARNING_LOG() << "Unknown instance state: " << instanceState; } catch (const dds::core::Exception &ex) { - ERROR_LOG(m_logger) << "writeSamples exception: " << ex.what(); + ERROR_LOG() << "writeSamples exception: " << ex.what(); } } m_dataWriter->flush(); @@ -207,7 +207,7 @@ public: { if (!m_dwt) return false; - DEBUG_LOG(m_logger) << "Creating DataWriter for domain " << dpOut.domain_id(); + DEBUG_LOG() << "Creating DataWriter for domain " << dpOut.domain_id(); m_dataWriter = dds::pub::DataWriter(pubOut, getTopic(dpOut, m_topicName), DDS::QosProfile::dataWriterDefault(m_topicType)); @@ -222,7 +222,7 @@ public: { - TRACE_LOG(m_logger) << "Data available for " << DDS::topic_type_name::value(); + TRACE_LOG() << "Data available for " << DDS::topic_type_name::value(); auto ws = new SampleWriter(reader.take(), m_dataWriter, m_topicType == DDS::QosProfile::TopicType::FunctionTopic, m_logger); m_dwt->enqueue(ws); } @@ -249,7 +249,6 @@ protected: dds::pub::DataWriter m_dataWriter; std::string m_topicName; DDS::QosProfile::TopicType m_topicType; - NGL::INGLLogger &m_logger; }; @@ -276,14 +275,14 @@ protected: const dds::domain::DomainParticipant &dpOut, const dds::pub::Publisher &pubOut) override { - DEBUG_LOG(m_logger) << "Initializing TopicDispatcher " << "(" << this << ")"; + DEBUG_LOG() << "Initializing TopicDispatcher " << "(" << this << ")"; if (m_dataReader != nullptr) return false; m_dataReader = dds::sub::DataReader(subIn, getTopic(dpIn, m_topicName), DDS::QosProfile::dataReaderDefault(m_topicType)); - DEBUG_LOG(m_logger) << "Creating DataReader for domain " << dpIn.domain_id() << ", ptr: " << m_dataReader.delegate().get(); + DEBUG_LOG() << "Creating DataReader for domain " << dpIn.domain_id() << ", ptr: " << m_dataReader.delegate().get(); m_dtl.reset(new DataTopicListener(dwt, m_topicName, m_topicType, m_logger)); @@ -295,10 +294,10 @@ protected: void shutdown() override { - DEBUG_LOG(m_logger) << "Cleaning up TopicDispatcher " << "(" << this << ")"; + DEBUG_LOG() << "Cleaning up TopicDispatcher " << "(" << this << ")"; if (m_dataReader != nullptr) { - DEBUG_LOG(m_logger) << "shutting down DataReader: " << m_dataReader.delegate().get(); + DEBUG_LOG() << "shutting down DataReader: " << m_dataReader.delegate().get(); m_dataReader.listener(nullptr, dds::core::status::StatusMask::none()); try { @@ -306,7 +305,7 @@ protected: } catch (const dds::core::Exception &ex) { - ERROR_LOG(m_logger) << "topic close ex: " << ex.what(); + ERROR_LOG() << "topic close ex: " << ex.what(); } } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/Data/asb_foreign_interface_impl.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/Data/asb_foreign_interface_impl.cpp index 9536b16f8..0bd289b63 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/Data/asb_foreign_interface_impl.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/Data/asb_foreign_interface_impl.cpp @@ -16,11 +16,10 @@ ForeignInterfaceImpl::ForeignInterfaceImpl(const std::shared_ptr ForeignInterfaceImpl::findImage(const ParticipantMa { if (!m_aesDtc) { - WARNING_LOG(m_logger) << "Fetching 'm_aesDtc' failed, No color and injury information will be included in symbol created for participant.id() " << participant.id(); + WARNING_LOG() << "Fetching 'm_aesDtc' failed, No color and injury information will be included in symbol created for participant.id() " << participant.id(); return findImage(symDataToRender); } const int partyId = m_aesDtc->partyForDusMine(lastState.originatorId()); @@ -111,7 +110,7 @@ QSharedPointer ForeignInterfaceImpl::findImage(const ParticipantMa { if (!m_aesDtc) { - WARNING_LOG(m_logger) << "Fetching 'm_aesDtc' failed, No color and injury information will be included in symbol created for participant.id() " << participant.id(); + WARNING_LOG() << "Fetching 'm_aesDtc' failed, No color and injury information will be included in symbol created for participant.id() " << participant.id(); return findImage(symDataToRender); } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/Data/asb_foreign_interface_impl.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/Data/asb_foreign_interface_impl.h index 55eb931e2..3ddea6ed9 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/Data/asb_foreign_interface_impl.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/Data/asb_foreign_interface_impl.h @@ -57,7 +57,6 @@ private: std::shared_ptr m_ppmDtc; std::shared_ptr m_aesDtc; std::shared_ptr m_guezIedDtc; - NGL::INGLLogger &m_logger; }; } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/Gui/SymbolEditor/asb_symbol_editor.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/Gui/SymbolEditor/asb_symbol_editor.cpp index a156c93ff..7342081e0 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/Gui/SymbolEditor/asb_symbol_editor.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/Gui/SymbolEditor/asb_symbol_editor.cpp @@ -152,9 +152,9 @@ SymbolEditor::SymbolEditor(LtsSession::LtsSession *session, QWidget *parent) , m_session(session) , m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger().getNGLLogger("SymbolEditor")) { - DEBUG_LOG(m_logger) << "SymbolEditor(" << "parent=" << parent << ")"; + DEBUG_LOG() << "SymbolEditor(" << "parent=" << parent << ")"; m_ui->setupUi(this); - DEBUG_LOG(m_logger) << "END " << LOGFUNCTION; + DEBUG_LOG() << "END " << Q_FUNC_INFO; } bool SymbolEditor::init(const std::shared_ptr &flmFtc, @@ -163,7 +163,7 @@ bool SymbolEditor::init(const std::shared_ptr const std::shared_ptr &ppmDtc, bool asApp) { - DEBUG_LOG(m_logger) << LOGFUNCTION; + DEBUG_LOG() << Q_FUNC_INFO; setOnlineHelpFilename(QStringLiteral("Symbol_Editor-Application")); if (asApp) @@ -214,25 +214,25 @@ bool SymbolEditor::init(const std::shared_ptr if (!m_internal->m_symbolFrames.setDirectory(QLatin1String(":/Symbole/Attributes/symbolframes"), QStringList(QLatin1String("*.xml")))) - ERROR_LOG(m_logger) << "Error while reading SymbolFrame-XML-Files!"; + ERROR_LOG() << "Error while reading SymbolFrame-XML-Files!"; if (!m_internal->m_branchSymbols.setDirectory(QLatin1String(":/Symbole/Attributes/branch"), QStringList(QLatin1String("*.xml")))) - ERROR_LOG(m_logger) << "Error while reading Branch/Truppengattung-XML-Files!"; + ERROR_LOG() << "Error while reading Branch/Truppengattung-XML-Files!"; if (!m_internal->m_mobilitySymbols.setDirectory(QLatin1String(":/Symbole/Attributes/mobility"), QStringList(QLatin1String("*.xml")))) - ERROR_LOG(m_logger) << "Error while reading Mobility-XML-Files!"; + ERROR_LOG() << "Error while reading Mobility-XML-Files!"; if (!m_internal->m_bcdabSymbols.setDirectory(QLatin1String(":/Symbole/Attributes/bcdab"), QStringList(QLatin1String("*.xml")))) - ERROR_LOG(m_logger) << "Error while reading BCDAB-XML-Files!"; + ERROR_LOG() << "Error while reading BCDAB-XML-Files!"; if (!m_internal->m_commandLevelSymbols.setDirectory(QLatin1String(":/Symbole/Attributes/commandlevel"), QStringList(QLatin1String("*.xml")))) - ERROR_LOG(m_logger) << "Error while reading CommandLevel-XML-Files!"; + ERROR_LOG() << "Error while reading CommandLevel-XML-Files!"; if (!m_internal->m_vehicleSymbols.setDirectory(QLatin1String(":/Symbole/Attributes/vehicle"), QStringList(QLatin1String("*.xml")))) - ERROR_LOG(m_logger) << "Error while reading vehicle-XML-Files!"; + ERROR_LOG() << "Error while reading vehicle-XML-Files!"; if (!m_internal->m_intrinsicMobilitySymbols.setDirectory(QLatin1String(":/Symbole/Attributes/intrinsicmobility"), QStringList(QLatin1String("*.xml")))) - ERROR_LOG(m_logger) << "Error while reading Intrinsic-Mobility-XML-Files!"; + ERROR_LOG() << "Error while reading Intrinsic-Mobility-XML-Files!"; if (!m_internal->m_armingSymbols.setDirectory(QLatin1String(":/Symbole/Attributes/arming"), QStringList(QLatin1String("*.xml")))) - ERROR_LOG(m_logger) << "Error while reading arming-XML-Files!"; + ERROR_LOG() << "Error while reading arming-XML-Files!"; if (!m_internal->m_miscSymbols.setDirectory(QLatin1String(":/Symbole/Attributes/misc"), QStringList(QLatin1String("*.xml")))) - ERROR_LOG(m_logger) << "Error while reading arming-XML-Files!"; + ERROR_LOG() << "Error while reading arming-XML-Files!"; if (!m_internal->m_sectorSymbols.setDirectory(QLatin1String(":/Symbole/Attributes/sectoricon"), QStringList(QLatin1String("*.xml")))) - ERROR_LOG(m_logger) << "Error while reading sectoricon-XML-Files!"; + ERROR_LOG() << "Error while reading sectoricon-XML-Files!"; m_internal->m_symbolColorsEditView.clear(); m_internal->m_symbolColorsEditView.insert(SymbologyXML::SymbolTypes::UNKNOWN, QColor(255, 255, 128)); @@ -438,22 +438,22 @@ bool SymbolEditor::init(const std::shared_ptr connect(m_ui->SliderTransparency, &QSlider::valueChanged, this, &SymbolEditor::onSliderTransparencyValueChanged); - DEBUG_LOG(m_logger) << "END " << LOGFUNCTION; + DEBUG_LOG() << "END " << Q_FUNC_INFO; return true; } SymbolEditor::~SymbolEditor() { - DEBUG_LOG(m_logger) << LOGFUNCTION; + DEBUG_LOG() << Q_FUNC_INFO; delete m_internal; delete m_ui; - DEBUG_LOG(m_logger) << "END " << LOGFUNCTION; + DEBUG_LOG() << "END " << Q_FUNC_INFO; } void SymbolEditor::movePrimitive(QPointF diff) { - DEBUG_LOG(m_logger) << LOGFUNCTION; + DEBUG_LOG() << Q_FUNC_INFO; if (m_internal->m_currentGraphicsItem != nullptr) { QGraphicsItem *sepi = m_internal->m_currentGraphicsItem; @@ -467,12 +467,12 @@ void SymbolEditor::movePrimitive(QPointF diff) setChanged(true); } } - DEBUG_LOG(m_logger) << "END " << LOGFUNCTION; + DEBUG_LOG() << "END " << Q_FUNC_INFO; } bool SymbolEditor::createNewSymbol(const QString &symbolname) { - DEBUG_LOG(m_logger) << LOGFUNCTION; + DEBUG_LOG() << Q_FUNC_INFO; m_internal->m_symbol.reset(); m_internal->m_symbol.setName(symbolname); @@ -485,13 +485,13 @@ bool SymbolEditor::createNewSymbol(const QString &symbolname) setChanged(false); clearUndo(); - DEBUG_LOG(m_logger) << "END " << LOGFUNCTION; + DEBUG_LOG() << "END " << Q_FUNC_INFO; return true; } void SymbolEditor::resetGUI() { - DEBUG_LOG(m_logger) << LOGFUNCTION; + DEBUG_LOG() << Q_FUNC_INFO; bool bOldUpdateInProgress = m_internal->m_updateInProgress; m_internal->m_updateInProgress = true; @@ -615,14 +615,14 @@ void SymbolEditor::resetGUI() m_internal->m_updateInProgress = bOldUpdateInProgress; - DEBUG_LOG(m_logger) << "END " << LOGFUNCTION; + DEBUG_LOG() << "END " << Q_FUNC_INFO; } void SymbolEditor::fillListWidget(const QMap &container, QWidget *widget, e_category category, SymbologyXML::SymbolTypes::t_icon_type iconType, bool withIcons, bool sort) { - DEBUG_LOG(m_logger) << LOGFUNCTION; + DEBUG_LOG() << Q_FUNC_INFO; if (!widget) return; @@ -668,14 +668,14 @@ void SymbolEditor::fillListWidget(const QMap &container, QWidget * cwidget->setMaxVisibleItems(25); } - DEBUG_LOG(m_logger) << "END" << LOGFUNCTION; + DEBUG_LOG() << "END" << Q_FUNC_INFO; } void SymbolEditor::widgetInsertItem(QWidget *widget, int index, const QString &text, int key, e_category category, SymbologyXML::SymbolTypes::t_icon_type iconType, bool withIcons) { - DEBUG_LOG(m_logger) << LOGFUNCTION; + DEBUG_LOG() << Q_FUNC_INFO; QListWidget *lwidget = qobject_cast(widget); QComboBox *cwidget = qobject_cast(widget); @@ -704,12 +704,12 @@ void SymbolEditor::widgetInsertItem(QWidget *widget, int index, const QString &t cwidget->insertItem(index, text, key); } - DEBUG_LOG(m_logger) << "END" << LOGFUNCTION; + DEBUG_LOG() << "END" << Q_FUNC_INFO; } QIcon SymbolEditor::getIcon(e_category category, SymbologyXML::SymbolTypes::t_icon_type iconType, int iconId, QSize iconSize) { - DEBUG_LOG(m_logger) << LOGFUNCTION; + DEBUG_LOG() << Q_FUNC_INFO; SymbologyXML::Symbol *newSymbol = nullptr; bool isAttrib = true; @@ -817,14 +817,14 @@ QIcon SymbolEditor::getIcon(e_category category, SymbologyXML::SymbolTypes::t_ic QTransform transformView; transformView.scale(1.0, -1.0); - DEBUG_LOG(m_logger) << "END" << LOGFUNCTION; + DEBUG_LOG() << "END" << Q_FUNC_INFO; return QIcon(pm.transformed(transformView)); } int SymbolEditor::getFrameSymbolID(SymbologyXML::SymbolTypes::t_dimen dimen, SymbologyXML::SymbolTypes::t_affil affil) { - DEBUG_LOG(m_logger) << LOGFUNCTION; + DEBUG_LOG() << Q_FUNC_INFO; SymbologyXML::SymbolTypes::t_affil tmp_affil = affil; if (tmp_affil == SymbologyXML::SymbolTypes::PENDING) @@ -834,14 +834,14 @@ int SymbolEditor::getFrameSymbolID(SymbologyXML::SymbolTypes::t_dimen dimen, Sym if (tmp_affil == SymbologyXML::SymbolTypes::ASSUMED_FRIEND) tmp_affil = SymbologyXML::SymbolTypes::FRIEND; - DEBUG_LOG(m_logger) << "END" << LOGFUNCTION; + DEBUG_LOG() << "END" << Q_FUNC_INFO; return SymbologyXML::SymbolTable::getFrameSymbolID(dimen, tmp_affil); } void SymbolEditor::updateGUI() { - DEBUG_LOG(m_logger) << LOGFUNCTION; + DEBUG_LOG() << Q_FUNC_INFO; m_internal->m_updateInProgress = true; @@ -857,12 +857,12 @@ void SymbolEditor::updateGUI() updateGraphicViews(true, true); m_internal->m_updateInProgress = false; - DEBUG_LOG(m_logger) << "END " << LOGFUNCTION; + DEBUG_LOG() << "END " << Q_FUNC_INFO; } void SymbolEditor::updateSymbolAttributesWidgets() { - DEBUG_LOG(m_logger) << LOGFUNCTION; + DEBUG_LOG() << Q_FUNC_INFO; bool bOldUpdateInProgress = m_internal->m_updateInProgress; m_internal->m_updateInProgress = true; @@ -930,7 +930,7 @@ void SymbolEditor::updateSymbolAttributesWidgets() int idx = m_ui->ComboBoxSectorMain->findData(iconId); if (idx < 0) - ERROR_LOG(m_logger) << "SECTORMAIN: iconid (" << iconId << ") not found"; + ERROR_LOG() << "SECTORMAIN: iconid (" << iconId << ") not found"; else m_ui->ComboBoxSectorMain->setCurrentIndex(m_ui->ComboBoxSectorMain->findData(iconId)); } @@ -994,12 +994,12 @@ void SymbolEditor::updateSymbolAttributesWidgets() m_internal->m_updateInProgress = bOldUpdateInProgress; - DEBUG_LOG(m_logger) << "END" << LOGFUNCTION; + DEBUG_LOG() << "END" << Q_FUNC_INFO; } void SymbolEditor::updateTextProperties() { - DEBUG_LOG(m_logger) << LOGFUNCTION; + DEBUG_LOG() << Q_FUNC_INFO; QLineEdit *arLE[3] = {m_ui->LineEdit1, m_ui->LineEdit2, m_ui->LineEdit3}; @@ -1051,12 +1051,12 @@ void SymbolEditor::updateTextProperties() break; } - DEBUG_LOG(m_logger) << "END " << LOGFUNCTION; + DEBUG_LOG() << "END " << Q_FUNC_INFO; } void SymbolEditor::updateGraphicViews(bool editview, bool preview) { - DEBUG_LOG(m_logger) << LOGFUNCTION; + DEBUG_LOG() << Q_FUNC_INFO; if (!m_internal->m_initFinished) return; @@ -1452,7 +1452,7 @@ void SymbolEditor::updateGraphicViews(bool editview, bool preview) delete bcdabSymbol; delete commandLevelSymbol; - DEBUG_LOG(m_logger) << "END " << LOGFUNCTION; + DEBUG_LOG() << "END " << Q_FUNC_INFO; } void SymbolEditor::reset() @@ -1474,7 +1474,7 @@ void SymbolEditor::drawSymbol(const SymbologyXML::Symbol *symbol, QGraphicsScene const QColor &color, const QColor &fillColor, double z, bool isAttrib, bool updateMap, bool drawBoundRect) { - DEBUG_LOG(m_logger) << LOGFUNCTION; + DEBUG_LOG() << Q_FUNC_INFO; QMap *mapItemPrimitives_p = nullptr; if (updateMap) @@ -1502,14 +1502,14 @@ void SymbolEditor::drawSymbol(const SymbologyXML::Symbol *symbol, QGraphicsScene mapItemPrimitives_p, drawBoundRect ); - DEBUG_LOG(m_logger) << "END " << LOGFUNCTION; + DEBUG_LOG() << "END " << Q_FUNC_INFO; } void SymbolEditor::drawSymbolPrimitive(SymbologyXML::Primitive *primitive, QGraphicsScene *scene, const QColor &color, const QColor &fillColor, double z, bool isAttrib, bool drawBoundRect) { - DEBUG_LOG(m_logger) << LOGFUNCTION; + DEBUG_LOG() << Q_FUNC_INFO; SymbologyXML::SymbolTypes::t_symbolTableCont symTableCont; symTableCont.resize(SymbologyXML::SymbolTypes::ICON_TYPE_END); @@ -1522,12 +1522,12 @@ void SymbolEditor::drawSymbolPrimitive(SymbologyXML::Primitive *primitive, QGrap SymbologyXML::SymbolExporter::drawSymbolPrimitive(primitive, symTableCont, scene, color, fillColor, z, isAttrib, &m_internal->m_mapItemPrimitives, drawBoundRect); - DEBUG_LOG(m_logger) << "END " << LOGFUNCTION; + DEBUG_LOG() << "END " << Q_FUNC_INFO; } void SymbolEditor::enableSelectMove(bool enable) { - DEBUG_LOG(m_logger) << LOGFUNCTION; + DEBUG_LOG() << Q_FUNC_INFO; QMapIterator it(m_internal->m_mapItemPrimitives); while (it.hasNext()) @@ -1538,24 +1538,24 @@ void SymbolEditor::enableSelectMove(bool enable) pi->setFlag(QGraphicsItem::ItemIsMovable, enable); } - DEBUG_LOG(m_logger) << "END " << LOGFUNCTION; + DEBUG_LOG() << "END " << Q_FUNC_INFO; } void SymbolEditor::setZoom(double zoom) { - DEBUG_LOG(m_logger) << LOGFUNCTION; + DEBUG_LOG() << Q_FUNC_INFO; m_ui->GraphicView->resetTransform(); QTransform transformView = m_ui->GraphicView->transform(); transformView.scale(VIEW_SCALE * zoom, -VIEW_SCALE * zoom); m_ui->GraphicView->setTransform(transformView); - DEBUG_LOG(m_logger) << "END " << LOGFUNCTION; + DEBUG_LOG() << "END " << Q_FUNC_INFO; } void SymbolEditor::addItem(SymbologyXML::Primitive *prim) { - DEBUG_LOG(m_logger) << LOGFUNCTION; + DEBUG_LOG() << Q_FUNC_INFO; pushUndo(); prim->setFill(m_internal->m_fillPrimitive); @@ -1579,16 +1579,16 @@ void SymbolEditor::addItem(SymbologyXML::Primitive *prim) } enableSelectMove(false); - DEBUG_LOG(m_logger) << "END " << LOGFUNCTION; + DEBUG_LOG() << "END " << Q_FUNC_INFO; } void SymbolEditor::slotImportTemplate() { - DEBUG_LOG(m_logger) << LOGFUNCTION; + DEBUG_LOG() << Q_FUNC_INFO; if (!m_internal->m_flmGui) { - ERROR_LOG(m_logger) << LOGFUNCTION << "Error FileManagementGuiPlugin isn't loaded."; + ERROR_LOG() << Q_FUNC_INFO << "Error FileManagementGuiPlugin isn't loaded."; return; } @@ -1598,7 +1598,7 @@ void SymbolEditor::slotImportTemplate() { if (content.size() == 0) { - ERROR_LOG(m_logger) << LOGFUNCTION << "Empty SymbolContent read from library"; + ERROR_LOG() << Q_FUNC_INFO << "Empty SymbolContent read from library"; } else { @@ -1620,13 +1620,13 @@ void SymbolEditor::slotImportTemplate() resetToolButtonGroupState(); - DEBUG_LOG(m_logger) << "END" << LOGFUNCTION; + DEBUG_LOG() << "END" << Q_FUNC_INFO; } void SymbolEditor::onToolButtonSelectClicked() { - DEBUG_LOG(m_logger) << LOGFUNCTION; + DEBUG_LOG() << Q_FUNC_INFO; m_internal->m_graphicsScene.setDrawMode(SymbolEditScene::ELEMENT_MOVE); m_internal->m_editMode = EDIT_MOVE; @@ -1638,12 +1638,12 @@ void SymbolEditor::onToolButtonSelectClicked() m_internal->m_currentGraphicsItem->setFlags(QGraphicsItem::ItemIsMovable | QGraphicsItem::ItemIsSelectable); } - DEBUG_LOG(m_logger) << "END " << LOGFUNCTION; + DEBUG_LOG() << "END " << Q_FUNC_INFO; } void SymbolEditor::onToolButtonRotateClicked() { - DEBUG_LOG(m_logger) << LOGFUNCTION; + DEBUG_LOG() << Q_FUNC_INFO; SymbolEditScene::DrawMode dm = m_internal->m_graphicsScene.getDrawMode(); m_internal->m_graphicsScene.setDrawMode(SymbolEditScene::ELEMENT_ROTATE); @@ -1685,16 +1685,16 @@ void SymbolEditor::onToolButtonRotateClicked() resetToolButtonGroupState(); - DEBUG_LOG(m_logger) << "END " << LOGFUNCTION; + DEBUG_LOG() << "END " << Q_FUNC_INFO; } void SymbolEditor::onToolButtonScaleClicked() { - DEBUG_LOG(m_logger) << LOGFUNCTION; + DEBUG_LOG() << Q_FUNC_INFO; if (m_internal->m_currentGraphicsItem == nullptr) { - DEBUG_LOG(m_logger) << "END " << LOGFUNCTION; + DEBUG_LOG() << "END " << Q_FUNC_INFO; return; } @@ -1750,12 +1750,12 @@ void SymbolEditor::onToolButtonScaleClicked() resetToolButtonGroupState(); - DEBUG_LOG(m_logger) << "END " << LOGFUNCTION; + DEBUG_LOG() << "END " << Q_FUNC_INFO; } void SymbolEditor::onToolButtonClearClicked() { - DEBUG_LOG(m_logger) << LOGFUNCTION; + DEBUG_LOG() << Q_FUNC_INFO; DeleteElementsDialog *selElemsDial = new DeleteElementsDialog(this); if (selElemsDial->exec() != QDialog::Accepted) @@ -1846,13 +1846,13 @@ void SymbolEditor::onToolButtonClearClicked() resetToolButtonGroupState(); - DEBUG_LOG(m_logger) << "END " << LOGFUNCTION; + DEBUG_LOG() << "END " << Q_FUNC_INFO; } void SymbolEditor::onToolButtonUndoClicked() { - DEBUG_LOG(m_logger) << LOGFUNCTION; + DEBUG_LOG() << Q_FUNC_INFO; int scrollx = m_ui->GraphicView->horizontalScrollBar()->sliderPosition(); int scrolly = m_ui->GraphicView->verticalScrollBar()->sliderPosition(); @@ -1864,13 +1864,13 @@ void SymbolEditor::onToolButtonUndoClicked() m_ui->GraphicView->horizontalScrollBar()->setSliderPosition(scrollx); m_ui->GraphicView->verticalScrollBar()->setSliderPosition(scrolly); - DEBUG_LOG(m_logger) << "END " << LOGFUNCTION; + DEBUG_LOG() << "END " << Q_FUNC_INFO; } void SymbolEditor::onToolButtonDeleteClicked() { - DEBUG_LOG(m_logger) << LOGFUNCTION; + DEBUG_LOG() << Q_FUNC_INFO; if (m_internal->m_mapItemPrimitives.find(m_internal->m_currentGraphicsItem) != m_internal->m_mapItemPrimitives.end()) { @@ -1895,13 +1895,13 @@ void SymbolEditor::onToolButtonDeleteClicked() resetToolButtonGroupState(); - DEBUG_LOG(m_logger) << "END " << LOGFUNCTION; + DEBUG_LOG() << "END " << Q_FUNC_INFO; } void SymbolEditor::onToolButtonCopyClicked() { - DEBUG_LOG(m_logger) << LOGFUNCTION; + DEBUG_LOG() << Q_FUNC_INFO; m_internal->m_editMode = EDIT_COPY; @@ -1913,13 +1913,13 @@ void SymbolEditor::onToolButtonCopyClicked() resetToolButtonGroupState(); - DEBUG_LOG(m_logger) << "END " << LOGFUNCTION; + DEBUG_LOG() << "END " << Q_FUNC_INFO; } void SymbolEditor::onToolButtonPasteClicked() { - DEBUG_LOG(m_logger) << LOGFUNCTION; + DEBUG_LOG() << Q_FUNC_INFO; m_internal->m_editMode = EDIT_PASTE; @@ -1939,57 +1939,57 @@ void SymbolEditor::onToolButtonPasteClicked() resetToolButtonGroupState(); - DEBUG_LOG(m_logger) << "END " << LOGFUNCTION; + DEBUG_LOG() << "END " << Q_FUNC_INFO; } void SymbolEditor::onToolButtonEllipseClicked() { - DEBUG_LOG(m_logger) << LOGFUNCTION; + DEBUG_LOG() << Q_FUNC_INFO; m_internal->m_graphicsScene.setDrawMode(SymbolEditScene::ELLIPSE_START); enableSelectMove(false); - DEBUG_LOG(m_logger) << "END " << LOGFUNCTION; + DEBUG_LOG() << "END " << Q_FUNC_INFO; } void SymbolEditor::onToolButtonLineClicked() { - DEBUG_LOG(m_logger) << LOGFUNCTION; + DEBUG_LOG() << Q_FUNC_INFO; m_internal->m_graphicsScene.setDrawMode(SymbolEditScene::LINE_START); enableSelectMove(false); - DEBUG_LOG(m_logger) << "END " << LOGFUNCTION; + DEBUG_LOG() << "END " << Q_FUNC_INFO; } void SymbolEditor::onToolButtonPolylineClicked() { - DEBUG_LOG(m_logger) << LOGFUNCTION; + DEBUG_LOG() << Q_FUNC_INFO; m_internal->m_graphicsScene.setDrawMode(SymbolEditScene::POLYLINE_START); enableSelectMove(false); - DEBUG_LOG(m_logger) << "END " << LOGFUNCTION; + DEBUG_LOG() << "END " << Q_FUNC_INFO; } void SymbolEditor::onToolButtonPolygonClicked() { - DEBUG_LOG(m_logger) << LOGFUNCTION; + DEBUG_LOG() << Q_FUNC_INFO; m_internal->m_graphicsScene.setDrawMode(SymbolEditScene::POLYGON_START); enableSelectMove(false); - DEBUG_LOG(m_logger) << "END " << LOGFUNCTION; + DEBUG_LOG() << "END " << Q_FUNC_INFO; } void SymbolEditor::onToolButtonTextClicked() { - DEBUG_LOG(m_logger) << LOGFUNCTION; + DEBUG_LOG() << Q_FUNC_INFO; resetToolButtonGroupState(); @@ -2028,7 +2028,7 @@ void SymbolEditor::onToolButtonTextClicked() - DEBUG_LOG(m_logger) << "END " << LOGFUNCTION; + DEBUG_LOG() << "END " << Q_FUNC_INFO; } @@ -2040,7 +2040,7 @@ void SymbolEditor::resetToolButtonGroupState() void SymbolEditor::onPushButtonFillColorClicked() { - DEBUG_LOG(m_logger) << LOGFUNCTION; + DEBUG_LOG() << Q_FUNC_INFO; m_internal->m_fillColor = QColorDialog::getColor(Qt::white, this, tr("Select fill color"), QColorDialog::DontUseNativeDialog); setPushButtonFillColorBackground(m_internal->m_fillColor); @@ -2072,33 +2072,33 @@ void SymbolEditor::onPushButtonFillColorClicked() } } } - DEBUG_LOG(m_logger) << "END" << LOGFUNCTION; + DEBUG_LOG() << "END" << Q_FUNC_INFO; } void SymbolEditor::setPushButtonFillColorBackground(QColor color) { - DEBUG_LOG(m_logger) << LOGFUNCTION; + DEBUG_LOG() << Q_FUNC_INFO; m_internal->m_fillColor = color; m_ui->PushButtonFillColor->setStyleSheet(QStringLiteral("background-color:rgb(%1,%2,%3)").arg(color.red()).arg(color.green()).arg(color.blue())); - DEBUG_LOG(m_logger) << "END" << LOGFUNCTION; + DEBUG_LOG() << "END" << Q_FUNC_INFO; } void SymbolEditor::onToolButtonRectClicked() { - DEBUG_LOG(m_logger) << LOGFUNCTION; + DEBUG_LOG() << Q_FUNC_INFO; m_internal->m_graphicsScene.setDrawMode(SymbolEditScene::RECT_START); enableSelectMove(false); - DEBUG_LOG(m_logger) << "END " << LOGFUNCTION; + DEBUG_LOG() << "END " << Q_FUNC_INFO; } void SymbolEditor::copyElementsFromSymbol(const SymbologyXML::Symbol &tmpSymbol) const { - DEBUG_LOG(m_logger) << LOGFUNCTION; + DEBUG_LOG() << Q_FUNC_INFO; if (m_internal->m_symbol.getDimen() == SymbologyXML::SymbolTypes::DIMEN_UNDEFINED) m_internal->m_symbol.setDimen(tmpSymbol.getDimen()); @@ -2158,16 +2158,16 @@ void SymbolEditor::copyElementsFromSymbol(const SymbologyXML::Symbol &tmpSymbol) } m_internal->m_symbol.setText(text1, align1, text2, align2, text3, align3); - DEBUG_LOG(m_logger) << "END" << LOGFUNCTION; + DEBUG_LOG() << "END" << Q_FUNC_INFO; } void SymbolEditor::onComboBoxDimenCurrentIndexChanged(int index) { - DEBUG_LOG(m_logger) << LOGFUNCTION; + DEBUG_LOG() << Q_FUNC_INFO; if (m_internal->m_updateInProgress || (index < 0)) { - DEBUG_LOG(m_logger) << "END " << LOGFUNCTION; + DEBUG_LOG() << "END " << Q_FUNC_INFO; return; } @@ -2187,16 +2187,16 @@ void SymbolEditor::onComboBoxDimenCurrentIndexChanged(int index) } updateGraphicViews(true, true); - DEBUG_LOG(m_logger) << "END " << LOGFUNCTION; + DEBUG_LOG() << "END " << Q_FUNC_INFO; } void SymbolEditor::onComboBoxAffilCurrentIndexChanged(int index) { - DEBUG_LOG(m_logger) << LOGFUNCTION; + DEBUG_LOG() << Q_FUNC_INFO; if (m_internal->m_updateInProgress || (index < 0)) { - DEBUG_LOG(m_logger) << "END " << LOGFUNCTION; + DEBUG_LOG() << "END " << Q_FUNC_INFO; return; } @@ -2219,16 +2219,16 @@ void SymbolEditor::onComboBoxAffilCurrentIndexChanged(int index) updateGraphicViews(true, true); - DEBUG_LOG(m_logger) << "END " << LOGFUNCTION; + DEBUG_LOG() << "END " << Q_FUNC_INFO; } void SymbolEditor::onComboBoxBCDABCurrentIndexChanged(int index) { - DEBUG_LOG(m_logger) << LOGFUNCTION; + DEBUG_LOG() << Q_FUNC_INFO; if (m_internal->m_updateInProgress || (index < 0)) { - DEBUG_LOG(m_logger) << "END " << LOGFUNCTION; + DEBUG_LOG() << "END " << Q_FUNC_INFO; return; } @@ -2239,16 +2239,16 @@ void SymbolEditor::onComboBoxBCDABCurrentIndexChanged(int index) setChanged(true); updateGraphicViews(true, true); - DEBUG_LOG(m_logger) << "END " << LOGFUNCTION; + DEBUG_LOG() << "END " << Q_FUNC_INFO; } void SymbolEditor::onComboBoxHeadquarterCurrentIndexChanged(int index) { - DEBUG_LOG(m_logger) << LOGFUNCTION; + DEBUG_LOG() << Q_FUNC_INFO; if (m_internal->m_updateInProgress || (index < 0)) { - DEBUG_LOG(m_logger) << "END " << LOGFUNCTION; + DEBUG_LOG() << "END " << Q_FUNC_INFO; return; } @@ -2257,16 +2257,16 @@ void SymbolEditor::onComboBoxHeadquarterCurrentIndexChanged(int index) setChanged(true); updateGraphicViews(true, true); - DEBUG_LOG(m_logger) << "END " << LOGFUNCTION; + DEBUG_LOG() << "END " << Q_FUNC_INFO; } void SymbolEditor::onComboBoxCommandLevelCurrentIndexChanged(int index) { - DEBUG_LOG(m_logger) << LOGFUNCTION; + DEBUG_LOG() << Q_FUNC_INFO; if (m_internal->m_updateInProgress || (index < 0)) { - DEBUG_LOG(m_logger) << "END " << LOGFUNCTION; + DEBUG_LOG() << "END " << Q_FUNC_INFO; return; } @@ -2276,16 +2276,16 @@ void SymbolEditor::onComboBoxCommandLevelCurrentIndexChanged(int index) setChanged(true); updateGraphicViews(true, true); - DEBUG_LOG(m_logger) << "END " << LOGFUNCTION; + DEBUG_LOG() << "END " << Q_FUNC_INFO; } void SymbolEditor::onComboBoxMobCurrentIndexChanged(int index) { - DEBUG_LOG(m_logger) << LOGFUNCTION; + DEBUG_LOG() << Q_FUNC_INFO; if (m_internal->m_updateInProgress || (index < 0)) { - DEBUG_LOG(m_logger) << "END " << LOGFUNCTION; + DEBUG_LOG() << "END " << Q_FUNC_INFO; return; } @@ -2295,13 +2295,13 @@ void SymbolEditor::onComboBoxMobCurrentIndexChanged(int index) setChanged(true); updateGraphicViews(true, true); - DEBUG_LOG(m_logger) << "END " << LOGFUNCTION; + DEBUG_LOG() << "END " << Q_FUNC_INFO; } void SymbolEditor::onComboBoxVehicleCurrentIndexChanged(int index) { - DEBUG_LOG(m_logger) << LOGFUNCTION; + DEBUG_LOG() << Q_FUNC_INFO; SymbologyXML::SymbolTypes::t_sector_rectpos rectpos = SymbologyXML::SymbolTypes::SECTOR_RECTPOS_DEFAULT; if (m_ui->CheckBoxVehicle->isChecked()) @@ -2311,13 +2311,13 @@ void SymbolEditor::onComboBoxVehicleCurrentIndexChanged(int index) SymbologyXML::SymbolTypes::ICON_TYPE_VEHICLE, SymbologyXML::SymbolTypes::SECTORMAIN, rectpos); - DEBUG_LOG(m_logger) << "END " << LOGFUNCTION; + DEBUG_LOG() << "END " << Q_FUNC_INFO; } void SymbolEditor::onCheckBoxVehicleStateChanged(int state) { - DEBUG_LOG(m_logger) << LOGFUNCTION; + DEBUG_LOG() << Q_FUNC_INFO; SymbologyXML::SymbolTypes::t_sector_rectpos rectpos = SymbologyXML::SymbolTypes::SECTOR_RECTPOS_DEFAULT; if (state) rectpos = SymbologyXML::SymbolTypes::SECTOR_RECTPOS_LARGE; @@ -2326,13 +2326,13 @@ void SymbolEditor::onCheckBoxVehicleStateChanged(int state) SymbologyXML::SymbolTypes::instance()->getVehicle()->getContainerAsInt(), SymbologyXML::SymbolTypes::ICON_TYPE_VEHICLE, SymbologyXML::SymbolTypes::SECTORMAIN, rectpos); - DEBUG_LOG(m_logger) << "END" << LOGFUNCTION; + DEBUG_LOG() << "END" << Q_FUNC_INFO; } void SymbolEditor::onComboBoxIntrinsicMobCurrentIndexChanged(int index) { - DEBUG_LOG(m_logger) << LOGFUNCTION; + DEBUG_LOG() << Q_FUNC_INFO; help_on_ComboBoxIndexChanged(m_ui->ComboBoxIntrinsicMob, @@ -2341,13 +2341,13 @@ void SymbolEditor::onComboBoxIntrinsicMobCurrentIndexChanged(int index) SymbologyXML::SymbolTypes::SECTOR2); m_ui->ComboBoxIntrinsicMob_2->setCurrentIndex(index); - DEBUG_LOG(m_logger) << "END " << LOGFUNCTION; + DEBUG_LOG() << "END " << Q_FUNC_INFO; } void SymbolEditor::onComboBoxIntrinsicMob2CurrentIndexChanged(int index) { - DEBUG_LOG(m_logger) << LOGFUNCTION; + DEBUG_LOG() << Q_FUNC_INFO; help_on_ComboBoxIndexChanged(m_ui->ComboBoxIntrinsicMob_2, @@ -2356,13 +2356,13 @@ void SymbolEditor::onComboBoxIntrinsicMob2CurrentIndexChanged(int index) SymbologyXML::SymbolTypes::SECTOR2); m_ui->ComboBoxIntrinsicMob->setCurrentIndex(index); - DEBUG_LOG(m_logger) << "END " << LOGFUNCTION; + DEBUG_LOG() << "END " << Q_FUNC_INFO; } void SymbolEditor::onComboBoxArmingCurrentIndexChanged(int index) { - DEBUG_LOG(m_logger) << LOGFUNCTION; + DEBUG_LOG() << Q_FUNC_INFO; SymbologyXML::SymbolTypes::t_sector_rectpos rectpos = SymbologyXML::SymbolTypes::SECTOR_RECTPOS_DEFAULT; if (m_ui->CheckBoxArming->isChecked()) @@ -2372,7 +2372,7 @@ void SymbolEditor::onComboBoxArmingCurrentIndexChanged(int index) SymbologyXML::SymbolTypes::ICON_TYPE_ARMING, SymbologyXML::SymbolTypes::SECTORMAIN, rectpos); - DEBUG_LOG(m_logger) << "END " << LOGFUNCTION; + DEBUG_LOG() << "END " << Q_FUNC_INFO; } @@ -2391,11 +2391,11 @@ void SymbolEditor::onCheckBoxArmingStateChanged(int state) void SymbolEditor::onListViewMiscItemSelectionChanged() { - DEBUG_LOG(m_logger) << LOGFUNCTION; + DEBUG_LOG() << Q_FUNC_INFO; if (m_internal->m_updateInProgress) { - DEBUG_LOG(m_logger) << "END " << LOGFUNCTION; + DEBUG_LOG() << "END " << Q_FUNC_INFO; return; } @@ -2428,13 +2428,13 @@ void SymbolEditor::onListViewMiscItemSelectionChanged() setChanged(true); updateGraphicViews(true, true); - DEBUG_LOG(m_logger) << "END " << LOGFUNCTION; + DEBUG_LOG() << "END " << Q_FUNC_INFO; } void SymbolEditor::onComboBoxSector1CurrentIndexChanged(int index) { - DEBUG_LOG(m_logger) << LOGFUNCTION; + DEBUG_LOG() << Q_FUNC_INFO; help_on_ComboBoxIndexChanged(m_ui->ComboBoxSector1, index, @@ -2442,13 +2442,13 @@ void SymbolEditor::onComboBoxSector1CurrentIndexChanged(int index) SymbologyXML::SymbolTypes::ICON_TYPE_SECTOR_ICON, SymbologyXML::SymbolTypes::SECTOR1); - DEBUG_LOG(m_logger) << "END " << LOGFUNCTION; + DEBUG_LOG() << "END " << Q_FUNC_INFO; } void SymbolEditor::onComboBoxSectorMainCurrentIndexChanged(int index) { - DEBUG_LOG(m_logger) << LOGFUNCTION; + DEBUG_LOG() << Q_FUNC_INFO; SymbologyXML::SymbolTypes::t_sector_rectpos rectpos = SymbologyXML::SymbolTypes::SECTOR_RECTPOS_DEFAULT; if (m_ui->CheckBoxMain && m_ui->CheckBoxMain->isChecked()) @@ -2460,7 +2460,7 @@ void SymbolEditor::onComboBoxSectorMainCurrentIndexChanged(int index) SymbologyXML::SymbolTypes::ICON_TYPE_SECTOR_ICON, SymbologyXML::SymbolTypes::SECTORMAIN, rectpos); - DEBUG_LOG(m_logger) << "END " << LOGFUNCTION; + DEBUG_LOG() << "END " << Q_FUNC_INFO; } @@ -2481,11 +2481,11 @@ void SymbolEditor::onCheckBoxMainStateChanged(int state) void SymbolEditor::onListViewSectorMainItemSelectionChanged() { - DEBUG_LOG(m_logger) << LOGFUNCTION; + DEBUG_LOG() << Q_FUNC_INFO; if (m_internal->m_updateInProgress) { - DEBUG_LOG(m_logger) << "END " << LOGFUNCTION; + DEBUG_LOG() << "END " << Q_FUNC_INFO; return; } @@ -2518,20 +2518,20 @@ void SymbolEditor::onListViewSectorMainItemSelectionChanged() setChanged(true); updateGraphicViews(true, true); - DEBUG_LOG(m_logger) << "END " << LOGFUNCTION; + DEBUG_LOG() << "END " << Q_FUNC_INFO; } void SymbolEditor::onComboBoxSector2CurrentIndexChanged(int index) { - DEBUG_LOG(m_logger) << LOGFUNCTION; + DEBUG_LOG() << Q_FUNC_INFO; help_on_ComboBoxIndexChanged(m_ui->ComboBoxSector2, index, SymbologyXML::SymbolTypes::instance()->getSectorIcon()->getContainerAsInt(SymbologyXML::SymbolTypes::SECTOR2), SymbologyXML::SymbolTypes::ICON_TYPE_SECTOR_ICON, SymbologyXML::SymbolTypes::SECTOR2); - DEBUG_LOG(m_logger) << "END " << LOGFUNCTION; + DEBUG_LOG() << "END " << Q_FUNC_INFO; } @@ -2541,11 +2541,11 @@ void SymbolEditor::help_on_ComboBoxIndexChanged(QComboBox *comboBox, SymbologyXML::SymbolTypes::t_sector_position pos, SymbologyXML::SymbolTypes::t_sector_rectpos rectpos) { - DEBUG_LOG(m_logger) << LOGFUNCTION; + DEBUG_LOG() << Q_FUNC_INFO; if (m_internal->m_updateInProgress || index < 0) { - DEBUG_LOG(m_logger) << "END " << LOGFUNCTION; + DEBUG_LOG() << "END " << Q_FUNC_INFO; return; } @@ -2566,16 +2566,16 @@ void SymbolEditor::help_on_ComboBoxIndexChanged(QComboBox *comboBox, setChanged(true); updateGraphicViews(true, true); - DEBUG_LOG(m_logger) << "END " << LOGFUNCTION; + DEBUG_LOG() << "END " << Q_FUNC_INFO; } void SymbolEditor::onComboBoxAlign1CurrentIndexChanged(int index) { - DEBUG_LOG(m_logger) << LOGFUNCTION; + DEBUG_LOG() << Q_FUNC_INFO; if (m_internal->m_updateInProgress || (index < 0)) { - DEBUG_LOG(m_logger) << "END " << LOGFUNCTION; + DEBUG_LOG() << "END " << Q_FUNC_INFO; return; } @@ -2586,16 +2586,16 @@ void SymbolEditor::onComboBoxAlign1CurrentIndexChanged(int index) setChanged(true); updateGraphicViews(true, true); - DEBUG_LOG(m_logger) << "END " << LOGFUNCTION; + DEBUG_LOG() << "END " << Q_FUNC_INFO; } void SymbolEditor::onComboBoxAlign2CurrentIndexChanged(int index) { - DEBUG_LOG(m_logger) << LOGFUNCTION; + DEBUG_LOG() << Q_FUNC_INFO; if (m_internal->m_updateInProgress || (index < 0)) { - DEBUG_LOG(m_logger) << "END " << LOGFUNCTION; + DEBUG_LOG() << "END " << Q_FUNC_INFO; return; } @@ -2606,16 +2606,16 @@ void SymbolEditor::onComboBoxAlign2CurrentIndexChanged(int index) setChanged(true); updateGraphicViews(true, true); - DEBUG_LOG(m_logger) << "END " << LOGFUNCTION; + DEBUG_LOG() << "END " << Q_FUNC_INFO; } void SymbolEditor::onComboBoxAlign3CurrentIndexChanged(int index) { - DEBUG_LOG(m_logger) << LOGFUNCTION; + DEBUG_LOG() << Q_FUNC_INFO; if (m_internal->m_updateInProgress || (index < 0)) { - DEBUG_LOG(m_logger) << "END " << LOGFUNCTION; + DEBUG_LOG() << "END " << Q_FUNC_INFO; return; } @@ -2626,25 +2626,25 @@ void SymbolEditor::onComboBoxAlign3CurrentIndexChanged(int index) setChanged(true); updateGraphicViews(true, true); - DEBUG_LOG(m_logger) << "END " << LOGFUNCTION; + DEBUG_LOG() << "END " << Q_FUNC_INFO; } void SymbolEditor::onComboBoxColorCurrentIndexChanged(int index) { - DEBUG_LOG(m_logger) << LOGFUNCTION; + DEBUG_LOG() << Q_FUNC_INFO; if (index != -1) { m_internal->m_previewColor = m_internal->m_symbolColorsPreview.at(index).second; updateGraphicViews(true, true); } - DEBUG_LOG(m_logger) << "END " << LOGFUNCTION; + DEBUG_LOG() << "END " << Q_FUNC_INFO; } void SymbolEditor::onComboBoxLineStyleCurrentIndexChanged(int index) { - DEBUG_LOG(m_logger) << LOGFUNCTION; + DEBUG_LOG() << Q_FUNC_INFO; switch (index) { @@ -2693,16 +2693,16 @@ void SymbolEditor::onComboBoxLineStyleCurrentIndexChanged(int index) } } - DEBUG_LOG(m_logger) << "END " << LOGFUNCTION; + DEBUG_LOG() << "END " << Q_FUNC_INFO; } void SymbolEditor::onLineEdit1TextChanged(const QString &text) { - DEBUG_LOG(m_logger) << LOGFUNCTION; + DEBUG_LOG() << Q_FUNC_INFO; if (m_internal->m_updateInProgress) { - DEBUG_LOG(m_logger) << "END " << LOGFUNCTION; + DEBUG_LOG() << "END " << Q_FUNC_INFO; return; } @@ -2714,16 +2714,16 @@ void SymbolEditor::onLineEdit1TextChanged(const QString &text) updateGraphicViews(true, true); setChanged(true); - DEBUG_LOG(m_logger) << "END " << LOGFUNCTION; + DEBUG_LOG() << "END " << Q_FUNC_INFO; } void SymbolEditor::onLineEdit2TextChanged(const QString &text) { - DEBUG_LOG(m_logger) << LOGFUNCTION; + DEBUG_LOG() << Q_FUNC_INFO; if (m_internal->m_updateInProgress) { - DEBUG_LOG(m_logger) << "END " << LOGFUNCTION; + DEBUG_LOG() << "END " << Q_FUNC_INFO; return; } @@ -2735,16 +2735,16 @@ void SymbolEditor::onLineEdit2TextChanged(const QString &text) updateGraphicViews(true, true); setChanged(true); - DEBUG_LOG(m_logger) << "END " << LOGFUNCTION; + DEBUG_LOG() << "END " << Q_FUNC_INFO; } void SymbolEditor::onLineEdit3TextChanged(const QString &text) { - DEBUG_LOG(m_logger) << LOGFUNCTION; + DEBUG_LOG() << Q_FUNC_INFO; if (m_internal->m_updateInProgress) { - DEBUG_LOG(m_logger) << "END " << LOGFUNCTION; + DEBUG_LOG() << "END " << Q_FUNC_INFO; return; } @@ -2754,17 +2754,17 @@ void SymbolEditor::onLineEdit3TextChanged(const QString &text) updateGraphicViews(true, true); setChanged(true); - DEBUG_LOG(m_logger) << "END " << LOGFUNCTION; + DEBUG_LOG() << "END " << Q_FUNC_INFO; } void SymbolEditor::onListViewTruppengattungItemSelectionChanged() { - DEBUG_LOG(m_logger) << LOGFUNCTION; + DEBUG_LOG() << Q_FUNC_INFO; if (m_internal->m_updateInProgress) { - DEBUG_LOG(m_logger) << "END " << LOGFUNCTION; + DEBUG_LOG() << "END " << Q_FUNC_INFO; return; } @@ -2784,43 +2784,43 @@ void SymbolEditor::onListViewTruppengattungItemSelectionChanged() } setChanged(true); updateGraphicViews(true, true); - DEBUG_LOG(m_logger) << "END " << LOGFUNCTION; + DEBUG_LOG() << "END " << Q_FUNC_INFO; } void SymbolEditor::onCheckBoxBackgroundStateChanged(int state) { - DEBUG_LOG(m_logger) << LOGFUNCTION; + DEBUG_LOG() << Q_FUNC_INFO; m_internal->m_displayPreviewBackground = (bool)state; updateGraphicViews(false, true); - DEBUG_LOG(m_logger) << "END " << LOGFUNCTION; + DEBUG_LOG() << "END " << Q_FUNC_INFO; } void SymbolEditor::onCheckBoxPlannedStateChanged(int state) { - DEBUG_LOG(m_logger) << LOGFUNCTION; + DEBUG_LOG() << Q_FUNC_INFO; if ((bool)state) m_internal->m_additionalDataPreview.m_state = SymbologyXML::SymbolTypes::STATE_ANTICIPATED; else m_internal->m_additionalDataPreview.m_state = SymbologyXML::SymbolTypes::STATE_PRESENT; updateGraphicViews(false, true); - DEBUG_LOG(m_logger) << "END " << LOGFUNCTION; + DEBUG_LOG() << "END " << Q_FUNC_INFO; } void SymbolEditor::onCheckBoxCopyValuesStateChanged(int state) { - DEBUG_LOG(m_logger) << LOGFUNCTION; + DEBUG_LOG() << Q_FUNC_INFO; m_internal->m_copyFromSelectedPrimitive = (bool)state; copyFromSelectedPrimitive(); - DEBUG_LOG(m_logger) << "END " << LOGFUNCTION; + DEBUG_LOG() << "END " << Q_FUNC_INFO; } void SymbolEditor::onCheckBoxFillStateChanged(int state) { - DEBUG_LOG(m_logger) << LOGFUNCTION; + DEBUG_LOG() << Q_FUNC_INFO; m_internal->m_fillPrimitive = state; if (m_internal->m_copyFromSelectedPrimitive && (m_internal->m_currentGraphicsItem != nullptr)) @@ -2852,37 +2852,37 @@ void SymbolEditor::onCheckBoxFillStateChanged(int state) } } - DEBUG_LOG(m_logger) << "END " << LOGFUNCTION; + DEBUG_LOG() << "END " << Q_FUNC_INFO; } void SymbolEditor::onCheckBoxDrawAreaStateChanged(int state) { - DEBUG_LOG(m_logger) << LOGFUNCTION; + DEBUG_LOG() << Q_FUNC_INFO; m_internal->m_showDrawArea = (bool)state; m_internal->m_graphicsScene.setShowDrawingArea(m_internal->m_showDrawArea); m_internal->m_graphicsScene.invalidate(m_internal->m_graphicsScene.sceneRect(), QGraphicsScene::ForegroundLayer); - DEBUG_LOG(m_logger) << "END " << LOGFUNCTION; + DEBUG_LOG() << "END " << Q_FUNC_INFO; } void SymbolEditor::onSpinBoxRasterValueChanged(double d) { - DEBUG_LOG(m_logger) << LOGFUNCTION; + DEBUG_LOG() << Q_FUNC_INFO; m_internal->m_gridWidth = d; m_internal->m_graphicsScene.setGridWidth(d); m_internal->m_graphicsScene.invalidate(m_internal->m_graphicsScene.sceneRect(), QGraphicsScene::BackgroundLayer); - DEBUG_LOG(m_logger) << "END " << LOGFUNCTION; + DEBUG_LOG() << "END " << Q_FUNC_INFO; } void SymbolEditor::onSpinBoxScaleValueChanged(double d) { - DEBUG_LOG(m_logger) << LOGFUNCTION; + DEBUG_LOG() << Q_FUNC_INFO; m_internal->m_symbol.setScale(d); setChanged(true); @@ -2890,13 +2890,13 @@ void SymbolEditor::onSpinBoxScaleValueChanged(double d) m_internal->m_previewZoom = d; updateGraphicViews(false, true); - DEBUG_LOG(m_logger) << "END " << LOGFUNCTION; + DEBUG_LOG() << "END " << Q_FUNC_INFO; } void SymbolEditor::onSpinBoxLineWidthValueChanged(double d) { - DEBUG_LOG(m_logger) << LOGFUNCTION; + DEBUG_LOG() << Q_FUNC_INFO; m_internal->m_pen.setWidthF(d); m_internal->m_graphicsScene.setPen(m_internal->m_pen); @@ -2930,34 +2930,34 @@ void SymbolEditor::onSpinBoxLineWidthValueChanged(double d) } } - DEBUG_LOG(m_logger) << "END " << LOGFUNCTION; + DEBUG_LOG() << "END " << Q_FUNC_INFO; } void SymbolEditor::onSliderTransparencyValueChanged(int value) { - DEBUG_LOG(m_logger) << LOGFUNCTION; + DEBUG_LOG() << Q_FUNC_INFO; m_internal->m_transparency = 1.0 - (double)value / 100.0; m_ui->LabelTransparency->setText(QLocale().toString((double)value / 100.0, 'f', 2)); updateGraphicViews(false, true); - DEBUG_LOG(m_logger) << "END " << LOGFUNCTION; + DEBUG_LOG() << "END " << Q_FUNC_INFO; } void SymbolEditor::setChanged(bool changed) { - DEBUG_LOG(m_logger) << LOGFUNCTION; + DEBUG_LOG() << Q_FUNC_INFO; if (changed) slotChangesMade(); - DEBUG_LOG(m_logger) << "END " << LOGFUNCTION; + DEBUG_LOG() << "END " << Q_FUNC_INFO; } void SymbolEditor::selectionChanged() { - DEBUG_LOG(m_logger) << LOGFUNCTION; + DEBUG_LOG() << Q_FUNC_INFO; bool enableEdit = false; bool selPrimIsICON = false; @@ -3002,18 +3002,18 @@ void SymbolEditor::selectionChanged() m_ui->CheckBoxFill->blockSignals(false); copyFromSelectedPrimitive(); - DEBUG_LOG(m_logger) << "END " << LOGFUNCTION; + DEBUG_LOG() << "END " << Q_FUNC_INFO; } void SymbolEditor::copyFromSelectedPrimitive() { - DEBUG_LOG(m_logger) << LOGFUNCTION; + DEBUG_LOG() << Q_FUNC_INFO; if (!m_internal->m_copyFromSelectedPrimitive || (m_internal->m_currentGraphicsItem == nullptr)) { - DEBUG_LOG(m_logger) << "END " << LOGFUNCTION; + DEBUG_LOG() << "END " << Q_FUNC_INFO; return; } @@ -3043,16 +3043,16 @@ void SymbolEditor::copyFromSelectedPrimitive() } } - DEBUG_LOG(m_logger) << "END " << LOGFUNCTION; + DEBUG_LOG() << "END " << Q_FUNC_INFO; } void SymbolEditor::pushUndo() { - DEBUG_LOG(m_logger) << LOGFUNCTION; + DEBUG_LOG() << Q_FUNC_INFO; if (m_internal->m_updateInProgress) { - DEBUG_LOG(m_logger) << "END " << LOGFUNCTION; + DEBUG_LOG() << "END " << Q_FUNC_INFO; return; } @@ -3060,13 +3060,13 @@ void SymbolEditor::pushUndo() m_ui->ToolButtonUndo->setEnabled(true); - DEBUG_LOG(m_logger) << "END " << LOGFUNCTION; + DEBUG_LOG() << "END " << Q_FUNC_INFO; } void SymbolEditor::popUndo() { - DEBUG_LOG(m_logger) << LOGFUNCTION; + DEBUG_LOG() << Q_FUNC_INFO; SymbolEditScene::DrawMode dm = m_internal->m_graphicsScene.getDrawMode(); @@ -3088,25 +3088,25 @@ void SymbolEditor::popUndo() m_internal->m_graphicsScene.setDrawMode(dm); - DEBUG_LOG(m_logger) << "END " << LOGFUNCTION; + DEBUG_LOG() << "END " << Q_FUNC_INFO; } void SymbolEditor::clearUndo() { - DEBUG_LOG(m_logger) << LOGFUNCTION; + DEBUG_LOG() << Q_FUNC_INFO; m_internal->m_symbolUndoStack.clear(); m_ui->ToolButtonUndo->setEnabled(false); - DEBUG_LOG(m_logger) << "END " << LOGFUNCTION; + DEBUG_LOG() << "END " << Q_FUNC_INFO; } void SymbolEditor::keyPressEvent(QKeyEvent *keyEvent) { - DEBUG_LOG(m_logger) << LOGFUNCTION; + DEBUG_LOG() << Q_FUNC_INFO; @@ -3150,13 +3150,13 @@ void SymbolEditor::keyPressEvent(QKeyEvent *keyEvent) else LtsWidgets::LtsDialog::keyPressEvent(keyEvent); - DEBUG_LOG(m_logger) << "END " << LOGFUNCTION; + DEBUG_LOG() << "END " << Q_FUNC_INFO; } void SymbolEditor::transformSelection(int key, Qt::KeyboardModifiers modifiers) { - DEBUG_LOG(m_logger) << LOGFUNCTION; + DEBUG_LOG() << Q_FUNC_INFO; u_int modAlt = Qt::AltModifier; @@ -3197,7 +3197,7 @@ void SymbolEditor::transformSelection(int key, Qt::KeyboardModifiers modifiers) } else { - DEBUG_LOG(m_logger) << "END " << LOGFUNCTION; + DEBUG_LOG() << "END " << Q_FUNC_INFO; return; } @@ -3233,13 +3233,13 @@ void SymbolEditor::transformSelection(int key, Qt::KeyboardModifiers modifiers) else movePrimitive(QPointF(stepWidth * factor * dx, stepWidth * factor * dy)); - DEBUG_LOG(m_logger) << "END " << LOGFUNCTION; + DEBUG_LOG() << "END " << Q_FUNC_INFO; } void SymbolEditor::restoreSelection(SymbologyXML::Primitive *prim) { - DEBUG_LOG(m_logger) << LOGFUNCTION; + DEBUG_LOG() << Q_FUNC_INFO; QMapIterator it(m_internal->m_mapItemPrimitives); while (it.hasNext()) { @@ -3251,7 +3251,7 @@ void SymbolEditor::restoreSelection(SymbologyXML::Primitive *prim) pi->setSelected(true); } } - DEBUG_LOG(m_logger) << "END " << LOGFUNCTION; + DEBUG_LOG() << "END " << Q_FUNC_INFO; } void SymbolEditor::retranslate() @@ -3264,7 +3264,7 @@ bool SymbolEditor::writeFile(bool saveAsNew) bool bRet = false; if (!m_internal->m_flmGui) { - ERROR_LOG(m_logger) << LOGFUNCTION << "Error FileManagementGuiPlugin isn't loaded."; + ERROR_LOG() << Q_FUNC_INFO << "Error FileManagementGuiPlugin isn't loaded."; return false; } @@ -3277,7 +3277,7 @@ bool SymbolEditor::writeFile(bool saveAsNew) int fileId = m_internal->m_flmGui->saveFileContent(this, FileManagement::FileType::OperatorDefinedSymbol, m_session->exerciseId(), byteArray, SYMBOL_FOLDER_ID, properties); if (fileId > 0) { - DEBUG_LOG(m_logger) << "Saved file with id = " << fileId; + DEBUG_LOG() << "Saved file with id = " << fileId; m_internal->m_lastFileId = fileId; FileManagement::FileContent fc = m_internal->m_flmDtc->fileContent(fileId); m_internal->m_lastFolderId = fc.folderId(); @@ -3287,7 +3287,7 @@ bool SymbolEditor::writeFile(bool saveAsNew) bRet = true; } else - ERROR_LOG(m_logger) << "Could not save file in library "; + ERROR_LOG() << "Could not save file in library "; return bRet; } @@ -3322,9 +3322,9 @@ void SymbolEditor::slotSave() const QString properties = QString::fromUtf8(m_internal->m_attributes.toJson(QJsonDocument::Compact)); if (m_internal->m_flmGui->saveContent(m_internal->m_lastFileId, byteArray, properties)) - DEBUG_LOG(m_logger) << "Saved file with id = " << m_internal->m_lastFileId; + DEBUG_LOG() << "Saved file with id = " << m_internal->m_lastFileId; else - ERROR_LOG(m_logger) << "Could not save file in library "; + ERROR_LOG() << "Could not save file in library "; } emit saveFinished(); } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/Gui/SymbolEditor/asb_symbol_editor.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/Gui/SymbolEditor/asb_symbol_editor.h index 3b377ff59..14ad1d2a1 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/Gui/SymbolEditor/asb_symbol_editor.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/Gui/SymbolEditor/asb_symbol_editor.h @@ -223,7 +223,6 @@ private: Ui::SymbolEditor *m_ui; SymbolEditorPrivate *m_internal; LtsSession::LtsSession *m_session; - NGL::INGLLogger &m_logger; }; } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/Gui/SymbolProxy/asb_flm_subscriber.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/Gui/SymbolProxy/asb_flm_subscriber.cpp index 8ece49951..13311db11 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/Gui/SymbolProxy/asb_flm_subscriber.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/Gui/SymbolProxy/asb_flm_subscriber.cpp @@ -105,7 +105,7 @@ FlmSubscriber::FlmSubscriber(const std::shared_ptrm_reFetchTimer->start(); }); @@ -204,11 +204,11 @@ void FlmSubscriber::onGetFileContentDataReply(const FileManagement::GetFileConte { const int32_t fileContentId = reply.id(); - TRACE_LOG(m_logger) << LOGFUNCTION << " START, " << fileContentId; + TRACE_LOG() << Q_FUNC_INFO << " START, " << fileContentId; if (!d->m_fileContentMap.contains(fileContentId)) { - ERROR_LOG(m_logger) << LOGFUNCTION << " fileContentId unknown, fileContentId=" << fileContentId; + ERROR_LOG() << Q_FUNC_INFO << " fileContentId unknown, fileContentId=" << fileContentId; return; } @@ -218,7 +218,7 @@ void FlmSubscriber::onGetFileContentDataReply(const FileManagement::GetFileConte const QString &operatorName = fcData.operatorName; const qint64 lastModified = fcData.lastModified; - DEBUG_LOG(m_logger) << LOGFUNCTION + DEBUG_LOG() << Q_FUNC_INFO << " fileContentId=" << fileContentId << " name=" << name << " operatorName=" << operatorName @@ -234,7 +234,7 @@ void FlmSubscriber::onGetFileContentDataReply(const FileManagement::GetFileConte QImage image; if (!svgToImage(QByteArray::fromRawData(reinterpret_cast(&reply.content().at(0)), reply.content().size()), image)) { - ERROR_LOG(m_logger) << LOGFUNCTION << " svgToImage failed, fileContentId=" << fileContentId; + ERROR_LOG() << Q_FUNC_INFO << " svgToImage failed, fileContentId=" << fileContentId; fcData.monitoring.replyState = FileContentStruct::ReplyFailure; return; } @@ -265,7 +265,7 @@ void FlmSubscriber::onGetFileContentDataReply(const FileManagement::GetFileConte } else { - ERROR_LOG(m_logger) << LOGFUNCTION << " xmlSymbolContent is empty, fileContentId=" << fileContentId; + ERROR_LOG() << Q_FUNC_INFO << " xmlSymbolContent is empty, fileContentId=" << fileContentId; fcData.monitoring.replyState = FileContentStruct::ReplyFailure; } break; @@ -273,24 +273,24 @@ void FlmSubscriber::onGetFileContentDataReply(const FileManagement::GetFileConte case FileContentStruct::SymbolType::UnsupportedSymbol: { - ERROR_LOG(m_logger) << LOGFUNCTION << " unsupported symbol found, fileContentId=" << fileContentId; + ERROR_LOG() << Q_FUNC_INFO << " unsupported symbol found, fileContentId=" << fileContentId; fcData.monitoring.replyState = FileContentStruct::ReplyFailure; break; } } - TRACE_LOG(m_logger) << LOGFUNCTION << " END"; + TRACE_LOG() << Q_FUNC_INFO << " END"; } bool FlmSubscriber::svgToImage(const QByteArray &svgByteArray, QImage &imageOut) { - TRACE_LOG(m_logger) << LOGFUNCTION << " START"; + TRACE_LOG() << Q_FUNC_INFO << " START"; QSvgRenderer svgRenderer; if (!svgRenderer.load(svgByteArray)) { - ERROR_LOG(m_logger) << LOGFUNCTION << " svgRenderer.load failed"; + ERROR_LOG() << Q_FUNC_INFO << " svgRenderer.load failed"; return false; } @@ -304,7 +304,7 @@ bool FlmSubscriber::svgToImage(const QByteArray &svgByteArray, QImage &imageOut) svgRenderer.render(&painter); painter.end(); - TRACE_LOG(m_logger) << LOGFUNCTION << " END"; + TRACE_LOG() << Q_FUNC_INFO << " END"; return true; } @@ -361,7 +361,7 @@ void FlmSubscriber::checkForReFetching() ; FileManagement::GetFileContentDataRequest request(fileContentId); if (!d->m_flmFtc->getFileContentDataRequest(request, this)) - ERROR_LOG(logger) << LOGFUNCTION << "Error reading FileContentData, fileContentId=" << fileContentId; + ERROR_LOG(logger) << Q_FUNC_INFO << "Error reading FileContentData, fileContentId=" << fileContentId; fcs.monitoring.replyState = FileContentStruct::Requested; fcs.monitoring.requestTime = getRequestTime(); @@ -383,7 +383,7 @@ void FlmSubscriber::checkForReFetching() void FlmSubscriber::onFileContentChanged(const FileManagement::FileContent &data, DataModification modType) { - TRACE_LOG(m_logger) << LOGFUNCTION + TRACE_LOG() << Q_FUNC_INFO << " data.id=" << data.id() << " data.fileStatus=" << data.fileStatus().underlying() << " modType=" << modType @@ -432,13 +432,13 @@ void FlmSubscriber::onFileContentChanged(const FileManagement::FileContent &data FileManagement::GetFileContentDataRequest request(fileContentId); if (!d->m_flmFtc->getFileContentDataRequest(request, this)) - ERROR_LOG(m_logger) << LOGFUNCTION << "Error reading FileContentData, fileContentId=" << fileContentId; + ERROR_LOG() << Q_FUNC_INFO << "Error reading FileContentData, fileContentId=" << fileContentId; break; } case DataModification::eRemoved: { - DEBUG_LOG(m_logger) << LOGFUNCTION + DEBUG_LOG() << Q_FUNC_INFO << " modType=" << modType << " fileContentId=" << fileContentId << " fileContentName=" << data.name(); @@ -448,7 +448,7 @@ void FlmSubscriber::onFileContentChanged(const FileManagement::FileContent &data if (!d->m_symbolProxy.removeSymbol(fileContentId)) - ERROR_LOG(m_logger) << LOGFUNCTION << " removeSymbol failed" + ERROR_LOG() << Q_FUNC_INFO << " removeSymbol failed" << " fileContentId=" << fileContentId << " fileContentName='" << data.name() << "'" << " contains=" << d->m_fileContentMap.contains(fileContentId); @@ -460,7 +460,7 @@ void FlmSubscriber::onFileContentChanged(const FileManagement::FileContent &data void FlmSubscriber::updateFileContentMap(const FileManagement::FileContent &data) { - TRACE_LOG(m_logger) << LOGFUNCTION << " START" + TRACE_LOG() << Q_FUNC_INFO << " START" << " d->m_fileContentMap.size()=" << d->m_fileContentMap.size() << " fileContentId=" << data.id() << " data.isDeleted()=" <errorString: '" << parseError.errorString() << "'" << ", offset: " << parseError.offset; } @@ -542,7 +542,7 @@ void FlmSubscriber::updateFileContentMap(const FileManagement::FileContent &data d->m_fileContentMap[fileContentId] = fcData; - TRACE_LOG(m_logger) << LOGFUNCTION << " END" + TRACE_LOG() << Q_FUNC_INFO << " END" << " d->m_fileContentMap.size()=" << d->m_fileContentMap.size() << " fileContentId=" << data.id() << " data.isDeleted()=" <setXmlSymbolToDict(dict, fileContentId, operatorName, lastModified, name, xmlContent, usrTags)) - ERROR_LOG(m_logger) << LOGFUNCTION << " dict.setXmlSymbolToDict failed" + ERROR_LOG() << Q_FUNC_INFO << " dict.setXmlSymbolToDict failed" << ", symbologyType='" << (int)symbologyType << "'" << ", name='" << name << "'"; } } - TRACE_LOG(m_logger) << LOGFUNCTION << " END" + TRACE_LOG() << Q_FUNC_INFO << " END" << " fileContentId=" << fileContentId << " name='" << name << "'"; } void FlmSubscriber::onLocalSymbolProxyXmlSymbolRemoved(qint32 fileContentId) { - TRACE_LOG(m_logger) << LOGFUNCTION << " START" << " fileContentId=" << fileContentId; + TRACE_LOG() << Q_FUNC_INFO << " START" << " fileContentId=" << fileContentId; for (const SymbologyType &symbologyType : std::as_const(d->m_symbolDictionaryToUpdate)) { AdvancedSymbology::SymbolDictionary &dict = AdvancedSymbology::SymbolDictionary::dictionary(symbologyType); - DEBUG_LOG(m_logger) << LOGFUNCTION << " dict.removeXmlSymbol:" + DEBUG_LOG() << Q_FUNC_INFO << " dict.removeXmlSymbol:" << " symbologyType='" << symbologyType << "'" << ", fileContentId=" << fileContentId; @@ -627,7 +627,7 @@ void FlmSubscriber::onLocalSymbolProxyXmlSymbolRemoved(qint32 fileContentId) dict.removeXmlSymbol(sidc); dict.removeXmlSymbol(fileContentId); } - TRACE_LOG(m_logger) << LOGFUNCTION << " END" << " fileContentId=" << fileContentId; + TRACE_LOG() << Q_FUNC_INFO << " END" << " fileContentId=" << fileContentId; } @@ -638,7 +638,7 @@ void FlmSubscriber::onLocalSymbolProxyXmlSymbolRemoved(qint32 fileContentId) bool FlmSubscriber::connectFlmSymbolProxy(int type_placeholder, SymbologyType symbologyType) { Q_UNUSED(type_placeholder); - TRACE_LOG(m_logger) << LOGFUNCTION << " m_fileContentMap.size()=" << d->m_fileContentMap.size() ; + TRACE_LOG() << Q_FUNC_INFO << " m_fileContentMap.size()=" << d->m_fileContentMap.size() ; d->m_symbolDictionaryToUpdate.insert(symbologyType); @@ -701,12 +701,12 @@ bool FlmSubscriber::setEtsSymbolToDict(SymbolDictionary &dict, if (!dict.setEtsSymbol(fileContentId, symProps.sidc(), symProps, image)) { - ERROR_LOG(m_logger) << LOGFUNCTION << " dict.insertExtraSymbol failed" + ERROR_LOG() << Q_FUNC_INFO << " dict.insertExtraSymbol failed" << ", fileContentId=" << fileContentId << ", name='" << name << "'"; return false; } else - INFO_LOG(m_logger) << LOGFUNCTION << " dict.insertExtraSymbol done" + INFO_LOG() << Q_FUNC_INFO << " dict.insertExtraSymbol done" << ", fileContentId=" << fileContentId << ", name='" << name << "'"; return true; @@ -731,7 +731,7 @@ bool FlmSubscriber::setXmlSymbolToDict(SymbolDictionary &dict, bool success = dict.setXmlSymbol(fileContentId, name, operatorName, lastModified, xmlContent, symProps); if (!success) - ERROR_LOG(m_logger) << LOGFUNCTION << " setXmlSymbol failed:" + ERROR_LOG() << Q_FUNC_INFO << " setXmlSymbol failed:" << ", file-id=" << fileContentId << ", filenameid='" << name << "'"; return success; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/Gui/SymbolProxy/asb_flm_subscriber.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/Gui/SymbolProxy/asb_flm_subscriber.h index 93d31e222..9dcc8aa44 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/Gui/SymbolProxy/asb_flm_subscriber.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/Gui/SymbolProxy/asb_flm_subscriber.h @@ -85,9 +85,7 @@ protected: void checkForReFetching(); -private: - LOGGER_T m_logger; - +private: struct Private; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/CMakeLists.txt index 58dd03fce..563da60d8 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/CMakeLists.txt +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/CMakeLists.txt @@ -48,7 +48,7 @@ ADD_SUBDIRECTORY(Gui) # # Gui Plugin Interface # -#NGL_ADD_LIBRARY(WS AlmGuiPluginInterface SHARED alm_gui_plugin_interface.h) +#NGL_ADD_LIBRARY2(WS AlmGuiPluginInterface SHARED alm_gui_plugin_interface.h) #NGL_TARGET_LINK_LIBRARIES(AlmGuiPluginInterface # Qt6::Core # GuiPluginInterface diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/Common/alm_config_alarm_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/Common/alm_config_alarm_model.cpp index 4ed617d52..c53c40e57 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/Common/alm_config_alarm_model.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/Common/alm_config_alarm_model.cpp @@ -28,7 +28,6 @@ parent) , m_ppmDtc(nullptr) , m_alarmHistoryModel(nullptr) , m_global(false) - , m_logger(getLogger("ConfigAlarmModel")) {} @@ -44,7 +43,7 @@ bool ConfigAlarmModel::initModel(const std::shared_ptr alarmConfigs = m_dtc->alarmConfigs(); - INFO_LOG(m_logger) << "initModel - #AlarmConfig: " << alarmConfigs.size(); + INFO_LOG() << "initModel - #AlarmConfig: " << alarmConfigs.size(); connect(m_dtc.get(), &Interface::Dtc::alarmConfigChanged, this, &ConfigAlarmModel::onAlarmConfigChanged); @@ -60,7 +59,7 @@ bool ConfigAlarmModel::initModel(const std::shared_ptr +#include "almcommon_export.h" #include #include @@ -49,7 +49,5 @@ private: std::shared_ptr m_ppmDtc; AlarmHistoryModel *m_alarmHistoryModel; bool m_global; - - LOGGER_T m_logger; }; } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/Common/alm_history_alarm_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/Common/alm_history_alarm_model.cpp index ed5b193cc..edfd42251 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/Common/alm_history_alarm_model.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/Common/alm_history_alarm_model.cpp @@ -33,7 +33,6 @@ AlarmHistoryModel::AlarmHistoryModel(QObject *parent) parent) , m_dtc(nullptr) , m_ppmDtc(nullptr) -, m_logger(getLogger("AlarmHistoryModel")) {} @@ -177,7 +176,7 @@ void AlarmHistoryModel::onNotificationChanged(const AlarmManagement::Notificatio const int global = propertieJsonObj[QStringLiteral("Global")].toInt(); const int friendlyFire = propertieJsonObj[QStringLiteral("FriendlyFire")].toInt(); - DEBUG_LOG(m_logger) << LOGFUNCTION + DEBUG_LOG() << Q_FUNC_INFO << " notification:" << data << ", Global: " << global << ", FriendlyFire: " << friendlyFire; @@ -198,7 +197,7 @@ void AlarmHistoryModel::onParticipantChanged(const ParticipantManagement::Partic QString tacticalIdentifier = QString::fromStdString(participant.tacticalIdentifier()); m_idTactIdentifierMap.insert(participant.id(), tacticalIdentifier); - DEBUG_LOG(m_logger) << LOGFUNCTION << " id=" << participant.id() + DEBUG_LOG() << Q_FUNC_INFO << " id=" << participant.id() << " designator=" << designator << " tacticalIdentifier=" << tacticalIdentifier; } @@ -206,7 +205,7 @@ void AlarmHistoryModel::onParticipantChanged(const ParticipantManagement::Partic int AlarmHistoryModel::participantId2EquipNo(const int participantId) const { int ret = m_partId2EquipNoMap.value(participantId, 0); - INFO_LOG(m_logger) << "participantId2EquipNo participantId=" << participantId + INFO_LOG() << "participantId2EquipNo participantId=" << participantId << " EquipmentNumber=" << ret; return ret; } @@ -214,7 +213,7 @@ int AlarmHistoryModel::participantId2EquipNo(const int participantId) const QString AlarmHistoryModel::getDesignator(const int participantId) const { QString designator = m_idDesignatorMap.value(participantId); - DEBUG_LOG(m_logger) << "m_idDesignatorMap.value(participantId)=" << designator; + DEBUG_LOG() << "m_idDesignatorMap.value(participantId)=" << designator; return designator; } @@ -222,7 +221,7 @@ QString AlarmHistoryModel::getDesignator(const int participantId) const QString AlarmHistoryModel::getTactIdentifier(const int participantId) const { QString tactIdentifier = m_idTactIdentifierMap.value(participantId); - DEBUG_LOG(m_logger) << "m_idTactIdentifierMap.value(participantId)=" << tactIdentifier; + DEBUG_LOG() << "m_idTactIdentifierMap.value(participantId)=" << tactIdentifier; return tactIdentifier; } @@ -235,7 +234,7 @@ void AlarmHistoryModel::onBCContaminationChanged(const AreaEffectSimulation::BCC int id = data.id(); QString name = QString::fromStdString(data.name()); m_aesNameMap[id] = name; - DEBUG_LOG(m_logger) << "onBCContaminationChanged: " << data + DEBUG_LOG() << "onBCContaminationChanged: " << data << " Name=" << name << " id=" << id; } @@ -248,7 +247,7 @@ void AlarmHistoryModel::onBoobyTrapChanged(const AreaEffectSimulation::BoobyTrap int id = data.id(); QString name = QString::fromStdString(data.name()); m_aesNameMap[id] = name; - DEBUG_LOG(m_logger) << "BoobyTrap: " << data + DEBUG_LOG() << "BoobyTrap: " << data << " Name=" << name << " id=" << id; } @@ -261,7 +260,7 @@ void AlarmHistoryModel::onOffRouteMineChanged(const AreaEffectSimulation::OffRou int id = data.id(); QString name = QString::fromStdString(data.name()); m_aesNameMap[id] = name; - DEBUG_LOG(m_logger) << "OffRouteMine: " << data + DEBUG_LOG() << "OffRouteMine: " << data << " Name=" << name << " id=" << id; } @@ -274,7 +273,7 @@ void AlarmHistoryModel::onAesItemChanged(const AreaEffectSimulation::AesItem &it QString name = QString::fromStdString(item.name()); int id = item.id(); m_aesNameMap[id] = name; - DEBUG_LOG(m_logger) << "AreaEffectSimulation::AesItem onAesItemChanged: " << item + DEBUG_LOG() << "AreaEffectSimulation::AesItem onAesItemChanged: " << item << " Name=" << name << " id=" << item.id(); } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/Common/alm_history_alarm_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/Common/alm_history_alarm_model.h index d33395d97..51094e0e1 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/Common/alm_history_alarm_model.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/Common/alm_history_alarm_model.h @@ -3,7 +3,7 @@ #pragma once -#include +#include "almcommon_export.h" #include #include #include @@ -89,7 +89,6 @@ private: QHash m_aesNameMap; friend class AlarmHistoryProxyModel; - LOGGER_T m_logger; }; class ALMCOMMON_EXPORT AlarmHistoryProxyModel final : public LtsWidgets::LtsColumnFilterProxyModel diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/ConfigAlarm/alm_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/ConfigAlarm/alm_dialog.cpp index 4086ec37b..5f5eab276 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/ConfigAlarm/alm_dialog.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/ConfigAlarm/alm_dialog.cpp @@ -24,7 +24,6 @@ AlarmDialog::AlarmDialog(QWidget *parent) , m_ui(new Ui::AlarmDialog) , m_requestHelper(new LtsUtils::RequestHelper(this)) , m_operatorId(-1) - , m_logger(getLogger("AlarmDialog")) { AlarmCheckBox alarmCheckBox; LtsUtils::ProjectSettings *ps = LtsUtils::ProjectSettings::getInstance(); @@ -155,7 +154,7 @@ bool AlarmDialog::init(const std::shared_ptr &f bool global = true; m_configAlarmModel->initModel(m_dtc, ppmDtc, alarmHistoryModel, global); - INFO_LOG(m_logger) << "AlarmDialog::init"; + INFO_LOG() << "AlarmDialog::init"; return true; } @@ -171,7 +170,7 @@ void AlarmDialog::onAlarmConfigChanged(const AlarmManagement::AlarmConfig &data, if (modType == DataModification::eRemoved) return; - DEBUG_LOG(m_logger) << "************** onAlarmConfigChanged " + DEBUG_LOG() << "************** onAlarmConfigChanged " << " id=" << data.id() << " operatorId=" << data.operatorId() << " m_operatorId=" << m_operatorId @@ -184,33 +183,33 @@ void AlarmDialog::onAlarmConfigChanged(const AlarmManagement::AlarmConfig &data, if (data.operatorId() == m_operatorId) { - DEBUG_LOG(m_logger) << "************** onAlarmConfig zuweisen "; + DEBUG_LOG() << "************** onAlarmConfig zuweisen "; switch (data.eventTypeId().underlying()) { case ProjectDataManagement::EventType_def::EnterNuclear: { - DEBUG_LOG(m_logger) << "EnterNuclear zuweisen "; + DEBUG_LOG() << "EnterNuclear zuweisen "; m_ui->cbxNMarker->setChecked(setMarker); m_ui->cbxNMessage->setChecked(messageWindow); break; } case ProjectDataManagement::EventType_def::EnterDangerArea: { - DEBUG_LOG(m_logger) << "EnterDangerArea zuweisen "; + DEBUG_LOG() << "EnterDangerArea zuweisen "; m_ui->cbxDanerAreaMarker->setChecked(setMarker); m_ui->cbxDangerAreaMessage->setChecked(messageWindow); break; } case ProjectDataManagement::EventType_def::EnterMineArea: { - DEBUG_LOG(m_logger) << "EnterMineArea zuweisen "; + DEBUG_LOG() << "EnterMineArea zuweisen "; m_ui->cbxMineAreaEntryMarker->setChecked(setMarker); m_ui->cbxMineAreaEntryMessage->setChecked(messageWindow); break; } case ProjectDataManagement::EventType_def::HitMine: { - DEBUG_LOG(m_logger) << "HitMine zuweisen "; + DEBUG_LOG() << "HitMine zuweisen "; m_ui->cbxMineAreaHitMarker->setChecked(setMarker); m_ui->cbxMineAreaHitMessage->setChecked(messageWindow); break; @@ -218,14 +217,14 @@ void AlarmDialog::onAlarmConfigChanged(const AlarmManagement::AlarmConfig &data, case ProjectDataManagement::EventType_def::Hit: { - DEBUG_LOG(m_logger) << "Hit zuweisen "; + DEBUG_LOG() << "Hit zuweisen "; m_ui->cbxDirectFireMarker->setChecked(setMarker); m_ui->cbxDirectFireMessage->setChecked(messageWindow); break; } case ProjectDataManagement::EventType_def::HitEffectSimulation: { - DEBUG_LOG(m_logger) << "HitEffectSimulation zuweisen "; + DEBUG_LOG() << "HitEffectSimulation zuweisen "; m_ui->cbxIndirectFireMarker->setChecked(setMarker); m_ui->cbxIndirectFireMessage->setChecked(messageWindow); break; @@ -233,27 +232,27 @@ void AlarmDialog::onAlarmConfigChanged(const AlarmManagement::AlarmConfig &data, case ProjectDataManagement::EventType_def::CrossLocalBorderline: { - DEBUG_LOG(m_logger) << "CrossLocalBorderline zuweisen "; + DEBUG_LOG() << "CrossLocalBorderline zuweisen "; m_ui->cbxLocalBorderMarker->setChecked(setMarker); m_ui->cbxLocalBorderMessage->setChecked(messageWindow); break; } case ProjectDataManagement::EventType_def::CrossGlobalBorderline: { - DEBUG_LOG(m_logger) << "CrossGlobalBorderline zuweisen "; + DEBUG_LOG() << "CrossGlobalBorderline zuweisen "; m_ui->cbxGlobalBorderMarker->setChecked(setMarker); m_ui->cbxGlobalBorderMessage->setChecked(messageWindow); break; } case ProjectDataManagement::EventType_def::AirSupport: { - DEBUG_LOG(m_logger) << "AirSupport zuweisen "; + DEBUG_LOG() << "AirSupport zuweisen "; m_ui->cbxAirSupportMarker->setChecked(setMarker); m_ui->cbxAirSupportMessage->setChecked(messageWindow); break; } default: - ERROR_LOG(m_logger) << "Not possible to set with Operator App!!!"; + ERROR_LOG() << "Not possible to set with Operator App!!!"; break; } } @@ -273,22 +272,22 @@ std::vector AlarmDialog::getCheckedValues() const if (item.checkboxMarker->isChecked()) { alarmActionDds.setMarker(true); - DEBUG_LOG(m_logger) << item.name << " setMarker = true"; + DEBUG_LOG() << item.name << " setMarker = true"; } else { alarmActionDds.setMarker(false); - DEBUG_LOG(m_logger) << item.name << " setMarker = false"; + DEBUG_LOG() << item.name << " setMarker = false"; } if (item.checkboxWindow->isChecked()) { alarmActionDds.messageWindow(true); - DEBUG_LOG(m_logger) << item.name << " messageWindow = true"; + DEBUG_LOG() << item.name << " messageWindow = true"; } else { alarmActionDds.messageWindow(false); - DEBUG_LOG(m_logger) << item.name << " messageWindow = false"; + DEBUG_LOG() << item.name << " messageWindow = false"; } if (alarmActionDds.setMarker() || alarmActionDds.messageWindow()) ret.push_back(alarmActionDds); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/ConfigAlarm/alm_history.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/ConfigAlarm/alm_history.cpp index 7e4622b44..4b164936f 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/ConfigAlarm/alm_history.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/ConfigAlarm/alm_history.cpp @@ -20,9 +20,8 @@ AlarmView::AlarmView(LtsSession::LtsSession *session, QWidget *parent) , m_sitMapGuiIfc(nullptr) , m_session(session) , m_ui(new Ui::AlarmView) - , m_logger(getLogger("AlarmView")) { - DEBUG_LOG(m_logger) << LOGFUNCTION << " --- AlarmView Konstruktor() "; + DEBUG_LOG() << Q_FUNC_INFO << " --- AlarmView Konstruktor() "; m_ui->setupUi(this); m_ui->widget->setSelectionMode(QAbstractItemView::MultiSelection); @@ -51,7 +50,7 @@ AlarmView::AlarmView(LtsSession::LtsSession *session, QWidget *parent) AlarmView::~AlarmView() { - INFO_LOG(m_logger) << "--- AlarmView Destruktor() "; + INFO_LOG() << "--- AlarmView Destruktor() "; m_sitMapGuiIfc = nullptr; delete m_ui; } @@ -66,14 +65,14 @@ void AlarmView::retranslate() bool AlarmView::init(const std::shared_ptr &dtc, AlarmHistoryModel *alarmHistoryModel) { - INFO_LOG(m_logger) << "--- init() "; + INFO_LOG() << "--- init() "; if (!dtc) return false; m_dtc = dtc; m_alarmHistoryModel = alarmHistoryModel; - DEBUG_LOG(m_logger) << "--- AlarmView::init "; + DEBUG_LOG() << "--- AlarmView::init "; m_proxyModel = new AlarmHistoryProxyModel(this); m_proxyModel->setSourceModel(m_alarmHistoryModel); m_ui->widget->setModel(m_proxyModel); @@ -102,14 +101,14 @@ void AlarmView::onSelectionChanged() void AlarmView::onShowAlarm() { - INFO_LOG(m_logger) << "--- onShowMAlarm() "; + INFO_LOG() << "--- onShowMAlarm() "; } void AlarmView::onRemoveAlarm() { - DEBUG_LOG(m_logger) << "onRemoveAlarm selectedRows.size" + DEBUG_LOG() << "onRemoveAlarm selectedRows.size" << m_ui->widget->selectedRows().size(); const QModelIndexList idxList = m_ui->widget->selectedRows(); @@ -125,7 +124,7 @@ void AlarmView::onRemoveAlarm() void AlarmView::onCenterAlarm() { - DEBUG_LOG(m_logger) << "onCenterAlarm"; + DEBUG_LOG() << "onCenterAlarm"; if (!m_sitMapGuiIfc) return; const QModelIndexList indexList = m_ui->widget->selectedRows(); @@ -138,14 +137,14 @@ void AlarmView::onCenterAlarm() if (!position.isNull()) { - DEBUG_LOG(m_logger) << LOGFUNCTION << " position=" << position.x() << " - " << position.y(); + DEBUG_LOG() << Q_FUNC_INFO << " position=" << position.x() << " - " << position.y(); m_sitMapGuiIfc->setCenterPoint(position); } else { const QModelIndex &indexParticipantId = m_alarmHistoryModel->index(index.row(), AlarmHistoryModel::ParticipantId, index.parent()); const int participantId = indexParticipantId.data().toInt(); - DEBUG_LOG(m_logger) << LOGFUNCTION << " participantId=" << participantId; + DEBUG_LOG() << Q_FUNC_INFO << " participantId=" << participantId; m_sitMapGuiIfc->centerMapToParticipant(participantId); } } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/ConfigAlarm/alm_history.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/ConfigAlarm/alm_history.h index d3f6d4706..40b3ec54d 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/ConfigAlarm/alm_history.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/ConfigAlarm/alm_history.h @@ -45,8 +45,6 @@ private: LtsSession::LtsSession *m_session; Ui::AlarmView *m_ui; - - LOGGER_T m_logger; }; } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/ConfigParticipantAlarm/alm_config_participant_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/ConfigParticipantAlarm/alm_config_participant_dialog.cpp index 632b02a4e..2bab71200 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/ConfigParticipantAlarm/alm_config_participant_dialog.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/ConfigParticipantAlarm/alm_config_participant_dialog.cpp @@ -99,10 +99,10 @@ bool ConfigParticipantsDialog::init(const std::shared_ptrequipmentNoContent->setText(equipmentNumbersStr); - DEBUG_LOG(m_logger) << "current participantId = " << participantData.id(); + DEBUG_LOG() << "current participantId = " << participantData.id(); m_typeClass = ppmDtc->type(participantData.typeId()).typeClass(); - DEBUG_LOG(m_logger) << "m_typeClass=" << m_typeClass << " TypeId=" << participantData.typeId(); + DEBUG_LOG() << "m_typeClass=" << m_typeClass << " TypeId=" << participantData.typeId(); fillCbx(); m_almDtc->alarmConfigs([this](const AlarmManagement::AlarmConfig &alarm) { setAlaramData(alarm); }); @@ -111,7 +111,7 @@ bool ConfigParticipantsDialog::init(const std::shared_ptrcbxDirectFire->setChecked(true); m_ui->cbxSetMarker->setChecked(alarm.setMarker()); m_ui->cbxMessageWindow->setChecked(alarm.messageWindow()); @@ -135,7 +135,7 @@ void ConfigParticipantsDialog::setAlaramData(const AlarmManagement::AlarmConfig } case ProjectDataManagement::EventType_def::HitEffectSimulation: { - DEBUG_LOG(m_logger) << "HitIndirect zuweisen "; + DEBUG_LOG() << "HitIndirect zuweisen "; m_ui->cbxIndirectFire->setChecked(true); m_ui->cbxSetMarker->setChecked(alarm.setMarker()); m_ui->cbxMessageWindow->setChecked(alarm.messageWindow()); @@ -143,7 +143,7 @@ void ConfigParticipantsDialog::setAlaramData(const AlarmManagement::AlarmConfig } case ProjectDataManagement::EventType_def::AirSupport: { - DEBUG_LOG(m_logger) << "AirSupport zuweisen "; + DEBUG_LOG() << "AirSupport zuweisen "; m_ui->cbxAirSupport->setChecked(true); m_ui->cbxSetMarker->setChecked(alarm.setMarker()); m_ui->cbxMessageWindow->setChecked(alarm.messageWindow()); @@ -151,7 +151,7 @@ void ConfigParticipantsDialog::setAlaramData(const AlarmManagement::AlarmConfig } case ProjectDataManagement::EventType_def::HitMine: { - DEBUG_LOG(m_logger) << "HitMine zuweisen "; + DEBUG_LOG() << "HitMine zuweisen "; m_ui->cbxMines->setChecked(true); m_ui->cbxSetMarker->setChecked(alarm.setMarker()); m_ui->cbxMessageWindow->setChecked(alarm.messageWindow()); @@ -161,7 +161,7 @@ void ConfigParticipantsDialog::setAlaramData(const AlarmManagement::AlarmConfig case ProjectDataManagement::EventType_def::HitN: case ProjectDataManagement::EventType_def::HitC: { - DEBUG_LOG(m_logger) << "Hit N/B/C zuweisen "; + DEBUG_LOG() << "Hit N/B/C zuweisen "; m_ui->cbxNbcAgent->setChecked(true); m_ui->cbxSetMarker->setChecked(alarm.setMarker()); m_ui->cbxMessageWindow->setChecked(alarm.messageWindow()); @@ -169,7 +169,7 @@ void ConfigParticipantsDialog::setAlaramData(const AlarmManagement::AlarmConfig } case ProjectDataManagement::EventType_def::FriendlyFire: { - DEBUG_LOG(m_logger) << "FriendlyFire zuweisen "; + DEBUG_LOG() << "FriendlyFire zuweisen "; m_ui->cbxFriendlyFire->setChecked(true); m_ui->cbxSetMarker->setChecked(alarm.setMarker()); m_ui->cbxMessageWindow->setChecked(alarm.messageWindow()); @@ -183,7 +183,7 @@ void ConfigParticipantsDialog::setAlaramData(const AlarmManagement::AlarmConfig } case ProjectDataManagement::EventType_def::Manipulation: { - DEBUG_LOG(m_logger) << "Manipulation zuweisen "; + DEBUG_LOG() << "Manipulation zuweisen "; m_ui->cbxManipulation->setChecked(true); m_ui->cbxSetMarker->setChecked(alarm.setMarker()); m_ui->cbxMessageWindow->setChecked(alarm.messageWindow()); @@ -191,7 +191,7 @@ void ConfigParticipantsDialog::setAlaramData(const AlarmManagement::AlarmConfig } case ProjectDataManagement::EventType_def::CrossGlobalBorderline: { - DEBUG_LOG(m_logger) << "CrossGlobalBorderline zuweisen "; + DEBUG_LOG() << "CrossGlobalBorderline zuweisen "; m_ui->cbxGlobalBorderLine->setChecked(true); m_ui->cbxSetMarker->setChecked(alarm.setMarker()); m_ui->cbxMessageWindow->setChecked(alarm.messageWindow()); @@ -199,7 +199,7 @@ void ConfigParticipantsDialog::setAlaramData(const AlarmManagement::AlarmConfig } case ProjectDataManagement::EventType_def::CrossLocalBorderline: { - DEBUG_LOG(m_logger) << "CrossLocalBorderline zuweisen "; + DEBUG_LOG() << "CrossLocalBorderline zuweisen "; m_ui->cbxLocalBorderLine->setChecked(true); m_ui->cbxSetMarker->setChecked(alarm.setMarker()); m_ui->cbxMessageWindow->setChecked(alarm.messageWindow()); @@ -207,7 +207,7 @@ void ConfigParticipantsDialog::setAlaramData(const AlarmManagement::AlarmConfig } default: { - ERROR_LOG(m_logger) << "Not possible to set with Operator App!!!"; + ERROR_LOG() << "Not possible to set with Operator App!!!"; } } } @@ -215,7 +215,7 @@ void ConfigParticipantsDialog::setAlaramData(const AlarmManagement::AlarmConfig std::vector ConfigParticipantsDialog::getCheckedValues() const { AlarmManagement::AlarmAction alarmActionDds; - DEBUG_LOG(m_logger) << "getCheckedValues"; + DEBUG_LOG() << "getCheckedValues"; std::vector alarmsDds; @@ -289,7 +289,7 @@ std::vector ConfigParticipantsDialog::getCheckedVa bool ConfigParticipantsDialog::apply() { - DEBUG_LOG(m_logger) << "apply"; + DEBUG_LOG() << "apply"; AlarmManagement::ConfigureAlarmsRequest req; req.participantIds(m_participantVector); req.alarms(getCheckedValues()); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/ConfigParticipantAlarm/alm_config_participant_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/ConfigParticipantAlarm/alm_config_participant_dialog.h index 19742039a..d7b3a6f35 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/ConfigParticipantAlarm/alm_config_participant_dialog.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/ConfigParticipantAlarm/alm_config_participant_dialog.h @@ -54,7 +54,5 @@ private: std::vector m_participantVector; ParticipantManagement::TypeClass m_typeClass; ParticipantManagement::ParticipantData m_participantData; - - NGL::INGLLogger &m_logger; }; } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/ConfigParticipantAlarm/alm_participant_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/ConfigParticipantAlarm/alm_participant_dialog.cpp index 0e1c28581..9ccfea779 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/ConfigParticipantAlarm/alm_participant_dialog.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/ConfigParticipantAlarm/alm_participant_dialog.cpp @@ -112,7 +112,7 @@ bool ParticipantsDialog::init(LtsSession::LtsSession *session, void ParticipantsDialog::onSelectionChanged() { bool configureAlarms = false; - DEBUG_LOG(m_logger) << "onSelectionChanged"; + DEBUG_LOG() << "onSelectionChanged"; const QModelIndexList currentlySelectedParticipants = m_ui->dvParticipants->selectedRows(); for (const QModelIndex &index : currentlySelectedParticipants) @@ -121,7 +121,7 @@ void ParticipantsDialog::onSelectionChanged() if ((data.equipmentNumber().is_set() && data.equipmentNumber().get() > 0) || m_ppmDtc->type(data.typeId()).typeClass() == ParticipantManagement::TypeClass_def::Unit) configureAlarms = true; - DEBUG_LOG(m_logger) << "setChildrenSelected row =" << index.row() << " column=" << index.column(); + DEBUG_LOG() << "setChildrenSelected row =" << index.row() << " column=" << index.column(); } m_buttonBox->setButtonEnabled(LtsWidgets::DialogButton::Edit, configureAlarms); @@ -141,7 +141,7 @@ void ParticipantsDialog::onCbPartyChanged() void ParticipantsDialog::onAddButtonClicked() { - DEBUG_LOG(m_logger) << "onAddButtonClicked"; + DEBUG_LOG() << "onAddButtonClicked"; m_participantVector.clear(); m_equipmentVector.clear(); @@ -151,14 +151,14 @@ void ParticipantsDialog::onAddButtonClicked() for (const QModelIndex &index : currentlySelectedParticipants) { - DEBUG_LOG(m_logger) << "setChildrenSelected: " << index.row() << " column=" << index.column(); + DEBUG_LOG() << "setChildrenSelected: " << index.row() << " column=" << index.column(); setChildrenSelected(index); } } QModelIndex participantIndex = m_ui->dvParticipants->currentIndex(); ParticipantManagement::ParticipantData data = m_participantModel->getParticipantData(participantIndex); - DEBUG_LOG(m_logger) << "current participantId = " << data.id(); + DEBUG_LOG() << "current participantId = " << data.id(); m_participantVector.push_back(data.id()); const auto partData = m_participantModel->getParticipantData(participantIndex); @@ -186,16 +186,16 @@ void ParticipantsDialog::setChildrenSelected(const QModelIndex &parent) if (m_participantModel->hasChildren(childIndex)) setChildrenSelected(childIndex); - DEBUG_LOG(m_logger) << "Setting row " + DEBUG_LOG() << "Setting row " << childIndex.row() << " selected"; ParticipantManagement::ParticipantData data = m_participantModel->getParticipantData(childIndex); - DEBUG_LOG(m_logger) << "append participantId = " << data.id(); + DEBUG_LOG() << "append participantId = " << data.id(); m_participantVector.push_back(data.id()); if (data.equipmentNumber().is_set()) { - DEBUG_LOG(m_logger) << "append equipmentNumber = " << data.equipmentNumber().get(); + DEBUG_LOG() << "append equipmentNumber = " << data.equipmentNumber().get(); m_equipmentVector.push_back(data.equipmentNumber().get()); } @@ -211,7 +211,7 @@ void ParticipantsDialog::tableColumnOrganiserSetting() void ParticipantsDialog::onConfigureAlarmsReply(const Core::FunctionReplyObject &replyObject) { - DEBUG_LOG(m_logger) << "onConfigureAlarmsReply" << replyObject.str(); + DEBUG_LOG() << "onConfigureAlarmsReply" << replyObject.str(); m_requestHelper->requestReply(replyObject); } @@ -220,7 +220,7 @@ void ParticipantsDialog::onDoubleClicked() if (!m_buttonBox->isButtonEnabled(LtsWidgets::DialogButton::Edit)) return; - DEBUG_LOG(m_logger) << "onDoubleClicked"; + DEBUG_LOG() << "onDoubleClicked"; onAddButtonClicked(); } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/ConfigParticipantAlarm/alm_participant_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/ConfigParticipantAlarm/alm_participant_dialog.h index ad516f1b8..7bcae5d43 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/ConfigParticipantAlarm/alm_participant_dialog.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/ConfigParticipantAlarm/alm_participant_dialog.h @@ -72,6 +72,5 @@ private: QString m_menuGroup; static int s_preselectedParty; Ui::ParticipantsDialog *m_ui; - NGL::INGLLogger &m_logger; }; } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/ConfigParticipantAlarm/alm_participant_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/ConfigParticipantAlarm/alm_participant_model.cpp index 6afec5e1f..833089bfe 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/ConfigParticipantAlarm/alm_participant_model.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/ConfigParticipantAlarm/alm_participant_model.cpp @@ -19,7 +19,7 @@ ParticipantAlarmModel::ParticipantAlarmModel(QObject *parent, { m_titles += tr("Alarm Assignable"); - DEBUG_LOG(m_logger) << "ParticipantAlarmModel::ParticipantAlarmModel"; + DEBUG_LOG() << "ParticipantAlarmModel::ParticipantAlarmModel"; } QVariant ParticipantAlarmModel::data(const QModelIndex &index, int role) const @@ -42,7 +42,7 @@ void ParticipantAlarmModel::onParticipantChanged(const ParticipantManagement::Pa if (data.partyId() != partyId()) return; - INFO_LOG(m_logger) << "onParticipantChanged isSimulated=" << data.isSimulated(); + INFO_LOG() << "onParticipantChanged isSimulated=" << data.isSimulated(); onReinitModel(partyId()); emit newData(); } @@ -56,7 +56,7 @@ bool ParticipantAlarmModel::isSelectableByAlarm(const QModelIndex &index, bool * m_dtc->type(data.typeId()).typeClass() == ParticipantManagement::TypeClass_def::Unit) isSimulatable = true; - DEBUG_LOG(m_logger) << "ParticipantId: " << data.id() + DEBUG_LOG() << "ParticipantId: " << data.id() << " isSimulated:" << data.isSimulated() << " equipmentNo:" << data.equipmentNumber() << " typeId=" << data.typeId() diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/ConfigParticipantAlarm/alm_participant_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/ConfigParticipantAlarm/alm_participant_model.h index 0e95cc54e..01e66affc 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/ConfigParticipantAlarm/alm_participant_model.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/ConfigParticipantAlarm/alm_participant_model.h @@ -23,7 +23,5 @@ signals: private: void onParticipantChanged(const ParticipantManagement::Participant &data, DataModification modType); bool isSelectableByAlarm(const QModelIndex &index, bool *bIsSimulated = nullptr) const; - - NGL::INGLLogger &m_logger; }; } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/ConfigParticipantAlarm/alm_participant_show_config.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/ConfigParticipantAlarm/alm_participant_show_config.cpp index cacbf61d4..27b1f3037 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/ConfigParticipantAlarm/alm_participant_show_config.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/ConfigParticipantAlarm/alm_participant_show_config.cpp @@ -23,7 +23,7 @@ ParticipantShowConfigView::ParticipantShowConfigView(LtsSession::LtsSession *ses , m_requestHelper(new LtsUtils::RequestHelper(this)) , m_logger(AlarmManagement::getLogger("ParticipantShowConfigView")) { - DEBUG_LOG(m_logger) << "--- ParticipantShowConfigView Konstruktor() "; + DEBUG_LOG() << "--- ParticipantShowConfigView Konstruktor() "; m_ui->setupUi(this); m_ui->widget->setSelectionMode(QAbstractItemView::SingleSelection); @@ -47,7 +47,7 @@ ParticipantShowConfigView::ParticipantShowConfigView(LtsSession::LtsSession *ses ParticipantShowConfigView::~ParticipantShowConfigView() { - INFO_LOG(m_logger) << "--- ParticipantShowConfigView Destruktor() "; + INFO_LOG() << "--- ParticipantShowConfigView Destruktor() "; delete m_ui; } @@ -62,7 +62,7 @@ bool ParticipantShowConfigView::init(const std::shared_ptr &ppmDtc, const std::shared_ptr &aesDtc) { - INFO_LOG(m_logger) << "--- init() "; + INFO_LOG() << "--- init() "; if (!dtc || !ftc) return false; @@ -71,7 +71,7 @@ bool ParticipantShowConfigView::init(const std::shared_ptrinitModel(dtc, ppmDtc, aesDtc); - DEBUG_LOG(m_logger) << "--- ParticipantShowConfigView::init "; + DEBUG_LOG() << "--- ParticipantShowConfigView::init "; m_configAlarmModel = new AlarmManagement::ConfigAlarmModel(this); m_configAlarmModel->initModel(m_dtc, ppmDtc, m_alarmHistoryModel, false); m_ui->widget->setModel(m_configAlarmModel); @@ -92,7 +92,7 @@ void ParticipantShowConfigView::onSelectionChanged() void ParticipantShowConfigView::onConfigureAlarmsReply(const Core::FunctionReplyObject &replyObject) { - DEBUG_LOG(m_logger)<<"onConfigureAlarmsReply"<requestReply(replyObject); } @@ -104,14 +104,14 @@ void ParticipantShowConfigView::tableColumnOrganiserSetting() void ParticipantShowConfigView::onShowAlarm() { - INFO_LOG(m_logger) << "--- onShowAlarm() "; + INFO_LOG() << "--- onShowAlarm() "; } void ParticipantShowConfigView::onRemoveAlarm() { - DEBUG_LOG(m_logger) << "onRemoveAlarm" + DEBUG_LOG() << "onRemoveAlarm" << " id = "<< m_configAlarmModel->getRowData(m_ui->widget->currentIndex().row()).id() << " eventTypeId = "<< m_configAlarmModel->getRowData(m_ui->widget->currentIndex().row()).eventTypeId() << " operatorId = "<< m_configAlarmModel->getRowData(m_ui->widget->currentIndex().row()).operatorId() diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/ConfigParticipantAlarm/alm_participant_show_config.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/ConfigParticipantAlarm/alm_participant_show_config.h index 7915b18ae..49beafc50 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/ConfigParticipantAlarm/alm_participant_show_config.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/ConfigParticipantAlarm/alm_participant_show_config.h @@ -57,8 +57,7 @@ private: Ui::ParticipantShowConfigView *m_ui; LtsUtils::RequestHelper *m_requestHelper; - AlarmManagement::LOGGER_T m_logger; - + AlarmManagement:: }; } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/EmergencyCalls/alm_emergency_call_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/EmergencyCalls/alm_emergency_call_dialog.cpp index dc0acd5a9..70627d395 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/EmergencyCalls/alm_emergency_call_dialog.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/EmergencyCalls/alm_emergency_call_dialog.cpp @@ -25,7 +25,6 @@ EmergencyCallDialog::EmergencyCallDialog(QWidget *parent) , m_session(nullptr) , m_ui(new Ui::EmergencyCallDialog) , m_requestHelper(new LtsUtils::RequestHelper(this)) - , m_logger(getLogger("EmergencyCallDialog")) { m_ui->setupUi(this); } @@ -42,9 +41,9 @@ bool EmergencyCallDialog::init(const std::shared_ptr &opmDtc, LtsSession::LtsSession *session) { - TRACE_LOG(m_logger) << LOGFUNCTION << " START "; + TRACE_LOG() << Q_FUNC_INFO << " START "; if (!ftc || !dtc || !session){ - ERROR_LOG(m_logger)<<" init Emergency call dialog failed !!"; + ERROR_LOG()<<" init Emergency call dialog failed !!"; return false; } @@ -100,8 +99,8 @@ bool EmergencyCallDialog::init(const std::shared_ptremergencyCallView->hideColumn(EmergencyCallModel::EXPIRED); #endif - INFO_LOG(m_logger) << "EmergencyCallDialog::init done"; - TRACE_LOG(m_logger) << LOGFUNCTION << " END"; + INFO_LOG() << "EmergencyCallDialog::init done"; + TRACE_LOG() << Q_FUNC_INFO << " END"; return true; } @@ -173,14 +172,14 @@ void EmergencyCallDialog::setAcknowledgeUi() void EmergencyCallDialog::onEditBtCliked() { - TRACE_LOG(m_logger) << LOGFUNCTION << " START"; + TRACE_LOG() << Q_FUNC_INFO << " START"; const AlmEmergencyCall &sos = getSelectedSOS(); if (sos.id() <= 0) return; setAcknowledgeUi(); - TRACE_LOG(m_logger) << LOGFUNCTION << " END"; + TRACE_LOG() << Q_FUNC_INFO << " END"; } @@ -223,7 +222,7 @@ void EmergencyCallDialog::onEmergencyIndexDoubleClicked(const QModelIndex &index void EmergencyCallDialog::sendAcknowledgeEmergency(const QString &comment) { - TRACE_LOG(m_logger) << LOGFUNCTION << " START"; + TRACE_LOG() << Q_FUNC_INFO << " START"; const AlmEmergencyCall &sos = getSelectedSOS(); if (sos.id() <= 0 || sos.expired()) @@ -244,7 +243,7 @@ void EmergencyCallDialog::sendAcknowledgeEmergency(const QString &comment) }); enaDisa(); - TRACE_LOG(m_logger) << LOGFUNCTION << " END"; + TRACE_LOG() << Q_FUNC_INFO << " END"; } void EmergencyCallDialog::tableColumnOrganiserSetting() diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/EmergencyCalls/alm_emergency_call_info_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/EmergencyCalls/alm_emergency_call_info_dialog.cpp index 5764be2c2..08436a065 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/EmergencyCalls/alm_emergency_call_info_dialog.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/EmergencyCalls/alm_emergency_call_info_dialog.cpp @@ -52,7 +52,6 @@ EmergencyCallInfoDialog::EmergencyCallInfoDialog(int entryId, QWidget *parent) : LtsWidgets::LtsDialog(parent, LtsWidgets::ButtonCombination::CloseOnly) , m_dtc(nullptr) , m_ftc(nullptr) - , m_logger(getLogger("EmergencyCallInfoDialog")) , m_requestHelper(new LtsUtils::RequestHelper(this)) , m_ui(new Ui::EmergencyCallInfoDialog) { @@ -72,10 +71,10 @@ bool EmergencyCallInfoDialog::init(const std::shared_ptr &ftc, const std::shared_ptr &sitMapGuiIfc, const std::shared_ptr&opmDtc) { - TRACE_LOG(m_logger) << LOGFUNCTION << " START"; + TRACE_LOG() << Q_FUNC_INFO << " START"; if (!ftc || !dtc) { - ERROR_LOG(m_logger)<<" init Emergency call Info dialog failed !!"; + ERROR_LOG()<<" init Emergency call Info dialog failed !!"; return false; } @@ -95,7 +94,7 @@ bool EmergencyCallInfoDialog::init(const std::shared_ptr &ftc, connect(m_ui->pbAckEmergency, &QPushButton::clicked, this, &EmergencyCallInfoDialog::onPbAckEmergencyClicked ); connect(m_ui->pbEmergencyCallFindOnMap, &QPushButton::clicked, this, &EmergencyCallInfoDialog::onFindEmergencyOnMap); - TRACE_LOG(m_logger) << LOGFUNCTION << " END"; + TRACE_LOG() << Q_FUNC_INFO << " END"; return true; } @@ -110,10 +109,10 @@ QString EmergencyCallInfoDialog::emergencyIdentifier() const bool EmergencyCallInfoDialog::setUiValues() { - TRACE_LOG(m_logger) << LOGFUNCTION << " START"; + TRACE_LOG() << Q_FUNC_INFO << " START"; if (!m_dtc || !m_ftc || m_emergency.id() < 0) { - ERROR_LOG(m_logger)<<" >> unabled to init EmergencyCallInfoDialog"; + ERROR_LOG()<<" >> unabled to init EmergencyCallInfoDialog"; return false; } @@ -134,7 +133,7 @@ bool EmergencyCallInfoDialog::setUiValues() QPixmap iconPixmap = QPixmap::fromImage(renderEmergencySymbol(m_emergency.expired())); m_ui->lblIcon->setPixmap(iconPixmap); - TRACE_LOG(m_logger) << LOGFUNCTION << " END"; + TRACE_LOG() << Q_FUNC_INFO << " END"; return true; } @@ -142,7 +141,7 @@ bool EmergencyCallInfoDialog::setUiValues() void EmergencyCallInfoDialog::onEmergencyCallChanged(AlarmManagement::AlmEmergencyCall data, DataModification modType) { - TRACE_LOG(m_logger) << LOGFUNCTION << " START"; + TRACE_LOG() << Q_FUNC_INFO << " START"; if (data.id() != m_emergency.id() || data.id() == 0) return; @@ -158,7 +157,7 @@ void EmergencyCallInfoDialog::onEmergencyCallChanged(AlarmManagement::AlmEmergen setUiValues(); } - TRACE_LOG(m_logger) << LOGFUNCTION << " END"; + TRACE_LOG() << Q_FUNC_INFO << " END"; } @@ -172,7 +171,7 @@ void EmergencyCallInfoDialog::onFindEmergencyOnMap() void EmergencyCallInfoDialog::onPbAckEmergencyClicked() { - TRACE_LOG(m_logger) << LOGFUNCTION << " START"; + TRACE_LOG() << Q_FUNC_INFO << " START"; LtsWidgets::LtsFramelessDialog *popup = new LtsWidgets::LtsFramelessDialog(this, LtsWidgets::Behaviour::Popup); LtsWidgets::LtsDialogButtonBox *btnBox = new LtsWidgets::LtsDialogButtonBox(popup); @@ -204,7 +203,7 @@ void EmergencyCallInfoDialog::onPbAckEmergencyClicked() popup->setMinimumWidth(350); popup->show(); le->setFocus(); - TRACE_LOG(m_logger) << LOGFUNCTION << " END"; + TRACE_LOG() << Q_FUNC_INFO << " END"; } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/EmergencyCalls/alm_emergency_call_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/EmergencyCalls/alm_emergency_call_model.cpp index d265ec7f4..a7695e7a6 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/EmergencyCalls/alm_emergency_call_model.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/EmergencyCalls/alm_emergency_call_model.cpp @@ -24,7 +24,6 @@ EmergencyCallModel::EmergencyCallModel(QObject *parent) tr("Comment"), }, parent) , m_dtc(nullptr) - , m_logger(getLogger("EmergencyCallModel")) {} QVariant EmergencyCallModel::data(const QModelIndex &index, int role) const diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/EmergencyCalls/alm_emergency_call_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/EmergencyCalls/alm_emergency_call_model.h index 364ac48e8..ff7fe601c 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/EmergencyCalls/alm_emergency_call_model.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/EmergencyCalls/alm_emergency_call_model.h @@ -42,8 +42,6 @@ private slots: private: std::shared_ptr m_dtc; std::shared_ptr m_opmDtc; - - LOGGER_T m_logger; friend class EmergencyCallProxyModel; }; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/AesInfo/aes_charge_effect_item_info.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/AesInfo/aes_charge_effect_item_info.cpp index d2989644e..af5530711 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/AesInfo/aes_charge_effect_item_info.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/AesInfo/aes_charge_effect_item_info.cpp @@ -27,7 +27,6 @@ namespace AreaEffectSimulation AesChargeEffectItemInfo::AesChargeEffectItemInfo(int chargeEffectId, QWidget *parent) : LtsWidgets::LtsDialog(parent, LtsWidgets::ButtonCombination::CloseOnly) - , m_logger(getLogger("AesChargeEffectItemInfo")) , m_session(nullptr) , m_ChargeEffectId(chargeEffectId) , m_ui(new Ui::AesChargeEffectItemInfo) @@ -52,13 +51,13 @@ bool AesChargeEffectItemInfo::init(LtsSession::LtsSession *session) if (!session->getDtc(m_pdmDtc)) { - ERROR_LOG(m_logger) << " failed to get pdmDtc"; + ERROR_LOG() << " failed to get pdmDtc"; return false; } if (!session->getDtc(m_aesDtc)) { - ERROR_LOG(m_logger) << " failed to get aesDtc"; + ERROR_LOG() << " failed to get aesDtc"; return false; } if (!m_aesDtc->isAesItemViewEnabled()) @@ -104,12 +103,12 @@ void AesChargeEffectItemInfo::retranslate() void AesChargeEffectItemInfo::onFindOnMap() const { - DEBUG_LOG(m_logger) << "onFindOnMap() aesId: "< ifc; if (m_session->getForeignGuiInterface(ifc)) ifc->centerMapToChargeEffectObject(m_ChargeEffectId); else - WARNING_LOG(m_logger) << LOGFUNCTION << "getForeignGuiInterface failed!"; + WARNING_LOG() << Q_FUNC_INFO << "getForeignGuiInterface failed!"; } template @@ -126,13 +125,13 @@ bool AesChargeEffectItemInfo::tryShowStandardEditDialog(const AesItemView& aiv) return true; } - WARNING_LOG(m_logger) << LOGFUNCTION << " getForeignGuiInterface failed for specific AES interface!"; + WARNING_LOG() << Q_FUNC_INFO << " getForeignGuiInterface failed for specific AES interface!"; return false; } void AesChargeEffectItemInfo::onShowDetails() { - DEBUG_LOG(m_logger) << LOGFUNCTION; + DEBUG_LOG() << Q_FUNC_INFO; const ChargeEffect item = m_aesDtc->chargeEffect(m_ChargeEffectId); @@ -140,7 +139,7 @@ void AesChargeEffectItemInfo::onShowDetails() { AesItemView aiv; m_aesDtc->aesItemViewFromEntityId(item.originatorId(), AreaEffectSimulation::AesType::AtUnknown, aiv); - DEBUG_LOG(m_logger) << "aiv.id():" << aiv.id() << ", aesType: " << aiv.aesTypeId(); + DEBUG_LOG() << "aiv.id():" << aiv.id() << ", aesType: " << aiv.aesTypeId(); auto registerDialog = [this](AreaEffectSimulation::BaseEdit* dialog) { @@ -201,7 +200,7 @@ void AesChargeEffectItemInfo::onShowDetails() registerDialog(ifc->showEditWindow(aiv.aesItemId(), true, this)); } else - WARNING_LOG(m_logger) << LOGFUNCTION << " getForeignGuiInterface failed!"; + WARNING_LOG() << Q_FUNC_INFO << " getForeignGuiInterface failed!"; break; } case AreaEffectSimulation::AesType::AtBoobyTrap: @@ -211,7 +210,7 @@ void AesChargeEffectItemInfo::onShowDetails() if (m_session->getForeignGuiInterface(ifc)) registerDialog(ifc->showBoobyTrapEditWindow(aiv.aesItemId(), this)); else - WARNING_LOG(m_logger) << LOGFUNCTION << " getForeignGuiInterface failed!"; + WARNING_LOG() << Q_FUNC_INFO << " getForeignGuiInterface failed!"; break; } case AreaEffectSimulation::AesType::AtOffRouteMine: @@ -221,7 +220,7 @@ void AesChargeEffectItemInfo::onShowDetails() if (m_session->getForeignGuiInterface(ifc)) registerDialog(ifc->showOffRouteMineEditWindow(aiv.aesItemId(), this)); else - WARNING_LOG(m_logger) << LOGFUNCTION << " getForeignGuiInterface failed!"; + WARNING_LOG() << Q_FUNC_INFO << " getForeignGuiInterface failed!"; break; } case AreaEffectSimulation::AesType::AtExplosionSingle: @@ -245,7 +244,7 @@ void AesChargeEffectItemInfo::onShowDetails() } } else - WARNING_LOG(m_logger) << LOGFUNCTION << " getForeignGuiInterface failed!"; + WARNING_LOG() << Q_FUNC_INFO << " getForeignGuiInterface failed!"; break; } @@ -261,7 +260,7 @@ void AesChargeEffectItemInfo::onShowDetails() registerDialog(ifc->showEditWindow(aiv.aesItemId(), ai.effectSourceId(), this)); } else - WARNING_LOG(m_logger) << LOGFUNCTION << " getForeignGuiInterface failed!"; + WARNING_LOG() << Q_FUNC_INFO << " getForeignGuiInterface failed!"; break; } @@ -284,10 +283,10 @@ void AesChargeEffectItemInfo::onShowDetails() break; case AreaEffectSimulation::AesType::AtUnknown: Q_ASSERT(false); - WARNING_LOG(m_logger) << "Unknown AesType found for aesEntityId: " << aiv.aesTypeId(); + WARNING_LOG() << "Unknown AesType found for aesEntityId: " << aiv.aesTypeId(); break; default: - DEBUG_LOG(m_logger) << "Couldn't find AesItem to ChargeEffect (any more). Hiding the button"; + DEBUG_LOG() << "Couldn't find AesItem to ChargeEffect (any more). Hiding the button"; m_ui->pbDetails->hide(); break; } @@ -303,13 +302,13 @@ void AesChargeEffectItemInfo::onShowDetails() addDialog(dialog, dialog->menuGroup(), dialog->dialogIdentifier(), LtsWidgets::LayoutArea::eDialogTab); } else - WARNING_LOG(m_logger) << LOGFUNCTION << " getForeignGuiInterface ChargeEffect failed!"; + WARNING_LOG() << Q_FUNC_INFO << " getForeignGuiInterface ChargeEffect failed!"; } } void AesChargeEffectItemInfo::onChargeEffectChanged(const ChargeEffect &data, DataModification modType) { - DEBUG_LOG(m_logger) << " [onChargeEffectChanged] id: " << data.id(); + DEBUG_LOG() << " [onChargeEffectChanged] id: " << data.id(); if (data.id() == m_ChargeEffectId && modType != DataModification::eRemoved) handleChargeEffect(data); } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/AesInfo/aes_danger_area_aes_item_info.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/AesInfo/aes_danger_area_aes_item_info.cpp index 88d6bac81..5a94b9f55 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/AesInfo/aes_danger_area_aes_item_info.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/AesInfo/aes_danger_area_aes_item_info.cpp @@ -22,7 +22,6 @@ namespace AreaEffectSimulation DangerAreaAesItemInfo::DangerAreaAesItemInfo(QWidget *parent) : LtsWidgets::LtsDialog(parent, LtsWidgets::ButtonCombination::CloseOnly) , m_dtc(nullptr) - , m_logger(getLogger("DangerArea.AesItemInfo")) , m_session(nullptr) , m_ui(new Ui::DangerAreaAesItemInfo) , m_aesItemId(-1) @@ -100,12 +99,12 @@ bool DangerAreaAesItemInfo::init(LtsSession::LtsSession *session) { if (m_session && session) { - ERROR_LOG(m_logger) << "double init()!"; + ERROR_LOG() << "double init()!"; return false; } if (!m_session && !session) { - ERROR_LOG(m_logger) << "No Session available!"; + ERROR_LOG() << "No Session available!"; return false; } if (!m_session) @@ -130,7 +129,7 @@ void DangerAreaAesItemInfo::insertAesItem(int aesItemId) } delete item; - WARNING_LOG(m_logger) << "AesItem with id " << aesItemId << " is not of any known type!"; + WARNING_LOG() << "AesItem with id " << aesItemId << " is not of any known type!"; } void DangerAreaAesItemInfo::setText() diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/AesInfo/aes_info_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/AesInfo/aes_info_dialog.cpp index a1db42da0..e73eabf04 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/AesInfo/aes_info_dialog.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/AesInfo/aes_info_dialog.cpp @@ -46,9 +46,8 @@ AesInfoDialog::AesInfoDialog(int aesEntityId, AesType aesType, QWidget *parent) , m_pdmDtc(nullptr) , m_ui(new Ui::AesInfoDialog) , m_requestHelper(new LtsUtils::RequestHelper(this)) - , m_logger(getLogger("AESInfoDialog")) { - DEBUG_LOG(m_logger) << "ctor AesInfoDialog() "; + DEBUG_LOG() << "ctor AesInfoDialog() "; m_ui->setupUi(this); m_ui->lblAesId->setText(QString::number(aesEntityId)); @@ -81,7 +80,7 @@ bool AesInfoDialog::cbFunc(const AreaEffectSimulation::AesItemView &aesItemView) if (aesItemView.aesItemId() != m_aesEntityId) return false; - DEBUG_LOG(m_logger) << "AesItemView found for aesEntityId: " << m_aesEntityId + DEBUG_LOG() << "AesItemView found for aesEntityId: " << m_aesEntityId << " AesItemView.aesTypeId(): " << aesItemView.aesTypeId(); if (aesItemView.aesTypeId() != m_aesType) @@ -95,7 +94,7 @@ bool AesInfoDialog::cbFunc(const AreaEffectSimulation::AesItemView &aesItemView) { handleNContamination(aesItemView); connect(m_dtc.get(), &AreaEffectSimulation::Interface::Dtc::nContaminationChanged, this, &AesInfoDialog::onNContaminationChanged); - DEBUG_LOG(m_logger) << "connect AreaEffectSimulation::Interface::Dtc::NContaminationChanged for aesEntityId: " << m_aesEntityId; + DEBUG_LOG() << "connect AreaEffectSimulation::Interface::Dtc::NContaminationChanged for aesEntityId: " << m_aesEntityId; setOnlineHelpFilename(QStringLiteral("Info_Dialog-N-Contamination")); break; } @@ -103,7 +102,7 @@ bool AesInfoDialog::cbFunc(const AreaEffectSimulation::AesItemView &aesItemView) { handleBCContamination(aesItemView); connect(m_dtc.get(), &AreaEffectSimulation::Interface::Dtc::bCContaminationChanged, this, &AesInfoDialog::onBCContaminationChanged); - DEBUG_LOG(m_logger) << "connect AreaEffectSimulation::Interface::Dtc::bCContaminationChanged for aesEntityId: " << m_aesEntityId; + DEBUG_LOG() << "connect AreaEffectSimulation::Interface::Dtc::bCContaminationChanged for aesEntityId: " << m_aesEntityId; setOnlineHelpFilename(QStringLiteral("Info_Dialog-C-Contamination")); break; } @@ -112,7 +111,7 @@ bool AesInfoDialog::cbFunc(const AreaEffectSimulation::AesItemView &aesItemView) { handleBoobyTrap(aesItemView); connect(m_dtc.get(), &AreaEffectSimulation::Interface::Dtc::boobyTrapChanged, this, &AesInfoDialog::onBoobyTrapChanged); - DEBUG_LOG(m_logger) << "connect AreaEffectSimulation::Interface::Dtc::boobyTrapChanged for aesEntityId: " << m_aesEntityId; + DEBUG_LOG() << "connect AreaEffectSimulation::Interface::Dtc::boobyTrapChanged for aesEntityId: " << m_aesEntityId; setOnlineHelpFilename(QStringLiteral("Info_Dialog-BoobyTrap")); break; } @@ -121,7 +120,7 @@ bool AesInfoDialog::cbFunc(const AreaEffectSimulation::AesItemView &aesItemView) { handleOffRouteMine(aesItemView); connect(m_dtc.get(), &AreaEffectSimulation::Interface::Dtc::offRouteMineChanged, this, &AesInfoDialog::onOffRouteMineChanged); - DEBUG_LOG(m_logger) << "connect AreaEffectSimulation::Interface::Dtc::offRouteMineChanged for aesEntityId: " << m_aesEntityId; + DEBUG_LOG() << "connect AreaEffectSimulation::Interface::Dtc::offRouteMineChanged for aesEntityId: " << m_aesEntityId; setOnlineHelpFilename(QStringLiteral("Info_Dialog-OffRouteMine")); break; } @@ -129,7 +128,7 @@ bool AesInfoDialog::cbFunc(const AreaEffectSimulation::AesItemView &aesItemView) { handleExplosionArea(aesItemView); connect(m_dtc.get(), &AreaEffectSimulation::Interface::Dtc::explosionAreaChanged, this, &AesInfoDialog::onExplosionAreaChanged); - DEBUG_LOG(m_logger) << "connect AreaEffectSimulation::Interface::Dtc::explosionAreaChanged for aesEntityId: " << m_aesEntityId; + DEBUG_LOG() << "connect AreaEffectSimulation::Interface::Dtc::explosionAreaChanged for aesEntityId: " << m_aesEntityId; setOnlineHelpFilename(QStringLiteral("Info_Dialog-Area_Artillery")); break; } @@ -137,7 +136,7 @@ bool AesInfoDialog::cbFunc(const AreaEffectSimulation::AesItemView &aesItemView) { handleExplosionSingle(aesItemView); connect(m_dtc.get(), &AreaEffectSimulation::Interface::Dtc::explosionSingleChanged, this, &AesInfoDialog::onExplosionSingleChanged); - DEBUG_LOG(m_logger) << "connect AreaEffectSimulation::Interface::Dtc::explosionSingleChanged for aesEntityId: " << m_aesEntityId; + DEBUG_LOG() << "connect AreaEffectSimulation::Interface::Dtc::explosionSingleChanged for aesEntityId: " << m_aesEntityId; setOnlineHelpFilename(QStringLiteral("Info_Dialog-Single_Artillery")); break; } @@ -145,7 +144,7 @@ bool AesInfoDialog::cbFunc(const AreaEffectSimulation::AesItemView &aesItemView) { handleMineArea(aesItemView); connect(m_dtc.get(), &AreaEffectSimulation::Interface::Dtc::mineAreaChanged, this, &AesInfoDialog::onMineAreaChanged); - DEBUG_LOG(m_logger) << "connect AreaEffectSimulation::Interface::Dtc::mineAreaChanged for aesEntityId: " << m_aesEntityId; + DEBUG_LOG() << "connect AreaEffectSimulation::Interface::Dtc::mineAreaChanged for aesEntityId: " << m_aesEntityId; setOnlineHelpFilename(QStringLiteral("Info_Dialog-Mine_Area")); break; } @@ -153,7 +152,7 @@ bool AesInfoDialog::cbFunc(const AreaEffectSimulation::AesItemView &aesItemView) { handleMineCorridor(aesItemView); connect(m_dtc.get(), &AreaEffectSimulation::Interface::Dtc::mineCorridorChanged, this, &AesInfoDialog::onMineCorridorChanged); - DEBUG_LOG(m_logger) << "connect AreaEffectSimulation::Interface::Dtc::mineCorridorChanged for aesEntityId: " << m_aesEntityId; + DEBUG_LOG() << "connect AreaEffectSimulation::Interface::Dtc::mineCorridorChanged for aesEntityId: " << m_aesEntityId; setOnlineHelpFilename(QStringLiteral("Info_Dialog-Mine_Corridor")); break; } @@ -161,7 +160,7 @@ bool AesInfoDialog::cbFunc(const AreaEffectSimulation::AesItemView &aesItemView) { handleGasPipe(aesItemView); connect(m_dtc.get(), &AreaEffectSimulation::Interface::Dtc::gasPipeChanged, this, &AesInfoDialog::onGasPipeChanged); - DEBUG_LOG(m_logger) << "connect AreaEffectSimulation::Interface::Dtc::gasPipeChanged for aesEntityId: " << m_aesEntityId; + DEBUG_LOG() << "connect AreaEffectSimulation::Interface::Dtc::gasPipeChanged for aesEntityId: " << m_aesEntityId; setOnlineHelpFilename(QStringLiteral("Info_Dialog-Gas_Pipeline")); break; } @@ -169,7 +168,7 @@ bool AesInfoDialog::cbFunc(const AreaEffectSimulation::AesItemView &aesItemView) { handleDangerArea(aesItemView); connect(m_dtc.get(), &AreaEffectSimulation::Interface::Dtc::dangerAreaChanged, this, &AesInfoDialog::onDangerAreaChanged); - DEBUG_LOG(m_logger) << "connect AreaEffectSimulation::Interface::Dtc::dangerAreaChanged for aesEntityId: " << m_aesEntityId; + DEBUG_LOG() << "connect AreaEffectSimulation::Interface::Dtc::dangerAreaChanged for aesEntityId: " << m_aesEntityId; setOnlineHelpFilename(QStringLiteral("Info_Dialog-Danger_Area")); break; } @@ -177,7 +176,7 @@ bool AesInfoDialog::cbFunc(const AreaEffectSimulation::AesItemView &aesItemView) { handleBorderline(aesItemView); connect(m_dtc.get(), &AreaEffectSimulation::Interface::Dtc::borderlineChanged, this, &AesInfoDialog::onBorderlineChanged); - DEBUG_LOG(m_logger) << "connect AreaEffectSimulation::Interface::Dtc::borderlineChanged for aesEntityId: " << m_aesEntityId; + DEBUG_LOG() << "connect AreaEffectSimulation::Interface::Dtc::borderlineChanged for aesEntityId: " << m_aesEntityId; setOnlineHelpFilename(QStringLiteral("Info_Dialog-Borderline")); @@ -197,7 +196,7 @@ bool AesInfoDialog::cbFunc(const AreaEffectSimulation::AesItemView &aesItemView) { handleFunctionalArea(aesItemView); connect(m_dtc.get(), &AreaEffectSimulation::Interface::Dtc::functionalAreaChanged, this, &AesInfoDialog::onFunctionalAreaChanged); - DEBUG_LOG(m_logger) << "connect AreaEffectSimulation::Interface::Dtc::functionalAreaChanged for aesEntityId: " << m_aesEntityId; + DEBUG_LOG() << "connect AreaEffectSimulation::Interface::Dtc::functionalAreaChanged for aesEntityId: " << m_aesEntityId; setOnlineHelpFilename(QStringLiteral("Info_Dialog-Functional_Area")); break; } @@ -205,7 +204,7 @@ bool AesInfoDialog::cbFunc(const AreaEffectSimulation::AesItemView &aesItemView) { handleAirSupportImpact(aesItemView); connect(m_dtc.get(), &AreaEffectSimulation::Interface::Dtc::airSupportImpactChanged, this, &AesInfoDialog::onAirSupportImpactChanged); - DEBUG_LOG(m_logger) << "connect AreaEffectSimulation::Interface::Dtc::airSupportImpactChanged for aesEntityId: " << m_aesEntityId; + DEBUG_LOG() << "connect AreaEffectSimulation::Interface::Dtc::airSupportImpactChanged for aesEntityId: " << m_aesEntityId; setOnlineHelpFilename(QStringLiteral("Info_Dialog-Aerial_Ordnance")); break; } @@ -213,7 +212,7 @@ bool AesInfoDialog::cbFunc(const AreaEffectSimulation::AesItemView &aesItemView) { handleExplosionCluster(aesItemView); connect(m_dtc.get(), &AreaEffectSimulation::Interface::Dtc::explosionClusterChanged, this, &AesInfoDialog::onExplosionClusterChanged); - DEBUG_LOG(m_logger) << "connect AreaEffectSimulation::Interface::Dtc::ExplosionCluster for aesEntityId: "<nContamination(m_aesEntityId)); @@ -318,7 +317,7 @@ void AesInfoDialog::handleNContamination(const AesItemView &aesItemView) void AesInfoDialog::handleNContamination(const AreaEffectSimulation::NContamination &data) { - DEBUG_LOG(m_logger) << LOGFUNCTION << "(AreaEffectSimulation::NContamination)" + DEBUG_LOG() << Q_FUNC_INFO << "(AreaEffectSimulation::NContamination)" << " data.id(): " << data.id(); handleAesItem(data, AesType::AtNContamination); @@ -332,7 +331,7 @@ void AesInfoDialog::handleNContamination(const AreaEffectSimulation::NContaminat void AesInfoDialog::handleBCContamination(const AesItemView &aesItemView) { - DEBUG_LOG(m_logger) << LOGFUNCTION << "(AesItemView)" + DEBUG_LOG() << Q_FUNC_INFO << "(AesItemView)" << " aesItemView.aesItemId(): " << aesItemView.aesItemId(); handleBCContamination(m_dtc->bCContamination(m_aesEntityId)); @@ -341,7 +340,7 @@ void AesInfoDialog::handleBCContamination(const AesItemView &aesItemView) void AesInfoDialog::handleBCContamination(const AreaEffectSimulation::BCContamination &data) { - DEBUG_LOG(m_logger) << LOGFUNCTION << "(AreaEffectSimulation::BCContamination)" + DEBUG_LOG() << Q_FUNC_INFO << "(AreaEffectSimulation::BCContamination)" << " data.id(): " << data.id(); handleAesItem(data, AesType::AtBCContamination); @@ -357,7 +356,7 @@ void AesInfoDialog::handleBCContamination(const AreaEffectSimulation::BCContamin void AesInfoDialog::handleBoobyTrap(const AesItemView &aesItemView) { - DEBUG_LOG(m_logger) << LOGFUNCTION << "(AesItemView)" + DEBUG_LOG() << Q_FUNC_INFO << "(AesItemView)" << " aesItemView.aesItemId(): " << aesItemView.aesItemId(); handleBoobyTrap(m_dtc->boobyTrap(m_aesEntityId)); @@ -366,7 +365,7 @@ void AesInfoDialog::handleBoobyTrap(const AesItemView &aesItemView) void AesInfoDialog::handleBoobyTrap(const AreaEffectSimulation::BoobyTrap &data) { - DEBUG_LOG(m_logger) << LOGFUNCTION << "(AreaEffectSimulation::BoobyTrap)" + DEBUG_LOG() << Q_FUNC_INFO << "(AreaEffectSimulation::BoobyTrap)" << " data.id(): " << data.id(); handleAesItem(data, AesType_def::AtBoobyTrap); @@ -387,7 +386,7 @@ void AesInfoDialog::handleBoobyTrap(const AreaEffectSimulation::BoobyTrap &data) void AesInfoDialog::handleOffRouteMine(const AesItemView &aesItemView) { - DEBUG_LOG(m_logger) << LOGFUNCTION << "(AesItemView)" + DEBUG_LOG() << Q_FUNC_INFO << "(AesItemView)" << " aesItemView.aesItemId(): " << aesItemView.aesItemId(); handleOffRouteMine(m_dtc->offRouteMine(m_aesEntityId)); @@ -396,7 +395,7 @@ void AesInfoDialog::handleOffRouteMine(const AesItemView &aesItemView) void AesInfoDialog::handleOffRouteMine(const AreaEffectSimulation::OffRouteMine &data) { - DEBUG_LOG(m_logger) << LOGFUNCTION << "(AreaEffectSimulation::OffRouteMine)" + DEBUG_LOG() << Q_FUNC_INFO << "(AreaEffectSimulation::OffRouteMine)" << " data.id(): " << data.id(); handleAesItem(data, AesType_def::AtOffRouteMine); @@ -417,7 +416,7 @@ void AesInfoDialog::handleOffRouteMine(const AreaEffectSimulation::OffRouteMine void AesInfoDialog::handleExplosionArea(const AesItemView &aesItemView) { - DEBUG_LOG(m_logger) << LOGFUNCTION << "(AesItemView)" + DEBUG_LOG() << Q_FUNC_INFO << "(AesItemView)" << " aesItemView.aesItemId(): " << aesItemView.aesItemId(); handleExplosionArea(m_dtc->explosionArea(m_aesEntityId)); @@ -426,7 +425,7 @@ void AesInfoDialog::handleExplosionArea(const AesItemView &aesItemView) void AesInfoDialog::handleExplosionArea(const AreaEffectSimulation::ExplosionArea &data) { - DEBUG_LOG(m_logger) << LOGFUNCTION << "(AreaEffectSimulation::ExplosionArea)" + DEBUG_LOG() << Q_FUNC_INFO << "(AreaEffectSimulation::ExplosionArea)" << " data.id(): " << data.id(); handleAesItem(data, AesType::AtExplosionArea); @@ -449,7 +448,7 @@ void AesInfoDialog::handleExplosionArea(const AreaEffectSimulation::ExplosionAre void AesInfoDialog::handleExplosionSingle(const AesItemView &aesItemView) { - DEBUG_LOG(m_logger) << LOGFUNCTION << "(AesItemView)" + DEBUG_LOG() << Q_FUNC_INFO << "(AesItemView)" << " aesItemView.aesItemId(): " << aesItemView.aesItemId(); handleExplosionSingle(m_dtc->explosionSingle(m_aesEntityId)); } @@ -457,7 +456,7 @@ void AesInfoDialog::handleExplosionSingle(const AesItemView &aesItemView) void AesInfoDialog::handleExplosionSingle(const AreaEffectSimulation::ExplosionSingle &data) { - DEBUG_LOG(m_logger) << LOGFUNCTION << "(AreaEffectSimulation::ExplosionSingle)" + DEBUG_LOG() << Q_FUNC_INFO << "(AreaEffectSimulation::ExplosionSingle)" << " data.id(): " << data.id(); handleAesItem(data, AesType::AtExplosionSingle); @@ -473,7 +472,7 @@ void AesInfoDialog::handleExplosionSingle(const AreaEffectSimulation::ExplosionS void AesInfoDialog::handleMineArea(const AesItemView &aesItemView) { - DEBUG_LOG(m_logger) << LOGFUNCTION << "(AesItemView)" + DEBUG_LOG() << Q_FUNC_INFO << "(AesItemView)" << " aesItemView.aesItemId(): " << aesItemView.aesItemId(); handleMineArea(m_dtc->mineArea(m_aesEntityId)); } @@ -481,7 +480,7 @@ void AesInfoDialog::handleMineArea(const AesItemView &aesItemView) void AesInfoDialog::handleMineArea(const AreaEffectSimulation::MineArea &data) { - DEBUG_LOG(m_logger) << LOGFUNCTION << "(AreaEffectSimulation::MineArea)" + DEBUG_LOG() << Q_FUNC_INFO << "(AreaEffectSimulation::MineArea)" << " data.id(): " << data.id(); handleAesItem(data, AesType::AtMineArea); @@ -505,7 +504,7 @@ void AesInfoDialog::handleMineArea(const AreaEffectSimulation::MineArea &data) void AesInfoDialog::handleMineCorridor(const AesItemView &aesItemView) { - DEBUG_LOG(m_logger) << LOGFUNCTION << "(AesItemView)" + DEBUG_LOG() << Q_FUNC_INFO << "(AesItemView)" << " aesItemView.aesItemId(): " << aesItemView.aesItemId(); handleMineCorridor(m_dtc->mineCorridor(m_aesEntityId)); } @@ -513,7 +512,7 @@ void AesInfoDialog::handleMineCorridor(const AesItemView &aesItemView) void AesInfoDialog::handleMineCorridor(const AreaEffectSimulation::MineCorridor &data) { - DEBUG_LOG(m_logger) << LOGFUNCTION << "(AreaEffectSimulation::MineArea)" + DEBUG_LOG() << Q_FUNC_INFO << "(AreaEffectSimulation::MineArea)" << " data.id(): " << data.id(); handleAesItem(data, AesType::AtMineCorridor); @@ -531,7 +530,7 @@ void AesInfoDialog::handleMineCorridor(const AreaEffectSimulation::MineCorridor void AesInfoDialog::handleGasPipe(const AesItemView &aesItemView) { - DEBUG_LOG(m_logger) << LOGFUNCTION << "(AesItemView)" + DEBUG_LOG() << Q_FUNC_INFO << "(AesItemView)" << " handleGasPipe: aesItemView.aesItemId(): " << aesItemView.aesItemId(); handleGasPipe(m_dtc->gasPipe(m_aesEntityId)); } @@ -539,7 +538,7 @@ void AesInfoDialog::handleGasPipe(const AesItemView &aesItemView) void AesInfoDialog::handleGasPipe(const AreaEffectSimulation::GasPipe &data) { - DEBUG_LOG(m_logger) << LOGFUNCTION << "(AreaEffectSimulation::GasPipe)" + DEBUG_LOG() << Q_FUNC_INFO << "(AreaEffectSimulation::GasPipe)" << " data.id(): " << data.id(); handleAesItem(data, AesType::AtGasPipe); @@ -556,7 +555,7 @@ void AesInfoDialog::handleGasPipe(const AreaEffectSimulation::GasPipe &data) void AesInfoDialog::handleDangerArea(const AesItemView &aesItemView) { - DEBUG_LOG(m_logger) << LOGFUNCTION << "(AesItemView)" + DEBUG_LOG() << Q_FUNC_INFO << "(AesItemView)" << " aesItemView.aesItemId(): " << aesItemView.aesItemId(); handleDangerArea(m_dtc->dangerArea(m_aesEntityId)); } @@ -564,7 +563,7 @@ void AesInfoDialog::handleDangerArea(const AesItemView &aesItemView) void AesInfoDialog::handleDangerArea(const AreaEffectSimulation::DangerArea &data) { - DEBUG_LOG(m_logger) << LOGFUNCTION << "(AreaEffectSimulation::DangerArea)" + DEBUG_LOG() << Q_FUNC_INFO << "(AreaEffectSimulation::DangerArea)" << " data.id(): " << data.id(); handleAesItem(data, AesType::AtDangerArea); @@ -587,7 +586,7 @@ void AesInfoDialog::handleDangerArea(const AreaEffectSimulation::DangerArea &dat void AesInfoDialog::handleBorderline(const AesItemView &aesItemView) { - DEBUG_LOG(m_logger) << LOGFUNCTION << "(AesItemView)" + DEBUG_LOG() << Q_FUNC_INFO << "(AesItemView)" << " aesItemView.aesItemId(): " << aesItemView.aesItemId(); handleBorderline(m_dtc->borderline(m_aesEntityId)); } @@ -595,7 +594,7 @@ void AesInfoDialog::handleBorderline(const AesItemView &aesItemView) void AesInfoDialog::handleBorderline(const AreaEffectSimulation::Borderline &data) { - DEBUG_LOG(m_logger) << LOGFUNCTION << "(AreaEffectSimulation::Borderline)" + DEBUG_LOG() << Q_FUNC_INFO << "(AreaEffectSimulation::Borderline)" << " data.id(): " << data.id(); handleAesItem(data, AesType::AtBorderline); @@ -615,7 +614,7 @@ void AesInfoDialog::handleBorderline(const AreaEffectSimulation::Borderline &dat void AesInfoDialog::handleFunctionalArea(const AesItemView &aesItemView) { - DEBUG_LOG(m_logger) << LOGFUNCTION << "(AesItemView)" + DEBUG_LOG() << Q_FUNC_INFO << "(AesItemView)" << " aesItemView.aesItemId(): " << aesItemView.aesItemId(); handleFunctionalArea(m_dtc->functionalArea(m_aesEntityId)); } @@ -624,7 +623,7 @@ void AesInfoDialog::handleFunctionalArea(const AesItemView &aesItemView) void AesInfoDialog::handleFunctionalArea(const FunctionalArea &data) { - DEBUG_LOG(m_logger) << LOGFUNCTION << "(AreaEffectSimulation::FunctionalArea)" + DEBUG_LOG() << Q_FUNC_INFO << "(AreaEffectSimulation::FunctionalArea)" << " data.id(): " << data.id(); handleAesItem(data, AesType::AtFunctionalArea); @@ -662,7 +661,7 @@ void AesInfoDialog::handleFunctionalArea(const FunctionalArea &data) void AesInfoDialog::handleAirSupportImpact(const AesItemView &aesItemView) { - DEBUG_LOG(m_logger) << LOGFUNCTION << "(AesItemView)" + DEBUG_LOG() << Q_FUNC_INFO << "(AesItemView)" << " aesItemView.aesItemId(): " << aesItemView.aesItemId(); handleAirSupportImpact(m_dtc->airSupportImpact(m_aesEntityId)); } @@ -671,7 +670,7 @@ void AesInfoDialog::handleAirSupportImpact(const AesItemView &aesItemView) void AesInfoDialog::handleAirSupportImpact(const AirSupportImpact &data) { - DEBUG_LOG(m_logger) << LOGFUNCTION << "(AreaEffectSimulation::FunctionalArea)" + DEBUG_LOG() << Q_FUNC_INFO << "(AreaEffectSimulation::FunctionalArea)" << " data.id(): " << data.id(); handleAesItem(data, AesType::AtAirSupportImpact); @@ -862,14 +861,14 @@ void AesInfoDialog::handleSingleDusMine() void AesInfoDialog::handleExplosionCluster(const AesItemView &aesItemView) { - DEBUG_LOG(m_logger) << LOGFUNCTION << "(AesItemView)" + DEBUG_LOG() << Q_FUNC_INFO << "(AesItemView)" << " aesItemView.aesItemId(): " << aesItemView.aesItemId(); handleExplosionCluster(m_dtc->explosionCluster(m_aesEntityId)); } void AesInfoDialog::handleExplosionCluster(const ExplosionCluster &data) { - DEBUG_LOG(m_logger) << LOGFUNCTION << "(AreaEffectSimulation::ExplosionCluster)" + DEBUG_LOG() << Q_FUNC_INFO << "(AreaEffectSimulation::ExplosionCluster)" << " data.id(): " << data.id(); handleAesItem(data, AesType::AtExplosionCluster); @@ -883,14 +882,14 @@ void AesInfoDialog::handleExplosionCluster(const ExplosionCluster &data) void AesInfoDialog::handleEffectCluster(const AesItemView &aesItemView) { - DEBUG_LOG(m_logger) << LOGFUNCTION << "(AesItemView)" + DEBUG_LOG() << Q_FUNC_INFO << "(AesItemView)" << " aesItemView.aesItemId(): " << aesItemView.aesItemId(); handleEffectCluster(m_dtc->effectCluster(m_aesEntityId)); } void AesInfoDialog::handleEffectCluster(const EffectCluster &data) { - DEBUG_LOG(m_logger) << LOGFUNCTION << "(AreaEffectSimulation::EffectCluster)" + DEBUG_LOG() << Q_FUNC_INFO << "(AreaEffectSimulation::EffectCluster)" << " data.id(): " << data.id(); handleAesItem(data, AesType::AtEffectCluster); @@ -955,18 +954,18 @@ void AesInfoDialog::handleAesItem(const AesItem &aesData, AesType aesTypeId) void AesInfoDialog::onFindOnMap() { - DEBUG_LOG(m_logger) << "onFindOnMap()"; + DEBUG_LOG() << "onFindOnMap()"; std::shared_ptr ifc; if (m_session->getForeignGuiInterface(ifc)) ifc->centerMapToAesObject(m_aesEntityId); else - WARNING_LOG(m_logger) << LOGFUNCTION << "getForeignGuiInterface failed!"; + WARNING_LOG() << Q_FUNC_INFO << "getForeignGuiInterface failed!"; } void AesInfoDialog::onShowDetails() { - DEBUG_LOG(m_logger) << LOGFUNCTION; + DEBUG_LOG() << Q_FUNC_INFO; switch (m_aesType.underlying()) { @@ -980,7 +979,7 @@ void AesInfoDialog::onShowDetails() addDialog(dialog, dialog->menuGroup(), dialog->dialogIdentifier(), LtsWidgets::LayoutArea::eDialogTab); } else - WARNING_LOG(m_logger) << LOGFUNCTION << " getForeignGuiInterface failed!"; + WARNING_LOG() << Q_FUNC_INFO << " getForeignGuiInterface failed!"; break; } case AreaEffectSimulation::AesType::AtBCContamination: @@ -1006,7 +1005,7 @@ void AesInfoDialog::onShowDetails() } } else - WARNING_LOG(m_logger) << LOGFUNCTION << " getForeignGuiInterface failed!"; + WARNING_LOG() << Q_FUNC_INFO << " getForeignGuiInterface failed!"; break; } case AreaEffectSimulation::AesType::AtBoobyTrap: @@ -1021,7 +1020,7 @@ void AesInfoDialog::onShowDetails() break; } else - WARNING_LOG(m_logger) << LOGFUNCTION << " getForeignGuiInterface failed!"; + WARNING_LOG() << Q_FUNC_INFO << " getForeignGuiInterface failed!"; break; } case AreaEffectSimulation::AesType::AtOffRouteMine: @@ -1036,7 +1035,7 @@ void AesInfoDialog::onShowDetails() break; } else - WARNING_LOG(m_logger) << LOGFUNCTION << " getForeignGuiInterface failed!"; + WARNING_LOG() << Q_FUNC_INFO << " getForeignGuiInterface failed!"; break; } case AreaEffectSimulation::AesType::AtExplosionSingle: @@ -1059,7 +1058,7 @@ void AesInfoDialog::onShowDetails() break; } else - WARNING_LOG(m_logger) << LOGFUNCTION << " getForeignGuiInterface failed!"; + WARNING_LOG() << Q_FUNC_INFO << " getForeignGuiInterface failed!"; break; } case AreaEffectSimulation::AesType::AtExplosionArea: @@ -1081,7 +1080,7 @@ void AesInfoDialog::onShowDetails() } } else - WARNING_LOG(m_logger) << LOGFUNCTION << " getForeignGuiInterface failed!"; + WARNING_LOG() << Q_FUNC_INFO << " getForeignGuiInterface failed!"; break; } case AreaEffectSimulation::AesType::AtExplosionCluster: @@ -1096,7 +1095,7 @@ void AesInfoDialog::onShowDetails() break; } else - WARNING_LOG(m_logger) << LOGFUNCTION << " getForeignGuiInterface failed!"; + WARNING_LOG() << Q_FUNC_INFO << " getForeignGuiInterface failed!"; break; } case AreaEffectSimulation::AesType::AtMineArea: @@ -1109,7 +1108,7 @@ void AesInfoDialog::onShowDetails() addDialog(dialog, dialog->menuGroup(), dialog->dialogIdentifier(), LtsWidgets::LayoutArea::eDialogTab); } else - WARNING_LOG(m_logger) << LOGFUNCTION << " getForeignGuiInterface failed!"; + WARNING_LOG() << Q_FUNC_INFO << " getForeignGuiInterface failed!"; break; } case AreaEffectSimulation::AesType::AtMineCorridor: @@ -1122,7 +1121,7 @@ void AesInfoDialog::onShowDetails() addDialog(dialog, dialog->menuGroup(), dialog->dialogIdentifier(), LtsWidgets::LayoutArea::eDialogTab); } else - WARNING_LOG(m_logger) << LOGFUNCTION << " getForeignGuiInterface failed!"; + WARNING_LOG() << Q_FUNC_INFO << " getForeignGuiInterface failed!"; break; } case AreaEffectSimulation::AesType::AtGasPipe: @@ -1135,7 +1134,7 @@ void AesInfoDialog::onShowDetails() addDialog(dialog, dialog->menuGroup(), dialog->dialogIdentifier(), LtsWidgets::LayoutArea::eDialogTab); } else - WARNING_LOG(m_logger) << LOGFUNCTION << " getForeignGuiInterface failed!"; + WARNING_LOG() << Q_FUNC_INFO << " getForeignGuiInterface failed!"; break; } case AreaEffectSimulation::AesType::AtDangerArea: @@ -1148,7 +1147,7 @@ void AesInfoDialog::onShowDetails() addDialog(dialog, dialog->menuGroup(), dialog->dialogIdentifier(), LtsWidgets::LayoutArea::eDialogTab); } else - WARNING_LOG(m_logger) << LOGFUNCTION << " getForeignGuiInterface failed!"; + WARNING_LOG() << Q_FUNC_INFO << " getForeignGuiInterface failed!"; break; } case AreaEffectSimulation::AesType::AtBorderline: @@ -1161,7 +1160,7 @@ void AesInfoDialog::onShowDetails() addDialog(dialog, dialog->menuGroup(), dialog->dialogIdentifier(), LtsWidgets::LayoutArea::eDialogTab); } else - WARNING_LOG(m_logger) << LOGFUNCTION << " getForeignGuiInterface failed!"; + WARNING_LOG() << Q_FUNC_INFO << " getForeignGuiInterface failed!"; break; } case AreaEffectSimulation::AesType::AtFunctionalArea: @@ -1174,7 +1173,7 @@ void AesInfoDialog::onShowDetails() addDialog(dialog, dialog->menuGroup(), dialog->dialogIdentifier(), LtsWidgets::LayoutArea::eDialogTab); } else - WARNING_LOG(m_logger) << LOGFUNCTION << " getForeignGuiInterface failed!"; + WARNING_LOG() << Q_FUNC_INFO << " getForeignGuiInterface failed!"; break; } case AreaEffectSimulation::AesType::AtAirSupportImpact: @@ -1192,7 +1191,7 @@ void AesInfoDialog::onShowDetails() break; case AreaEffectSimulation::AesType::AtUnknown: Q_ASSERT(false); - WARNING_LOG(m_logger) << "Unknown AesType found for aesEntityId: " << m_aesEntityId; + WARNING_LOG() << "Unknown AesType found for aesEntityId: " << m_aesEntityId; break; default: break; @@ -1205,7 +1204,7 @@ bool AesInfoDialog::onResetDusMines() { if (m_aesType == AreaEffectSimulation::AesType_def::AtMineAreaSingleMines) { - DEBUG_LOG(m_logger) << "onResetDusMines() AtMineAreaSingleMines mineId: " << m_aesEntityId; + DEBUG_LOG() << "onResetDusMines() AtMineAreaSingleMines mineId: " << m_aesEntityId; MineResetRequest req(0, {m_aesEntityId}); return m_requestHelper->startSingleRequest([req, this]() @@ -1226,7 +1225,7 @@ bool AesInfoDialog::onResetDusMines() void AesInfoDialog::onNContaminationChanged(const AreaEffectSimulation::NContamination &data, DataModification modType) { - DEBUG_LOG(m_logger) << LOGFUNCTION << " id: " << data.id(); + DEBUG_LOG() << Q_FUNC_INFO << " id: " << data.id(); if (data.id() == m_aesEntityId && modType != DataModification::eRemoved) handleNContamination(data); } @@ -1234,7 +1233,7 @@ void AesInfoDialog::onNContaminationChanged(const AreaEffectSimulation::NContami void AesInfoDialog::onBCContaminationChanged(const AreaEffectSimulation::BCContamination &data, DataModification modType) { - DEBUG_LOG(m_logger) << LOGFUNCTION << " id: " << data.id(); + DEBUG_LOG() << Q_FUNC_INFO << " id: " << data.id(); if (data.id() == m_aesEntityId && modType != DataModification::eRemoved) handleBCContamination(data); } @@ -1242,7 +1241,7 @@ void AesInfoDialog::onBCContaminationChanged(const AreaEffectSimulation::BCConta void AesInfoDialog::onBoobyTrapChanged(const AreaEffectSimulation::BoobyTrap &data, DataModification modType) { - DEBUG_LOG(m_logger) << LOGFUNCTION << " id: " << data.id(); + DEBUG_LOG() << Q_FUNC_INFO << " id: " << data.id(); if (data.id() == m_aesEntityId && modType != DataModification::eRemoved) handleBoobyTrap(data); } @@ -1250,7 +1249,7 @@ void AesInfoDialog::onBoobyTrapChanged(const AreaEffectSimulation::BoobyTrap &da void AesInfoDialog::onOffRouteMineChanged(const AreaEffectSimulation::OffRouteMine &data, DataModification modType) { - DEBUG_LOG(m_logger) << LOGFUNCTION << " id: " << data.id(); + DEBUG_LOG() << Q_FUNC_INFO << " id: " << data.id(); if (data.id() == m_aesEntityId && modType != DataModification::eRemoved) handleOffRouteMine(data); } @@ -1258,7 +1257,7 @@ void AesInfoDialog::onOffRouteMineChanged(const AreaEffectSimulation::OffRouteMi void AesInfoDialog::onExplosionAreaChanged(const AreaEffectSimulation::ExplosionArea &data, DataModification modType) { - DEBUG_LOG(m_logger) << LOGFUNCTION << " id: " << data.id(); + DEBUG_LOG() << Q_FUNC_INFO << " id: " << data.id(); if (data.id() == m_aesEntityId && modType != DataModification::eRemoved) handleExplosionArea(data); } @@ -1266,7 +1265,7 @@ void AesInfoDialog::onExplosionAreaChanged(const AreaEffectSimulation::Explosion void AesInfoDialog::onExplosionSingleChanged(const AreaEffectSimulation::ExplosionSingle &data, DataModification modType) { - DEBUG_LOG(m_logger) << LOGFUNCTION << " id: " << data.id(); + DEBUG_LOG() << Q_FUNC_INFO << " id: " << data.id(); if (data.id() == m_aesEntityId && modType != DataModification::eRemoved) handleExplosionSingle(data); } @@ -1274,7 +1273,7 @@ void AesInfoDialog::onExplosionSingleChanged(const AreaEffectSimulation::Explosi void AesInfoDialog::onMineAreaChanged(const AreaEffectSimulation::MineArea &data, DataModification modType) { - DEBUG_LOG(m_logger) << LOGFUNCTION << " id: " << data.id(); + DEBUG_LOG() << Q_FUNC_INFO << " id: " << data.id(); if (data.id() == m_aesEntityId && modType != DataModification::eRemoved) handleMineArea(data); } @@ -1282,7 +1281,7 @@ void AesInfoDialog::onMineAreaChanged(const AreaEffectSimulation::MineArea &data void AesInfoDialog::onMineCorridorChanged(const MineCorridor &data, DataModification modType) { - DEBUG_LOG(m_logger) << LOGFUNCTION << " id: " << data.id(); + DEBUG_LOG() << Q_FUNC_INFO << " id: " << data.id(); if (data.id() == m_aesEntityId && modType != DataModification::eRemoved) handleMineCorridor(data); } @@ -1290,7 +1289,7 @@ void AesInfoDialog::onMineCorridorChanged(const MineCorridor &data, DataModifica void AesInfoDialog::onGasPipeChanged(const GasPipe &data, DataModification modType) { - DEBUG_LOG(m_logger) << LOGFUNCTION << " id: " << data.id(); + DEBUG_LOG() << Q_FUNC_INFO << " id: " << data.id(); if (data.id() == m_aesEntityId && modType != DataModification::eRemoved) handleGasPipe(data); } @@ -1298,7 +1297,7 @@ void AesInfoDialog::onGasPipeChanged(const GasPipe &data, DataModification modTy void AesInfoDialog::onDangerAreaChanged(const AreaEffectSimulation::DangerArea &data, DataModification modType) { - DEBUG_LOG(m_logger) << LOGFUNCTION << " id: " << data.id(); + DEBUG_LOG() << Q_FUNC_INFO << " id: " << data.id(); if (data.id() == m_aesEntityId && modType != DataModification::eRemoved) handleDangerArea(data); } @@ -1306,7 +1305,7 @@ void AesInfoDialog::onDangerAreaChanged(const AreaEffectSimulation::DangerArea & void AesInfoDialog::onBorderlineChanged(const AreaEffectSimulation::Borderline &data, DataModification modType) { - DEBUG_LOG(m_logger) << LOGFUNCTION << " id: " << data.id(); + DEBUG_LOG() << Q_FUNC_INFO << " id: " << data.id(); if (data.id() == m_aesEntityId && modType != DataModification::eRemoved) handleBorderline(data); } @@ -1314,7 +1313,7 @@ void AesInfoDialog::onBorderlineChanged(const AreaEffectSimulation::Borderline & void AesInfoDialog::onFunctionalAreaChanged(const FunctionalArea &data, DataModification modType) { - DEBUG_LOG(m_logger) << LOGFUNCTION << " id: " << data.id(); + DEBUG_LOG() << Q_FUNC_INFO << " id: " << data.id(); if (data.id() == m_aesEntityId && modType != DataModification::eRemoved) handleFunctionalArea(data); } @@ -1322,7 +1321,7 @@ void AesInfoDialog::onFunctionalAreaChanged(const FunctionalArea &data, DataModi void AesInfoDialog::onAirSupportImpactChanged(const AirSupportImpact &data, DataModification modType) { - DEBUG_LOG(m_logger) << LOGFUNCTION << " id: " << data.id(); + DEBUG_LOG() << Q_FUNC_INFO << " id: " << data.id(); if (data.id() == m_aesEntityId && modType != DataModification::eRemoved) handleAirSupportImpact(data); } @@ -1330,7 +1329,7 @@ void AesInfoDialog::onAirSupportImpactChanged(const AirSupportImpact &data, Data void AesInfoDialog::onDusMineStateChanged(const DusMineState &data, DataModification modType) { - DEBUG_LOG(m_logger) << LOGFUNCTION << " id: " << data.id(); + DEBUG_LOG() << Q_FUNC_INFO << " id: " << data.id(); if (modType == DataModification::eRemoved) return; @@ -1357,7 +1356,7 @@ void AesInfoDialog::onDusMineStateChanged(const DusMineState &data, DataModifica void AesInfoDialog::onDusSingleMineChanged(const DusSingleMine &data, DataModification modType) { - DEBUG_LOG(m_logger) << LOGFUNCTION << " id: " << data.id(); + DEBUG_LOG() << Q_FUNC_INFO << " id: " << data.id(); if (data.id() == m_aesEntityId && modType != DataModification::eRemoved) handleSingleDusMine(); } @@ -1365,14 +1364,14 @@ void AesInfoDialog::onDusSingleMineChanged(const DusSingleMine &data, DataModifi void AesInfoDialog::onExplosionClusterChanged(const ExplosionCluster &data, DataModification modType) { - DEBUG_LOG(m_logger) << LOGFUNCTION << " id: " << data.id(); + DEBUG_LOG() << Q_FUNC_INFO << " id: " << data.id(); if (data.id() == m_aesEntityId && modType != DataModification::eRemoved) handleExplosionCluster(data); } void AesInfoDialog::onEffectClusterChanged(const EffectCluster &data, DataModification modType) { - DEBUG_LOG(m_logger) << LOGFUNCTION << " id: " << data.id(); + DEBUG_LOG() << Q_FUNC_INFO << " id: " << data.id(); if (data.id() == m_aesEntityId && modType != DataModification::eRemoved) handleEffectCluster(data); } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/AesInfo/aes_info_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/AesInfo/aes_info_dialog.h index 8af7a5ac9..0d8e4882d 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/AesInfo/aes_info_dialog.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/AesInfo/aes_info_dialog.h @@ -125,6 +125,5 @@ private: Ui::AesInfoDialog* m_ui; LtsUtils::RequestHelper *m_requestHelper; - LOGGER_T m_logger; }; } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Base/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Base/CMakeLists.txt index a680e406f..09b6e2ffb 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Base/CMakeLists.txt +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Base/CMakeLists.txt @@ -27,7 +27,7 @@ NGL_WRAP_UI(aes_base_gui_SRCS InfoView/aes_base_info.ui ) -NGL_ADD_LIBRARY(WS AesBaseGui SHARED ${aes_base_gui_SRCS}) +NGL_ADD_LIBRARY2(WS AesBaseGui SHARED ${aes_base_gui_SRCS}) NGL_TARGET_LINK_LIBRARIES(AesBaseGui PRIVATE ExmDataPluginInterface diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Base/aes_base_edit.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Base/aes_base_edit.cpp index 75051c188..fa0c6bda6 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Base/aes_base_edit.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Base/aes_base_edit.cpp @@ -297,7 +297,7 @@ bool BaseEdit::init(int aesItemId, LtsSession::LtsSession *session) { if (m_session) { - ERROR_LOG(m_logger) << "double init()!"; + ERROR_LOG() << "double init()!"; return false; } m_session = session; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Base/aes_base_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Base/aes_base_model.cpp index 122dfdcb7..8038dfd03 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Base/aes_base_model.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Base/aes_base_model.cpp @@ -25,14 +25,13 @@ AesGuiBasHelpers::AesGuiBasHelpers() : m_aesDtc(nullptr) , m_pdmDtc(nullptr) , m_ppmDtc(nullptr) - , m_logger(getLogger("AesGuiBase")) {} bool AesGuiBasHelpers::initModel(LtsSession::LtsSession *session) { if (m_aesDtc) { - ERROR_LOG(m_logger) << "double init()!"; + ERROR_LOG() << "double init()!"; return false; } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Base/aes_itemlist.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Base/aes_itemlist.cpp index eb5b77a87..c68f02d41 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Base/aes_itemlist.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Base/aes_itemlist.cpp @@ -35,7 +35,6 @@ AesItemList::AesItemList(const QString &menuGroup, QWidget *parent) , m_bHasAddAdlerOperatorRights(false) , m_session(nullptr) , m_ui(new Ui::AesItemList) - , m_logger(getLogger("AesItemList")) { m_ui->setupUi(this); @@ -51,7 +50,7 @@ bool AesItemList::init(LtsSession::LtsSession *session) { if (m_session) { - ERROR_LOG(m_logger) << "double init()!"; + ERROR_LOG() << "double init()!"; return false; } m_session = session; @@ -171,7 +170,7 @@ void AesItemList::onAdlerBtn() AesEffectState aesEffectState = model()->aesEffectStateId(currentRow()); ProjectDataManagement::EffectSource effectSource = model()->aesEffectSourceId(currentRow()); - DEBUG_LOG(m_logger) << "onAdlerBtn aesEffectState=" << aesEffectState; + DEBUG_LOG() << "onAdlerBtn aesEffectState=" << aesEffectState; switch (aesEffectState.underlying()) { @@ -209,7 +208,7 @@ void AesItemList::onAdlerBtn() AreaEffectSimulation::SetAesItemEffectorStateRequest req; req.aesId(model()->aesId(currentRow())); req.newEffectorState(AesEffectorState::EsReadyToFire); - DEBUG_LOG(m_logger) << "Send setAesItemEffectorStateRequest with aesId: " << req.aesId() << ", AesEffectorState: " << req.newEffectorState(); + DEBUG_LOG() << "Send setAesItemEffectorStateRequest with aesId: " << req.aesId() << ", AesEffectorState: " << req.newEffectorState(); m_requestHelper->startSingleRequest([req, this]() { return m_ftc->setAesItemEffectorStateRequest(req, this); }); } @@ -224,7 +223,7 @@ void AesItemList::onAdlerBtn() void AesItemList::onHandleAdler() { AesEffectState aesEffectState = model()->aesEffectStateId(currentRow()); - DEBUG_LOG(m_logger) << "onHandleAdler aesEffectState=" << aesEffectState; + DEBUG_LOG() << "onHandleAdler aesEffectState=" << aesEffectState; auto *adlerBtn = m_buttonBox->getButton(ADLER_BTN); switch (aesEffectState.underlying()) diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/ChargeAdministration/aes_charge_administration_adler_list.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/ChargeAdministration/aes_charge_administration_adler_list.cpp index 17d91da38..f400cf755 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/ChargeAdministration/aes_charge_administration_adler_list.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/ChargeAdministration/aes_charge_administration_adler_list.cpp @@ -27,7 +27,6 @@ ChargeAdministrationAdlerList::ChargeAdministrationAdlerList(QWidget *parent) , m_session(nullptr) , m_requestHelper(new LtsUtils::RequestHelper(this)) , m_ui(new Ui::ChargeAdministrationList) - , m_logger(getLogger("ChargeAdministrationAdlerList")) { m_ui->setupUi(this); @@ -62,7 +61,7 @@ bool ChargeAdministrationAdlerList::init(LtsSession::LtsSession *session) { if (m_session) { - ERROR_LOG(m_logger) << "double init()!"; + ERROR_LOG() << "double init()!"; return false; } m_session = session; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/ChargeAdministration/aes_charge_administration_adler_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/ChargeAdministration/aes_charge_administration_adler_model.cpp index 4582a79b8..70d7cdef7 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/ChargeAdministration/aes_charge_administration_adler_model.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/ChargeAdministration/aes_charge_administration_adler_model.cpp @@ -58,7 +58,6 @@ ChargeAdministrationAdlerModel::ChargeAdministrationAdlerModel(QObject *parent) tr("Total Stock"), tr("Gear Class")}, parent) - , m_logger(getLogger("ChargeAdministration")) {} bool ChargeAdministrationAdlerModel::initModel(LtsSession::LtsSession *session) @@ -80,7 +79,7 @@ bool ChargeAdministrationAdlerModel::initModel(LtsSession::LtsSession *session) QMap parties; if (!m_ppmDtc->visibleParties(parties, LtsSessionData::LtsSessionData::getInstance()->getVisibleParties(session->exerciseId()))) { - DEBUG_LOG (m_logger) << "Could not retrieve visible Parties!"; + DEBUG_LOG() << "Could not retrieve visible Parties!"; return false; } @@ -105,7 +104,7 @@ void ChargeAdministrationAdlerModel::onStateChanged(const ParticipantManagement: case DataModification::eAdded: case DataModification::eModified: { - DEBUG_LOG(m_logger) << "+++++++++ DataModification --> " << modType; + DEBUG_LOG() << "+++++++++ DataModification --> " << modType; updateParticipantChargeTypeMap(data); updateItem(m_ppmDtc->participant(data.participantId()).partyId()); @@ -189,10 +188,10 @@ void ChargeAdministrationAdlerModel::updateItem(int partyId) { if (participantCharges.partyId != partyId) continue; - DEBUG_LOG(m_logger) << "+++++++++ ParticipantId -> " << participantCharges.participantId << ", sampleTime ->" << sampleTime; + DEBUG_LOG() << "+++++++++ ParticipantId -> " << participantCharges.participantId << ", sampleTime ->" << sampleTime; for (auto it = participantCharges.chargeTypeTotalStockMap.cbegin(), end = participantCharges.chargeTypeTotalStockMap.cend(); it != end; ++it) { - DEBUG_LOG(m_logger) << "+++++++++ chargeRemain ->" << it.key() << ": " << it.value().remain + DEBUG_LOG() << "+++++++++ chargeRemain ->" << it.key() << ": " << it.value().remain << it.value().lastUpdate; GearData data; data.lastUpdate = it.value().lastUpdate; @@ -212,7 +211,7 @@ void ChargeAdministrationAdlerModel::updateItem(int partyId) item.partyId = partyId; for (auto gearData = chargeTypeGearData.cbegin(), end = chargeTypeGearData.cend(); gearData != end; ++gearData) { - DEBUG_LOG(m_logger) << "### PartyId " << item.partyId << " insert item -> chargeTypeId: " << gearData.key() << ", amount: " << gearData.value().remain + DEBUG_LOG() << "### PartyId " << item.partyId << " insert item -> chargeTypeId: " << gearData.key() << ", amount: " << gearData.value().remain << ", lastUpdate:" << gearData.value().lastUpdate; item.chargeTypeId = gearData.key(); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/ChargeAdministration/aes_charge_administration_list.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/ChargeAdministration/aes_charge_administration_list.cpp index a9cada13a..c56c0ea91 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/ChargeAdministration/aes_charge_administration_list.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/ChargeAdministration/aes_charge_administration_list.cpp @@ -31,7 +31,6 @@ ChargeAdministrationList::ChargeAdministrationList(QWidget *parent) , m_ftc(nullptr) , m_requestHelper(new LtsUtils::RequestHelper(this)) , m_ui(new Ui::ChargeAdministrationList) - , m_logger(getLogger("ChargeAdministrationList")) { m_ui->setupUi(this); @@ -70,7 +69,7 @@ bool ChargeAdministrationList::init(LtsSession::LtsSession *session) { if (m_session) { - ERROR_LOG(m_logger) << "double init()!"; + ERROR_LOG() << "double init()!"; return false; } m_session = session; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/ChargeAdministration/aes_charge_administration_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/ChargeAdministration/aes_charge_administration_model.cpp index 79f6611ee..a0dfc2680 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/ChargeAdministration/aes_charge_administration_model.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/ChargeAdministration/aes_charge_administration_model.cpp @@ -59,7 +59,6 @@ ChargeAdministrationModel::ChargeAdministrationModel(QObject *parent) tr("Used"), tr("Gear Class")}, parent) - , m_logger(getLogger("ChargeAdministration")) { } @@ -67,7 +66,7 @@ bool ChargeAdministrationModel::initModel(LtsSession::LtsSession *session, QVect { if (m_aesDtc) { - ERROR_LOG(m_logger) << "double init()!"; + ERROR_LOG() << "double init()!"; return false; } @@ -102,7 +101,7 @@ bool ChargeAdministrationModel::initModel(LtsSession::LtsSession *session, QVect QMap parties; if (!ppmDtc->visibleParties(parties, LtsSessionData::LtsSessionData::getInstance()->getVisibleParties(session->exerciseId()))) { - ERROR_LOG(m_logger) << "Could not retrieve visible Parties!"; + ERROR_LOG() << "Could not retrieve visible Parties!"; return false; } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Explosion/aes_effect_cluster_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Explosion/aes_effect_cluster_model.h index b7af0ee02..9d916d02e 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Explosion/aes_effect_cluster_model.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Explosion/aes_effect_cluster_model.h @@ -4,7 +4,7 @@ #pragma once #include -#include +#include namespace AreaEffectSimulation { diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AssetManagement/Gui/AsmTrainingAreaEdit/asm_edit_training_area_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AssetManagement/Gui/AsmTrainingAreaEdit/asm_edit_training_area_dialog.cpp index 91951f062..b503b2518 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AssetManagement/Gui/AsmTrainingAreaEdit/asm_edit_training_area_dialog.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AssetManagement/Gui/AsmTrainingAreaEdit/asm_edit_training_area_dialog.cpp @@ -44,7 +44,6 @@ AsmEditTrainingAreaDialog::AsmEditTrainingAreaDialog(QWidget *parent) , m_ui(new Ui::AsmEditTrainingAreaDialog) , m_requestHelper(new LtsUtils::RequestHelper(this)) , m_menuGroup() - , m_logger(getLogger("AssetManangementEditDialog")) { m_ui->setupUi(this); } @@ -71,12 +70,12 @@ bool AsmEditTrainingAreaDialog::init(LtsSession::LtsSessionDataDds *session, m_session = session; if (!m_session->getDtc(m_asmDtc)) { - ERROR_LOG(m_logger) << "AsmEditTrainingAreaDialog::init() Could not enable DTC from ASM"; + ERROR_LOG() << "AsmEditTrainingAreaDialog::init() Could not enable DTC from ASM"; return false; } if(!m_session->getFtc(m_asmFtc)) { - ERROR_LOG(m_logger) << "AsmEditTrainingAreaDialog::init() Could not enable FTC from ASM"; + ERROR_LOG() << "AsmEditTrainingAreaDialog::init() Could not enable FTC from ASM"; return false; } m_asmFtc->enableTrainingAreaRemove(true); @@ -86,7 +85,7 @@ bool AsmEditTrainingAreaDialog::init(LtsSession::LtsSessionDataDds *session, if (!sitMapGuiIfc) { - ERROR_LOG(m_logger) << LOGFUNCTION << " Invalid shared_ptr sitMapGuiIfc!"; + ERROR_LOG() << Q_FUNC_INFO << " Invalid shared_ptr sitMapGuiIfc!"; return false; } @@ -94,7 +93,7 @@ bool AsmEditTrainingAreaDialog::init(LtsSession::LtsSessionDataDds *session, AssetManagement::TrainingArea ta = AssetManagement::TrainingArea(); if(trainingAreaId == 0) { - DEBUG_LOG(m_logger) << LOGFUNCTION << " New training area "; + DEBUG_LOG() << Q_FUNC_INFO << " New training area "; ta.id() = 0; ta.name() = QStringLiteral("newArea").toStdString(); ta.width() = 12800; @@ -106,12 +105,12 @@ bool AsmEditTrainingAreaDialog::init(LtsSession::LtsSessionDataDds *session, ta = m_asmDtc->trainingArea(trainingAreaId); if(ta.id()<= 0) { - ERROR_LOG(m_logger) << LOGFUNCTION << " training area not valid id: "<< trainingAreaId; + ERROR_LOG() << Q_FUNC_INFO << " training area not valid id: "<< trainingAreaId; return false; } m_dialogTitle = tr("Edit Training Area: %1").arg(QString::fromStdString(ta.name())); - DEBUG_LOG(m_logger) << LOGFUNCTION << " edit training area " <getCoordinate(this, SLOT(onCoordinate(QPointF)), nullptr); break; case SituationMap::MapMode::Undefined: - ERROR_LOG(m_logger) << LOGFUNCTION << " ModeMode == Undefined "; + ERROR_LOG() << Q_FUNC_INFO << " ModeMode == Undefined "; break; } @@ -203,7 +202,7 @@ void AsmEditTrainingAreaDialog::onRectData(const QPointF ¢erPoint, double wi m_trainingArea.width() = width; m_trainingArea.bottomLeft() = convert(btmLeft); - DEBUG_LOG(m_logger) << "Pos X: " << centerPoint.x() << " Y: " << centerPoint.y() << " W: " << width << " H: " << height; + DEBUG_LOG() << "Pos X: " << centerPoint.x() << " Y: " << centerPoint.y() << " W: " << width << " H: " << height; showPreviewObject(); } @@ -236,7 +235,7 @@ void AsmEditTrainingAreaDialog::onCoordinate(const QPointF ¢erPoint) m_trainingArea.width() = width; m_trainingArea.bottomLeft() = convert(btmLeft); - DEBUG_LOG(m_logger) << "Pos X: " << centerPoint.x() << " Y: " << centerPoint.y() << " W: " << width << " H: " << height; + DEBUG_LOG() << "Pos X: " << centerPoint.x() << " Y: " << centerPoint.y() << " W: " << width << " H: " << height; showPreviewObject(); @@ -246,10 +245,10 @@ void AsmEditTrainingAreaDialog::onCoordinate(const QPointF ¢erPoint) void AsmEditTrainingAreaDialog::onEditClicked() { - TRACE_LOG(m_logger) << LOGFUNCTION << " START Editing.."; + TRACE_LOG() << Q_FUNC_INFO << " START Editing.."; if (!m_sitMapGuiIfc || m_trainingArea.id() < 0) { - ERROR_LOG(m_logger) << "onEditClicked: sitMapGuiIfc or trainingArea_id: "<sbWidth->value(), m_ui->sbHeight->value()); - TRACE_LOG(m_logger) << LOGFUNCTION << " END Edit"; + TRACE_LOG() << Q_FUNC_INFO << " END Edit"; onSelectionChanged(); @@ -280,7 +279,7 @@ void AsmEditTrainingAreaDialog::showPreviewObject() { if (!m_sitMapGuiIfc || m_previewPolygon.size() == 0) { - TRACE_LOG(m_logger) << " AsmEditTrainingAreaDialog::showPreviewObject(): m_sitMapGuiIfc invalid or polygon empty "; + TRACE_LOG() << " AsmEditTrainingAreaDialog::showPreviewObject(): m_sitMapGuiIfc invalid or polygon empty "; return; } m_sitMapGuiIfc->displayPreviewObject(this, m_previewPolygon, true); @@ -293,7 +292,7 @@ QPointF AsmEditTrainingAreaDialog::getCentPos(TrainingArea ta) ta.bottomLeft().lat()); QPointF centerPoint = utmCoordinate.geographic((ta.width() / 2.0), ta.height() / 2.0); - TRACE_LOG(m_logger) << LOGFUNCTION << " coord: x: "<< centerPoint.x() <<" y: "<< centerPoint.y(); + TRACE_LOG() << Q_FUNC_INFO << " coord: x: "<< centerPoint.x() <<" y: "<< centerPoint.y(); return centerPoint; } @@ -307,7 +306,7 @@ bool AsmEditTrainingAreaDialog::apply() if(!m_asmFtc) { - ERROR_LOG(m_logger) << LOGFUNCTION << " Can not retrieve AssetManagement::FTC"; + ERROR_LOG() << Q_FUNC_INFO << " Can not retrieve AssetManagement::FTC"; return false; } double height = m_ui->sbHeight->value(); @@ -326,7 +325,7 @@ bool AsmEditTrainingAreaDialog::apply() return m_asmFtc->trainingAreaModifyRequest(req, this); }); - TRACE_LOG(m_logger) << LOGFUNCTION << " scucess=" << success; + TRACE_LOG() << Q_FUNC_INFO << " scucess=" << success; return success; } @@ -347,7 +346,7 @@ QPolygonF AsmEditTrainingAreaDialog::getTrainingArea(const TrainingArea &ta) QPolygonF polygonF; if(!m_asmDtc) { - ERROR_LOG(m_logger) << " m_asmDtc is not valid!"; + ERROR_LOG() << " m_asmDtc is not valid!"; return{}; } AssetManagement::TrainingArea ddsTrainingArea = ta; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AssetManagement/Gui/AsmTrainingAreaEdit/asm_edit_training_area_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AssetManagement/Gui/AsmTrainingAreaEdit/asm_edit_training_area_dialog.h index 42d635e59..a453f5749 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AssetManagement/Gui/AsmTrainingAreaEdit/asm_edit_training_area_dialog.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AssetManagement/Gui/AsmTrainingAreaEdit/asm_edit_training_area_dialog.h @@ -74,7 +74,6 @@ private: QString m_dialogTitle{}; QString m_menuGroup; - LOGGER_T m_logger; QString m_trainingAreaName{}; AssetManagement::TrainingArea m_trainingArea; std::shared_ptr m_sitMapGuiIfc; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AssetManagement/Gui/AsmTrainingAreaEdit/asm_training_area_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AssetManagement/Gui/AsmTrainingAreaEdit/asm_training_area_dialog.cpp index 7d210f07f..5d5610f96 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AssetManagement/Gui/AsmTrainingAreaEdit/asm_training_area_dialog.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AssetManagement/Gui/AsmTrainingAreaEdit/asm_training_area_dialog.cpp @@ -25,7 +25,6 @@ AsmTrainingAreaDialog::AsmTrainingAreaDialog(const QString &menuGroup, QWidget * , m_session(nullptr) , m_menuGroup(menuGroup) , m_requestHelper(new LtsUtils::RequestHelper(this)) - , m_logger(getLogger("AsmTrainingAreaDialog")) { m_ui->setupUi(this); setOnlineHelpFilename(QStringLiteral("Asset_Management-Training_Area")); @@ -64,19 +63,19 @@ bool AsmTrainingAreaDialog::init(LtsSession::LtsSessionDataDds *session, const s if (!m_session->getDtc(m_asmDtc)) { - ERROR_LOG(m_logger) << "Could not enable DTC from ASM"; + ERROR_LOG() << "Could not enable DTC from ASM"; return false; } if(!m_session->getFtc(m_asmFtc)) { - ERROR_LOG(m_logger) << "Could not enable FTC from ASM"; + ERROR_LOG() << "Could not enable FTC from ASM"; return false; } m_sitMapGuiIfc = sitMapGuiIfc; if(!m_sitMapGuiIfc) { - ERROR_LOG(m_logger) << "m_sitMapGuiIfc is invalid "; + ERROR_LOG() << "m_sitMapGuiIfc is invalid "; return false; } bool bRet = true; @@ -87,11 +86,11 @@ bool AsmTrainingAreaDialog::init(LtsSession::LtsSessionDataDds *session, const s if(!bRet) { - ERROR_LOG(m_logger) << "Could not enable dtc or ftc from ASM"; + ERROR_LOG() << "Could not enable dtc or ftc from ASM"; return false; } - INFO_LOG(m_logger) << "Ftc && Dtc enabled from ASM"; + INFO_LOG() << "Ftc && Dtc enabled from ASM"; delete m_model; m_model = new AsmTrainingAreaDialogModel(this); @@ -135,12 +134,12 @@ void AsmTrainingAreaDialog::onAddTrainingArea() addDialog(dialog, m_menuGroup, identifier, LtsWidgets::LayoutArea::eDialogTab); } - TRACE_LOG(m_logger) << LOGFUNCTION << " adding temp training Area "; + TRACE_LOG() << Q_FUNC_INFO << " adding temp training Area "; } void AsmTrainingAreaDialog::onRemoveTrainingArea() { - TRACE_LOG(m_logger) << LOGFUNCTION << " START" ; + TRACE_LOG() << Q_FUNC_INFO << " START" ; QModelIndexList indexList = m_ui->trainingAreaView->selectedRows(); if (indexList.size() == 0) return; @@ -148,7 +147,7 @@ void AsmTrainingAreaDialog::onRemoveTrainingArea() TrainingArea req = m_model->getRowData(indexList.front().row()); if (req.id() < 0) { - ERROR_LOG(m_logger) << LOGFUNCTION << " invalid id:bt"<< req.id(); + ERROR_LOG() << Q_FUNC_INFO << " invalid id:bt"<< req.id(); return; } if (!m_viewedTaIds.contains(req.id())) @@ -158,7 +157,7 @@ void AsmTrainingAreaDialog::onRemoveTrainingArea() return m_asmFtc->trainingAreaRemoveRequest(TrainingAreaRemoveRequest(req.id()), this); }); - TRACE_LOG(m_logger) << LOGFUNCTION << " success = " << success; + TRACE_LOG() << Q_FUNC_INFO << " success = " << success; } else { @@ -166,7 +165,7 @@ void AsmTrainingAreaDialog::onRemoveTrainingArea() tr("Cannot remove currently edited Training Area")); } - TRACE_LOG(m_logger) << LOGFUNCTION << " END"; + TRACE_LOG() << Q_FUNC_INFO << " END"; } void AsmTrainingAreaDialog::onEditTrainingArea() @@ -177,7 +176,7 @@ void AsmTrainingAreaDialog::onEditTrainingArea() TrainingArea taItem = m_model->getRowData(indexList.front().row()); if (taItem.id() < 0) { - ERROR_LOG(m_logger) << "onEditTrainingArea invalid id = "<< taItem.id(); + ERROR_LOG() << "onEditTrainingArea invalid id = "<< taItem.id(); return; } @@ -206,16 +205,16 @@ void AsmTrainingAreaDialog::onEditTrainingArea() void AsmTrainingAreaDialog::onSelectionChanged() { enaDisa(); - DEBUG_LOG(m_logger) << "onSelectionChanged() called !"; + DEBUG_LOG() << "onSelectionChanged() called !"; const QModelIndex curIdx = m_ui->trainingAreaView->currentIndex(); if (!curIdx.isValid()) return; AssetManagement::TrainingArea taItem = m_model->getRowData(curIdx.row()); - DEBUG_LOG(m_logger) << "onSelectionChanged() selected training area id: "<trainingArea(trainingAreaId); if (ddsTrainingArea.id() != trainingAreaId) { - ERROR_LOG(m_logger) << LOGFUNCTION << " TrainingArea not found, trainingAreaId = " << trainingAreaId; + ERROR_LOG() << Q_FUNC_INFO << " TrainingArea not found, trainingAreaId = " << trainingAreaId; return {}; } @@ -281,7 +280,7 @@ void AsmTrainingAreaDialog::showAllTrainingAreas() for (int row = 0; row < rowCount; ++row) { const TrainingArea ¤tArea = m_model->getRowData(row); - INFO_LOG(m_logger) << " row = " << row << " ; currentArea = " << currentArea; + INFO_LOG() << " row = " << row << " ; currentArea = " << currentArea; const QPolygonF &poly = getTrainingArea(currentArea); polyVec.append(poly); } @@ -293,7 +292,7 @@ void AsmTrainingAreaDialog::showPreviewObject() { if (!this->m_sitMapGuiIfc || m_previewPolygon.size() == 0) { - TRACE_LOG(m_logger) << " showPreviewObject(): m_sitMapGuiIfc invalid or polygon empty "; + TRACE_LOG() << " showPreviewObject(): m_sitMapGuiIfc invalid or polygon empty "; return; } this->m_sitMapGuiIfc->displayPreviewObject(this, m_previewPolygon, true); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AssetManagement/Gui/AsmTrainingAreaEdit/asm_training_area_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AssetManagement/Gui/AsmTrainingAreaEdit/asm_training_area_dialog.h index 2e841822a..e422c3a27 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AssetManagement/Gui/AsmTrainingAreaEdit/asm_training_area_dialog.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AssetManagement/Gui/AsmTrainingAreaEdit/asm_training_area_dialog.h @@ -65,7 +65,6 @@ private: std::shared_ptr m_asmDtc; std::shared_ptr m_asmFtc; LtsUtils::RequestHelper *m_requestHelper; - LOGGER_T m_logger; QPolygonF m_previewPolygon; std::shared_ptr m_sitMapGuiIfc; QSet m_viewedTaIds{}; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AssetManagement/Gui/AsmTrainingAreaEdit/asm_training_area_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AssetManagement/Gui/AsmTrainingAreaEdit/asm_training_area_model.cpp index c61b3ad9c..6adfde568 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AssetManagement/Gui/AsmTrainingAreaEdit/asm_training_area_model.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AssetManagement/Gui/AsmTrainingAreaEdit/asm_training_area_model.cpp @@ -14,7 +14,6 @@ AsmTrainingAreaDialogModel::AsmTrainingAreaDialogModel(QObject *parent) parent) ,m_asmDtc(nullptr) - ,m_logger(getLogger("AsmTrainingAreaDialogModel")) {} AsmTrainingAreaDialogModel::~AsmTrainingAreaDialogModel() @@ -35,7 +34,7 @@ bool AsmTrainingAreaDialogModel::initModel(const std::shared_ptr }); } else { - WARNING_LOG(m_logger) << LOGFUNCTION << " no m_asmDtc"; + WARNING_LOG() << Q_FUNC_INFO << " no m_asmDtc"; } return true; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AssetManagement/Gui/AsmTrainingAreaEdit/asm_training_area_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AssetManagement/Gui/AsmTrainingAreaEdit/asm_training_area_model.h index bea5b591e..e32e9dbda 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AssetManagement/Gui/AsmTrainingAreaEdit/asm_training_area_model.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AssetManagement/Gui/AsmTrainingAreaEdit/asm_training_area_model.h @@ -36,7 +36,6 @@ public: private: bool m_hideRemoved; std::shared_ptr m_asmDtc; - LOGGER_T m_logger; }; } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/AudioSettings/audio_settings_avail_streams_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/AudioSettings/audio_settings_avail_streams_model.cpp index 58c78c062..502d66942 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/AudioSettings/audio_settings_avail_streams_model.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/AudioSettings/audio_settings_avail_streams_model.cpp @@ -30,7 +30,6 @@ AvailStreamsModel::AvailStreamsModel(Interface::Dtc *avmDtc, , m_cnrRoot(new NGLTreeItem(QVariant())) , m_tvcRoot(new NGLTreeItem(QVariant())) , m_changes(false) - , m_logger(getLogger("AudioSettingsAvailStreamsModel")) { Q_ASSERT(avmDtc); @@ -110,7 +109,7 @@ QVariant AvailStreamsModel::data(const QModelIndex &index, int role) const { NGLTreeItem *item = privateData(index); StreamData data = item->data().value(); - DEBUG_LOG(m_logger) << data.name; + DEBUG_LOG() << data.name; return data.name; } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/AudioSettings/audio_settings_avail_streams_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/AudioSettings/audio_settings_avail_streams_model.h index 2baa98359..4bedd4065 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/AudioSettings/audio_settings_avail_streams_model.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/AudioSettings/audio_settings_avail_streams_model.h @@ -54,8 +54,6 @@ private: NGLTreeItem *m_tvcRoot; bool m_changes; QVector > m_changedStreams; - - NGL::INGLLogger &m_logger; }; class AvailStreamsFilter final : public QSortFilterProxyModel diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/AudioSettings/audio_settings_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/AudioSettings/audio_settings_dialog.cpp index 9ee5a0ba8..d88728d3b 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/AudioSettings/audio_settings_dialog.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/AudioSettings/audio_settings_dialog.cpp @@ -18,7 +18,6 @@ AudioSettingsDialog::AudioSettingsDialog(QWidget *parent) : LtsWidgets::LtsDialog(parent, LtsWidgets::ButtonCombination::OkApplyCancel) , m_ui(new Ui::AudioSettingsDialog) , m_requestHelper(new LtsUtils::RequestHelper(this)) - , m_logger(getLogger("AudioSettingsDialog")) { m_ui->setupUi(this); setAttribute(Qt::WA_DeleteOnClose); @@ -123,7 +122,7 @@ void AudioSettingsDialog::retranslate() void AudioSettingsDialog::onOperatorChanged(const OperatorManagement::User &data, DataModification modType) { - DEBUG_LOG(m_logger) << "************** onOperatorChanged "; + DEBUG_LOG() << "************** onOperatorChanged "; switch (modType) { case DataModification::eRemoved: @@ -246,7 +245,7 @@ void AudioSettingsDialog::onDownButtonClicked() void AudioSettingsDialog::onSelectionChangedAllocation(const QItemSelection &selected, const QItemSelection &deselected) { - DEBUG_LOG(m_logger) << "onSelectionChangedAllocation selected.isEmpty()=" << selected.isEmpty(); + DEBUG_LOG() << "onSelectionChangedAllocation selected.isEmpty()=" << selected.isEmpty(); Q_UNUSED(deselected); QModelIndex first = m_ui->treeViewAllocated->model()->index(0, 0); int rowCnt = m_ui->treeViewAllocated->model()->rowCount(); @@ -282,7 +281,7 @@ bool AudioSettingsDialog::apply() bool AudioSettingsDialog::applyRemove() { RemoveCnrTvcProfileRequest removeRequest; - DEBUG_LOG(m_logger) << "AudioSettingsDialog::applyRemove"; + DEBUG_LOG() << "AudioSettingsDialog::applyRemove"; for (const auto &profile : std::as_const(m_cnrTvcProfileMap)) { @@ -305,7 +304,7 @@ bool AudioSettingsDialog::applyRemove() bool AudioSettingsDialog::applyModify() { ModifyCnrTvcProfileRequest modifyRequest; - DEBUG_LOG(m_logger) << "AudioSettingsDialog::applyModify"; + DEBUG_LOG() << "AudioSettingsDialog::applyModify"; for (const auto &profile : std::as_const(m_cnrTvcProfileMap)) { @@ -383,7 +382,7 @@ void AudioSettingsDialog::onSelectionOperatorChanged(const int index) m_ui->pushButtonUp->setEnabled(false); m_ui->pushButtonDown->setEnabled(false); m_operatorId = m_ui->operatorComboBox->currentData().toInt(); - DEBUG_LOG(m_logger) << "onSelectionOperatorChanged" << " operatorStr=" << m_ui->operatorComboBox->currentText() << " m_operatorId= " << m_operatorId; + DEBUG_LOG() << "onSelectionOperatorChanged" << " operatorStr=" << m_ui->operatorComboBox->currentText() << " m_operatorId= " << m_operatorId; fillOperatorList(); m_modelAllocated->resetChangeState(); m_modelAvailable->resetChangeState(); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/AudioSettings/audio_settings_used_streams_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/AudioSettings/audio_settings_used_streams_model.cpp index 28ef8c609..174284c9a 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/AudioSettings/audio_settings_used_streams_model.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/AudioSettings/audio_settings_used_streams_model.cpp @@ -14,7 +14,6 @@ namespace AudioVideoManagement AllocatedStreamsModel::AllocatedStreamsModel(QObject *parent) : NGLTreeModel(parent, new NGLTreeItem(QVariant(QLatin1String("root"))), { tr("Allocated") }) - , m_logger(getLogger("AudioSettingsUsedStreamsModel")) { setMimeType(StreamData::mimeType()); } @@ -32,7 +31,7 @@ QVariant AllocatedStreamsModel::data(const QModelIndex &index, int role) const { NGLTreeItem *item = privateData(index); StreamData data = item->data().value(); - DEBUG_LOG(m_logger) << data.name; + DEBUG_LOG() << data.name; return data.name; } @@ -93,14 +92,14 @@ bool AllocatedStreamsModel::dropMimeData(const QMimeData *data, Qt::DropAction a qDeleteAll(droppedItems); emit droppedStreamNames(streams); m_changes = true; - DEBUG_LOG(m_logger) << data->data(QStringLiteral("NGLTreeModel/dragDrop")); + DEBUG_LOG() << data->data(QStringLiteral("NGLTreeModel/dragDrop")); return NGLTreeModel::dropMimeData(data, action, row, 0, QModelIndex()); } void AllocatedStreamsModel::setNewStreamData(const QVector &newData) { - DEBUG_LOG(m_logger) << "set new stream data, count: " << newData.size(); + DEBUG_LOG() << "set new stream data, count: " << newData.size(); resetModel(); for (const StreamData &sd : newData) m_rootItem->appendChild(new NGLTreeItem(QVariant::fromValue(sd))); @@ -117,15 +116,15 @@ QVector AllocatedStreamsModel::getStreamDataVector() const const NGLTreeItem *item = m_rootItem->child(i); const StreamData sd = item->data().value(); result.append(sd); - DEBUG_LOG(m_logger) << "result.append(sd.name):" << sd.name; + DEBUG_LOG() << "result.append(sd.name):" << sd.name; } - DEBUG_LOG(m_logger) << "getStreamDataVector() size: " << result.size(); + DEBUG_LOG() << "getStreamDataVector() size: " << result.size(); return result; } void AllocatedStreamsModel::changeOrder(const QModelIndex &idx, bool up) { - DEBUG_LOG(m_logger) << "changeOrder " + DEBUG_LOG() << "changeOrder " << " index = " << idx.row() << " up = " << up << " m_rootItem->childCount()= " << m_rootItem->childCount(); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/AudioSettings/audio_settings_used_streams_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/AudioSettings/audio_settings_used_streams_model.h index 2923239e1..9befaf236 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/AudioSettings/audio_settings_used_streams_model.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/AudioSettings/audio_settings_used_streams_model.h @@ -42,7 +42,6 @@ signals: private: bool m_changes{false}; QVector > m_changedStreams; - NGL::INGLLogger &m_logger; }; } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/TopicEditor/avm_sequence_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/TopicEditor/avm_sequence_model.cpp index db599c313..80a45a13e 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/TopicEditor/avm_sequence_model.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/TopicEditor/avm_sequence_model.cpp @@ -22,7 +22,6 @@ AvmSequenceModel::AvmSequenceModel(QObject *parent) tr("Volume"), tr("Description")}, parent) - , m_logger(getLogger("AvmSequenceModel")) {} void AvmSequenceModel::setTimezoneHoursOffset(int timezoneHoursOffset) diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/TopicEditor/avm_sequence_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/TopicEditor/avm_sequence_model.h index af7b8aa5f..8853020b5 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/TopicEditor/avm_sequence_model.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/TopicEditor/avm_sequence_model.h @@ -63,7 +63,6 @@ private: QVector m_highlightedRows; int m_timezoneHoursOffset = 0; - LOGGER_T m_logger; }; class AvmSequenceProxyModel final : public LtsWidgets::LtsColumnFilterProxyModel diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/TopicEditor/topic_editor.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/TopicEditor/topic_editor.cpp index 341d8b5e2..2f902a2ff 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/TopicEditor/topic_editor.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/TopicEditor/topic_editor.cpp @@ -62,7 +62,6 @@ TopicEditor::TopicEditor(LtsSession::LtsSession *session, const TopicEditorBase: , m_model(new AvmSequenceModel(this)) , m_playbackMenu(nullptr) , m_ui(new Ui::AVTopicEditor) - , m_logger(getLogger("TopicEditor")) { Q_ASSERT(session); @@ -380,7 +379,7 @@ void TopicEditor::onEditSequence() if (!m_playbackMenu) return; - DEBUG_LOG(m_logger) << "slotEditSequence "; + DEBUG_LOG() << "slotEditSequence "; const auto selRows = m_ui->tvSequences->selectionModel()->selectedRows(); if (selRows.size() != 1) @@ -393,7 +392,7 @@ void TopicEditor::onEditSequence() m_model->setHighlightedRow(row); const AvsSequence selectedSeq = m_model->getRowData(row); - DEBUG_LOG(m_logger) << "selectedSeq.internalStreamName=" << selectedSeq.internalStreamName; + DEBUG_LOG() << "selectedSeq.internalStreamName=" << selectedSeq.internalStreamName; m_playbackMenu->setStreamName(selectedSeq.internalStreamName); m_ui->dtStart->setMsecsSinceEpoch(std::chrono::milliseconds(selectedSeq.start.time_since_epoch()).count()); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/TopicEditor/topic_editor.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/TopicEditor/topic_editor.h index 3b161560a..b75162feb 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/TopicEditor/topic_editor.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/TopicEditor/topic_editor.h @@ -67,7 +67,6 @@ private: QString m_topicStreamName; Ui::AVTopicEditor *m_ui{nullptr}; - NGL::INGLLogger &m_logger; }; } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/avm_available_streams_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/avm_available_streams_model.cpp index 6fb7e23a4..fbbaba8af 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/avm_available_streams_model.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/avm_available_streams_model.cpp @@ -64,7 +64,6 @@ AvailableStreamsModel::AvailableStreamsModel(const std::shared_ptrremoveAllChildren(); @@ -251,7 +250,7 @@ void AvailableStreamsModel::initModel() { if (videoTeam.exerciseId() != m_session->exerciseId()) continue; - DEBUG_LOG(m_logger) << "add new videoteam" << videoTeam; + DEBUG_LOG() << "add new videoteam" << videoTeam; StreamModelData item; item.name = QString::fromStdString(videoTeam.streamName().c_str()); item.mountingPointId = -1 * videoTeam.id(); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/avm_available_streams_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/avm_available_streams_model.h index 7a8a9ba90..a76c6be62 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/avm_available_streams_model.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/avm_available_streams_model.h @@ -96,8 +96,6 @@ private: const std::shared_ptr m_ismDtc; LtsSession::LtsSession *m_session; StreamNameMapping *m_streamNameMapping; - - NGL::INGLLogger &m_logger; }; } Q_DECLARE_METATYPE(AudioVideoManagement::StreamModelData) diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/avm_choose_menu.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/avm_choose_menu.cpp index 915e34b4b..a29300f9c 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/avm_choose_menu.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/avm_choose_menu.cpp @@ -18,7 +18,6 @@ ChooseMenu::ChooseMenu(Interface::Dtc *dtc, AvsMenus *avsMenus, QWidget *parent) , m_dtc(dtc) , m_avsMenus(avsMenus) , m_ui(new Ui::ChooseMenuStruct) - , m_logger(getLogger("ChooseMenu")) { Q_ASSERT(dtc); Q_ASSERT(avsMenus); @@ -86,11 +85,11 @@ void ChooseMenu::onMenuStructChanged(const MenuStruct &data, DataModification mo bool ChooseMenu::apply() { int menuId = m_ui->cbAudio->currentData().toInt(); - INFO_LOG(m_logger) << "MenuId Audio: " << menuId; + INFO_LOG() << "MenuId Audio: " << menuId; m_avsMenus->setAnnouncementMenu(menuId); menuId = m_ui->cbVideo->currentData().toInt(); - INFO_LOG(m_logger) << "MenuId Video: " << menuId; + INFO_LOG() << "MenuId Video: " << menuId; m_avsMenus->setVideoMenu(menuId); return true; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/avm_choose_menu.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/avm_choose_menu.h index a1f1229fb..76bfbe513 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/avm_choose_menu.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/avm_choose_menu.h @@ -50,7 +50,6 @@ private: Interface::Dtc *m_dtc; AvsMenus *m_avsMenus; Ui::ChooseMenuStruct *m_ui; - NGL::INGLLogger &m_logger; }; } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/avm_menu_edit.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/avm_menu_edit.cpp index b3696aa5c..f6fcf0ee5 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/avm_menu_edit.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/avm_menu_edit.cpp @@ -15,7 +15,6 @@ MenuEdit::MenuEdit(QWidget *parent) , m_availStreamsModel(nullptr) , m_usedStreamsModel(nullptr) , m_isAudio(false) - , m_logger(getLogger("AudioVideoManagementEdit")) , m_requestHelper(new LtsUtils::RequestHelper(this)) { m_ui->setupUi(this); @@ -47,11 +46,11 @@ bool MenuEdit::init(LtsSession::LtsSession *session, StreamNameMapping *streamNameMapping, const MenuStruct &ms) { - DEBUG_LOG(m_logger) << "MenuEdit::init()"; + DEBUG_LOG() << "MenuEdit::init()"; if (!ftc || !dtc) { - ERROR_LOG(m_logger) << "MenuEdit::init() Invalid shared_ptr!"; + ERROR_LOG() << "MenuEdit::init() Invalid shared_ptr!"; return false; } @@ -120,7 +119,7 @@ void MenuEdit::onRemove() return; slotChangesMade(); - DEBUG_LOG(m_logger) << "index row: " << index.row(); + DEBUG_LOG() << "index row: " << index.row(); m_usedStreamsModel->removeRow(index.row(), index.parent()); } else @@ -132,7 +131,7 @@ void MenuEdit::onRemove() return; slotChangesMade(); - DEBUG_LOG(m_logger) << "index row: " << index.row(); + DEBUG_LOG() << "index row: " << index.row(); m_usedStreamsModel->removeRow(index.row(), index.parent()); } @@ -141,7 +140,7 @@ void MenuEdit::onRemove() void MenuEdit::onModelDataChanged() { - INFO_LOG(m_logger) << "onModelDataChanged"; + INFO_LOG() << "onModelDataChanged"; m_ui->menuTreeView->expandAll(); } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/avm_menu_edit.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/avm_menu_edit.h index 283387717..2338a92b4 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/avm_menu_edit.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/avm_menu_edit.h @@ -68,7 +68,6 @@ private: UsedStreamsModel *m_usedStreamsModel; bool m_isAudio; QString m_name; - NGL::INGLLogger &m_logger; LtsUtils::RequestHelper *m_requestHelper; AudioVideoManagement::MenuStruct m_lastDdsMenuStruct; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/avm_menu_edit_view.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/avm_menu_edit_view.cpp index 2b97e7f16..fcebe89b2 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/avm_menu_edit_view.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/avm_menu_edit_view.cpp @@ -26,7 +26,6 @@ MenuEditView::MenuEditView(const QString &menuGroup, LtsSession::LtsSession *ses , m_session(session) , m_requestHelper(new LtsUtils::RequestHelper(this)) , m_ui(new Ui::MenuEditView) - , m_logger(getLogger("AudioVideoManagementDialog")) { m_ui->setupUi(this); m_ui->widget->setSelectionMode(QAbstractItemView::SingleSelection); @@ -150,7 +149,7 @@ void MenuEditView::onEditMenuStruct() AudioVideoManagement::MenuStruct ms = m_model->getRowData(row); ms.isAudio(m_isAudio); - DEBUG_LOG(m_logger) << "---onEditMenuStruct () " + DEBUG_LOG() << "---onEditMenuStruct () " << " id: " << ms.id() << " name: " << ms.name(); @@ -205,15 +204,15 @@ void MenuEditView::onExportButtonClicked() int fileId = m_flmGui->saveFileContent(this, FileManagement::FileType::Xml, m_session->exerciseId(), byteArray); if (fileId > 0) - DEBUG_LOG(m_logger) << "Saved file with id = " << fileId; + DEBUG_LOG() << "Saved file with id = " << fileId; else - ERROR_LOG(m_logger) << "Could not save file in library "; + ERROR_LOG() << "Could not save file in library "; } void MenuEditView::onImportButtonClicked() { - DEBUG_LOG(m_logger) << " onImportButtonClicked() "; + DEBUG_LOG() << " onImportButtonClicked() "; QByteArray content; int fileId = m_flmGui->loadFileContent(this, content, {FileManagement::FileType::Xml}, m_session->exerciseId(), FileManagement::toString(FileManagement::XmlType::AVMMenuEditView)); @@ -240,7 +239,7 @@ void MenuEditView::onImportButtonClicked() }); } } - INFO_LOG(m_logger) << "--- onImportButtonClicked() "; + INFO_LOG() << "--- onImportButtonClicked() "; } } } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/avm_menu_edit_view.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/avm_menu_edit_view.h index 4ab08393d..f3ca3fb10 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/avm_menu_edit_view.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/avm_menu_edit_view.h @@ -76,9 +76,6 @@ private: LtsSession::LtsSession *m_session; LtsUtils::RequestHelper *m_requestHelper; Ui::MenuEditView *m_ui; - - LOGGER_T m_logger; - }; } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/avm_menu_view_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/avm_menu_view_model.cpp index d1cd81345..934a1af2f 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/avm_menu_view_model.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/avm_menu_view_model.cpp @@ -21,7 +21,6 @@ MenuViewModel::MenuViewModel(QObject *parent) parent) , m_isAudio(false) , m_dtc(nullptr) - , m_logger(getLogger("MenuViewModel")) {} @@ -78,7 +77,7 @@ QByteArray MenuViewModel::modelToJson(int row) const QJsonObject obj; obj[QStringLiteral("XmlType")] = FileManagement::toString(FileManagement::XmlType::AVMMenuEditView); - DEBUG_LOG(m_logger) << "row =" << ": " << row; + DEBUG_LOG() << "row =" << ": " << row; const AudioVideoManagement::MenuStruct &menuStruct = m_vecData.at(row); obj[QStringLiteral("id")] = 0; @@ -123,7 +122,7 @@ QVector MenuViewModel::jsonToMenuStructs(const const QJsonArray arrEntry(obj.value(QStringLiteral("menuEntries")).toArray()); menuStruct.menuEntries().resize(arrEntry.size()); - INFO_LOG(m_logger) << "arrEntry.size()=" << arrEntry.size(); + INFO_LOG() << "arrEntry.size()=" << arrEntry.size(); for (int j = 0; j < arrEntry.size(); ++j) { const QJsonObject objEntry(arrEntry.at(j).toObject()); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/avm_menu_view_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/avm_menu_view_model.h index 2e3be82fc..d299467ab 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/avm_menu_view_model.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/avm_menu_view_model.h @@ -30,6 +30,5 @@ protected: private: bool m_isAudio; std::shared_ptr m_dtc; - LOGGER_T m_logger; }; } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/avm_new_menu_struct.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/avm_new_menu_struct.cpp index 999dc1613..13556f38e 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/avm_new_menu_struct.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/avm_new_menu_struct.cpp @@ -13,7 +13,6 @@ namespace AudioVideoManagement NewMenuStruct::NewMenuStruct(QWidget *parent) : LtsWidgets::LtsFramelessDialog(parent, LtsWidgets::Behaviour::Modal) , m_ui(new Ui::NewMenuStruct) - , m_logger(getLogger("NewMenu")) { m_ui->setupUi(this); m_ui->ltsDialogButtonBox->getButton(LtsWidgets::DialogButton::Ok)->hide(); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/avm_new_menu_struct.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/avm_new_menu_struct.h index a488bc071..b7456fb39 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/avm_new_menu_struct.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/avm_new_menu_struct.h @@ -30,7 +30,6 @@ Q_SIGNALS: private: Ui::NewMenuStruct *m_ui; - LOGGER_T m_logger; }; } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/avm_playback_menu.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/avm_playback_menu.cpp index 6f8e6d7f5..327f62b5a 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/avm_playback_menu.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/avm_playback_menu.cpp @@ -296,7 +296,6 @@ AvmPlaybackMenu::AvmPlaybackMenu(QWidget *parent) : QWidget(parent) , m_ui(new Ui::Playback) , m_requestHelper(new LtsUtils::RequestHelper(this)) - , m_logger(getLogger("AvmPlaybackMenu")) {} @@ -388,12 +387,12 @@ bool AvmPlaybackMenu::init(LtsSession::LtsSession *session, AvaSession *avaSessi m_presetStreamName = streamName; if (m_presetStreamName) - DEBUG_LOG(m_logger) << "init stream preset: " << m_presetStreamName.get(); + DEBUG_LOG() << "init stream preset: " << m_presetStreamName.get(); m_presetStartTime = startTime; if (m_presetStartTime) - DEBUG_LOG(m_logger) << "init time preset: " << std::chrono::milliseconds(m_presetStartTime.get().time_since_epoch()).count(); + DEBUG_LOG() << "init time preset: " << std::chrono::milliseconds(m_presetStartTime.get().time_since_epoch()).count(); m_session = session; m_playbackApp = std::move(appHandle); @@ -1007,37 +1006,37 @@ void AvmPlaybackMenu::preselectStream(const QString &fallbackInternalStreamName) const QString currentStreamName(m_presetStreamName.is_initialized() ? *m_presetStreamName : QString()); const QString currentInternalName(currentStreamName.isEmpty() ? fallbackInternalStreamName : QString()); - DEBUG_LOG(m_logger) << "currentStreamName: " << currentStreamName; - DEBUG_LOG(m_logger) << "currentInternalName: " << currentInternalName; + DEBUG_LOG() << "currentStreamName: " << currentStreamName; + DEBUG_LOG() << "currentInternalName: " << currentInternalName; m_presetStreamName.reset(); if (!currentInternalName.isEmpty() || !currentStreamName.isEmpty()) { - DEBUG_LOG(m_logger) << "stream preset set - searching for '" << currentStreamName << "'.."; + DEBUG_LOG() << "stream preset set - searching for '" << currentStreamName << "'.."; bool found = false; for (int i = 0; i < m_ui->cbStreams->count(); i++) { const AvaStream &curStream = m_ui->cbStreams->itemData(i).value(); - DEBUG_LOG(m_logger) << "stream " << i << ": " << curStream.displayName << " (" << curStream.internalName << ")"; + DEBUG_LOG() << "stream " << i << ": " << curStream.displayName << " (" << curStream.internalName << ")"; if ((!currentInternalName.isEmpty() && curStream.displayName == currentInternalName) || (!currentStreamName.isEmpty() && curStream.internalName == currentStreamName)) { found = true; - DEBUG_LOG(m_logger) << "stream preset set, found & selected"; + DEBUG_LOG() << "stream preset set, found & selected"; m_ui->cbStreams->setCurrentIndex(i); break; } } if (!found) - WARNING_LOG(m_logger) << "new stream list does not contain old selected stream (" << currentInternalName << ") !"; + WARNING_LOG() << "new stream list does not contain old selected stream (" << currentInternalName << ") !"; } else - DEBUG_LOG(m_logger) << "no stream preset set"; + DEBUG_LOG() << "no stream preset set"; } @@ -1098,7 +1097,7 @@ void AvmPlaybackMenu::setSavedPos(qint64 msecs) void AvmPlaybackMenu::onTimelineComplete(const AvaTimeline &timeline) { - DEBUG_LOG(m_logger) << "onTimelineComplete"; + DEBUG_LOG() << "onTimelineComplete"; m_intervalModel.setData(timeline.parts()); m_ui->tavIntervals->resizeColumnsToContents(); @@ -1116,7 +1115,7 @@ void AvmPlaybackMenu::onTimelineComplete(const AvaTimeline &timeline) m_savedPos.reset(); } - DEBUG_LOG(m_logger) << "onTimelineComplete " << std::chrono::milliseconds(newPos.time_since_epoch()).count(); + DEBUG_LOG() << "onTimelineComplete " << std::chrono::milliseconds(newPos.time_since_epoch()).count(); m_avaCtrl->setAbsPosition(m_playbackApp.dialogId(), ALL_STREAMS(), newPos); m_timelineIsComplete = true; @@ -1143,7 +1142,7 @@ void AvmPlaybackMenu::onStreamPositionReceived(const QString &dialogId, const QS return; m_lastAvsPos = pos; - DEBUG_LOG(m_logger) << "onStreamPositionReceived: last avs pos now: " << std::chrono::milliseconds((*m_lastAvsPos).time_since_epoch()).count() << " - direct apply? " << m_avaCtrl->isEmpty(); + DEBUG_LOG() << "onStreamPositionReceived: last avs pos now: " << std::chrono::milliseconds((*m_lastAvsPos).time_since_epoch()).count() << " - direct apply? " << m_avaCtrl->isEmpty(); if (m_avaCtrl->isEmpty()) applyAvsPos(); @@ -1199,13 +1198,13 @@ void AvmPlaybackMenu::onUiTimeChanged(AvaTimePoint t) m_currentButtonState != ButtonStates::Stopped) return; - DEBUG_LOG(m_logger) << "onUiTimeChanged " << std::chrono::milliseconds(t.time_since_epoch()).count(); + DEBUG_LOG() << "onUiTimeChanged " << std::chrono::milliseconds(t.time_since_epoch()).count(); m_avaCtrl->setAbsPosition(m_playbackApp.dialogId(), ALL_STREAMS(), t); } void AvmPlaybackMenu::onStreamSelectionChanged(const QVector &selectedStreams) { - DEBUG_LOG(m_logger) << "onStreamSelectionChanged count = " << selectedStreams.count(); + DEBUG_LOG() << "onStreamSelectionChanged count = " << selectedStreams.count(); Q_ASSERT(!selectedStreams.isEmpty()); @@ -1232,7 +1231,7 @@ void AvmPlaybackMenu::onStreamSelectionChanged(const QVector &selecte void AvmPlaybackMenu::onIntervalActivated(const QModelIndex &index) { AvaTimelinePart interval = m_intervalModel.getRowData(index.row()); - DEBUG_LOG(m_logger) << "start = " << std::chrono::milliseconds(interval.first.time_since_epoch()).count(); + DEBUG_LOG() << "start = " << std::chrono::milliseconds(interval.first.time_since_epoch()).count(); m_avaCtrl->setAbsPosition(m_playbackApp.dialogId(), ALL_STREAMS(), interval.first); @@ -1303,7 +1302,7 @@ void AvmPlaybackMenu::selectMarker(const MarkerManagement::Marker &marker) (void)blocker; const auto &rowData = marker; - DEBUG_LOG(m_logger) << "AvmPlaybackMenu::onMarkerClicked name = " << QString::fromStdString(rowData.name()) + DEBUG_LOG() << "AvmPlaybackMenu::onMarkerClicked name = " << QString::fromStdString(rowData.name()) << " note = " << QString::fromStdString(rowData.note()); bool selectMarkerStream = false; @@ -1320,7 +1319,7 @@ void AvmPlaybackMenu::selectMarker(const MarkerManagement::Marker &marker) for (const MarkerManagement::MarkerDescription &desc : rowData.descriptions()) { - DEBUG_LOG(m_logger) << " description = " << QString::fromStdString(desc.content()) + DEBUG_LOG() << " description = " << QString::fromStdString(desc.content()) << " desc.markerType()=" << desc.markerType(); if ((desc.markerType() == MarkerManagement::MarkerType::Video && m_isAudio == false) || (desc.markerType() == MarkerManagement::MarkerType::Audio && m_isAudio == true)) @@ -1346,7 +1345,7 @@ void AvmPlaybackMenu::selectMarker(const MarkerManagement::Marker &marker) avaStream.displayName = m_streamNameMapping->displayName(avaStream.internalName); m_ui->cbMarkerStreams->addItem(avaStream.displayName, QVariant::fromValue(avaStream)); - DEBUG_LOG(m_logger) << "streams[" << avaStream.internalName << "]" + DEBUG_LOG() << "streams[" << avaStream.internalName << "]" << " internaName=" << avaStream.internalName << " displayName=" << avaStream.displayName; if (bIsSelected && selectedStream.internalName.isEmpty()) @@ -1364,7 +1363,7 @@ void AvmPlaybackMenu::selectMarker(const MarkerManagement::Marker &marker) qint64 time = rowData.timeStamp() - rowData.timeStampOffset(); - DEBUG_LOG(m_logger) << "marker time: " << time << " (" << QDateTime::fromMSecsSinceEpoch(time).toString(QStringLiteral("dd.MM.yy HH:mm:ss.zzz")) << ")"; + DEBUG_LOG() << "marker time: " << time << " (" << QDateTime::fromMSecsSinceEpoch(time).toString(QStringLiteral("dd.MM.yy HH:mm:ss.zzz")) << ")"; std::chrono::milliseconds t(time); AvaTimePoint p(std::chrono::duration_cast(t)); @@ -1404,7 +1403,7 @@ void AvmPlaybackMenu::onSetMarkerClicked() if (!m_selectedStreams || m_selectedStreams.get().isEmpty()) { new LtsWidgets::LtsMessageDialogNew(this, tr("No stream selected to create a marker from.")); - WARNING_LOG(m_logger) << "onSetMarkerClicked called, but no selected streams available"; + WARNING_LOG() << "onSetMarkerClicked called, but no selected streams available"; return; } @@ -1445,7 +1444,7 @@ void AvmPlaybackMenu::onStartClicked() { - DEBUG_LOG(m_logger) << "onStartClicked" + DEBUG_LOG() << "onStartClicked" << " dialogId=" << m_playbackApp.dialogId() << " currentSpeed=" << currentSpeed() @@ -1460,7 +1459,7 @@ void AvmPlaybackMenu::onStartClicked() return; } - WARNING_LOG(m_logger) << "onStartClicked called, but no selected streams available"; + WARNING_LOG() << "onStartClicked called, but no selected streams available"; return; } @@ -1502,14 +1501,14 @@ void AvmPlaybackMenu::onAllStreams() void AvmPlaybackMenu::onIntervalBackwardClicked() { const AvaTimelinePart &targetInterval = m_intervalModel.previousInterval(); - DEBUG_LOG(m_logger) << "onIntervalBackwardClicked " << std::chrono::milliseconds(targetInterval.first.time_since_epoch()).count(); + DEBUG_LOG() << "onIntervalBackwardClicked " << std::chrono::milliseconds(targetInterval.first.time_since_epoch()).count(); m_avaCtrl->setAbsPosition(m_playbackApp.dialogId(), ALL_STREAMS(), targetInterval.first); } void AvmPlaybackMenu::onIntervalForwardClicked() { const AvaTimelinePart &targetInterval = m_intervalModel.nextInterval(); - DEBUG_LOG(m_logger) << "onIntervalForwardClicked " << std::chrono::milliseconds(targetInterval.first.time_since_epoch()).count(); + DEBUG_LOG() << "onIntervalForwardClicked " << std::chrono::milliseconds(targetInterval.first.time_since_epoch()).count(); m_avaCtrl->setAbsPosition(m_playbackApp.dialogId(), ALL_STREAMS(), targetInterval.first); } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/avm_playback_menu.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/avm_playback_menu.h index 61b17f040..73366d22d 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/avm_playback_menu.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/avm_playback_menu.h @@ -210,8 +210,6 @@ private: bool m_videoScreenSelectionDone { false }; bool m_timelineIsComplete { false }; ButtonStates m_buttonStateBeforePlaybackAppPause { ButtonStates::AllOff }; - - LOGGER_T m_logger; }; } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/avm_used_streams_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/avm_used_streams_model.cpp index 793fb1468..21d150291 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/avm_used_streams_model.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/avm_used_streams_model.cpp @@ -23,7 +23,6 @@ UsedStreamsModel::UsedStreamsModel(const std::shared_ptr avmDtc, , m_dummyId(-10000000) , m_menuStruct(ms) , m_streamNameMapping(streamNameMapping) -, m_logger(getLogger("UsedStreamsModel")) { Q_ASSERT(streamNameMapping); @@ -130,7 +129,7 @@ bool UsedStreamsModel::dropMimeData(const QMimeData *data, Qt::DropAction action if (!checkDrop(data, index(row, column), parent, action)) return false; - INFO_LOG(m_logger) << "dropMimeData: action = " << action + INFO_LOG() << "dropMimeData: action = " << action << ", row = " << row << ", parent: valid = " << parent.isValid(); @@ -201,7 +200,7 @@ bool UsedStreamsModel::canDropMimeData(const QMimeData *data, Qt::DropAction act stream >> idParent >> idItem >> group >> itemData >> mountId; ms = itemData.value(); - INFO_LOG(m_logger) << "Insert:" + INFO_LOG() << "Insert:" << "\n ms.name=" << ms.name << "\n ms.isGroup=" << ms.isGroup << "\n ms.parentId=" << ms.parentId @@ -302,7 +301,7 @@ void UsedStreamsModel::insertChildren(NGLTreeItem *parent, int parentId, const s if (me.isGroup()) { - DEBUG_LOG(m_logger) << "insertChildren" + DEBUG_LOG() << "insertChildren" << me.mountingPointId() << me.name(); insertChildren(treeItem, me.id(), entries); @@ -336,7 +335,7 @@ bool UsedStreamsModel::checkSingleItem(NGLTreeItem *target, StreamModelData &toC bool retValue = true; if (!target) { - ERROR_LOG(m_logger) << "Nullptr exception"; + ERROR_LOG() << "Nullptr exception"; return false; } else @@ -344,10 +343,10 @@ bool UsedStreamsModel::checkSingleItem(NGLTreeItem *target, StreamModelData &toC StreamModelData msTarget = target->data().value(); if (msTarget.id == toCheck.parentId) - DEBUG_LOG(m_logger) << "Drag&drag in same folder."; + DEBUG_LOG() << "Drag&drag in same folder."; else if (msTarget.isGroup && toCheck.isGroup) { - DEBUG_LOG(m_logger) << "Trying to drop folder into folder"; + DEBUG_LOG() << "Trying to drop folder into folder"; retValue = false; } else @@ -429,18 +428,18 @@ bool UsedStreamsModel::checkDrop(const QMimeData *data, const QModelIndex &index else if ((movedFolders.at(0) != item.parentId) && (movedFolders.contains(item.parentId)) && (action == Qt::MoveAction)) { - DEBUG_LOG(m_logger) << "Ignoring items in sub folder while moving."; + DEBUG_LOG() << "Ignoring items in sub folder while moving."; continue; } else if (!movedFolders.contains(item.parentId) && (action == Qt::MoveAction)) { - DEBUG_LOG(m_logger) << "Only allow items from same folder to be moved."; + DEBUG_LOG() << "Only allow items from same folder to be moved."; return false; } if (!checkSingleItem(itemToCheck, item)) { - DEBUG_LOG(m_logger) << "Not able to add item with name: " << item.name; + DEBUG_LOG() << "Not able to add item with name: " << item.name; return false; } @@ -453,7 +452,7 @@ bool UsedStreamsModel::checkDrop(const QMimeData *data, const QModelIndex &index } else { - DEBUG_LOG(m_logger) << "More than one folder selected."; + DEBUG_LOG() << "More than one folder selected."; return false; } } @@ -464,7 +463,7 @@ bool UsedStreamsModel::checkDrop(const QMimeData *data, const QModelIndex &index if (countDropped + countAgainst > 12) { - DEBUG_LOG(m_logger) << "Trying to add to many items to folder"; + DEBUG_LOG() << "Trying to add to many items to folder"; return false; } return true; @@ -552,7 +551,7 @@ void UsedStreamsModel::onDataChanged(const InfrastructureManagement::MainStructu const DataModification modType) { beginResetModel(); - INFO_LOG(m_logger) << "onDataChanged m_rootItem->childCount()" << m_rootItem->childCount() + INFO_LOG() << "onDataChanged m_rootItem->childCount()" << m_rootItem->childCount() << " data.elements().size()=" << data.elements().size(); switch (modType) @@ -563,7 +562,7 @@ void UsedStreamsModel::onDataChanged(const InfrastructureManagement::MainStructu case DataModification::eAdded: for (const InfrastructureManagement::StructureElement &se : data.elements()) { - INFO_LOG(m_logger) << "se.id()" << se.id() + INFO_LOG() << "se.id()" << se.id() << " se.displayName()" << se.displayName() << " m_rootItem->childCount()" << m_rootItem->childCount(); const QString newName = QString::fromStdString(se.displayName()); @@ -578,7 +577,7 @@ void UsedStreamsModel::onDataChangedMvs(const VideoTeam &data, const DataModific { beginResetModel(); - INFO_LOG(m_logger) << "onDataChanged m_rootItem->childCount()" << m_rootItem->childCount(); + INFO_LOG() << "onDataChanged m_rootItem->childCount()" << m_rootItem->childCount(); switch (modType) { @@ -587,7 +586,7 @@ void UsedStreamsModel::onDataChangedMvs(const VideoTeam &data, const DataModific case DataModification::eModified: case DataModification::eAdded: - INFO_LOG(m_logger) << "se.id()" << data.id() + INFO_LOG() << "se.id()" << data.id() << " se.displayName()" << data.streamName() << " m_rootItem->childCount()" << m_rootItem->childCount(); const QString newName = QString::fromStdString(data.streamName()); @@ -603,8 +602,8 @@ void UsedStreamsModel::onStreamNameDataChanged(int32_t mountingPointId, const QS Q_UNUSED(internalName) beginResetModel(); - INFO_LOG(m_logger) << "onDataChanged m_rootItem->childCount()" << m_rootItem->childCount(); - INFO_LOG(m_logger) << "se.id()" << mountingPointId + INFO_LOG() << "onDataChanged m_rootItem->childCount()" << m_rootItem->childCount(); + INFO_LOG() << "se.id()" << mountingPointId << " se.displayName()" << displayName << " m_rootItem->childCount()" << m_rootItem->childCount(); updateStreamNames(mountingPointId, displayName, m_rootItem); @@ -615,7 +614,7 @@ void UsedStreamsModel::onStreamNameDataChanged(int32_t mountingPointId, const QS void UsedStreamsModel::updateStreamNames(const int mountingPointId, const QString &newName, NGLTreeItem *item) { - INFO_LOG(m_logger) << "updateStreamNames mountingPointId=" << mountingPointId + INFO_LOG() << "updateStreamNames mountingPointId=" << mountingPointId << " newName=" << newName; int childCount = item->childCount(); @@ -624,17 +623,17 @@ void UsedStreamsModel::updateStreamNames(const int mountingPointId, const QStrin NGLTreeItem *child = item->child(i); if (!child->data().canConvert()) - ERROR_LOG(m_logger) << "Error convert item"; + ERROR_LOG() << "Error convert item"; StreamModelData usedStream = child->data().value(); - INFO_LOG(m_logger) << "i=" << i + INFO_LOG() << "i=" << i << " usedStream.mountingPointId=" << usedStream.mountingPointId << " usedStream.name=" << usedStream.name << " mountingPointId=" << mountingPointId << " newName=" << newName; if (mountingPointId == usedStream.mountingPointId) { - INFO_LOG(m_logger) << "Set new DisplayName id=" << usedStream.id + INFO_LOG() << "Set new DisplayName id=" << usedStream.id << " mountingPointId=" << usedStream.mountingPointId << " name=" << usedStream.name << " new Name =" << newName; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/avm_used_streams_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/avm_used_streams_model.h index 0f57379cc..8d8f747de 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/avm_used_streams_model.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/avm_used_streams_model.h @@ -70,7 +70,6 @@ private: int m_dummyId; MenuStruct m_menuStruct; StreamNameMapping *m_streamNameMapping; - NGL::INGLLogger &m_logger; }; } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/topic_replay.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/topic_replay.cpp index 68ca487e1..84224aabe 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/topic_replay.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/topic_replay.cpp @@ -50,15 +50,14 @@ private: TopicReplay::TopicReplay(DataInterface *dataIfc, bool isAudio) : m_isAudio(isAudio) , m_dataIfc(dataIfc) - , m_logger(getLogger("TopicReplay")) { - DEBUG_LOG(m_logger) << "TopicReplay::TopicReplay()"; + DEBUG_LOG() << "TopicReplay::TopicReplay()"; Q_ASSERT(dataIfc); } TopicReplay::~TopicReplay() { - DEBUG_LOG(m_logger) << "TopicReplay::~TopicReplay()"; + DEBUG_LOG() << "TopicReplay::~TopicReplay()"; if (m_isPlaying) playbackStop(); @@ -66,7 +65,7 @@ TopicReplay::~TopicReplay() QWidget *TopicReplay::createWidget() { - DEBUG_LOG(m_logger) << "TopicReplay::createWidget()"; + DEBUG_LOG() << "TopicReplay::createWidget()"; Q_ASSERT(!m_screenPlacementHelper); if (m_isAudio) @@ -81,19 +80,19 @@ QWidget *TopicReplay::createWidget() void TopicReplay::slotSetScriptResponse(const AudioVideoManagement::AvaStreamInfo &streamInfo, AudioVideoManagement::AvaStreamState streamState) { if (streamState == AudioVideoManagement::AvaStreamState::NotPossible) - ERROR_LOG(m_logger) << "Script could not be set"; + ERROR_LOG() << "Script could not be set"; else - ERROR_LOG(m_logger) << "Script set!"; + ERROR_LOG() << "Script set!"; - ERROR_LOG(m_logger) << "streamInfo: start" << streamInfo.duration.count(); - ERROR_LOG(m_logger) << "streamState: " << static_cast(streamState); + ERROR_LOG() << "streamInfo: start" << streamInfo.duration.count(); + ERROR_LOG() << "streamState: " << static_cast(streamState); } bool TopicReplay::playbackInit(const QJsonObject &attributes) { - DEBUG_LOG(m_logger) << "TopicReplay::playbackInit()"; - DEBUG_LOG(m_logger) << QJsonDocument(attributes).toJson(); + DEBUG_LOG() << "TopicReplay::playbackInit()"; + DEBUG_LOG() << QJsonDocument(attributes).toJson(); if (m_screenPlacementHelper && !m_isAudio) m_screenPlacementHelper->show(); @@ -104,7 +103,7 @@ bool TopicReplay::playbackInit(const QJsonObject &attributes) AvaControl *ctrl = getAvaControl(); if (ctrl == nullptr) { - ERROR_LOG(m_logger) << "no ava control!"; + ERROR_LOG() << "no ava control!"; return false; } @@ -112,7 +111,7 @@ bool TopicReplay::playbackInit(const QJsonObject &attributes) if (!topicData.isValid) { - ERROR_LOG(m_logger) << "topicData is invalid"; + ERROR_LOG() << "topicData is invalid"; return false; } @@ -123,7 +122,7 @@ bool TopicReplay::playbackInit(const QJsonObject &attributes) PlaybackApp *app = m_isAudio ? m_dataIfc->audioPresentationApp() : m_dataIfc->videoPresentationApp(); if (app == nullptr || app->inUse()) { - ERROR_LOG(m_logger) << "app invalid or in use!"; + ERROR_LOG() << "app invalid or in use!"; return false; } @@ -143,7 +142,7 @@ bool TopicReplay::playbackInit(const QJsonObject &attributes) if (!m_appHandle) { - ERROR_LOG(m_logger) << "appHandle: missing app after creating appHandle!"; + ERROR_LOG() << "appHandle: missing app after creating appHandle!"; return false; } @@ -151,7 +150,7 @@ bool TopicReplay::playbackInit(const QJsonObject &attributes) NGL::Settings s({}); bool isLocal = s.isDatabaseConnectionLocal(); - DEBUG_LOG(m_logger) << "isLocal? " << isLocal; + DEBUG_LOG() << "isLocal? " << isLocal; AvaScriptSource source; if (isLocal) @@ -169,7 +168,7 @@ bool TopicReplay::playbackInit(const QJsonObject &attributes) source = AvaScriptSource::ServerVideo; } - DEBUG_LOG(m_logger) << "source: " << static_cast(source); + DEBUG_LOG() << "source: " << static_cast(source); ctrl->setScript(m_appHandle.dialogId(), m_scriptName, source, topicData.streamList(), @@ -181,7 +180,7 @@ bool TopicReplay::playbackInit(const QJsonObject &attributes) bool TopicReplay::playbackStart(int secondsOffset) { - DEBUG_LOG(m_logger) << "TopicReplay::playbackStart()"; + DEBUG_LOG() << "TopicReplay::playbackStart()"; if (m_screenPlacementHelper && !m_isAudio) m_screenPlacementHelper->show(); @@ -189,7 +188,7 @@ bool TopicReplay::playbackStart(int secondsOffset) AvaControl *ctrl = getAvaControl(); if (ctrl == nullptr) { - ERROR_LOG(m_logger) << "ctrl == nullptr"; + ERROR_LOG() << "ctrl == nullptr"; return false; } @@ -197,7 +196,7 @@ bool TopicReplay::playbackStart(int secondsOffset) if (!m_appHandle) { - ERROR_LOG(m_logger) << "appHandle: missing app!"; + ERROR_LOG() << "appHandle: missing app!"; return false; } @@ -205,13 +204,13 @@ bool TopicReplay::playbackStart(int secondsOffset) ctrl->startScript(m_appHandle.dialogId(), m_scriptName); m_isPlaying = true; - DEBUG_LOG(m_logger) << "m_isPlaying = true"; + DEBUG_LOG() << "m_isPlaying = true"; return true; } bool TopicReplay::playbackPause() { - DEBUG_LOG(m_logger) << "TopicReplay::playbackPause()"; + DEBUG_LOG() << "TopicReplay::playbackPause()"; if (m_screenPlacementHelper) m_screenPlacementHelper->hide(); @@ -222,13 +221,13 @@ bool TopicReplay::playbackPause() AvaControl *ctrl = getAvaControl(); if (ctrl == nullptr) { - ERROR_LOG(m_logger) << "no ctrl!"; + ERROR_LOG() << "no ctrl!"; return false; } if (!m_appHandle) { - ERROR_LOG(m_logger) << "appHandle: missing app!"; + ERROR_LOG() << "appHandle: missing app!"; return false; } @@ -238,7 +237,7 @@ bool TopicReplay::playbackPause() bool TopicReplay::playbackStop() { - DEBUG_LOG(m_logger) << "TopicReplay::playbackStop()"; + DEBUG_LOG() << "TopicReplay::playbackStop()"; if (m_screenPlacementHelper) m_screenPlacementHelper->hide(); @@ -249,13 +248,13 @@ bool TopicReplay::playbackStop() AvaControl *ctrl = getAvaControl(); if (ctrl == nullptr) { - ERROR_LOG(m_logger) << "no ctrl!"; + ERROR_LOG() << "no ctrl!"; return false; } if (!m_appHandle) { - ERROR_LOG(m_logger) << "appHandle: missing app!"; + ERROR_LOG() << "appHandle: missing app!"; return false; } @@ -275,7 +274,7 @@ bool TopicReplay::exportTopic(const QJsonObject &attributes, VdControl *ctrl = getVdControl(); if (ctrl == nullptr) { - ERROR_LOG(m_logger) << "ctrl missing!"; + ERROR_LOG() << "ctrl missing!"; exportNotifier->setExportFailed(); return false; } @@ -287,7 +286,7 @@ bool TopicReplay::exportTopic(const QJsonObject &attributes, if (!topicData.isValid) { - ERROR_LOG(m_logger) << "topicData is invalid"; + ERROR_LOG() << "topicData is invalid"; exportNotifier->setExportFailed(); return false; } @@ -305,7 +304,7 @@ bool TopicReplay::exportTopic(const QJsonObject &attributes, void TopicReplay::onWidgetPlaced(const QRect &geometry) { - WARNING_LOG(m_logger) << "TopicReplay::onWidgetPlaced() - geo: " << geometry.x() << "/" << geometry.y() + WARNING_LOG() << "TopicReplay::onWidgetPlaced() - geo: " << geometry.x() << "/" << geometry.y() << " m_isAudio=" << m_isAudio; m_dialogGeometry = geometry; @@ -316,17 +315,17 @@ void TopicReplay::onWidgetPlaced(const QRect &geometry) PlaybackApp *app = m_isAudio ? m_dataIfc->audioPresentationApp() : m_dataIfc->videoPresentationApp(); if (app == nullptr) { - ERROR_LOG(m_logger) << "app missing!"; + ERROR_LOG() << "app missing!"; return; } if (!app->inUse()) { - ERROR_LOG(m_logger) << "app not in use - waiting for playbackInit to aquire it"; + ERROR_LOG() << "app not in use - waiting for playbackInit to aquire it"; return; } - DEBUG_LOG(m_logger) << "setGeometry"; + DEBUG_LOG() << "setGeometry"; app->setGeometry(*m_dialogGeometry); } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/CombatNetRadioConfiguration/avm_combat_net_radio_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/CombatNetRadioConfiguration/avm_combat_net_radio_dialog.cpp index 683e788fc..59c796adb 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/CombatNetRadioConfiguration/avm_combat_net_radio_dialog.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/CombatNetRadioConfiguration/avm_combat_net_radio_dialog.cpp @@ -25,7 +25,6 @@ CombatNetRadioDialog::CombatNetRadioDialog(LtsSession::LtsSession *session, cons , m_ui(new Ui::CombatNetRadioDialog) , m_menuGroup(menuGroup) , m_requestHelper(new LtsUtils::RequestHelper(this)) - , m_logger(getLogger("CombatNetRadioDialog")) { m_ui->setupUi(this); setUnchangeable(true); @@ -60,7 +59,7 @@ bool CombatNetRadioDialog::init(const std::shared_ptr &avmDtc, avmFtc->enableModifyCnrConfig() && avmFtc->enableRemoveCnrConfig())) { - ERROR_LOG(m_logger) << "Could not enable topics"; + ERROR_LOG() << "Could not enable topics"; return false; } @@ -79,7 +78,7 @@ bool CombatNetRadioDialog::init(const std::shared_ptr &avmDtc, { m_filter.reset(); m_model.reset(); - ERROR_LOG(m_logger) << "Could not init model"; + ERROR_LOG() << "Could not init model"; return false; } @@ -192,14 +191,14 @@ void CombatNetRadioDialog::onExportButtonClicked() int fileId = m_flmGui->saveFileContent(this, FileManagement::FileType::Xml, m_session->exerciseId(), byteArray); if (fileId > 0) - DEBUG_LOG(m_logger) << "Saved file with id = " << fileId; + DEBUG_LOG() << "Saved file with id = " << fileId; else - ERROR_LOG(m_logger) << "Could not save file in library "; + ERROR_LOG() << "Could not save file in library "; } void CombatNetRadioDialog::onImportButtonClicked() { - DEBUG_LOG(m_logger) << " onImportButtonClicked() "; + DEBUG_LOG() << " onImportButtonClicked() "; QByteArray content; int fileId = m_flmGui->loadFileContent(this, content, {FileManagement::FileType::Xml}, m_session->exerciseId(), FileManagement::toString(FileManagement::XmlType::AVMCombatNetRadio)); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/CombatNetRadioConfiguration/avm_combat_net_radio_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/CombatNetRadioConfiguration/avm_combat_net_radio_dialog.h index 0e90ac282..eb206dc32 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/CombatNetRadioConfiguration/avm_combat_net_radio_dialog.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/CombatNetRadioConfiguration/avm_combat_net_radio_dialog.h @@ -94,8 +94,5 @@ private: std::shared_ptr m_ppmDtc; ExerciseManagement::Interface::Dtc *m_exmDtc{nullptr}; std::shared_ptr m_flmGui; - - LOGGER_T m_logger; - }; } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/CombatNetRadioConfiguration/avm_combat_net_radio_dialog_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/CombatNetRadioConfiguration/avm_combat_net_radio_dialog_model.cpp index 95000118f..9955af8a4 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/CombatNetRadioConfiguration/avm_combat_net_radio_dialog_model.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/CombatNetRadioConfiguration/avm_combat_net_radio_dialog_model.cpp @@ -26,7 +26,6 @@ CombatNetRadioDialogModel::CombatNetRadioDialogModel(int32_t exerciseId, QObject tr("Global") }, parent) , m_exerciseId(exerciseId) -, m_logger(getLogger("CombatNetRadioDialogModel")) { } @@ -41,7 +40,7 @@ QVariant CombatNetRadioDialogModel::data(const QModelIndex &index, int role) con switch (index.column()) { case CHANNEL: - INFO_LOG(m_logger)<<"CombatNetRadioDialogModel::data role =" << role + INFO_LOG()<<"CombatNetRadioDialogModel::data role =" << role << " row = " << index.row(); return QString::fromStdString(m_cnrChannels.value(config.cnrChannelId()).name()); case RADIO_CIRCUIT: @@ -62,14 +61,14 @@ QVariant CombatNetRadioDialogModel::data(const QModelIndex &index, int role) con if (unit.id() != unitId) return {}; - INFO_LOG(m_logger) << " config.unitId()=" << unitId + INFO_LOG() << " config.unitId()=" << unitId << " Str=" << unit.name(); QString unitStr; if (unit.designator().size() > 0) unitStr = QString::fromStdString(unit.designator()) + QLatin1Char('/'); unitStr.append(QString::fromStdString(unit.tacticalIdentifier())); - INFO_LOG(m_logger) << "unitStr = " << unitStr; + INFO_LOG() << "unitStr = " << unitStr; return unitStr; } @@ -99,7 +98,7 @@ bool CombatNetRadioDialogModel::init(const std::shared_ptr &avmD if (!ppmDtc->visibleParties(m_parties, LtsSessionData::LtsSessionData::getInstance()->getVisibleParties(m_exerciseId))) { - ERROR_LOG(m_logger) << "Could not retrieve visible Parties!"; + ERROR_LOG() << "Could not retrieve visible Parties!"; return false; } m_units = ppmDtc->units(); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/CombatNetRadioConfiguration/avm_combat_net_radio_dialog_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/CombatNetRadioConfiguration/avm_combat_net_radio_dialog_model.h index eb975fffa..76848a2ab 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/CombatNetRadioConfiguration/avm_combat_net_radio_dialog_model.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/CombatNetRadioConfiguration/avm_combat_net_radio_dialog_model.h @@ -46,8 +46,6 @@ private: QMap m_cnrChannels; QMap m_parties; QMap m_units; - - LOGGER_T m_logger; }; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/CombatNetRadioConfiguration/avm_edit_combat_net_radio_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/CombatNetRadioConfiguration/avm_edit_combat_net_radio_dialog.cpp index 0b246fc91..de52724a4 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/CombatNetRadioConfiguration/avm_edit_combat_net_radio_dialog.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/CombatNetRadioConfiguration/avm_edit_combat_net_radio_dialog.cpp @@ -92,7 +92,6 @@ EditCombatNetRadioDialog::EditCombatNetRadioDialog(const boost::optionalcbUnit->currentIndex() > 0) { request.unitId().set(m_ui->cbUnit->currentData().toInt()); - INFO_LOG(m_logger)<< "currentIndex="<cbUnit->currentIndex() + INFO_LOG()<< "currentIndex="<cbUnit->currentIndex() << " unitId ="< parties; if (!m_ppmDtc->visibleParties(parties, LtsSessionData::LtsSessionData::getInstance()->getVisibleParties(m_exerciseId))) - ERROR_LOG(m_logger) << "Could not retrieve visible Parties!"; + ERROR_LOG() << "Could not retrieve visible Parties!"; for (const ParticipantManagement::Party &party : std::as_const(parties)) m_ui->cbParty->addItem(ParticipantManagement::trPartyName(party.name()), party.id()); @@ -490,10 +489,10 @@ void EditCombatNetRadioDialog::onPartyIndexChanged(int index) if (unit.designator().size() > 0) { unitStr = QString::fromStdString(unit.designator()) + QLatin1Char('/'); - INFO_LOG(m_logger)<<"Designator != leer: unitStr = " << unitStr; + INFO_LOG()<<"Designator != leer: unitStr = " << unitStr; } unitStr += QString::fromStdString(unit.tacticalIdentifier()); - INFO_LOG(m_logger) << "unitStr =" << unitStr + INFO_LOG() << "unitStr =" << unitStr << " id =" << unit.id(); m_ui->cbUnit->addItem(unitStr, unit.id()); @@ -562,14 +561,14 @@ void EditCombatNetRadioDialog::onExportButtonClicked() QByteArray byteArray = cnrConfigRequestToJson(); int fileId = m_flmGui->saveFileContent(this, FileManagement::FileType::Xml, m_exerciseId, byteArray); if (fileId > 0) - DEBUG_LOG(m_logger) << "Saved file with id = " << fileId; + DEBUG_LOG() << "Saved file with id = " << fileId; else - ERROR_LOG(m_logger) << "Could not save file in library "; + ERROR_LOG() << "Could not save file in library "; } void EditCombatNetRadioDialog::onImportButtonClicked() { - DEBUG_LOG(m_logger) << " onImportButtonClicked() "; + DEBUG_LOG() << " onImportButtonClicked() "; QByteArray content; int fileId = m_flmGui->loadFileContent(this, content, {FileManagement::FileType::Xml}, m_exerciseId, FileManagement::toString(FileManagement::XmlType::AVMEditCombatNetRadio)); @@ -589,7 +588,7 @@ void EditCombatNetRadioDialog::onImportButtonClicked() { ModifyCnrConfigRequest req = jsonToModifyCnrConfig(content); setUiValues(toConfig(req)); - INFO_LOG(m_logger) << "--- onImportButtonClicked() "; + INFO_LOG() << "--- onImportButtonClicked() "; } } } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/CombatNetRadioConfiguration/avm_edit_combat_net_radio_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/CombatNetRadioConfiguration/avm_edit_combat_net_radio_dialog.h index 594aa7618..f20c36584 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/CombatNetRadioConfiguration/avm_edit_combat_net_radio_dialog.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/CombatNetRadioConfiguration/avm_edit_combat_net_radio_dialog.h @@ -117,7 +117,5 @@ private: QVector m_takenNames; std::unique_ptr m_requestHelper; bool m_isGlobal; - - LOGGER_T m_logger; }; } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/CombatNetRadioConfiguration/avm_load_combat_net_radio_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/CombatNetRadioConfiguration/avm_load_combat_net_radio_dialog.cpp index 8be928d4c..7180fa1e6 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/CombatNetRadioConfiguration/avm_load_combat_net_radio_dialog.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/CombatNetRadioConfiguration/avm_load_combat_net_radio_dialog.cpp @@ -15,7 +15,6 @@ LoadCombatNetRadioDialog::LoadCombatNetRadioDialog(const QByteArray &data, : LtsWidgets::LtsFramelessDialog(parent, LtsWidgets::Behaviour::Modal) , m_ui(new Ui::LoadCombatNetRadioDialog) , m_model(new LoadCombatNetRadioDialogModel(data, session)) - , m_logger(getLogger("LoadCombatNetRadioDialog")) { m_ui->setupUi(this); m_ui->dataView->setModel(m_model); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/CombatNetRadioConfiguration/avm_load_combat_net_radio_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/CombatNetRadioConfiguration/avm_load_combat_net_radio_dialog.h index fbd8fd9b5..502c9a702 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/CombatNetRadioConfiguration/avm_load_combat_net_radio_dialog.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/CombatNetRadioConfiguration/avm_load_combat_net_radio_dialog.h @@ -60,7 +60,5 @@ private: std::unique_ptr m_ui; LoadCombatNetRadioDialogModel *m_model; bool m_isApplied = false; - - LOGGER_T m_logger; }; } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/CombatNetRadioConfiguration/avm_load_combat_net_radio_dialog_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/CombatNetRadioConfiguration/avm_load_combat_net_radio_dialog_model.cpp index a448c74c2..5d599d268 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/CombatNetRadioConfiguration/avm_load_combat_net_radio_dialog_model.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/CombatNetRadioConfiguration/avm_load_combat_net_radio_dialog_model.cpp @@ -34,9 +34,8 @@ LoadCombatNetRadioDialogModel::LoadCombatNetRadioDialogModel(const QByteArray &d tr("Conflict(s)") }, parent) , m_exerciseId(session == nullptr ? 0 : session->exerciseId()) - , m_logger(getLogger("LoadCombatNetRadioDialogModel")) { - DEBUG_LOG(m_logger) << "Own exercise id: " << m_exerciseId; + DEBUG_LOG() << "Own exercise id: " << m_exerciseId; if (session != nullptr) { @@ -45,28 +44,28 @@ LoadCombatNetRadioDialogModel::LoadCombatNetRadioDialogModel(const QByteArray &d if (!session->getDtc(avmDtc) || !avmDtc->enableCnrChannel() || !avmDtc->enableCnrConfig()) - ERROR_LOG(m_logger) << "Could not get AVM data"; + ERROR_LOG() << "Could not get AVM data"; else { m_cnrChannels = avmDtc->cnrChannels(); m_cnrConfigs = avmDtc->cnrConfigs(); } - DEBUG_LOG(m_logger) << "cnrconfigs: " << m_cnrConfigs.size(); - DEBUG_LOG(m_logger) << "ownExerciseId: " << m_exerciseId; + DEBUG_LOG() << "cnrconfigs: " << m_cnrConfigs.size(); + DEBUG_LOG() << "ownExerciseId: " << m_exerciseId; std::shared_ptr exmDtc; if (!session->getDtc(exmDtc) || !exmDtc->enableExercise()) - ERROR_LOG(m_logger) << "Could not get EXM data"; + ERROR_LOG() << "Could not get EXM data"; else m_exercises = exmDtc->exercises(); - DEBUG_LOG(m_logger) << "exercises: " << m_exercises.size(); + DEBUG_LOG() << "exercises: " << m_exercises.size(); } else - ERROR_LOG(m_logger) << "Got invalid session."; + ERROR_LOG() << "Got invalid session."; m_vecData = jsonToCnrConfigVector(data); @@ -378,7 +377,7 @@ QVector LoadCombatNetRadioDialogModel::removeRequest { if (!m_conflictedCnrIds.contains(idxCounter)) { - WARNING_LOG(m_logger) << "Tried to get remove request for row " << idxCounter << " but it is not present."; + WARNING_LOG() << "Tried to get remove request for row " << idxCounter << " but it is not present."; continue; } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/CombatNetRadioConfiguration/avm_load_combat_net_radio_dialog_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/CombatNetRadioConfiguration/avm_load_combat_net_radio_dialog_model.h index d3ab5de71..324b15538 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/CombatNetRadioConfiguration/avm_load_combat_net_radio_dialog_model.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/CombatNetRadioConfiguration/avm_load_combat_net_radio_dialog_model.h @@ -107,7 +107,5 @@ private: QVector m_includeStates; QVector m_disabledRows; QVector m_conflicts; - - LOGGER_T m_logger; }; } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_edit_frequency_planning_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_edit_frequency_planning_dialog.cpp index 8291313a6..9958fac06 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_edit_frequency_planning_dialog.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_edit_frequency_planning_dialog.cpp @@ -67,7 +67,6 @@ EditFrequencyPlanningDialog::EditFrequencyPlanningDialog(LtsSession::LtsSession , m_exerciseId(session->exerciseId()) , m_isEdit(EditFrequencyPlanningSetResourceDialog::DialogMode::Assign) , m_activeFrequencyPlanningStatus(0) - , m_logger(getLogger("EditFrequencyPlanningDialog")) { m_ui->setupUi(this); @@ -139,7 +138,7 @@ void EditFrequencyPlanningDialog::retranslate() void EditFrequencyPlanningDialog::onRemoveFrequencyPlanningReply(const Core::FunctionReplyObject &reply) { if (reply.error()) - ERROR_LOG(m_logger) << reply.str(); + ERROR_LOG() << reply.str(); m_requestHelper->requestReply(reply); } @@ -186,7 +185,7 @@ void EditFrequencyPlanningDialog::onAddClicked() if (cnrConfigId <= 0) return; - DEBUG_LOG(m_logger) << "---RessourceDialog aufrufen...." + DEBUG_LOG() << "---RessourceDialog aufrufen...." << " cnrConfigId: " << cnrConfigId << " radioCircuit: " << cnrConfigRow.radioCircuit() << " FrequencySetId: " << m_frequencyDataModel->getFrequencySetId(); @@ -271,7 +270,7 @@ void EditFrequencyPlanningDialog::enableSelectedUnassignButton() m_buttonBox->setText(LtsWidgets::DialogButton::Add, tr("Assign")); } - DEBUG_LOG(m_logger) << "---enableAssignUnassignButtons()...." + DEBUG_LOG() << "---enableAssignUnassignButtons()...." << " cnrConfigId: " << cnrConfigId << " radioCircuitId: " << cnrConfigRow.radioCircuit(); @@ -283,7 +282,7 @@ void EditFrequencyPlanningDialog::enableSelectedUnassignButton() void EditFrequencyPlanningDialog::onAssignRadioCircuit(const FrequencyPlanningData &fpd) { - DEBUG_LOG(m_logger) << "---onAssignRadioCircuit()...." + DEBUG_LOG() << "---onAssignRadioCircuit()...." << "CnrConfigId: " << fpd.cnrConfigId(); m_frequencyDataModel->setFrequencyPlanningData(fpd); @@ -371,14 +370,14 @@ void EditFrequencyPlanningDialog::onExportButtonClicked() QByteArray byteArray = m_frequencyDataModel->uiToJson(); int fileId = m_flmGui->saveFileContent(this, FileManagement::FileType::Xml, m_session->exerciseId(), byteArray); if (fileId > 0) - DEBUG_LOG(m_logger) << "Saved file with id = " << fileId; + DEBUG_LOG() << "Saved file with id = " << fileId; else - ERROR_LOG(m_logger) << "Could not save file in library "; + ERROR_LOG() << "Could not save file in library "; } void EditFrequencyPlanningDialog::onImportButtonClicked() { - DEBUG_LOG(m_logger) << "--- onImportButtonClicked() "; + DEBUG_LOG() << "--- onImportButtonClicked() "; QByteArray content; int fileId = m_flmGui->loadFileContent(this, content, {FileManagement::FileType::Xml}, m_session->exerciseId(), FileManagement::toString(FileManagement::XmlType::AVMEditFrequencyPlanning)); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_edit_frequency_planning_frequency_data_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_edit_frequency_planning_frequency_data_model.cpp index 7b13b33ff..922669910 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_edit_frequency_planning_frequency_data_model.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_edit_frequency_planning_frequency_data_model.cpp @@ -150,11 +150,10 @@ EditFrequencyPlanningFrequencyDataModel::EditFrequencyPlanningFrequencyDataModel , m_ismDtc(ismDtc) , m_ppmDtc(ppmDtc) , m_initPlan(initPlanning) - , m_logger(getLogger("EditFrequencyPlanningDataModel")) { Q_ASSERT(avmDtc); Q_ASSERT(ppmDtc); - DEBUG_LOG(m_logger) << "---EditFrequencyPlanningDataMod m_frequencyPlanningData[c.id()];el() "; + DEBUG_LOG() << "---EditFrequencyPlanningDataMod m_frequencyPlanningData[c.id()];el() "; int frequencySetId = initPlanning.frequencySetId(); std::vector fsdVec = m_avmDtc->frequencySet(frequencySetId).data(); @@ -385,14 +384,14 @@ QVariant EditFrequencyPlanningFrequencyDataModel::data(const QModelIndex &index, return QStringLiteral("-"); const auto unit = m_units[unitId]; - INFO_LOG(m_logger) << " config.unitId()=" << unitId + INFO_LOG() << " config.unitId()=" << unitId << " Str=" << unit.name(); QString unitStr; if (unit.designator().size() > 0) unitStr = QString::fromStdString(unit.designator()) + QLatin1Char('/'); unitStr.append(QString::fromStdString(unit.tacticalIdentifier())); - INFO_LOG(m_logger) << "unitStr = " << unitStr; + INFO_LOG() << "unitStr = " << unitStr; return unitStr; } @@ -607,7 +606,7 @@ void EditFrequencyPlanningFrequencyDataModel::setFrequencePlanningId(int id) m_initPlan.id(id); return; } - WARNING_LOG(m_logger) << "Trying to set a new frequency planning id but there is alreay an id set (" + WARNING_LOG() << "Trying to set a new frequency planning id but there is alreay an id set (" << m_initPlan.id() << " - " << id << ")"; } @@ -784,12 +783,12 @@ bool EditFrequencyPlanningFrequencyDataModel::checkResourceAssignments() { if (inner != outer) { - DEBUG_LOG(m_logger) << "---ist ungleich cnrConfigId(A): " << p.cnrConfigId() + DEBUG_LOG() << "---ist ungleich cnrConfigId(A): " << p.cnrConfigId() << " (B): " << pI.cnrConfigId(); } else { - DEBUG_LOG(m_logger) << "---ist gleich cnrConfigId(A): " << p.cnrConfigId() + DEBUG_LOG() << "---ist gleich cnrConfigId(A): " << p.cnrConfigId() << " (B): " << pI.cnrConfigId(); if (!m_multipleAssignedCnrIds.contains(p.cnrConfigId()) ) m_multipleAssignedCnrIds.append(p.cnrConfigId()); @@ -809,7 +808,7 @@ bool EditFrequencyPlanningFrequencyDataModel::checkResourceAssignments() qs.append(QString::number(id)); qs.append(QStringLiteral(", ")); } - DEBUG_LOG(m_logger) << "---Number of multiple assigned frequency set data: " << m_multipleAssignedCnrIds.size() + DEBUG_LOG() << "---Number of multiple assigned frequency set data: " << m_multipleAssignedCnrIds.size() << " cnrConfigIds: " << qs; #endif return bOk; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_edit_frequency_planning_resource_data_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_edit_frequency_planning_resource_data_model.cpp index d617acb3c..d763f603a 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_edit_frequency_planning_resource_data_model.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_edit_frequency_planning_resource_data_model.cpp @@ -24,7 +24,6 @@ EditFrequencyPlanningResourceDataModel::EditFrequencyPlanningResourceDataModel(c }, parent) , m_assignedFrequencySetDataIds(assignedFrequencySetDataIds) , m_frequencyBand(frequencyBand) - , m_logger(getLogger("EditFrequencyPlanningResourceDataModel")) { } @@ -89,7 +88,7 @@ bool EditFrequencyPlanningResourceDataModel::isFiltered(const AudioVideoManageme if (m_assignedFrequencySetDataIds.contains(data.id())) { - DEBUG_LOG(m_logger) << "---m_assignments.size(): " << m_assignedFrequencySetDataIds.size() + DEBUG_LOG() << "---m_assignments.size(): " << m_assignedFrequencySetDataIds.size() << " frequencySetDataId: " << data.id() << " ist bereits enthalten"; return true; } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_edit_frequency_planning_resource_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_edit_frequency_planning_resource_dialog.cpp index 425e2dff6..26d8f8b08 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_edit_frequency_planning_resource_dialog.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_edit_frequency_planning_resource_dialog.cpp @@ -42,7 +42,6 @@ EditFrequencyPlanningResourceDialog::EditFrequencyPlanningResourceDialog(int fre , m_ui(new Ui::EditFrequencyPlanningResourceDialog) , m_frequencySetId(frequencySetId) , m_dialogMode(dialogMode) - , m_logger(getLogger("EditFrequencyPlanningResourceDialog")) { m_ui->setupUi(this); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_edit_frequency_planning_set_resource_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_edit_frequency_planning_set_resource_dialog.cpp index 21b7a383a..d9a7eaae5 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_edit_frequency_planning_set_resource_dialog.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_edit_frequency_planning_set_resource_dialog.cpp @@ -32,7 +32,6 @@ EditFrequencyPlanningSetResourceDialog::EditFrequencyPlanningSetResourceDialog( , m_avmDtc(avmDtc) , m_frequencyResourceDataModel(nullptr) , m_config(m_avmDtc->cnrConfig(cnrConfigId)) - , m_logger(getLogger("EditFrequencyPlanningSetResourceDialog")) { m_ui->setupUi(this); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_frequency_planning_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_frequency_planning_dialog.cpp index 127a40a78..00778e933 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_frequency_planning_dialog.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_frequency_planning_dialog.cpp @@ -38,11 +38,10 @@ FrequencyPlanningDialog::FrequencyPlanningDialog(LtsSession::LtsSession *session , m_ismDtc(nullptr) , m_flmGui(nullptr) , m_activeFrequencyPlanningStatus(0) - , m_logger(getLogger("FrequencyPlanningDialog")) { m_ui->setupUi(this); - DEBUG_LOG(m_logger) << "---FrequencyPlanningDialog() "; + DEBUG_LOG() << "---FrequencyPlanningDialog() "; m_ui->dataView->setSelectionMode(QAbstractItemView::SingleSelection); m_ui->dataView->treeView()->setSelectionBehavior(QAbstractItemView::SelectRows); @@ -92,7 +91,7 @@ bool FrequencyPlanningDialog::init(const std::shared_ptr &avmDtc avmDtc->enableActiveFrequencyPlanning() && ismDtc->enableMainStructureElement())) { - ERROR_LOG(m_logger) << "Could not enable topics"; + ERROR_LOG() << "Could not enable topics"; return false; } @@ -109,7 +108,7 @@ bool FrequencyPlanningDialog::init(const std::shared_ptr &avmDtc { delete m_model; m_model = nullptr; - ERROR_LOG(m_logger) << "Could not init model"; + ERROR_LOG() << "Could not init model"; return false; } @@ -301,7 +300,7 @@ void FrequencyPlanningDialog::onEditClicked() return; const FrequencyPlanning &fp = m_model->data(currentIndex, Qt::UserRole).value(); - DEBUG_LOG(m_logger) << "---onEditClicked() FrequencyPlanningId: " << fp.id() << " FrequencySetDataId: " << fp.frequencySetId(); + DEBUG_LOG() << "---onEditClicked() FrequencyPlanningId: " << fp.id() << " FrequencySetDataId: " << fp.frequencySetId(); m_copy = false; showEditDialog(m_model->data(currentIndex, Qt::UserRole).value()); @@ -441,14 +440,14 @@ void FrequencyPlanningDialog::onExportButtonClicked() int fileId = m_flmGui->saveFileContent(this, FileManagement::FileType::Xml, m_session->exerciseId(), byteArray); if (fileId > 0) - DEBUG_LOG(m_logger) << "Saved file with id = " << fileId; + DEBUG_LOG() << "Saved file with id = " << fileId; else - ERROR_LOG(m_logger) << "Could not save file in library "; + ERROR_LOG() << "Could not save file in library "; } void FrequencyPlanningDialog::onImportButtonClicked() { - DEBUG_LOG(m_logger) << " onImportButtonClicked() "; + DEBUG_LOG() << " onImportButtonClicked() "; if (m_model->rowCount() > 0) { QHash texts({{LtsWidgets::Button::Yes, tr("Ok")}}); @@ -485,7 +484,7 @@ void FrequencyPlanningDialog::onImportButtonClicked() return m_avmFtc->modifyFrequencyPlanningRequest(request, this); }); } - INFO_LOG(m_logger) << "--- onImportButtonClicked() "; + INFO_LOG() << "--- onImportButtonClicked() "; } } } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_frequency_planning_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_frequency_planning_dialog.h index 743ecb5be..6db7da523 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_frequency_planning_dialog.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_frequency_planning_dialog.h @@ -124,7 +124,5 @@ private: std::shared_ptr m_flmGui; QMap m_editDlgMap; int m_activeFrequencyPlanningStatus; - LOGGER_T m_logger; - }; } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_frequency_planning_dialog_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_frequency_planning_dialog_model.cpp index 1422892ad..6d00a6281 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_frequency_planning_dialog_model.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_frequency_planning_dialog_model.cpp @@ -21,9 +21,8 @@ FrequencyPlanningDialogModel::FrequencyPlanningDialogModel(int32_t exerciseId, Q tr("Active") }, parent) , m_exerciseId(exerciseId) - , m_logger(getLogger("FrequencyPlanningDialogModel")) { - DEBUG_LOG(m_logger) << "---FrequencyPlanningDialogModel() "; + DEBUG_LOG() << "---FrequencyPlanningDialogModel() "; } QVariant FrequencyPlanningDialogModel::data(const QModelIndex &index, int role) const @@ -83,7 +82,7 @@ FrequencySet FrequencyPlanningDialogModel::frequencySetByIndex(const QModelIndex void FrequencyPlanningDialogModel::onFrequencyPlanningChanged(const FrequencyPlanning &data, DataModification modType) { - INFO_LOG(m_logger) << "onFrequencyPlanningChanged " + INFO_LOG() << "onFrequencyPlanningChanged " << " data.exerciseId()" << data.exerciseId() << " m_exerciseId=" << m_exerciseId; if ((data.exerciseId().is_set() && data.exerciseId().get() != m_exerciseId) @@ -101,7 +100,7 @@ QByteArray FrequencyPlanningDialogModel::modelToJson() for (int row = 0; row < rowCount(); row++) { - DEBUG_LOG(m_logger) << "row =" << ": " << row; + DEBUG_LOG() << "row =" << ": " << row; QJsonObject inner; const FrequencyPlanning &planning = m_vecData.at(row); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_frequency_planning_dialog_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_frequency_planning_dialog_model.h index b28ea9292..cc4362b5e 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_frequency_planning_dialog_model.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_frequency_planning_dialog_model.h @@ -53,7 +53,6 @@ private: QMap m_frequencySets; friend class FrequencyPlanningDialogProxyModel; - LOGGER_T m_logger; }; class FrequencyPlanningDialogProxyModel final : public LtsWidgets::LtsColumnFilterProxyModel diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_frequency_planning_widget.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_frequency_planning_widget.cpp index 1ae1a8604..c90ad883d 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_frequency_planning_widget.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_frequency_planning_widget.cpp @@ -22,7 +22,6 @@ FrequencyPlanningWidget::FrequencyPlanningWidget(const std::shared_ptrsetupUi(this); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_init_frequency_planning_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_init_frequency_planning_dialog.cpp index 296ac5c03..1b9187f77 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_init_frequency_planning_dialog.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_init_frequency_planning_dialog.cpp @@ -15,9 +15,8 @@ InitFrequencyPlanningDialog::InitFrequencyPlanningDialog(LtsSession::LtsSession , m_ui(new Ui::InitFrequencyPlanningDialog) , m_dateOfCreation(session->partitionTime()) , m_session(session) - , m_logger(getLogger("InitFrequencyPlanningDialog")) { - DEBUG_LOG(m_logger) << "---InitFrequencyPlanningDialog() "; + DEBUG_LOG() << "---InitFrequencyPlanningDialog() "; m_ui->setupUi(this); QMap frequencySets = avmDtc->frequencySets(); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_init_frequency_planning_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_init_frequency_planning_dialog.h index dad4ff7b5..4146fcf2b 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_init_frequency_planning_dialog.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_init_frequency_planning_dialog.h @@ -40,7 +40,5 @@ private: Ui::InitFrequencyPlanningDialog *m_ui; qint64 m_dateOfCreation; LtsSession::LtsSession *m_session; - LOGGER_T m_logger; - }; } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_load_frequency_planning_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_load_frequency_planning_dialog.cpp index a4eee1db3..661b52473 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_load_frequency_planning_dialog.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_load_frequency_planning_dialog.cpp @@ -13,7 +13,6 @@ LoadFrequencyPlanningDialog::LoadFrequencyPlanningDialog(const QByteArray &data, : LtsWidgets::LtsFramelessDialog(parent, LtsWidgets::Behaviour::Modal) , m_ui(new Ui::LoadFrequencyPlanningDialog) , m_model(new LoadFrequencyPlanningDialogModel(initPlan, avmDtc, ismDtc, this)) - , m_logger(getLogger("LoadFrequencyPlanningDialog")) { m_ui->setupUi(this); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_load_frequency_planning_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_load_frequency_planning_dialog.h index ec3a5243c..4259ad304 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_load_frequency_planning_dialog.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_load_frequency_planning_dialog.h @@ -62,7 +62,5 @@ private: std::unique_ptr m_ui; LoadFrequencyPlanningDialogModel *m_model; bool m_isApplied = false; - - LOGGER_T m_logger; }; } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_load_frequency_planning_dialog_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_load_frequency_planning_dialog_model.cpp index 314177d3b..a12a67848 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_load_frequency_planning_dialog_model.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_load_frequency_planning_dialog_model.cpp @@ -140,10 +140,9 @@ LoadFrequencyPlanningDialogModel::LoadFrequencyPlanningDialogModel(const Frequen , m_initPlan(initPlan) , m_parentPlan(initPlan) , m_exerciseId(initPlan.exerciseId().is_set() ? initPlan.exerciseId().get() : 0) - , m_logger(getLogger("EditFrequencyPlanningDataModel")) { Q_ASSERT(avmDtc); - DEBUG_LOG(m_logger) << "---EditFrequencyPlanningDataMod m_frequencyPlanningData[c.id()];el() "; + DEBUG_LOG() << "---EditFrequencyPlanningDataMod m_frequencyPlanningData[c.id()];el() "; m_initPlan.data().clear(); @@ -168,7 +167,7 @@ void LoadFrequencyPlanningDialogModel::setData(const QByteArray &data) if (m_initPlan.frequencySetId() != obj.value("frequencySetId")) { - ERROR_LOG(m_logger) << "false frequency set!"; + ERROR_LOG() << "false frequency set!"; return; } @@ -620,7 +619,7 @@ void LoadFrequencyPlanningDialogModel::checkConflicts() if (!item || !item->data().canConvert()) { - DEBUG_LOG(m_logger) << "Could not get item for row " << row; + DEBUG_LOG() << "Could not get item for row " << row; continue; } @@ -874,7 +873,7 @@ QVector LoadFrequencyPlanningDialogModel::planningData() if (!item || !item->data().canConvert()) { - DEBUG_LOG(m_logger) << "Could not get item for row " << row; + DEBUG_LOG() << "Could not get item for row " << row; continue; } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/Eloka/avm_eloka_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/Eloka/avm_eloka_dialog.cpp index c78c60032..1cd09e62b 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/Eloka/avm_eloka_dialog.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/Eloka/avm_eloka_dialog.cpp @@ -32,7 +32,6 @@ ElokaDialog::ElokaDialog(LtsSession::LtsSession *session, AvaSession *avaSession , m_usedCnr() , m_usedTvc() , m_usedAnnouncement() - , m_logger(getLogger("ElokaDialog")) { Q_ASSERT(session); Q_ASSERT(avaSession); @@ -110,7 +109,7 @@ void ElokaDialog::setAvaSessionStatus(bool established) void ElokaDialog::onAddClicked() { - DEBUG_LOG(m_logger) << "**** onAddClicked() "; + DEBUG_LOG() << "**** onAddClicked() "; ElokaEditDialog *dialog = new ElokaEditDialog(m_session, m_avaSession, m_avmDtc, m_streamNameMapping, ElokaData(), this); @@ -129,7 +128,7 @@ void ElokaDialog::onAddClicked() void ElokaDialog::onEditClicked() { - DEBUG_LOG(m_logger) << "**** onEditClicked() "; + DEBUG_LOG() << "**** onEditClicked() "; const QModelIndex idx = m_ui->tvEloka->currentIndex(); @@ -155,7 +154,7 @@ void ElokaDialog::onEditClicked() void ElokaDialog::onRemoveClicked() { - DEBUG_LOG(m_logger) << "**** onRemoveClicked() "; + DEBUG_LOG() << "**** onRemoveClicked() "; const QModelIndex idx = m_ui->tvEloka->currentIndex(); @@ -185,7 +184,7 @@ void ElokaDialog::onPrint() void ElokaDialog::onQueryElokaResponse(const QVector &&eloka) { - DEBUG_LOG(m_logger) << "onQueryElokaResponse"; + DEBUG_LOG() << "onQueryElokaResponse"; m_elokaListCollector.start(); m_elokaModel->clear(); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/Eloka/avm_eloka_edit_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/Eloka/avm_eloka_edit_dialog.cpp index f3feeb1b6..80769508e 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/Eloka/avm_eloka_edit_dialog.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/Eloka/avm_eloka_edit_dialog.cpp @@ -110,7 +110,6 @@ ElokaEditDialog::ElokaEditDialog(LtsSession::LtsSession *session, AvaSession *av , m_tvcConfigMap() , m_announcementMap() , m_userProfile() - , m_logger(getLogger("ElokaEditDialog")) { Q_ASSERT(session); Q_ASSERT(avaSession); @@ -352,7 +351,7 @@ void ElokaEditDialog::getActiveCnrs() void ElokaEditDialog::onCnrConfigChanged(const CnrConfig &data, DataModification modType) { - DEBUG_LOG(m_logger) << "onCnrConfigChanged"; + DEBUG_LOG() << "onCnrConfigChanged"; switch (modType) { case DataModification::eAdded: @@ -375,7 +374,7 @@ void ElokaEditDialog::onCnrConfigChanged(const CnrConfig &data, void ElokaEditDialog::onTvcConfigChanged(const TvcConfig &data, DataModification modType) { - DEBUG_LOG(m_logger) << "onTvcConfigChanged"; + DEBUG_LOG() << "onTvcConfigChanged"; switch (modType) { @@ -399,7 +398,7 @@ void ElokaEditDialog::onTvcConfigChanged(const TvcConfig &data, void ElokaEditDialog::onStreamChanged(const Stream &data, DataModification modType) { - DEBUG_LOG(m_logger) << "onStreamChanged"; + DEBUG_LOG() << "onStreamChanged"; if ((data.type() != StreamType_def::AudioOut) && (data.type() != StreamType_def::AudioInOut)) @@ -428,7 +427,7 @@ void ElokaEditDialog::onCnrTvcProfileChanged(const CnrTvcProfile &data, DataModification modType) { Q_UNUSED(modType); - DEBUG_LOG(m_logger) << "onCnrTvcProfileChanged"; + DEBUG_LOG() << "onCnrTvcProfileChanged"; if (data.exerciseId() != m_session->exerciseId() || data.operatorId() != LtsSessionData::LtsSessionData::getInstance()->getOperatorId()) @@ -536,7 +535,7 @@ void ElokaEditDialog::setCurrentCircuit(const ElokaData &data) void ElokaEditDialog::onGetElokaListResponse(const QVector &actions) { - DEBUG_LOG(m_logger) << "onGetElokaListResponse"; + DEBUG_LOG() << "onGetElokaListResponse"; if (!m_elokaData.internalName.isEmpty()) setUnchangeable(true); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/Eloka/avm_eloka_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/Eloka/avm_eloka_model.cpp index 2494ee0f0..3e408912d 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/Eloka/avm_eloka_model.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/Eloka/avm_eloka_model.cpp @@ -20,7 +20,6 @@ ElokaModel::ElokaModel(LtsSession::LtsSession *session, QObject *parent) tr("Start Time") }, parent) - , m_logger(getLogger("ElokaModel")) { Q_ASSERT(session); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/MobileVideoSystem/avm_mvs_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/MobileVideoSystem/avm_mvs_dialog.cpp index 36b9bab79..d81c5930d 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/MobileVideoSystem/avm_mvs_dialog.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/MobileVideoSystem/avm_mvs_dialog.cpp @@ -24,7 +24,6 @@ MvsDialog::MvsDialog(const QString &menuGroup, LtsSession::LtsSession *session, , m_requestHelper(new LtsUtils::RequestHelper(this)) , m_avmDtc(nullptr) , m_avmFtc(nullptr) - , m_logger(getLogger("MvsDialog")) { m_ui->setupUi(this); setOnlineHelpFilename(QStringLiteral("Situation-Configuration_Video_Teams")); @@ -59,7 +58,7 @@ bool MvsDialog::init(const std::shared_ptr { delete m_model; m_model = nullptr; - ERROR_LOG(m_logger) << "Could not init model"; + ERROR_LOG() << "Could not init model"; return false; } @@ -179,14 +178,14 @@ void MvsDialog::onExportButtonClicked() int fileId = m_flmGui->saveFileContent(this, FileManagement::FileType::Xml, m_session->exerciseId(), byteArray); if (fileId > 0) - DEBUG_LOG(m_logger) << "Saved file with id = " << fileId; + DEBUG_LOG() << "Saved file with id = " << fileId; else - ERROR_LOG(m_logger) << "Could not save file in library "; + ERROR_LOG() << "Could not save file in library "; } void MvsDialog::onImportButtonClicked() { - DEBUG_LOG(m_logger) << " onImportButtonClicked() "; + DEBUG_LOG() << " onImportButtonClicked() "; QByteArray content; int fileId = m_flmGui->loadFileContent(this, content, {FileManagement::FileType::Xml}, m_session->exerciseId(), FileManagement::toString(FileManagement::XmlType::AVMMvsDialog)); @@ -212,7 +211,7 @@ void MvsDialog::onImportButtonClicked() return m_avmFtc->videoTeamModifyRequest(request, this); }); } - INFO_LOG(m_logger) << "--- onImportButtonClicked() "; + INFO_LOG() << "--- onImportButtonClicked() "; } } } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/MobileVideoSystem/avm_mvs_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/MobileVideoSystem/avm_mvs_dialog.h index 719b4aea8..a3044cf9c 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/MobileVideoSystem/avm_mvs_dialog.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/MobileVideoSystem/avm_mvs_dialog.h @@ -83,7 +83,5 @@ private: std::shared_ptr m_avmDtc; std::shared_ptr m_avmFtc; std::shared_ptr m_flmGui; - LOGGER_T m_logger; - }; } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/MobileVideoSystem/avm_mvs_edit_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/MobileVideoSystem/avm_mvs_edit_dialog.cpp index 0d946f415..458e3835c 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/MobileVideoSystem/avm_mvs_edit_dialog.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/MobileVideoSystem/avm_mvs_edit_dialog.cpp @@ -42,7 +42,6 @@ EditVideoTeamDialog::EditVideoTeamDialog(int32_t id, const std::shared_ptr