Skip to content

Commit 44610b6

Browse files
Totto16Totto16
authored
Merge pull request #201 from OpenBrickProtocolFoundation/fix_clang_tidy_errors
Fix clang tidy errors
2 parents 48605f9 + e1fa148 commit 44610b6

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

67 files changed

+433
-351
lines changed

‎.github/workflows/lint.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ jobs:
5252
tidy-checks: ''
5353
step-summary: true
5454
file-annotations: true
55-
ignore: subprojects|build|android|assets|recordings|docs|toolchains|platforms|wrapper|src/libs/core/hash-library|src/lobby/curl_client.*
55+
ignore: subprojects|build|android|assets|recordings|docs|toolchains|platforms|wrapper|src/libs/core/hash-library|tests|src/lobby/curl_client.*
5656

5757
- name: Fail CI run if linter checks failed
5858
if: steps.linter.outputs.checks-failed != 0

‎src/discord/core.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ struct DiscordInstance {
110110
std::unique_ptr<discord::Core> m_core;
111111
std::unique_ptr<discord::User> m_current_user;
112112

113-
DiscordInstance(discord::Core* core);
113+
explicit DiscordInstance(discord::Core* core);
114114

115115
public:
116116
OOPETRIS_GRAPHICS_EXPORTED [[nodiscard]] static helper::expected<DiscordInstance, std::string> initialize();

‎src/executables/game/application.cpp

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ void Application::update() {
183183
if (scene_change) {
184184

185185
std::visit(
186-
helper::overloaded{
186+
helper::Overloaded{
187187
[this, index](const scenes::Scene::Pop&) {
188188
m_scene_stack.erase(
189189
m_scene_stack.begin()
@@ -201,10 +201,11 @@ void Application::update() {
201201
},
202202
[this](const scenes::Scene::Switch& scene_switch) {
203203
spdlog::info(
204-
"switching to scene {}", magic_enum::enum_name(scene_switch.target_scene)
204+
"switching to scene {}", magic_enum::enum_name(scene_switch.m_target_scene)
205+
);
206+
auto scene = scenes::create_scene(
207+
*this, scene_switch.m_target_scene, scene_switch.m_layout
205208
);
206-
auto scene =
207-
scenes::create_scene(*this, scene_switch.target_scene, scene_switch.layout);
208209

209210
// only clear, after the construction was successful
210211
m_scene_stack.clear();

‎src/executables/game/application.hpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,8 @@ struct Application final : public EventListener, public ServiceProvider {
4545
#endif
4646

4747
protected:
48-
EventDispatcher m_event_dispatcher;
48+
EventDispatcher
49+
m_event_dispatcher; //NOLINT(misc-non-private-member-variables-in-classes,cppcoreguidelines-non-private-member-variables-in-classes)
4950

5051
private:
5152
std::vector<std::unique_ptr<scenes::Scene>> m_scene_stack;

‎src/executables/utility/main.cpp

Lines changed: 29 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -7,50 +7,51 @@
77
#include <filesystem>
88
#include <iostream>
99

10-
void print_info(const recorder::RecordingReader& recording_reader) noexcept {
11-
//TODO(Totto): Implement, print basic information and final result for each simulation
12-
UNUSED(recording_reader);
13-
std::cerr << "NOT IMPLEMENTED\n";
14-
}
10+
namespace {
11+
void print_info(const recorder::RecordingReader& recording_reader) noexcept {
12+
//TODO(Totto): Implement, print basic information and final result for each simulation
13+
UNUSED(recording_reader);
14+
std::cerr << "NOT IMPLEMENTED\n";
15+
}
1516

16-
void dump_json(const recorder::RecordingReader& recording_reader, bool pretty_print, bool ensure_ascii) noexcept {
17+
void dump_json(const recorder::RecordingReader& recording_reader, bool pretty_print, bool ensure_ascii) noexcept {
1718

18-
auto result = json::try_convert_to_json<recorder::RecordingReader>(recording_reader);
19+
auto result = json::try_convert_to_json<recorder::RecordingReader>(recording_reader);
1920

20-
if (not result.has_value()) {
21-
std::cerr << fmt::format("An error occurred during converting to json: {}\n", result.error());
22-
std::exit(1);
23-
}
21+
if (not result.has_value()) {
22+
std::cerr << fmt::format("An error occurred during converting to json: {}\n", result.error());
23+
std::exit(1);
24+
}
2425

2526

26-
int indent = -1;
27-
char indent_char = ' ';
27+
int indent = -1;
28+
char indent_char = ' ';
2829

29-
if (pretty_print) {
30-
indent = 1;
31-
indent_char = '\t';
32-
}
30+
if (pretty_print) {
31+
indent = 1;
32+
indent_char = '\t';
33+
}
3334

34-
try {
35+
try {
3536

36-
std::cout << result.value().dump(indent, indent_char, ensure_ascii);
37+
std::cout << result.value().dump(indent, indent_char, ensure_ascii);
3738

38-
} catch (const std::exception& error) {
39-
std::cerr << error.what();
40-
std::exit(1);
41-
}
39+
} catch (const std::exception& error) {
40+
std::cerr << error.what();
41+
std::exit(1);
42+
}
4243

43-
if (pretty_print) {
44-
std::cout << "\n";
44+
if (pretty_print) {
45+
std::cout << "\n";
46+
}
4547
}
46-
}
4748

49+
} // namespace
4850

4951
int main(int argc, char** argv) noexcept {
5052

5153
try {
5254

53-
5455
auto arguments_result = CommandLineArguments::from_args(argc, argv);
5556

5657
if (not arguments_result.has_value()) {
@@ -80,7 +81,7 @@ int main(int argc, char** argv) noexcept {
8081
const auto recording_reader = std::move(parsed.value());
8182

8283
std::visit(
83-
helper::overloaded{ [&recording_reader](const Dump& dump) {
84+
helper::Overloaded{ [&recording_reader](const Dump& dump) {
8485
dump_json(recording_reader, dump.pretty_print, dump.ensure_ascii);
8586
},
8687
[&recording_reader](const Info& /* info */) { print_info(recording_reader); } },

‎src/game/bag.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@
33
Bag::Bag(Random& random) : m_tetromino_sequence{} {
44
// initialize array with invalid tetromino type
55
for (helper::TetrominoType& type : m_tetromino_sequence) {
6-
type = static_cast<helper::TetrominoType>(static_cast<int>(helper::TetrominoType::LastType) + 1);
6+
type = static_cast<helper::TetrominoType>( //NOLINT(clang-analyzer-optin.core.EnumCastOutOfRange)
7+
static_cast<int>(helper::TetrominoType::LastType) + 1
8+
);
79
}
810

911
// fill in the sequence with random order

‎src/game/grid.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
Grid::Grid(const ui::Layout& layout, bool is_top_level)
77
: ui::Widget{ layout, ui::WidgetType::Component, is_top_level } {
88

9-
const u32 total_x_tiles = grid::preview_extends.x * 2 + 2 + grid::width_in_tiles;
9+
const u32 total_x_tiles = (grid::preview_extends.x * 2) + 2 + grid::width_in_tiles;
1010
constexpr u32 total_y_tiles = grid::height_in_tiles;
1111

1212
const u32 tile_size_x = layout.get_rect().width() / total_x_tiles;
@@ -86,7 +86,7 @@ void Grid::draw_background(const ServiceProvider& service_provider, GridRect gri
8686

8787
for (u32 column = 0; column <= grid_rect.width(); ++column) {
8888
const auto start = top_left + shapes::UPoint{ column * m_tile_size, 0 };
89-
const auto end = shapes::UPoint{ start.x, start.y + grid_rect.height() * m_tile_size };
89+
const auto end = shapes::UPoint{ start.x, start.y + (grid_rect.height() * m_tile_size) };
9090
service_provider.renderer().draw_line(start, end, grid_color);
9191
service_provider.renderer().draw_line(start - shapes::UPoint{ 1, 0 }, end - shapes::UPoint{ 1, 0 }, grid_color);
9292
}
@@ -100,8 +100,8 @@ void Grid::draw_background(const ServiceProvider& service_provider, GridRect gri
100100

101101
const auto outline_top_left = top_left - shapes::UPoint{ 2, 2 };
102102
const auto outline_bottom_right = shapes::UPoint{
103-
top_left.x + grid_rect.width() * m_tile_size + 1,
104-
top_left.y + grid_rect.height() * m_tile_size + 1,
103+
top_left.x + (grid_rect.width() * m_tile_size) + 1,
104+
top_left.y + (grid_rect.height() * m_tile_size) + 1,
105105
};
106106

107107
const auto outline_rect = shapes::URect{

‎src/game/tetrion.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ Tetrion::Tetrion(
2424
: ui::Widget{ layout , ui::WidgetType::Component ,is_top_level},
2525
SimulatedTetrion{tetrion_index,random_seed,starting_level, service_provider,std::move(recording_writer)},
2626
m_main_layout{
27-
utils::size_t_identity<2>(),
27+
utils::SizeIdentity<2>(),
2828
0,
2929
ui::Direction::Vertical,
3030
{ 0.85 },

‎src/graphics/rect.hpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ namespace shapes {
1717
constexpr AbstractRect(Point top_left, Point bottom_right) // NOLINT(bugprone-easily-swappable-parameters)
1818
: top_left{ top_left },
1919
bottom_right{ bottom_right } { }
20-
constexpr AbstractRect(T x, T y, T width, T height)
21-
: top_left{ x, y },
22-
bottom_right{ x + width - 1, y + height - 1 } { }
20+
constexpr AbstractRect(T x_pos, T y_pos, T width, T height)
21+
: top_left{ x_pos, y_pos },
22+
bottom_right{ x_pos + width - 1, y_pos + height - 1 } { }
2323

2424
[[nodiscard]] constexpr T width() const {
2525
return static_cast<T>(bottom_right.x - top_left.x + 1);

‎src/graphics/renderer.cpp

Lines changed: 21 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -91,35 +91,36 @@ void Renderer::draw_self_computed_circle_impl(const shapes::IPoint& center, i32
9191

9292
const i32 radius = diameter / 2;
9393

94-
i32 x = radius - 1;
95-
i32 y = 0;
96-
i32 tx = 1;
97-
i32 ty = 1;
98-
i32 error = tx - diameter;
94+
i32 x_pos = radius - 1;
95+
i32 y_pos = 0;
96+
i32 tx_pos = 1;
97+
i32 ty_pos = 1;
98+
i32 error = tx_pos - diameter;
9999

100-
while (x >= y) {
100+
while (x_pos >= y_pos) {
101101
// Each of the following renders an octant of the circle
102102
SDL_RenderDrawPoint(
103-
m_renderer, center_x + x, center_y - y // NOLINT(clang-analyzer-core.UndefinedBinaryOperatorResult)
103+
m_renderer, center_x + x_pos, // NOLINT(clang-analyzer-core.UndefinedBinaryOperatorResult)
104+
center_y - y_pos
104105
);
105-
SDL_RenderDrawPoint(m_renderer, center_x + x, center_y + y);
106-
SDL_RenderDrawPoint(m_renderer, center_x - x, center_y - y);
107-
SDL_RenderDrawPoint(m_renderer, center_x - x, center_y + y);
108-
SDL_RenderDrawPoint(m_renderer, center_x + y, center_y - x);
109-
SDL_RenderDrawPoint(m_renderer, center_x + y, center_y + x);
110-
SDL_RenderDrawPoint(m_renderer, center_x - y, center_y - x);
111-
SDL_RenderDrawPoint(m_renderer, center_x - y, center_y + x);
106+
SDL_RenderDrawPoint(m_renderer, center_x + x_pos, center_y + y_pos);
107+
SDL_RenderDrawPoint(m_renderer, center_x - x_pos, center_y - y_pos);
108+
SDL_RenderDrawPoint(m_renderer, center_x - x_pos, center_y + y_pos);
109+
SDL_RenderDrawPoint(m_renderer, center_x + y_pos, center_y - x_pos);
110+
SDL_RenderDrawPoint(m_renderer, center_x + y_pos, center_y + x_pos);
111+
SDL_RenderDrawPoint(m_renderer, center_x - y_pos, center_y - x_pos);
112+
SDL_RenderDrawPoint(m_renderer, center_x - y_pos, center_y + x_pos);
112113

113114
if (error <= 0) {
114-
++y;
115-
error += ty;
116-
ty += 2;
115+
++y_pos;
116+
error += ty_pos;
117+
ty_pos += 2;
117118
}
118119

119120
if (error > 0) {
120-
--x;
121-
tx += 2;
122-
error += (tx - diameter);
121+
--x_pos;
122+
tx_pos += 2;
123+
error += (tx_pos - diameter);
123124
}
124125
}
125126
}

0 commit comments

Comments
 (0)