aboutsummaryrefslogtreecommitdiffstats
path: root/src/libs/modelinglib
diff options
context:
space:
mode:
authorhjk <hjk@qt.io>2021-01-11 10:47:10 +0100
committerhjk <hjk@qt.io>2021-01-11 10:53:43 +0000
commit48a6f8ad8240b4b8f2e7ac5a567e5874ad462be6 (patch)
treea85c445bba0271a861d794a471cf35ea18f2ccc3 /src/libs/modelinglib
parent7644dae9378528e49543b7f4c79920717d8d4045 (diff)
Modeling: Rename D{Association,Connection}End::setCardina{t,}lity
Typos. Note that this doesn't fix the typos in the saved models yet. Task-number: QTCREATORBUG-24543 Change-Id: I3317160692efdbaab10b00a76129ca128b57e259 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Diffstat (limited to 'src/libs/modelinglib')
-rw-r--r--src/libs/modelinglib/qmt/diagram/dassociation.cpp2
-rw-r--r--src/libs/modelinglib/qmt/diagram/dassociation.h2
-rw-r--r--src/libs/modelinglib/qmt/diagram/dconnection.cpp2
-rw-r--r--src/libs/modelinglib/qmt/diagram/dconnection.h2
-rw-r--r--src/libs/modelinglib/qmt/diagram_controller/dupdatevisitor.cpp8
-rw-r--r--src/libs/modelinglib/qmt/serializer/diagramserializer.cpp4
6 files changed, 10 insertions, 10 deletions
diff --git a/src/libs/modelinglib/qmt/diagram/dassociation.cpp b/src/libs/modelinglib/qmt/diagram/dassociation.cpp
index f1c2ea9b521..1ed5256cb4f 100644
--- a/src/libs/modelinglib/qmt/diagram/dassociation.cpp
+++ b/src/libs/modelinglib/qmt/diagram/dassociation.cpp
@@ -43,7 +43,7 @@ void DAssociationEnd::setName(const QString &name)
m_name = name;
}
-void DAssociationEnd::setCardinatlity(const QString &cardinality)
+void DAssociationEnd::setCardinality(const QString &cardinality)
{
m_cardinality = cardinality;
}
diff --git a/src/libs/modelinglib/qmt/diagram/dassociation.h b/src/libs/modelinglib/qmt/diagram/dassociation.h
index 7c914272e58..64a3b9dd6bb 100644
--- a/src/libs/modelinglib/qmt/diagram/dassociation.h
+++ b/src/libs/modelinglib/qmt/diagram/dassociation.h
@@ -40,7 +40,7 @@ public:
QString name() const { return m_name; }
void setName(const QString &name);
QString cardinality() const { return m_cardinality; }
- void setCardinatlity(const QString &cardinality);
+ void setCardinality(const QString &cardinality);
MAssociationEnd::Kind kind() const { return m_kind; }
void setKind(MAssociationEnd::Kind kind);
bool isNavigable() const { return m_isNavigable; }
diff --git a/src/libs/modelinglib/qmt/diagram/dconnection.cpp b/src/libs/modelinglib/qmt/diagram/dconnection.cpp
index a5611795fc0..1528d92e296 100644
--- a/src/libs/modelinglib/qmt/diagram/dconnection.cpp
+++ b/src/libs/modelinglib/qmt/diagram/dconnection.cpp
@@ -43,7 +43,7 @@ void DConnectionEnd::setName(const QString &name)
m_name = name;
}
-void DConnectionEnd::setCardinatlity(const QString &cardinality)
+void DConnectionEnd::setCardinality(const QString &cardinality)
{
m_cardinality = cardinality;
}
diff --git a/src/libs/modelinglib/qmt/diagram/dconnection.h b/src/libs/modelinglib/qmt/diagram/dconnection.h
index 4100142eeff..4fd06ee981b 100644
--- a/src/libs/modelinglib/qmt/diagram/dconnection.h
+++ b/src/libs/modelinglib/qmt/diagram/dconnection.h
@@ -40,7 +40,7 @@ public:
QString name() const { return m_name; }
void setName(const QString &name);
QString cardinality() const { return m_cardinality; }
- void setCardinatlity(const QString &cardinality);
+ void setCardinality(const QString &cardinality);
bool isNavigable() const { return m_isNavigable; }
void setNavigable(bool navigable);
diff --git a/src/libs/modelinglib/qmt/diagram_controller/dupdatevisitor.cpp b/src/libs/modelinglib/qmt/diagram_controller/dupdatevisitor.cpp
index cc1ffa681ac..5fce86758a3 100644
--- a/src/libs/modelinglib/qmt/diagram_controller/dupdatevisitor.cpp
+++ b/src/libs/modelinglib/qmt/diagram_controller/dupdatevisitor.cpp
@@ -207,14 +207,14 @@ void DUpdateVisitor::visitMAssociation(const MAssociation *association)
QMT_ASSERT(dassociation, return);
DAssociationEnd endA;
endA.setName(association->endA().name());
- endA.setCardinatlity(association->endA().cardinality());
+ endA.setCardinality(association->endA().cardinality());
endA.setNavigable(association->endA().isNavigable());
endA.setKind(association->endA().kind());
if (isUpdating(endA != dassociation->endA()))
dassociation->setEndA(endA);
DAssociationEnd endB;
endB.setName(association->endB().name());
- endB.setCardinatlity(association->endB().cardinality());
+ endB.setCardinality(association->endB().cardinality());
endB.setNavigable(association->endB().isNavigable());
endB.setKind(association->endB().kind());
if (isUpdating(endB != dassociation->endB()))
@@ -230,13 +230,13 @@ void DUpdateVisitor::visitMConnection(const MConnection *connection)
dconnection->setCustomRelationId(connection->customRelationId());
DConnectionEnd endA;
endA.setName(connection->endA().name());
- endA.setCardinatlity(connection->endA().cardinality());
+ endA.setCardinality(connection->endA().cardinality());
endA.setNavigable(connection->endA().isNavigable());
if (isUpdating(endA != dconnection->endA()))
dconnection->setEndA(endA);
DConnectionEnd endB;
endB.setName(connection->endB().name());
- endB.setCardinatlity(connection->endB().cardinality());
+ endB.setCardinality(connection->endB().cardinality());
endB.setNavigable(connection->endB().isNavigable());
if (isUpdating(endB != dconnection->endB()))
dconnection->setEndB(endB);
diff --git a/src/libs/modelinglib/qmt/serializer/diagramserializer.cpp b/src/libs/modelinglib/qmt/serializer/diagramserializer.cpp
index d00a5f94075..865418d8f58 100644
--- a/src/libs/modelinglib/qmt/serializer/diagramserializer.cpp
+++ b/src/libs/modelinglib/qmt/serializer/diagramserializer.cpp
@@ -307,7 +307,7 @@ inline void Access<Archive, DAssociationEnd>::serialize(Archive &archive, DAssoc
{
archive || tag(associationEnd)
|| attr("name", associationEnd, &DAssociationEnd::name, &DAssociationEnd::setName)
- || attr("cradinality", associationEnd, &DAssociationEnd::cardinality, &DAssociationEnd::setCardinatlity)
+ || attr("cradinality", associationEnd, &DAssociationEnd::cardinality, &DAssociationEnd::setCardinality)
|| attr("navigable", associationEnd, &DAssociationEnd::isNavigable, &DAssociationEnd::setNavigable)
|| attr("kind", associationEnd, &DAssociationEnd::kind, &DAssociationEnd::setKind)
|| end;
@@ -341,7 +341,7 @@ inline void Access<Archive, DConnectionEnd>::serialize(Archive &archive, DConnec
{
archive || tag(connectionEnd)
|| attr("name", connectionEnd, &DConnectionEnd::name, &DConnectionEnd::setName)
- || attr("cradinality", connectionEnd, &DConnectionEnd::cardinality, &DConnectionEnd::setCardinatlity)
+ || attr("cradinality", connectionEnd, &DConnectionEnd::cardinality, &DConnectionEnd::setCardinality)
|| attr("navigable", connectionEnd, &DConnectionEnd::isNavigable, &DConnectionEnd::setNavigable)
|| end;
}