petern/OpenTTD
1
0
Fork 0
forked from mirror/OpenTTD
Code Pull Requests Activity

Codechange: Use std::map instead of custom SmallMap.

Browse Source
This commit is contained in:
Peter Nelson
2023-05-16 20:50:41 +01:00
committed by PeterN
parent 72018badff
commit c38df2d589
30 changed files with 81 additions and 235 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/window.cpp
View File

@@ -340,7 +340,7 @@ Scrollbar *Window::GetScrollbar(uint widnum)
*/
const QueryString *Window::GetQueryString(uint widnum) const
{
auto query = this->querystrings.Find(widnum);
auto query = this->querystrings.find(widnum);
return query != this->querystrings.end() ? query->second : nullptr;
}
@@ -351,8 +351,8 @@ const QueryString *Window::GetQueryString(uint widnum) const
*/
QueryString *Window::GetQueryString(uint widnum)
{
SmallMap<int, QueryString*>::Pair *query = this->querystrings.Find(widnum);
return query != this->querystrings.End() ? query->second : nullptr;
auto query = this->querystrings.find(widnum);
return query != this->querystrings.end() ? query->second : nullptr;
}
/**
@@ -360,8 +360,7 @@ QueryString *Window::GetQueryString(uint widnum)
*/
void Window::UpdateQueryStringSize()
{
for (auto &qs : this->querystrings)
{
for (auto &qs : this->querystrings) {
qs.second->text.UpdateSize();
}
}
@@ -1912,7 +1911,7 @@ static void DecreaseWindowCounters()
}
/* Handle editboxes */
for (SmallMap<int, QueryString*>::Pair &pair : w->querystrings) {
for (auto &pair : w->querystrings) {
pair.second->HandleEditBox(w, pair.first);
}