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

ModelEditor: Make keyword static known to class member parser

Browse Source 
Sometimes my brain is a junk room where I found the most wondrous bugs.

Change-Id: Ic3a29152fed564d405ee1251ff69ee57cf10ae36
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
This commit is contained in:
Jochen Becher
2015-12-22 19:58:39 +01:00
parent 6e1c70357c
commit e3d0a38bfa
3 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/libs/3rdparty/modeling/qmt/diagram_scene/items/classitem.cpp vendored
View File

@@ -665,6 +665,8 @@ void ClassItem::updateMembers(const Style *style)
*text += StereotypesItem::format(member.stereotypes()); *text += StereotypesItem::format(member.stereotypes());
*text += QStringLiteral(" "); *text += QStringLiteral(" ");
} }
if (member.properties() & MClassMember::PropertyStatic)
*text += QStringLiteral("static ");
if (member.properties() & MClassMember::PropertyVirtual) if (member.properties() & MClassMember::PropertyVirtual)
*text += QStringLiteral("virtual "); *text += QStringLiteral("virtual ");
*text += member.declaration().toHtmlEscaped(); *text += member.declaration().toHtmlEscaped();

1
src/libs/3rdparty/modeling/qmt/model/mclassmember.h vendored
View File

@@ -65,6 +65,7 @@ public:
PropertyOverride = 0x8, PropertyOverride = 0x8,
PropertyFinal = 0x10, PropertyFinal = 0x10,
PropertyConstexpr = 0x20, PropertyConstexpr = 0x20,
PropertyStatic = 0x40,
PropertyQsignal = 0x100, PropertyQsignal = 0x100,
PropertyQslot = 0x200, PropertyQslot = 0x200,
PropertyQinvokable = 0x400, PropertyQinvokable = 0x400,

5
src/libs/3rdparty/modeling/qmt/model_widgets_ui/classmembersedit.cpp vendored
View File

@@ -434,6 +434,8 @@ QString ClassMembersEdit::build(const QList<MClassMember> &members)
text += QStringLiteral("slot "); text += QStringLiteral("slot ");
if (member.properties() & MClassMember::PropertyQinvokable) if (member.properties() & MClassMember::PropertyQinvokable)
text += QStringLiteral("invokable "); text += QStringLiteral("invokable ");
if (member.properties() & MClassMember::PropertyStatic)
text += QStringLiteral("static ");
if (member.properties() & MClassMember::PropertyVirtual) if (member.properties() & MClassMember::PropertyVirtual)
text += QStringLiteral("virtual "); text += QStringLiteral("virtual ");
if (member.properties() & MClassMember::PropertyConstexpr) if (member.properties() & MClassMember::PropertyConstexpr)
@@ -507,6 +509,9 @@ QList<MClassMember> ClassMembersEdit::parse(const QString &text, bool *ok)
StereotypesController ctrl; StereotypesController ctrl;
member.setStereotypes(ctrl.fromString(stereotypes)); member.setStereotypes(ctrl.fromString(stereotypes));
word = cursor.readWord().toLower(); word = cursor.readWord().toLower();
} else if (word == QStringLiteral("static")) {
member.setProperties(member.properties() | MClassMember::PropertyStatic);
word = cursor.readWord().toLower();
} else if (word == QStringLiteral("virtual")) { } else if (word == QStringLiteral("virtual")) {
member.setProperties(member.properties() | MClassMember::PropertyVirtual); member.setProperties(member.properties() | MClassMember::PropertyVirtual);
word = cursor.readWord().toLower(); word = cursor.readWord().toLower();