diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2020-09-18 12:35:24 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2020-09-21 07:22:03 +0000 |
| commit | 3888c3340443e4671ac4fe205568025c3c45dc6f (patch) | |
| tree | 3d33677759b0a11a9c8a20e9444095732d122e10 /src/libs/modelinglib | |
| parent | 830a829b2ebb224a970fecdca71055963a174c71 (diff) | |
Modeling: Fix build with Qt6
QUuid constructor with QString became explicit.
QStringRef gone.
Task-number: QTCREATORBUG-24098
Change-Id: I76d74bbce788c2349b777e76416ddec4a5933eb1
Reviewed-by: hjk <hjk@qt.io>
Diffstat (limited to 'src/libs/modelinglib')
3 files changed, 9 insertions, 5 deletions
diff --git a/src/libs/modelinglib/qmt/diagram_widgets_ui/diagramview.cpp b/src/libs/modelinglib/qmt/diagram_widgets_ui/diagramview.cpp index 2d23871f0bf..f91bcef9968 100644 --- a/src/libs/modelinglib/qmt/diagram_widgets_ui/diagramview.cpp +++ b/src/libs/modelinglib/qmt/diagram_widgets_ui/diagramview.cpp @@ -80,7 +80,8 @@ void DiagramView::dragEnterEvent(QDragEnterEvent *event) QString key; dataStream >> key; if (!key.isEmpty()) { - if (m_diagramSceneModel->diagramSceneController()->isAddingAllowed(Uid(key), m_diagramSceneModel->diagram())) + if (m_diagramSceneModel->diagramSceneController() + ->isAddingAllowed(Uid(QUuid(key)), m_diagramSceneModel->diagram())) accept = true; } } @@ -122,8 +123,10 @@ void DiagramView::dropEvent(QDropEvent *event) QString key; dataStream >> key; if (!key.isEmpty()) { - if (diagramSceneController->isAddingAllowed(Uid(key), m_diagramSceneModel->diagram())) { - diagramSceneController->addExistingModelElement(Uid(key), mapToScene(event->pos()), + if (diagramSceneController->isAddingAllowed(Uid(QUuid(key)), + m_diagramSceneModel->diagram())) { + diagramSceneController->addExistingModelElement(Uid(QUuid(key)), + mapToScene(event->pos()), m_diagramSceneModel->diagram()); } } diff --git a/src/libs/modelinglib/qmt/model_widgets_ui/modeltreeview.cpp b/src/libs/modelinglib/qmt/model_widgets_ui/modeltreeview.cpp index b3cfc13a0b0..5ad40944f67 100644 --- a/src/libs/modelinglib/qmt/model_widgets_ui/modeltreeview.cpp +++ b/src/libs/modelinglib/qmt/model_widgets_ui/modeltreeview.cpp @@ -207,7 +207,8 @@ void ModelTreeView::dropEvent(QDropEvent *event) QString key; dataStream >> key; if (!key.isEmpty()) { - MElement *modelElement = treeModel->modelController()->findElement(Uid(key)); + MElement *modelElement = treeModel->modelController()->findElement( + Uid(QUuid(key))); if (modelElement) { if (auto modelObject = dynamic_cast<MObject*>(modelElement)) { if (auto targetModelPackage = dynamic_cast<MPackage *>(targetModelObject)) { diff --git a/src/libs/modelinglib/qstringparser/qstringparser.cpp b/src/libs/modelinglib/qstringparser/qstringparser.cpp index bc9348394b8..cf40a46e619 100644 --- a/src/libs/modelinglib/qstringparser/qstringparser.cpp +++ b/src/libs/modelinglib/qstringparser/qstringparser.cpp @@ -124,7 +124,7 @@ bool QStringParser::Parser::scan(double *d, int *index) ++(*index); } bool ok = false; - *d = m_source.midRef(startIndex, *index - startIndex).toDouble(&ok); + *d = m_source.mid(startIndex, *index - startIndex).toDouble(&ok); return ok; } |