kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

TechDraw: apply std::ranges

Browse Source
This commit is contained in:
bofdahof
2025-03-12 20:03:39 +10:00
committed by Chris Hennes
parent 34881bc82e
commit 20141d7f19
5 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/Mod/TechDraw/App/DrawTemplate.cpp
View File

@@ -116,10 +116,9 @@ std::pair<int, int> DrawTemplate::getPageNumbers() const
std::sort(pageNames.begin(), pageNames.end(), collator);
int pos = 0;
DrawPage *page = getParentPage();
if (page) {
auto it = std::find(pageNames.begin(), pageNames.end(), QString::fromUtf8(page->Label.getValue()));
if (it != pageNames.end()) {
if (const DrawPage* page = getParentPage()) {
if (const auto it = std::ranges::find(pageNames, QString::fromUtf8(page->Label.getValue()));
it != pageNames.end()) {
pos = it - pageNames.begin() + 1;
}
}

4
src/Mod/TechDraw/App/DrawViewSpreadsheet.cpp
View File

@@ -331,7 +331,7 @@ std::string DrawViewSpreadsheet::getSheetImage()
cell->getAlignment(alignment);
}
// skip cell if found in skiplist
if (std::find(skiplist.begin(), skiplist.end(), address.toString()) == skiplist.end()) {
if (std::ranges::find(skiplist, address.toString()) == skiplist.end()) {
result << " <rect x=\"" << coloffset << "\" y=\"" << rowoffset << "\" width=\""
<< cellwidth << "\" height=\"" << cellheight << "\" style=\"fill:" << bcolor
<< ";stroke-width:" << LineWidth.getValue() / getScale()
@@ -388,7 +388,7 @@ std::string DrawViewSpreadsheet::getSheetImage()
int DrawViewSpreadsheet::colInList(const std::vector<std::string>& list,
const std::string& toFind)
{
auto match = std::find(std::begin(list), std::end(list), toFind);
const auto match = std::ranges::find(list, toFind);
if (match == std::end(list)) {
return -1; // Error value
}