Skip to content

Commit bf1c56d

Browse files
committed
fix: fix clang-tidy warnings
1 parent 794952e commit bf1c56d

File tree

3 files changed

+11
-11
lines changed

3 files changed

+11
-11
lines changed

src/discord/core.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -49,11 +49,11 @@ DiscordInstance::DiscordInstance()
4949

5050

5151
m_client.SetStatusChangedCallback(
52-
[this](discordpp::Client::Status status, discordpp::Client::Error error, int32_t errorDetail) -> void {
52+
[this](discordpp::Client::Status status, discordpp::Client::Error error, int32_t error_detail) -> void {
5353
if (error != discordpp::Client::Error::None) {
5454
this->m_status = DiscordStatus::Error;
5555
spdlog::error(
56-
"Connection Error: {} - Details: {}", discordpp::Client::ErrorToString(error), errorDetail
56+
"Connection Error: {} - Details: {}", discordpp::Client::ErrorToString(error), error_detail
5757
);
5858
return;
5959
}
@@ -75,7 +75,7 @@ void DiscordInstance::after_ready() {
7575

7676
this->m_client.GetDiscordClientConnectedUser(
7777
constants::discord::application_id,
78-
[this](discordpp::ClientResult result, std::optional<discordpp::UserHandle> user) -> void {
78+
[this](const discordpp::ClientResult& result, std::optional<discordpp::UserHandle> user) -> void {
7979
if (result.Successful() and user.has_value()) {
8080

8181
auto user_handle = m_client.GetUser(user->Id());
@@ -139,15 +139,15 @@ void DiscordInstance::update() {
139139

140140
void DiscordInstance::set_activity(const DiscordActivityWrapper& activity) {
141141

142-
auto raw_activity = activity.get_raw();
142+
const auto& raw_activity = activity.get_raw();
143143

144144
if (not raw_activity.operator bool()) {
145145
spdlog::error("Tried to set an invalid Discord Activity!");
146146
return;
147147
}
148148

149149
// Update rich presence
150-
m_client.UpdateRichPresence(raw_activity, [](discordpp::ClientResult result) {
150+
m_client.UpdateRichPresence(raw_activity, [](const discordpp::ClientResult& result) {
151151
if (result.Successful()) {
152152
spdlog::info("Rich Presence updated successfully");
153153
} else {

src/discord/core.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ namespace constants::discord {
4646

4747
struct DiscordActivityWrapper {
4848
private:
49-
discordpp::Activity m_activity{};
49+
discordpp::Activity m_activity;
5050

5151
[[nodiscard]] discordpp::ActivityTimestamps get_timestamps();
5252

@@ -124,7 +124,7 @@ struct DiscordInstance {
124124

125125
OOPETRIS_GRAPHICS_EXPORTED ~DiscordInstance();
126126

127-
OOPETRIS_GRAPHICS_EXPORTED void update();
127+
OOPETRIS_GRAPHICS_EXPORTED static void update();
128128

129129
OOPETRIS_GRAPHICS_EXPORTED void set_activity(const DiscordActivityWrapper& activity);
130130

src/executables/game/application.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -382,7 +382,8 @@ void Application::update() {
382382
},
383383
[this](const scenes::Scene::Push& push) {
384384
spdlog::info("pushing back scene {}", magic_enum::enum_name(push.target_scene));
385-
m_scene_stack.push_back(scenes::create_scene(*this, push.target_scene, push.layout)
385+
m_scene_stack.push_back(
386+
scenes::create_scene(*this, push.target_scene, push.layout)
386387
);
387388
},
388389
[this](scenes::Scene::RawPush& raw_push) {
@@ -433,14 +434,13 @@ void Application::update() {
433434
if (m_discord_instance.has_value()) {
434435

435436
switch (m_discord_instance->get_status()) {
436-
case DiscordStatus::Starting:
437-
break;
438437
case DiscordStatus::Error:
439438
m_discord_instance = std::nullopt;
440439
spdlog::warn("Error initializing the discord instance, it might not be running, destroying client!");
441440
break;
441+
case DiscordStatus::Starting:
442442
case DiscordStatus::Ok:
443-
m_discord_instance->update();
443+
DiscordInstance::update();
444444
break;
445445
}
446446
}

0 commit comments

Comments
 (0)