From 818b56ac767e3c68a31e99e8de7b9e238350b88f Mon Sep 17 00:00:00 2001
From: Justin Bassett <jbassett271@gmail.com>
Date: Mon, 30 Apr 2018 15:14:21 -0700
Subject: [PATCH 01/11] Add DI for FlowViewStyle

---
 include/nodes/internal/FlowView.hpp |  9 +++++++
 src/FlowView.cpp                    | 42 ++++++++++++++++++++++++-----
 2 files changed, 44 insertions(+), 7 deletions(-)

diff --git a/include/nodes/internal/FlowView.hpp b/include/nodes/internal/FlowView.hpp
index 378ff2e6..edebef87 100644
--- a/include/nodes/internal/FlowView.hpp
+++ b/include/nodes/internal/FlowView.hpp
@@ -3,6 +3,7 @@
 #include <QtWidgets/QGraphicsView>
 
 #include "Export.hpp"
+#include "FlowViewStyle.hpp"
 
 namespace QtNodes
 {
@@ -16,7 +17,9 @@ class NODE_EDITOR_PUBLIC FlowView
 public:
 
   FlowView(QWidget *parent = Q_NULLPTR);
+  FlowView(FlowViewStyle style, QWidget* parent = Q_NULLPTR);
   FlowView(FlowScene *scene, QWidget *parent = Q_NULLPTR);
+  FlowView(FlowScene *scene, FlowViewStyle style, QWidget* parent = Q_NULLPTR);
 
   FlowView(const FlowView&) = delete;
   FlowView operator=(const FlowView&) = delete;
@@ -27,6 +30,10 @@ class NODE_EDITOR_PUBLIC FlowView
 
   void setScene(FlowScene *scene);
 
+  void setStyle(FlowViewStyle style);
+
+  static FlowViewStyle const& defaultStyle();
+
 public slots:
 
   void scaleUp();
@@ -65,5 +72,7 @@ public slots:
   QPointF _clickPos;
 
   FlowScene* _scene;
+
+  FlowViewStyle _style = defaultStyle();
 };
 }
diff --git a/src/FlowView.cpp b/src/FlowView.cpp
index 4e5e1e9b..81bcbf99 100644
--- a/src/FlowView.cpp
+++ b/src/FlowView.cpp
@@ -24,6 +24,7 @@
 #include "StyleCollection.hpp"
 
 using QtNodes::FlowView;
+using QtNodes::FlowViewStyle;
 using QtNodes::FlowScene;
 
 FlowView::
@@ -36,9 +37,6 @@ FlowView(QWidget *parent)
   setDragMode(QGraphicsView::ScrollHandDrag);
   setRenderHint(QPainter::Antialiasing);
 
-  auto const &flowViewStyle = StyleCollection::flowViewStyle();
-
-  setBackgroundBrush(flowViewStyle.BackgroundColor);
 
   //setViewportUpdateMode(QGraphicsView::FullViewportUpdate);
   //setViewportUpdateMode(QGraphicsView::MinimalViewportUpdate);
@@ -53,6 +51,14 @@ FlowView(QWidget *parent)
 }
 
 
+FlowView::
+FlowView(FlowViewStyle style, QWidget *parent)
+  : FlowView(parent)
+{
+  setStyle(std::move(style));
+}
+
+
 FlowView::
 FlowView(FlowScene *scene, QWidget *parent)
   : FlowView(parent)
@@ -61,6 +67,14 @@ FlowView(FlowScene *scene, QWidget *parent)
 }
 
 
+FlowView::
+FlowView(FlowScene *scene, FlowViewStyle style, QWidget *parent)
+  : FlowView(scene, parent)
+{
+  setStyle(std::move(style));
+}
+
+
 QAction*
 FlowView::
 clearSelectionAction() const
@@ -98,6 +112,22 @@ FlowView::setScene(FlowScene *scene)
 }
 
 
+void
+FlowView::setStyle(FlowViewStyle style)
+{
+  _style = std::move(style);
+
+  setBackgroundBrush(_style.BackgroundColor);
+}
+
+
+FlowViewStyle const&
+FlowView::defaultStyle()
+{
+  return StyleCollection::flowViewStyle();
+}
+
+
 void
 FlowView::
 contextMenuEvent(QContextMenuEvent *event)
@@ -375,16 +405,14 @@ drawBackground(QPainter* painter, const QRectF& r)
       }
     };
 
-  auto const &flowViewStyle = StyleCollection::flowViewStyle();
-
   QBrush bBrush = backgroundBrush();
 
-  QPen pfine(flowViewStyle.FineGridColor, 1.0);
+  QPen pfine(_style.FineGridColor, 1.0);
 
   painter->setPen(pfine);
   drawGrid(15);
 
-  QPen p(flowViewStyle.CoarseGridColor, 1.0);
+  QPen p(_style.CoarseGridColor, 1.0);
 
   painter->setPen(p);
   drawGrid(150);

From 2bb3ff0267fc722d81341a3ae81648c62c45fba3 Mon Sep 17 00:00:00 2001
From: Justin Bassett <jbassett271@gmail.com>
Date: Tue, 1 May 2018 13:21:20 -0700
Subject: [PATCH 02/11] DI styling

---
 include/nodes/internal/Connection.hpp         |  13 ++-
 include/nodes/internal/ConnectionGeometry.hpp |   7 +-
 include/nodes/internal/FlowScene.hpp          |  12 ++
 include/nodes/internal/Node.hpp               |   3 +-
 include/nodes/internal/NodeDataModel.hpp      |   8 +-
 include/nodes/internal/NodeGeometry.hpp       |   5 +-
 src/Connection.cpp                            |  17 ++-
 src/ConnectionGeometry.cpp                    |  10 +-
 src/ConnectionPainter.cpp                     |  10 +-
 src/FlowScene.cpp                             | 103 ++++++++++++++----
 src/Node.cpp                                  |   5 +-
 src/NodeDataModel.cpp                         |   1 +
 src/NodeGeometry.cpp                          |  22 ++--
 src/NodePainter.cpp                           |  13 +--
 src/NodePainter.hpp                           |   7 +-
 15 files changed, 170 insertions(+), 66 deletions(-)

diff --git a/include/nodes/internal/Connection.hpp b/include/nodes/internal/Connection.hpp
index 902e78a2..4bc3897f 100644
--- a/include/nodes/internal/Connection.hpp
+++ b/include/nodes/internal/Connection.hpp
@@ -9,6 +9,7 @@
 
 #include "Serializable.hpp"
 #include "ConnectionState.hpp"
+#include "ConnectionStyle.hpp"
 #include "ConnectionGeometry.hpp"
 #include "TypeConverter.hpp"
 #include "QUuidStdHash.hpp"
@@ -36,15 +37,17 @@ class NODE_EDITOR_PUBLIC Connection
 
   /// New Connection is attached to the port of the given Node.
   /// The port has parameters (portType, portIndex).
-  /// The opposite connection end will require anothre port.
+  /// The opposite connection end will require another port.
   Connection(PortType portType,
              Node& node,
-             PortIndex portIndex);
+             PortIndex portIndex,
+             ConnectionStyle const &style);
 
   Connection(Node& nodeIn,
              PortIndex portIndexIn,
              Node& nodeOut,
              PortIndex portIndexOut,
+             ConnectionStyle const &style,
              TypeConverter const & converter =
                TypeConverter{});
 
@@ -118,6 +121,9 @@ class NODE_EDITOR_PUBLIC Connection
   void
   setTypeConverter(TypeConverter converter);
 
+  ConnectionStyle const &
+  connectionStyle() const;
+
 public: // data propagation
 
   void
@@ -139,10 +145,11 @@ class NODE_EDITOR_PUBLIC Connection
   PortIndex _inPortIndex;
 
 private:
-
   ConnectionState    _connectionState;
   ConnectionGeometry _connectionGeometry;
 
+  ConnectionStyle const *_connectionStyle;
+
   std::unique_ptr<ConnectionGraphicsObject>_connectionGraphicsObject;
 
   TypeConverter _converter;
diff --git a/include/nodes/internal/ConnectionGeometry.hpp b/include/nodes/internal/ConnectionGeometry.hpp
index 870c3559..86965c7a 100644
--- a/include/nodes/internal/ConnectionGeometry.hpp
+++ b/include/nodes/internal/ConnectionGeometry.hpp
@@ -10,11 +10,12 @@
 namespace QtNodes
 {
 
+class ConnectionStyle;
+
 class ConnectionGeometry
 {
 public:
-
-  ConnectionGeometry();
+  ConnectionGeometry(ConnectionStyle const &style);
 
 public:
 
@@ -56,5 +57,7 @@ class ConnectionGeometry
   double _lineWidth;
 
   bool _hovered;
+
+  ConnectionStyle const* _style;
 };
 }
diff --git a/include/nodes/internal/FlowScene.hpp b/include/nodes/internal/FlowScene.hpp
index 4ea3bfe7..2068aba8 100644
--- a/include/nodes/internal/FlowScene.hpp
+++ b/include/nodes/internal/FlowScene.hpp
@@ -22,6 +22,8 @@ class Node;
 class NodeGraphicsObject;
 class Connection;
 class ConnectionGraphicsObject;
+
+class ConnectionStyle;
 class NodeStyle;
 
 /// Scene holds connections and nodes.
@@ -97,6 +99,12 @@ class NODE_EDITOR_PUBLIC FlowScene
 
   void loadFromMemory(const QByteArray& data);
 
+  ConnectionStyle const& connectionStyle() const;
+  NodeStyle const& defaultNodeStyle() const;
+
+  void setConnectionStyle(ConnectionStyle style);
+  void setDefaultNodeStyle(NodeStyle style);
+
 signals:
 
   void nodeCreated(Node &n);
@@ -125,9 +133,13 @@ class NODE_EDITOR_PUBLIC FlowScene
   using SharedConnection = std::shared_ptr<Connection>;
   using UniqueNode       = std::unique_ptr<Node>;
 
+  struct Style;
+
   std::unordered_map<QUuid, SharedConnection> _connections;
   std::unordered_map<QUuid, UniqueNode>       _nodes;
   std::shared_ptr<DataModelRegistry>          _registry;
+
+  std::unique_ptr<Style> _style;
 };
 
 Node*
diff --git a/include/nodes/internal/Node.hpp b/include/nodes/internal/Node.hpp
index 4615cf2e..cb738e9b 100644
--- a/include/nodes/internal/Node.hpp
+++ b/include/nodes/internal/Node.hpp
@@ -24,6 +24,7 @@ class Connection;
 class ConnectionState;
 class NodeGraphicsObject;
 class NodeDataModel;
+class NodeStyle;
 
 class NODE_EDITOR_PUBLIC Node
   : public QObject
@@ -34,7 +35,7 @@ class NODE_EDITOR_PUBLIC Node
 public:
 
   /// NodeDataModel should be an rvalue and is moved into the Node
-  Node(std::unique_ptr<NodeDataModel> && dataModel);
+  Node(std::unique_ptr<NodeDataModel> && dataModel, NodeStyle const& style);
 
   virtual
   ~Node();
diff --git a/include/nodes/internal/NodeDataModel.hpp b/include/nodes/internal/NodeDataModel.hpp
index af209d9d..3693655b 100644
--- a/include/nodes/internal/NodeDataModel.hpp
+++ b/include/nodes/internal/NodeDataModel.hpp
@@ -95,6 +95,12 @@ class NODE_EDITOR_PUBLIC NodeDataModel
   void
   setNodeStyle(NodeStyle const& style);
 
+  bool
+  usingDefaultNodeStyle() const
+  {
+    return _usingDefaultNodeStyle;
+  }
+
 public:
 
   /// Triggers the algorithm
@@ -141,7 +147,7 @@ class NODE_EDITOR_PUBLIC NodeDataModel
   computingFinished();
 
 private:
-
   NodeStyle _nodeStyle;
+  bool      _usingDefaultNodeStyle = true;
 };
 }
diff --git a/include/nodes/internal/NodeGeometry.hpp b/include/nodes/internal/NodeGeometry.hpp
index e674d40e..b76fca2f 100644
--- a/include/nodes/internal/NodeGeometry.hpp
+++ b/include/nodes/internal/NodeGeometry.hpp
@@ -15,12 +15,13 @@ namespace QtNodes
 class NodeState;
 class NodeDataModel;
 class Node;
+class NodeStyle;
 
 class NODE_EDITOR_PUBLIC NodeGeometry
 {
 public:
 
-  NodeGeometry(std::unique_ptr<NodeDataModel> const &dataModel);
+  NodeGeometry(std::unique_ptr<NodeDataModel> const &dataModel, NodeStyle const &style);
 
 public:
   unsigned int
@@ -154,5 +155,7 @@ class NODE_EDITOR_PUBLIC NodeGeometry
 
   mutable QFontMetrics _fontMetrics;
   mutable QFontMetrics _boldFontMetrics;
+
+  NodeStyle const* _nodeStyle;
 };
 }
diff --git a/src/Connection.cpp b/src/Connection.cpp
index 2a868d22..abb693e6 100644
--- a/src/Connection.cpp
+++ b/src/Connection.cpp
@@ -14,6 +14,7 @@
 #include "NodeDataModel.hpp"
 
 #include "ConnectionState.hpp"
+#include "ConnectionStyle.hpp"
 #include "ConnectionGeometry.hpp"
 #include "ConnectionGraphicsObject.hpp"
 
@@ -26,16 +27,20 @@ using QtNodes::NodeData;
 using QtNodes::NodeDataType;
 using QtNodes::ConnectionGraphicsObject;
 using QtNodes::ConnectionGeometry;
+using QtNodes::ConnectionStyle;
 using QtNodes::TypeConverter;
 
 Connection::
 Connection(PortType portType,
            Node& node,
-           PortIndex portIndex)
+           PortIndex portIndex,
+           ConnectionStyle const &style)
   : _uid(QUuid::createUuid())
   , _outPortIndex(INVALID)
   , _inPortIndex(INVALID)
   , _connectionState()
+  , _connectionGeometry(style)
+  , _connectionStyle(&style)
 {
   setNodeToPort(node, portType, portIndex);
 
@@ -48,6 +53,7 @@ Connection(Node& nodeIn,
            PortIndex portIndexIn,
            Node& nodeOut,
            PortIndex portIndexOut,
+           ConnectionStyle const &style,
            TypeConverter const & typeConverter)
   : _uid(QUuid::createUuid())
   , _outNode(&nodeOut)
@@ -55,6 +61,8 @@ Connection(Node& nodeIn,
   , _outPortIndex(portIndexOut)
   , _inPortIndex(portIndexIn)
   , _connectionState()
+  , _connectionGeometry(style)
+  , _connectionStyle(&style)
   , _converter(typeConverter)
 {
   setNodeToPort(nodeIn, PortType::In, portIndexIn);
@@ -401,6 +409,13 @@ setTypeConverter(TypeConverter converter)
 }
 
 
+ConnectionStyle const &
+Connection::connectionStyle() const
+{
+  return *_connectionStyle;
+}
+
+
 void
 Connection::
 propagateData(std::shared_ptr<NodeData> nodeData) const
diff --git a/src/ConnectionGeometry.cpp b/src/ConnectionGeometry.cpp
index 2f8e4be3..4e6d6488 100644
--- a/src/ConnectionGeometry.cpp
+++ b/src/ConnectionGeometry.cpp
@@ -2,18 +2,19 @@
 
 #include <cmath>
 
-#include "StyleCollection.hpp"
+#include "ConnectionStyle.hpp"
 
 using QtNodes::ConnectionGeometry;
 using QtNodes::PortType;
 
 ConnectionGeometry::
-ConnectionGeometry()
+ConnectionGeometry(ConnectionStyle const &style)
   : _in(0, 0)
   , _out(0, 0)
   //, _animationPhase(0)
   , _lineWidth(3.0)
   , _hovered(false)
+  , _style(&style)
 { }
 
 QPointF const&
@@ -78,10 +79,7 @@ boundingRect() const
 
   QRectF c1c2Rect = QRectF(points.first, points.second).normalized();
 
-  auto const &connectionStyle =
-    StyleCollection::connectionStyle();
-
-  float const diam = connectionStyle.pointDiameter();
+  float const diam = _style->pointDiameter();
 
   QRectF commonRect = basicRect.united(c1c2Rect);
 
diff --git a/src/ConnectionPainter.cpp b/src/ConnectionPainter.cpp
index 11d31af0..a10a59c7 100644
--- a/src/ConnectionPainter.cpp
+++ b/src/ConnectionPainter.cpp
@@ -9,8 +9,6 @@
 
 #include "NodeData.hpp"
 
-#include "StyleCollection.hpp"
-
 
 using QtNodes::ConnectionPainter;
 using QtNodes::ConnectionGeometry;
@@ -110,7 +108,7 @@ drawSketchLine(QPainter * painter,
   if (state.requiresPort())
   {
     auto const & connectionStyle =
-      QtNodes::StyleCollection::connectionStyle();
+      connection.connectionStyle();
 
     QPen p;
     p.setWidth(connectionStyle.constructionLineWidth());
@@ -150,7 +148,7 @@ drawHoveredOrSelected(QPainter * painter,
     QPen p;
 
     auto const &connectionStyle =
-      QtNodes::StyleCollection::connectionStyle();
+      connection.connectionStyle();
     double const lineWidth     = connectionStyle.lineWidth();
 
     p.setWidth(2 * lineWidth);
@@ -184,7 +182,7 @@ drawNormalLine(QPainter * painter,
   // colors
 
   auto const &connectionStyle =
-    QtNodes::StyleCollection::connectionStyle();
+    connection.connectionStyle();
 
   QColor normalColorOut  = connectionStyle.normalColor();
   QColor normalColorIn   = connectionStyle.normalColor();
@@ -301,7 +299,7 @@ paint(QPainter* painter,
   QPointF const & sink   = geom.sink();
 
   auto const & connectionStyle =
-    QtNodes::StyleCollection::connectionStyle();
+    connection.connectionStyle();
 
   double const pointDiameter = connectionStyle.pointDiameter();
 
diff --git a/src/FlowScene.cpp b/src/FlowScene.cpp
index c2aa8b91..4b7900ed 100644
--- a/src/FlowScene.cpp
+++ b/src/FlowScene.cpp
@@ -1,6 +1,7 @@
 #include "FlowScene.hpp"
 
 #include <stdexcept>
+#include <utility>
 
 #include <QtWidgets/QGraphicsSceneMoveEvent>
 #include <QtWidgets/QFileDialog>
@@ -26,22 +27,40 @@
 #include "FlowView.hpp"
 #include "DataModelRegistry.hpp"
 
+#include "NodeStyle.hpp"
+#include "ConnectionStyle.hpp"
+#include "StyleCollection.hpp"
+
 using QtNodes::FlowScene;
 using QtNodes::Node;
+using QtNodes::NodeStyle;
 using QtNodes::NodeGraphicsObject;
 using QtNodes::Connection;
+using QtNodes::ConnectionStyle;
 using QtNodes::DataModelRegistry;
 using QtNodes::NodeDataModel;
 using QtNodes::PortType;
 using QtNodes::PortIndex;
 using QtNodes::TypeConverter;
 
+struct FlowScene::Style
+{
+  ConnectionStyle _connectionStyle;
+  NodeStyle       _defaultNodeStyle;
+
+  Style()
+    : _connectionStyle(StyleCollection::connectionStyle())
+    , _defaultNodeStyle(StyleCollection::nodeStyle())
+  {
+  }
+};
 
 FlowScene::
 FlowScene(std::shared_ptr<DataModelRegistry> registry,
           QObject * parent)
   : QGraphicsScene(parent)
   , _registry(registry)
+  , _style(std::make_unique<FlowScene::Style>())
 {
   setItemIndexMethod(QGraphicsScene::NoIndex);
 }
@@ -68,7 +87,10 @@ createConnection(PortType connectedPort,
                  Node& node,
                  PortIndex portIndex)
 {
-  auto connection = std::make_shared<Connection>(connectedPort, node, portIndex);
+  auto connection = std::make_shared<Connection>(connectedPort,
+                                                 node,
+                                                 portIndex,
+                                                 connectionStyle());
 
   auto cgo = detail::make_unique<ConnectionGraphicsObject>(*this, *connection);
 
@@ -95,6 +117,7 @@ createConnection(Node& nodeIn,
                                  portIndexIn,
                                  nodeOut,
                                  portIndexOut,
+                                 connectionStyle(),
                                  converter);
 
   auto cgo = detail::make_unique<ConnectionGraphicsObject>(*this, *connection);
@@ -172,23 +195,38 @@ deleteConnection(Connection& connection)
 }
 
 
-Node&
-FlowScene::
-createNode(std::unique_ptr<NodeDataModel> && dataModel)
+static
+Node &
+makeNode(FlowScene &                                       scene,
+         std::unordered_map<QUuid, std::unique_ptr<Node>> &nodes,
+         std::unique_ptr<NodeDataModel> &&                 dataModel)
 {
-  auto node = detail::make_unique<Node>(std::move(dataModel));
-  auto ngo  = detail::make_unique<NodeGraphicsObject>(*this, *node);
+  if (dataModel->usingDefaultNodeStyle()) {
+    dataModel->setNodeStyle(scene.defaultNodeStyle());
+  }
+
+  auto node = detail::make_unique<Node>(std::move(dataModel), scene.defaultNodeStyle());
+  auto ngo  = detail::make_unique<NodeGraphicsObject>(scene, *node);
 
   node->setGraphicsObject(std::move(ngo));
 
-  auto nodePtr = node.get();
-  _nodes[node->id()] = std::move(node);
+  auto nodePtr      = node.get();
+  nodes[node->id()] = std::move(node);
 
-  nodeCreated(*nodePtr);
   return *nodePtr;
 }
 
 
+Node&
+FlowScene::
+createNode(std::unique_ptr<NodeDataModel> && dataModel)
+{
+  Node& node = ::makeNode(*this, _nodes, std::move(dataModel));
+  nodeCreated(node);
+  return node;
+}
+
+
 Node&
 FlowScene::
 restoreNode(QJsonObject const& nodeJson)
@@ -201,17 +239,10 @@ restoreNode(QJsonObject const& nodeJson)
     throw std::logic_error(std::string("No registered model with name ") +
                            modelName.toLocal8Bit().data());
 
-  auto node = detail::make_unique<Node>(std::move(dataModel));
-  auto ngo  = detail::make_unique<NodeGraphicsObject>(*this, *node);
-  node->setGraphicsObject(std::move(ngo));
-
-  node->restore(nodeJson);
-
-  auto nodePtr = node.get();
-  _nodes[node->id()] = std::move(node);
-
-  nodeCreated(*nodePtr);
-  return *nodePtr;
+  auto& node = ::makeNode(*this, _nodes, std::move(dataModel));
+  node.restore(nodeJson);
+  nodeCreated(node);
+  return node;
 }
 
 
@@ -551,6 +582,38 @@ loadFromMemory(const QByteArray& data)
 }
 
 
+ConnectionStyle const &
+FlowScene::
+connectionStyle() const
+{
+  return _style->_connectionStyle;
+}
+
+
+NodeStyle const &
+FlowScene::
+defaultNodeStyle() const
+{
+  return _style->_defaultNodeStyle;
+}
+
+
+void
+FlowScene::
+setConnectionStyle(ConnectionStyle style)
+{
+  _style->_connectionStyle = std::move(style);
+}
+
+
+void
+FlowScene::
+setDefaultNodeStyle(NodeStyle style)
+{
+  _style->_defaultNodeStyle = std::move(style);
+}
+
+
 //------------------------------------------------------------------------------
 namespace QtNodes
 {
diff --git a/src/Node.cpp b/src/Node.cpp
index 7ea8b91b..bf4e6f4b 100644
--- a/src/Node.cpp
+++ b/src/Node.cpp
@@ -8,6 +8,7 @@
 
 #include "NodeGraphicsObject.hpp"
 #include "NodeDataModel.hpp"
+#include "NodeStyle.hpp"
 
 #include "ConnectionGraphicsObject.hpp"
 #include "ConnectionState.hpp"
@@ -23,11 +24,11 @@ using QtNodes::PortIndex;
 using QtNodes::PortType;
 
 Node::
-Node(std::unique_ptr<NodeDataModel> && dataModel)
+Node(std::unique_ptr<NodeDataModel> && dataModel, NodeStyle const& style)
   : _uid(QUuid::createUuid())
   , _nodeDataModel(std::move(dataModel))
   , _nodeState(_nodeDataModel)
-  , _nodeGeometry(_nodeDataModel)
+  , _nodeGeometry(_nodeDataModel, style)
   , _nodeGraphicsObject(nullptr)
 {
   _nodeGeometry.recalculateSize();
diff --git a/src/NodeDataModel.cpp b/src/NodeDataModel.cpp
index 9737b345..baab374b 100644
--- a/src/NodeDataModel.cpp
+++ b/src/NodeDataModel.cpp
@@ -38,4 +38,5 @@ NodeDataModel::
 setNodeStyle(NodeStyle const& style)
 {
   _nodeStyle = style;
+  _usingDefaultNodeStyle = false;
 }
diff --git a/src/NodeGeometry.cpp b/src/NodeGeometry.cpp
index 922ea74d..7e7a689b 100644
--- a/src/NodeGeometry.cpp
+++ b/src/NodeGeometry.cpp
@@ -4,12 +4,11 @@
 #include <cmath>
 
 #include "PortType.hpp"
-#include "NodeState.hpp"
 #include "NodeDataModel.hpp"
 #include "Node.hpp"
 #include "NodeGraphicsObject.hpp"
-
-#include "StyleCollection.hpp"
+#include "NodeState.hpp"
+#include "NodeStyle.hpp"
 
 using QtNodes::NodeGeometry;
 using QtNodes::NodeDataModel;
@@ -18,7 +17,7 @@ using QtNodes::PortType;
 using QtNodes::Node;
 
 NodeGeometry::
-NodeGeometry(std::unique_ptr<NodeDataModel> const &dataModel)
+NodeGeometry(std::unique_ptr<NodeDataModel> const &dataModel, NodeStyle const &style)
   : _width(100)
   , _height(150)
   , _inputPortWidth(70)
@@ -32,6 +31,7 @@ NodeGeometry(std::unique_ptr<NodeDataModel> const &dataModel)
   , _dataModel(dataModel)
   , _fontMetrics(QFont())
   , _boldFontMetrics(QFont())
+  , _nodeStyle(&style)
 {
   QFont f; f.setBold(true);
 
@@ -56,9 +56,7 @@ QRectF
 NodeGeometry::
 boundingRect() const
 {
-  auto const &nodeStyle = StyleCollection::nodeStyle();
-
-  double addon = 4 * nodeStyle.ConnectionPointDiameter;
+  double addon = 4 * _nodeStyle->ConnectionPointDiameter;
 
   return QRectF(0 - addon,
                 0 - addon,
@@ -135,8 +133,6 @@ portScenePosition(PortIndex index,
                   PortType portType,
                   QTransform t) const
 {
-  auto const &nodeStyle = StyleCollection::nodeStyle();
-
   unsigned int step = _entryHeight + _spacing;
 
   QPointF result;
@@ -154,7 +150,7 @@ portScenePosition(PortIndex index,
   {
     case PortType::Out:
     {
-      double x = _width + nodeStyle.ConnectionPointDiameter;
+      double x = _width + _nodeStyle->ConnectionPointDiameter;
 
       result = QPointF(x, totalHeight);
       break;
@@ -162,7 +158,7 @@ portScenePosition(PortIndex index,
 
     case PortType::In:
     {
-      double x = 0.0 - nodeStyle.ConnectionPointDiameter;
+      double x = 0.0 - _nodeStyle->ConnectionPointDiameter;
 
       result = QPointF(x, totalHeight);
       break;
@@ -182,14 +178,12 @@ checkHitScenePoint(PortType portType,
                    QPointF const scenePoint,
                    QTransform sceneTransform) const
 {
-  auto const &nodeStyle = StyleCollection::nodeStyle();
-
   PortIndex result = INVALID;
 
   if (portType == PortType::None)
     return result;
 
-  double const tolerance = 2.0 * nodeStyle.ConnectionPointDiameter;
+  double const tolerance = 2.0 * _nodeStyle->ConnectionPointDiameter;
 
   unsigned int const nItems = _dataModel->nPorts(portType);
 
diff --git a/src/NodePainter.cpp b/src/NodePainter.cpp
index fffd1b51..e7ca8092 100644
--- a/src/NodePainter.cpp
+++ b/src/NodePainter.cpp
@@ -4,7 +4,6 @@
 
 #include <QtCore/QMargins>
 
-#include "StyleCollection.hpp"
 #include "PortType.hpp"
 #include "NodeGraphicsObject.hpp"
 #include "NodeGeometry.hpp"
@@ -40,9 +39,9 @@ paint(QPainter* painter,
 
   drawNodeRect(painter, geom, model, graphicsObject);
 
-  drawConnectionPoints(painter, geom, state, model, scene);
+  drawConnectionPoints(painter, geom, state, model, scene, scene.connectionStyle());
 
-  drawFilledConnectionPoints(painter, geom, state, model);
+  drawFilledConnectionPoints(painter, geom, state, model, scene.connectionStyle());
 
   drawModelName(painter, geom, state, model);
 
@@ -110,10 +109,10 @@ drawConnectionPoints(QPainter* painter,
                      NodeGeometry const& geom,
                      NodeState const& state,
                      NodeDataModel const * model,
-                     FlowScene const & scene)
+                     FlowScene const & scene,
+                     ConnectionStyle const &connectionStyle)
 {
   NodeStyle const& nodeStyle      = model->nodeStyle();
-  auto const     &connectionStyle = StyleCollection::connectionStyle();
 
   float diameter = nodeStyle.ConnectionPointDiameter;
   auto  reducedDiameter = diameter * 0.6;
@@ -195,10 +194,10 @@ NodePainter::
 drawFilledConnectionPoints(QPainter * painter,
                            NodeGeometry const & geom,
                            NodeState const & state,
-                           NodeDataModel const * model)
+                           NodeDataModel const * model,
+                           ConnectionStyle const & connectionStyle)
 {
   NodeStyle const& nodeStyle       = model->nodeStyle();
-  auto const     & connectionStyle = StyleCollection::connectionStyle();
 
   auto diameter = nodeStyle.ConnectionPointDiameter;
 
diff --git a/src/NodePainter.hpp b/src/NodePainter.hpp
index ba8c3c71..7a4b8904 100644
--- a/src/NodePainter.hpp
+++ b/src/NodePainter.hpp
@@ -12,6 +12,7 @@ class NodeGraphicsObject;
 class NodeDataModel;
 class FlowItemEntry;
 class FlowScene;
+class ConnectionStyle;
 
 class NodePainter
 {
@@ -54,14 +55,16 @@ class NodePainter
                        NodeGeometry const& geom,
                        NodeState const& state,
                        NodeDataModel const * model,
-                       FlowScene const & scene);
+                       FlowScene const & scene,
+                       ConnectionStyle const & connectionStyle);
 
   static
   void
   drawFilledConnectionPoints(QPainter* painter,
                              NodeGeometry const& geom,
                              NodeState const& state,
-                             NodeDataModel const * model);
+                             NodeDataModel const * model,
+                             ConnectionStyle const & connectionStyle);
 
   static
   void

From 8ad2d3a9684b407fef95abdc8636bc98f3df2023 Mon Sep 17 00:00:00 2001
From: Justin Bassett <jbassett271@gmail.com>
Date: Tue, 1 May 2018 13:31:05 -0700
Subject: [PATCH 03/11] Fix bug in FlowViewStyle setting

---
 include/nodes/internal/FlowView.hpp |  4 +--
 src/FlowView.cpp                    | 40 +++++++++++++++--------------
 2 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/include/nodes/internal/FlowView.hpp b/include/nodes/internal/FlowView.hpp
index edebef87..9cee49ac 100644
--- a/include/nodes/internal/FlowView.hpp
+++ b/include/nodes/internal/FlowView.hpp
@@ -32,8 +32,6 @@ class NODE_EDITOR_PUBLIC FlowView
 
   void setStyle(FlowViewStyle style);
 
-  static FlowViewStyle const& defaultStyle();
-
 public slots:
 
   void scaleUp();
@@ -73,6 +71,6 @@ public slots:
 
   FlowScene* _scene;
 
-  FlowViewStyle _style = defaultStyle();
+  FlowViewStyle _style;
 };
 }
diff --git a/src/FlowView.cpp b/src/FlowView.cpp
index 81bcbf99..221a3b9e 100644
--- a/src/FlowView.cpp
+++ b/src/FlowView.cpp
@@ -26,9 +26,25 @@
 using QtNodes::FlowView;
 using QtNodes::FlowViewStyle;
 using QtNodes::FlowScene;
+using QtNodes::StyleCollection;
+
+
+static
+FlowViewStyle const&
+defaultStyle()
+{
+  return StyleCollection::flowViewStyle();
+}
+
 
 FlowView::
 FlowView(QWidget *parent)
+  : FlowView(::defaultStyle(), parent)
+{}
+
+
+FlowView::
+FlowView(FlowViewStyle style, QWidget *parent)
   : QGraphicsView(parent)
   , _clearSelectionAction(Q_NULLPTR)
   , _deleteSelectionAction(Q_NULLPTR)
@@ -48,31 +64,24 @@ FlowView(QWidget *parent)
   setCacheMode(QGraphicsView::CacheBackground);
 
   //setViewport(new QGLWidget(QGLFormat(QGL::SampleBuffers)));
-}
 
-
-FlowView::
-FlowView(FlowViewStyle style, QWidget *parent)
-  : FlowView(parent)
-{
   setStyle(std::move(style));
 }
 
 
 FlowView::
-FlowView(FlowScene *scene, QWidget *parent)
+FlowView(FlowScene *scene, FlowViewStyle style, QWidget *parent)
   : FlowView(parent)
 {
   setScene(scene);
+  setStyle(std::move(style));
 }
 
 
 FlowView::
-FlowView(FlowScene *scene, FlowViewStyle style, QWidget *parent)
-  : FlowView(scene, parent)
-{
-  setStyle(std::move(style));
-}
+FlowView(FlowScene *scene, QWidget *parent)
+  : FlowView(scene, ::defaultStyle(), parent)
+{}
 
 
 QAction*
@@ -121,13 +130,6 @@ FlowView::setStyle(FlowViewStyle style)
 }
 
 
-FlowViewStyle const&
-FlowView::defaultStyle()
-{
-  return StyleCollection::flowViewStyle();
-}
-
-
 void
 FlowView::
 contextMenuEvent(QContextMenuEvent *event)

From da1f6c0446880824743e174f9e9fc548fcf66a26 Mon Sep 17 00:00:00 2001
From: Justin Bassett <jbassett271@gmail.com>
Date: Tue, 1 May 2018 13:35:54 -0700
Subject: [PATCH 04/11] Apply std::move where appropriate

---
 src/ConnectionStyle.cpp | 3 ++-
 src/FlowViewStyle.cpp   | 4 +++-
 src/NodeStyle.cpp       | 4 ++--
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/ConnectionStyle.cpp b/src/ConnectionStyle.cpp
index 24511644..ef1d3b6e 100644
--- a/src/ConnectionStyle.cpp
+++ b/src/ConnectionStyle.cpp
@@ -1,6 +1,7 @@
 #include "ConnectionStyle.hpp"
 
 #include <iostream>
+#include <utility>
 
 #include <QtCore/QFile>
 #include <QtCore/QJsonDocument>
@@ -42,7 +43,7 @@ setConnectionStyle(QString jsonText)
 {
   ConnectionStyle style(jsonText);
 
-  StyleCollection::setConnectionStyle(style);
+  StyleCollection::setConnectionStyle(std::move(style));
 }
 
 #ifdef STYLE_DEBUG
diff --git a/src/FlowViewStyle.cpp b/src/FlowViewStyle.cpp
index e08cf4fc..87bd5104 100644
--- a/src/FlowViewStyle.cpp
+++ b/src/FlowViewStyle.cpp
@@ -1,5 +1,7 @@
 #include "FlowViewStyle.hpp"
 
+#include <utility>
+
 #include <QtCore/QFile>
 #include <QtCore/QJsonDocument>
 #include <QtCore/QJsonObject>
@@ -39,7 +41,7 @@ setStyle(QString jsonText)
 {
   FlowViewStyle style(jsonText);
 
-  StyleCollection::setFlowViewStyle(style);
+  StyleCollection::setFlowViewStyle(std::move(style));
 }
 
 
diff --git a/src/NodeStyle.cpp b/src/NodeStyle.cpp
index c62e0ac9..a2a6e42f 100644
--- a/src/NodeStyle.cpp
+++ b/src/NodeStyle.cpp
@@ -1,6 +1,7 @@
 #include "NodeStyle.hpp"
 
 #include <iostream>
+#include <utility>
 
 #include <QtCore/QFile>
 #include <QtCore/QJsonDocument>
@@ -41,8 +42,7 @@ setNodeStyle(QString jsonText)
 {
   NodeStyle style(jsonText);
 
-
-  StyleCollection::setNodeStyle(style);
+  StyleCollection::setNodeStyle(std::move(style));
 }
 
 

From 77c472465b901e492933b272ba468d50019e73f9 Mon Sep 17 00:00:00 2001
From: Justin Bassett <jbassett271@gmail.com>
Date: Tue, 1 May 2018 16:30:19 -0700
Subject: [PATCH 05/11] Most of the way there

---
 CMakeLists.txt                             |   1 -
 examples/connection_colors/main.cpp        |  19 +-
 examples/styles/models.hpp                 |   2 +-
 include/nodes/internal/Connection.hpp      |   2 +-
 include/nodes/internal/ConnectionStyle.hpp |  59 ++--
 include/nodes/internal/FlowScene.hpp       |  11 +-
 include/nodes/internal/FlowView.hpp        |   8 +-
 include/nodes/internal/FlowViewStyle.hpp   |  43 ++-
 include/nodes/internal/NodeDataModel.hpp   |  14 +-
 include/nodes/internal/NodeStyle.hpp       |  99 ++++--
 include/nodes/internal/Style.hpp           |  22 --
 src/ConnectionPainter.cpp                  |   1 +
 src/ConnectionStyle.cpp                    | 247 +++++++-------
 src/FlowScene.cpp                          |  35 +-
 src/FlowView.cpp                           |  26 +-
 src/FlowViewStyle.cpp                      | 105 ++----
 src/NodeDataModel.cpp                      |  13 +-
 src/NodeGeometry.cpp                       |   8 +-
 src/NodeGraphicsObject.cpp                 |   6 +-
 src/NodePainter.cpp                        |  54 +--
 src/NodeStyle.cpp                          | 361 ++++++++++++++++-----
 src/StyleCollection.cpp                    |  64 ----
 src/StyleCollection.hpp                    |  61 ----
 src/StyleImport.cpp                        | 166 ++++++++++
 src/StyleImport.hpp                        |  63 ++++
 25 files changed, 876 insertions(+), 614 deletions(-)
 delete mode 100644 include/nodes/internal/Style.hpp
 delete mode 100644 src/StyleCollection.cpp
 delete mode 100644 src/StyleCollection.hpp
 create mode 100644 src/StyleImport.cpp
 create mode 100644 src/StyleImport.hpp

diff --git a/CMakeLists.txt b/CMakeLists.txt
index dd5aebcb..520426f3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -42,7 +42,6 @@ set(CPP_SOURCE_FILES
   src/NodeState.cpp
   src/NodeStyle.cpp
   src/Properties.cpp
-  src/StyleCollection.cpp
 )
 
 # If we want to give the option to build a static library,
diff --git a/examples/connection_colors/main.cpp b/examples/connection_colors/main.cpp
index a9aeb826..ea8e5370 100644
--- a/examples/connection_colors/main.cpp
+++ b/examples/connection_colors/main.cpp
@@ -33,21 +33,6 @@ registerDataModels()
 }
 
 
-static
-void
-setStyle()
-{
-  ConnectionStyle::setConnectionStyle(
-    R"(
-  {
-    "ConnectionStyle": {
-      "UseDataDefinedColors": true
-    }
-  }
-  )");
-}
-
-
 //------------------------------------------------------------------------------
 
 int
@@ -55,9 +40,11 @@ main(int argc, char* argv[])
 {
   QApplication app(argc, argv);
 
-  setStyle();
+  auto connectionStyle = ConnectionStyle::defaultStyle();
+  connectionStyle->useDataDefinedColors(true);
 
   FlowScene scene(registerDataModels());
+  scene->setConnectionStyle(std::move(connectionStyle));
 
   FlowView view(&scene);
 
diff --git a/examples/styles/models.hpp b/examples/styles/models.hpp
index a06ae728..4b119f16 100644
--- a/examples/styles/models.hpp
+++ b/examples/styles/models.hpp
@@ -55,7 +55,7 @@ class MyDataModel : public NodeDataModel
   std::unique_ptr<NodeDataModel>
   clone() const override
   {
-    return std::make_unique<MyDataModel>();
+    return std::make_unique<MyDataModel>(nodeStyle().shared_from_this());
   }
 
 public:
diff --git a/include/nodes/internal/Connection.hpp b/include/nodes/internal/Connection.hpp
index 4bc3897f..171f9888 100644
--- a/include/nodes/internal/Connection.hpp
+++ b/include/nodes/internal/Connection.hpp
@@ -9,7 +9,6 @@
 
 #include "Serializable.hpp"
 #include "ConnectionState.hpp"
-#include "ConnectionStyle.hpp"
 #include "ConnectionGeometry.hpp"
 #include "TypeConverter.hpp"
 #include "QUuidStdHash.hpp"
@@ -24,6 +23,7 @@ namespace QtNodes
 class Node;
 class NodeData;
 class ConnectionGraphicsObject;
+class ConnectionStyle;
 
 ///
 class NODE_EDITOR_PUBLIC Connection
diff --git a/include/nodes/internal/ConnectionStyle.hpp b/include/nodes/internal/ConnectionStyle.hpp
index e37feb03..a19e6d06 100644
--- a/include/nodes/internal/ConnectionStyle.hpp
+++ b/include/nodes/internal/ConnectionStyle.hpp
@@ -1,34 +1,28 @@
 #pragma once
 
+#include <memory>
+
 #include <QtGui/QColor>
 
+#include <QByteArray>
+#include <QObject>
+#include <QString>
+
 #include "Export.hpp"
-#include "Style.hpp"
 
 namespace QtNodes
 {
 
-class NODE_EDITOR_PUBLIC ConnectionStyle : public Style
+class NODE_EDITOR_PUBLIC ConnectionStyle : public std::enable_shared_from_this<ConnectionStyle>
 {
 public:
-
   ConnectionStyle();
 
-  ConnectionStyle(QString jsonText);
-
-public:
-
-  static void setConnectionStyle(QString jsonText);
-
-private:
+  static std::shared_ptr<ConnectionStyle>
+  defaultStyle();
 
-  void loadJsonText(QString jsonText) override;
-
-  void loadJsonFile(QString fileName) override;
-
-  void loadJsonFromByteArray(QByteArray const &byteArray) override;
-
-public:
+  static std::shared_ptr<ConnectionStyle>
+  fromJson(QString jsonText);
 
   QColor constructionColor() const;
   QColor normalColor() const;
@@ -43,18 +37,31 @@ class NODE_EDITOR_PUBLIC ConnectionStyle : public Style
 
   bool useDataDefinedColors() const;
 
+  void setConstructionColor(QColor);
+  void setNormalColor(QColor);
+  void setSelectedColor(QColor);
+  void setSelectedHaloColor(QColor);
+  void setHoveredColor(QColor);
+
+  void setLineWidth(float);
+  void setConstructionLineWidth(float);
+  void setPointDiameter(float);
+
+  void useDataDefinedColors(bool);
+
 private:
+  void loadJson(QByteArray const& jsonBytes);
 
-  QColor ConstructionColor;
-  QColor NormalColor;
-  QColor SelectedColor;
-  QColor SelectedHaloColor;
-  QColor HoveredColor;
+  QColor _constructionColor;
+  QColor _normalColor;
+  QColor _selectedColor;
+  QColor _selectedHaloColor;
+  QColor _hoveredColor;
 
-  float LineWidth;
-  float ConstructionLineWidth;
-  float PointDiameter;
+  float _lineWidth;
+  float _constructionLineWidth;
+  float _pointDiameter;
 
-  bool UseDataDefinedColors;
+  bool _useDataDefinedColors;
 };
 }
diff --git a/include/nodes/internal/FlowScene.hpp b/include/nodes/internal/FlowScene.hpp
index 2068aba8..e98de6a7 100644
--- a/include/nodes/internal/FlowScene.hpp
+++ b/include/nodes/internal/FlowScene.hpp
@@ -100,10 +100,10 @@ class NODE_EDITOR_PUBLIC FlowScene
   void loadFromMemory(const QByteArray& data);
 
   ConnectionStyle const& connectionStyle() const;
-  NodeStyle const& defaultNodeStyle() const;
+  NodeStyle const& nodeStyle() const;
 
-  void setConnectionStyle(ConnectionStyle style);
-  void setDefaultNodeStyle(NodeStyle style);
+  void setConnectionStyle(std::shared_ptr<ConnectionStyle const> style);
+  void setNodeStyle(std::shared_ptr<NodeStyle const> style);
 
 signals:
 
@@ -133,13 +133,12 @@ class NODE_EDITOR_PUBLIC FlowScene
   using SharedConnection = std::shared_ptr<Connection>;
   using UniqueNode       = std::unique_ptr<Node>;
 
-  struct Style;
-
   std::unordered_map<QUuid, SharedConnection> _connections;
   std::unordered_map<QUuid, UniqueNode>       _nodes;
   std::shared_ptr<DataModelRegistry>          _registry;
 
-  std::unique_ptr<Style> _style;
+  std::shared_ptr<ConnectionStyle const> _connectionStyle;
+  std::shared_ptr<NodeStyle const>       _nodeStyle;
 };
 
 Node*
diff --git a/include/nodes/internal/FlowView.hpp b/include/nodes/internal/FlowView.hpp
index 9cee49ac..6381e197 100644
--- a/include/nodes/internal/FlowView.hpp
+++ b/include/nodes/internal/FlowView.hpp
@@ -17,9 +17,9 @@ class NODE_EDITOR_PUBLIC FlowView
 public:
 
   FlowView(QWidget *parent = Q_NULLPTR);
-  FlowView(FlowViewStyle style, QWidget* parent = Q_NULLPTR);
+  FlowView(std::shared_ptr<FlowViewStyle const> style, QWidget *parent = Q_NULLPTR);
   FlowView(FlowScene *scene, QWidget *parent = Q_NULLPTR);
-  FlowView(FlowScene *scene, FlowViewStyle style, QWidget* parent = Q_NULLPTR);
+  FlowView(FlowScene *scene, std::shared_ptr<FlowViewStyle const> style, QWidget *parent = Q_NULLPTR);
 
   FlowView(const FlowView&) = delete;
   FlowView operator=(const FlowView&) = delete;
@@ -30,7 +30,7 @@ class NODE_EDITOR_PUBLIC FlowView
 
   void setScene(FlowScene *scene);
 
-  void setStyle(FlowViewStyle style);
+  void setStyle(std::shared_ptr<FlowViewStyle const> style);
 
 public slots:
 
@@ -71,6 +71,6 @@ public slots:
 
   FlowScene* _scene;
 
-  FlowViewStyle _style;
+  std::shared_ptr<FlowViewStyle const> _style;
 };
 }
diff --git a/include/nodes/internal/FlowViewStyle.hpp b/include/nodes/internal/FlowViewStyle.hpp
index aebdb4b4..de0cf91a 100644
--- a/include/nodes/internal/FlowViewStyle.hpp
+++ b/include/nodes/internal/FlowViewStyle.hpp
@@ -1,37 +1,52 @@
 #pragma once
 
+#include <memory>
+
 #include <QtGui/QColor>
 
+#include <QString>
+#include <QByteArray>
+
 #include "Export.hpp"
-#include "Style.hpp"
 
 namespace QtNodes
 {
 
-class NODE_EDITOR_PUBLIC FlowViewStyle : public Style
+class NODE_EDITOR_PUBLIC FlowViewStyle : public std::enable_shared_from_this<FlowViewStyle>
 {
 public:
-
   FlowViewStyle();
 
-  FlowViewStyle(QString jsonText);
+  static std::shared_ptr<FlowViewStyle>
+  defaultStyle();
 
-public:
+  static std::shared_ptr<FlowViewStyle>
+  fromJson(QString jsonText);
 
-  static void setStyle(QString jsonText);
+  QColor const &
+  backgroundColor() const;
 
-private:
+  QColor const &
+  fineGridColor() const;
 
-  void loadJsonText(QString jsonText) override;
+  QColor const &
+  coarseGridColor() const;
 
-  void loadJsonFile(QString fileName) override;
+  void
+  setBackgroundColor(QColor backgroundColor);
 
-  void loadJsonFromByteArray(QByteArray const &byteArray) override;
+  void
+  setFineGridColor(QColor fineGridColor);
 
-public:
+  void
+  setCoarseGridColor(QColor coarseGridColor);
+
+private:
+
+  void loadJson(QByteArray const& jsonBytes);
 
-  QColor BackgroundColor;
-  QColor FineGridColor;
-  QColor CoarseGridColor;
+  QColor _backgroundColor;
+  QColor _fineGridColor;
+  QColor _coarseGridColor;
 };
 }
diff --git a/include/nodes/internal/NodeDataModel.hpp b/include/nodes/internal/NodeDataModel.hpp
index 3693655b..55da819f 100644
--- a/include/nodes/internal/NodeDataModel.hpp
+++ b/include/nodes/internal/NodeDataModel.hpp
@@ -1,6 +1,5 @@
 #pragma once
 
-
 #include <QtWidgets/QWidget>
 
 #include "PortType.hpp"
@@ -32,7 +31,7 @@ class NODE_EDITOR_PUBLIC NodeDataModel
 
 public:
 
-  NodeDataModel();
+  NodeDataModel(std::shared_ptr<NodeStyle const> style);
 
   virtual
   ~NodeDataModel() = default;
@@ -93,13 +92,7 @@ class NODE_EDITOR_PUBLIC NodeDataModel
   nodeStyle() const;
 
   void
-  setNodeStyle(NodeStyle const& style);
-
-  bool
-  usingDefaultNodeStyle() const
-  {
-    return _usingDefaultNodeStyle;
-  }
+  setNodeStyle(std::shared_ptr<NodeStyle const> style);
 
 public:
 
@@ -147,7 +140,6 @@ class NODE_EDITOR_PUBLIC NodeDataModel
   computingFinished();
 
 private:
-  NodeStyle _nodeStyle;
-  bool      _usingDefaultNodeStyle = true;
+  std::shared_ptr<NodeStyle const> _nodeStyle;
 };
 }
diff --git a/include/nodes/internal/NodeStyle.hpp b/include/nodes/internal/NodeStyle.hpp
index 5f051888..e1cf483e 100644
--- a/include/nodes/internal/NodeStyle.hpp
+++ b/include/nodes/internal/NodeStyle.hpp
@@ -1,56 +1,99 @@
 #pragma once
 
+#include <memory>
+
 #include <QtGui/QColor>
 
+#include <QByteArray>
+#include <QString>
+
 #include "Export.hpp"
-#include "Style.hpp"
 
 namespace QtNodes
 {
 
-class NODE_EDITOR_PUBLIC NodeStyle : public Style
+class NODE_EDITOR_PUBLIC NodeStyle : public std::enable_shared_from_this<NodeStyle>
 {
 public:
-
   NodeStyle();
 
-  NodeStyle(QString jsonText);
+  static std::shared_ptr<NodeStyle>
+  defaultStyle();
 
-public:
+  static std::shared_ptr<NodeStyle>
+  fromJson(QString jsonText);
 
-  static void setNodeStyle(QString jsonText);
+  QColor normalBoundaryColor() const;
+  QColor selectedBoundaryColor() const;
+  QColor gradientColor0() const;
+  QColor gradientColor1() const;
+  QColor gradientColor2() const;
+  QColor gradientColor3() const;
+  QColor shadowColor() const;
 
-private:
+  QColor fontColor() const;
+  QColor fontColorFaded() const;
 
-  void loadJsonText(QString jsonText) override;
+  QColor connectionPointColor() const;
+  QColor filledConnectionPointColor() const;
 
-  void loadJsonFile(QString fileName) override;
+  QColor warningColor() const;
+  QColor errorColor() const;
 
-  void loadJsonFromByteArray(QByteArray const &byteArray) override;
+  float penWidth() const;
+  float hoveredPenWidth() const;
+  float connectionPointDiameter() const;
+  float opacity() const;
 
-public:
+  void setNormalBoundaryColor(QColor);
+  void setSelectedBoundaryColor(QColor);
+  void setGradientColor0(QColor);
+  void setGradientColor1(QColor);
+  void setGradientColor2(QColor);
+  void setGradientColor3(QColor);
+  void setShadowColor(QColor);
+
+  void setFontColor(QColor);
+  void setFontColorFaded(QColor);
+
+  void setConnectionPointColor(QColor);
+  void setFilledConnectionPointColor(QColor);
+
+  void setWarningColor(QColor);
+  void setErrorColor(QColor);
+
+  void setPenWidth(float);
+  void setHoveredPenWidth(float);
+  void setConnectionPointDiameter(float);
+  void setOpacity(float);
+
+private:
+
+  void loadJson(QByteArray const& jsonBytes);
+
+private:
 
-  QColor NormalBoundaryColor;
-  QColor SelectedBoundaryColor;
-  QColor GradientColor0;
-  QColor GradientColor1;
-  QColor GradientColor2;
-  QColor GradientColor3;
-  QColor ShadowColor;
-  QColor FontColor;
-  QColor FontColorFaded;
+  QColor _normalBoundaryColor;
+  QColor _selectedBoundaryColor;
+  QColor _gradientColor0;
+  QColor _gradientColor1;
+  QColor _gradientColor2;
+  QColor _gradientColor3;
+  QColor _shadowColor;
+  QColor _fontColor;
+  QColor _fontColorFaded;
 
-  QColor ConnectionPointColor;
-  QColor FilledConnectionPointColor;
+  QColor _connectionPointColor;
+  QColor _filledConnectionPointColor;
 
-  QColor WarningColor;
-  QColor ErrorColor;
+  QColor _warningColor;
+  QColor _errorColor;
 
-  float PenWidth;
-  float HoveredPenWidth;
+  float _penWidth;
+  float _hoveredPenWidth;
 
-  float ConnectionPointDiameter;
+  float _connectionPointDiameter;
 
-  float Opacity;
+  float _opacity;
 };
 }
diff --git a/include/nodes/internal/Style.hpp b/include/nodes/internal/Style.hpp
deleted file mode 100644
index a0d24cf6..00000000
--- a/include/nodes/internal/Style.hpp
+++ /dev/null
@@ -1,22 +0,0 @@
-#pragma once
-
-#include <QtCore/QString>
-
-class Style
-{
-public:
-
-  virtual
-  ~Style() = default;
-
-private:
-
-  virtual void
-  loadJsonText(QString jsonText) = 0;
-
-  virtual void
-  loadJsonFile(QString fileName) = 0;
-
-  virtual void
-  loadJsonFromByteArray(QByteArray const &byteArray) = 0;
-};
diff --git a/src/ConnectionPainter.cpp b/src/ConnectionPainter.cpp
index a10a59c7..4b682d36 100644
--- a/src/ConnectionPainter.cpp
+++ b/src/ConnectionPainter.cpp
@@ -4,6 +4,7 @@
 
 #include "ConnectionGeometry.hpp"
 #include "ConnectionState.hpp"
+#include "ConnectionStyle.hpp"
 #include "ConnectionGraphicsObject.hpp"
 #include "Connection.hpp"
 
diff --git a/src/ConnectionStyle.cpp b/src/ConnectionStyle.cpp
index ef1d3b6e..7df82778 100644
--- a/src/ConnectionStyle.cpp
+++ b/src/ConnectionStyle.cpp
@@ -4,231 +4,232 @@
 #include <utility>
 
 #include <QtCore/QFile>
+#include <QtCore/QJsonArray>
 #include <QtCore/QJsonDocument>
 #include <QtCore/QJsonObject>
 #include <QtCore/QJsonValueRef>
-#include <QtCore/QJsonArray>
 
 #include <QDebug>
 
-#include "StyleCollection.hpp"
+#include "StyleImport.hpp"
 
 using QtNodes::ConnectionStyle;
+using QtNodes::StyleImport;
 
-inline void initResources() { Q_INIT_RESOURCE(resources); }
 
+void
 ConnectionStyle::
-ConnectionStyle()
+loadJson(QByteArray const& jsonBytes)
 {
-  // Explicit resources inialization for preventing the static initialization
-  // order fiasco: https://isocpp.org/wiki/faq/ctors#static-init-order
-  initResources();
+  QJsonDocument json(QJsonDocument::fromJson(jsonBytes));
+  QJsonObject topLevelObject = json.object();
+
+  QJsonValueRef nodeStyleValues = topLevelObject["ConnectionStyle"];
+  QJsonObject obj = nodeStyleValues.toObject();
+
+  StyleImport::readColor(obj, "ConstructionColor", &_constructionColor);
+  StyleImport::readColor(obj, "NormalColor", &_normalColor);
+  StyleImport::readColor(obj, "SelectedColor", &_selectedColor);
+  StyleImport::readColor(obj, "SelectedHaloColor", &_selectedHaloColor);
+  StyleImport::readColor(obj, "HoveredColor", &_hoveredColor);
 
-  // This configuration is stored inside the compiled unit and is loaded statically
-  loadJsonFile(":DefaultStyle.json");
+  StyleImport::readFloat(obj, "LineWidth", &_lineWidth);
+  StyleImport::readFloat(obj, "ConstructionLineWidth", &_constructionLineWidth);
+  StyleImport::readFloat(obj, "PointDiameter", &_pointDiameter);
+
+  StyleImport::readBool(obj, "UseDataDefinedColors", &_useDataDefinedColors);
 }
 
 
+std::shared_ptr<ConnectionStyle>
 ConnectionStyle::
-ConnectionStyle(QString jsonText)
+defaultStyle()
 {
-  loadJsonFile(":DefaultStyle.json");
-  loadJsonText(jsonText);
+  StyleImport::initResources();
+
+  auto style = std::make_shared<ConnectionStyle>();
+
+  style->loadJson(StyleImport::readJsonFile(":DefaultStyle.json"));
+
+  return style;
 }
 
 
-void
+std::shared_ptr<ConnectionStyle>
 ConnectionStyle::
-setConnectionStyle(QString jsonText)
+fromJson(QString jsonText)
 {
-  ConnectionStyle style(jsonText);
+  auto style = defaultStyle();
 
-  StyleCollection::setConnectionStyle(std::move(style));
-}
+  style->loadJson(StyleImport::readJsonText(jsonText));
 
-#ifdef STYLE_DEBUG
-  #define CONNECTION_STYLE_CHECK_UNDEFINED_VALUE(v, variable) { \
-      if (v.type() == QJsonValue::Undefined || \
-          v.type() == QJsonValue::Null) \
-        qWarning() << "Undefined value for parameter:" << #variable; \
-  }
-#else
-  #define CONNECTION_STYLE_CHECK_UNDEFINED_VALUE(v, variable)
-#endif
+  return style;
+}
 
 
-#define CONNECTION_VALUE_EXISTS(v) \
-  (v.type() != QJsonValue::Undefined && \
-   v.type() != QJsonValue::Null)
+ConnectionStyle::
+ConnectionStyle()
+= default;
 
-#define CONNECTION_STYLE_READ_COLOR(values, variable)  { \
-    auto valueRef = values[#variable]; \
-    CONNECTION_STYLE_CHECK_UNDEFINED_VALUE(valueRef, variable) \
-    if (CONNECTION_VALUE_EXISTS(valueRef)) {\
-      if (valueRef.isArray()) { \
-        auto colorArray = valueRef.toArray(); \
-        std::vector<int> rgb; rgb.reserve(3); \
-        for (auto it = colorArray.begin(); it != colorArray.end(); ++it) { \
-          rgb.push_back((*it).toInt()); \
-        } \
-        variable = QColor(rgb[0], rgb[1], rgb[2]); \
-      } else { \
-        variable = QColor(valueRef.toString()); \
-      } \
-    } \
-}
 
-#define CONNECTION_STYLE_READ_FLOAT(values, variable)  { \
-    auto valueRef = values[#variable]; \
-    CONNECTION_STYLE_CHECK_UNDEFINED_VALUE(valueRef, variable) \
-    if (CONNECTION_VALUE_EXISTS(valueRef)) \
-      variable = valueRef.toDouble(); \
+QColor
+ConnectionStyle::
+constructionColor() const
+{
+  return _constructionColor;
 }
 
-#define CONNECTION_STYLE_READ_BOOL(values, variable)  { \
-    auto valueRef = values[#variable]; \
-    CONNECTION_STYLE_CHECK_UNDEFINED_VALUE(valueRef, variable) \
-    if (CONNECTION_VALUE_EXISTS(valueRef)) \
-      variable = valueRef.toBool(); \
-}
 
-void
+QColor
 ConnectionStyle::
-loadJsonFile(QString styleFile)
+normalColor() const
 {
-  QFile file(styleFile);
+  return _normalColor;
+}
 
-  if (!file.open(QIODevice::ReadOnly))
-  {
-    qWarning() << "Couldn't open file " << styleFile;
 
-    return;
-  }
+// QColor
+// ConnectionStyle::
+// normalColor(QString typeId) const
+// {
+//   std::size_t hash = qHash(typeId);
 
-  loadJsonFromByteArray(file.readAll());
-}
+//   std::size_t const hue_range = 0xFF;
 
+//   qsrand(hash);
+//   std::size_t hue = qrand() % hue_range;
 
-void
+//   std::size_t sat = 120 + hash % 129;
+
+//   return QColor::fromHsl(hue,
+//                          sat,
+//                          160);
+// }
+
+
+QColor
 ConnectionStyle::
-loadJsonText(QString jsonText)
+selectedColor() const
 {
-  loadJsonFromByteArray(jsonText.toUtf8());
+  return _selectedColor;
 }
 
 
-void
+QColor
 ConnectionStyle::
-loadJsonFromByteArray(QByteArray const &byteArray)
+selectedHaloColor() const
 {
-  QJsonDocument json(QJsonDocument::fromJson(byteArray));
-
-  QJsonObject topLevelObject = json.object();
-
-  QJsonValueRef nodeStyleValues = topLevelObject["ConnectionStyle"];
+  return _selectedHaloColor;
+}
 
-  QJsonObject obj = nodeStyleValues.toObject();
 
-  CONNECTION_STYLE_READ_COLOR(obj, ConstructionColor);
-  CONNECTION_STYLE_READ_COLOR(obj, NormalColor);
-  CONNECTION_STYLE_READ_COLOR(obj, SelectedColor);
-  CONNECTION_STYLE_READ_COLOR(obj, SelectedHaloColor);
-  CONNECTION_STYLE_READ_COLOR(obj, HoveredColor);
+QColor
+ConnectionStyle::
+hoveredColor() const
+{
+  return _hoveredColor;
+}
 
-  CONNECTION_STYLE_READ_FLOAT(obj, LineWidth);
-  CONNECTION_STYLE_READ_FLOAT(obj, ConstructionLineWidth);
-  CONNECTION_STYLE_READ_FLOAT(obj, PointDiameter);
 
-  CONNECTION_STYLE_READ_BOOL(obj, UseDataDefinedColors);
+float
+ConnectionStyle::
+lineWidth() const
+{
+  return _lineWidth;
 }
 
 
-QColor
+float
 ConnectionStyle::
-constructionColor() const
+constructionLineWidth() const
 {
-  return ConstructionColor;
+  return _constructionLineWidth;
 }
 
 
-QColor
+float
 ConnectionStyle::
-normalColor() const
+pointDiameter() const
 {
-  return NormalColor;
+  return _pointDiameter;
 }
 
 
-QColor
+bool
 ConnectionStyle::
-normalColor(QString typeId) const
+useDataDefinedColors() const
 {
-  std::size_t hash = qHash(typeId);
+  return _useDataDefinedColors;
+}
 
-  std::size_t const hue_range = 0xFF;
 
-  qsrand(hash);
-  std::size_t hue = qrand() % hue_range;
+void
+ConnectionStyle::
+setConstructionColor(QColor color)
+{
+  _constructionColor = std::move(color);
+}
 
-  std::size_t sat = 120 + hash % 129;
 
-  return QColor::fromHsl(hue,
-                         sat,
-                         160);
+void
+ConnectionStyle::
+setNormalColor(QColor color)
+{
+  _normalColor = std::move(color);
 }
 
 
-QColor
+void
 ConnectionStyle::
-selectedColor() const
+setSelectedColor(QColor color)
 {
-  return SelectedColor;
+  _selectedColor = std::move(color);
 }
 
 
-QColor
+void
 ConnectionStyle::
-selectedHaloColor() const
+setSelectedHaloColor(QColor color)
 {
-  return SelectedHaloColor;
+  _selectedHaloColor = std::move(color);
 }
 
 
-QColor
+void
 ConnectionStyle::
-hoveredColor() const
+setHoveredColor(QColor color)
 {
-  return HoveredColor;
+  _hoveredColor = std::move(color);
 }
 
 
-float
+void
 ConnectionStyle::
-lineWidth() const
+setLineWidth(float value)
 {
-  return LineWidth;
+  _lineWidth = value;
 }
 
 
-float
+void
 ConnectionStyle::
-constructionLineWidth() const
+setConstructionLineWidth(float value)
 {
-  return ConstructionLineWidth;
+  _constructionLineWidth = value;
 }
 
 
-float
+void
 ConnectionStyle::
-pointDiameter() const
+setPointDiameter(float value)
 {
-  return PointDiameter;
+  _pointDiameter = value;
 }
 
 
-bool
+void
 ConnectionStyle::
-useDataDefinedColors() const
+useDataDefinedColors(bool use)
 {
-  return UseDataDefinedColors;
+  _useDataDefinedColors = use;
 }
diff --git a/src/FlowScene.cpp b/src/FlowScene.cpp
index 4b7900ed..2289045a 100644
--- a/src/FlowScene.cpp
+++ b/src/FlowScene.cpp
@@ -29,7 +29,6 @@
 
 #include "NodeStyle.hpp"
 #include "ConnectionStyle.hpp"
-#include "StyleCollection.hpp"
 
 using QtNodes::FlowScene;
 using QtNodes::Node;
@@ -43,24 +42,14 @@ using QtNodes::PortType;
 using QtNodes::PortIndex;
 using QtNodes::TypeConverter;
 
-struct FlowScene::Style
-{
-  ConnectionStyle _connectionStyle;
-  NodeStyle       _defaultNodeStyle;
-
-  Style()
-    : _connectionStyle(StyleCollection::connectionStyle())
-    , _defaultNodeStyle(StyleCollection::nodeStyle())
-  {
-  }
-};
 
 FlowScene::
 FlowScene(std::shared_ptr<DataModelRegistry> registry,
           QObject * parent)
   : QGraphicsScene(parent)
   , _registry(registry)
-  , _style(std::make_unique<FlowScene::Style>())
+  , _connectionStyle(ConnectionStyle::defaultStyle())
+  , _nodeStyle(NodeStyle::defaultStyle())
 {
   setItemIndexMethod(QGraphicsScene::NoIndex);
 }
@@ -201,11 +190,7 @@ makeNode(FlowScene &                                       scene,
          std::unordered_map<QUuid, std::unique_ptr<Node>> &nodes,
          std::unique_ptr<NodeDataModel> &&                 dataModel)
 {
-  if (dataModel->usingDefaultNodeStyle()) {
-    dataModel->setNodeStyle(scene.defaultNodeStyle());
-  }
-
-  auto node = detail::make_unique<Node>(std::move(dataModel), scene.defaultNodeStyle());
+  auto node = detail::make_unique<Node>(std::move(dataModel), scene.nodeStyle());
   auto ngo  = detail::make_unique<NodeGraphicsObject>(scene, *node);
 
   node->setGraphicsObject(std::move(ngo));
@@ -586,31 +571,31 @@ ConnectionStyle const &
 FlowScene::
 connectionStyle() const
 {
-  return _style->_connectionStyle;
+  return *_connectionStyle;
 }
 
 
 NodeStyle const &
 FlowScene::
-defaultNodeStyle() const
+nodeStyle() const
 {
-  return _style->_defaultNodeStyle;
+  return *_nodeStyle;
 }
 
 
 void
 FlowScene::
-setConnectionStyle(ConnectionStyle style)
+setConnectionStyle(std::shared_ptr<ConnectionStyle const> style)
 {
-  _style->_connectionStyle = std::move(style);
+  _connectionStyle = std::move(style);
 }
 
 
 void
 FlowScene::
-setDefaultNodeStyle(NodeStyle style)
+setNodeStyle(std::shared_ptr<NodeStyle const> style)
 {
-  _style->_defaultNodeStyle = std::move(style);
+  _nodeStyle = std::move(style);
 }
 
 
diff --git a/src/FlowView.cpp b/src/FlowView.cpp
index 221a3b9e..bdc4d3cd 100644
--- a/src/FlowView.cpp
+++ b/src/FlowView.cpp
@@ -21,30 +21,20 @@
 #include "Node.hpp"
 #include "NodeGraphicsObject.hpp"
 #include "ConnectionGraphicsObject.hpp"
-#include "StyleCollection.hpp"
 
 using QtNodes::FlowView;
 using QtNodes::FlowViewStyle;
 using QtNodes::FlowScene;
-using QtNodes::StyleCollection;
-
-
-static
-FlowViewStyle const&
-defaultStyle()
-{
-  return StyleCollection::flowViewStyle();
-}
 
 
 FlowView::
 FlowView(QWidget *parent)
-  : FlowView(::defaultStyle(), parent)
+  : FlowView(FlowViewStyle::defaultStyle(), parent)
 {}
 
 
 FlowView::
-FlowView(FlowViewStyle style, QWidget *parent)
+FlowView(std::shared_ptr<FlowViewStyle const> style, QWidget *parent)
   : QGraphicsView(parent)
   , _clearSelectionAction(Q_NULLPTR)
   , _deleteSelectionAction(Q_NULLPTR)
@@ -70,7 +60,7 @@ FlowView(FlowViewStyle style, QWidget *parent)
 
 
 FlowView::
-FlowView(FlowScene *scene, FlowViewStyle style, QWidget *parent)
+FlowView(FlowScene *scene, std::shared_ptr<FlowViewStyle const> style, QWidget *parent)
   : FlowView(parent)
 {
   setScene(scene);
@@ -80,7 +70,7 @@ FlowView(FlowScene *scene, FlowViewStyle style, QWidget *parent)
 
 FlowView::
 FlowView(FlowScene *scene, QWidget *parent)
-  : FlowView(scene, ::defaultStyle(), parent)
+  : FlowView(scene, FlowViewStyle::defaultStyle(), parent)
 {}
 
 
@@ -122,11 +112,11 @@ FlowView::setScene(FlowScene *scene)
 
 
 void
-FlowView::setStyle(FlowViewStyle style)
+FlowView::setStyle(std::shared_ptr<FlowViewStyle const> style)
 {
   _style = std::move(style);
 
-  setBackgroundBrush(_style.BackgroundColor);
+  setBackgroundBrush(_style->backgroundColor());
 }
 
 
@@ -409,12 +399,12 @@ drawBackground(QPainter* painter, const QRectF& r)
 
   QBrush bBrush = backgroundBrush();
 
-  QPen pfine(_style.FineGridColor, 1.0);
+  QPen pfine(_style->fineGridColor(), 1.0);
 
   painter->setPen(pfine);
   drawGrid(15);
 
-  QPen p(_style.CoarseGridColor, 1.0);
+  QPen p(_style->coarseGridColor(), 1.0);
 
   painter->setPen(p);
   drawGrid(150);
diff --git a/src/FlowViewStyle.cpp b/src/FlowViewStyle.cpp
index 87bd5104..e3ccffab 100644
--- a/src/FlowViewStyle.cpp
+++ b/src/FlowViewStyle.cpp
@@ -3,111 +3,60 @@
 #include <utility>
 
 #include <QtCore/QFile>
+#include <QtCore/QJsonArray>
 #include <QtCore/QJsonDocument>
 #include <QtCore/QJsonObject>
 #include <QtCore/QJsonValueRef>
-#include <QtCore/QJsonArray>
 
 #include <QDebug>
 
-#include "StyleCollection.hpp"
+#include "StyleImport.hpp"
 
 using QtNodes::FlowViewStyle;
-
-inline void initResources() { Q_INIT_RESOURCE(resources); }
-
-FlowViewStyle::
-FlowViewStyle()
-{
-  // Explicit resources inialization for preventing the static initialization
-  // order fiasco: https://isocpp.org/wiki/faq/ctors#static-init-order
-  initResources();
-
-  // This configuration is stored inside the compiled unit and is loaded statically
-  loadJsonFile(":DefaultStyle.json");
-}
-
-
-FlowViewStyle::
-FlowViewStyle(QString jsonText)
-{
-  loadJsonText(jsonText);
-}
+using QtNodes::StyleImport;
+using QtNodes::StyleImportError;
 
 
 void
 FlowViewStyle::
-setStyle(QString jsonText)
+loadJson(QByteArray const &jsonBytes)
 {
-  FlowViewStyle style(jsonText);
+  QJsonDocument json(QJsonDocument::fromJson(jsonBytes));
+  QJsonObject   topLevelObject = json.object();
 
-  StyleCollection::setFlowViewStyle(std::move(style));
-}
+  QJsonValueRef flowViewStyleValues = topLevelObject["FlowViewStyle"];
+  QJsonObject   obj                 = flowViewStyleValues.toObject();
 
-
-#ifdef STYLE_DEBUG
-  #define FLOW_VIEW_STYLE_CHECK_UNDEFINED_VALUE(v, variable) { \
-      if (v.type() == QJsonValue::Undefined || \
-          v.type() == QJsonValue::Null) \
-        qWarning() << "Undefined value for parameter:" << #variable; \
-  }
-#else
-  #define FLOW_VIEW_STYLE_CHECK_UNDEFINED_VALUE(v, variable)
-#endif
-
-#define FLOW_VIEW_STYLE_READ_COLOR(values, variable)  { \
-    auto valueRef = values[#variable]; \
-    FLOW_VIEW_STYLE_CHECK_UNDEFINED_VALUE(valueRef, variable) \
-    if (valueRef.isArray()) { \
-      auto colorArray = valueRef.toArray(); \
-      std::vector<int> rgb; rgb.reserve(3); \
-      for (auto it = colorArray.begin(); it != colorArray.end(); ++it) { \
-        rgb.push_back((*it).toInt()); \
-      } \
-      variable = QColor(rgb[0], rgb[1], rgb[2]); \
-    } else { \
-      variable = QColor(valueRef.toString()); \
-    } \
+  _backgroundColor = StyleImport::readColor(obj, "BackgroundColor");
+  _fineGridColor   = StyleImport::readColor(obj, "FineGridColor");
+  _coarseGridColor = StyleImport::readColor(obj, "CoarseGridColor");
 }
 
-void
+
+std::shared_ptr<FlowViewStyle>
 FlowViewStyle::
-loadJsonFile(QString styleFile)
+defaultStyle()
 {
-  QFile file(styleFile);
-
-  if (!file.open(QIODevice::ReadOnly))
-  {
-    qWarning() << "Couldn't open file " << styleFile;
+  StyleImport::initResources();
 
-    return;
-  }
+  auto style = std::make_shared<FlowViewStyle>();
+  style->loadJson(StyleImport::readJsonFile(":DefaultStyle.json"));
 
-  loadJsonFromByteArray(file.readAll());
+  return style;
 }
 
 
-void
+std::shared_ptr<FlowViewStyle>
 FlowViewStyle::
-loadJsonText(QString jsonText)
+fromJson(QString jsonText)
 {
-  loadJsonFromByteArray(jsonText.toUtf8());
+  auto style = std::make_shared<FlowViewStyle>();
+  style->loadJson(StyleImport::readJsonText(jsonText));
+
+  return style;
 }
 
 
-void
 FlowViewStyle::
-loadJsonFromByteArray(QByteArray const &byteArray)
-{
-  QJsonDocument json(QJsonDocument::fromJson(byteArray));
-
-  QJsonObject topLevelObject = json.object();
-
-  QJsonValueRef nodeStyleValues = topLevelObject["FlowViewStyle"];
-
-  QJsonObject obj = nodeStyleValues.toObject();
-
-  FLOW_VIEW_STYLE_READ_COLOR(obj, BackgroundColor);
-  FLOW_VIEW_STYLE_READ_COLOR(obj, FineGridColor);
-  FLOW_VIEW_STYLE_READ_COLOR(obj, CoarseGridColor);
-}
+FlowViewStyle()
+= default;
diff --git a/src/NodeDataModel.cpp b/src/NodeDataModel.cpp
index baab374b..661bdec4 100644
--- a/src/NodeDataModel.cpp
+++ b/src/NodeDataModel.cpp
@@ -1,13 +1,13 @@
 #include "NodeDataModel.hpp"
 
-#include "StyleCollection.hpp"
+#include <utility>
 
 using QtNodes::NodeDataModel;
 using QtNodes::NodeStyle;
 
 NodeDataModel::
-NodeDataModel()
-  : _nodeStyle(StyleCollection::nodeStyle())
+NodeDataModel(std::shared_ptr<NodeStyle const> style)
+  : _nodeStyle(std::move(style))
 {
   // Derived classes can initialize specific style here
 }
@@ -29,14 +29,13 @@ NodeStyle const&
 NodeDataModel::
 nodeStyle() const
 {
-  return _nodeStyle;
+  return *_nodeStyle;
 }
 
 
 void
 NodeDataModel::
-setNodeStyle(NodeStyle const& style)
+setNodeStyle(std::shared_ptr<NodeStyle const> style)
 {
-  _nodeStyle = style;
-  _usingDefaultNodeStyle = false;
+  _nodeStyle = std::move(style);
 }
diff --git a/src/NodeGeometry.cpp b/src/NodeGeometry.cpp
index 7e7a689b..d8396d16 100644
--- a/src/NodeGeometry.cpp
+++ b/src/NodeGeometry.cpp
@@ -56,7 +56,7 @@ QRectF
 NodeGeometry::
 boundingRect() const
 {
-  double addon = 4 * _nodeStyle->ConnectionPointDiameter;
+  double addon = 4 * _nodeStyle->connectionPointDiameter();
 
   return QRectF(0 - addon,
                 0 - addon,
@@ -150,7 +150,7 @@ portScenePosition(PortIndex index,
   {
     case PortType::Out:
     {
-      double x = _width + _nodeStyle->ConnectionPointDiameter;
+      double x = _width + _nodeStyle->connectionPointDiameter();
 
       result = QPointF(x, totalHeight);
       break;
@@ -158,7 +158,7 @@ portScenePosition(PortIndex index,
 
     case PortType::In:
     {
-      double x = 0.0 - _nodeStyle->ConnectionPointDiameter;
+      double x = 0.0 - _nodeStyle->connectionPointDiameter();
 
       result = QPointF(x, totalHeight);
       break;
@@ -183,7 +183,7 @@ checkHitScenePoint(PortType portType,
   if (portType == PortType::None)
     return result;
 
-  double const tolerance = 2.0 * _nodeStyle->ConnectionPointDiameter;
+  double const tolerance = 2.0 * _nodeStyle->connectionPointDiameter();
 
   unsigned int const nItems = _dataModel->nPorts(portType);
 
diff --git a/src/NodeGraphicsObject.cpp b/src/NodeGraphicsObject.cpp
index 3f394e91..467d18fb 100644
--- a/src/NodeGraphicsObject.cpp
+++ b/src/NodeGraphicsObject.cpp
@@ -16,8 +16,6 @@
 #include "NodeDataModel.hpp"
 #include "NodeConnectionInteraction.hpp"
 
-#include "StyleCollection.hpp"
-
 using QtNodes::NodeGraphicsObject;
 using QtNodes::Node;
 using QtNodes::FlowScene;
@@ -46,12 +44,12 @@ NodeGraphicsObject(FlowScene &scene,
     auto effect = new QGraphicsDropShadowEffect;
     effect->setOffset(4, 4);
     effect->setBlurRadius(20);
-    effect->setColor(nodeStyle.ShadowColor);
+    effect->setColor(nodeStyle.shadowColor());
 
     setGraphicsEffect(effect);
   }
 
-  setOpacity(nodeStyle.Opacity);
+  setOpacity(nodeStyle.opacity());
 
   setAcceptHoverEvents(true);
 
diff --git a/src/NodePainter.cpp b/src/NodePainter.cpp
index e7ca8092..b921365f 100644
--- a/src/NodePainter.cpp
+++ b/src/NodePainter.cpp
@@ -4,13 +4,15 @@
 
 #include <QtCore/QMargins>
 
+#include "ConnectionStyle.hpp"
 #include "PortType.hpp"
 #include "NodeGraphicsObject.hpp"
 #include "NodeGeometry.hpp"
 #include "NodeState.hpp"
+#include "FlowScene.hpp"
 #include "NodeDataModel.hpp"
 #include "Node.hpp"
-#include "FlowScene.hpp"
+#include "NodeStyle.hpp"
 
 using QtNodes::NodePainter;
 using QtNodes::NodeGeometry;
@@ -69,31 +71,31 @@ drawNodeRect(QPainter* painter,
   NodeStyle const& nodeStyle = model->nodeStyle();
 
   auto color = graphicsObject.isSelected()
-               ? nodeStyle.SelectedBoundaryColor
-               : nodeStyle.NormalBoundaryColor;
+               ? nodeStyle.selectedBoundaryColor()
+               : nodeStyle.normalBoundaryColor();
 
   if (geom.hovered())
   {
-    QPen p(color, nodeStyle.HoveredPenWidth);
+    QPen p(color, nodeStyle.hoveredPenWidth());
     painter->setPen(p);
   }
   else
   {
-    QPen p(color, nodeStyle.PenWidth);
+    QPen p(color, nodeStyle.penWidth());
     painter->setPen(p);
   }
 
   QLinearGradient gradient(QPointF(0.0, 0.0),
                            QPointF(2.0, geom.height()));
 
-  gradient.setColorAt(0.0, nodeStyle.GradientColor0);
-  gradient.setColorAt(0.03, nodeStyle.GradientColor1);
-  gradient.setColorAt(0.97, nodeStyle.GradientColor2);
-  gradient.setColorAt(1.0, nodeStyle.GradientColor3);
+  gradient.setColorAt(0.0, nodeStyle.gradientColor0());
+  gradient.setColorAt(0.03, nodeStyle.gradientColor1());
+  gradient.setColorAt(0.97, nodeStyle.gradientColor2());
+  gradient.setColorAt(1.0, nodeStyle.gradientColor3());
 
   painter->setBrush(gradient);
 
-  float diam = nodeStyle.ConnectionPointDiameter;
+  float diam = nodeStyle.connectionPointDiameter();
 
   QRectF boundary( -diam, -diam, 2.0 * diam + geom.width(), 2.0 * diam + geom.height());
 
@@ -114,7 +116,7 @@ drawConnectionPoints(QPainter* painter,
 {
   NodeStyle const& nodeStyle      = model->nodeStyle();
 
-  float diameter = nodeStyle.ConnectionPointDiameter;
+  float diameter = nodeStyle.connectionPointDiameter();
   auto  reducedDiameter = diameter * 0.6;
 
   auto drawPoints =
@@ -175,7 +177,7 @@ drawConnectionPoints(QPainter* painter,
         }
         else
         {
-          painter->setBrush(nodeStyle.ConnectionPointColor);
+          painter->setBrush(nodeStyle.connectionPointColor());
         }
 
         painter->drawEllipse(p,
@@ -199,7 +201,7 @@ drawFilledConnectionPoints(QPainter * painter,
 {
   NodeStyle const& nodeStyle       = model->nodeStyle();
 
-  auto diameter = nodeStyle.ConnectionPointDiameter;
+  auto diameter = nodeStyle.connectionPointDiameter();
 
   auto drawPoints =
     [&](PortType portType)
@@ -222,8 +224,8 @@ drawFilledConnectionPoints(QPainter * painter,
           }
           else
           {
-            painter->setPen(nodeStyle.FilledConnectionPointColor);
-            painter->setBrush(nodeStyle.FilledConnectionPointColor);
+            painter->setPen(nodeStyle.filledConnectionPointColor());
+            painter->setBrush(nodeStyle.filledConnectionPointColor());
           }
 
           painter->drawEllipse(p,
@@ -266,7 +268,7 @@ drawModelName(QPainter * painter,
                    (geom.spacing() + geom.entryHeight()) / 3.0);
 
   painter->setFont(f);
-  painter->setPen(nodeStyle.FontColor);
+  painter->setPen(nodeStyle.fontColor());
   painter->drawText(position, name);
 
   f.setBold(false);
@@ -298,9 +300,9 @@ drawEntryLabels(QPainter * painter,
         QPointF p = geom.portScenePosition(i, portType);
 
         if (entries[i].empty())
-          painter->setPen(nodeStyle.FontColorFaded);
+          painter->setPen(nodeStyle.fontColorFaded());
         else
-          painter->setPen(nodeStyle.FontColor);
+          painter->setPen(nodeStyle.fontColor());
 
         QString s;
 
@@ -370,33 +372,33 @@ drawValidationRect(QPainter * painter,
     NodeStyle const& nodeStyle = model->nodeStyle();
 
     auto color = graphicsObject.isSelected()
-                 ? nodeStyle.SelectedBoundaryColor
-                 : nodeStyle.NormalBoundaryColor;
+                 ? nodeStyle.selectedBoundaryColor()
+                 : nodeStyle.normalBoundaryColor();
 
     if (geom.hovered())
     {
-      QPen p(color, nodeStyle.HoveredPenWidth);
+      QPen p(color, nodeStyle.hoveredPenWidth());
       painter->setPen(p);
     }
     else
     {
-      QPen p(color, nodeStyle.PenWidth);
+      QPen p(color, nodeStyle.penWidth());
       painter->setPen(p);
     }
 
     //Drawing the validation message background
     if (modelValidationState == NodeValidationState::Error)
     {
-      painter->setBrush(nodeStyle.ErrorColor);
+      painter->setBrush(nodeStyle.errorColor());
     }
     else
     {
-      painter->setBrush(nodeStyle.WarningColor);
+      painter->setBrush(nodeStyle.warningColor());
     }
 
     double const radius = 3.0;
 
-    float diam = nodeStyle.ConnectionPointDiameter;
+    float diam = nodeStyle.connectionPointDiameter();
 
     QRectF boundary(-diam,
                     -diam + geom.height() - geom.validationHeight(),
@@ -420,7 +422,7 @@ drawValidationRect(QPainter * painter,
                      geom.height() - (geom.validationHeight() - diam) / 2.0);
 
     painter->setFont(f);
-    painter->setPen(nodeStyle.FontColor);
+    painter->setPen(nodeStyle.fontColor());
     painter->drawText(position, errorMsg);
   }
 }
diff --git a/src/NodeStyle.cpp b/src/NodeStyle.cpp
index a2a6e42f..7fd8965f 100644
--- a/src/NodeStyle.cpp
+++ b/src/NodeStyle.cpp
@@ -4,133 +4,346 @@
 #include <utility>
 
 #include <QtCore/QFile>
+#include <QtCore/QJsonArray>
 #include <QtCore/QJsonDocument>
 #include <QtCore/QJsonObject>
 #include <QtCore/QJsonValueRef>
-#include <QtCore/QJsonArray>
 
 #include <QDebug>
 
-#include "StyleCollection.hpp"
+#include "StyleImport.hpp"
 
 using QtNodes::NodeStyle;
+using QtNodes::StyleImport;
+
+
+void
+NodeStyle::
+loadJson(QByteArray const &jsonBytes)
+{
+  QJsonDocument json(QJsonDocument::fromJson(jsonBytes));
+  QJsonObject   topLevelObject = json.object();
+
+  QJsonValueRef nodeStyleValues = topLevelObject["NodeStyle"];
+  QJsonObject   obj             = nodeStyleValues.toObject();
+
+  _normalBoundaryColor        = StyleImport::readColor(obj, "NormalBoundaryColor");
+  _selectedBoundaryColor      = StyleImport::readColor(obj, "SelectedBoundaryColor");
+  _gradientColor0             = StyleImport::readColor(obj, "GradientColor0");
+  _gradientColor1             = StyleImport::readColor(obj, "GradientColor1");
+  _gradientColor2             = StyleImport::readColor(obj, "GradientColor2");
+  _gradientColor3             = StyleImport::readColor(obj, "GradientColor3");
+  _shadowColor                = StyleImport::readColor(obj, "ShadowColor");
+  _fontColor                  = StyleImport::readColor(obj, "FontColor");
+  _fontColorFaded             = StyleImport::readColor(obj, "FontColorFaded");
+  _connectionPointColor       = StyleImport::readColor(obj, "ConnectionPointColor");
+  _filledConnectionPointColor = StyleImport::readColor(obj, "FilledConnectionPointColor");
+  _warningColor               = StyleImport::readColor(obj, "WarningColor");
+  _errorColor                 = StyleImport::readColor(obj, "ErrorColor");
+
+  _penWidth                = StyleImport::readFloat(obj, "PenWidth");
+  _hoveredPenWidth         = StyleImport::readFloat(obj, "HoveredPenWidth");
+  _connectionPointDiameter = StyleImport::readFloat(obj, "ConnectionPointDiameter");
+
+  _opacity = StyleImport::readFloat(obj, "Opacity");
+}
+
+
+std::shared_ptr<NodeStyle>
+NodeStyle::
+defaultStyle()
+{
+  StyleImport::initResources();
+
+  auto style = std::make_shared<NodeStyle>();
+  style->loadJson(StyleImport::readJsonFile(":DefaultStyle.json"));
+
+  return style;
+}
+
+
+std::shared_ptr<NodeStyle>
+NodeStyle::
+fromJson(QString jsonText)
+{
+  auto style = std::make_shared<NodeStyle>();
+  style->loadJson(StyleImport::readJsonText(jsonText));
+
+  return style;
+}
 
-inline void initResources() { Q_INIT_RESOURCE(resources); }
 
 NodeStyle::
 NodeStyle()
 {
-  // Explicit resources inialization for preventing the static initialization
-  // order fiasco: https://isocpp.org/wiki/faq/ctors#static-init-order
-  initResources();
+}
+
+
+QColor
+NodeStyle::
+normalBoundaryColor() const
+{
+  return _normalBoundaryColor;
+}
+
+
+QColor
+NodeStyle::
+selectedBoundaryColor() const
+{
+  return _selectedBoundaryColor;
+}
+
+
+QColor
+NodeStyle::
+gradientColor0() const
+{
+  return _gradientColor0;
+}
+
+
+QColor
+NodeStyle::
+gradientColor1() const
+{
+  return _gradientColor1;
+}
+
+
+QColor
+NodeStyle::
+gradientColor2() const
+{
+  return _gradientColor2;
+}
+
+
+QColor
+NodeStyle::
+gradientColor3() const
+{
+  return _gradientColor3;
+}
+
+
+QColor
+NodeStyle::
+shadowColor() const
+{
+  return _shadowColor;
+}
+
+
+QColor
+NodeStyle::
+fontColor() const
+{
+  return _fontColor;
+}
+
+
+QColor
+NodeStyle::
+fontColorFaded() const
+{
+  return _fontColorFaded;
+}
+
+
+QColor
+NodeStyle::
+connectionPointColor() const
+{
+  return _connectionPointColor;
+}
+
+
+QColor
+NodeStyle::
+filledConnectionPointColor() const
+{
+  return _filledConnectionPointColor;
+}
+
+
+QColor
+NodeStyle::
+warningColor() const
+{
+  return _warningColor;
+}
+
+
+QColor
+NodeStyle::
+errorColor() const
+{
+  return _errorColor;
+}
+
+
+float
+NodeStyle::
+penWidth() const
+{
+  return _penWidth;
+}
+
 
-  // This configuration is stored inside the compiled unit and is loaded statically
-  loadJsonFile(":DefaultStyle.json");
+float
+NodeStyle::
+hoveredPenWidth() const
+{
+  return _hoveredPenWidth;
 }
 
 
+float
 NodeStyle::
-NodeStyle(QString jsonText)
+connectionPointDiameter() const
 {
-  loadJsonText(jsonText);
+  return _connectionPointDiameter;
 }
 
 
+float
+NodeStyle::
+opacity() const
+{
+  return _opacity;
+}
+
 void
 NodeStyle::
-setNodeStyle(QString jsonText)
+setNormalBoundaryColor(QColor color)
 {
-  NodeStyle style(jsonText);
+  _normalBoundaryColor = std::move(color);
+}
 
-  StyleCollection::setNodeStyle(std::move(style));
+
+void
+NodeStyle::
+setSelectedBoundaryColor(QColor color)
+{
+  _selectedBoundaryColor = std::move(color);
 }
 
 
-#ifdef STYLE_DEBUG
-  #define NODE_STYLE_CHECK_UNDEFINED_VALUE(v, variable) { \
-      if (v.type() == QJsonValue::Undefined || \
-          v.type() == QJsonValue::Null) \
-        qWarning() << "Undefined value for parameter:" << #variable; \
-  }
-#else
-  #define NODE_STYLE_CHECK_UNDEFINED_VALUE(v, variable)
-#endif
+void
+NodeStyle::
+setGradientColor0(QColor color)
+{
+  _gradientColor0 = std::move(color);
+}
 
-#define NODE_STYLE_READ_COLOR(values, variable)  { \
-    auto valueRef = values[#variable]; \
-    NODE_STYLE_CHECK_UNDEFINED_VALUE(valueRef, variable) \
-    if (valueRef.isArray()) { \
-      auto colorArray = valueRef.toArray(); \
-      std::vector<int> rgb; rgb.reserve(3); \
-      for (auto it = colorArray.begin(); it != colorArray.end(); ++it) { \
-        rgb.push_back((*it).toInt()); \
-      } \
-      variable = QColor(rgb[0], rgb[1], rgb[2]); \
-    } else { \
-      variable = QColor(valueRef.toString()); \
-    } \
+
+void
+NodeStyle::
+setGradientColor1(QColor color)
+{
+  _gradientColor1 = std::move(color);
 }
 
-#define NODE_STYLE_READ_FLOAT(values, variable)  { \
-    auto valueRef = values[#variable]; \
-    NODE_STYLE_CHECK_UNDEFINED_VALUE(valueRef, variable) \
-    variable = valueRef.toDouble(); \
+
+void
+NodeStyle::
+setGradientColor2(QColor color)
+{
+  _gradientColor2 = std::move(color);
 }
 
+
 void
 NodeStyle::
-loadJsonFile(QString styleFile)
+setGradientColor3(QColor color)
 {
-  QFile file(styleFile);
+  _gradientColor3 = std::move(color);
+}
 
-  if (!file.open(QIODevice::ReadOnly))
-  {
-    qWarning() << "Couldn't open file " << styleFile;
 
-    return;
-  }
+void
+NodeStyle::
+setShadowColor(QColor color)
+{
+  _shadowColor = std::move(color);
+}
+
 
-  loadJsonFromByteArray(file.readAll());
+void
+NodeStyle::
+setFontColor(QColor color)
+{
+  _fontColor = std::move(color);
 }
 
 
 void
 NodeStyle::
-loadJsonText(QString jsonText)
+setFontColorFaded(QColor color)
 {
-  loadJsonFromByteArray(jsonText.toUtf8());
+  _fontColorFaded = std::move(color);
 }
 
 
 void
 NodeStyle::
-loadJsonFromByteArray(QByteArray const &byteArray)
+setConnectionPointColor(QColor color)
 {
-  QJsonDocument json(QJsonDocument::fromJson(byteArray));
+  _connectionPointColor = std::move(color);
+}
 
-  QJsonObject topLevelObject = json.object();
 
-  QJsonValueRef nodeStyleValues = topLevelObject["NodeStyle"];
+void
+NodeStyle::
+setFilledConnectionPointColor(QColor color)
+{
+  _filledConnectionPointColor = std::move(color);
+}
+
+
+void
+NodeStyle::
+setWarningColor(QColor color)
+{
+  _warningColor = std::move(color);
+}
+
+
+void
+NodeStyle::
+setErrorColor(QColor color)
+{
+  _errorColor = std::move(color);
+}
 
-  QJsonObject obj = nodeStyleValues.toObject();
-
-  NODE_STYLE_READ_COLOR(obj, NormalBoundaryColor);
-  NODE_STYLE_READ_COLOR(obj, SelectedBoundaryColor);
-  NODE_STYLE_READ_COLOR(obj, GradientColor0);
-  NODE_STYLE_READ_COLOR(obj, GradientColor1);
-  NODE_STYLE_READ_COLOR(obj, GradientColor2);
-  NODE_STYLE_READ_COLOR(obj, GradientColor3);
-  NODE_STYLE_READ_COLOR(obj, ShadowColor);
-  NODE_STYLE_READ_COLOR(obj, FontColor);
-  NODE_STYLE_READ_COLOR(obj, FontColorFaded);
-  NODE_STYLE_READ_COLOR(obj, ConnectionPointColor);
-  NODE_STYLE_READ_COLOR(obj, FilledConnectionPointColor);
-  NODE_STYLE_READ_COLOR(obj, WarningColor);
-  NODE_STYLE_READ_COLOR(obj, ErrorColor);
-
-  NODE_STYLE_READ_FLOAT(obj, PenWidth);
-  NODE_STYLE_READ_FLOAT(obj, HoveredPenWidth);
-  NODE_STYLE_READ_FLOAT(obj, ConnectionPointDiameter);
-
-  NODE_STYLE_READ_FLOAT(obj, Opacity);
+void
+NodeStyle::
+setPenWidth(float value)
+{
+  _penWidth = value;
+}
+
+
+void
+NodeStyle::
+setHoveredPenWidth(float value)
+{
+  _hoveredPenWidth = value;
+}
+
+
+void
+NodeStyle::
+setConnectionPointDiameter(float value)
+{
+  _connectionPointDiameter = value;
+}
+
+
+void
+NodeStyle::
+setOpacity(float value)
+{
+  _opacity = value;
 }
diff --git a/src/StyleCollection.cpp b/src/StyleCollection.cpp
deleted file mode 100644
index 3f1d3d62..00000000
--- a/src/StyleCollection.cpp
+++ /dev/null
@@ -1,64 +0,0 @@
-#include "StyleCollection.hpp"
-
-using QtNodes::StyleCollection;
-using QtNodes::NodeStyle;
-using QtNodes::ConnectionStyle;
-using QtNodes::FlowViewStyle;
-
-NodeStyle const&
-StyleCollection::
-nodeStyle()
-{
-  return instance()._nodeStyle;
-}
-
-
-ConnectionStyle const&
-StyleCollection::
-connectionStyle()
-{
-  return instance()._connectionStyle;
-}
-
-
-FlowViewStyle const&
-StyleCollection::
-flowViewStyle()
-{
-  return instance()._flowViewStyle;
-}
-
-
-void
-StyleCollection::
-setNodeStyle(NodeStyle nodeStyle)
-{
-  instance()._nodeStyle = nodeStyle;
-}
-
-
-void
-StyleCollection::
-setConnectionStyle(ConnectionStyle connectionStyle)
-{
-  instance()._connectionStyle = connectionStyle;
-}
-
-
-void
-StyleCollection::
-setFlowViewStyle(FlowViewStyle flowViewStyle)
-{
-  instance()._flowViewStyle = flowViewStyle;
-}
-
-
-
-StyleCollection&
-StyleCollection::
-instance()
-{
-  static StyleCollection collection;
-
-  return collection;
-}
diff --git a/src/StyleCollection.hpp b/src/StyleCollection.hpp
deleted file mode 100644
index 71eb2902..00000000
--- a/src/StyleCollection.hpp
+++ /dev/null
@@ -1,61 +0,0 @@
-#pragma once
-
-#include "NodeStyle.hpp"
-#include "ConnectionStyle.hpp"
-#include "FlowViewStyle.hpp"
-
-namespace QtNodes
-{
-
-class StyleCollection
-{
-public:
-
-  static
-  NodeStyle const&
-  nodeStyle();
-
-  static
-  ConnectionStyle const&
-  connectionStyle();
-
-  static
-  FlowViewStyle const&
-  flowViewStyle();
-
-public:
-
-  static
-  void
-  setNodeStyle(NodeStyle);
-
-  static
-  void
-  setConnectionStyle(ConnectionStyle);
-
-  static
-  void
-  setFlowViewStyle(FlowViewStyle);
-
-private:
-
-  StyleCollection() = default;
-
-  StyleCollection(StyleCollection const&) = delete;
-
-  StyleCollection&
-  operator=(StyleCollection const&) = delete;
-
-  static
-  StyleCollection&
-  instance();
-
-private:
-
-  NodeStyle _nodeStyle;
-
-  ConnectionStyle _connectionStyle;
-
-  FlowViewStyle _flowViewStyle;
-};
-}
diff --git a/src/StyleImport.cpp b/src/StyleImport.cpp
new file mode 100644
index 00000000..9d9a0832
--- /dev/null
+++ b/src/StyleImport.cpp
@@ -0,0 +1,166 @@
+#include "StyleImport.hpp"
+
+#include <QtCore/QFile>
+#include <QtCore/QJsonArray>
+#include <QtCore/QJsonValueRef>
+
+#include <QDebug>
+
+using QtNodes::StyleImport;
+
+void
+StyleImport::
+initResources()
+{
+  Q_INIT_RESOURCE(resources);
+}
+
+
+QByteArray
+StyleImport::
+readJsonFile(QString const &fileName)
+{
+  QFile file(styleFile);
+
+  if (!file.open(QIODevice::ReadOnly))
+  {
+    qWarning() << "Couldn't open file " << styleFile;
+
+    return;
+  }
+
+  return file.readAll();
+}
+
+
+QByteArray
+StyleImport::
+readJsonText(QString const &jsonText)
+{
+  return jsonText.toUtf8();
+}
+
+
+bool
+StyleImport::
+hasValue(QJsonValue const &value, QString const &name)
+{
+  return (value.type() != QJsonValue::Undefined
+          && value.type() != QJsonValue::Null);
+}
+
+
+void
+StyleImport::
+checkUndefinedValue(QJsonValue const &value, QString const &name)
+{
+  if (!hasValue(value, name)) {
+    qWarning() << "Undefined value for parameter: " << name;
+  }
+}
+
+
+bool
+StyleImport::
+readColor(QJsonObject const &obj, QString const &name, QColor *output)
+{
+  auto valueRef = obj[name];
+
+  if (StyleDebug) {
+    checkUndefinedValue(valueRef, name);
+  }
+
+  if (!hasValue(valueRef, name)) return false;
+
+  if (valueRef.isArray()) {
+    auto colors = valueRef.toArray();
+
+    *output = QColor(colors.at(0).toInt(),
+                     colors.at(1).toInt(),
+                     colors.at(2).toInt());
+  }
+  else
+  {
+    *output = QColor(valueRef.toString());
+  }
+
+  return true;
+}
+
+
+bool
+StyleImport::
+readFloat(QJsonObject const &obj, QString const &name, float *output)
+{
+  auto valueRef = obj[name];
+
+  if (StyleDebug) {
+    checkUndefinedValue(valueRef, name);
+  }
+
+  if (!hasValue(valueRef, name)) return false;
+
+  *output = valueRef.toDouble();
+
+  return true;
+}
+
+
+bool
+StyleImport::
+readBool(QJsonObject const &obj, QString const &name, bool *output)
+{
+  auto valueRef = obj[name];
+
+  if (StyleDebug) {
+    checkUndefinedValue(valueRef, name);
+  }
+
+  if (!hasValue(valueRef, name)) return false;
+
+  *output = valueRef.toBool();
+
+  return true;
+}
+
+
+QColor
+StyleImport::
+readColor(QJsonObject const &obj, QString const &name)
+{
+  QColor result;
+
+  if (!readColor(obj, name, &result)) {
+    throw StyleImportError("Missing " + name.toStdString());
+  }
+
+  return result;
+}
+
+
+float
+StyleImport::
+readFloat(QJsonObject const &obj, QString const &name)
+{
+  float result;
+
+  if (!readFloat(obj, name, &result)) {
+    throw StyleImportError("Missing " + name.toStdString());
+  }
+
+  return result;
+}
+
+
+bool
+StyleImport::
+readBool(QJsonObject const &obj, QString const &name)
+{
+  bool result;
+
+  if (!readBool(obj, name, &result)) {
+    throw StyleImportError("Missing " + name.toStdString());
+  }
+
+  return result;
+}
diff --git a/src/StyleImport.hpp b/src/StyleImport.hpp
new file mode 100644
index 00000000..6f8ad2f9
--- /dev/null
+++ b/src/StyleImport.hpp
@@ -0,0 +1,63 @@
+#pragma once
+
+#include <stdexcept>
+
+#include <QtGui/QColor>
+
+#include <QtCore/QByteArray>
+#include <QtCore/QJsonObject>
+#include <QtCore/QJsonValue>
+#include <QtCore/QString>
+
+namespace QtNodes
+{
+
+class StyleImportError : public std::logic_error
+{
+public:
+  using std::logic_error::logic_error;
+};
+
+class StyleImport
+{
+public:
+#ifdef STYLE_DEBUG
+  static constexpr bool StyleDebug = true;
+#else
+  static constexpr bool StyleDebug = false;
+#endif
+
+  static void
+  initResources();
+
+  static QByteArray
+  readJsonFile(QString const &fileName);
+
+  static QByteArray
+  readJsonText(QString const &jsonText);
+
+  static bool
+  hasValue(QJsonValue const &value, QString const &name);
+
+  static void
+  checkUndefinedValue(QJsonValue const &vlaue, QString const &name);
+
+  static bool
+  readColor(QJsonObject const &obj, QString const &name, QColor *output);
+
+  static bool
+  readFloat(QJsonObject const &obj, QString const &name, float *output);
+
+  static bool
+  readBool(QJsonObject const &obj, QString const &name, bool *output);
+
+  static QColor
+  readColor(QJsonObject const &obj, QString const &name);
+
+  static float
+  readFloat(QJsonObject const &obj, QString const &name);
+
+  static bool
+  readBool(QJsonObject const &obj, QString const &name);
+};
+}

From 397d98aab25a20c6a18eb436462a69dfff8dcf4c Mon Sep 17 00:00:00 2001
From: Justin Bassett <jbassett271@gmail.com>
Date: Wed, 2 May 2018 12:35:50 -0700
Subject: [PATCH 06/11] Finish removing styling singletons

---
 CMakeLists.txt                             |  1 +
 examples/calculator/main.cpp               | 40 +++++------
 examples/connection_colors/main.cpp        |  2 +-
 examples/styles/main.cpp                   | 18 +++--
 examples/styles/models.hpp                 |  2 +-
 include/nodes/internal/ConnectionStyle.hpp |  6 +-
 include/nodes/internal/FlowViewStyle.hpp   | 32 +++++++--
 include/nodes/internal/Node.hpp            |  9 ++-
 include/nodes/internal/NodeDataModel.hpp   | 11 +--
 include/nodes/internal/NodeStyle.hpp       |  2 +-
 src/ConnectionPainter.cpp                  |  9 +--
 src/ConnectionStyle.cpp                    | 39 +++++-----
 src/FlowScene.cpp                          |  8 +--
 src/Node.cpp                               | 20 +++++-
 src/NodeDataModel.cpp                      | 21 +-----
 src/NodeGraphicsObject.cpp                 |  2 +-
 src/NodePainter.cpp                        | 84 +++++++++++++---------
 src/NodePainter.hpp                        | 14 ++--
 src/StyleImport.cpp                        | 22 ++++--
 19 files changed, 191 insertions(+), 151 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 520426f3..4ac88877 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -42,6 +42,7 @@ set(CPP_SOURCE_FILES
   src/NodeState.cpp
   src/NodeStyle.cpp
   src/Properties.cpp
+  src/StyleImport.cpp
 )
 
 # If we want to give the option to build a static library,
diff --git a/examples/calculator/main.cpp b/examples/calculator/main.cpp
index 28708cd5..deec9d11 100644
--- a/examples/calculator/main.cpp
+++ b/examples/calculator/main.cpp
@@ -60,27 +60,24 @@ registerDataModels()
 
 
 static
-void
-setStyle()
+auto
+connectionStyle()
 {
-  ConnectionStyle::setConnectionStyle(
-  R"(
-  {
-    "ConnectionStyle": {
-      "ConstructionColor": "gray",
-      "NormalColor": "black",
-      "SelectedColor": "gray",
-      "SelectedHaloColor": "deepskyblue",
-      "HoveredColor": "deepskyblue",
-
-      "LineWidth": 3.0,
-      "ConstructionLineWidth": 2.0,
-      "PointDiameter": 10.0,
-
-      "UseDataDefinedColors": true
-    }
-  }
-  )");
+  auto style = ConnectionStyle::defaultStyle();
+  
+  style->setConstructionColor(QColor("gray"));
+  style->setNormalColor(QColor("black"));
+  style->setSelectedColor(QColor("gray"));
+  style->setSelectedHaloColor(QColor("deepskyblue"));
+  style->setHoveredColor(QColor("deepskyblue"));
+
+  style->setLineWidth(3.0);
+  style->setConstructionLineWidth(2.0);
+  style->setPointDiameter(10.0);
+
+  style->useDataDefinedColors(true);
+
+  return style;
 }
 
 
@@ -89,8 +86,6 @@ main(int argc, char *argv[])
 {
   QApplication app(argc, argv);
 
-  setStyle();
-
   QWidget mainWidget;
 
   auto menuBar    = new QMenuBar();
@@ -101,6 +96,7 @@ main(int argc, char *argv[])
 
   l->addWidget(menuBar);
   auto scene = new FlowScene(registerDataModels(), &mainWidget);
+  scene->setConnectionStyle(connectionStyle());
   l->addWidget(new FlowView(scene));
   l->setContentsMargins(0, 0, 0, 0);
   l->setSpacing(0);
diff --git a/examples/connection_colors/main.cpp b/examples/connection_colors/main.cpp
index ea8e5370..08e07b82 100644
--- a/examples/connection_colors/main.cpp
+++ b/examples/connection_colors/main.cpp
@@ -44,7 +44,7 @@ main(int argc, char* argv[])
   connectionStyle->useDataDefinedColors(true);
 
   FlowScene scene(registerDataModels());
-  scene->setConnectionStyle(std::move(connectionStyle));
+  scene.setConnectionStyle(std::move(connectionStyle));
 
   FlowView view(&scene);
 
diff --git a/examples/styles/main.cpp b/examples/styles/main.cpp
index 1b1e3c8d..6802a3bf 100644
--- a/examples/styles/main.cpp
+++ b/examples/styles/main.cpp
@@ -30,9 +30,9 @@ registerDataModels()
 
 static
 void
-setStyle()
+setStyle(FlowScene& scene, FlowView& view)
 {
-  FlowViewStyle::setStyle(
+  view.setStyle(FlowViewStyle::fromJson(
   R"(
   {
     "FlowViewStyle": {
@@ -41,9 +41,9 @@ setStyle()
       "CoarseGridColor": [235, 235, 220]
     }
   }
-  )");
+  )"));
 
-  NodeStyle::setNodeStyle(
+  scene.setNodeStyle(NodeStyle::fromJson(
   R"(
   {
     "NodeStyle": {
@@ -63,9 +63,9 @@ setStyle()
       "Opacity": 1.0
     }
   }
-  )");
+  )"));
 
-  ConnectionStyle::setConnectionStyle(
+  scene.setConnectionStyle(ConnectionStyle::fromJson(
   R"(
   {
     "ConnectionStyle": {
@@ -82,7 +82,7 @@ setStyle()
       "UseDataDefinedColors": false
     }
   }
-  )");
+  )"));
 }
 
 
@@ -93,11 +93,9 @@ main(int argc, char* argv[])
 {
   QApplication app(argc, argv);
 
-  setStyle();
-
   FlowScene scene(registerDataModels());
-
   FlowView view(&scene);
+  setStyle(scene, view);
 
   view.setWindowTitle("Style example");
   view.resize(800, 600);
diff --git a/examples/styles/models.hpp b/examples/styles/models.hpp
index 4b119f16..a06ae728 100644
--- a/examples/styles/models.hpp
+++ b/examples/styles/models.hpp
@@ -55,7 +55,7 @@ class MyDataModel : public NodeDataModel
   std::unique_ptr<NodeDataModel>
   clone() const override
   {
-    return std::make_unique<MyDataModel>(nodeStyle().shared_from_this());
+    return std::make_unique<MyDataModel>();
   }
 
 public:
diff --git a/include/nodes/internal/ConnectionStyle.hpp b/include/nodes/internal/ConnectionStyle.hpp
index a19e6d06..f3b48c6a 100644
--- a/include/nodes/internal/ConnectionStyle.hpp
+++ b/include/nodes/internal/ConnectionStyle.hpp
@@ -13,7 +13,7 @@
 namespace QtNodes
 {
 
-class NODE_EDITOR_PUBLIC ConnectionStyle : public std::enable_shared_from_this<ConnectionStyle>
+class NODE_EDITOR_PUBLIC ConnectionStyle
 {
 public:
   ConnectionStyle();
@@ -26,7 +26,6 @@ class NODE_EDITOR_PUBLIC ConnectionStyle : public std::enable_shared_from_this<C
 
   QColor constructionColor() const;
   QColor normalColor() const;
-  QColor normalColor(QString typeId) const;
   QColor selectedColor() const;
   QColor selectedHaloColor() const;
   QColor hoveredColor() const;
@@ -49,6 +48,9 @@ class NODE_EDITOR_PUBLIC ConnectionStyle : public std::enable_shared_from_this<C
 
   void useDataDefinedColors(bool);
 
+  static QColor
+  computeNormalColor(QString typeId);
+
 private:
   void loadJson(QByteArray const& jsonBytes);
 
diff --git a/include/nodes/internal/FlowViewStyle.hpp b/include/nodes/internal/FlowViewStyle.hpp
index de0cf91a..a584855b 100644
--- a/include/nodes/internal/FlowViewStyle.hpp
+++ b/include/nodes/internal/FlowViewStyle.hpp
@@ -12,7 +12,7 @@
 namespace QtNodes
 {
 
-class NODE_EDITOR_PUBLIC FlowViewStyle : public std::enable_shared_from_this<FlowViewStyle>
+class NODE_EDITOR_PUBLIC FlowViewStyle
 {
 public:
   FlowViewStyle();
@@ -24,22 +24,40 @@ class NODE_EDITOR_PUBLIC FlowViewStyle : public std::enable_shared_from_this<Flo
   fromJson(QString jsonText);
 
   QColor const &
-  backgroundColor() const;
+  backgroundColor() const
+  {
+    return _backgroundColor;
+  }
 
   QColor const &
-  fineGridColor() const;
+  fineGridColor() const
+  {
+    return _fineGridColor;
+  }
 
   QColor const &
-  coarseGridColor() const;
+  coarseGridColor() const
+  {
+    return _coarseGridColor;
+  }
 
   void
-  setBackgroundColor(QColor backgroundColor);
+  setBackgroundColor(QColor backgroundColor)
+  {
+    _backgroundColor = backgroundColor;
+  }
 
   void
-  setFineGridColor(QColor fineGridColor);
+  setFineGridColor(QColor fineGridColor)
+  {
+    _fineGridColor = fineGridColor;
+  }
 
   void
-  setCoarseGridColor(QColor coarseGridColor);
+  setCoarseGridColor(QColor coarseGridColor)
+  {
+    _coarseGridColor = coarseGridColor;
+  }
 
 private:
 
diff --git a/include/nodes/internal/Node.hpp b/include/nodes/internal/Node.hpp
index cb738e9b..606eaafc 100644
--- a/include/nodes/internal/Node.hpp
+++ b/include/nodes/internal/Node.hpp
@@ -10,6 +10,7 @@
 
 #include "Export.hpp"
 #include "NodeState.hpp"
+#include "NodeStyle.hpp"
 #include "NodeGeometry.hpp"
 #include "NodeData.hpp"
 #include "NodeGraphicsObject.hpp"
@@ -24,7 +25,6 @@ class Connection;
 class ConnectionState;
 class NodeGraphicsObject;
 class NodeDataModel;
-class NodeStyle;
 
 class NODE_EDITOR_PUBLIC Node
   : public QObject
@@ -35,7 +35,7 @@ class NODE_EDITOR_PUBLIC Node
 public:
 
   /// NodeDataModel should be an rvalue and is moved into the Node
-  Node(std::unique_ptr<NodeDataModel> && dataModel, NodeStyle const& style);
+  Node(std::unique_ptr<NodeDataModel> && dataModel, NodeStyle const& defaultStyle);
 
   virtual
   ~Node();
@@ -83,6 +83,9 @@ class NODE_EDITOR_PUBLIC Node
   NodeState &
   nodeState();
 
+  NodeStyle const &
+  nodeStyle() const;
+
   NodeDataModel*
   nodeDataModel() const;
 
@@ -112,6 +115,8 @@ public slots: // data propagation
 
   // painting
 
+  NodeStyle const *_nodeStyle;
+
   NodeGeometry _nodeGeometry;
 
   std::unique_ptr<NodeGraphicsObject> _nodeGraphicsObject;
diff --git a/include/nodes/internal/NodeDataModel.hpp b/include/nodes/internal/NodeDataModel.hpp
index 55da819f..048dbdf2 100644
--- a/include/nodes/internal/NodeDataModel.hpp
+++ b/include/nodes/internal/NodeDataModel.hpp
@@ -31,7 +31,7 @@ class NODE_EDITOR_PUBLIC NodeDataModel
 
 public:
 
-  NodeDataModel(std::shared_ptr<NodeStyle const> style);
+  NodeDataModel();
 
   virtual
   ~NodeDataModel() = default;
@@ -88,11 +88,7 @@ class NODE_EDITOR_PUBLIC NodeDataModel
     return ConnectionPolicy::Many;
   }
 
-  NodeStyle const&
-  nodeStyle() const;
-
-  void
-  setNodeStyle(std::shared_ptr<NodeStyle const> style);
+  virtual NodeStyle const* nodeStyle() const { return nullptr; }
 
 public:
 
@@ -138,8 +134,5 @@ class NODE_EDITOR_PUBLIC NodeDataModel
 
   void
   computingFinished();
-
-private:
-  std::shared_ptr<NodeStyle const> _nodeStyle;
 };
 }
diff --git a/include/nodes/internal/NodeStyle.hpp b/include/nodes/internal/NodeStyle.hpp
index e1cf483e..86cdcee3 100644
--- a/include/nodes/internal/NodeStyle.hpp
+++ b/include/nodes/internal/NodeStyle.hpp
@@ -12,7 +12,7 @@
 namespace QtNodes
 {
 
-class NODE_EDITOR_PUBLIC NodeStyle : public std::enable_shared_from_this<NodeStyle>
+class NODE_EDITOR_PUBLIC NodeStyle
 {
 public:
   NodeStyle();
diff --git a/src/ConnectionPainter.cpp b/src/ConnectionPainter.cpp
index 4b682d36..588409fa 100644
--- a/src/ConnectionPainter.cpp
+++ b/src/ConnectionPainter.cpp
@@ -11,9 +11,10 @@
 #include "NodeData.hpp"
 
 
-using QtNodes::ConnectionPainter;
-using QtNodes::ConnectionGeometry;
 using QtNodes::Connection;
+using QtNodes::ConnectionGeometry;
+using QtNodes::ConnectionPainter;
+using QtNodes::ConnectionStyle;
 
 
 static
@@ -200,8 +201,8 @@ drawNormalLine(QPainter * painter,
 
     gradientColor = (dataTypeOut.id != dataTypeIn.id);
 
-    normalColorOut  = connectionStyle.normalColor(dataTypeOut.id);
-    normalColorIn   = connectionStyle.normalColor(dataTypeIn.id);
+    normalColorOut  = ConnectionStyle::computeNormalColor(dataTypeOut.id);
+    normalColorIn   = ConnectionStyle::computeNormalColor(dataTypeIn.id);
     selectedColor = normalColorOut.darker(200);
   }
 
diff --git a/src/ConnectionStyle.cpp b/src/ConnectionStyle.cpp
index 7df82778..077a1808 100644
--- a/src/ConnectionStyle.cpp
+++ b/src/ConnectionStyle.cpp
@@ -67,6 +67,26 @@ fromJson(QString jsonText)
 }
 
 
+// static
+QColor
+ConnectionStyle::
+computeNormalColor(QString typeId)
+{
+  std::size_t hash = qHash(typeId);
+
+  std::size_t const hue_range = 0xFF;
+
+  qsrand(hash);
+  std::size_t hue = qrand() % hue_range;
+
+  std::size_t sat = 120 + hash % 129;
+
+  return QColor::fromHsl(hue,
+                         sat,
+                         160);
+}
+
+
 ConnectionStyle::
 ConnectionStyle()
 = default;
@@ -88,25 +108,6 @@ normalColor() const
 }
 
 
-// QColor
-// ConnectionStyle::
-// normalColor(QString typeId) const
-// {
-//   std::size_t hash = qHash(typeId);
-
-//   std::size_t const hue_range = 0xFF;
-
-//   qsrand(hash);
-//   std::size_t hue = qrand() % hue_range;
-
-//   std::size_t sat = 120 + hash % 129;
-
-//   return QColor::fromHsl(hue,
-//                          sat,
-//                          160);
-// }
-
-
 QColor
 ConnectionStyle::
 selectedColor() const
diff --git a/src/FlowScene.cpp b/src/FlowScene.cpp
index 2289045a..46646983 100644
--- a/src/FlowScene.cpp
+++ b/src/FlowScene.cpp
@@ -81,7 +81,7 @@ createConnection(PortType connectedPort,
                                                  portIndex,
                                                  connectionStyle());
 
-  auto cgo = detail::make_unique<ConnectionGraphicsObject>(*this, *connection);
+  auto cgo = QtNodes::detail::make_unique<ConnectionGraphicsObject>(*this, *connection);
 
   // after this function connection points are set to node port
   connection->setGraphicsObject(std::move(cgo));
@@ -109,7 +109,7 @@ createConnection(Node& nodeIn,
                                  connectionStyle(),
                                  converter);
 
-  auto cgo = detail::make_unique<ConnectionGraphicsObject>(*this, *connection);
+  auto cgo = QtNodes::detail::make_unique<ConnectionGraphicsObject>(*this, *connection);
 
   nodeIn.nodeState().setConnection(PortType::In, portIndexIn, *connection);
   nodeOut.nodeState().setConnection(PortType::Out, portIndexOut, *connection);
@@ -190,8 +190,8 @@ makeNode(FlowScene &                                       scene,
          std::unordered_map<QUuid, std::unique_ptr<Node>> &nodes,
          std::unique_ptr<NodeDataModel> &&                 dataModel)
 {
-  auto node = detail::make_unique<Node>(std::move(dataModel), scene.nodeStyle());
-  auto ngo  = detail::make_unique<NodeGraphicsObject>(scene, *node);
+  auto node = QtNodes::detail::make_unique<Node>(std::move(dataModel), scene.nodeStyle());
+  auto ngo  = QtNodes::detail::make_unique<NodeGraphicsObject>(scene, *node);
 
   node->setGraphicsObject(std::move(ngo));
 
diff --git a/src/Node.cpp b/src/Node.cpp
index bf4e6f4b..fdbb9f4a 100644
--- a/src/Node.cpp
+++ b/src/Node.cpp
@@ -16,6 +16,7 @@
 using QtNodes::Node;
 using QtNodes::NodeGeometry;
 using QtNodes::NodeState;
+using QtNodes::NodeStyle;
 using QtNodes::NodeData;
 using QtNodes::NodeDataType;
 using QtNodes::NodeDataModel;
@@ -23,12 +24,21 @@ using QtNodes::NodeGraphicsObject;
 using QtNodes::PortIndex;
 using QtNodes::PortType;
 
+
+static NodeStyle const *
+computeStyle(NodeStyle const *preferredStyle, NodeStyle const &backupStyle)
+{
+  return preferredStyle ? preferredStyle : &backupStyle;
+}
+
+
 Node::
 Node(std::unique_ptr<NodeDataModel> && dataModel, NodeStyle const& style)
   : _uid(QUuid::createUuid())
   , _nodeDataModel(std::move(dataModel))
   , _nodeState(_nodeDataModel)
-  , _nodeGeometry(_nodeDataModel, style)
+  , _nodeStyle(computeStyle(_nodeDataModel->nodeStyle(), style))
+  , _nodeGeometry(_nodeDataModel, *_nodeStyle)
   , _nodeGraphicsObject(nullptr)
 {
   _nodeGeometry.recalculateSize();
@@ -171,6 +181,14 @@ nodeState()
 }
 
 
+NodeStyle const &
+Node::
+nodeStyle() const
+{
+  return *_nodeStyle;
+}
+
+
 NodeDataModel*
 Node::
 nodeDataModel() const
diff --git a/src/NodeDataModel.cpp b/src/NodeDataModel.cpp
index 661bdec4..ee0b4550 100644
--- a/src/NodeDataModel.cpp
+++ b/src/NodeDataModel.cpp
@@ -3,13 +3,10 @@
 #include <utility>
 
 using QtNodes::NodeDataModel;
-using QtNodes::NodeStyle;
 
 NodeDataModel::
-NodeDataModel(std::shared_ptr<NodeStyle const> style)
-  : _nodeStyle(std::move(style))
+NodeDataModel()
 {
-  // Derived classes can initialize specific style here
 }
 
 
@@ -23,19 +20,3 @@ save() const
 
   return modelJson;
 }
-
-
-NodeStyle const&
-NodeDataModel::
-nodeStyle() const
-{
-  return *_nodeStyle;
-}
-
-
-void
-NodeDataModel::
-setNodeStyle(std::shared_ptr<NodeStyle const> style)
-{
-  _nodeStyle = std::move(style);
-}
diff --git a/src/NodeGraphicsObject.cpp b/src/NodeGraphicsObject.cpp
index 467d18fb..974f2eee 100644
--- a/src/NodeGraphicsObject.cpp
+++ b/src/NodeGraphicsObject.cpp
@@ -38,7 +38,7 @@ NodeGraphicsObject(FlowScene &scene,
 
   setCacheMode( QGraphicsItem::DeviceCoordinateCache );
 
-  auto const &nodeStyle = node.nodeDataModel()->nodeStyle();
+  auto const &nodeStyle = node.nodeStyle();
 
   {
     auto effect = new QGraphicsDropShadowEffect;
diff --git a/src/NodePainter.cpp b/src/NodePainter.cpp
index b921365f..6b03b803 100644
--- a/src/NodePainter.cpp
+++ b/src/NodePainter.cpp
@@ -14,11 +14,13 @@
 #include "Node.hpp"
 #include "NodeStyle.hpp"
 
+using QtNodes::ConnectionStyle;
 using QtNodes::NodePainter;
 using QtNodes::NodeGeometry;
 using QtNodes::NodeGraphicsObject;
 using QtNodes::Node;
 using QtNodes::NodeState;
+using QtNodes::NodeStyle;
 using QtNodes::NodeDataModel;
 using QtNodes::FlowScene;
 
@@ -39,19 +41,19 @@ paint(QPainter* painter,
   //--------------------------------------------
   NodeDataModel const * model = node.nodeDataModel();
 
-  drawNodeRect(painter, geom, model, graphicsObject);
+  drawNodeRect(painter, geom, node, graphicsObject);
 
-  drawConnectionPoints(painter, geom, state, model, scene, scene.connectionStyle());
+  drawConnectionPoints(painter, geom, state, node, scene, scene.connectionStyle());
 
-  drawFilledConnectionPoints(painter, geom, state, model, scene.connectionStyle());
+  drawFilledConnectionPoints(painter, geom, state, node, scene.connectionStyle());
 
-  drawModelName(painter, geom, state, model);
+  drawModelName(painter, geom, state, node);
 
-  drawEntryLabels(painter, geom, state, model);
+  drawEntryLabels(painter, geom, state, node);
 
-  drawResizeRect(painter, geom, model);
+  drawResizeRect(painter, geom, node);
 
-  drawValidationRect(painter, geom, model, graphicsObject);
+  drawValidationRect(painter, geom, node, graphicsObject);
 
   /// call custom painter
   if (auto painterDelegate = model->painterDelegate())
@@ -65,10 +67,10 @@ void
 NodePainter::
 drawNodeRect(QPainter* painter,
              NodeGeometry const& geom,
-             NodeDataModel const* model,
+             Node const& node,
              NodeGraphicsObject const & graphicsObject)
 {
-  NodeStyle const& nodeStyle = model->nodeStyle();
+  NodeStyle const& nodeStyle = node.nodeStyle();
 
   auto color = graphicsObject.isSelected()
                ? nodeStyle.selectedBoundaryColor()
@@ -108,13 +110,15 @@ drawNodeRect(QPainter* painter,
 void
 NodePainter::
 drawConnectionPoints(QPainter* painter,
-                     NodeGeometry const& geom,
-                     NodeState const& state,
-                     NodeDataModel const * model,
+                     NodeGeometry const & geom,
+                     NodeState const & state,
+                     Node const & node,
                      FlowScene const & scene,
                      ConnectionStyle const &connectionStyle)
 {
-  NodeStyle const& nodeStyle      = model->nodeStyle();
+  NodeDataModel const &model = *node.nodeDataModel();
+
+  NodeStyle const &nodeStyle = node.nodeStyle();
 
   float diameter = nodeStyle.connectionPointDiameter();
   auto  reducedDiameter = diameter * 0.6;
@@ -128,11 +132,11 @@ drawConnectionPoints(QPainter* painter,
       {
         QPointF p = geom.portScenePosition(i, portType);
 
-        auto const & dataType = model->dataType(portType, i);
+        auto const & dataType = model.dataType(portType, i);
 
         bool canConnect = (state.getEntries(portType)[i].empty() ||
                            (portType == PortType::Out &&
-                            model->portOutConnectionPolicy(i) == NodeDataModel::ConnectionPolicy::Many) );
+                            model.portOutConnectionPolicy(i) == NodeDataModel::ConnectionPolicy::Many) );
 
         double r = 1.0;
         if (state.isReacting() &&
@@ -173,7 +177,7 @@ drawConnectionPoints(QPainter* painter,
 
         if (connectionStyle.useDataDefinedColors())
         {
-          painter->setBrush(connectionStyle.normalColor(dataType.id));
+          painter->setBrush(ConnectionStyle::computeNormalColor(dataType.id));
         }
         else
         {
@@ -196,10 +200,12 @@ NodePainter::
 drawFilledConnectionPoints(QPainter * painter,
                            NodeGeometry const & geom,
                            NodeState const & state,
-                           NodeDataModel const * model,
+                           Node const & node,
                            ConnectionStyle const & connectionStyle)
 {
-  NodeStyle const& nodeStyle       = model->nodeStyle();
+  NodeDataModel const &model = *node.nodeDataModel();
+
+  NodeStyle const &nodeStyle = node.nodeStyle();
 
   auto diameter = nodeStyle.connectionPointDiameter();
 
@@ -214,11 +220,11 @@ drawFilledConnectionPoints(QPainter * painter,
 
         if (!state.getEntries(portType)[i].empty())
         {
-          auto const & dataType = model->dataType(portType, i);
+          auto const & dataType = model.dataType(portType, i);
 
           if (connectionStyle.useDataDefinedColors())
           {
-            QColor const c = connectionStyle.normalColor(dataType.id);
+            QColor const c = ConnectionStyle::computeNormalColor(dataType.id);
             painter->setPen(c);
             painter->setBrush(c);
           }
@@ -245,16 +251,18 @@ NodePainter::
 drawModelName(QPainter * painter,
               NodeGeometry const & geom,
               NodeState const & state,
-              NodeDataModel const * model)
+              Node const &node)
 {
-  NodeStyle const& nodeStyle = model->nodeStyle();
+  NodeDataModel const &model = *node.nodeDataModel();
+
+  NodeStyle const& nodeStyle = node.nodeStyle();
 
   Q_UNUSED(state);
 
-  if (!model->captionVisible())
+  if (!model.captionVisible())
     return;
 
-  QString const &name = model->caption();
+  QString const &name = model.caption();
 
   QFont f = painter->font();
 
@@ -281,15 +289,17 @@ NodePainter::
 drawEntryLabels(QPainter * painter,
                 NodeGeometry const & geom,
                 NodeState const & state,
-                NodeDataModel const * model)
+                Node const &node)
 {
+  NodeDataModel const &model = *node.nodeDataModel();
+
   QFontMetrics const & metrics =
     painter->fontMetrics();
 
   auto drawPoints =
     [&](PortType portType)
     {
-      auto const &nodeStyle = model->nodeStyle();
+      auto const &nodeStyle = node.nodeStyle();
 
       auto& entries = state.getEntries(portType);
 
@@ -306,13 +316,13 @@ drawEntryLabels(QPainter * painter,
 
         QString s;
 
-        if (model->portCaptionVisible(portType, i))
+        if (model.portCaptionVisible(portType, i))
         {
-          s = model->portCaption(portType, i);
+          s = model.portCaption(portType, i);
         }
         else
         {
-          s = model->dataType(portType, i).name;
+          s = model.dataType(portType, i).name;
         }
 
         auto rect = metrics.boundingRect(s);
@@ -347,9 +357,11 @@ void
 NodePainter::
 drawResizeRect(QPainter * painter,
                NodeGeometry const & geom,
-               NodeDataModel const * model)
+               Node const &node)
 {
-  if (model->resizable())
+  NodeDataModel const &model = *node.nodeDataModel();
+
+  if (model.resizable())
   {
     painter->setBrush(Qt::gray);
 
@@ -362,14 +374,16 @@ void
 NodePainter::
 drawValidationRect(QPainter * painter,
                    NodeGeometry const & geom,
-                   NodeDataModel const * model,
+                   Node const & node,
                    NodeGraphicsObject const & graphicsObject)
 {
-  auto modelValidationState = model->validationState();
+  NodeDataModel const &model = *node.nodeDataModel();
+
+  auto modelValidationState = model.validationState();
 
   if (modelValidationState != NodeValidationState::Valid)
   {
-    NodeStyle const& nodeStyle = model->nodeStyle();
+    NodeStyle const& nodeStyle = node.nodeStyle();
 
     auto color = graphicsObject.isSelected()
                  ? nodeStyle.selectedBoundaryColor()
@@ -410,7 +424,7 @@ drawValidationRect(QPainter * painter,
     painter->setBrush(Qt::gray);
 
     //Drawing the validation message itself
-    QString const &errorMsg = model->validationMessage();
+    QString const &errorMsg = model.validationMessage();
 
     QFont f = painter->font();
 
diff --git a/src/NodePainter.hpp b/src/NodePainter.hpp
index 7a4b8904..cc2def13 100644
--- a/src/NodePainter.hpp
+++ b/src/NodePainter.hpp
@@ -32,7 +32,7 @@ class NodePainter
   void
   drawNodeRect(QPainter* painter,
                NodeGeometry const& geom,
-               NodeDataModel const* model,
+               Node const& node,
                NodeGraphicsObject const & graphicsObject);
 
   static
@@ -40,21 +40,21 @@ class NodePainter
   drawModelName(QPainter* painter,
                 NodeGeometry const& geom,
                 NodeState const& state,
-                NodeDataModel const * model);
+                Node const & node);
 
   static
   void
   drawEntryLabels(QPainter* painter,
                   NodeGeometry const& geom,
                   NodeState const& state,
-                  NodeDataModel const * model);
+                  Node const & node);
 
   static
   void
   drawConnectionPoints(QPainter* painter,
                        NodeGeometry const& geom,
                        NodeState const& state,
-                       NodeDataModel const * model,
+                       Node const & node,
                        FlowScene const & scene,
                        ConnectionStyle const & connectionStyle);
 
@@ -63,20 +63,20 @@ class NodePainter
   drawFilledConnectionPoints(QPainter* painter,
                              NodeGeometry const& geom,
                              NodeState const& state,
-                             NodeDataModel const * model,
+                             Node const & node,
                              ConnectionStyle const & connectionStyle);
 
   static
   void
   drawResizeRect(QPainter* painter,
                  NodeGeometry const& geom,
-                 NodeDataModel const * model);
+                 Node const & node);
 
   static
   void
   drawValidationRect(QPainter * painter,
                      NodeGeometry const & geom,
-                     NodeDataModel const * model,
+                     Node const & node,
                      NodeGraphicsObject const & graphicsObject);
 };
 }
diff --git a/src/StyleImport.cpp b/src/StyleImport.cpp
index 9d9a0832..62cc05a8 100644
--- a/src/StyleImport.cpp
+++ b/src/StyleImport.cpp
@@ -8,25 +8,37 @@
 
 using QtNodes::StyleImport;
 
+
+static
+inline
 void
-StyleImport::
 initResources()
 {
+  // note: this function must be in the global namespace.
+  // Q_INIT_RESOURCE(...) requires it.
   Q_INIT_RESOURCE(resources);
 }
 
 
+void
+StyleImport::
+initResources()
+{
+  ::initResources();
+}
+
+
 QByteArray
 StyleImport::
 readJsonFile(QString const &fileName)
 {
-  QFile file(styleFile);
+  QFile file(fileName);
 
   if (!file.open(QIODevice::ReadOnly))
   {
-    qWarning() << "Couldn't open file " << styleFile;
+    qWarning() << "Couldn't open file " << fileName;
 
-    return;
+    return QByteArray();
   }
 
   return file.readAll();
@@ -43,7 +55,7 @@ readJsonText(QString const &jsonText)
 
 bool
 StyleImport::
-hasValue(QJsonValue const &value, QString const &name)
+hasValue(QJsonValue const &value, QString const &)
 {
   return (value.type() != QJsonValue::Undefined
           && value.type() != QJsonValue::Null);

From f88d00bb55ebd0d5dfdeb9ee0cec3a6348640de2 Mon Sep 17 00:00:00 2001
From: Justin Bassett <jbassett271@gmail.com>
Date: Fri, 11 May 2018 15:12:05 -0700
Subject: [PATCH 07/11] small misc improvements

---
 include/nodes/internal/ConnectionStyle.hpp | 4 ++--
 include/nodes/internal/FlowViewStyle.hpp   | 2 +-
 include/nodes/internal/NodeStyle.hpp       | 2 +-
 src/ConnectionStyle.cpp                    | 4 ++--
 src/FlowViewStyle.cpp                      | 3 +--
 src/NodeDataModel.cpp                      | 3 +--
 src/NodeStyle.cpp                          | 5 ++---
 7 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/include/nodes/internal/ConnectionStyle.hpp b/include/nodes/internal/ConnectionStyle.hpp
index f3b48c6a..3f6ee54b 100644
--- a/include/nodes/internal/ConnectionStyle.hpp
+++ b/include/nodes/internal/ConnectionStyle.hpp
@@ -22,7 +22,7 @@ class NODE_EDITOR_PUBLIC ConnectionStyle
   defaultStyle();
 
   static std::shared_ptr<ConnectionStyle>
-  fromJson(QString jsonText);
+  fromJson(QString const& jsonText);
 
   QColor constructionColor() const;
   QColor normalColor() const;
@@ -49,7 +49,7 @@ class NODE_EDITOR_PUBLIC ConnectionStyle
   void useDataDefinedColors(bool);
 
   static QColor
-  computeNormalColor(QString typeId);
+  computeNormalColor(QString const& typeId);
 
 private:
   void loadJson(QByteArray const& jsonBytes);
diff --git a/include/nodes/internal/FlowViewStyle.hpp b/include/nodes/internal/FlowViewStyle.hpp
index a584855b..f3e27eeb 100644
--- a/include/nodes/internal/FlowViewStyle.hpp
+++ b/include/nodes/internal/FlowViewStyle.hpp
@@ -21,7 +21,7 @@ class NODE_EDITOR_PUBLIC FlowViewStyle
   defaultStyle();
 
   static std::shared_ptr<FlowViewStyle>
-  fromJson(QString jsonText);
+  fromJson(QString const& jsonText);
 
   QColor const &
   backgroundColor() const
diff --git a/include/nodes/internal/NodeStyle.hpp b/include/nodes/internal/NodeStyle.hpp
index 86cdcee3..91f7f59f 100644
--- a/include/nodes/internal/NodeStyle.hpp
+++ b/include/nodes/internal/NodeStyle.hpp
@@ -21,7 +21,7 @@ class NODE_EDITOR_PUBLIC NodeStyle
   defaultStyle();
 
   static std::shared_ptr<NodeStyle>
-  fromJson(QString jsonText);
+  fromJson(QString const& jsonText);
 
   QColor normalBoundaryColor() const;
   QColor selectedBoundaryColor() const;
diff --git a/src/ConnectionStyle.cpp b/src/ConnectionStyle.cpp
index 077a1808..25d917d9 100644
--- a/src/ConnectionStyle.cpp
+++ b/src/ConnectionStyle.cpp
@@ -57,7 +57,7 @@ defaultStyle()
 
 std::shared_ptr<ConnectionStyle>
 ConnectionStyle::
-fromJson(QString jsonText)
+fromJson(QString const& jsonText)
 {
   auto style = defaultStyle();
 
@@ -70,7 +70,7 @@ fromJson(QString jsonText)
 // static
 QColor
 ConnectionStyle::
-computeNormalColor(QString typeId)
+computeNormalColor(QString const& typeId)
 {
   std::size_t hash = qHash(typeId);
 
diff --git a/src/FlowViewStyle.cpp b/src/FlowViewStyle.cpp
index e3ccffab..99a0534a 100644
--- a/src/FlowViewStyle.cpp
+++ b/src/FlowViewStyle.cpp
@@ -14,7 +14,6 @@
 
 using QtNodes::FlowViewStyle;
 using QtNodes::StyleImport;
-using QtNodes::StyleImportError;
 
 
 void
@@ -48,7 +47,7 @@ defaultStyle()
 
 std::shared_ptr<FlowViewStyle>
 FlowViewStyle::
-fromJson(QString jsonText)
+fromJson(QString const& jsonText)
 {
   auto style = std::make_shared<FlowViewStyle>();
   style->loadJson(StyleImport::readJsonText(jsonText));
diff --git a/src/NodeDataModel.cpp b/src/NodeDataModel.cpp
index ee0b4550..286ef056 100644
--- a/src/NodeDataModel.cpp
+++ b/src/NodeDataModel.cpp
@@ -6,8 +6,7 @@ using QtNodes::NodeDataModel;
 
 NodeDataModel::
 NodeDataModel()
-{
-}
+= default;
 
 
 QJsonObject
diff --git a/src/NodeStyle.cpp b/src/NodeStyle.cpp
index 7fd8965f..1d323f09 100644
--- a/src/NodeStyle.cpp
+++ b/src/NodeStyle.cpp
@@ -64,7 +64,7 @@ defaultStyle()
 
 std::shared_ptr<NodeStyle>
 NodeStyle::
-fromJson(QString jsonText)
+fromJson(QString const& jsonText)
 {
   auto style = std::make_shared<NodeStyle>();
   style->loadJson(StyleImport::readJsonText(jsonText));
@@ -75,8 +75,7 @@ fromJson(QString jsonText)
 
 NodeStyle::
 NodeStyle()
-{
-}
+= default;
 
 
 QColor

From 008eea54d5ce4e75d10c3ca0c9482ddd6a8f49d9 Mon Sep 17 00:00:00 2001
From: Justin Bassett <jbassett271@gmail.com>
Date: Fri, 11 May 2018 15:54:01 -0700
Subject: [PATCH 08/11] Use FooStyle objects directly; improve implementation
 of FooStyle objects

---
 examples/calculator/main.cpp               | 18 ++++++++---------
 examples/connection_colors/main.cpp        |  2 +-
 include/nodes/internal/ConnectionStyle.hpp |  7 +++----
 include/nodes/internal/FlowScene.hpp       | 14 ++++++-------
 include/nodes/internal/FlowView.hpp        |  8 ++++----
 include/nodes/internal/FlowViewStyle.hpp   |  7 +++----
 include/nodes/internal/NodeStyle.hpp       |  6 +++---
 src/ConnectionStyle.cpp                    | 23 ++++++++++++++--------
 src/FlowScene.cpp                          |  8 ++++----
 src/FlowView.cpp                           | 12 +++++------
 src/FlowViewStyle.cpp                      | 22 +++++++++------------
 src/NodeStyle.cpp                          | 21 +++++++++-----------
 12 files changed, 73 insertions(+), 75 deletions(-)

diff --git a/examples/calculator/main.cpp b/examples/calculator/main.cpp
index deec9d11..0332ff5a 100644
--- a/examples/calculator/main.cpp
+++ b/examples/calculator/main.cpp
@@ -65,17 +65,17 @@ connectionStyle()
 {
   auto style = ConnectionStyle::defaultStyle();
   
-  style->setConstructionColor(QColor("gray"));
-  style->setNormalColor(QColor("black"));
-  style->setSelectedColor(QColor("gray"));
-  style->setSelectedHaloColor(QColor("deepskyblue"));
-  style->setHoveredColor(QColor("deepskyblue"));
+  style.setConstructionColor(QColor("gray"));
+  style.setNormalColor(QColor("black"));
+  style.setSelectedColor(QColor("gray"));
+  style.setSelectedHaloColor(QColor("deepskyblue"));
+  style.setHoveredColor(QColor("deepskyblue"));
 
-  style->setLineWidth(3.0);
-  style->setConstructionLineWidth(2.0);
-  style->setPointDiameter(10.0);
+  style.setLineWidth(3.0);
+  style.setConstructionLineWidth(2.0);
+  style.setPointDiameter(10.0);
 
-  style->useDataDefinedColors(true);
+  style.useDataDefinedColors(true);
 
   return style;
 }
diff --git a/examples/connection_colors/main.cpp b/examples/connection_colors/main.cpp
index 08e07b82..008616d3 100644
--- a/examples/connection_colors/main.cpp
+++ b/examples/connection_colors/main.cpp
@@ -41,7 +41,7 @@ main(int argc, char* argv[])
   QApplication app(argc, argv);
 
   auto connectionStyle = ConnectionStyle::defaultStyle();
-  connectionStyle->useDataDefinedColors(true);
+  connectionStyle.useDataDefinedColors(true);
 
   FlowScene scene(registerDataModels());
   scene.setConnectionStyle(std::move(connectionStyle));
diff --git a/include/nodes/internal/ConnectionStyle.hpp b/include/nodes/internal/ConnectionStyle.hpp
index 3f6ee54b..d451c986 100644
--- a/include/nodes/internal/ConnectionStyle.hpp
+++ b/include/nodes/internal/ConnectionStyle.hpp
@@ -1,7 +1,5 @@
 #pragma once
 
-#include <memory>
-
 #include <QtGui/QColor>
 
 #include <QByteArray>
@@ -18,10 +16,10 @@ class NODE_EDITOR_PUBLIC ConnectionStyle
 public:
   ConnectionStyle();
 
-  static std::shared_ptr<ConnectionStyle>
+  static ConnectionStyle const&
   defaultStyle();
 
-  static std::shared_ptr<ConnectionStyle>
+  static ConnectionStyle
   fromJson(QString const& jsonText);
 
   QColor constructionColor() const;
@@ -52,6 +50,7 @@ class NODE_EDITOR_PUBLIC ConnectionStyle
   computeNormalColor(QString const& typeId);
 
 private:
+  ConnectionStyle(QByteArray const& jsonBytes);
   void loadJson(QByteArray const& jsonBytes);
 
   QColor _constructionColor;
diff --git a/include/nodes/internal/FlowScene.hpp b/include/nodes/internal/FlowScene.hpp
index 78b2eded..201014e5 100644
--- a/include/nodes/internal/FlowScene.hpp
+++ b/include/nodes/internal/FlowScene.hpp
@@ -13,6 +13,9 @@
 #include "TypeConverter.hpp"
 #include "memory.hpp"
 
+#include "ConnectionStyle.hpp"
+#include "NodeStyle.hpp"
+
 namespace QtNodes
 {
 
@@ -23,9 +26,6 @@ class NodeGraphicsObject;
 class Connection;
 class ConnectionGraphicsObject;
 
-class ConnectionStyle;
-class NodeStyle;
-
 /// Scene holds connections and nodes.
 class NODE_EDITOR_PUBLIC FlowScene
   : public QGraphicsScene
@@ -102,8 +102,8 @@ class NODE_EDITOR_PUBLIC FlowScene
   ConnectionStyle const& connectionStyle() const;
   NodeStyle const& nodeStyle() const;
 
-  void setConnectionStyle(std::shared_ptr<ConnectionStyle const> style);
-  void setNodeStyle(std::shared_ptr<NodeStyle const> style);
+  void setConnectionStyle(ConnectionStyle style);
+  void setNodeStyle(NodeStyle style);
 
 signals:
 
@@ -137,8 +137,8 @@ class NODE_EDITOR_PUBLIC FlowScene
   std::unordered_map<QUuid, UniqueNode>       _nodes;
   std::shared_ptr<DataModelRegistry>          _registry;
 
-  std::shared_ptr<ConnectionStyle const> _connectionStyle;
-  std::shared_ptr<NodeStyle const>       _nodeStyle;
+  ConnectionStyle _connectionStyle;
+  NodeStyle       _nodeStyle;
 };
 
 Node*
diff --git a/include/nodes/internal/FlowView.hpp b/include/nodes/internal/FlowView.hpp
index 6381e197..bc04a3f2 100644
--- a/include/nodes/internal/FlowView.hpp
+++ b/include/nodes/internal/FlowView.hpp
@@ -17,9 +17,9 @@ class NODE_EDITOR_PUBLIC FlowView
 public:
 
   FlowView(QWidget *parent = Q_NULLPTR);
-  FlowView(std::shared_ptr<FlowViewStyle const> style, QWidget *parent = Q_NULLPTR);
+  FlowView(FlowViewStyle style, QWidget *parent = Q_NULLPTR);
   FlowView(FlowScene *scene, QWidget *parent = Q_NULLPTR);
-  FlowView(FlowScene *scene, std::shared_ptr<FlowViewStyle const> style, QWidget *parent = Q_NULLPTR);
+  FlowView(FlowScene *scene, FlowViewStyle style, QWidget *parent = Q_NULLPTR);
 
   FlowView(const FlowView&) = delete;
   FlowView operator=(const FlowView&) = delete;
@@ -30,7 +30,7 @@ class NODE_EDITOR_PUBLIC FlowView
 
   void setScene(FlowScene *scene);
 
-  void setStyle(std::shared_ptr<FlowViewStyle const> style);
+  void setStyle(FlowViewStyle style);
 
 public slots:
 
@@ -71,6 +71,6 @@ public slots:
 
   FlowScene* _scene;
 
-  std::shared_ptr<FlowViewStyle const> _style;
+  FlowViewStyle _style;
 };
 }
diff --git a/include/nodes/internal/FlowViewStyle.hpp b/include/nodes/internal/FlowViewStyle.hpp
index f3e27eeb..1110d7b3 100644
--- a/include/nodes/internal/FlowViewStyle.hpp
+++ b/include/nodes/internal/FlowViewStyle.hpp
@@ -17,10 +17,10 @@ class NODE_EDITOR_PUBLIC FlowViewStyle
 public:
   FlowViewStyle();
 
-  static std::shared_ptr<FlowViewStyle>
+  static FlowViewStyle const&
   defaultStyle();
 
-  static std::shared_ptr<FlowViewStyle>
+  static FlowViewStyle
   fromJson(QString const& jsonText);
 
   QColor const &
@@ -60,8 +60,7 @@ class NODE_EDITOR_PUBLIC FlowViewStyle
   }
 
 private:
-
-  void loadJson(QByteArray const& jsonBytes);
+  FlowViewStyle(QByteArray const& jsonBytes);
 
   QColor _backgroundColor;
   QColor _fineGridColor;
diff --git a/include/nodes/internal/NodeStyle.hpp b/include/nodes/internal/NodeStyle.hpp
index 91f7f59f..61a4865f 100644
--- a/include/nodes/internal/NodeStyle.hpp
+++ b/include/nodes/internal/NodeStyle.hpp
@@ -17,10 +17,10 @@ class NODE_EDITOR_PUBLIC NodeStyle
 public:
   NodeStyle();
 
-  static std::shared_ptr<NodeStyle>
+  static NodeStyle const&
   defaultStyle();
 
-  static std::shared_ptr<NodeStyle>
+  static NodeStyle
   fromJson(QString const& jsonText);
 
   QColor normalBoundaryColor() const;
@@ -69,7 +69,7 @@ class NODE_EDITOR_PUBLIC NodeStyle
 
 private:
 
-  void loadJson(QByteArray const& jsonBytes);
+  NodeStyle(QByteArray const& jsonBytes);
 
 private:
 
diff --git a/src/ConnectionStyle.cpp b/src/ConnectionStyle.cpp
index 25d917d9..10426ea9 100644
--- a/src/ConnectionStyle.cpp
+++ b/src/ConnectionStyle.cpp
@@ -17,6 +17,13 @@ using QtNodes::ConnectionStyle;
 using QtNodes::StyleImport;
 
 
+ConnectionStyle::
+ConnectionStyle(QByteArray const& jsonBytes)
+{
+  loadJson(jsonBytes);
+}
+
+
 void
 ConnectionStyle::
 loadJson(QByteArray const& jsonBytes)
@@ -41,27 +48,27 @@ loadJson(QByteArray const& jsonBytes)
 }
 
 
-std::shared_ptr<ConnectionStyle>
+ConnectionStyle const&
 ConnectionStyle::
 defaultStyle()
 {
-  StyleImport::initResources();
-
-  auto style = std::make_shared<ConnectionStyle>();
+  static ConnectionStyle const DefaultStyle = [] {
+    StyleImport::initResources();
 
-  style->loadJson(StyleImport::readJsonFile(":DefaultStyle.json"));
+    return ConnectionStyle(StyleImport::readJsonFile(":DefaultStyle.json"));
+  }();
 
-  return style;
+  return DefaultStyle;
 }
 
 
-std::shared_ptr<ConnectionStyle>
+ConnectionStyle
 ConnectionStyle::
 fromJson(QString const& jsonText)
 {
   auto style = defaultStyle();
 
-  style->loadJson(StyleImport::readJsonText(jsonText));
+  style.loadJson(StyleImport::readJsonText(jsonText));
 
   return style;
 }
diff --git a/src/FlowScene.cpp b/src/FlowScene.cpp
index 2ae7bd88..8414b60d 100644
--- a/src/FlowScene.cpp
+++ b/src/FlowScene.cpp
@@ -571,7 +571,7 @@ ConnectionStyle const &
 FlowScene::
 connectionStyle() const
 {
-  return *_connectionStyle;
+  return _connectionStyle;
 }
 
 
@@ -579,13 +579,13 @@ NodeStyle const &
 FlowScene::
 nodeStyle() const
 {
-  return *_nodeStyle;
+  return _nodeStyle;
 }
 
 
 void
 FlowScene::
-setConnectionStyle(std::shared_ptr<ConnectionStyle const> style)
+setConnectionStyle(ConnectionStyle style)
 {
   _connectionStyle = std::move(style);
 }
@@ -593,7 +593,7 @@ setConnectionStyle(std::shared_ptr<ConnectionStyle const> style)
 
 void
 FlowScene::
-setNodeStyle(std::shared_ptr<NodeStyle const> style)
+setNodeStyle(NodeStyle style)
 {
   _nodeStyle = std::move(style);
 }
diff --git a/src/FlowView.cpp b/src/FlowView.cpp
index bdc4d3cd..45399875 100644
--- a/src/FlowView.cpp
+++ b/src/FlowView.cpp
@@ -34,7 +34,7 @@ FlowView(QWidget *parent)
 
 
 FlowView::
-FlowView(std::shared_ptr<FlowViewStyle const> style, QWidget *parent)
+FlowView(FlowViewStyle style, QWidget *parent)
   : QGraphicsView(parent)
   , _clearSelectionAction(Q_NULLPTR)
   , _deleteSelectionAction(Q_NULLPTR)
@@ -60,7 +60,7 @@ FlowView(std::shared_ptr<FlowViewStyle const> style, QWidget *parent)
 
 
 FlowView::
-FlowView(FlowScene *scene, std::shared_ptr<FlowViewStyle const> style, QWidget *parent)
+FlowView(FlowScene *scene, FlowViewStyle style, QWidget *parent)
   : FlowView(parent)
 {
   setScene(scene);
@@ -112,11 +112,11 @@ FlowView::setScene(FlowScene *scene)
 
 
 void
-FlowView::setStyle(std::shared_ptr<FlowViewStyle const> style)
+FlowView::setStyle(FlowViewStyle style)
 {
   _style = std::move(style);
 
-  setBackgroundBrush(_style->backgroundColor());
+  setBackgroundBrush(_style.backgroundColor());
 }
 
 
@@ -399,12 +399,12 @@ drawBackground(QPainter* painter, const QRectF& r)
 
   QBrush bBrush = backgroundBrush();
 
-  QPen pfine(_style->fineGridColor(), 1.0);
+  QPen pfine(_style.fineGridColor(), 1.0);
 
   painter->setPen(pfine);
   drawGrid(15);
 
-  QPen p(_style->coarseGridColor(), 1.0);
+  QPen p(_style.coarseGridColor(), 1.0);
 
   painter->setPen(p);
   drawGrid(150);
diff --git a/src/FlowViewStyle.cpp b/src/FlowViewStyle.cpp
index 99a0534a..a6820745 100644
--- a/src/FlowViewStyle.cpp
+++ b/src/FlowViewStyle.cpp
@@ -16,9 +16,8 @@ using QtNodes::FlowViewStyle;
 using QtNodes::StyleImport;
 
 
-void
 FlowViewStyle::
-loadJson(QByteArray const &jsonBytes)
+FlowViewStyle(QByteArray const& jsonBytes)
 {
   QJsonDocument json(QJsonDocument::fromJson(jsonBytes));
   QJsonObject   topLevelObject = json.object();
@@ -32,27 +31,24 @@ loadJson(QByteArray const &jsonBytes)
 }
 
 
-std::shared_ptr<FlowViewStyle>
+FlowViewStyle const&
 FlowViewStyle::
 defaultStyle()
 {
-  StyleImport::initResources();
+  static FlowViewStyle const DefaultStyle = [] {
+    StyleImport::initResources();
+    return FlowViewStyle(StyleImport::readJsonFile(":DefaultStyle.json"));
+  }();
 
-  auto style = std::make_shared<FlowViewStyle>();
-  style->loadJson(StyleImport::readJsonFile(":DefaultStyle.json"));
-
-  return style;
+  return DefaultStyle;
 }
 
 
-std::shared_ptr<FlowViewStyle>
+FlowViewStyle
 FlowViewStyle::
 fromJson(QString const& jsonText)
 {
-  auto style = std::make_shared<FlowViewStyle>();
-  style->loadJson(StyleImport::readJsonText(jsonText));
-
-  return style;
+  return FlowViewStyle(StyleImport::readJsonText(jsonText));
 }
 
 
diff --git a/src/NodeStyle.cpp b/src/NodeStyle.cpp
index 1d323f09..8d329b2e 100644
--- a/src/NodeStyle.cpp
+++ b/src/NodeStyle.cpp
@@ -17,9 +17,8 @@ using QtNodes::NodeStyle;
 using QtNodes::StyleImport;
 
 
-void
 NodeStyle::
-loadJson(QByteArray const &jsonBytes)
+NodeStyle(QByteArray const& jsonBytes)
 {
   QJsonDocument json(QJsonDocument::fromJson(jsonBytes));
   QJsonObject   topLevelObject = json.object();
@@ -49,27 +48,25 @@ loadJson(QByteArray const &jsonBytes)
 }
 
 
-std::shared_ptr<NodeStyle>
+NodeStyle const&
 NodeStyle::
 defaultStyle()
 {
-  StyleImport::initResources();
+  static NodeStyle const DefaultStyle = [] {
+    StyleImport::initResources();
 
-  auto style = std::make_shared<NodeStyle>();
-  style->loadJson(StyleImport::readJsonFile(":DefaultStyle.json"));
+    return NodeStyle(StyleImport::readJsonFile(":DefaultStyle.json"));
+  }();
 
-  return style;
+  return DefaultStyle;
 }
 
 
-std::shared_ptr<NodeStyle>
+NodeStyle
 NodeStyle::
 fromJson(QString const& jsonText)
 {
-  auto style = std::make_shared<NodeStyle>();
-  style->loadJson(StyleImport::readJsonText(jsonText));
-
-  return style;
+  return NodeStyle(StyleImport::readJsonText(jsonText));
 }
 
 

From 9f09fad49942a98cf6667f3e8fbc50ea10ab12e5 Mon Sep 17 00:00:00 2001
From: Justin Bassett <jbassett271@gmail.com>
Date: Fri, 11 May 2018 16:29:24 -0700
Subject: [PATCH 09/11] Add missing using declarations

---
 src/ConnectionGeometry.cpp | 1 +
 src/NodeGeometry.cpp       | 9 +++++----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/ConnectionGeometry.cpp b/src/ConnectionGeometry.cpp
index 4e6d6488..d1530bc7 100644
--- a/src/ConnectionGeometry.cpp
+++ b/src/ConnectionGeometry.cpp
@@ -5,6 +5,7 @@
 #include "ConnectionStyle.hpp"
 
 using QtNodes::ConnectionGeometry;
+using QtNodes::ConnectionStyle;
 using QtNodes::PortType;
 
 ConnectionGeometry::
diff --git a/src/NodeGeometry.cpp b/src/NodeGeometry.cpp
index 1dd6301b..8c99ac14 100644
--- a/src/NodeGeometry.cpp
+++ b/src/NodeGeometry.cpp
@@ -3,18 +3,19 @@
 #include <iostream>
 #include <cmath>
 
-#include "PortType.hpp"
-#include "NodeDataModel.hpp"
 #include "Node.hpp"
+#include "NodeDataModel.hpp"
 #include "NodeGraphicsObject.hpp"
 #include "NodeState.hpp"
 #include "NodeStyle.hpp"
+#include "PortType.hpp"
 
-using QtNodes::NodeGeometry;
+using QtNodes::Node;
 using QtNodes::NodeDataModel;
+using QtNodes::NodeGeometry;
+using QtNodes::NodeStyle;
 using QtNodes::PortIndex;
 using QtNodes::PortType;
-using QtNodes::Node;
 
 NodeGeometry::
 NodeGeometry(std::unique_ptr<NodeDataModel> const &dataModel, NodeStyle const &style)

From 8cb84ce377be04890b9576d464fb8ee2227c1f10 Mon Sep 17 00:00:00 2001
From: Justin Bassett <jbassett271@gmail.com>
Date: Mon, 14 May 2018 15:24:25 -0700
Subject: [PATCH 10/11] Address concerns

---
 include/nodes/internal/Connection.hpp          | 2 +-
 include/nodes/internal/ConnectionStyle.hpp     | 5 ++---
 include/nodes/internal/FlowScene.hpp           | 7 ++++---
 include/nodes/internal/FlowViewStyle.hpp       | 6 ++----
 include/nodes/internal/Node.hpp                | 3 ++-
 include/nodes/internal/NodePainterDelegate.hpp | 2 +-
 include/nodes/internal/NodeStyle.hpp           | 6 ++----
 src/Connection.cpp                             | 6 +++---
 src/ConnectionStyle.cpp                        | 2 --
 src/FlowScene.cpp                              | 2 +-
 src/FlowViewStyle.cpp                          | 2 --
 src/Node.cpp                                   | 9 ++++-----
 src/NodeStyle.cpp                              | 3 ---
 13 files changed, 22 insertions(+), 33 deletions(-)

diff --git a/include/nodes/internal/Connection.hpp b/include/nodes/internal/Connection.hpp
index 2bbdbfeb..0a3d24e2 100644
--- a/include/nodes/internal/Connection.hpp
+++ b/include/nodes/internal/Connection.hpp
@@ -148,7 +148,7 @@ class NODE_EDITOR_PUBLIC Connection
   ConnectionState    _connectionState;
   ConnectionGeometry _connectionGeometry;
 
-  ConnectionStyle const *_connectionStyle;
+  ConnectionStyle const &_connectionStyle;
 
   std::unique_ptr<ConnectionGraphicsObject>_connectionGraphicsObject;
 
diff --git a/include/nodes/internal/ConnectionStyle.hpp b/include/nodes/internal/ConnectionStyle.hpp
index d451c986..48242512 100644
--- a/include/nodes/internal/ConnectionStyle.hpp
+++ b/include/nodes/internal/ConnectionStyle.hpp
@@ -2,9 +2,8 @@
 
 #include <QtGui/QColor>
 
-#include <QByteArray>
-#include <QObject>
-#include <QString>
+#include <QtCore/QByteArray>
+#include <QtCore/QString>
 
 #include "Export.hpp"
 
diff --git a/include/nodes/internal/FlowScene.hpp b/include/nodes/internal/FlowScene.hpp
index 201014e5..990044ef 100644
--- a/include/nodes/internal/FlowScene.hpp
+++ b/include/nodes/internal/FlowScene.hpp
@@ -133,12 +133,13 @@ class NODE_EDITOR_PUBLIC FlowScene
   using SharedConnection = std::shared_ptr<Connection>;
   using UniqueNode       = std::unique_ptr<Node>;
 
+  // styles MUST come before _connections and _nodes, so that the styles outlive them
+  ConnectionStyle _connectionStyle;
+  NodeStyle       _nodeStyle;
+
   std::unordered_map<QUuid, SharedConnection> _connections;
   std::unordered_map<QUuid, UniqueNode>       _nodes;
   std::shared_ptr<DataModelRegistry>          _registry;
-
-  ConnectionStyle _connectionStyle;
-  NodeStyle       _nodeStyle;
 };
 
 Node*
diff --git a/include/nodes/internal/FlowViewStyle.hpp b/include/nodes/internal/FlowViewStyle.hpp
index 1110d7b3..1567933b 100644
--- a/include/nodes/internal/FlowViewStyle.hpp
+++ b/include/nodes/internal/FlowViewStyle.hpp
@@ -1,11 +1,9 @@
 #pragma once
 
-#include <memory>
-
 #include <QtGui/QColor>
 
-#include <QString>
-#include <QByteArray>
+#include <QtCore/QString>
+#include <QtCore/QByteArray>
 
 #include "Export.hpp"
 
diff --git a/include/nodes/internal/Node.hpp b/include/nodes/internal/Node.hpp
index 61112041..28e8da05 100644
--- a/include/nodes/internal/Node.hpp
+++ b/include/nodes/internal/Node.hpp
@@ -115,7 +115,8 @@ public slots: // data propagation
 
   // painting
 
-  NodeStyle const *_nodeStyle;
+  // _nodeStyle must come before _nodeGeometry
+  NodeStyle const &_nodeStyle;
 
   NodeGeometry _nodeGeometry;
 
diff --git a/include/nodes/internal/NodePainterDelegate.hpp b/include/nodes/internal/NodePainterDelegate.hpp
index d532619f..f22496c8 100644
--- a/include/nodes/internal/NodePainterDelegate.hpp
+++ b/include/nodes/internal/NodePainterDelegate.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <QPainter>
+#include <QtGui/QPainter>
 
 #include "NodeGeometry.hpp"
 #include "NodeDataModel.hpp"
diff --git a/include/nodes/internal/NodeStyle.hpp b/include/nodes/internal/NodeStyle.hpp
index 61a4865f..24bad2a0 100644
--- a/include/nodes/internal/NodeStyle.hpp
+++ b/include/nodes/internal/NodeStyle.hpp
@@ -1,11 +1,9 @@
 #pragma once
 
-#include <memory>
-
 #include <QtGui/QColor>
 
-#include <QByteArray>
-#include <QString>
+#include <QtCore/QByteArray>
+#include <QtCore/QString>
 
 #include "Export.hpp"
 
diff --git a/src/Connection.cpp b/src/Connection.cpp
index 6d760817..0a65ccd0 100644
--- a/src/Connection.cpp
+++ b/src/Connection.cpp
@@ -41,7 +41,7 @@ Connection(PortType portType,
   , _inPortIndex(INVALID)
   , _connectionState()
   , _connectionGeometry(style)
-  , _connectionStyle(&style)
+  , _connectionStyle(style)
 {
   setNodeToPort(node, portType, portIndex);
 
@@ -63,7 +63,7 @@ Connection(Node& nodeIn,
   , _inPortIndex(portIndexIn)
   , _connectionState()
   , _connectionGeometry(style)
-  , _connectionStyle(&style)
+  , _connectionStyle(style)
   , _converter(std::move(typeConverter))
 {
   setNodeToPort(nodeIn, PortType::In, portIndexIn);
@@ -413,7 +413,7 @@ setTypeConverter(TypeConverter converter)
 ConnectionStyle const &
 Connection::connectionStyle() const
 {
-  return *_connectionStyle;
+  return _connectionStyle;
 }
 
 
diff --git a/src/ConnectionStyle.cpp b/src/ConnectionStyle.cpp
index 10426ea9..e63d6d62 100644
--- a/src/ConnectionStyle.cpp
+++ b/src/ConnectionStyle.cpp
@@ -9,8 +9,6 @@
 #include <QtCore/QJsonObject>
 #include <QtCore/QJsonValueRef>
 
-#include <QDebug>
-
 #include "StyleImport.hpp"
 
 using QtNodes::ConnectionStyle;
diff --git a/src/FlowScene.cpp b/src/FlowScene.cpp
index 8414b60d..b5618a02 100644
--- a/src/FlowScene.cpp
+++ b/src/FlowScene.cpp
@@ -47,9 +47,9 @@ FlowScene::
 FlowScene(std::shared_ptr<DataModelRegistry> registry,
           QObject * parent)
   : QGraphicsScene(parent)
-  , _registry(std::move(registry))
   , _connectionStyle(ConnectionStyle::defaultStyle())
   , _nodeStyle(NodeStyle::defaultStyle())
+  , _registry(std::move(registry))
 {
   setItemIndexMethod(QGraphicsScene::NoIndex);
 }
diff --git a/src/FlowViewStyle.cpp b/src/FlowViewStyle.cpp
index a6820745..bf800960 100644
--- a/src/FlowViewStyle.cpp
+++ b/src/FlowViewStyle.cpp
@@ -8,8 +8,6 @@
 #include <QtCore/QJsonObject>
 #include <QtCore/QJsonValueRef>
 
-#include <QDebug>
-
 #include "StyleImport.hpp"
 
 using QtNodes::FlowViewStyle;
diff --git a/src/Node.cpp b/src/Node.cpp
index f5206892..4b5fef8c 100644
--- a/src/Node.cpp
+++ b/src/Node.cpp
@@ -3,7 +3,6 @@
 #include <QtCore/QObject>
 
 #include <utility>
-#include <iostream>
 
 #include "FlowScene.hpp"
 
@@ -26,10 +25,10 @@ using QtNodes::PortIndex;
 using QtNodes::PortType;
 
 
-static NodeStyle const *
+static NodeStyle const&
 computeStyle(NodeStyle const *preferredStyle, NodeStyle const &backupStyle)
 {
-  return preferredStyle ? preferredStyle : &backupStyle;
+  return preferredStyle ? *preferredStyle : backupStyle;
 }
 
 
@@ -39,7 +38,7 @@ Node(std::unique_ptr<NodeDataModel> && dataModel, NodeStyle const& style)
   , _nodeDataModel(std::move(dataModel))
   , _nodeState(_nodeDataModel)
   , _nodeStyle(computeStyle(_nodeDataModel->nodeStyle(), style))
-  , _nodeGeometry(_nodeDataModel, *_nodeStyle)
+  , _nodeGeometry(_nodeDataModel, _nodeStyle)
   , _nodeGraphicsObject(nullptr)
 {
   _nodeGeometry.recalculateSize();
@@ -186,7 +185,7 @@ NodeStyle const &
 Node::
 nodeStyle() const
 {
-  return *_nodeStyle;
+  return _nodeStyle;
 }
 
 
diff --git a/src/NodeStyle.cpp b/src/NodeStyle.cpp
index 8d329b2e..0ea9829c 100644
--- a/src/NodeStyle.cpp
+++ b/src/NodeStyle.cpp
@@ -1,6 +1,5 @@
 #include "NodeStyle.hpp"
 
-#include <iostream>
 #include <utility>
 
 #include <QtCore/QFile>
@@ -9,8 +8,6 @@
 #include <QtCore/QJsonObject>
 #include <QtCore/QJsonValueRef>
 
-#include <QDebug>
-
 #include "StyleImport.hpp"
 
 using QtNodes::NodeStyle;

From 468101e61581f472ce5d016799e210fbec70043d Mon Sep 17 00:00:00 2001
From: Justin Bassett <jbassett271@gmail.com>
Date: Mon, 14 May 2018 15:38:32 -0700
Subject: [PATCH 11/11] add missing #include <QtCore/QHash>

---
 src/ConnectionStyle.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/ConnectionStyle.cpp b/src/ConnectionStyle.cpp
index e63d6d62..9fc34833 100644
--- a/src/ConnectionStyle.cpp
+++ b/src/ConnectionStyle.cpp
@@ -4,6 +4,7 @@
 #include <utility>
 
 #include <QtCore/QFile>
+#include <QtCore/QHash>
 #include <QtCore/QJsonArray>
 #include <QtCore/QJsonDocument>
 #include <QtCore/QJsonObject>