From 6f5c2ea5b0e9daba66c89916d8cd6e8f70408b28 Mon Sep 17 00:00:00 2001 From: Orgad Shaneh Date: Wed, 21 May 2014 20:21:14 +0300 Subject: [PATCH] QmlDesigner: Pass const values by references Change-Id: I468b2bebec64680289b24044b0b4e3d5d734f604 Reviewed-by: Tim Jenssen Reviewed-by: Marco Bubke --- .../components/componentcore/modelnodeoperations.cpp | 2 +- .../formeditor/anchorindicatorgraphicsitem.cpp | 3 ++- .../formeditor/anchorindicatorgraphicsitem.h | 2 +- .../qmldesigner/components/formeditor/dragtool.cpp | 10 +++++++--- .../qmldesigner/components/formeditor/dragtool.h | 6 +++--- .../components/integration/designdocument.cpp | 2 +- .../components/propertyeditor/fileresourcesmodel.cpp | 2 +- .../components/propertyeditor/fileresourcesmodel.h | 2 +- .../components/propertyeditor/gradientmodel.cpp | 2 +- .../components/propertyeditor/gradientmodel.h | 2 +- .../components/propertyeditor/propertyeditorvalue.cpp | 4 ++-- .../propertyeditor/qmlanchorbindingproxy.cpp | 4 ++-- .../components/propertyeditor/qmlanchorbindingproxy.h | 2 +- .../designercore/filemanager/moveobjectvisitor.cpp | 2 +- .../designercore/filemanager/moveobjectvisitor.h | 2 +- .../qmldesigner/designercore/include/abstractview.h | 2 +- .../qmldesigner/designercore/include/modelnode.h | 2 +- .../qmldesigner/designercore/include/qmlobjectnode.h | 2 +- .../qmldesigner/designercore/model/abstractview.cpp | 4 ++-- .../qmldesigner/designercore/model/modelnode.cpp | 2 +- .../qmldesigner/designercore/model/qmlobjectnode.cpp | 2 +- src/plugins/qmldesigner/documentmanager.cpp | 2 +- 22 files changed, 34 insertions(+), 29 deletions(-) diff --git a/src/plugins/qmldesigner/components/componentcore/modelnodeoperations.cpp b/src/plugins/qmldesigner/components/componentcore/modelnodeoperations.cpp index 8aeee432721..c4b88fc7df4 100644 --- a/src/plugins/qmldesigner/components/componentcore/modelnodeoperations.cpp +++ b/src/plugins/qmldesigner/components/componentcore/modelnodeoperations.cpp @@ -362,7 +362,7 @@ static inline void backupPropertyAndRemove(ModelNode node, const PropertyName &p } -static inline void restoreProperty(ModelNode node, const PropertyName &propertyName) +static inline void restoreProperty(const ModelNode &node, const PropertyName &propertyName) { if (node.hasAuxiliaryData(auxDataString + propertyName)) node.variantProperty(propertyName).setValue(node.auxiliaryData(auxDataString + propertyName)); diff --git a/src/plugins/qmldesigner/components/formeditor/anchorindicatorgraphicsitem.cpp b/src/plugins/qmldesigner/components/formeditor/anchorindicatorgraphicsitem.cpp index 7bbf8d61921..fc2375495b8 100644 --- a/src/plugins/qmldesigner/components/formeditor/anchorindicatorgraphicsitem.cpp +++ b/src/plugins/qmldesigner/components/formeditor/anchorindicatorgraphicsitem.cpp @@ -209,7 +209,8 @@ static void updateAnchorLinePoints(QPointF *firstPoint, QPointF *secondPoint, co *secondPoint = anchorLine.qmlItemNode().instanceSceneTransform().map(*secondPoint); } -void AnchorIndicatorGraphicsItem::updateAnchorIndicator(const AnchorLine &sourceAnchorLine, const AnchorLine targetAnchorLine) +void AnchorIndicatorGraphicsItem::updateAnchorIndicator(const AnchorLine &sourceAnchorLine, + const AnchorLine &targetAnchorLine) { if (sourceAnchorLine.qmlItemNode().isValid() && targetAnchorLine.qmlItemNode().isValid()) { m_sourceAnchorLineType = sourceAnchorLine.type(); diff --git a/src/plugins/qmldesigner/components/formeditor/anchorindicatorgraphicsitem.h b/src/plugins/qmldesigner/components/formeditor/anchorindicatorgraphicsitem.h index b0b118ee04b..a4369e80d1d 100644 --- a/src/plugins/qmldesigner/components/formeditor/anchorindicatorgraphicsitem.h +++ b/src/plugins/qmldesigner/components/formeditor/anchorindicatorgraphicsitem.h @@ -46,7 +46,7 @@ public: void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget); QRectF boundingRect() const; - void updateAnchorIndicator(const AnchorLine &sourceAnchorLine, const AnchorLine targetAnchorLine); + void updateAnchorIndicator(const AnchorLine &sourceAnchorLine, const AnchorLine &targetAnchorLine); AnchorLineType sourceAnchorLineType() const; void setSourceAnchorLineType(const AnchorLineType &sourceAnchorLineType); diff --git a/src/plugins/qmldesigner/components/formeditor/dragtool.cpp b/src/plugins/qmldesigner/components/formeditor/dragtool.cpp index 31968384f62..16534e92ced 100644 --- a/src/plugins/qmldesigner/components/formeditor/dragtool.cpp +++ b/src/plugins/qmldesigner/components/formeditor/dragtool.cpp @@ -145,7 +145,9 @@ void DragTool::beginWithPoint(const QPointF &beginPoint) m_moveManipulator.begin(beginPoint); } -void DragTool::createQmlItemNode(const ItemLibraryEntry &itemLibraryEntry, QmlItemNode parentNode, QPointF scenePos) +void DragTool::createQmlItemNode(const ItemLibraryEntry &itemLibraryEntry, + const QmlItemNode &parentNode, + const QPointF &scenePos) { MetaInfo metaInfo = MetaInfo::global(); @@ -161,7 +163,9 @@ void DragTool::createQmlItemNode(const ItemLibraryEntry &itemLibraryEntry, QmlIt m_selectionIndicator.setItems(scene()->itemsForQmlItemNodes(nodeList)); } -void DragTool::createQmlItemNodeFromImage(const QString &imageName, QmlItemNode parentNode, QPointF scenePos) +void DragTool::createQmlItemNodeFromImage(const QString &imageName, + const QmlItemNode &parentNode, + const QPointF &scenePos) { if (!parentNode.isValid()) return; @@ -392,7 +396,7 @@ void DragTool::end(Snapper::Snapping useSnapping) clear(); } -void DragTool::move(QPointF scenePos) +void DragTool::move(const QPointF &scenePos) { if (!m_movingItem) return; diff --git a/src/plugins/qmldesigner/components/formeditor/dragtool.h b/src/plugins/qmldesigner/components/formeditor/dragtool.h index 71809607093..21011b78b2e 100644 --- a/src/plugins/qmldesigner/components/formeditor/dragtool.h +++ b/src/plugins/qmldesigner/components/formeditor/dragtool.h @@ -110,14 +110,14 @@ protected: private: void commitTransaction(); - void createQmlItemNode(const ItemLibraryEntry &itemLibraryEntry, QmlItemNode parentNode, QPointF scenePos); - void createQmlItemNodeFromImage(const QString &imageName, QmlItemNode parentNode, QPointF scenePos); + void createQmlItemNode(const ItemLibraryEntry &itemLibraryEntry, const QmlItemNode &parentNode, const QPointF &scenePos); + void createQmlItemNodeFromImage(const QString &imageName, const QmlItemNode &parentNode, const QPointF &scenePos); FormEditorItem* calculateContainer(const QPointF &point, FormEditorItem * currentItem = 0); void begin(QPointF scenePos); void end(); void end(Snapper::Snapping useSnapping); - void move(QPointF scenePos); + void move(const QPointF &scenePos); MoveManipulator m_moveManipulator; SelectionIndicator m_selectionIndicator; diff --git a/src/plugins/qmldesigner/components/integration/designdocument.cpp b/src/plugins/qmldesigner/components/integration/designdocument.cpp index bed0501d2cd..a96ff8999b6 100644 --- a/src/plugins/qmldesigner/components/integration/designdocument.cpp +++ b/src/plugins/qmldesigner/components/integration/designdocument.cpp @@ -422,7 +422,7 @@ void DesignDocument::cutSelected() deleteSelected(); } -static void scatterItem(ModelNode pastedNode, const ModelNode targetNode, int offset = -2000) +static void scatterItem(const ModelNode &pastedNode, const ModelNode &targetNode, int offset = -2000) { bool scatter = false; diff --git a/src/plugins/qmldesigner/components/propertyeditor/fileresourcesmodel.cpp b/src/plugins/qmldesigner/components/propertyeditor/fileresourcesmodel.cpp index f94c091fda8..c1dd3270bf5 100644 --- a/src/plugins/qmldesigner/components/propertyeditor/fileresourcesmodel.cpp +++ b/src/plugins/qmldesigner/components/propertyeditor/fileresourcesmodel.cpp @@ -44,7 +44,7 @@ FileResourcesModel::FileResourcesModel(QObject *parent) : { } -void FileResourcesModel::setAnchorBackend(const QVariant anchorBackend) +void FileResourcesModel::setAnchorBackend(const QVariant &anchorBackend) { QObject* anchorBackendObject = anchorBackend.value(); diff --git a/src/plugins/qmldesigner/components/propertyeditor/fileresourcesmodel.h b/src/plugins/qmldesigner/components/propertyeditor/fileresourcesmodel.h index 85f92294391..a54c69fcd6c 100644 --- a/src/plugins/qmldesigner/components/propertyeditor/fileresourcesmodel.h +++ b/src/plugins/qmldesigner/components/propertyeditor/fileresourcesmodel.h @@ -50,7 +50,7 @@ class FileResourcesModel : public QObject public: explicit FileResourcesModel(QObject *parent = 0); - void setAnchorBackend(const QVariant anchorBackend); + void setAnchorBackend(const QVariant &anchorBackend); QString fileName() const; void setFileName(const QUrl &fileName); void setFileNameStr(const QString &fileName); diff --git a/src/plugins/qmldesigner/components/propertyeditor/gradientmodel.cpp b/src/plugins/qmldesigner/components/propertyeditor/gradientmodel.cpp index 4d9d9d5b721..f7e89dae5b7 100644 --- a/src/plugins/qmldesigner/components/propertyeditor/gradientmodel.cpp +++ b/src/plugins/qmldesigner/components/propertyeditor/gradientmodel.cpp @@ -287,7 +287,7 @@ void GradientModel::setupModel() m_lock = false; } -void GradientModel::setAnchorBackend(const QVariant anchorBackend) +void GradientModel::setAnchorBackend(const QVariant &anchorBackend) { QObject* anchorBackendObject = anchorBackend.value(); diff --git a/src/plugins/qmldesigner/components/propertyeditor/gradientmodel.h b/src/plugins/qmldesigner/components/propertyeditor/gradientmodel.h index f594e402610..944d2956674 100644 --- a/src/plugins/qmldesigner/components/propertyeditor/gradientmodel.h +++ b/src/plugins/qmldesigner/components/propertyeditor/gradientmodel.h @@ -78,7 +78,7 @@ public slots: private: void setupModel(); - void setAnchorBackend(const QVariant anchorBackend); + void setAnchorBackend(const QVariant &anchorBackend); QVariant anchorBackend() const {return QVariant(); } QString gradientPropertyName() const; void setGradientPropertyName(const QString &name); diff --git a/src/plugins/qmldesigner/components/propertyeditor/propertyeditorvalue.cpp b/src/plugins/qmldesigner/components/propertyeditor/propertyeditorvalue.cpp index 20e32edded5..e041836113c 100644 --- a/src/plugins/qmldesigner/components/propertyeditor/propertyeditorvalue.cpp +++ b/src/plugins/qmldesigner/components/propertyeditor/propertyeditorvalue.cpp @@ -57,7 +57,7 @@ QVariant PropertyEditorValue::value() const return returnValue; } -static bool cleverDoubleCompare(QVariant value1, QVariant value2) +static bool cleverDoubleCompare(const QVariant &value1, const QVariant &value2) { //we ignore slight changes on doubles if ((value1.type() == QVariant::Double) && (value2.type() == QVariant::Double)) { int a = value1.toDouble() * 100; @@ -69,7 +69,7 @@ static bool cleverDoubleCompare(QVariant value1, QVariant value2) return false; } -static bool cleverColorCompare(QVariant value1, QVariant value2) +static bool cleverColorCompare(const QVariant &value1, const QVariant &value2) { if ((value1.type() == QVariant::Color) && (value2.type() == QVariant::Color)) { QColor c1 = value1.value(); diff --git a/src/plugins/qmldesigner/components/propertyeditor/qmlanchorbindingproxy.cpp b/src/plugins/qmldesigner/components/propertyeditor/qmlanchorbindingproxy.cpp index 5bdcfb86cf4..45e69b54580 100644 --- a/src/plugins/qmldesigner/components/propertyeditor/qmlanchorbindingproxy.cpp +++ b/src/plugins/qmldesigner/components/propertyeditor/qmlanchorbindingproxy.cpp @@ -57,7 +57,7 @@ static inline void backupPropertyAndRemove(ModelNode node, const PropertyName &p } -static inline void restoreProperty(ModelNode node, const PropertyName &propertyName) +static inline void restoreProperty(const ModelNode &node, const PropertyName &propertyName) { if (node.hasAuxiliaryData(auxDataString + propertyName)) node.variantProperty(propertyName).setValue(node.auxiliaryData(auxDataString + propertyName)); @@ -682,7 +682,7 @@ void QmlAnchorBindingProxy::setRightAnchor(bool anchor) return QRect(); } -QRectF QmlAnchorBindingProxy::boundingBox(QmlItemNode node) +QRectF QmlAnchorBindingProxy::boundingBox(const QmlItemNode &node) { if (node.isValid()) return node.instanceTransformWithContentTransform().mapRect(node.instanceBoundingRect()); diff --git a/src/plugins/qmldesigner/components/propertyeditor/qmlanchorbindingproxy.h b/src/plugins/qmldesigner/components/propertyeditor/qmlanchorbindingproxy.h index 66a3260e1d3..a30f48e7665 100644 --- a/src/plugins/qmldesigner/components/propertyeditor/qmlanchorbindingproxy.h +++ b/src/plugins/qmldesigner/components/propertyeditor/qmlanchorbindingproxy.h @@ -215,7 +215,7 @@ private: QRectF parentBoundingBox(); - QRectF boundingBox(QmlItemNode node); + QRectF boundingBox(const QmlItemNode &node); QRectF transformedBoundingBox(); diff --git a/src/plugins/qmldesigner/designercore/filemanager/moveobjectvisitor.cpp b/src/plugins/qmldesigner/designercore/filemanager/moveobjectvisitor.cpp index 12c4a3c8ca3..7b09f8317b7 100644 --- a/src/plugins/qmldesigner/designercore/filemanager/moveobjectvisitor.cpp +++ b/src/plugins/qmldesigner/designercore/filemanager/moveobjectvisitor.cpp @@ -279,7 +279,7 @@ bool MoveObjectVisitor::visit(UiObjectDefinition *ast) return !didRewriting(); } -void MoveObjectVisitor::doMove(TextModifier::MoveInfo moveInfo) +void MoveObjectVisitor::doMove(const TextModifier::MoveInfo &moveInfo) { if (moveInfo.objectEnd > moveInfo.objectStart) { Inserter findTargetAndInsert(*textModifier(), diff --git a/src/plugins/qmldesigner/designercore/filemanager/moveobjectvisitor.h b/src/plugins/qmldesigner/designercore/filemanager/moveobjectvisitor.h index 32fc12aebcd..000aae7583d 100644 --- a/src/plugins/qmldesigner/designercore/filemanager/moveobjectvisitor.h +++ b/src/plugins/qmldesigner/designercore/filemanager/moveobjectvisitor.h @@ -53,7 +53,7 @@ protected: virtual bool visit(QmlJS::AST::UiObjectDefinition *ast); private: - void doMove(QmlDesigner::TextModifier::MoveInfo moveInfo); + void doMove(const TextModifier::MoveInfo &moveInfo); private: QList parents; diff --git a/src/plugins/qmldesigner/designercore/include/abstractview.h b/src/plugins/qmldesigner/designercore/include/abstractview.h index 96f17b16e37..0b3f427a4c7 100644 --- a/src/plugins/qmldesigner/designercore/include/abstractview.h +++ b/src/plugins/qmldesigner/designercore/include/abstractview.h @@ -160,7 +160,7 @@ public: ModelNode modelNodeForId(const QString &id); bool hasId(const QString &id) const; - QString generateNewId(const QString prefixName) const; + QString generateNewId(const QString &prefixName) const; ModelNode modelNodeForInternalId(qint32 internalId) const; bool hasModelNodeForInternalId(qint32 internalId) const; diff --git a/src/plugins/qmldesigner/designercore/include/modelnode.h b/src/plugins/qmldesigner/designercore/include/modelnode.h index f1a97c171b4..b62d490e38b 100644 --- a/src/plugins/qmldesigner/designercore/include/modelnode.h +++ b/src/plugins/qmldesigner/designercore/include/modelnode.h @@ -91,7 +91,7 @@ public: ModelNode(); ModelNode(const Internal::InternalNodePointer &internalNode, Model *model, const AbstractView *view); - ModelNode(const ModelNode modelNode, AbstractView *view); + ModelNode(const ModelNode &modelNode, AbstractView *view); ModelNode(const ModelNode &other); ~ModelNode(); diff --git a/src/plugins/qmldesigner/designercore/include/qmlobjectnode.h b/src/plugins/qmldesigner/designercore/include/qmlobjectnode.h index add85f0f102..5344ed7cf33 100644 --- a/src/plugins/qmldesigner/designercore/include/qmlobjectnode.h +++ b/src/plugins/qmldesigner/designercore/include/qmlobjectnode.h @@ -95,7 +95,7 @@ public: void removeProperty(const PropertyName &name); - void setParent(QmlObjectNode newParent); + void setParent(const QmlObjectNode &newParent); QmlItemNode toQmlItemNode() const; diff --git a/src/plugins/qmldesigner/designercore/model/abstractview.cpp b/src/plugins/qmldesigner/designercore/model/abstractview.cpp index a4ab694d35a..759fcf412c9 100644 --- a/src/plugins/qmldesigner/designercore/model/abstractview.cpp +++ b/src/plugins/qmldesigner/designercore/model/abstractview.cpp @@ -352,7 +352,7 @@ bool AbstractView::hasId(const QString &id) const return model()->d->hasId(id); } -QString firstCharToLower(const QString string) +QString firstCharToLower(const QString &string) { QString resultString = string; @@ -362,7 +362,7 @@ QString firstCharToLower(const QString string) return resultString; } -QString AbstractView::generateNewId(const QString prefixName) const +QString AbstractView::generateNewId(const QString &prefixName) const { int counter = 1; diff --git a/src/plugins/qmldesigner/designercore/model/modelnode.cpp b/src/plugins/qmldesigner/designercore/model/modelnode.cpp index 8215054ac28..6f009c41973 100644 --- a/src/plugins/qmldesigner/designercore/model/modelnode.cpp +++ b/src/plugins/qmldesigner/designercore/model/modelnode.cpp @@ -86,7 +86,7 @@ ModelNode::ModelNode(const InternalNodePointer &internalNode, Model *model, cons Q_ASSERT(!m_model || m_view); } -ModelNode::ModelNode(const ModelNode modelNode, AbstractView *view) +ModelNode::ModelNode(const ModelNode &modelNode, AbstractView *view) : m_internalNode(modelNode.m_internalNode), m_model(modelNode.model()), m_view(view) diff --git a/src/plugins/qmldesigner/designercore/model/qmlobjectnode.cpp b/src/plugins/qmldesigner/designercore/model/qmlobjectnode.cpp index 232e8a96161..40dff682ac5 100644 --- a/src/plugins/qmldesigner/designercore/model/qmlobjectnode.cpp +++ b/src/plugins/qmldesigner/designercore/model/qmlobjectnode.cpp @@ -523,7 +523,7 @@ PropertyName QmlObjectNode::defaultPropertyName() const return modelNode().metaInfo().defaultPropertyName(); } -void QmlObjectNode::setParent(QmlObjectNode newParent) +void QmlObjectNode::setParent(const QmlObjectNode &newParent) { if (newParent.hasDefaultPropertyName()) newParent.modelNode().defaultNodeAbstractProperty().reparentHere(modelNode()); diff --git a/src/plugins/qmldesigner/documentmanager.cpp b/src/plugins/qmldesigner/documentmanager.cpp index 1cbe972be87..9aa0e9ddb03 100644 --- a/src/plugins/qmldesigner/documentmanager.cpp +++ b/src/plugins/qmldesigner/documentmanager.cpp @@ -43,7 +43,7 @@ static inline DesignDocument* currentDesignDocument() return QmlDesignerPlugin::instance()->documentManager().currentDesignDocument(); } -static inline void getProperties(const ModelNode node, QHash &propertyHash) +static inline void getProperties(const ModelNode &node, QHash &propertyHash) { if (QmlObjectNode::isValidQmlObjectNode(node)) { foreach (const AbstractProperty &abstractProperty, node.properties()) {