diff --git a/rizin b/rizin index 44400041..b9851b7c 160000 --- a/rizin +++ b/rizin @@ -1 +1 @@ -Subproject commit 444000416cc929d4ce67116a46eaeee1d8a5b4fd +Subproject commit b9851b7c24ab5d3cc2d0192d4b8f8859cad2999c diff --git a/src/core/Cutter.cpp b/src/core/Cutter.cpp index f9f8570c..4a1ae79c 100644 --- a/src/core/Cutter.cpp +++ b/src/core/Cutter.cpp @@ -3226,15 +3226,12 @@ QList CutterCore::getAllHeaders() if (!bf) { return {}; } - const RzList *fields = rz_bin_object_get_fields(bf->o); + const RzPVector *fields = rz_bin_object_get_fields(bf->o); if (!fields) { return {}; } - RzListIter *iter; - RzBinField *field; QList ret; - - CutterRzListForeach (fields, iter, RzBinField, field) { + for (auto field : CutterPVector(fields)) { HeaderDescription header; header.vaddr = field->vaddr; header.paddr = field->paddr; @@ -3242,7 +3239,6 @@ QList CutterCore::getAllHeaders() header.name = field->name; ret << header; } - return ret; } diff --git a/src/widgets/Dashboard.cpp b/src/widgets/Dashboard.cpp index aeb156c3..192aab30 100644 --- a/src/widgets/Dashboard.cpp +++ b/src/widgets/Dashboard.cpp @@ -134,11 +134,11 @@ void Dashboard::updateContents() setPlainText(ui->percentageLineEdit, QString::number(precentage) + "%"); ui->libraryList->setPlainText(""); - const RzList *libs = bf ? rz_bin_object_get_libs(bf->o) : nullptr; + const RzPVector *libs = bf ? rz_bin_object_get_libs(bf->o) : nullptr; if (libs) { QString libText; bool first = true; - for (const auto &lib : CutterRzList(libs)) { + for (const auto &lib : CutterPVector(libs)) { if (!first) { libText.append("\n"); }