Misc improvements (use std::move, use const&, etc) (#170)

Author: Quincunx271

include/nodes/internal/Connection.hpp

@@ -45,7 +45,7 @@ class NODE_EDITOR_PUBLIC Connection
              PortIndex portIndexIn,
              Node& nodeOut,
              PortIndex portIndexOut,
-             TypeConverter const & converter =
+             TypeConverter converter =
                TypeConverter{});
 
   Connection(const Connection&) = delete;

include/nodes/internal/FlowScene.hpp

@@ -66,11 +66,11 @@ class NODE_EDITOR_PUBLIC FlowScene
 
   void setRegistry(std::shared_ptr<DataModelRegistry> registry);
 
-  void iterateOverNodes(std::function<void(Node*)> visitor);
+  void iterateOverNodes(std::function<void(Node*)> const & visitor);
 
-  void iterateOverNodeData(std::function<void(NodeDataModel*)> visitor);
+  void iterateOverNodeData(std::function<void(NodeDataModel*)> const & visitor);
 
-  void iterateOverNodeDataDependentOrder(std::function<void(NodeDataModel*)> visitor);
+  void iterateOverNodeDataDependentOrder(std::function<void(NodeDataModel*)> const & visitor);
 
   QPointF getNodePosition(const Node& node) const;
 
@@ -132,5 +132,5 @@ class NODE_EDITOR_PUBLIC FlowScene
 
 Node*
 locateNodeAt(QPointF scenePoint, FlowScene &scene,
-             QTransform viewTransform);
+             QTransform const & viewTransform);
 }

include/nodes/internal/Node.hpp

@@ -53,7 +53,7 @@ class NODE_EDITOR_PUBLIC Node
   id() const;
 
   void reactToPossibleConnection(PortType,
-                                 NodeDataType,
+                                 NodeDataType const &,
                                  QPointF const & scenePoint);
 
   void

include/nodes/internal/NodeGeometry.hpp

@@ -92,12 +92,12 @@ class NODE_EDITOR_PUBLIC NodeGeometry
   QPointF
   portScenePosition(PortIndex index,
                     PortType portType,
-                    QTransform t = QTransform()) const;
+                    QTransform const & t = QTransform()) const;
 
   PortIndex
   checkHitScenePoint(PortType portType,
-                     QPointF const point,
-                     QTransform t = QTransform()) const;
+                     QPointF point,
+                     QTransform const & t = QTransform()) const;
 
   QRect
   resizeRect() const;

src/Connection.cpp

@@ -1,6 +1,7 @@
 #include "Connection.hpp"
 
-#include <math.h>
+#include <cmath>
+#include <utility>
 
 #include <QtWidgets/QtWidgets>
 #include <QtGlobal>
@@ -48,14 +49,14 @@ Connection(Node& nodeIn,
            PortIndex portIndexIn,
            Node& nodeOut,
            PortIndex portIndexOut,
-           TypeConverter const & typeConverter)
+           TypeConverter typeConverter)
   : _uid(QUuid::createUuid())
   , _outNode(&nodeOut)
   , _inNode(&nodeIn)
   , _outPortIndex(portIndexOut)
   , _inPortIndex(portIndexIn)
   , _connectionState()
-  , _converter(typeConverter)
+  , _converter(std::move(typeConverter))
 {
   setNodeToPort(nodeIn, PortType::In, portIndexIn);
   setNodeToPort(nodeOut, PortType::Out, portIndexOut);

src/FlowScene.cpp

@@ -1,6 +1,7 @@
 #include "FlowScene.hpp"
 
 #include <stdexcept>
+#include <utility>
 
 #include <QtWidgets/QGraphicsSceneMoveEvent>
 #include <QtWidgets/QFileDialog>
@@ -41,7 +42,7 @@ FlowScene::
 FlowScene(std::shared_ptr<DataModelRegistry> registry,
           QObject * parent)
   : QGraphicsScene(parent)
-  , _registry(registry)
+  , _registry(std::move(registry))
 {
   setItemIndexMethod(QGraphicsScene::NoIndex);
 }
@@ -254,13 +255,13 @@ void
 FlowScene::
 setRegistry(std::shared_ptr<DataModelRegistry> registry)
 {
-  _registry = registry;
+  _registry = std::move(registry);
 }
 
 
 void
 FlowScene::
-iterateOverNodes(std::function<void(Node*)> visitor)
+iterateOverNodes(std::function<void(Node*)> const & visitor)
 {
   for (const auto& _node : _nodes)
   {
@@ -271,7 +272,7 @@ iterateOverNodes(std::function<void(Node*)> visitor)
 
 void
 FlowScene::
-iterateOverNodeData(std::function<void(NodeDataModel*)> visitor)
+iterateOverNodeData(std::function<void(NodeDataModel*)> const & visitor)
 {
   for (const auto& _node : _nodes)
   {
@@ -282,7 +283,7 @@ iterateOverNodeData(std::function<void(NodeDataModel*)> visitor)
 
 void
 FlowScene::
-iterateOverNodeDataDependentOrder(std::function<void(NodeDataModel*)> visitor)
+iterateOverNodeDataDependentOrder(std::function<void(NodeDataModel*)> const & visitor)
 {
   std::set<QUuid> visitedNodesSet;
 
@@ -537,16 +538,16 @@ loadFromMemory(const QByteArray& data)
 
   QJsonArray nodesJsonArray = jsonDocument["nodes"].toArray();
 
-  for (int i = 0; i < nodesJsonArray.size(); ++i)
+  for (QJsonValueRef node : nodesJsonArray)
   {
-    restoreNode(nodesJsonArray[i].toObject());
+    restoreNode(node.toObject());
   }
 
   QJsonArray connectionJsonArray = jsonDocument["connections"].toArray();
 
-  for (int i = 0; i < connectionJsonArray.size(); ++i)
+  for (QJsonValueRef connection : connectionJsonArray)
   {
-    restoreConnection(connectionJsonArray[i].toObject());
+    restoreConnection(connection.toObject());
   }
 }
 
@@ -557,7 +558,7 @@ namespace QtNodes
 
 Node*
 locateNodeAt(QPointF scenePoint, FlowScene &scene,
-             QTransform viewTransform)
+             QTransform const & viewTransform)
 {
   // items under cursor
   QList<QGraphicsItem*> items =

src/Node.cpp

@@ -2,6 +2,7 @@
 
 #include <QtCore/QObject>
 
+#include <utility>
 #include <iostream>
 
 #include "FlowScene.hpp"
@@ -39,7 +40,7 @@ Node(std::unique_ptr<NodeDataModel> && dataModel)
 
 
 Node::
-~Node() {}
+~Node() = default;
 
 QJsonObject
 Node::
@@ -86,7 +87,7 @@ id() const
 void
 Node::
 reactToPossibleConnection(PortType reactingPortType,
-                          NodeDataType reactingDataType,
+                          NodeDataType const &reactingDataType,
                           QPointF const &scenePoint)
 {
   QTransform const t = _nodeGraphicsObject->sceneTransform();
@@ -183,7 +184,7 @@ Node::
 propagateData(std::shared_ptr<NodeData> nodeData,
               PortIndex inPortIndex) const
 {
-  _nodeDataModel->setInData(nodeData, inPortIndex);
+  _nodeDataModel->setInData(std::move(nodeData), inPortIndex);
 
   //Recalculate the nodes visuals. A data change can result in the node taking more space than before, so this forces a recalculate+repaint on the affected node
   _nodeGraphicsObject->setGeometryChanged();

src/NodeGeometry.cpp

@@ -133,7 +133,7 @@ QPointF
 NodeGeometry::
 portScenePosition(PortIndex index,
                   PortType portType,
-                  QTransform t) const
+                  QTransform const & t) const
 {
   auto const &nodeStyle = StyleCollection::nodeStyle();
 
@@ -180,7 +180,7 @@ PortIndex
 NodeGeometry::
 checkHitScenePoint(PortType portType,
                    QPointF const scenePoint,
-                   QTransform sceneTransform) const
+                   QTransform const & sceneTransform) const
 {
   auto const &nodeStyle = StyleCollection::nodeStyle();
 

src/NodeState.cpp

@@ -110,7 +110,7 @@ setReaction(ReactToConnectionState reaction,
 
   _reactingPortType = reactingPortType;
 
-  _reactingDataType = reactingDataType;
+  _reactingDataType = std::move(reactingDataType);
 }