From 7f3058d501481bdc6d6e642ef14a635d43f99927 Mon Sep 17 00:00:00 2001 From: jvoisin Date: Fri, 25 Feb 2022 17:40:27 +0100 Subject: [PATCH] Use toStringView in esmtool instead of toString --- apps/esmtool/esmtool.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/apps/esmtool/esmtool.cpp b/apps/esmtool/esmtool.cpp index a7946c77a6..a968dcb464 100644 --- a/apps/esmtool/esmtool.cpp +++ b/apps/esmtool/esmtool.cpp @@ -293,7 +293,7 @@ void printRaw(ESM::ESMReader &esm) while(esm.hasMoreRecs()) { ESM::NAME n = esm.getRecName(); - std::cout << "Record: " << n.toString() << '\n'; + std::cout << "Record: " << n.toStringView() << '\n'; esm.getRecHeader(); while(esm.hasMoreSubs()) { @@ -302,7 +302,7 @@ void printRaw(ESM::ESMReader &esm) esm.skipHSub(); n = esm.retSubName(); std::ios::fmtflags f(std::cout.flags()); - std::cout << " " << n.toString() << " - " << esm.getSubSize() + std::cout << " " << n.toStringView() << " - " << esm.getSubSize() << " bytes @ 0x" << std::hex << offs << '\n'; std::cout.flags(f); } @@ -367,9 +367,9 @@ int load(Arguments& info) auto record = EsmTool::RecordBase::create(n); if (record == nullptr) { - if (skipped.count(n.toInt()) == 0) + if (!quiet && skipped.count(n.toInt()) == 0) { - std::cout << "Skipping " << n.toString() << " records.\n"; + std::cout << "Skipping " << n.toStringView() << " records.\n"; skipped.emplace(n.toInt()); } @@ -389,7 +389,7 @@ int load(Arguments& info) if (!info.types.empty()) { std::vector::iterator match; - match = std::find(info.types.begin(), info.types.end(), n.toString()); + match = std::find(info.types.begin(), info.types.end(), n.toStringView()); if (match == info.types.end()) interested = false; } @@ -398,7 +398,7 @@ int load(Arguments& info) if(!quiet && interested) { - std::cout << "\nRecord: " << n.toString() << " '" << record->getId() << "'\n"; + std::cout << "\nRecord: " << n.toStringView() << " '" << record->getId() << "'\n"; record->print(); } @@ -454,7 +454,7 @@ int clone(Arguments& info) ESM::NAME name; name = stat.first; int amount = stat.second; - std::cout << std::setw(digitCount) << amount << " " << name.toString() << " "; + std::cout << std::setw(digitCount) << amount << " " << name.toStringView() << " "; if (++i % 3 == 0) std::cout << '\n'; }