Skip to content

Commit 3778769

Browse files
committed
fix: fix clang-tidy warnings in discord code
1 parent 670ca2c commit 3778769

File tree

2 files changed

+8
-7
lines changed

2 files changed

+8
-7
lines changed

src/discord/core.cpp

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,7 @@
1818
}
1919

2020
DiscordInstance::DiscordInstance()
21-
: m_client{},
22-
m_current_user{ std::move(discordpp::UserHandle::nullobj) },
21+
: m_current_user{ discordpp::UserHandle::nullobj },
2322
m_status{ DiscordStatus::Starting } {
2423

2524
m_client.AddLogCallback(
@@ -214,7 +213,7 @@ DiscordActivityWrapper& DiscordActivityWrapper::set_details(const std::string& t
214213

215214
discordpp::ActivityTimestamps DiscordActivityWrapper::get_timestamps() {
216215

217-
std::optional<discordpp::ActivityTimestamps> timestamps = m_activity.Timestamps();
216+
std::optional<discordpp::ActivityTimestamps> timestamps = this->m_activity.Timestamps();
218217

219218
if (timestamps.has_value()) {
220219
return timestamps.value();
@@ -225,7 +224,7 @@ discordpp::ActivityTimestamps DiscordActivityWrapper::get_timestamps() {
225224

226225

227226
[[nodiscard]] discordpp::ActivityAssets DiscordActivityWrapper::get_assets() {
228-
std::optional<discordpp::ActivityAssets> assets = m_activity.Assets();
227+
std::optional<discordpp::ActivityAssets> assets = this->m_activity.Assets();
229228

230229
if (assets.has_value()) {
231230
return assets.value();

src/discord/core.hpp

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,7 @@
1818
#endif
1919

2020

21-
// https://discord.com/developers/docs/discord-social-sdk/getting-started/using-c++
2221
#include <discordpp.h>
23-
#include <memory>
2422
#include <string>
2523

2624
namespace constants::discord {
@@ -115,14 +113,18 @@ struct DiscordInstance {
115113

116114
OOPETRIS_GRAPHICS_EXPORTED [[nodiscard]] DiscordStatus get_status();
117115

118-
119116
OOPETRIS_GRAPHICS_EXPORTED DiscordInstance(DiscordInstance&& old) noexcept;
120117

121118
OOPETRIS_GRAPHICS_EXPORTED DiscordInstance& operator=(DiscordInstance&& other) noexcept;
122119

120+
OOPETRIS_GRAPHICS_EXPORTED DiscordInstance(DiscordInstance& old) noexcept = delete;
121+
122+
OOPETRIS_GRAPHICS_EXPORTED DiscordInstance& operator=(const DiscordInstance& other) noexcept = delete;
123+
123124
OOPETRIS_GRAPHICS_EXPORTED ~DiscordInstance();
124125

125126
OOPETRIS_GRAPHICS_EXPORTED void update();
127+
126128
OOPETRIS_GRAPHICS_EXPORTED void set_activity(const DiscordActivityWrapper& activity);
127129

128130
private:

0 commit comments

Comments
 (0)