mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

Codechange: Apply coding style

pull/8708/head
SamuXarick 2021-02-19 15:06:00 +00:00 committed by Charles Pigott
parent 058f13bdf9
commit cb95b1d2e7
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/object_gui.cpp
View File

@ -42,7 +42,7 @@ class BuildObjectWindow : public Window {
int line_height; ///< The height of a single line. int line_height; ///< The height of a single line.
int info_height; ///< The height of the info box. int info_height; ///< The height of the info box.
Scrollbar* vscroll; ///< The scrollbar. Scrollbar *vscroll; ///< The scrollbar.
static Listing last_sorting; ///< Default sorting of #GUIObjectClassList. static Listing last_sorting; ///< Default sorting of #GUIObjectClassList.
static Filtering last_filtering; ///< Default filtering of #GUIObjectClassList. static Filtering last_filtering; ///< Default filtering of #GUIObjectClassList.
@ -114,7 +114,7 @@ public:
ResetObjectToPlace(); ResetObjectToPlace();
this->vscroll->SetCount((int) this->object_classes.size()); this->vscroll->SetCount((int)this->object_classes.size());
EnsureSelectedObjectClassIsVisible(); EnsureSelectedObjectClassIsVisible();
@ -122,7 +122,7 @@ public:
} }
/** Sort object classes by class name. */ /** Sort object classes by class name. */
static bool NameSorter(const ObjectClass *const& a, const ObjectClass *const& b) static bool NameSorter(const ObjectClass * const &a, const ObjectClass * const &b)
{ {
char buffer_a[DRAW_STRING_BUFFER]; char buffer_a[DRAW_STRING_BUFFER];
GetString(buffer_a, a->name, lastof(buffer_a)); GetString(buffer_a, a->name, lastof(buffer_a));
@ -134,7 +134,7 @@ public:
} }
/** Filter object classes by class name. */ /** Filter object classes by class name. */
static bool CDECL TagNameFilter(const ObjectClass *const* oc, StringFilter& filter) static bool CDECL TagNameFilter(const ObjectClass * const *oc, StringFilter &filter)
{ {
char buffer[DRAW_STRING_BUFFER]; char buffer[DRAW_STRING_BUFFER];
GetString(buffer, (*oc)->name, lastof(buffer)); GetString(buffer, (*oc)->name, lastof(buffer));
@ -180,7 +180,7 @@ public:
* result of starting a new game without the corresponding NewGRF. */ * result of starting a new game without the corresponding NewGRF. */
bool available = false; bool available = false;
for (uint i = 0; ObjectClass::GetClassCount(); ++i) { for (uint i = 0; ObjectClass::GetClassCount(); ++i) {
ObjectClass* objclass = ObjectClass::Get((ObjectClassID)i); ObjectClass *objclass = ObjectClass::Get((ObjectClassID)i);
if (objclass == _selected_object_class) { if (objclass == _selected_object_class) {
available = true; available = true;
break; break;
@ -588,11 +588,11 @@ public:
Listing BuildObjectWindow::last_sorting = { false, 0 }; Listing BuildObjectWindow::last_sorting = { false, 0 };
Filtering BuildObjectWindow::last_filtering = { false, 0 }; Filtering BuildObjectWindow::last_filtering = { false, 0 };
BuildObjectWindow::GUIObjectClassList::SortFunction* const BuildObjectWindow::sorter_funcs[] = { BuildObjectWindow::GUIObjectClassList::SortFunction * const BuildObjectWindow::sorter_funcs[] = {
&NameSorter, &NameSorter,
}; };
BuildObjectWindow::GUIObjectClassList::FilterFunction* const BuildObjectWindow::filter_funcs[] = { BuildObjectWindow::GUIObjectClassList::FilterFunction * const BuildObjectWindow::filter_funcs[] = {
&TagNameFilter, &TagNameFilter,
}; };