From 12762e51026d81a847f51d740ef81ca7bdb80219 Mon Sep 17 00:00:00 2001 From: Marco Bubke Date: Tue, 20 Apr 2021 11:03:01 +0200 Subject: [PATCH] QmlDesigner: Use more secure friend declaration The shorter form is not declaring any class implicitly. The class have to be declared before. So you avoid the mistake of declaring a new class instead of make one friend. Change-Id: Ia035e2f5967c24cdb053ac8b91aa61bbbd5ea20d Reviewed-by: Tim Jenssen --- .../assetexporterplugin/componentexporter.h | 2 +- .../components/curveeditor/detail/graphicsview.h | 2 +- .../formeditor/abstractformeditortool.h | 3 ++- .../components/formeditor/formeditoritem.h | 16 ++++++++++------ .../components/formeditor/formeditorscene.h | 4 ++-- .../components/formeditor/resizecontroller.h | 6 ++++-- .../components/formeditor/rotationcontroller.h | 6 ++++-- .../components/navigator/navigatorview.h | 2 -- .../qmldesigner/components/pathtool/pathitem.h | 3 ++- .../designercore/include/abstractproperty.h | 4 ++-- .../designercore/include/bindingproperty.h | 6 +++--- .../designercore/include/itemlibraryinfo.h | 2 -- .../qmldesigner/designercore/include/metainfo.h | 8 ++++---- .../qmldesigner/designercore/include/model.h | 12 ++++++------ .../qmldesigner/designercore/include/modelnode.h | 12 ++++++------ .../designercore/include/nodeabstractproperty.h | 6 +++--- .../designercore/include/nodeinstance.h | 3 ++- .../designercore/include/nodeinstanceview.h | 2 +- .../designercore/include/nodelistproperty.h | 11 +++++------ .../designercore/include/nodeproperty.h | 6 +++--- .../designercore/include/qmlconnections.h | 4 +++- .../designercore/include/qmlitemnode.h | 3 ++- .../designercore/include/qmlobjectnode.h | 5 +++-- .../qmldesigner/designercore/include/qmlstate.h | 3 ++- .../designercore/include/signalhandlerproperty.h | 6 +++--- .../designercore/include/variantproperty.h | 6 +++--- .../instances/nodeinstanceserverproxy.h | 4 +++- .../designercore/model/internalnode_p.h | 3 ++- .../model/internalnodeabstractproperty.h | 2 +- .../qmldesigner/designercore/model/model_p.h | 6 +++--- 30 files changed, 86 insertions(+), 72 deletions(-) diff --git a/src/plugins/qmldesigner/assetexporterplugin/componentexporter.h b/src/plugins/qmldesigner/assetexporterplugin/componentexporter.h index d2f6c720c8a..ef4760c2bde 100644 --- a/src/plugins/qmldesigner/assetexporterplugin/componentexporter.h +++ b/src/plugins/qmldesigner/assetexporterplugin/componentexporter.h @@ -50,7 +50,7 @@ public: virtual ~NodeDumperCreatorBase() {} protected: virtual NodeDumper *instance(const QByteArrayList &, const ModelNode &) const = 0; - friend class QmlDesigner::Component; + friend Component; }; template diff --git a/src/plugins/qmldesigner/components/curveeditor/detail/graphicsview.h b/src/plugins/qmldesigner/components/curveeditor/detail/graphicsview.h index c2d2b0c714a..22b474d1bb7 100644 --- a/src/plugins/qmldesigner/components/curveeditor/detail/graphicsview.h +++ b/src/plugins/qmldesigner/components/curveeditor/detail/graphicsview.h @@ -44,7 +44,7 @@ class GraphicsView : public QGraphicsView { Q_OBJECT - friend class Playhead; + friend Playhead; signals: void currentFrameChanged(int frame, bool notify); diff --git a/src/plugins/qmldesigner/components/formeditor/abstractformeditortool.h b/src/plugins/qmldesigner/components/formeditor/abstractformeditortool.h index 02cbc5a289a..c1fe3c34d59 100644 --- a/src/plugins/qmldesigner/components/formeditor/abstractformeditortool.h +++ b/src/plugins/qmldesigner/components/formeditor/abstractformeditortool.h @@ -40,7 +40,8 @@ class FormEditorView; class QMLDESIGNERCORE_EXPORT AbstractFormEditorTool { - friend class FormEditorView; + friend FormEditorView; + public: AbstractFormEditorTool(FormEditorView* view); diff --git a/src/plugins/qmldesigner/components/formeditor/formeditoritem.h b/src/plugins/qmldesigner/components/formeditor/formeditoritem.h index 8304f1a36b7..769488aa4a3 100644 --- a/src/plugins/qmldesigner/components/formeditor/formeditoritem.h +++ b/src/plugins/qmldesigner/components/formeditor/formeditoritem.h @@ -49,7 +49,8 @@ namespace Internal { class QMLDESIGNERCORE_EXPORT FormEditorItem : public QGraphicsItem { - friend class QmlDesigner::FormEditorScene; + friend FormEditorScene; + public: ~FormEditorItem() override; @@ -156,7 +157,8 @@ private: // variables class FormEditorFlowItem : public FormEditorItem { - friend class QmlDesigner::FormEditorScene; + friend FormEditorScene; + public: void synchronizeOtherProperty(const QByteArray &propertyName) override; void setDataModelPosition(const QPointF &position) override; @@ -175,7 +177,8 @@ private: class FormEditorFlowActionItem : public FormEditorItem { - friend class QmlDesigner::FormEditorScene; + friend FormEditorScene; + public: void setDataModelPosition(const QPointF &position) override; void setDataModelPositionInBaseState(const QPointF &position) override; @@ -194,7 +197,8 @@ private: class FormEditorTransitionItem : public FormEditorItem { - friend class QmlDesigner::FormEditorScene; + friend FormEditorScene; + public: void synchronizeOtherProperty(const QByteArray &propertyName) override; void setDataModelPosition(const QPointF &position) override; @@ -220,7 +224,7 @@ private: class FormEditorFlowDecisionItem : FormEditorFlowItem { - friend class QmlDesigner::FormEditorScene; + friend FormEditorScene; public: void updateGeometry() override; @@ -243,7 +247,7 @@ protected: class FormEditorFlowWildcardItem : FormEditorFlowDecisionItem { - friend class QmlDesigner::FormEditorScene; + friend FormEditorScene; public: void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = nullptr) override; diff --git a/src/plugins/qmldesigner/components/formeditor/formeditorscene.h b/src/plugins/qmldesigner/components/formeditor/formeditorscene.h index 6ac22f47f41..070d5877762 100644 --- a/src/plugins/qmldesigner/components/formeditor/formeditorscene.h +++ b/src/plugins/qmldesigner/components/formeditor/formeditorscene.h @@ -47,8 +47,8 @@ class QMLDESIGNERCORE_EXPORT FormEditorScene : public QGraphicsScene { Q_OBJECT - friend class QmlDesigner::FormEditorItem; - friend class QmlDesigner::FormEditorView; + friend FormEditorItem; + friend FormEditorView; public: diff --git a/src/plugins/qmldesigner/components/formeditor/resizecontroller.h b/src/plugins/qmldesigner/components/formeditor/resizecontroller.h index 334ce19c0cf..c7846fd7c8a 100644 --- a/src/plugins/qmldesigner/components/formeditor/resizecontroller.h +++ b/src/plugins/qmldesigner/components/formeditor/resizecontroller.h @@ -37,7 +37,8 @@ class WeakResizeController; class ResizeController { - friend class WeakResizeController; + friend WeakResizeController; + public: ResizeController(); ResizeController(LayerItem *layerItem, FormEditorItem *formEditorItem); @@ -76,7 +77,8 @@ private: // variables class WeakResizeController { - friend class ResizeController; + friend ResizeController; + public: WeakResizeController(); WeakResizeController(const WeakResizeController &resizeController); diff --git a/src/plugins/qmldesigner/components/formeditor/rotationcontroller.h b/src/plugins/qmldesigner/components/formeditor/rotationcontroller.h index 52b50023872..ffca7bae5af 100644 --- a/src/plugins/qmldesigner/components/formeditor/rotationcontroller.h +++ b/src/plugins/qmldesigner/components/formeditor/rotationcontroller.h @@ -37,7 +37,8 @@ class WeakRotationController; class RotationController { - friend class WeakRotationController; + friend WeakRotationController; + public: RotationController(); RotationController(LayerItem *layerItem, FormEditorItem *formEditorItem); @@ -74,7 +75,8 @@ private: class WeakRotationController { - friend class RotationController; + friend RotationController; + public: WeakRotationController(); WeakRotationController(const WeakRotationController &rotationController); diff --git a/src/plugins/qmldesigner/components/navigator/navigatorview.h b/src/plugins/qmldesigner/components/navigator/navigatorview.h index d2470c8eb89..7e811ca39f3 100644 --- a/src/plugins/qmldesigner/components/navigator/navigatorview.h +++ b/src/plugins/qmldesigner/components/navigator/navigatorview.h @@ -133,8 +133,6 @@ private: QHash> m_expandMap; NavigatorModelInterface *m_currentModelInterface = nullptr; - - friend class TestNavigator; }; } diff --git a/src/plugins/qmldesigner/components/pathtool/pathitem.h b/src/plugins/qmldesigner/components/pathtool/pathitem.h index 17981283a67..aa75a0aff0d 100644 --- a/src/plugins/qmldesigner/components/pathtool/pathitem.h +++ b/src/plugins/qmldesigner/components/pathtool/pathitem.h @@ -65,7 +65,8 @@ private: class PathItem : public QGraphicsObject { Q_OBJECT - friend class PathUpdateDisabler; + friend PathUpdateDisabler; + public: enum { diff --git a/src/plugins/qmldesigner/designercore/include/abstractproperty.h b/src/plugins/qmldesigner/designercore/include/abstractproperty.h index 2a74a12539d..7f6671be5ea 100644 --- a/src/plugins/qmldesigner/designercore/include/abstractproperty.h +++ b/src/plugins/qmldesigner/designercore/include/abstractproperty.h @@ -61,8 +61,8 @@ namespace Internal { class QMLDESIGNERCORE_EXPORT AbstractProperty { - friend class QmlDesigner::ModelNode; - friend class QmlDesigner::Internal::ModelPrivate; + friend ModelNode; + friend Internal::ModelPrivate; friend QMLDESIGNERCORE_EXPORT bool operator ==(const AbstractProperty &property1, const AbstractProperty &property2); friend QMLDESIGNERCORE_EXPORT bool operator !=(const AbstractProperty &property1, const AbstractProperty &property2); diff --git a/src/plugins/qmldesigner/designercore/include/bindingproperty.h b/src/plugins/qmldesigner/designercore/include/bindingproperty.h index c0442a678d2..761d93b892f 100644 --- a/src/plugins/qmldesigner/designercore/include/bindingproperty.h +++ b/src/plugins/qmldesigner/designercore/include/bindingproperty.h @@ -32,9 +32,9 @@ namespace QmlDesigner { class QMLDESIGNERCORE_EXPORT BindingProperty : public QmlDesigner::AbstractProperty { - friend class QmlDesigner::ModelNode; - friend class QmlDesigner::Internal::ModelPrivate; - friend class QmlDesigner::AbstractProperty; + friend ModelNode; + friend Internal::ModelPrivate; + friend AbstractProperty; public: void setExpression(const QString &expression); diff --git a/src/plugins/qmldesigner/designercore/include/itemlibraryinfo.h b/src/plugins/qmldesigner/designercore/include/itemlibraryinfo.h index b31b3d916c3..c44467f002a 100644 --- a/src/plugins/qmldesigner/designercore/include/itemlibraryinfo.h +++ b/src/plugins/qmldesigner/designercore/include/itemlibraryinfo.h @@ -48,8 +48,6 @@ QMLDESIGNERCORE_EXPORT QDebug operator<<(QDebug debug, const ItemLibraryEntry &i class QMLDESIGNERCORE_EXPORT ItemLibraryEntry { - //friend class QmlDesigner::MetaInfo; - //friend class QmlDesigner::Internal::MetaInfoParser; friend QMLDESIGNERCORE_EXPORT QDataStream& operator<<(QDataStream& stream, const ItemLibraryEntry &itemLibraryEntry); friend QMLDESIGNERCORE_EXPORT QDataStream& operator>>(QDataStream& stream, ItemLibraryEntry &itemLibraryEntry); friend QMLDESIGNERCORE_EXPORT QDebug operator<<(QDebug debug, const ItemLibraryEntry &itemLibraryEntry); diff --git a/src/plugins/qmldesigner/designercore/include/metainfo.h b/src/plugins/qmldesigner/designercore/include/metainfo.h index cc4e8c1ed01..eb17139b8e2 100644 --- a/src/plugins/qmldesigner/designercore/include/metainfo.h +++ b/src/plugins/qmldesigner/designercore/include/metainfo.h @@ -52,10 +52,10 @@ QMLDESIGNERCORE_EXPORT bool operator!=(const MetaInfo &first, const MetaInfo &se class QMLDESIGNERCORE_EXPORT MetaInfo { - friend class QmlDesigner::Internal::MetaInfoPrivate; - friend class QmlDesigner::Internal::ModelPrivate; - friend class QmlDesigner::Internal::MetaInfoReader; - friend class QmlDesigner::Internal::SubComponentManagerPrivate; + friend Internal::MetaInfoPrivate; + friend Internal::ModelPrivate; + friend Internal::MetaInfoReader; + friend Internal::SubComponentManagerPrivate; friend QMLDESIGNERCORE_EXPORT bool operator==(const MetaInfo &, const MetaInfo &); public: diff --git a/src/plugins/qmldesigner/designercore/include/model.h b/src/plugins/qmldesigner/designercore/include/model.h index 966e30c0c15..7b47dd67bd0 100644 --- a/src/plugins/qmldesigner/designercore/include/model.h +++ b/src/plugins/qmldesigner/designercore/include/model.h @@ -64,12 +64,12 @@ using PropertyListType = QList >; class QMLDESIGNERCORE_EXPORT Model : public QObject { - friend class QmlDesigner::ModelNode; - friend class QmlDesigner::AbstractProperty; - friend class QmlDesigner::AbstractView; - friend class Internal::ModelPrivate; - friend class Internal::WriteLocker; - friend class QmlDesigner::Internal::NodeMetaInfoPrivate; + friend ModelNode; + friend AbstractProperty; + friend AbstractView; + friend Internal::ModelPrivate; + friend Internal::WriteLocker; + friend Internal::NodeMetaInfoPrivate; Q_OBJECT diff --git a/src/plugins/qmldesigner/designercore/include/modelnode.h b/src/plugins/qmldesigner/designercore/include/modelnode.h index dd23038e9b6..e9c47ccae47 100644 --- a/src/plugins/qmldesigner/designercore/include/modelnode.h +++ b/src/plugins/qmldesigner/designercore/include/modelnode.h @@ -75,12 +75,12 @@ class QMLDESIGNERCORE_EXPORT ModelNode friend QMLDESIGNERCORE_EXPORT QDebug operator<<(QDebug debug, const ModelNode &modelNode); friend QMLDESIGNERCORE_EXPORT bool operator <(const ModelNode &firstNode, const ModelNode &secondNode); friend QMLDESIGNERCORE_EXPORT QList toInternalNodeList(const QList &nodeList); - friend class QmlDesigner::Model; - friend class QmlDesigner::AbstractView; - friend class QmlDesigner::NodeListProperty; - friend class QmlDesigner::Internal::ModelPrivate; - friend class QmlDesigner::NodeAbstractProperty; - friend class QmlDesigner::NodeProperty; + friend Model; + friend AbstractView; + friend NodeListProperty; + friend Internal::ModelPrivate; + friend NodeAbstractProperty; + friend NodeProperty; public: enum NodeSourceType { diff --git a/src/plugins/qmldesigner/designercore/include/nodeabstractproperty.h b/src/plugins/qmldesigner/designercore/include/nodeabstractproperty.h index ae9e070d6ea..8c2f67e6ad4 100644 --- a/src/plugins/qmldesigner/designercore/include/nodeabstractproperty.h +++ b/src/plugins/qmldesigner/designercore/include/nodeabstractproperty.h @@ -36,9 +36,9 @@ namespace Internal { class QMLDESIGNERCORE_EXPORT NodeAbstractProperty : public AbstractProperty { - friend class QmlDesigner::ModelNode; - friend class QmlDesigner::Internal::ModelPrivate; - friend class QmlDesigner::AbstractProperty; + friend ModelNode; + friend Internal::ModelPrivate; + friend AbstractProperty; friend QMLDESIGNERCORE_EXPORT bool operator ==(const NodeAbstractProperty &property1, const NodeAbstractProperty &property2); friend QMLDESIGNERCORE_EXPORT bool operator !=(const NodeAbstractProperty &property1, const NodeAbstractProperty &property2); diff --git a/src/plugins/qmldesigner/designercore/include/nodeinstance.h b/src/plugins/qmldesigner/designercore/include/nodeinstance.h index 56b8141bde6..d008375175f 100644 --- a/src/plugins/qmldesigner/designercore/include/nodeinstance.h +++ b/src/plugins/qmldesigner/designercore/include/nodeinstance.h @@ -42,7 +42,8 @@ class ProxyNodeInstanceData; class NodeInstance { - friend class NodeInstanceView; + friend NodeInstanceView; + public: static NodeInstance create(const ModelNode &node); NodeInstance(); diff --git a/src/plugins/qmldesigner/designercore/include/nodeinstanceview.h b/src/plugins/qmldesigner/designercore/include/nodeinstanceview.h index 42ec211373c..a76eefcc43b 100644 --- a/src/plugins/qmldesigner/designercore/include/nodeinstanceview.h +++ b/src/plugins/qmldesigner/designercore/include/nodeinstanceview.h @@ -73,7 +73,7 @@ class QMLDESIGNERCORE_EXPORT NodeInstanceView : public AbstractView, public Node { Q_OBJECT - friend class NodeInstance; + friend NodeInstance; public: using Pointer = QWeakPointer; diff --git a/src/plugins/qmldesigner/designercore/include/nodelistproperty.h b/src/plugins/qmldesigner/designercore/include/nodelistproperty.h index 1412f7ade3f..fa46635b97e 100644 --- a/src/plugins/qmldesigner/designercore/include/nodelistproperty.h +++ b/src/plugins/qmldesigner/designercore/include/nodelistproperty.h @@ -35,8 +35,6 @@ namespace QmlDesigner { -class NodeListProperty; - namespace Internal { class ModelPrivate; class InternalNodeListProperty; @@ -44,7 +42,7 @@ using InternalNodeListPropertyPointer = QSharedPointer class NodeListPropertyIterator { - friend class QmlDesigner::NodeListProperty; + friend NodeListProperty; public: using iterator_category = std::random_access_iterator_tag; @@ -177,9 +175,10 @@ private: class QMLDESIGNERCORE_EXPORT NodeListProperty : public NodeAbstractProperty { - friend class QmlDesigner::ModelNode; - friend class QmlDesigner::AbstractProperty; - friend class QmlDesigner::Internal::ModelPrivate; + friend ModelNode; + friend AbstractProperty; + friend Internal::ModelPrivate; + public: using value_type = ModelNode; using iterator = Internal::NodeListPropertyIterator; diff --git a/src/plugins/qmldesigner/designercore/include/nodeproperty.h b/src/plugins/qmldesigner/designercore/include/nodeproperty.h index 40a5e2ec781..64cacb5a71e 100644 --- a/src/plugins/qmldesigner/designercore/include/nodeproperty.h +++ b/src/plugins/qmldesigner/designercore/include/nodeproperty.h @@ -34,9 +34,9 @@ namespace Internal { class ModelPrivate; } class QMLDESIGNERCORE_EXPORT NodeProperty : public NodeAbstractProperty { - friend class QmlDesigner::ModelNode; - friend class QmlDesigner::Internal::ModelPrivate; - friend class QmlDesigner::AbstractProperty; + friend ModelNode; + friend Internal::ModelPrivate; + friend AbstractProperty; public: void setModelNode(const ModelNode &modelNode); diff --git a/src/plugins/qmldesigner/designercore/include/qmlconnections.h b/src/plugins/qmldesigner/designercore/include/qmlconnections.h index d84f0017a9b..23267738e58 100644 --- a/src/plugins/qmldesigner/designercore/include/qmlconnections.h +++ b/src/plugins/qmldesigner/designercore/include/qmlconnections.h @@ -32,9 +32,11 @@ namespace QmlDesigner { +class StatesEditorView; + class QMLDESIGNERCORE_EXPORT QmlConnections : public QmlModelNodeFacade { - friend class StatesEditorView; + friend StatesEditorView; public: QmlConnections(); diff --git a/src/plugins/qmldesigner/designercore/include/qmlitemnode.h b/src/plugins/qmldesigner/designercore/include/qmlitemnode.h index 2aa4b8d4bbe..38b5f24c773 100644 --- a/src/plugins/qmldesigner/designercore/include/qmlitemnode.h +++ b/src/plugins/qmldesigner/designercore/include/qmlitemnode.h @@ -44,7 +44,8 @@ class ItemLibraryEntry; class QMLDESIGNERCORE_EXPORT QmlItemNode : public QmlVisualNode { - friend class QmlAnchors; + friend QmlAnchors; + public: QmlItemNode() : QmlVisualNode() {} QmlItemNode(const ModelNode &modelNode) : QmlVisualNode(modelNode) {} diff --git a/src/plugins/qmldesigner/designercore/include/qmlobjectnode.h b/src/plugins/qmldesigner/designercore/include/qmlobjectnode.h index 48b7c1ac007..23e99e1db25 100644 --- a/src/plugins/qmldesigner/designercore/include/qmlobjectnode.h +++ b/src/plugins/qmldesigner/designercore/include/qmlobjectnode.h @@ -42,8 +42,9 @@ class QmlVisualNode; class QMLDESIGNERCORE_EXPORT QmlObjectNode : public QmlModelNodeFacade { - friend class QmlItemNode; - friend class MoveManipulator; + friend QmlItemNode; + friend MoveManipulator; + public: QmlObjectNode(); QmlObjectNode(const ModelNode &modelNode); diff --git a/src/plugins/qmldesigner/designercore/include/qmlstate.h b/src/plugins/qmldesigner/designercore/include/qmlstate.h index 7c43ac87761..bd0aad854ba 100644 --- a/src/plugins/qmldesigner/designercore/include/qmlstate.h +++ b/src/plugins/qmldesigner/designercore/include/qmlstate.h @@ -36,10 +36,11 @@ class QmlObjectNode; class QmlModelStateGroup; class Annotation; class AnnotationEditor; +class StatesEditorView; class QMLDESIGNERCORE_EXPORT QmlModelState : public QmlModelNodeFacade { - friend class StatesEditorView; + friend StatesEditorView; public: QmlModelState(); diff --git a/src/plugins/qmldesigner/designercore/include/signalhandlerproperty.h b/src/plugins/qmldesigner/designercore/include/signalhandlerproperty.h index f28fd7feda7..07e48decadc 100644 --- a/src/plugins/qmldesigner/designercore/include/signalhandlerproperty.h +++ b/src/plugins/qmldesigner/designercore/include/signalhandlerproperty.h @@ -32,9 +32,9 @@ namespace QmlDesigner { class QMLDESIGNERCORE_EXPORT SignalHandlerProperty : public QmlDesigner::AbstractProperty { - friend class QmlDesigner::ModelNode; - friend class QmlDesigner::Internal::ModelPrivate; - friend class QmlDesigner::AbstractProperty; + friend ModelNode; + friend Internal::ModelPrivate; + friend AbstractProperty; public: void setSource(const QString &source); diff --git a/src/plugins/qmldesigner/designercore/include/variantproperty.h b/src/plugins/qmldesigner/designercore/include/variantproperty.h index 8f25ab3109a..7e59b87e198 100644 --- a/src/plugins/qmldesigner/designercore/include/variantproperty.h +++ b/src/plugins/qmldesigner/designercore/include/variantproperty.h @@ -42,9 +42,9 @@ namespace Internal { class ModelPrivate; } class QMLDESIGNERCORE_EXPORT VariantProperty : public AbstractProperty { - friend class QmlDesigner::ModelNode; - friend class QmlDesigner::Internal::ModelPrivate; - friend class QmlDesigner::AbstractProperty; + friend ModelNode; + friend Internal::ModelPrivate; + friend AbstractProperty; public: void setValue(const QVariant &value); diff --git a/src/plugins/qmldesigner/designercore/instances/nodeinstanceserverproxy.h b/src/plugins/qmldesigner/designercore/instances/nodeinstanceserverproxy.h index e4edeb6725a..f87f15432cc 100644 --- a/src/plugins/qmldesigner/designercore/instances/nodeinstanceserverproxy.h +++ b/src/plugins/qmldesigner/designercore/instances/nodeinstanceserverproxy.h @@ -48,13 +48,15 @@ namespace QmlDesigner { class NodeInstanceClientInterface; class NodeInstanceView; class NodeInstanceClientProxy; +class BaseConnectionManager; class ConnectionManagerInterface; class NodeInstanceServerProxy : public NodeInstanceServerInterface { - friend class BaseConnectionManager; Q_OBJECT + friend BaseConnectionManager; + public: explicit NodeInstanceServerProxy(NodeInstanceView *nodeInstanceView, ProjectExplorer::Target *target, diff --git a/src/plugins/qmldesigner/designercore/model/internalnode_p.h b/src/plugins/qmldesigner/designercore/model/internalnode_p.h index a5f3c6dfcad..8770763b4e3 100644 --- a/src/plugins/qmldesigner/designercore/model/internalnode_p.h +++ b/src/plugins/qmldesigner/designercore/model/internalnode_p.h @@ -52,7 +52,8 @@ using InternalPropertyPointer = QSharedPointer; class InternalNode { - friend class InternalProperty; + friend InternalProperty; + public: using Pointer = QSharedPointer; using WeakPointer = QWeakPointer; diff --git a/src/plugins/qmldesigner/designercore/model/internalnodeabstractproperty.h b/src/plugins/qmldesigner/designercore/model/internalnodeabstractproperty.h index ee80cc42dad..2254788e77d 100644 --- a/src/plugins/qmldesigner/designercore/model/internalnodeabstractproperty.h +++ b/src/plugins/qmldesigner/designercore/model/internalnodeabstractproperty.h @@ -33,7 +33,7 @@ namespace Internal { class InternalNodeAbstractProperty : public InternalProperty { - friend class InternalNode; + friend InternalNode; public: using Pointer = QSharedPointer; diff --git a/src/plugins/qmldesigner/designercore/model/model_p.h b/src/plugins/qmldesigner/designercore/model/model_p.h index 20374189751..43a85858092 100644 --- a/src/plugins/qmldesigner/designercore/model/model_p.h +++ b/src/plugins/qmldesigner/designercore/model/model_p.h @@ -83,9 +83,9 @@ class ModelPrivate : public QObject { Q_OBJECT Q_DISABLE_COPY(ModelPrivate) - friend class QmlDesigner::Model; - friend class QmlDesigner::Internal::WriteLocker; - friend class QmlDesigner::Internal::NodeMetaInfoPrivate; + friend Model; + friend Internal::WriteLocker; + friend Internal::NodeMetaInfoPrivate; public: ModelPrivate(Model *model);