Skip to content

Automatic fixes of clang-tidy warnings: misc-unused-using-decls,moder… #26

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Flamefire merged 1 commit into from
Jun 12, 2025
Merged

Automatic fixes of clang-tidy warnings: misc-unused-using-decls,moder… #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions include/libsiedler2/ColorBGRA.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,8 @@ inline bool operator!=(const ColorBGRA& lhs, const ColorBGRA& rhs)
return !(lhs == rhs);
}

inline constexpr ColorBGRA::ColorBGRA(uint8_t b, uint8_t g, uint8_t r, uint8_t a) : value{b, g, r, a} {}
inline constexpr ColorBGRA::ColorBGRA(ColorRGB clrRGB, uint8_t a) : ColorBGRA(clrRGB.b, clrRGB.g, clrRGB.r, a) {}
constexpr ColorBGRA::ColorBGRA(uint8_t b, uint8_t g, uint8_t r, uint8_t a) : value{b, g, r, a} {}
constexpr ColorBGRA::ColorBGRA(ColorRGB clrRGB, uint8_t a) : ColorBGRA(clrRGB.b, clrRGB.g, clrRGB.r, a) {}
inline ColorBGRA::ColorBGRA(const void* bgraBuffer)
{
std::memcpy(value.data(), bgraBuffer, 4);
Expand Down
4 changes: 2 additions & 2 deletions include/libsiedler2/PixelBuffer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,10 @@ class PixelBuffer
uint16_t getHeight() const { return height_; }
uint32_t getSizeInBytes() const { return static_cast<uint32_t>(getNumPixels() * sizeof(T_Pixel)); }
uint32_t getNumPixels() const { return static_cast<uint32_t>(pixels_.size()); }
uint8_t* getPixelPtr() { return pixels_.empty() ? nullptr : reinterpret_cast<uint8_t*>(&pixels_[0]); }
uint8_t* getPixelPtr() { return pixels_.empty() ? nullptr : reinterpret_cast<uint8_t*>(pixels_.data()); }
const uint8_t* getPixelPtr() const
{
return pixels_.empty() ? nullptr : reinterpret_cast<const uint8_t*>(&pixels_[0]);
return pixels_.empty() ? nullptr : reinterpret_cast<const uint8_t*>(pixels_.data());
}
std::vector<T_Pixel>& getPixels() { return pixels_; }
const std::vector<T_Pixel>& getPixels() const { return pixels_; }
Expand Down
2 changes: 1 addition & 1 deletion src/ArchivItem_Bitmap_Raw.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ int libsiedler2::baseArchivItem_Bitmap_Raw::load(std::istream& file, const Archi
// Speicher anlegen
if(length > 0)
{
int ec = create(&data[0], width, height, TextureFormat::Paletted, palette);
int ec = create(data.data(), width, height, TextureFormat::Paletted, palette);
if(ec)
return ec;
ec = convertFormat(outFormat);
Expand Down
4 changes: 2 additions & 2 deletions src/ArchivItem_Sound_XMidi.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ int ArchivItem_Sound_XMidi::load(std::istream& file, uint32_t length)
return ErrorCode::WRONG_FORMAT;
tracklist[track_nr].getTimbres().resize(numTimbres);
if(numTimbres > 0)
fs.readRaw(&tracklist[track_nr].getTimbres()[0], numTimbres);
fs.readRaw(tracklist[track_nr].getTimbres().data(), numTimbres);
fs >> chunkId;
}
if(!isChunk(chunkId, "EVNT"))
Expand Down Expand Up @@ -177,7 +177,7 @@ int ArchivItem_Sound_XMidi::write(std::ostream& file) const
fs.write("TIMB", 4);
fs << uint32_t(track.getTimbres().size() * 2 + 2);
fsLE << uint16_t(track.getTimbres().size());
fs.writeRaw(&track.getTimbres()[0], track.getTimbres().size());
fs.writeRaw(track.getTimbres().data(), track.getTimbres().size());
}
fs.write("EVNT", 4);
fs << uint32_t(track.getData().size());
Expand Down
4 changes: 2 additions & 2 deletions src/LoadBMP.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ static int read_palette(ArchivItem_BitmapBase& bitmap, T_FStream& bmpFs, const B
if(numClrsUsed > 0)
{
std::array<ColorBGRA, 256> colors;
if(!bmpFs.read(reinterpret_cast<char*>(&colors[0]), numClrsUsed * 4))
if(!bmpFs.read(reinterpret_cast<char*>(colors.data()), numClrsUsed * 4))
return ErrorCode::UNEXPECTED_EOF;

auto pal = getAllocator().create<ArchivItem_Palette>(BobType::Palette);
Expand Down Expand Up @@ -203,7 +203,7 @@ int loader::LoadBMP(const boost::filesystem::path& filepath, Archiv& image,
return ErrorCode::UNEXPECTED_EOF;
}

if(int ec = bitmap->create(bmih.width, bmih.height, &buffer[0], bmih.width, bmih.height, format))
if(int ec = bitmap->create(bmih.width, bmih.height, buffer.data(), bmih.width, bmih.height, format))
return ec;
if(ArchivItem_BitmapBase::getWantedFormat(bitmap->getFormat()) != bitmap->getFormat())
{
Expand Down
4 changes: 2 additions & 2 deletions src/MIDI_Track.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ int MIDI_Track::read(std::istream& file, size_t length)
return ErrorCode::NONE;

mid_data.resize(length);
if(!file.read(reinterpret_cast<char*>(&mid_data[0]), length))
if(!file.read(reinterpret_cast<char*>(mid_data.data()), length))
return ErrorCode::UNEXPECTED_EOF;
return ErrorCode::NONE;
}
Expand All @@ -37,7 +37,7 @@ const uint8_t* MIDI_Track::getMid() const
{
if(mid_data.empty())
return nullptr;
return &mid_data[0];
return mid_data.data();
}

uint32_t MIDI_Track::getMidLength() const
Expand Down
Loading