WIP: Build fixes und EXTERNAL_DEPENDENCIES.md

This commit is contained in:
torsten committed 2026-08-21 07:04:40 +02:00
1 parent 85bae2e60a
commit 27fe03a03a
300 files changed
+983 -417

No files matched your search

@@ -5,10 +5,15 @@
#include "ui_charge_edit_dialog.h"
#include <Plugins/ProjectDataManagement/pdm_data_plugin_interface.h>
#ifdef BUILD_WITH_EXTERNAL_DDS
#include <ProjectDataManagement/pdm_dtc.h>
#endif
#include <LtsSession/lts_session.h>
#include <LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/request_helper.h>
#ifdef BUILD_WITH_EXTERNAL_DDS
namespace ProjectDataManagement
{
ChargeEditDialog::ChargeEditDialog(const int chargeId,
@@ -95,4 +100,6 @@ bool ChargeEditDialog::apply()
});
}
}
}
#endif // BUILD_WITH_EXTERNAL_DDS
@@ -3,12 +3,10 @@
#pragma once
#include <LtsWidgets/lts_dialog.h>
#include <ProjectDataManagement/pdm_ftc.h>
#include <ProjectDataManagement/logger.h>
#include <memory>
namespace Ui {
class ChargeEditDialog;
namespace Core {
class FunctionReplyObject;
}
namespace LtsSession {
@@ -21,6 +19,25 @@ class RequestHelper;
namespace ProjectDataManagement
{
#ifdef BUILD_WITH_EXTERNAL_DDS
// Forward declarations for external dependencies
struct ChargeType;
#endif
namespace Interface {
namespace Ftc {
class UpdateChargeNamesReplyHandler;
}
}
// Forward declaration - LtsWidgets::LtsDialog wird in CPP definiert
namespace LtsWidgets {
class LtsDialog;
}
#ifdef BUILD_WITH_EXTERNAL_DDS
class ChargeEditDialog : public LtsWidgets::LtsDialog
, protected ProjectDataManagement::Interface::Ftc::UpdateChargeNamesReplyHandler
{
@@ -50,4 +67,7 @@ private:
ChargeType m_chargeType;
LOGGER_T m_logger;
};
#endif // BUILD_WITH_EXTERNAL_DDS
}
@@ -23,8 +23,7 @@
#include <QJsonObject>
#include <QJsonDocument>
#ifdef BUILD_WITH_EXTERNAL_DDS
namespace ProjectDataManagement
{
@@ -281,4 +280,6 @@ void ChargeTableDialog::onExportButtonClicked()
m_flmGui->saveFileContent(this, FileManagement::FileType::Xml, m_session->exerciseId(), byteArray);
}
}
} // namespace ProjectDataManagement
#endif // BUILD_WITH_EXTERNAL_DDS
@@ -3,28 +3,22 @@
#pragma once
#include "charge_table_model.h"
#include <memory>
#include <vector>
#include <QSet>
#include <ProjectDataManagement/pdm_ftc.h>
#include <LtsWidgets/lts_dialog.h>
#include <ProjectDataManagement/logger.h>
#include <Plugins/FileManagement/flm_explorer_gui_plugin_interface.h>
#include <QWidget>
namespace Ui
{
class ChargeTableDialog;
namespace Core {
class FunctionReplyObject;
}
namespace LtsSession
{
namespace LtsSession {
class LtsSession;
}
namespace LtsUtils {
class RequestHelper;
}
namespace FileManagement {
class ForeignGuiInterface;
}
@@ -32,6 +26,30 @@ class ForeignGuiInterface;
namespace ProjectDataManagement
{
#ifdef BUILD_WITH_EXTERNAL_DDS
// Forward declarations for external dependencies
struct GearClass;
struct ChargeType;
#else
// Forward declarations for external dependencies
struct GearClass;
struct ChargeType;
#endif
namespace Interface {
namespace Ftc {
class UpdateChargeTypeReplyHandler;
class UpdateChargeNamesReplyHandler;
}
}
// Forward declaration - LtsWidgets::LtsDialog wird in CPP definiert
namespace LtsWidgets {
class LtsDialog;
}
#ifdef BUILD_WITH_EXTERNAL_DDS
class ChargeTableDialog : public LtsWidgets::LtsDialog
, protected ProjectDataManagement::Interface::Ftc::UpdateChargeTypeReplyHandler
{
@@ -75,4 +93,6 @@ private slots:
void onExportButtonClicked();
};
#endif // BUILD_WITH_EXTERNAL_DDS
}
@@ -4,6 +4,8 @@
#include "charge_table_model.h"
#ifdef BUILD_WITH_EXTERNAL_DDS
#include <QIcon>
#include <QJsonObject>
#include <QJsonDocument>
@@ -429,4 +431,6 @@ int ChargeTableDialogModel::baseCharge(int chargeTypeId)
}
}
}
#endif // BUILD_WITH_EXTERNAL_DDS
@@ -3,24 +3,31 @@
#pragma once
#include <ProjectDataManagement/pdm_dtc.h>
#include <ProjectDataManagement/logger.h>
#include <LtsWidgets/lts_abstract_table_model.h>
#include <QSet>
#ifdef BUILD_WITH_EXTERNAL_DDS
#include <ProjectDataManagement/pdm_dtc.h>
#endif
#include <ProjectDataManagement/logger.h>
namespace ProjectDataManagement
{
#ifdef BUILD_WITH_EXTERNAL_DDS
inline uint qHash(GearClass gc)
{
return ::qHash(gc.underlying());
}
#endif
#ifdef BUILD_WITH_EXTERNAL_DDS
class ChargeTableDialogModel final : public LtsWidgets::LtsAbstractTableModel<ProjectDataManagement::ChargeType>
{
Q_OBJECT
@@ -189,4 +196,6 @@ private:
};
#endif // BUILD_WITH_EXTERNAL_DDS
}