CMakeLists.txt

@@ -1,5 +1,7 @@
 cmake_minimum_required(VERSION 3.14...3.25)
 
+set (CXX_STANDARD 23)
+
 project(
 	qr
 	VERSION 1.1.0
@@ -28,7 +30,7 @@ target_include_directories(qr PRIVATE src lib)
 add_custom_target(man ALL)
 add_custom_command(
 	TARGET man
-	COMMAND help2man -h "-h" -v "-v" -o qr.7 ./${EXE_NAME}
+	COMMAND help2man -h "-h" -v "-v" -o qr.7 ${EXE_NAME}
 	COMMAND gzip -f qr.7
 )
 

main.cpp

@@ -3,11 +3,11 @@
 #include <iostream>
 #include <sstream>
 
-#include <qrcodegen.hpp>
+#include "qrcodegen.hpp"
-
-#include "util.hpp"
 #include "QR.hpp"
 
+#define UNUSED(var) (void) var;
+
 // Version is injected through cmake
 constexpr const char* VERSION = "@qr_VERSION@";
 

src/QR.cpp

@@ -14,7 +14,6 @@ namespace massivedynamic {
 
 QR::QR(const std::string& data, std::string outputFile, size_t size, qrcodegen::QrCode::Ecc type) : outputFile(std::move(outputFile)), 
 		qr(qrcodegen::QrCode::encodeText(data.c_str(), type)), size(size) {
-	this->pixels.reserve(this->qr.getSize() * this->qr.getSize());
 	// this is inherently stupid, but "qrcodegen::QrCode" does not give access to the
 	// `segments` vector member and the class itself is marked final.
 	for (int y = 0; y < qr.getSize(); y++) {

src/QR.hpp

@@ -2,12 +2,15 @@
 
 #include <vector>
 #include <string>
-#include <qrcodegen.hpp>
 
-#include "util.hpp"
+#include "qrcodegen.hpp"
 #include "Renderer.hpp"
 
+#define UNUSED_CASE(name) case name: break; 
+
 namespace massivedynamic {
+	typedef uint32_t Color;
+
 	enum class Format {
 		CONSOLE,
 		SVG,
@@ -29,7 +32,6 @@ namespace massivedynamic {
 			QR(const QR&&)  = delete;
 			QR(QR&)         = delete;
 			~QR()           = default;
-			QR& operator=(const QR&) = delete;
 
 			void render(Format format);
 

src/Renderer.hpp

@@ -1,8 +1,6 @@
 #pragma once
 
 #include <vector>
-#include <string>
-#include <cstddef>
 
 namespace massivedynamic {
 	
@@ -16,7 +14,6 @@ class Renderer {
 		Renderer(const Renderer&&) = delete;
 		Renderer(Renderer&)        = delete;
 		virtual ~Renderer()        = default;
-		Renderer& operator=(const Renderer&) = delete;
 
 		virtual void render(const std::string& filename) = 0;
 };

src/renderers/ConsoleRenderer.hpp

@@ -1,7 +1,5 @@
 #pragma once
 
-#include <iomanip>
-
 #include "Renderer.hpp"
 
 namespace massivedynamic {
@@ -12,16 +10,17 @@ class ConsoleRenderer : public Renderer {
 		virtual void render(const std::string&) override {
 			int border = 1;
 
-			std::cout << std::setfill('\n') << std::setw(border) << "";
+			std::cout << std::string(border, '\n');
 			for (int y = 0; y < sourceSize; y++) {
 				std::cout << std::string(border * 2, ' ');
 				for (int x = 0; x < sourceSize; x++) {
 					bool isFilled = pixels.at(y * sourceSize + x);
 					std::cout << (isFilled ? "██" : "  ");
 				}
-				std::cout << std::setfill(' ') << std::setw(border * 2) << '\n';
+				std::cout << std::string(border * 2, ' ');
+				std::cout << '\n';
 			}
-			std::cout << std::setfill('\n') << std::setw(border) << "";
+			std::cout << std::string(border, '\n');
 			std::cout.flush();
 		}
 };

src/renderers/PixelRenderer.hpp

@@ -4,13 +4,12 @@
 #include <iostream>
 #include <cassert>
 
-#define STB_IMAGE_WRITE_IMPLEMENTATION
-#include <stb_image_write.hpp>
-
-#include "util.hpp"
 #include "Renderer.hpp"
+#define STB_IMAGE_WRITE_IMPLEMENTATION
+#include "stb_image_write.hpp"
 
 namespace massivedynamic {
+	typedef uint32_t Color;
 
 	class PixelRenderer : public Renderer {
 		protected:
@@ -38,11 +37,13 @@ namespace massivedynamic {
 				WHITE = 0xFFFFFFFF
 			};
 
-			PixelRenderer(const std::vector<bool>& pixels, size_t sourceSize, size_t targetSize) :
+			PixelRenderer(const std::vector<bool>& pixels, size_t sourceSize, size_t targetSize) : Renderer(pixels, sourceSize, targetSize), pixelSize(0) {
-					Renderer(pixels, sourceSize, targetSize == 0 ? (sourceSize + 2) * 2 : targetSize),
+				this->targetSize = this->targetSize == 0 ? (sourceSize + 2) * 2 : this->targetSize;
-					pixelSize(round(static_cast<float>(this->targetSize) / static_cast<float>(this->sourceSize + 2))),
+				this->pixelSize  = round(static_cast<float>(this->targetSize) / static_cast<float>(this->sourceSize + 2));
-					border(round(static_cast<float>(this->targetSize - this->pixelSize * this->sourceSize) / 2.0f)),
+				this->border     = round(static_cast<float>(this->targetSize - this->pixelSize * this->sourceSize) / 2.0f);
-					bitmap(std::vector<Color>(this->targetSize * this->targetSize, Colors::WHITE)) {}
+
+				this->bitmap = std::vector<Color>(this->targetSize * this->targetSize, Colors::WHITE);
+			}
 
 			virtual void generateBuffer() {
 				for (size_t y = 0; y < sourceSize; y++) {

src/renderers/SVGRenderer.hpp

@@ -40,7 +40,7 @@ namespace massivedynamic {
 					}
 				}
 
-				file << "</svg>\n";
+				file << "</svg>" << std::endl;
 
 				file.close();
 			}

src/util.hpp

@@ -1,12 +0,0 @@
-#pragma once
-
-#include <stdint.h>
-
-#define UNUSED(var) (void) var;
-#define UNUSED_CASE(name) case name: break; 
-
-namespace massivedynamic {
-
-	using Color = uint32_t;
-
-}