This commit is contained in:
2 files changed
-119
No files matched your search
@@ -1,97 +0,0 @@
|
|||||||
# Aktueller Checkpoint - Qt6 Migration
|
|
||||||
|
|
||||||
**Datum:** 2026-08-25
|
|
||||||
**Session:** 038
|
|
||||||
**Git Commit:** 5655b9af
|
|
||||||
**Build-Status:** 342/1140 Targets (BLOCKIERT)
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Letzter sinnvoller Arbeitspunkt
|
|
||||||
|
|
||||||
###已成功完成的修复 (Session 038):
|
|
||||||
1. ✅ **tab_dtc.h** - Type Aliases nach Interface namespace verschoben
|
|
||||||
- MinelayerTrailerData, MinelayerThrowerData, SpecialSensorData jetzt nach namespace Interface definiert
|
|
||||||
- Behebt "incomplete type" Fehler bei TrainingAreaBase::Interface::Xxx
|
|
||||||
|
|
||||||
2. ✅ **handler_minelayer_data.cpp** - convertMinelayerDataToXdrData() Aufrufe korrigiert
|
|
||||||
- `.position()` statt `.position` (Accessor-Methode mit Klammern)
|
|
||||||
- `.layingDensity()` statt `.layingDensity`
|
|
||||||
- `.effectStart()` statt `.effectStart`
|
|
||||||
- `.effectDuration()` statt `.effectDuration`
|
|
||||||
- `.chargeTypeId()` statt `.chargeTypeId`
|
|
||||||
- `.mineCount()` statt `.mineCount`
|
|
||||||
|
|
||||||
3. ✅ **aes_ftc.h** - Ftc::create() Signatur aktualisiert
|
|
||||||
- Parameter von `std::shared_ptr<DDSConnector>` zu `std::shared_ptr<DDSConnector::DdsConnector>`
|
|
||||||
- Inline-Implementation hinzugefügt
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Verbleibende BLOCKER (müssen als nächstes fixen):
|
|
||||||
|
|
||||||
### 1. handler_minelayer_data.cpp - Signal/Slot Connect (Zeilen 62-64)
|
|
||||||
```cpp
|
|
||||||
// FEHLER: connect() mit alter SIGNAL/SLOT Syntax oder falsche Signatur
|
|
||||||
// MUSS: Qt6 function-pointer Syntax verwenden
|
|
||||||
connect(m_dtc.get(), &TrainingAreaBase::Interface::Dtc::specialSensorDataChanged,
|
|
||||||
this, &HandlerMinelayerData::onSpecialSensorDataChanged);
|
|
||||||
```
|
|
||||||
|
|
||||||
### 2. handler_minelayer_data.cpp - QString Conversion (Zeile 297)
|
|
||||||
```cpp
|
|
||||||
// FEHLER: setName() erwartet QString, bekommt std::string
|
|
||||||
// Aktuell: charge.setName(QString::fromUtf8(data.chargeType().toStdString()));
|
|
||||||
// KORREKTUR: charge.setName(QString::fromUtf8(data.chargeType()));
|
|
||||||
```
|
|
||||||
|
|
||||||
### 3. handler_minelayer_data.cpp - Namespace Qualification (Zeilen 147, 190)
|
|
||||||
```cpp
|
|
||||||
// FEHLER: TrainingAreaBase::MinelayerTrailerData nicht gefunden
|
|
||||||
// KORREKTUR: TrainingAreaBase::Interface::MinelayerTrailerData verwenden
|
|
||||||
```
|
|
||||||
|
|
||||||
### 4. dds_connector.h - Incomplete Type (Zeilen 207-209)
|
|
||||||
```cpp
|
|
||||||
// FEHLER: Unvollständige Typen in der Klasse
|
|
||||||
// Benötigt: Forward declarations oder richtige Include-Reihenfolge
|
|
||||||
```
|
|
||||||
|
|
||||||
### 5. handler_minelayer_data.cpp - ddsConnector() Return Type (Zeile 42)
|
|
||||||
```cpp
|
|
||||||
// FEHLER: ddsConnector() gibt int zurück statt std::shared_ptr<DdsConnector>
|
|
||||||
// Header muss korrigiert werden
|
|
||||||
```
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Nächste Schritte (Priorität):
|
|
||||||
|
|
||||||
1. **dds_connector.h fixen** - Return Type von ddsConnector() korrigieren
|
|
||||||
2. **handler_minelayer_data.cpp fixen** - Alle 5 verbleibenden Fehler beheben
|
|
||||||
3. **Build neu starten** - `./build_docker.sh 2>&1 | tee build_log.txt`
|
|
||||||
4. **MIGRATION_STATUS.md updaten** - Auf 2026-08-29 (Session 038)
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Wichtige Dateien für nächste Session:
|
|
||||||
|
|
||||||
| Datei | Status | Priorität |
|
|
||||||
|-------|--------|-----------|
|
|
||||||
| `Lts/Services/GuezMinelayerProcessing/handler_minelayer_data.cpp` | ❌ Fehler | HIGH |
|
|
||||||
| `include/DDS/DDSConnector/dds_connector.h` | ❌ Fehler | HIGH |
|
|
||||||
| `include/Proxies/TrainingAreaBase/tab_dtc.h` | ✅ Gefixt | - |
|
|
||||||
| `include/AreaEffectSimulation/aes_ftc.h` | ✅ Gefixt | - |
|
|
||||||
| `./MIGRATION_STATUS.md` | ⏳ Update nötig | MEDIUM |
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Build-Command für Fortsetzung:
|
|
||||||
```bash
|
|
||||||
cd /home/torsten/swy/sandbox
|
|
||||||
./build_docker.sh 2>&1 | tee build_log_session038.txt
|
|
||||||
```
|
|
||||||
|
|
||||||
## Checkpoint speichern:
|
|
||||||
Dieser Stand wurde gespeichert in: `.checkpoint_current.md`
|
|
||||||
Nächste Session kann hier nahtlos fortfahren.
|
|
||||||
@@ -1,22 +0,0 @@
|
|||||||
Release: qt6-migration-2026.07.14
|
|
||||||
Date: 2026-07-14
|
|
||||||
|
|
||||||
Summary
|
|
||||||
Migrated project to Qt 6.8: updated CMake and cmake modules for Qt6, adjusted sources for Qt6 API changes, removed Strix and added GoogleTest scaffolding, and created a reproducible Docker dev image with Qt 6.8.3.
|
|
||||||
|
|
||||||
Migrated subfolders
|
|
||||||
- ./Z: Core application libraries and widgets (nglwidgets, ngltools, ngldb, nglapplication, nglsettings, nglcompression, etc.) — full Qt6 porting, resources (qrc), Poppler Qt6 integration and tests.
|
|
||||||
- ./TetraIF: Tetra interface modules (CoPrtCnv, PrtCnv, LogView) — compatibility updates and Qt6 API adjustments.
|
|
||||||
|
|
||||||
Key changes
|
|
||||||
- Docker: app/Dockerfile and app/run_docker.sh (install Qt 6.8.3, poppler-qt6, build Log4Qt)
|
|
||||||
- CMake: Qt6-first shim, cmake/NGLMacros.cmake, cmake/FindPopplerQt5.cmake compatibility
|
|
||||||
- Source: Qt6 API fixes (QTimeZone, QLibraryInfo::path, qChecksum overloads, key combo adjustments), resource qrc additions
|
|
||||||
- Tests: GoogleTest integration; Strix removed
|
|
||||||
|
|
||||||
Verification
|
|
||||||
Tag: qt6-migration-2026.07.14
|
|
||||||
Ran ./final-migration/run_final_migration.sh in Docker (configure, build, ctest). All tests passed (3/3).
|
|
||||||
|
|
||||||
Notes
|
|
||||||
Merged into main. For follow-up: continue reducing remaining deprecation warnings and consider enabling stricter warning checks in CI.
|
|
||||||
Reference in new issue
Block a user