Merge feature/qt6-migration-basis-modules-services into feature/qt6-migration-basis-modules
Resolves 17 conflicts against legacy Qt5 semantics; validates with BUILD_RTI=ON BUILD_GRANTLEE=ON.
This commit is contained in:
1200 files changed
+20421
-18259
No files matched your search
+43
@@ -0,0 +1,43 @@
|
||||
#pragma once
|
||||
|
||||
// STUB-HEADER: Diese Datei wird normalerweise von ddsdtc generiert
|
||||
// Für die Migration erstellen wir minimale Implementierungen
|
||||
|
||||
#include <QtGlobal>
|
||||
#include <string>
|
||||
#include <memory>
|
||||
|
||||
namespace OperatorManagement
|
||||
{
|
||||
|
||||
struct User
|
||||
{
|
||||
[[nodiscard]] qint32 id() const { return m_id; }
|
||||
[[nodiscard]] std::string name() const { return m_name; }
|
||||
|
||||
qint32 m_id = 0;
|
||||
std::string m_name;
|
||||
};
|
||||
|
||||
namespace Interface
|
||||
{
|
||||
class Dtc
|
||||
{
|
||||
public:
|
||||
// Initialization methods
|
||||
void enableUser() {}
|
||||
void waitForHistoricalDataUser() {}
|
||||
|
||||
User user(qint32 id) const
|
||||
{
|
||||
// STUB-Implementierung - leerer User
|
||||
User u;
|
||||
u.m_id = id;
|
||||
u.m_name = "Unknown";
|
||||
return u;
|
||||
}
|
||||
};
|
||||
|
||||
class Ftc;
|
||||
} // namespace Interface
|
||||
} // namespace OperatorManagement
|
||||
+21
@@ -0,0 +1,21 @@
|
||||
#ifndef OPM_FTC_H
|
||||
#define OPM_FTC_H
|
||||
|
||||
// Stub header for OperatorManagement FTC functionality
|
||||
// This file is part of FilterManagement which is excluded from build
|
||||
// For non-FilterManagement builds, we provide this stub
|
||||
|
||||
#include <QtCore/QString>
|
||||
#include <QtCore/QObject>
|
||||
|
||||
// Forward declarations and stubs for FTC (Filter/Translation/Conversion)
|
||||
// Actual implementation is in FilterManagement plugin
|
||||
|
||||
class OpmFtc
|
||||
{
|
||||
public:
|
||||
virtual ~OpmFtc() = default;
|
||||
// Stub methods - actual implementation in FilterManagement
|
||||
};
|
||||
|
||||
#endif // OPM_FTC_H
|
||||
Reference in new issue
Block a user