diff options
author | Eike Ziller <eike.ziller@qt.io> | 2022-01-03 12:55:06 +0100 |
---|---|---|
committer | Eike Ziller <eike.ziller@qt.io> | 2022-01-04 11:03:08 +0000 |
commit | 5a135ba44266dc34264f70fd53c95eb53be0af1d (patch) | |
tree | b0e75d5002ea65e003f00c30fbb6a5c2c6b17de7 /src/libs/modelinglib | |
parent | cf5fc98a2c3d573061fda1e357e0a17901a47b55 (diff) |
Modeling: Fix queued connections for Qt 6
The argument must be registered as a meta type for queued connections.
This also depends on a consistent naming of the type in the signal
arguments (which best is fully qualified).
Fixes: QTCREATORBUG-26760
Task-number: QTCREATORBUG-24098
Change-Id: I83991326f051d592a1665ae8cdb472d8376e74bc
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Diffstat (limited to 'src/libs/modelinglib')
6 files changed, 20 insertions, 20 deletions
diff --git a/src/libs/modelinglib/qmt/diagram_controller/diagramcontroller.h b/src/libs/modelinglib/qmt/diagram_controller/diagramcontroller.h index e84cec6920..cf9d12f09c 100644 --- a/src/libs/modelinglib/qmt/diagram_controller/diagramcontroller.h +++ b/src/libs/modelinglib/qmt/diagram_controller/diagramcontroller.h @@ -71,16 +71,16 @@ public: signals: void beginResetAllDiagrams(); void endResetAllDiagrams(); - void beginResetDiagram(const MDiagram *diagram); - void endResetDiagram(const MDiagram *diagram); - void beginUpdateElement(int row, const MDiagram *diagram); - void endUpdateElement(int row, const MDiagram *diagram); - void beginInsertElement(int row, const MDiagram *diagram); - void endInsertElement(int row, const MDiagram *diagram); - void beginRemoveElement(int row, const MDiagram *diagram); - void endRemoveElement(int row, const MDiagram *diagram); - void modified(const MDiagram *diagram); - void diagramAboutToBeRemoved(const MDiagram *diagram); + void beginResetDiagram(const qmt::MDiagram *diagram); + void endResetDiagram(const qmt::MDiagram *diagram); + void beginUpdateElement(int row, const qmt::MDiagram *diagram); + void endUpdateElement(int row, const qmt::MDiagram *diagram); + void beginInsertElement(int row, const qmt::MDiagram *diagram); + void endInsertElement(int row, const qmt::MDiagram *diagram); + void beginRemoveElement(int row, const qmt::MDiagram *diagram); + void endRemoveElement(int row, const qmt::MDiagram *diagram); + void modified(const qmt::MDiagram *diagram); + void diagramAboutToBeRemoved(const qmt::MDiagram *diagram); public: ModelController *modelController() const { return m_modelController; } diff --git a/src/libs/modelinglib/qmt/diagram_scene/diagramscenemodel.h b/src/libs/modelinglib/qmt/diagram_scene/diagramscenemodel.h index 3a669da5d0..98ad9a7677 100644 --- a/src/libs/modelinglib/qmt/diagram_scene/diagramscenemodel.h +++ b/src/libs/modelinglib/qmt/diagram_scene/diagramscenemodel.h @@ -80,8 +80,8 @@ public: ~DiagramSceneModel() override; signals: - void diagramSceneActivated(const MDiagram *diagram); - void selectionHasChanged(const MDiagram *diagram); + void diagramSceneActivated(const qmt::MDiagram *diagram); + void selectionHasChanged(const qmt::MDiagram *diagram); void sceneRectChanged(const QRectF &sceneRect); public: diff --git a/src/libs/modelinglib/qmt/diagram_ui/diagramsmanager.h b/src/libs/modelinglib/qmt/diagram_ui/diagramsmanager.h index 226c2389a5..cb5298d723 100644 --- a/src/libs/modelinglib/qmt/diagram_ui/diagramsmanager.h +++ b/src/libs/modelinglib/qmt/diagram_ui/diagramsmanager.h @@ -61,8 +61,8 @@ public: signals: void someDiagramOpened(bool); - void diagramActivated(const MDiagram *diagram); - void diagramSelectionChanged(const MDiagram *diagram); + void diagramActivated(const qmt::MDiagram *diagram); + void diagramSelectionChanged(const qmt::MDiagram *diagram); public: void setModel(TreeModel *model); diff --git a/src/libs/modelinglib/qmt/diagram_widgets_ui/diagramsview.h b/src/libs/modelinglib/qmt/diagram_widgets_ui/diagramsview.h index ec8cc026a4..7e1fa7df3b 100644 --- a/src/libs/modelinglib/qmt/diagram_widgets_ui/diagramsview.h +++ b/src/libs/modelinglib/qmt/diagram_widgets_ui/diagramsview.h @@ -50,8 +50,8 @@ public: ~DiagramsView() override; signals: - void currentDiagramChanged(const MDiagram *diagram); - void diagramCloseRequested(const MDiagram *diagram); + void currentDiagramChanged(const qmt::MDiagram *diagram); + void diagramCloseRequested(const qmt::MDiagram *diagram); void someDiagramOpened(bool); public: diff --git a/src/libs/modelinglib/qmt/diagram_widgets_ui/stackeddiagramsview.h b/src/libs/modelinglib/qmt/diagram_widgets_ui/stackeddiagramsview.h index 36822ea245..2f045e6da6 100644 --- a/src/libs/modelinglib/qmt/diagram_widgets_ui/stackeddiagramsview.h +++ b/src/libs/modelinglib/qmt/diagram_widgets_ui/stackeddiagramsview.h @@ -49,8 +49,8 @@ public: ~StackedDiagramsView() override; signals: - void currentDiagramChanged(const MDiagram *diagram); - void diagramCloseRequested(const MDiagram *diagram); + void currentDiagramChanged(const qmt::MDiagram *diagram); + void diagramCloseRequested(const qmt::MDiagram *diagram); void someDiagramOpened(bool); public: diff --git a/src/libs/modelinglib/qmt/tasks/diagramscenecontroller.h b/src/libs/modelinglib/qmt/tasks/diagramscenecontroller.h index 5f925df48b..c13d3aab26 100644 --- a/src/libs/modelinglib/qmt/tasks/diagramscenecontroller.h +++ b/src/libs/modelinglib/qmt/tasks/diagramscenecontroller.h @@ -72,8 +72,8 @@ public: ~DiagramSceneController() override; signals: - void newElementCreated(DElement *element, MDiagram *diagram); - void elementAdded(DElement *element, MDiagram *diagram); + void newElementCreated(DElement *element, qmt::MDiagram *diagram); + void elementAdded(DElement *element, qmt::MDiagram *diagram); public: ModelController *modelController() const { return m_modelController; } |