Qt6 Migration: DDS-Stubs, Logger-Fixes, Export-Header Korrekturen
- NGL_ADD_LIBRARY2: 87 CMakeLists.txt konvertiert für Export-Header Generierung - 44 Export-Header Include-Pfade korrigiert (_export.h) - 81 DDS-Stub-Header generiert (*_dtc.h, *_fts.h, *_dts.h, *_ftc.h) - INGLLogger: Duplikat gelöscht, m_logger Member entfernt, variadische Makros - Q_FUNC_INFO Redefinition behoben (Qt6 definiert bereits) - FATAL_LOG Makro hinzugefügt - InfrastructureManagement DDS-Stubs (ism.hpp, ism_enums.hpp, ism_ftc.h) - FilterManagement DDS-Stubs (flt_ftc.h, flt_dts.h) - AreaEffectSimulation DDS-Stubs (aes.hpp, aes_enums.hpp) - SymbolAppearance Klasse vollständig definiert mit content() Methode - BuildingComponentFilter Klasse definiert mit Copy-Konstruktor - Ftc Factory: nullptr Return (abstract class) - AesFilter Klasse in aes.hpp hinzugefügt - Dtc Klasse in ppm.hpp mit participantChanged Signal - AesType Enum: alle 15 At* Werte definiert - AesEffectState_def: EsReceived hinzugefügt - DataModification Enum: eAdded/eModified/eRemoved - function_reply_object.h → core_types.h Include-Pfad (72 Dateien) - Enum-Class-Streaming Template-Operator in INGLLogger.h - ism_mounting_point.h: QImage → QtGui/QImage, QGuiApplication/QScreen - ism_data_plugin_interface.h: QSet Include, Include-Reihenfolge - QRegExp → QRegularExpression in tpm_js_parser.cpp - .underlying() Aufrufe zu direktem Enum-Vergleich korrigiert - Include-Pfade: aes.hpp in symbol_appearance_settings_impl.h und aes_display_filter_impl.h Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This commit is contained in:
2785 files changed
+18754
-18316
No files matched your search
-1
@@ -13,7 +13,6 @@ AclDialog::AclDialog(QWidget *parent)
|
||||
, m_ui(new Ui::AclDialog)
|
||||
, m_dtc(nullptr)
|
||||
, m_ftc(nullptr)
|
||||
, m_logger(getLogger("AclDialog"))
|
||||
{
|
||||
m_ui->setupUi(this);
|
||||
|
||||
|
||||
-1
@@ -35,7 +35,6 @@ private:
|
||||
|
||||
std::shared_ptr<OperatorManagement::Interface::Dtc> m_dtc;
|
||||
std::shared_ptr<OperatorManagement::Interface::Ftc> m_ftc;
|
||||
LOGGER_T m_logger;
|
||||
};
|
||||
}
|
||||
|
||||
-1
@@ -17,7 +17,6 @@ AclDialogModel::AclDialogModel(QObject *parent)
|
||||
parent)
|
||||
, m_dtc(nullptr)
|
||||
, m_ftc(nullptr)
|
||||
, m_logger(getLogger("AccessControlLevelDialogModel"))
|
||||
{}
|
||||
|
||||
AclDialogModel::~AclDialogModel()
|
||||
|
||||
-1
@@ -29,6 +29,5 @@ public:
|
||||
private:
|
||||
std::shared_ptr<OperatorManagement::Interface::Dtc> m_dtc;
|
||||
std::shared_ptr<OperatorManagement::Interface::Ftc> m_ftc;
|
||||
LOGGER_T m_logger;
|
||||
};
|
||||
}
|
||||
-1
@@ -20,7 +20,6 @@ GroupEditDialog::GroupEditDialog(QWidget *parent)
|
||||
, m_dtc(nullptr)
|
||||
, m_ftc(nullptr)
|
||||
, m_model(nullptr)
|
||||
, m_logger(getLogger("GroupEditDialog"))
|
||||
, m_requestHelper(new LtsUtils::RequestHelper(this))
|
||||
{
|
||||
m_ui->setupUi(this);
|
||||
|
||||
-1
@@ -64,7 +64,6 @@ class GroupEditDialog
|
||||
std::shared_ptr<Interface::Dtc> m_dtc;
|
||||
std::shared_ptr<Interface::Ftc> m_ftc;
|
||||
MembershipModel *m_model;
|
||||
LOGGER_T m_logger;
|
||||
LtsUtils::RequestHelper *m_requestHelper;
|
||||
};
|
||||
|
||||
|
||||
-1
@@ -20,7 +20,6 @@ GroupModel::GroupModel(QObject *parent)
|
||||
parent)
|
||||
, m_dtc(nullptr)
|
||||
, m_hideHidden(false)
|
||||
, m_logger(getLogger("GroupManagementDialogModel"))
|
||||
{}
|
||||
|
||||
GroupModel::~GroupModel()
|
||||
|
||||
-1
@@ -41,6 +41,5 @@ protected:
|
||||
private:
|
||||
std::shared_ptr<OperatorManagement::Interface::Dtc> m_dtc;
|
||||
bool m_hideHidden;
|
||||
LOGGER_T m_logger;
|
||||
};
|
||||
}
|
||||
+1
-2
@@ -23,7 +23,6 @@ OperatorDialog::OperatorDialog(const QString &menuGroup, QWidget *parent)
|
||||
, m_ui(new Ui::OperatorDialog)
|
||||
, m_ftc(nullptr)
|
||||
, m_requestHelper(new LtsUtils::RequestHelper(this))
|
||||
, m_logger(getLogger("OperatorDialog"))
|
||||
{
|
||||
m_ui->setupUi(this);
|
||||
|
||||
@@ -121,7 +120,7 @@ void OperatorDialog::onEditOperator()
|
||||
|
||||
if (op.id() <= 0)
|
||||
return;
|
||||
DEBUG_LOG(m_logger) << "current Operator Id: " << op.id();
|
||||
DEBUG_LOG() << "current Operator Id: " << op.id();
|
||||
|
||||
OperatorEditDialog *dialog = new OperatorEditDialog(op.id(), m_session, m_menuGroup, this);
|
||||
const QString identifier = QLatin1String("EditOperator") + QString::number(op.id());
|
||||
|
||||
-3
@@ -51,9 +51,6 @@ private:
|
||||
LtsSession::LtsSession *m_session;
|
||||
std::shared_ptr<OperatorManagement::Interface::Ftc> m_ftc;
|
||||
LtsUtils::RequestHelper *m_requestHelper;
|
||||
|
||||
LOGGER_T m_logger;
|
||||
|
||||
private slots:
|
||||
void enaDisa();
|
||||
void onRemoveOperator();
|
||||
|
||||
+6
-7
@@ -44,7 +44,6 @@ OperatorEditDialog::OperatorEditDialog(const int operatorId,
|
||||
, m_dtc(nullptr)
|
||||
, m_ftc(nullptr)
|
||||
, m_ui(new Ui::OperatorEditDialog)
|
||||
, m_logger(getLogger("operatorManangementEditDialog"))
|
||||
, m_requestHelper(new LtsUtils::RequestHelper(this))
|
||||
{
|
||||
m_ui->setupUi(this);
|
||||
@@ -171,7 +170,7 @@ bool OperatorEditDialog::operatorCreateModify(const OperatorCreateModifyRequest
|
||||
return false;
|
||||
}
|
||||
|
||||
DEBUG_LOG(m_logger) << "req.name: " << req.name();
|
||||
DEBUG_LOG() << "req.name: " << req.name();
|
||||
return m_requestHelper->startSingleRequest([this, req]()
|
||||
{
|
||||
return m_ftc->operatorCreateModifyRequest(req, this);
|
||||
@@ -366,7 +365,7 @@ bool OperatorEditDialog::apply()
|
||||
const QVector<int> visiblePartyIds = m_visiblePartiesModel->getCheckedIds();
|
||||
std::vector<OperatorManagement::PartiesByExercise> vpbe;
|
||||
PartiesByExercise pbe;
|
||||
DEBUG_LOG(m_logger) << "----------------- m_session.exerciseId:" << m_session->exerciseId();
|
||||
DEBUG_LOG() << "----------------- m_session.exerciseId:" << m_session->exerciseId();
|
||||
pbe.exerciseId(0);
|
||||
pbe.visibleParties().set({});
|
||||
std::copy(visiblePartyIds.begin(), visiblePartyIds.end(), std::back_inserter(pbe.visibleParties().get()));
|
||||
@@ -403,7 +402,7 @@ bool OperatorEditDialog::apply()
|
||||
const QVector<int> visiblePartyIds = m_visiblePartiesModel->getCheckedIds();
|
||||
std::vector<OperatorManagement::PartiesByExercise> vpbe;
|
||||
PartiesByExercise pbe;
|
||||
DEBUG_LOG (m_logger) << "----------------- m_session.exerciseId:" << m_session->exerciseId();
|
||||
DEBUG_LOG() << "----------------- m_session.exerciseId:" << m_session->exerciseId();
|
||||
pbe.exerciseId(0);
|
||||
pbe.visibleParties().set({});
|
||||
std::copy(visiblePartyIds.begin(), visiblePartyIds.end(), std::back_inserter(pbe.visibleParties().get()));
|
||||
@@ -461,7 +460,7 @@ void OperatorEditDialog::createFolders()
|
||||
return;
|
||||
}
|
||||
|
||||
DEBUG_LOG(m_logger) << "User Folder created with id = " << folderId;
|
||||
DEBUG_LOG() << "User Folder created with id = " << folderId;
|
||||
|
||||
#ifdef GUEZ_MODE
|
||||
|
||||
@@ -474,7 +473,7 @@ void OperatorEditDialog::createFolders()
|
||||
return;
|
||||
}
|
||||
|
||||
DEBUG_LOG(m_logger) << "User Subfolder created with id = " << subFolderId;
|
||||
DEBUG_LOG() << "User Subfolder created with id = " << subFolderId;
|
||||
#endif
|
||||
|
||||
LtsWidgets::LtsMessageDialog::showMessage(this, tr("User folders successfully created"));
|
||||
@@ -500,7 +499,7 @@ int OperatorEditDialog::createFolder(int parentFolderId, const QString &folderNa
|
||||
return m_flmFtc->folderModifyRequest(req, this);
|
||||
});
|
||||
|
||||
DEBUG_LOG(m_logger) << "Created folder id = " << m_requestHelper->getRepliedId();
|
||||
DEBUG_LOG() << "Created folder id = " << m_requestHelper->getRepliedId();
|
||||
|
||||
return m_requestHelper->getRepliedId();
|
||||
}
|
||||
|
||||
-1
@@ -87,7 +87,6 @@ private:
|
||||
std::shared_ptr<FileManagement::Interface::Ftc> m_flmFtc;
|
||||
|
||||
Ui::OperatorEditDialog *m_ui;
|
||||
LOGGER_T m_logger;
|
||||
LtsUtils::RequestHelper *m_requestHelper;
|
||||
|
||||
void getProfilePicture();
|
||||
|
||||
-1
@@ -18,7 +18,6 @@ PresetDialog::PresetDialog(const QString &menuGroup, QWidget *parent)
|
||||
, m_dtc(nullptr)
|
||||
, m_ftc(nullptr)
|
||||
, m_requestHelper(new LtsUtils::RequestHelper(this))
|
||||
, m_logger(getLogger("PresetDialog"))
|
||||
{
|
||||
m_ui->setupUi(this);
|
||||
|
||||
|
||||
-2
@@ -45,8 +45,6 @@ private:
|
||||
std::shared_ptr<OperatorManagement::Interface::Dtc> m_dtc;
|
||||
std::shared_ptr<OperatorManagement::Interface::Ftc> m_ftc;
|
||||
LtsUtils::RequestHelper *m_requestHelper;
|
||||
LOGGER_T m_logger;
|
||||
|
||||
private slots:
|
||||
void enaDisa();
|
||||
void onRemoveGroup();
|
||||
|
||||
Reference in new issue
Block a user