remove unnecessary changes

Author: g-abilio

include/QtNodes/internal/NodeDelegateModel.hpp

@@ -68,9 +68,6 @@ class NODE_EDITOR_PUBLIC NodeDelegateModel
     /// Validation State will default to Valid, but you can manipulate it by overriding in an inherited class
     virtual NodeValidationState validationState() const { return _nodeValidationState; }
 
-    /// Returns the curent processing status
-    virtual NodeProcessingStatus processingStatus() const { return _processingStatus; }
-
     QJsonObject save() const override;
 
     void load(QJsonObject const &) override;

src/DataFlowGraphModel.cpp

@@ -294,11 +294,6 @@ QVariant DataFlowGraphModel::nodeData(NodeId nodeId, NodeRole role) const
         auto validationState = model->validationState();
         result = QVariant::fromValue(validationState);
     } break;
-
-    case NodeRole::ProcessingStatus: {
-        auto processingStatus = model->processingStatus();
-        result = QVariant::fromValue(processingStatus);
-    } break;
     }
 
     return result;
@@ -368,16 +363,6 @@ bool DataFlowGraphModel::setNodeData(NodeId nodeId, NodeRole role, QVariant valu
         }
         Q_EMIT nodeUpdated(nodeId);
     } break;
-
-    case NodeRole::ProcessingStatus: {
-        if (value.canConvert<QtNodes::NodeProcessingStatus>()) {
-            auto status = value.value<QtNodes::NodeProcessingStatus>();
-            if (auto node = delegateModel<NodeDelegateModel>(nodeId); node != nullptr) {
-                node->setNodeProcessingStatus(status);
-            }
-        }
-        Q_EMIT nodeUpdated(nodeId);
-    } break;
     }
 
     return result;

src/DefaultNodePainter.cpp

@@ -328,21 +328,6 @@ void DefaultNodePainter::drawValidationIcon(QPainter *painter, NodeGraphicsObjec
     QPointF center(size.width(), 0.0);
     center += QPointF(iconSize.width() / 2.0, -iconSize.height() / 2.0);
 
-<<<<<<< HEAD
-=======
-    painter->save();
-
-    // Draw a colored circle behind the icon to highlight validation issues
-    painter->setPen(Qt::NoPen);
-    painter->setBrush(color);
-    painter->drawEllipse(center, iconSize.width() / 2.0 + 2.0, iconSize.height() / 2.0 + 2.0);
-
-    QPainter imgPainter(&pixmap);
-    imgPainter.setCompositionMode(QPainter::CompositionMode_SourceIn);
-    imgPainter.fillRect(pixmap.rect(), nodeStyle.FontColor);
-    imgPainter.end();
-
->>>>>>> f953fcab52f505a74271c5f665d6627dce63b66d
     painter->drawPixmap(center.toPoint() - QPoint(iconSize.width() / 2, iconSize.height() / 2),
                         pixmap);
 }