Session 022: Migrate Lts/Tools (72 submodules) to Qt6
- Copied complete Lts/Tools directory from qt5-before to qt6-after - Updated 32 CMakeLists.txt files (Qt5:: → Qt6::) - Tools subdirectory already included in parent Lts/CMakeLists.txt - All 72 tool submodules now present in qt6-migrated-legatus - Includes: Adler, ArAssets, ConfigX, DBAdministration, DBUpdate, DdsView, InfrastructureManagement, and 67 more tools - C++17 standard (RTI 7.7.0 compatibility maintained) - Tests deferred until final validation phase Migration progress: ✅ Lts/Application (68 files) ✅ Lts/DDS (verified Qt6-ready) ✅ Lts/Plugins (60 submodules, verified) ✅ Lts/Projects (5 submodules, verified) ✅ Lts/Proxies (13 submodules, verified) ✅ Lts/Services (47 submodules, verified) ✅ Lts/Tools (72 submodules, copied + CMake updated) ✅ Lts/Viewer (LtsFileDialog, LtsReportDisplay, SituationMap) 🟡 TetraIF (partial) 🟡 Z (partial: nglwidgets, QtSingleApplication, qsql_informix, WMS_Interface)
This commit is contained in:
1 parent
01dce5fe52
commit
d5c13033e2
1792 files changed
+982018
No files matched your search
@@ -0,0 +1,59 @@
|
||||
/**
|
||||
* @RDE_HEADER@
|
||||
* Settings for zwmsqt
|
||||
* $Id$
|
||||
* $HeadURL$
|
||||
* $Author$
|
||||
*/
|
||||
#pragma once
|
||||
|
||||
#include <DDS/Generic/topic_description.h>
|
||||
|
||||
#include <nglsettings/nglsettings_settings.h>
|
||||
#include <QtCore/QMap>
|
||||
|
||||
struct TopicDescriptionEx : public DDSGeneric::TopicDescription
|
||||
{
|
||||
TopicDescriptionEx() = default;
|
||||
explicit TopicDescriptionEx(const DDSGeneric::TopicDescription &td)
|
||||
: DDSGeneric::TopicDescription(td)
|
||||
{}
|
||||
QString serviceName;
|
||||
};
|
||||
|
||||
class NGLSettings : public NGL::Settings
|
||||
{
|
||||
NGLSettings();
|
||||
public:
|
||||
|
||||
// QString --> TopicName
|
||||
QMap<QString, QStringList> infoValues();
|
||||
void setInfoValues(const QMap<QString, QStringList> &map);
|
||||
|
||||
int ddsDomain() const;
|
||||
void setDdsDomain(int domainId);
|
||||
|
||||
static NGLSettings *instance();
|
||||
|
||||
/* Temporary "globally" accessible Values */
|
||||
// <TopicNAME, Description>
|
||||
QMap<std::string, TopicDescriptionEx> m_dtTypes;
|
||||
QMap<std::string, TopicDescriptionEx> m_ftTypes;
|
||||
|
||||
// DataTopics
|
||||
QMap<std::string, TopicDescriptionEx> dataTopics() const;
|
||||
bool hasDataTopic(const std::string &name) const;
|
||||
TopicDescriptionEx dataTopic(const std::string &topicName) const;
|
||||
TopicDescriptionEx dataTopic(const QString &topicName) const { return dataTopic(topicName.toStdString()); }
|
||||
void insertDataTopic(const TopicDescriptionEx &td);
|
||||
|
||||
// FunctionTopics
|
||||
QMap<std::string, TopicDescriptionEx> functionTopics() const;
|
||||
bool hasFunctionTopic(const std::string &name) const;
|
||||
TopicDescriptionEx functionTopic(const std::string &topicName) const;
|
||||
void insertFunctionTopic(const TopicDescriptionEx &td);
|
||||
|
||||
TopicDescriptionEx topicFromTopicName(const std::string &topicName) const;
|
||||
TopicDescriptionEx topicFromTopicName(const QString &topicName) const { return topicFromTopicName(topicName.toStdString()); }
|
||||
};
|
||||
|
||||
Reference in new issue
Block a user