27551410928

Committed 15 Jun 2026 01:57PM UTC coverage: 50.354% (-0.4%) from 50.749%

Build # 27551410928

Build Type

Pull #1947

github

Committed by

web-flow

Commit Message

Merge 223793751 into f299328f2

Pull Request Pull Request #1947: Replace `boost::optional` by `std::optional`

Coverage Stats

35 of 103 new or added lines in 52 files covered. (33.98%)

5 existing lines in 2 files now uncovered.

23178 of 46030 relevant lines covered (50.35%)

43858.99 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

5.94

/libs/s25main/controls/ctrlGroup.cpp

// Copyright (C) 2005 - 2021 Settlers Freaks (sf-team at siedler25.org)
//
// SPDX-License-Identifier: GPL-2.0-or-later

#include "ctrlGroup.h"

struct MouseCoords;
struct KeyEvent;

ctrlGroup::ctrlGroup(Window* parent, unsigned id) : Window(parent, id, DrawPoint(0, 0)) {}

void ctrlGroup::Msg_ButtonClick(const unsigned ctrl_id)
{
    GetParent()->Msg_Group_ButtonClick(this->GetID(), ctrl_id);
}

void ctrlGroup::Msg_EditEnter(const unsigned ctrl_id)
{
    GetParent()->Msg_Group_EditEnter(this->GetID(), ctrl_id);
}

void ctrlGroup::Msg_EditChange(const unsigned ctrl_id)
{
    GetParent()->Msg_Group_EditChange(this->GetID(), ctrl_id);
}

void ctrlGroup::Msg_TabChange(const unsigned ctrl_id, const unsigned short tab_id)
{
    GetParent()->Msg_Group_TabChange(this->GetID(), ctrl_id, tab_id);
}

void ctrlGroup::Msg_ListSelectItem(const unsigned ctrl_id, const int selection)
{
    GetParent()->Msg_Group_ListSelectItem(this->GetID(), ctrl_id, selection);
}

void ctrlGroup::Msg_ComboSelectItem(const unsigned ctrl_id, const unsigned selection)
{
    GetParent()->Msg_Group_ComboSelectItem(this->GetID(), ctrl_id, selection);
}

void ctrlGroup::Msg_CheckboxChange(const unsigned ctrl_id, const bool checked)
{
    GetParent()->Msg_Group_CheckboxChange(this->GetID(), ctrl_id, checked);
}

void ctrlGroup::Msg_ProgressChange(const unsigned ctrl_id, const unsigned short position)
{
    GetParent()->Msg_Group_ProgressChange(this->GetID(), ctrl_id, position);
}

void ctrlGroup::Msg_ScrollShow(const unsigned ctrl_id, const bool visible)
{
    GetParent()->Msg_Group_ScrollShow(this->GetID(), ctrl_id, visible);
}

void ctrlGroup::Msg_OptionGroupChange(const unsigned ctrl_id, const unsigned selection)
{
    GetParent()->Msg_Group_OptionGroupChange(this->GetID(), ctrl_id, selection);
}

void ctrlGroup::Msg_Timer(const unsigned ctrl_id)
{
    GetParent()->Msg_Group_Timer(this->GetID(), ctrl_id);
}

void ctrlGroup::Msg_TableSelectItem(const unsigned ctrl_id, const std::optional<unsigned>& selection)
{
    GetParent()->Msg_Group_TableSelectItem(this->GetID(), ctrl_id, selection);
}

void ctrlGroup::Msg_TableRightButton(const unsigned ctrl_id, const std::optional<unsigned>& selection)
{
    GetParent()->Msg_Group_TableRightButton(this->GetID(), ctrl_id, selection);
}

void ctrlGroup::Msg_TableLeftButton(const unsigned ctrl_id, const std::optional<unsigned>& selection)
{
    GetParent()->Msg_Group_TableLeftButton(this->GetID(), ctrl_id, selection);
}

bool ctrlGroup::Msg_LeftDown(const MouseCoords& mc)
{
    return RelayMouseMessage(&Window::Msg_LeftDown, mc);
}

bool ctrlGroup::Msg_RightDown(const MouseCoords& mc)
{
    return RelayMouseMessage(&Window::Msg_RightDown, mc);
}

bool ctrlGroup::Msg_LeftUp(const MouseCoords& mc)
{
    return RelayMouseMessage(&Window::Msg_LeftUp, mc);
}

bool ctrlGroup::Msg_RightUp(const MouseCoords& mc)
{
    return RelayMouseMessage(&Window::Msg_RightUp, mc);
}

bool ctrlGroup::Msg_WheelUp(const MouseCoords& mc)
{
    return RelayMouseMessage(&Window::Msg_WheelUp, mc);
}

bool ctrlGroup::Msg_WheelDown(const MouseCoords& mc)
{
    return RelayMouseMessage(&Window::Msg_WheelDown, mc);
}

bool ctrlGroup::Msg_MouseMove(const MouseCoords& mc)
{
    return RelayMouseMessage(&Window::Msg_MouseMove, mc);
}

bool ctrlGroup::Msg_KeyDown(const KeyEvent& ke)
{
    return RelayKeyboardMessage(&Window::Msg_KeyDown, ke);
}

void ctrlGroup::Msg_Group_ButtonClick(const unsigned /*group_id*/, const unsigned ctrl_id)
{
    GetParent()->Msg_Group_ButtonClick(this->GetID(), ctrl_id);
}

void ctrlGroup::Msg_Group_EditEnter(const unsigned /*group_id*/, const unsigned ctrl_id)
{
    GetParent()->Msg_Group_EditEnter(this->GetID(), ctrl_id);
}

void ctrlGroup::Msg_Group_EditChange(const unsigned /*group_id*/, const unsigned ctrl_id)
{
    GetParent()->Msg_Group_EditChange(this->GetID(), ctrl_id);
}

void ctrlGroup::Msg_Group_TabChange(const unsigned /*group_id*/, const unsigned ctrl_id, const unsigned short tab_id)
{
    GetParent()->Msg_Group_TabChange(this->GetID(), ctrl_id, tab_id);
}

void ctrlGroup::Msg_Group_ListSelectItem(const unsigned /*group_id*/, const unsigned ctrl_id, const int selection)
{
    GetParent()->Msg_Group_ListSelectItem(this->GetID(), ctrl_id, selection);
}

void ctrlGroup::Msg_Group_ComboSelectItem(const unsigned /*group_id*/, const unsigned ctrl_id, const unsigned selection)
{
    GetParent()->Msg_Group_ComboSelectItem(this->GetID(), ctrl_id, selection);
}

void ctrlGroup::Msg_Group_CheckboxChange(const unsigned /*group_id*/, const unsigned ctrl_id, const bool checked)
{
    GetParent()->Msg_Group_CheckboxChange(this->GetID(), ctrl_id, checked);
}

void ctrlGroup::Msg_Group_ProgressChange(const unsigned /*group_id*/, const unsigned ctrl_id,
                                         const unsigned short position)
{
    GetParent()->Msg_Group_ProgressChange(this->GetID(), ctrl_id, position);
}

void ctrlGroup::Msg_Group_ScrollShow(const unsigned /*group_id*/, const unsigned ctrl_id, const bool visible)
{
    GetParent()->Msg_Group_ScrollShow(this->GetID(), ctrl_id, visible);
}

void ctrlGroup::Msg_Group_OptionGroupChange(const unsigned /*group_id*/, const unsigned ctrl_id, unsigned selection)
{
    GetParent()->Msg_Group_OptionGroupChange(this->GetID(), ctrl_id, selection);
}

void ctrlGroup::Msg_Group_Timer(const unsigned /*group_id*/, const unsigned ctrl_id)
{
    GetParent()->Msg_Group_Timer(this->GetID(), ctrl_id);
}

void ctrlGroup::Msg_Group_TableSelectItem(const unsigned /*group_id*/, const unsigned ctrl_id,
                                          const std::optional<unsigned>& selection)
{
    GetParent()->Msg_Group_TableSelectItem(this->GetID(), ctrl_id, selection);
}

void ctrlGroup::Msg_Group_TableRightButton(const unsigned /*group_id*/, const unsigned ctrl_id,
                                           const std::optional<unsigned>& selection)
{
    GetParent()->Msg_Group_TableRightButton(this->GetID(), ctrl_id, selection);
}

void ctrlGroup::Msg_Group_TableLeftButton(const unsigned /*group_id*/, const unsigned ctrl_id,
                                          const std::optional<unsigned>& selection)
{
    GetParent()->Msg_Group_TableLeftButton(this->GetID(), ctrl_id, selection);
}

1	// Copyright (C) 2005 - 2021 Settlers Freaks (sf-team at siedler25.org)
2	//
3	// SPDX-License-Identifier: GPL-2.0-or-later
4
5	#include "ctrlGroup.h"
6
7	struct MouseCoords;
8	struct KeyEvent;
9
10	ctrlGroup::ctrlGroup(Window* parent, unsigned id) : Window(parent, id, DrawPoint(0, 0)) {}	113✔
11
12	void ctrlGroup::Msg_ButtonClick(const unsigned ctrl_id)	×
13	{
14	GetParent()->Msg_Group_ButtonClick(this->GetID(), ctrl_id);	×
15	}	×
16
17	void ctrlGroup::Msg_EditEnter(const unsigned ctrl_id)	×
18	{
19	GetParent()->Msg_Group_EditEnter(this->GetID(), ctrl_id);	×
20	}	×
21
22	void ctrlGroup::Msg_EditChange(const unsigned ctrl_id)	×
23	{
24	GetParent()->Msg_Group_EditChange(this->GetID(), ctrl_id);	×
25	}	×
26
27	void ctrlGroup::Msg_TabChange(const unsigned ctrl_id, const unsigned short tab_id)	1✔
28	{
29	GetParent()->Msg_Group_TabChange(this->GetID(), ctrl_id, tab_id);	1✔
30	}	1✔
31
32	void ctrlGroup::Msg_ListSelectItem(const unsigned ctrl_id, const int selection)	×
33	{
34	GetParent()->Msg_Group_ListSelectItem(this->GetID(), ctrl_id, selection);	×
35	}	×
36
37	void ctrlGroup::Msg_ComboSelectItem(const unsigned ctrl_id, const unsigned selection)	×
38	{
39	GetParent()->Msg_Group_ComboSelectItem(this->GetID(), ctrl_id, selection);	×
40	}	×
41
42	void ctrlGroup::Msg_CheckboxChange(const unsigned ctrl_id, const bool checked)	×
43	{
44	GetParent()->Msg_Group_CheckboxChange(this->GetID(), ctrl_id, checked);	×
45	}	×
46
47	void ctrlGroup::Msg_ProgressChange(const unsigned ctrl_id, const unsigned short position)	×
48	{
49	GetParent()->Msg_Group_ProgressChange(this->GetID(), ctrl_id, position);	×
50	}	×
51
52	void ctrlGroup::Msg_ScrollShow(const unsigned ctrl_id, const bool visible)	×
53	{
54	GetParent()->Msg_Group_ScrollShow(this->GetID(), ctrl_id, visible);	×
55	}	×
56
57	void ctrlGroup::Msg_OptionGroupChange(const unsigned ctrl_id, const unsigned selection)	×
58	{
59	GetParent()->Msg_Group_OptionGroupChange(this->GetID(), ctrl_id, selection);	×
60	}	×
61
62	void ctrlGroup::Msg_Timer(const unsigned ctrl_id)	×
63	{
64	GetParent()->Msg_Group_Timer(this->GetID(), ctrl_id);	×
65	}	×
66
NEW 67	void ctrlGroup::Msg_TableSelectItem(const unsigned ctrl_id, const std::optional<unsigned>& selection)	×
68	{
69	GetParent()->Msg_Group_TableSelectItem(this->GetID(), ctrl_id, selection);	×
70	}	×
71
NEW 72	void ctrlGroup::Msg_TableRightButton(const unsigned ctrl_id, const std::optional<unsigned>& selection)	×
73	{
74	GetParent()->Msg_Group_TableRightButton(this->GetID(), ctrl_id, selection);	×
75	}	×
76
NEW 77	void ctrlGroup::Msg_TableLeftButton(const unsigned ctrl_id, const std::optional<unsigned>& selection)	×
78	{
79	GetParent()->Msg_Group_TableLeftButton(this->GetID(), ctrl_id, selection);	×
80	}	×
81
82	bool ctrlGroup::Msg_LeftDown(const MouseCoords& mc)	×
83	{
84	return RelayMouseMessage(&Window::Msg_LeftDown, mc);	×
85	}
86
87	bool ctrlGroup::Msg_RightDown(const MouseCoords& mc)	×
88	{
89	return RelayMouseMessage(&Window::Msg_RightDown, mc);	×
90	}
91
92	bool ctrlGroup::Msg_LeftUp(const MouseCoords& mc)	×
93	{
94	return RelayMouseMessage(&Window::Msg_LeftUp, mc);	×
95	}
96
97	bool ctrlGroup::Msg_RightUp(const MouseCoords& mc)	×
98	{
99	return RelayMouseMessage(&Window::Msg_RightUp, mc);	×
100	}
101
102	bool ctrlGroup::Msg_WheelUp(const MouseCoords& mc)	×
103	{
104	return RelayMouseMessage(&Window::Msg_WheelUp, mc);	×
105	}
106
107	bool ctrlGroup::Msg_WheelDown(const MouseCoords& mc)	×
108	{
109	return RelayMouseMessage(&Window::Msg_WheelDown, mc);	×
110	}
111
112	bool ctrlGroup::Msg_MouseMove(const MouseCoords& mc)	4✔
113	{
114	return RelayMouseMessage(&Window::Msg_MouseMove, mc);	4✔
115	}
116
117	bool ctrlGroup::Msg_KeyDown(const KeyEvent& ke)	×
118	{
119	return RelayKeyboardMessage(&Window::Msg_KeyDown, ke);	×
120	}
121
122	void ctrlGroup::Msg_Group_ButtonClick(const unsigned /group_id/, const unsigned ctrl_id)	×
123	{
124	GetParent()->Msg_Group_ButtonClick(this->GetID(), ctrl_id);	×
125	}	×
126
127	void ctrlGroup::Msg_Group_EditEnter(const unsigned /group_id/, const unsigned ctrl_id)	×
128	{
129	GetParent()->Msg_Group_EditEnter(this->GetID(), ctrl_id);	×
130	}	×
131
132	void ctrlGroup::Msg_Group_EditChange(const unsigned /group_id/, const unsigned ctrl_id)	×
133	{
134	GetParent()->Msg_Group_EditChange(this->GetID(), ctrl_id);	×
135	}	×
136
137	void ctrlGroup::Msg_Group_TabChange(const unsigned /group_id/, const unsigned ctrl_id, const unsigned short tab_id)	×
138	{
139	GetParent()->Msg_Group_TabChange(this->GetID(), ctrl_id, tab_id);	×
140	}	×
141
142	void ctrlGroup::Msg_Group_ListSelectItem(const unsigned /group_id/, const unsigned ctrl_id, const int selection)	×
143	{
144	GetParent()->Msg_Group_ListSelectItem(this->GetID(), ctrl_id, selection);	×
145	}	×
146
147	void ctrlGroup::Msg_Group_ComboSelectItem(const unsigned /group_id/, const unsigned ctrl_id, const unsigned selection)	×
148	{
149	GetParent()->Msg_Group_ComboSelectItem(this->GetID(), ctrl_id, selection);	×
150	}	×
151
152	void ctrlGroup::Msg_Group_CheckboxChange(const unsigned /group_id/, const unsigned ctrl_id, const bool checked)	×
153	{
154	GetParent()->Msg_Group_CheckboxChange(this->GetID(), ctrl_id, checked);	×
155	}	×
156
157	void ctrlGroup::Msg_Group_ProgressChange(const unsigned /group_id/, const unsigned ctrl_id,	×
158	const unsigned short position)
159	{
160	GetParent()->Msg_Group_ProgressChange(this->GetID(), ctrl_id, position);	×
161	}	×
162
163	void ctrlGroup::Msg_Group_ScrollShow(const unsigned /group_id/, const unsigned ctrl_id, const bool visible)	×
164	{
165	GetParent()->Msg_Group_ScrollShow(this->GetID(), ctrl_id, visible);	×
166	}	×
167
168	void ctrlGroup::Msg_Group_OptionGroupChange(const unsigned /group_id/, const unsigned ctrl_id, unsigned selection)	×
169	{
170	GetParent()->Msg_Group_OptionGroupChange(this->GetID(), ctrl_id, selection);	×
171	}	×
172
173	void ctrlGroup::Msg_Group_Timer(const unsigned /group_id/, const unsigned ctrl_id)	×
174	{
175	GetParent()->Msg_Group_Timer(this->GetID(), ctrl_id);	×
176	}	×
177
178	void ctrlGroup::Msg_Group_TableSelectItem(const unsigned /group_id/, const unsigned ctrl_id,	×
179	const std::optional<unsigned>& selection)
180	{
181	GetParent()->Msg_Group_TableSelectItem(this->GetID(), ctrl_id, selection);	×
182	}	×
183
184	void ctrlGroup::Msg_Group_TableRightButton(const unsigned /group_id/, const unsigned ctrl_id,	×
185	const std::optional<unsigned>& selection)
186	{
187	GetParent()->Msg_Group_TableRightButton(this->GetID(), ctrl_id, selection);	×
188	}	×
189
190	void ctrlGroup::Msg_Group_TableLeftButton(const unsigned /group_id/, const unsigned ctrl_id,	×
191	const std::optional<unsigned>& selection)
192	{
193	GetParent()->Msg_Group_TableLeftButton(this->GetID(), ctrl_id, selection);	×
194	}	×

Return-To-The-Roots / s25client / 27551410928

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous