Qt6 Migration: BUILD_RTI Guards, Export-Header und Include-Pfade korrigiert
- BUILD_RTI Guards in LtsSession implementiert (6 Dateien) - LtsSessionDataDds Stub für BUILD_RTI=OFF erstellt - Export-Header Stubs erstellt (GuezNasat, AlarmManagement, MarkerManagement) - Include-Pfade korrigiert (resource_path.h, logger.h, Proxies) - QStringRef → QString migriert (Qt6 Kompatibilität) - Qt6::Gui Dependencies hinzugefügt (LtsElevation, AdvancedSymbology) - FilterManagement-Plugins temporär vom Build ausgeschlossen - MOC-Probleme gefixt (staticMetaObject, override final) - Build erfolgreich: 1940 Targets mit BUILD_RTI=OFF im Docker-Container Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This commit is contained in:
46 files changed
+2487
-110
No files matched your search
@@ -11,8 +11,11 @@
|
||||
#pragma once
|
||||
|
||||
#include "lts_session_data_dds.h"
|
||||
#ifdef BUILD_RTI
|
||||
#include "lts_session_manager.h"
|
||||
#endif
|
||||
|
||||
#include <LtsAppDescriptor/lts_app_descriptor.h>
|
||||
#include <LtsSession/ltssession_export.h>
|
||||
#include <LtsWidgets/lts_base.h>
|
||||
#include <QDebug>
|
||||
@@ -83,12 +86,18 @@ class LTSSESSION_EXPORT LtsSession : public LtsSessionDataDds
|
||||
static QString appIconFilename(LtsAppDescriptor::App app);
|
||||
static QIcon appToIcon(LtsAppDescriptor::App app);
|
||||
|
||||
#ifdef BUILD_RTI
|
||||
explicit LtsSession(LtsSessionManager* sessionManager);
|
||||
#else
|
||||
explicit LtsSession();
|
||||
#endif
|
||||
~LtsSession();
|
||||
|
||||
QString toString() const;
|
||||
|
||||
#ifdef BUILD_RTI
|
||||
LtsSessionManager* getSessionManager();
|
||||
#endif
|
||||
bool init(const DdsConnectionParams& connParams, const QVector<LtsPluginManager::AppPluginInstance>& dataPluginList,
|
||||
const QVector<LtsPluginManager::AppPluginInstance>& guiPluginList, bool hidden);
|
||||
#ifdef BUILD_RTI
|
||||
@@ -96,7 +105,11 @@ class LTSSESSION_EXPORT LtsSession : public LtsSessionDataDds
|
||||
const QVector<LtsPluginManager::AppPluginInstance>& dataPluginList,
|
||||
const QVector<LtsPluginManager::AppPluginInstance>& guiPluginList);
|
||||
#endif
|
||||
#ifdef BUILD_RTI
|
||||
void makeVisible();
|
||||
#else
|
||||
void makeVisible(); // no-op when BUILD_RTI=OFF
|
||||
#endif
|
||||
|
||||
void setPayloadsEnabled()
|
||||
{
|
||||
@@ -125,7 +138,9 @@ class LTSSESSION_EXPORT LtsSession : public LtsSessionDataDds
|
||||
*/
|
||||
LtsWidgets::LtsDragIcon* addAction(const LtsWidgets::PluginData& plData, bool isFirstRun = false);
|
||||
void setMenuVisible(bool visible = true);
|
||||
#ifdef BUILD_RTI
|
||||
bool removeMenuAction(LtsWidgets::LtsDragIcon* icon);
|
||||
#endif
|
||||
int screenId() const;
|
||||
int screenContainerId() const;
|
||||
int screenTypeId() const;
|
||||
@@ -153,9 +168,15 @@ class LTSSESSION_EXPORT LtsSession : public LtsSessionDataDds
|
||||
* and puts the text into all base layouts of this session
|
||||
* @param exerciseData the human reable exercise name of the current exercise
|
||||
*/
|
||||
#ifdef BUILD_RTI
|
||||
void setExerciseData(const LtsWidgets::ExerciseData& exerciseData);
|
||||
const LtsWidgets::ExerciseData* exerciseData() const;
|
||||
void setProfilePicture(const QPixmap& pixmap);
|
||||
#else
|
||||
void setExerciseData(const LtsWidgets::ExerciseData& exerciseData) { Q_UNUSED(exerciseData) }
|
||||
const LtsWidgets::ExerciseData* exerciseData() const { return nullptr; }
|
||||
void setProfilePicture(const QPixmap& pixmap) { Q_UNUSED(pixmap) }
|
||||
#endif
|
||||
|
||||
void setBaseLayoutVisible()
|
||||
{
|
||||
@@ -186,10 +207,14 @@ class LTSSESSION_EXPORT LtsSession : public LtsSessionDataDds
|
||||
*/
|
||||
bool isChildOfSession(QWidget* child);
|
||||
|
||||
#ifdef BUILD_RTI
|
||||
LtsWidgets::LtsBaseLayoutWidget* baseLayout()
|
||||
{
|
||||
return m_baseLayout;
|
||||
}
|
||||
#else
|
||||
void* baseLayout() const { return nullptr; }
|
||||
#endif
|
||||
|
||||
QWidget* baseLayoutWidget(); // prevents some classes to include LtsBaseLayoutWidget.h just to specify the blw as a
|
||||
// parent widget
|
||||
@@ -278,10 +303,14 @@ class LTSSESSION_EXPORT LtsSession : public LtsSessionDataDds
|
||||
m_hidden = true;
|
||||
}
|
||||
|
||||
const QString workspaceId() const;
|
||||
const QString workspaceId() const;
|
||||
void setWorkspaceId(const QString& newWorkspaceId);
|
||||
|
||||
#ifdef BUILD_RTI
|
||||
LtsWidgets::ExcState exerciseState() const;
|
||||
#else
|
||||
LtsWidgets::ExcState exerciseState() const { return LtsWidgets::ExerciseState::eUnknown; }
|
||||
#endif // BUILD_RTI
|
||||
|
||||
void setLoadedFromSavegame()
|
||||
{
|
||||
@@ -294,8 +323,24 @@ class LTSSESSION_EXPORT LtsSession : public LtsSessionDataDds
|
||||
}
|
||||
|
||||
void addDeveloperActions();
|
||||
#ifdef BUILD_RTI
|
||||
void refetchActions(); // Do not use.
|
||||
void setDependency(LtsSession* session);
|
||||
#else
|
||||
void refetchActions(); // Do not use. (no-op when BUILD_RTI=OFF)
|
||||
#endif
|
||||
void setDependency(LtsSession* session)
|
||||
{
|
||||
#ifdef BUILD_RTI
|
||||
if (m_dependency)
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Tried to set session dependency on self";
|
||||
return;
|
||||
}
|
||||
m_dependency = session;
|
||||
#else
|
||||
Q_UNUSED(session)
|
||||
#endif
|
||||
}
|
||||
|
||||
bool hasDependency(LtsSession* session)
|
||||
{
|
||||
@@ -320,19 +365,25 @@ class LTSSESSION_EXPORT LtsSession : public LtsSessionDataDds
|
||||
}
|
||||
|
||||
public slots:
|
||||
#ifdef BUILD_RTI
|
||||
void slotExecuteNextPayload(); // NEVER call this directly, queue a signal to this slot !
|
||||
void slotPluginInitDone(); // NEVER call this directly, queue a signal to this slot !
|
||||
#endif
|
||||
void slotShowOnlineHelp(const QString& fileName);
|
||||
// void takeOverBdv();
|
||||
|
||||
private slots:
|
||||
#ifdef BUILD_RTI
|
||||
void slotShowOperatorSettings();
|
||||
#endif
|
||||
void slotSwap();
|
||||
void slotStapleTopicLockHandler(LtsWidgets::LtsDialog* widget);
|
||||
void slotStopWaitDialog();
|
||||
#ifdef BUILD_RTI
|
||||
void slotStartPluginInit();
|
||||
void slotMonitorSelected();
|
||||
void delayScriptEditorStart();
|
||||
#endif
|
||||
|
||||
signals:
|
||||
void signalInitializationAborted();
|
||||
@@ -354,10 +405,13 @@ class LTSSESSION_EXPORT LtsSession : public LtsSessionDataDds
|
||||
private:
|
||||
friend class DeveloperTools::DevDialog;
|
||||
friend class DeveloperTools::AppWidget;
|
||||
#ifdef BUILD_RTI
|
||||
friend class LtsSessionManager;
|
||||
#endif
|
||||
|
||||
bool event(QEvent* e) override;
|
||||
void createBaseLayout();
|
||||
#ifdef BUILD_RTI
|
||||
void initializePlugins(const QVector<LtsPluginManager::AppPluginInstance>& dataPluginList,
|
||||
const QVector<LtsPluginManager::AppPluginInstance>& guiPluginList);
|
||||
void initializeDataPlugins(const QVector<LtsPluginManager::AppPluginInstance>& dataPluginList);
|
||||
@@ -366,34 +420,51 @@ class LTSSESSION_EXPORT LtsSession : public LtsSessionDataDds
|
||||
void clearDataPluginInterfaces();
|
||||
void clearGuiPluginInterfaces();
|
||||
void executePayloads();
|
||||
#endif
|
||||
void connectOnlineHelpButton(LtsWidgets::LtsDialog* widget);
|
||||
// TODO: AFTER FAT !! void stapleWidget(LtsWidgets::LtsDialog *dialog); // FIXME: HACK: because an LtsDialog can
|
||||
// directly add widgets to the base layout and misses the staples...
|
||||
void aboutToCloseTab(LtsWidgets::LayoutArea area);
|
||||
|
||||
#ifdef BUILD_RTI
|
||||
QPointer<LtsSessionManager> m_sessionManager;
|
||||
#endif
|
||||
#ifdef BUILD_RTI
|
||||
QMap<int /*priority*/, std::shared_ptr<GuiPluginBase::Interface>>
|
||||
m_payloadPriorityMap; // QMap automatically sorts by key on iteration and overwrites multiple occurences with
|
||||
// the latest)
|
||||
QList<std::shared_ptr<GuiPluginBase::Interface>>
|
||||
m_payloadList; // for payloads that don't care when they are executed (prio '9999' plugins)
|
||||
#endif
|
||||
LtsWidgets::LtsBackgroundWidget* m_mainBackground;
|
||||
bool m_hasBaseLayout;
|
||||
#ifdef BUILD_RTI
|
||||
LtsWidgets::LtsBaseLayoutWidget* m_baseLayout;
|
||||
#else
|
||||
void* m_baseLayout{nullptr}; // stub for non-RTI build
|
||||
#endif
|
||||
bool m_markedForDeletion;
|
||||
bool m_payloads;
|
||||
QVector<LtsNotification::LtsNotificationController*> m_notiCtlList;
|
||||
bool m_initDone; // set by doneInitializingSession / signalDoneInitializingSession
|
||||
#ifdef BUILD_RTI
|
||||
bool m_payloadsDone{false}; // for debug
|
||||
#endif
|
||||
bool m_menuVisible;
|
||||
// bool m_ignoreSignalInLoop = false;
|
||||
bool m_firstActionsFetch;
|
||||
#ifdef BUILD_RTI
|
||||
LtsWidgets::ExerciseData* m_exerciseData;
|
||||
#else
|
||||
void* m_exerciseData{nullptr}; // stub for non-RTI build
|
||||
#endif
|
||||
QVector<LtsWidgets::PluginData> m_missingRightActions;
|
||||
std::shared_ptr<Core::Interface::Ftc> m_coreFtc;
|
||||
#ifdef BUILD_RTI
|
||||
GuiPluginBase::Interface* m_currentInitIfc; // not owning
|
||||
bool m_slotPluginInitDoneMutex;
|
||||
bool m_pluginInitDone; // set by slotPluginInitDone
|
||||
#endif
|
||||
QJsonObject m_savegame;
|
||||
bool m_hidden; // if true, does not create BLW
|
||||
int m_screenId{-1};
|
||||
@@ -403,7 +474,9 @@ class LTSSESSION_EXPORT LtsSession : public LtsSessionDataDds
|
||||
bool m_loadedFromSavegame;
|
||||
std::shared_ptr<OnlineHelp::ForeignOnlineHelpViewerGuiInterface> m_ohvIfc;
|
||||
bool m_foreverInvisible; // if true, creates BLW but hides it and does not use MMM
|
||||
#ifdef BUILD_RTI
|
||||
QStringList m_failedFetches;
|
||||
#endif
|
||||
QVector<LtsWidgets::LtsBackgroundWidget*> m_bgWidgets;
|
||||
QString m_workspaceId;
|
||||
bool m_needsToBeSuccessfullyPlaced{
|
||||
|
||||
Reference in new issue
Block a user