feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Modeling: Fix build with Qt6

Browse Source 
QUuid constructor with QString became explicit.
QStringRef gone.

Task-number: QTCREATORBUG-24098
Change-Id: I76d74bbce788c2349b777e76416ddec4a5933eb1
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Eike Ziller
2020-09-18 12:35:24 +02:00
parent 830a829b2e
commit 3888c33404
3 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/libs/modelinglib/qmt/diagram_widgets_ui/diagramview.cpp
View File

@@ -80,7 +80,8 @@ void DiagramView::dragEnterEvent(QDragEnterEvent *event)
QString key; QString key;
dataStream >> key; dataStream >> key;
if (!key.isEmpty()) { 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; accept = true;
} }
} }
@@ -122,8 +123,10 @@ void DiagramView::dropEvent(QDropEvent *event)
QString key; QString key;
dataStream >> key; dataStream >> key;
if (!key.isEmpty()) { if (!key.isEmpty()) {
if (diagramSceneController->isAddingAllowed(Uid(key), m_diagramSceneModel->diagram())) { if (diagramSceneController->isAddingAllowed(Uid(QUuid(key)),
diagramSceneController->addExistingModelElement(Uid(key), mapToScene(event->pos()), m_diagramSceneModel->diagram())) {
diagramSceneController->addExistingModelElement(Uid(QUuid(key)),
mapToScene(event->pos()),
m_diagramSceneModel->diagram()); m_diagramSceneModel->diagram());
} }
} }

3
src/libs/modelinglib/qmt/model_widgets_ui/modeltreeview.cpp
View File

@@ -207,7 +207,8 @@ void ModelTreeView::dropEvent(QDropEvent *event)
QString key; QString key;
dataStream >> key; dataStream >> key;
if (!key.isEmpty()) { if (!key.isEmpty()) {
MElement *modelElement = treeModel->modelController()->findElement(Uid(key)); MElement *modelElement = treeModel->modelController()->findElement(
Uid(QUuid(key)));
if (modelElement) { if (modelElement) {
if (auto modelObject = dynamic_cast<MObject*>(modelElement)) { if (auto modelObject = dynamic_cast<MObject*>(modelElement)) {
if (auto targetModelPackage = dynamic_cast<MPackage *>(targetModelObject)) { if (auto targetModelPackage = dynamic_cast<MPackage *>(targetModelObject)) {

2
src/libs/modelinglib/qstringparser/qstringparser.cpp
View File

@@ -124,7 +124,7 @@ bool QStringParser::Parser::scan(double *d, int *index)
++(*index); ++(*index);
} }
bool ok = false; bool ok = false;
*d = m_source.midRef(startIndex, *index - startIndex).toDouble(&ok); *d = m_source.mid(startIndex, *index - startIndex).toDouble(&ok);
return ok; return ok;
} }