diff --git a/src/libs/3rdparty/modeling/qmt/config/configcontroller.cpp b/src/libs/3rdparty/modeling/qmt/config/configcontroller.cpp
index 6e05d5abcec..d315f95b565 100644
--- a/src/libs/3rdparty/modeling/qmt/config/configcontroller.cpp
+++ b/src/libs/3rdparty/modeling/qmt/config/configcontroller.cpp
@@ -45,8 +45,9 @@
 
 namespace qmt {
 
-struct ConfigController::ConfigControllerPrivate
+class ConfigController::ConfigControllerPrivate
 {
+public:
     ConfigControllerPrivate()
         : m_stereotypeController(0)
     {
diff --git a/src/libs/3rdparty/modeling/qmt/config/configcontroller.h b/src/libs/3rdparty/modeling/qmt/config/configcontroller.h
index b8bcc72adaf..e012c7a3537 100644
--- a/src/libs/3rdparty/modeling/qmt/config/configcontroller.h
+++ b/src/libs/3rdparty/modeling/qmt/config/configcontroller.h
@@ -45,7 +45,7 @@ class QMT_EXPORT ConfigController : public QObject
 {
     Q_OBJECT
 
-    struct ConfigControllerPrivate;
+    class ConfigControllerPrivate;
 
 public:
 
diff --git a/src/libs/3rdparty/modeling/qmt/config/stereotypedefinitionparser.cpp b/src/libs/3rdparty/modeling/qmt/config/stereotypedefinitionparser.cpp
index 2f36bf32090..a7d52c12c19 100644
--- a/src/libs/3rdparty/modeling/qmt/config/stereotypedefinitionparser.cpp
+++ b/src/libs/3rdparty/modeling/qmt/config/stereotypedefinitionparser.cpp
@@ -107,8 +107,9 @@ StereotypeDefinitionParserError::~StereotypeDefinitionParserError()
 }
 
 
-struct StereotypeDefinitionParser::StereotypeDefinitionParserPrivate
+class StereotypeDefinitionParser::StereotypeDefinitionParserPrivate
 {
+public:
     StereotypeDefinitionParserPrivate()
         : m_scanner(0)
     {
@@ -119,8 +120,9 @@ struct StereotypeDefinitionParser::StereotypeDefinitionParserPrivate
 };
 
 
-struct StereotypeDefinitionParser::IconCommandParameter
+class StereotypeDefinitionParser::IconCommandParameter
 {
+public:
     IconCommandParameter(ShapeValueF::Unit unit, ShapeValueF::Origin origin = ShapeValueF::OriginSmart)
         : m_unit(unit),
           m_origin(origin)
diff --git a/src/libs/3rdparty/modeling/qmt/config/stereotypedefinitionparser.h b/src/libs/3rdparty/modeling/qmt/config/stereotypedefinitionparser.h
index 495375fea1f..5f78b447bc9 100644
--- a/src/libs/3rdparty/modeling/qmt/config/stereotypedefinitionparser.h
+++ b/src/libs/3rdparty/modeling/qmt/config/stereotypedefinitionparser.h
@@ -67,9 +67,9 @@ class QMT_EXPORT StereotypeDefinitionParser : public QObject
 {
     Q_OBJECT
 
-    struct StereotypeDefinitionParserPrivate;
+    class StereotypeDefinitionParserPrivate;
 
-    struct IconCommandParameter;
+    class IconCommandParameter;
 
 public:
 
diff --git a/src/libs/3rdparty/modeling/qmt/config/textscanner.cpp b/src/libs/3rdparty/modeling/qmt/config/textscanner.cpp
index a1ba7d37dd0..78308d9c5c1 100644
--- a/src/libs/3rdparty/modeling/qmt/config/textscanner.cpp
+++ b/src/libs/3rdparty/modeling/qmt/config/textscanner.cpp
@@ -54,7 +54,9 @@ TextScannerError::~TextScannerError()
 {
 }
 
-struct TextScanner::TextScannerPrivate {
+class TextScanner::TextScannerPrivate
+{
+public:
     TextScannerPrivate()
         : m_maxOperatorLength(0),
           m_source(0)
diff --git a/src/libs/3rdparty/modeling/qmt/config/textscanner.h b/src/libs/3rdparty/modeling/qmt/config/textscanner.h
index df33711d865..6db9f5884d5 100644
--- a/src/libs/3rdparty/modeling/qmt/config/textscanner.h
+++ b/src/libs/3rdparty/modeling/qmt/config/textscanner.h
@@ -40,7 +40,7 @@
 namespace qmt {
 
 class ITextSource;
-struct SourceChar;
+class SourceChar;
 class Token;
 
 class QMT_EXPORT TextScannerError :
@@ -65,7 +65,7 @@ class QMT_EXPORT TextScanner : public QObject
 {
     Q_OBJECT
 
-    struct TextScannerPrivate;
+    class TextScannerPrivate;
 
 public:
     explicit TextScanner(QObject *parent = 0);
diff --git a/src/libs/3rdparty/modeling/qmt/config/textsource.h b/src/libs/3rdparty/modeling/qmt/config/textsource.h
index 8b28d6fc4ab..122895c0234 100644
--- a/src/libs/3rdparty/modeling/qmt/config/textsource.h
+++ b/src/libs/3rdparty/modeling/qmt/config/textsource.h
@@ -38,7 +38,9 @@
 
 namespace qmt {
 
-struct SourceChar {
+class SourceChar
+{
+public:
     SourceChar() { }
     SourceChar(QChar chr, const SourcePos &sourcePos)
         : ch(chr),
diff --git a/src/libs/3rdparty/modeling/qmt/diagram_controller/diagramcontroller.cpp b/src/libs/3rdparty/modeling/qmt/diagram_controller/diagramcontroller.cpp
index 7bdaa9bb7dc..69dcb8a1986 100644
--- a/src/libs/3rdparty/modeling/qmt/diagram_controller/diagramcontroller.cpp
+++ b/src/libs/3rdparty/modeling/qmt/diagram_controller/diagramcontroller.cpp
@@ -54,7 +54,9 @@
 
 namespace qmt {
 
-struct DiagramController::Clone {
+class DiagramController::Clone
+{
+public:
     Clone();
     Uid m_elementKey;
     int m_indexOfElement;
diff --git a/src/libs/3rdparty/modeling/qmt/diagram_controller/diagramcontroller.h b/src/libs/3rdparty/modeling/qmt/diagram_controller/diagramcontroller.h
index 889935cc96e..f4db176c853 100644
--- a/src/libs/3rdparty/modeling/qmt/diagram_controller/diagramcontroller.h
+++ b/src/libs/3rdparty/modeling/qmt/diagram_controller/diagramcontroller.h
@@ -71,7 +71,7 @@ public:
 
 private:
 
-    struct Clone;
+    class Clone;
 
     class DiagramUndoCommand;
     class UpdateElementCommand;
diff --git a/src/libs/3rdparty/modeling/qmt/diagram_scene/capabilities/latchable.h b/src/libs/3rdparty/modeling/qmt/diagram_scene/capabilities/latchable.h
index 6910a207123..6e403fbe316 100644
--- a/src/libs/3rdparty/modeling/qmt/diagram_scene/capabilities/latchable.h
+++ b/src/libs/3rdparty/modeling/qmt/diagram_scene/capabilities/latchable.h
@@ -56,7 +56,9 @@ public:
         Vcenter
     };
 
-    struct Latch {
+    class Latch
+    {
+    public:
         Latch()
             : m_latchType(None),
               m_pos(0.0),
diff --git a/src/libs/3rdparty/modeling/qmt/diagram_scene/items/packageitem.cpp b/src/libs/3rdparty/modeling/qmt/diagram_scene/items/packageitem.cpp
index 8ae19533726..10186720c0e 100644
--- a/src/libs/3rdparty/modeling/qmt/diagram_scene/items/packageitem.cpp
+++ b/src/libs/3rdparty/modeling/qmt/diagram_scene/items/packageitem.cpp
@@ -64,7 +64,9 @@ static const qreal MINIMUM_AUTO_WIDTH = 100.0;
 static const qreal MINIMUM_AUTO_HEIGHT = 70.0;
 
 
-struct PackageItem::ShapeGeometry {
+class PackageItem::ShapeGeometry
+{
+public:
     ShapeGeometry(const QSizeF &minimumSize, const QSizeF &minimumTabSize)
         : m_minimumSize(minimumSize),
           m_minimumTabSize(minimumTabSize)
diff --git a/src/libs/3rdparty/modeling/qmt/diagram_scene/items/packageitem.h b/src/libs/3rdparty/modeling/qmt/diagram_scene/items/packageitem.h
index 132311592f5..9597a60ffad 100644
--- a/src/libs/3rdparty/modeling/qmt/diagram_scene/items/packageitem.h
+++ b/src/libs/3rdparty/modeling/qmt/diagram_scene/items/packageitem.h
@@ -55,7 +55,7 @@ class PackageItem :
         public ObjectItem,
         public IRelationable
 {
-    struct ShapeGeometry;
+    class ShapeGeometry;
 
 public:
     PackageItem(DPackage *package, DiagramSceneModel *diagramSceneModel, QGraphicsItem *parent = 0);
diff --git a/src/libs/3rdparty/modeling/qmt/infrastructure/geometryutilities.cpp b/src/libs/3rdparty/modeling/qmt/infrastructure/geometryutilities.cpp
index a11e89908cf..14c889b485d 100644
--- a/src/libs/3rdparty/modeling/qmt/infrastructure/geometryutilities.cpp
+++ b/src/libs/3rdparty/modeling/qmt/infrastructure/geometryutilities.cpp
@@ -81,7 +81,9 @@ bool GeometryUtilities::intersect(const QPolygonF &polygon, const QLineF &line,
 
 namespace {
 
-struct Candidate {
+class Candidate
+{
+public:
     Candidate() : third(GeometryUtilities::SideUnspecified) { }
 
     Candidate(const QVector2D &f, const QPointF &s, GeometryUtilities::Side t) : first(f), second(s), third(t) { }
diff --git a/src/libs/3rdparty/modeling/qmt/infrastructure/handles.h b/src/libs/3rdparty/modeling/qmt/infrastructure/handles.h
index 6e038cf1386..26cdd4b62cc 100644
--- a/src/libs/3rdparty/modeling/qmt/infrastructure/handles.h
+++ b/src/libs/3rdparty/modeling/qmt/infrastructure/handles.h
@@ -45,11 +45,11 @@ class Handles
 {
 public:
 
-    typedef QList<Handle<T> > type;
+    typedef QList<Handle<T> > value_type;
 
-    typedef typename type::iterator iterator;
+    typedef typename value_type::iterator iterator;
 
-    typedef typename type::const_iterator const_iterator;
+    typedef typename value_type::const_iterator const_iterator;
 
 public:
 
@@ -154,16 +154,16 @@ public:
 
 public:
 
-    const type &get() const { return m_handleList; }
+    const value_type &get() const { return m_handleList; }
 
-    type take()
+    value_type take()
     {
-        type handles = m_handleList;
+        value_type handles = m_handleList;
         m_handleList.clear();
         return handles;
     }
 
-    void set(const type &handles) {
+    void set(const value_type &handles) {
         reset();
         m_handleList = handles;
     }
@@ -259,7 +259,7 @@ public:
 
 private:
 
-    type m_handleList;
+    value_type m_handleList;
 
     bool m_takeOwnership;
 };
diff --git a/src/libs/3rdparty/modeling/qmt/model_controller/modelcontroller.cpp b/src/libs/3rdparty/modeling/qmt/model_controller/modelcontroller.cpp
index e48000a7e32..4609295d051 100644
--- a/src/libs/3rdparty/modeling/qmt/model_controller/modelcontroller.cpp
+++ b/src/libs/3rdparty/modeling/qmt/model_controller/modelcontroller.cpp
@@ -47,7 +47,9 @@
 
 namespace qmt {
 
-struct ModelController::Clone {
+class ModelController::Clone
+{
+public:
     Clone();
 
     ElementType m_elementType;
@@ -379,7 +381,7 @@ public:
 
     void add(MElement *element, MObject *owner)
     {
-        struct Clone clone;
+        ModelController::Clone clone;
 
         clone.m_elementKey = element->uid();
         clone.m_ownerKey = owner->uid();
diff --git a/src/libs/3rdparty/modeling/qmt/model_controller/modelcontroller.h b/src/libs/3rdparty/modeling/qmt/model_controller/modelcontroller.h
index d3b51c42334..c579e6534d5 100644
--- a/src/libs/3rdparty/modeling/qmt/model_controller/modelcontroller.h
+++ b/src/libs/3rdparty/modeling/qmt/model_controller/modelcontroller.h
@@ -65,7 +65,7 @@ class QMT_EXPORT ModelController :
         TypeObject,
         TypeRelation };
 
-    struct Clone;
+    class Clone;
 
     class UpdateObjectCommand;
     class UpdateRelationCommand;
diff --git a/src/libs/3rdparty/modeling/qmt/model_widgets_ui/classmembersedit.cpp b/src/libs/3rdparty/modeling/qmt/model_widgets_ui/classmembersedit.cpp
index 88ab6d3afdf..be8a0183b0b 100644
--- a/src/libs/3rdparty/modeling/qmt/model_widgets_ui/classmembersedit.cpp
+++ b/src/libs/3rdparty/modeling/qmt/model_widgets_ui/classmembersedit.cpp
@@ -301,7 +301,9 @@ QString ClassMembersEdit::Cursor::preparse(const QString &text)
 }
 
 
-struct ClassMembersEdit::ClassMembersEditPrivate {
+class ClassMembersEdit::ClassMembersEditPrivate
+{
+public:
     ClassMembersEditPrivate()
         : m_valid(true)
     {
diff --git a/src/libs/3rdparty/modeling/qmt/model_widgets_ui/classmembersedit.h b/src/libs/3rdparty/modeling/qmt/model_widgets_ui/classmembersedit.h
index 69e75d0eec4..bfaf30d8ede 100644
--- a/src/libs/3rdparty/modeling/qmt/model_widgets_ui/classmembersedit.h
+++ b/src/libs/3rdparty/modeling/qmt/model_widgets_ui/classmembersedit.h
@@ -44,7 +44,7 @@ class QMT_EXPORT ClassMembersEdit :
     Q_OBJECT
 
     class Cursor;
-    struct ClassMembersEditPrivate;
+    class ClassMembersEditPrivate;
 
 public:
 
diff --git a/src/libs/3rdparty/modeling/qmt/stereotype/iconshape.cpp b/src/libs/3rdparty/modeling/qmt/stereotype/iconshape.cpp
index d92170ed785..7bdd2578339 100644
--- a/src/libs/3rdparty/modeling/qmt/stereotype/iconshape.cpp
+++ b/src/libs/3rdparty/modeling/qmt/stereotype/iconshape.cpp
@@ -51,7 +51,9 @@ QList<T *> CloneAll(const QList<T *> &rhs)
 
 namespace qmt {
 
-struct IconShape::IconShapePrivate {
+class IconShape::IconShapePrivate
+{
+public:
     IconShapePrivate()
     {
     }
diff --git a/src/libs/3rdparty/modeling/qmt/stereotype/iconshape.h b/src/libs/3rdparty/modeling/qmt/stereotype/iconshape.h
index 0ae4c730bab..9316183e22d 100644
--- a/src/libs/3rdparty/modeling/qmt/stereotype/iconshape.h
+++ b/src/libs/3rdparty/modeling/qmt/stereotype/iconshape.h
@@ -44,7 +44,7 @@ class ShapeConstVisitor;
 
 class QMT_EXPORT IconShape
 {
-    struct IconShapePrivate;
+    class IconShapePrivate;
 
 public:
 
diff --git a/src/libs/3rdparty/modeling/qmt/stereotype/shapes.h b/src/libs/3rdparty/modeling/qmt/stereotype/shapes.h
index c439bac5630..9fe8b70336b 100644
--- a/src/libs/3rdparty/modeling/qmt/stereotype/shapes.h
+++ b/src/libs/3rdparty/modeling/qmt/stereotype/shapes.h
@@ -294,7 +294,9 @@ public:
         TypeClose
     };
 
-    struct Element {
+    class Element
+    {
+    public:
         explicit Element(ElementType element = TypeNone)
             : m_elementType(element),
               m_angle1(0.0),
diff --git a/src/libs/3rdparty/modeling/qmt/stereotype/stereotypecontroller.cpp b/src/libs/3rdparty/modeling/qmt/stereotype/stereotypecontroller.cpp
index dd8fcef1c29..b393f69a787 100644
--- a/src/libs/3rdparty/modeling/qmt/stereotype/stereotypecontroller.cpp
+++ b/src/libs/3rdparty/modeling/qmt/stereotype/stereotypecontroller.cpp
@@ -46,8 +46,9 @@
 
 namespace qmt {
 
-struct StereotypeController::StereotypeControllerPrivate
+class StereotypeController::StereotypeControllerPrivate
 {
+public:
     StereotypeControllerPrivate()
     {
     }
diff --git a/src/libs/3rdparty/modeling/qmt/stereotype/stereotypecontroller.h b/src/libs/3rdparty/modeling/qmt/stereotype/stereotypecontroller.h
index 1d23181bb9b..17f1ec6318f 100644
--- a/src/libs/3rdparty/modeling/qmt/stereotype/stereotypecontroller.h
+++ b/src/libs/3rdparty/modeling/qmt/stereotype/stereotypecontroller.h
@@ -48,7 +48,7 @@ class QMT_EXPORT StereotypeController :
 {
     Q_OBJECT
 
-    struct StereotypeControllerPrivate;
+    class StereotypeControllerPrivate;
 
 public:
     explicit StereotypeController(QObject *parent = 0);
diff --git a/src/libs/3rdparty/modeling/qmt/stereotype/toolbar.h b/src/libs/3rdparty/modeling/qmt/stereotype/toolbar.h
index d1e6a37ec01..ee0901fe6a9 100644
--- a/src/libs/3rdparty/modeling/qmt/stereotype/toolbar.h
+++ b/src/libs/3rdparty/modeling/qmt/stereotype/toolbar.h
@@ -48,7 +48,9 @@ public:
         TooltypeSeparator
     };
 
-    struct Tool {
+    class Tool
+    {
+    public:
         Tool()
             : m_toolType(TooltypeSeparator)
         {
diff --git a/src/libs/3rdparty/modeling/qmt/style/defaultstyleengine.cpp b/src/libs/3rdparty/modeling/qmt/style/defaultstyleengine.cpp
index a23f06b31c6..3c33ced239b 100644
--- a/src/libs/3rdparty/modeling/qmt/style/defaultstyleengine.cpp
+++ b/src/libs/3rdparty/modeling/qmt/style/defaultstyleengine.cpp
@@ -49,7 +49,9 @@ namespace qmt {
 
 // TODO use tuple instead of these 4 explicit key classes
 
-struct ObjectStyleKey {
+class ObjectStyleKey
+{
+public:
     ObjectStyleKey()
         : m_elementType(StyleEngine::TypeOther)
     {
@@ -76,7 +78,9 @@ bool operator==(const ObjectStyleKey &lhs, const ObjectStyleKey &rhs)
 }
 
 
-struct RelationStyleKey {
+class RelationStyleKey
+{
+public:
     RelationStyleKey(StyleEngine::ElementType elementType = StyleEngine::TypeOther,
                      DObject::VisualPrimaryRole visualPrimaryRole = DObject::PrimaryRoleNormal)
         : m_elementType(elementType),
@@ -98,7 +102,9 @@ bool operator==(const RelationStyleKey &lhs, const RelationStyleKey &rhs)
 }
 
 
-struct AnnotationStyleKey {
+class AnnotationStyleKey
+{
+public:
     AnnotationStyleKey(DAnnotation::VisualRole visualRole = DAnnotation::RoleNormal)
         : m_visualRole(visualRole)
     {
@@ -117,7 +123,9 @@ bool operator==(const AnnotationStyleKey &lhs, const AnnotationStyleKey &rhs)
 }
 
 
-struct BoundaryStyleKey {
+class BoundaryStyleKey
+{
+public:
     BoundaryStyleKey()
     {
     }
@@ -229,7 +237,9 @@ const Style *DefaultStyleEngine::applyObjectStyle(const Style *baseStyle, const
 {
     ElementType elementType = objectType(styledObject.object());
 
-    struct DepthProperties {
+    class DepthProperties
+    {
+    public:
         DepthProperties()
             : m_elementType(TypeOther),
               m_visualPrimaryRole(DObject::PrimaryRoleNormal),
diff --git a/src/libs/3rdparty/modeling/qmt/style/defaultstyleengine.h b/src/libs/3rdparty/modeling/qmt/style/defaultstyleengine.h
index 8286fa85d7d..e07a346fe28 100644
--- a/src/libs/3rdparty/modeling/qmt/style/defaultstyleengine.h
+++ b/src/libs/3rdparty/modeling/qmt/style/defaultstyleengine.h
@@ -45,10 +45,10 @@ QT_END_NAMESPACE
 
 namespace qmt {
 
-struct ObjectStyleKey;
-struct RelationStyleKey;
-struct AnnotationStyleKey;
-struct BoundaryStyleKey;
+class ObjectStyleKey;
+class RelationStyleKey;
+class AnnotationStyleKey;
+class BoundaryStyleKey;
 
 
 class QMT_EXPORT DefaultStyleEngine :
diff --git a/src/libs/3rdparty/modeling/qtserialization/inc/qark/archivebasics.h b/src/libs/3rdparty/modeling/qtserialization/inc/qark/archivebasics.h
index 00c88b4f5c1..e2baff1fcec 100644
--- a/src/libs/3rdparty/modeling/qtserialization/inc/qark/archivebasics.h
+++ b/src/libs/3rdparty/modeling/qtserialization/inc/qark/archivebasics.h
@@ -84,7 +84,7 @@ public:
     }
 
 private:
-    Flag::maskType m_flags;
+    Flag::MaskType m_flags;
     QHash<QString, QVariant> m_userData;
 };
 
diff --git a/src/libs/3rdparty/modeling/qtserialization/inc/qark/flag.h b/src/libs/3rdparty/modeling/qtserialization/inc/qark/flag.h
index 3434893edbd..1e8561adffb 100644
--- a/src/libs/3rdparty/modeling/qtserialization/inc/qark/flag.h
+++ b/src/libs/3rdparty/modeling/qtserialization/inc/qark/flag.h
@@ -35,15 +35,15 @@ namespace qark {
 
 class Flag {
 public:
-    typedef unsigned int maskType;
+    typedef unsigned int MaskType;
 
     explicit Flag() : m_mask(m_nextMask) { m_nextMask *= 2; }
 
-    maskType mask() const { return m_mask; }
+    MaskType mask() const { return m_mask; }
 
 private:
-    static maskType m_nextMask;
-    maskType m_mask;
+    static MaskType m_nextMask;
+    MaskType m_mask;
 };
 
 }
diff --git a/src/libs/3rdparty/modeling/qtserialization/inc/qark/impl/loadingrefmap.h b/src/libs/3rdparty/modeling/qtserialization/inc/qark/impl/loadingrefmap.h
index 10ef5479e9f..d957c3e153a 100644
--- a/src/libs/3rdparty/modeling/qtserialization/inc/qark/impl/loadingrefmap.h
+++ b/src/libs/3rdparty/modeling/qtserialization/inc/qark/impl/loadingrefmap.h
@@ -61,13 +61,13 @@ public:
 
 private:
 
-    typedef ObjectId keyType;
-    typedef void * valueType;
-    typedef QMap<keyType, valueType> mapType;
+    typedef ObjectId KeyType;
+    typedef void *ValueType;
+    typedef QMap<KeyType, ValueType> MapType;
 
 private:
 
-    mapType m_references;
+    MapType m_references;
 };
 
 }
diff --git a/src/libs/3rdparty/modeling/qtserialization/inc/qark/impl/savingrefmap.h b/src/libs/3rdparty/modeling/qtserialization/inc/qark/impl/savingrefmap.h
index eac95b76727..16fd8f35082 100644
--- a/src/libs/3rdparty/modeling/qtserialization/inc/qark/impl/savingrefmap.h
+++ b/src/libs/3rdparty/modeling/qtserialization/inc/qark/impl/savingrefmap.h
@@ -82,13 +82,13 @@ private:
 
 private:
 
-    typedef QPair<const void *, const char *> keyType;
-    typedef QPair<ObjectId, bool> valueType;
-    typedef QMap<keyType, valueType> mapType;
+    typedef QPair<const void *, const char *> KeyType;
+    typedef QPair<ObjectId, bool> ValueType;
+    typedef QMap<KeyType, ValueType> MapType;
 
 private:
 
-    mapType m_references;
+    MapType m_references;
     ObjectId m_nextRef;
 };
 
diff --git a/src/libs/3rdparty/modeling/qtserialization/inc/qark/parameters.h b/src/libs/3rdparty/modeling/qtserialization/inc/qark/parameters.h
index 979ae4c198d..6e6e4ee5867 100644
--- a/src/libs/3rdparty/modeling/qtserialization/inc/qark/parameters.h
+++ b/src/libs/3rdparty/modeling/qtserialization/inc/qark/parameters.h
@@ -62,7 +62,7 @@ public:
 
 private:
 
-    Flag::maskType m_flags;
+    Flag::MaskType m_flags;
 };
 
 }
diff --git a/src/libs/3rdparty/modeling/qtserialization/inc/qark/qxmlinarchive.h b/src/libs/3rdparty/modeling/qtserialization/inc/qark/qxmlinarchive.h
index 58e8bea0fb6..dbf48abeceb 100644
--- a/src/libs/3rdparty/modeling/qtserialization/inc/qark/qxmlinarchive.h
+++ b/src/libs/3rdparty/modeling/qtserialization/inc/qark/qxmlinarchive.h
@@ -68,16 +68,16 @@ public:
 
 private:
 
-    struct XmlTag;
+    class XmlTag;
 
     class Node {
     public:
-        typedef QList<Node *> childrenType;
+        typedef QList<Node *> ChildrenType;
 
     public:
         virtual ~Node() { qDeleteAll(m_children); }
 
-        const childrenType &children() const { return m_children; }
+        const ChildrenType &children() const { return m_children; }
 
         virtual QString qualifiedName() const = 0;
 
@@ -86,7 +86,7 @@ private:
         void append(Node *node) { m_children.append(node); }
 
     private:
-        childrenType m_children;
+        ChildrenType m_children;
     };
 
     class TagNode :
@@ -517,7 +517,9 @@ public:
         Instance
     };
 
-    struct ReferenceTag {
+    class ReferenceTag
+    {
+    public:
         explicit ReferenceTag(ReferenceKind k = Nullpointer, const QString &string = QLatin1String("")) : kind(k), typeName(string) { }
 
         ReferenceKind kind;
@@ -568,7 +570,9 @@ public:
 
 private:
 
-    struct XmlTag {
+    class XmlTag
+    {
+    public:
         XmlTag() : m_endTag(false) { }
         QString m_tagName;
         bool m_endTag;
@@ -586,7 +590,7 @@ private:
                 return;
             } else {
                 bool foundTag = false;
-                for (Node::childrenType::const_iterator it = node->children().begin(); it != node->children().end(); ++it) {
+                for (Node::ChildrenType::const_iterator it = node->children().begin(); it != node->children().end(); ++it) {
                     if ((*it)->qualifiedName() == xmlTag.m_tagName) {
                         foundTag = true;
                         (*it)->accept(*this, xmlTag);
diff --git a/src/libs/3rdparty/modeling/qtserialization/inc/qark/serialize_pointer.h b/src/libs/3rdparty/modeling/qtserialization/inc/qark/serialize_pointer.h
index 4d36f3cf9fa..b34eb52d059 100644
--- a/src/libs/3rdparty/modeling/qtserialization/inc/qark/serialize_pointer.h
+++ b/src/libs/3rdparty/modeling/qtserialization/inc/qark/serialize_pointer.h
@@ -50,9 +50,9 @@ inline void save(Archive &archive, T *p, const Parameters &)
                 archive.endInstance();
             } else {
                 archive.beginInstance(typeUid(*p));
-                typename registry::TypeRegistry<Archive, T>::typeInfo typeData = typeInfo<Archive, T>(*p);
+                typename registry::TypeRegistry<Archive, T>::TypeInfo typeData = typeInfo<Archive, T>(*p);
                 if (typeData.m_saveFunc == 0) {
-                    throw unregisteredType();
+                    throw UnregisteredType();
                 } else {
                     typeData.m_saveFunc(archive, p);
                 }
@@ -80,9 +80,9 @@ void load(Archive &archive, T *&p, const Parameters &)
         if (refTag.typeName.isEmpty()) {
             registry::loadNonVirtualPointer<Archive,T>(archive, p);
         } else {
-            typename registry::TypeRegistry<Archive, T>::typeInfo typeData = typeInfo<Archive, T>(refTag.typeName);
+            typename registry::TypeRegistry<Archive, T>::TypeInfo typeData = typeInfo<Archive, T>(refTag.typeName);
             if (typeData.m_loadFunc == 0) {
-                throw unregisteredType();
+                throw UnregisteredType();
             } else {
                 typeData.m_loadFunc(archive, p);
             }
diff --git a/src/libs/3rdparty/modeling/qtserialization/inc/qark/typeregistry.h b/src/libs/3rdparty/modeling/qtserialization/inc/qark/typeregistry.h
index 07bbffbd8e5..ee53a20340a 100644
--- a/src/libs/3rdparty/modeling/qtserialization/inc/qark/typeregistry.h
+++ b/src/libs/3rdparty/modeling/qtserialization/inc/qark/typeregistry.h
@@ -45,12 +45,12 @@
 
 namespace qark {
 
-class unregisteredType :
+class UnregisteredType :
         public std::exception
 {
 };
 
-class abstractType :
+class AbstractType :
         public std::exception
 {
 };
@@ -63,13 +63,13 @@ template<int N>
 class TypeNameMaps {
 public:
 
-    typedef QHash<QString, QString> mapType;
+    typedef QHash<QString, QString> MapType;
 
 public:
 
-    static mapType &nameToUidMap() { return *typeidNameToUidMap; }
+    static MapType &nameToUidMap() { return *typeidNameToUidMap; }
 
-    static mapType &uidToNameMap() { return *typeidUidToNameMap; }
+    static MapType &uidToNameMap() { return *typeidUidToNameMap; }
 
 #if !defined(QT_NO_DEBUG)
     static bool hasNameToUidMap() { return typeidNameToUidMap != 0; }
@@ -82,8 +82,8 @@ protected:
     static void init()
     {
         static bool initialized = false;
-        static mapType nameToUidMap;
-        static mapType uidToNameMap;
+        static MapType nameToUidMap;
+        static MapType uidToNameMap;
 
         if (!initialized) {
             typeidNameToUidMap = &nameToUidMap;
@@ -94,16 +94,16 @@ protected:
 
 private:
 
-    static mapType *typeidNameToUidMap;
+    static MapType *typeidNameToUidMap;
 
-    static mapType *typeidUidToNameMap;
+    static MapType *typeidUidToNameMap;
 };
 
 template<int N>
-typename TypeNameMaps<N>::mapType *TypeNameMaps<N>::typeidNameToUidMap;
+typename TypeNameMaps<N>::MapType *TypeNameMaps<N>::typeidNameToUidMap;
 
 template<int N>
-typename TypeNameMaps<N>::mapType *TypeNameMaps<N>::typeidUidToNameMap;
+typename TypeNameMaps<N>::MapType *TypeNameMaps<N>::typeidUidToNameMap;
 
 
 template<class T>
@@ -111,7 +111,7 @@ class TypeNameRegistry :
         public TypeNameMaps<0>
 {
 
-    typedef TypeNameMaps<0> base;
+    typedef TypeNameMaps<0> Base;
 
 private:
 
@@ -120,11 +120,11 @@ private:
 private:
     static int __init(const QString &name)
     {
-        base::init();
-        QMT_CHECK(!base::nameToUidMap().contains(QLatin1String(typeid(T).name())) || base::nameToUidMap().value(QLatin1String(typeid(T).name())) == name);
-        QMT_CHECK(!base::uidToNameMap().contains(name) || base::uidToNameMap().value(name) == QLatin1String(typeid(T).name()));
-        base::nameToUidMap().insert(QLatin1String(typeid(T).name()), name);
-        base::uidToNameMap().insert(name, QLatin1String(typeid(T).name()));
+        Base::init();
+        QMT_CHECK(!Base::nameToUidMap().contains(QLatin1String(typeid(T).name())) || Base::nameToUidMap().value(QLatin1String(typeid(T).name())) == name);
+        QMT_CHECK(!Base::uidToNameMap().contains(name) || Base::uidToNameMap().value(name) == QLatin1String(typeid(T).name()));
+        Base::nameToUidMap().insert(QLatin1String(typeid(T).name()), name);
+        Base::uidToNameMap().insert(name, QLatin1String(typeid(T).name()));
         return 0;
     }
 };
@@ -135,37 +135,39 @@ template<class Archive, class BASE>
 class TypeRegistry {
 public:
 
-    struct typeInfo {
+    class TypeInfo
+    {
+    public:
 
-        typedef Archive &(*saveFuncType)(Archive &, BASE * const &p);
-        typedef Archive &(*loadFuncType)(Archive &, BASE * &p);
+        typedef Archive &(*SaveFuncType)(Archive &, BASE * const &p);
+        typedef Archive &(*LoadFuncType)(Archive &, BASE * &p);
 
-        explicit typeInfo()
+        explicit TypeInfo()
             : m_saveFunc(0),
               m_loadFunc(0)
         {
         }
 
-        explicit typeInfo(saveFuncType sfunc, loadFuncType lfunc)
+        explicit TypeInfo(SaveFuncType sfunc, LoadFuncType lfunc)
             : m_saveFunc(sfunc),
               m_loadFunc(lfunc)
         {
         }
 
-        bool operator==(const typeInfo &rhs) const
+        bool operator==(const TypeInfo &rhs) const
         {
             return m_saveFunc == rhs.m_saveFunc && m_loadFunc == rhs.m_loadFunc;
         }
 
-        saveFuncType m_saveFunc;
-        loadFuncType m_loadFunc;
+        SaveFuncType m_saveFunc;
+        LoadFuncType m_loadFunc;
     };
 
-    typedef QHash<QString, typeInfo> mapType;
+    typedef QHash<QString, TypeInfo> MapType;
 
 public:
 
-    static mapType &map() { return *m_map; }
+    static MapType &map() { return *m_map; }
 
 #if !defined(QT_NO_DEBUG)
     static bool hasMap() { return m_map != 0; }
@@ -175,7 +177,7 @@ protected:
 
     static void init() {
         static bool initialized = false;
-        static mapType theMap;
+        static MapType theMap;
 
         if (!initialized) {
             m_map = &theMap;
@@ -185,11 +187,11 @@ protected:
 
 private:
 
-    static mapType *m_map;
+    static MapType *m_map;
 };
 
 template<class Archive, class BASE>
-typename TypeRegistry<Archive, BASE>::mapType *TypeRegistry<Archive,BASE>::m_map;
+typename TypeRegistry<Archive, BASE>::MapType *TypeRegistry<Archive,BASE>::m_map;
 
 
 template<class Archive, class BASE, class DERIVED>
@@ -197,22 +199,22 @@ class DerivedTypeRegistry :
         public TypeRegistry<Archive, BASE>
 {
 
-    typedef TypeRegistry<Archive, BASE> base;
+    typedef TypeRegistry<Archive, BASE> Base;
 
-    typedef Archive &(*saveFuncType)(Archive &, BASE * const &);
+    typedef Archive &(*SaveFuncType)(Archive &, BASE * const &);
 
-    typedef Archive &(*loadFuncType)(Archive &, BASE * &);
+    typedef Archive &(*LoadFuncType)(Archive &, BASE * &);
 
 private:
 
     static int __static_init;
 
 private:
-    static int __init(saveFuncType sfunc, loadFuncType lfunc)
+    static int __init(SaveFuncType sfunc, LoadFuncType lfunc)
     {
-        base::init();
-        QMT_CHECK(!base::map().contains(QLatin1String(typeid(DERIVED).name())) || base::map().value(QLatin1String(typeid(DERIVED).name())) == typename base::typeInfo(sfunc, lfunc));
-        base::map().insert(QLatin1String(typeid(DERIVED).name()), typename base::typeInfo(sfunc, lfunc));
+        Base::init();
+        QMT_CHECK(!Base::map().contains(QLatin1String(typeid(DERIVED).name())) || Base::map().value(QLatin1String(typeid(DERIVED).name())) == typename Base::TypeInfo(sfunc, lfunc));
+        Base::map().insert(QLatin1String(typeid(DERIVED).name()), typename Base::TypeInfo(sfunc, lfunc));
         return 0;
     }
 };
@@ -246,7 +248,7 @@ typename std::enable_if<std::is_abstract<T>::value, void>::type loadNonVirtualPo
     (void) archive;
     (void) p;
 
-    throw abstractType();
+    throw AbstractType();
 }
 
 inline QString demangleTypename(const char *mangledName)
@@ -287,7 +289,7 @@ QString typeUid(const T &t)
 }
 
 template<class Archive, class T>
-typename registry::TypeRegistry<Archive, T>::typeInfo typeInfo(const T &t)
+typename registry::TypeRegistry<Archive, T>::TypeInfo typeInfo(const T &t)
 {
     Q_UNUSED(t);
 #if !defined(QT_NO_DEBUG) // avoid warning about unused function ::hasNameToUidMap in Qt >= 5.5
@@ -299,7 +301,7 @@ typename registry::TypeRegistry<Archive, T>::typeInfo typeInfo(const T &t)
 }
 
 template<class Archive, class T>
-typename registry::TypeRegistry<Archive,T>::typeInfo typeInfo(const QString &uid)
+typename registry::TypeRegistry<Archive,T>::TypeInfo typeInfo(const QString &uid)
 {
 #if !defined(QT_NO_DEBUG) // avoid warning about unused function ::hasNameToUidMap in Qt >= 5.5
     QMT_CHECK_X((registry::TypeNameRegistry<T>::hasUidToNameMap()), "typeInfo<T>(const QString &)", "type maps are not correctly initialized");
diff --git a/src/libs/3rdparty/modeling/qtserialization/src/flag.cpp b/src/libs/3rdparty/modeling/qtserialization/src/flag.cpp
index 98a5f48974f..026eb50226a 100644
--- a/src/libs/3rdparty/modeling/qtserialization/src/flag.cpp
+++ b/src/libs/3rdparty/modeling/qtserialization/src/flag.cpp
@@ -32,6 +32,6 @@
 
 namespace qark {
 
-Flag::maskType Flag::m_nextMask = 1;
+Flag::MaskType Flag::m_nextMask = 1;
 
 }
diff --git a/src/libs/3rdparty/modeling/qtserialization/src/savingrefmap.cpp b/src/libs/3rdparty/modeling/qtserialization/src/savingrefmap.cpp
index beabbd1f17a..d9f776ced55 100644
--- a/src/libs/3rdparty/modeling/qtserialization/src/savingrefmap.cpp
+++ b/src/libs/3rdparty/modeling/qtserialization/src/savingrefmap.cpp
@@ -37,7 +37,7 @@ namespace impl {
 int SavingRefMap::countDanglingReferences()
 {
     int dangling = 0;
-    for (mapType::const_iterator it = m_references.begin(); it != m_references.end(); ++it) {
+    for (MapType::const_iterator it = m_references.begin(); it != m_references.end(); ++it) {
         if (!it.value().second) {
             ++dangling;
         }
@@ -47,12 +47,12 @@ int SavingRefMap::countDanglingReferences()
 
 bool SavingRefMap::hasRef(const void *address, const char *typeName)
 {
-    return m_references.find(keyType(address, typeName)) != m_references.end();
+    return m_references.find(KeyType(address, typeName)) != m_references.end();
 }
 
 bool SavingRefMap::hasDefinedRef(const void *address, const char *typeName)
 {
-    mapType::const_iterator it = m_references.find(keyType(address, typeName));
+    MapType::const_iterator it = m_references.find(KeyType(address, typeName));
     if (it == m_references.end()) {
         return false;
     }
@@ -61,8 +61,8 @@ bool SavingRefMap::hasDefinedRef(const void *address, const char *typeName)
 
 ObjectId SavingRefMap::ref(const void *address, const char *typeName, bool define)
 {
-    keyType k = keyType(address, typeName);
-    mapType::iterator it = m_references.find(k);
+    KeyType k = KeyType(address, typeName);
+    MapType::iterator it = m_references.find(k);
     if (it != m_references.end()) {
         if (define) {
             it.value().second = true;
@@ -70,7 +70,7 @@ ObjectId SavingRefMap::ref(const void *address, const char *typeName, bool defin
         return it.value().first;
     }
     ObjectId id = m_nextRef++;
-    m_references[k] = valueType(id, define);
+    m_references[k] = ValueType(id, define);
     return id;
 }