refactor: Replace getXName().c_str(ctx) with ctx->nameOfX

This makes the ongoing migration to IdStringList easier.

Signed-off-by: D. Shah <dave@ds0.me>

2 files changed, 14 insertions, 16 deletions

diff --git a/gui/designwidget.cc b/gui/designwidget.cc
index f856b5f6..ff79c3a1 100644
--- a/gui/designwidget.cc
+++ b/gui/designwidget.cc
@@ -631,7 +631,7 @@ void DesignWidget::onSelectionChanged(int num, const QItemSelection &, const QIt
             addProperty(portInfoItem, QVariant::String, "Name", item.c_str(ctx));

             addProperty(portInfoItem, QVariant::Int, "Type", int(ctx->getBelPinType(bel, item)));

             WireId wire = ctx->getBelPinWire(bel, item);

-            addProperty(portInfoItem, QVariant::String, "Wire", ctx->getWireName(wire).c_str(ctx), ElementType::WIRE);

+            addProperty(portInfoItem, QVariant::String, "Wire", ctx->nameOfWire(wire), ElementType::WIRE);

         }

     } else if (type == ElementType::WIRE) {

         std::lock_guard<std::mutex> lock_ui(ctx->ui_mutex);

@@ -644,8 +644,8 @@ void DesignWidget::onSelectionChanged(int num, const QItemSelection &, const QIt
         addProperty(topItem, QVariant::String, "Type", ctx->getWireType(wire).c_str(ctx));

         addProperty(topItem, QVariant::Bool, "Available", ctx->checkWireAvail(wire));

         addProperty(topItem, QVariant::String, "Bound Net", ctx->nameOf(ctx->getBoundWireNet(wire)), ElementType::NET);

-        addProperty(topItem, QVariant::String, "Conflicting Wire",

-                    ctx->getWireName(ctx->getConflictingWireWire(wire)).c_str(ctx), ElementType::WIRE);

+        addProperty(topItem, QVariant::String, "Conflicting Wire", ctx->nameOfWire(ctx->getConflictingWireWire(wire)),

+                    ElementType::WIRE);

         addProperty(topItem, QVariant::String, "Conflicting Net", ctx->nameOf(ctx->getConflictingWireNet(wire)),

                     ElementType::NET);

 

@@ -666,7 +666,7 @@ void DesignWidget::onSelectionChanged(int num, const QItemSelection &, const QIt
         for (const auto &item : ctx->getWireBelPins(wire)) {

             QString belname = "";

             if (item.bel != BelId())

-                belname = ctx->getBelName(item.bel).c_str(ctx);

+                belname = ctx->nameOfBel(item.bel);

             QString pinname = item.pin.c_str(ctx);

 

             QtProperty *dhItem = addSubGroup(belpinsItem, belname + "-" + pinname);

@@ -707,16 +707,15 @@ void DesignWidget::onSelectionChanged(int num, const QItemSelection &, const QIt
         addProperty(topItem, QVariant::Bool, "Available", ctx->checkPipAvail(pip));

         addProperty(topItem, QVariant::String, "Bound Net", ctx->nameOf(ctx->getBoundPipNet(pip)), ElementType::NET);

         if (ctx->getConflictingPipWire(pip) != WireId()) {

-            addProperty(topItem, QVariant::String, "Conflicting Wire",

-                        ctx->getWireName(ctx->getConflictingPipWire(pip)).c_str(ctx), ElementType::WIRE);

+            addProperty(topItem, QVariant::String, "Conflicting Wire", ctx->nameOfWire(ctx->getConflictingPipWire(pip)),

+                        ElementType::WIRE);

         } else {

             addProperty(topItem, QVariant::String, "Conflicting Wire", "", ElementType::NONE);

         }

         addProperty(topItem, QVariant::String, "Conflicting Net", ctx->nameOf(ctx->getConflictingPipNet(pip)),

                     ElementType::NET);

-        addProperty(topItem, QVariant::String, "Src Wire", ctx->getWireName(ctx->getPipSrcWire(pip)).c_str(ctx),

-                    ElementType::WIRE);

-        addProperty(topItem, QVariant::String, "Dest Wire", ctx->getWireName(ctx->getPipDstWire(pip)).c_str(ctx),

+        addProperty(topItem, QVariant::String, "Src Wire", ctx->nameOfWire(ctx->getPipSrcWire(pip)), ElementType::WIRE);

+        addProperty(topItem, QVariant::String, "Dest Wire", ctx->nameOfWire(ctx->getPipDstWire(pip)),

                     ElementType::WIRE);

 

         QtProperty *attrsItem = addSubGroup(topItem, "Attributes");

@@ -769,14 +768,13 @@ void DesignWidget::onSelectionChanged(int num, const QItemSelection &, const QIt
 

         QtProperty *wiresItem = addSubGroup(topItem, "Wires");

         for (auto &item : net->wires) {

-            auto name = ctx->getWireName(item.first).c_str(ctx);

+            auto name = ctx->nameOfWire(item.first);

 

             QtProperty *wireItem = addSubGroup(wiresItem, name);

             addProperty(wireItem, QVariant::String, "Wire", name, ElementType::WIRE);

 

             if (item.second.pip != PipId())

-                addProperty(wireItem, QVariant::String, "Pip", ctx->getPipName(item.second.pip).c_str(ctx),

-                            ElementType::PIP);

+                addProperty(wireItem, QVariant::String, "Pip", ctx->nameOfPip(item.second.pip), ElementType::PIP);

             else

                 addProperty(wireItem, QVariant::String, "Pip", "", ElementType::PIP);

 

diff --git a/gui/fpgaviewwidget.cc b/gui/fpgaviewwidget.cc
index 67ab80fd..9c90e2c5 100644
--- a/gui/fpgaviewwidget.cc
+++ b/gui/fpgaviewwidget.cc
@@ -779,22 +779,22 @@ void FPGAViewWidget::mouseMoveEvent(QMouseEvent *event)
         rendererArgs_->x = event->x();
         rendererArgs_->y = event->y();
         if (closest.type == ElementType::BEL) {
-            rendererArgs_->hintText = std::string("BEL\n") + ctx_->getBelName(closest.bel).c_str(ctx_);
+            rendererArgs_->hintText = std::string("BEL\n") + ctx_->getBelName(closest.bel).str(ctx_);
             CellInfo *cell = ctx_->getBoundBelCell(closest.bel);
             if (cell != nullptr)
                 rendererArgs_->hintText += std::string("\nCELL\n") + ctx_->nameOf(cell);
         } else if (closest.type == ElementType::WIRE) {
-            rendererArgs_->hintText = std::string("WIRE\n") + ctx_->getWireName(closest.wire).c_str(ctx_);
+            rendererArgs_->hintText = std::string("WIRE\n") + ctx_->getWireName(closest.wire).str(ctx_);
             NetInfo *net = ctx_->getBoundWireNet(closest.wire);
             if (net != nullptr)
                 rendererArgs_->hintText += std::string("\nNET\n") + ctx_->nameOf(net);
         } else if (closest.type == ElementType::PIP) {
-            rendererArgs_->hintText = std::string("PIP\n") + ctx_->getPipName(closest.pip).c_str(ctx_);
+            rendererArgs_->hintText = std::string("PIP\n") + ctx_->getPipName(closest.pip).str(ctx_);
             NetInfo *net = ctx_->getBoundPipNet(closest.pip);
             if (net != nullptr)
                 rendererArgs_->hintText += std::string("\nNET\n") + ctx_->nameOf(net);
         } else if (closest.type == ElementType::GROUP) {
-            rendererArgs_->hintText = std::string("GROUP\n") + ctx_->getGroupName(closest.group).c_str(ctx_);
+            rendererArgs_->hintText = std::string("GROUP\n") + ctx_->getGroupName(closest.group).str(ctx_);
         } else
             rendererArgs_->hintText = "";