Fix clang complaints.

heinezen · Nov 11, 2023 · 4a73418 · 4a73418
1 parent dff7c1e
commit 4a73418
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 24 deletions.
diff --git a/libopenage/curve/map_filter_iterator.h b/libopenage/curve/map_filter_iterator.h
@@ -32,8 +32,6 @@ class MapFilterIterator : public CurveIterator<val_t, container_t> {
 	                  const time::time_t &to) :
 		CurveIterator<val_t, container_t>(base, container, from, to) {}
 
-	MapFilterIterator(const MapFilterIterator &) = default;
-
 	using CurveIterator<val_t, container_t>::operator=;
 
 	virtual bool valid() const override {

diff --git a/libopenage/gamestate/game.cpp b/libopenage/gamestate/game.cpp
@@ -96,7 +96,7 @@ void Game::load_path(const util::Path &base_dir,
 	auto base_path = base_dir.resolve_native_path();
 	auto search_path = base_dir / mod_dir / search;
 
-	auto fileload_func = [&base_path, &mod_dir](const std::string &filename) {
+	auto fileload_func = [&base_path](const std::string &filename) {
 		// nyan wants a string filepath, so we have to construct it from the
 		// path and subpath parameters
 		log::log(INFO << "Loading .nyan file: " << filename);

diff --git a/libopenage/gamestate/terrain_factory.cpp b/libopenage/gamestate/terrain_factory.cpp
@@ -9,6 +9,7 @@
 #include "gamestate/api/terrain.h"
 #include "gamestate/terrain.h"
 #include "gamestate/terrain_chunk.h"
+#include "gamestate/terrain_tile.h"
 #include "renderer/render_factory.h"
 #include "renderer/stages/terrain/terrain_render_entity.h"
 #include "time/time.h"
@@ -121,7 +122,7 @@ std::shared_ptr<TerrainChunk> TerrainFactory::add_chunk(const std::shared_ptr<Ga
 	std::vector<TerrainTile> tiles{};
 	tiles.reserve(size[0] * size[1]);
 	for (size_t i = 0; i < size[0] * size[1]; ++i) {
-		tiles.emplace_back(terrain_obj, test_texture_path, 0.0f);
+		tiles.push_back({terrain_obj, test_texture_path, terrain_elevation_t::zero()});
 	}
 
 	auto chunk = std::make_shared<TerrainChunk>(size, offset, std::move(tiles));

diff --git a/libopenage/renderer/gui/integration/private/gui_texture.cpp b/libopenage/renderer/gui/integration/private/gui_texture.cpp
@@ -40,33 +40,33 @@ bool GuiTexture::isAtlasTexture() const {
 }
 
 namespace {
-GLuint create_compatible_texture(GLuint texture_id, GLsizei w, GLsizei h) {
-	glBindTexture(GL_TEXTURE_2D, texture_id);
+// GLuint create_compatible_texture(GLuint texture_id, GLsizei w, GLsizei h) {
+// 	glBindTexture(GL_TEXTURE_2D, texture_id);
 
-	GLint min_filter;
-	GLint mag_filter;
-	GLint iformat;
+// 	GLint min_filter;
+// 	GLint mag_filter;
+// 	GLint iformat;
 
-	glGetTexParameteriv(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, &min_filter);
-	glGetTexParameteriv(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, &mag_filter);
-	glGetTexLevelParameteriv(GL_TEXTURE_2D, 0, GL_TEXTURE_INTERNAL_FORMAT, &iformat);
+// 	glGetTexParameteriv(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, &min_filter);
+// 	glGetTexParameteriv(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, &mag_filter);
+// 	glGetTexLevelParameteriv(GL_TEXTURE_2D, 0, GL_TEXTURE_INTERNAL_FORMAT, &iformat);
 
-	GLuint new_texture_id;
-	glGenTextures(1, &new_texture_id);
-	glBindTexture(GL_TEXTURE_2D, new_texture_id);
+// 	GLuint new_texture_id;
+// 	glGenTextures(1, &new_texture_id);
+// 	glBindTexture(GL_TEXTURE_2D, new_texture_id);
 
-	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, min_filter);
-	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, mag_filter);
+// 	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, min_filter);
+// 	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, mag_filter);
 
-	glTexImage2D(GL_TEXTURE_2D, 0, iformat, w, h, 0, GL_RGBA, GL_UNSIGNED_BYTE, nullptr);
+// 	glTexImage2D(GL_TEXTURE_2D, 0, iformat, w, h, 0, GL_RGBA, GL_UNSIGNED_BYTE, nullptr);
 
-	glBindTexture(GL_TEXTURE_2D, 0);
+// 	glBindTexture(GL_TEXTURE_2D, 0);
 
-	return new_texture_id;
-}
+// 	return new_texture_id;
+// }
 } // namespace
 
-QSGTexture *GuiTexture::removedFromAtlas(QRhiResourceUpdateBatch *resourceUpdates /* = nullptr */) const {
+QSGTexture *GuiTexture::removedFromAtlas(QRhiResourceUpdateBatch * /* resourceUpdates */ /* = nullptr */) const {
 	if (this->isAtlasTexture()) {
 		return this->standalone.get();
 	}

diff --git a/libopenage/renderer/gui/integration/private/gui_texture_handle.cpp b/libopenage/renderer/gui/integration/private/gui_texture_handle.cpp
@@ -25,7 +25,7 @@ QSize textureSize(const SizedTextureHandle &texture_handle) {
 	return texture_handle.size;
 }
 
-QSize native_size(const TextureHandle &texture_handle) {
+QSize native_size(const TextureHandle & /* texture_handle */) {
 	return QSize(0, 0);
 }
 

diff --git a/libopenage/renderer/opengl/window.cpp b/libopenage/renderer/opengl/window.cpp
@@ -146,7 +146,7 @@ std::shared_ptr<Renderer> GlWindow::make_renderer() {
 	auto renderer = std::make_shared<GlRenderer>(this->get_context(),
 	                                             this->size * this->scale_dpr);
 
-	this->add_resize_callback([this, renderer](size_t w, size_t h, double scale) {
+	this->add_resize_callback([renderer](size_t w, size_t h, double scale) {
 		// this up-scales all the default framebuffer to the "bigger" highdpi window.
 		renderer->resize_display_target(w * scale, h * scale);
 	});