refactor: Rename procedure node icons (#1934)

src/gui/main.qrc

@@ -1,28 +1,28 @@
 <RCC>
   <qresource prefix="nodes">
-    <file>icons/nodes/add.svg</file>
-    <file>icons/nodes/sphericalGlobalPotential.svg</file>
-    <file>icons/nodes/regionalGlobalPotential.svg</file>
-    <file>icons/nodes/restraintPotential.svg</file>
-    <file>icons/nodes/cylindricalGlobalPotential.svg</file>
-    <file>icons/nodes/box.svg</file>
-    <file>icons/nodes/customRegion.svg</file>
-    <file>icons/nodes/coordinateSets.svg</file>
-    <file>icons/nodes/addPair.svg</file>
-    <file>icons/nodes/cylindricalRegion.svg</file>
-    <file>icons/nodes/copy.svg</file>
-    <file>icons/nodes/generalRegion.svg</file>
-    <file>icons/nodes/parameters.svg</file>
-    <file>icons/nodes/pick.svg</file>
-    <file>icons/nodes/pickProximity.svg</file>
-    <file>icons/nodes/pickRegion.svg</file>
-    <file>icons/nodes/remove.svg</file>
-    <file>icons/nodes/select.svg</file>
-    <file>icons/nodes/transmute.svg</file>
-    <file>icons/nodes/temperature.svg</file>
-    <file>icons/nodes/sizeFactor.svg</file>
-    <file>icons/nodes/rotateFragment.svg</file>
-    <file>icons/nodes/importCoordinates.svg</file>
+    <file>icons/nodes/Add.svg</file>
+    <file>icons/nodes/SphericalGlobalPotential.svg</file>
+    <file>icons/nodes/RegionalGlobalPotential.svg</file>
+    <file>icons/nodes/RestraintPotential.svg</file>
+    <file>icons/nodes/CylindricalGlobalPotential.svg</file>
+    <file>icons/nodes/Box.svg</file>
+    <file>icons/nodes/CustomRegion.svg</file>
+    <file>icons/nodes/CoordinateSets.svg</file>
+    <file>icons/nodes/AddPair.svg</file>
+    <file>icons/nodes/CylindricalRegion.svg</file>
+    <file>icons/nodes/Copy.svg</file>
+    <file>icons/nodes/GeneralRegion.svg</file>
+    <file>icons/nodes/Parameters.svg</file>
+    <file>icons/nodes/Pick.svg</file>
+    <file>icons/nodes/PickProximity.svg</file>
+    <file>icons/nodes/PickRegion.svg</file>
+    <file>icons/nodes/Remove.svg</file>
+    <file>icons/nodes/Select.svg</file>
+    <file>icons/nodes/Transmute.svg</file>
+    <file>icons/nodes/Temperature.svg</file>
+    <file>icons/nodes/SizeFactor.svg</file>
+    <file>icons/nodes/RotateFragment.svg</file>
+    <file>icons/nodes/ImportCoordinates.svg</file>
   </qresource>
   <qresource prefix="dissolve">
     <file>icons/dissolve.png</file>

src/gui/models/nodePaletteModel.cpp

@@ -60,12 +60,12 @@ QVariant NodePaletteModel::data(const QModelIndex &index, int role) const
         switch (role)
         {
             case (Qt::DisplayRole):
-                return QString::fromStdString(std::string(ProcedureNode::nodeTypes().keyword(nodeType)));
+                return QString::fromStdString(ProcedureNode::nodeTypes().keyword(nodeType));
             case (Qt::ToolTipRole):
                 return QString::fromStdString(brief);
             case (Qt::DecorationRole):
-                return QIcon(QPixmap(
-                    QString(":/nodes/icons/nodes/%1.svg").arg(QString::fromStdString(ProcedureNode::lccNodeType(nodeType)))));
+                return QIcon(QPixmap(QString(":/nodes/icons/nodes/%1.svg")
+                                         .arg(QString::fromStdString(ProcedureNode::nodeTypes().keyword(nodeType)))));
             default:
                 return {};
         }

src/gui/models/procedureModel.cpp

@@ -89,21 +89,18 @@ QVariant ProcedureModel::data(const QModelIndex &index, int role) const
     {
         case (Qt::DisplayRole):
             if (node->name().empty())
-                return QString::fromStdString(std::string(ProcedureNode::nodeTypes().keyword(node->type())));
+                return QString::fromStdString(ProcedureNode::nodeTypes().keyword(node->type()));
             else
-                return QString("%1 (%2)").arg(
-                    QString::fromStdString(std::string(node->name())),
-                    QString::fromStdString(std::string(ProcedureNode::nodeTypes().keyword(node->type()))));
+                return QString("%1 (%2)").arg(QString::fromStdString(std::string(node->name())),
+                                              QString::fromStdString(ProcedureNode::nodeTypes().keyword(node->type())));
         case (Qt::UserRole):
             return QVariant::fromValue(node->shared_from_this());
         case (Qt::DecorationRole):
-            return QIcon(QPixmap(
-                QString(":/nodes/icons/nodes/%1.svg").arg(QString::fromStdString(ProcedureNode::lccNodeType(node->type())))));
+            return QIcon(QPixmap(QString(":/nodes/icons/nodes/%1.svg")
+                                     .arg(QString::fromStdString(ProcedureNode::nodeTypes().keyword(node->type())))));
         default:
             return {};
     }
-
-    return {};
 }
 
 bool ProcedureModel::setData(const QModelIndex &index, const QVariant &value, int role)

src/gui/nodeControlWidget.cpp

@@ -18,8 +18,8 @@ NodeControlWidget::NodeControlWidget(DissolveWindow *dissolveWindow, NodeRef nod
     connect(dissolveWindow, SIGNAL(dataMutated(int)), this, SLOT(globalDataMutated(int)));
 
     // Set the icon label
-    ui_.NodeIconLabel->setPixmap(
-        QPixmap(QString(":/nodes/icons/nodes/%1.svg").arg(QString::fromStdString(ProcedureNode::lccNodeType(node->type())))));
+    ui_.NodeIconLabel->setPixmap(QPixmap(
+        QString(":/nodes/icons/nodes/%1.svg").arg(QString::fromStdString(ProcedureNode::nodeTypes().keyword(node->type())))));
 
     // Set up any keyword widgets we have
     if (!node_->keywords().sections().empty())
@@ -49,7 +49,7 @@ void NodeControlWidget::updateControls()
     // Ensure node name and icon status are up to date
     ui_.NodeNameLabel->setText(
         QString("%1 (%2)").arg(QString::fromStdString(std::string(node_->name())),
-                               QString::fromStdString(std::string(ProcedureNode::nodeTypes().keyword(node_->type())))));
+                               QString::fromStdString(ProcedureNode::nodeTypes().keyword(node_->type()))));
 
     // Update keywords
     ui_.NodeKeywordsWidget->updateControls();

src/procedure/nodes/node.cpp

@@ -44,14 +44,6 @@ EnumOptions<ProcedureNode::NodeType> ProcedureNode::nodeTypes()
                      {ProcedureNode::NodeType::Transmute, "Transmute"}});
 }
 
-// Return the lowerCamelCase name of the node type provided
-std::string ProcedureNode::lccNodeType(NodeType nodeType)
-{
-    auto lccNodeName = ProcedureNode::nodeTypes().keyword(nodeType);
-    lccNodeName.front() = tolower(lccNodeName.front());
-    return lccNodeName;
-}
-
 ProcedureNode::ProcedureNode(NodeType nodeType) : type_(nodeType) {}
 
 /*

src/procedure/nodes/node.h

@@ -59,8 +59,6 @@ class ProcedureNode : public std::enable_shared_from_this<ProcedureNode>, public
     using NodeTypeVector = std::vector<ProcedureNode::NodeType>;
     // Return enum option info for NodeType
     static EnumOptions<NodeType> nodeTypes();
-    // Return the lowerCamelCase name of the node type provided
-    static std::string lccNodeType(NodeType nodeType);
     ProcedureNode(NodeType nodeType);
     virtual ~ProcedureNode() = default;