Use C++17 variable templates for traits

Author: Flamefire

include/libsiedler2/ArchivItem_Bitmap.h

@@ -1,4 +1,4 @@
-// Copyright (C) 2005 - 2021 Settlers Freaks (sf-team at siedler25.org)
+// Copyright (C) 2005 - 2025 Settlers Freaks (sf-team at siedler25.org)
 //
 // SPDX-License-Identifier: GPL-2.0-or-later
 
@@ -55,7 +55,7 @@ inline int baseArchivItem_Bitmap::print(T_PixelBuffer& pixelBuffer, const Archiv
                                         uint16_t from_h) const
 {
     return print(pixelBuffer.getPixelPtr(), pixelBuffer.getWidth(), pixelBuffer.getHeight(),
-                 traits::GetFormat<T_PixelBuffer>::value, dstPalette, to_x, to_y, from_x, from_y, from_w, from_h);
+                 traits::GetFormat_v<T_PixelBuffer>, dstPalette, to_x, to_y, from_x, from_y, from_w, from_h);
 }
 
 inline int baseArchivItem_Bitmap::create(const uint8_t* buffer, uint16_t buffer_width, uint16_t buffer_height,
@@ -75,7 +75,7 @@ inline int baseArchivItem_Bitmap::create(uint16_t width, uint16_t height, const
                                          const ArchivItem_Palette* palette)
 {
     return create(width, height, pixelBuffer.getPixelPtr(), pixelBuffer.getWidth(), pixelBuffer.getHeight(),
-                  traits::GetFormat<T_PixelBuffer>::value, palette);
+                  traits::GetFormat_v<T_PixelBuffer>, palette);
 }
 
 template<class T_PixelBuffer>

include/libsiedler2/ArchivItem_Bitmap_Player.h

@@ -1,4 +1,4 @@
-// Copyright (C) 2005 - 2021 Settlers Freaks (sf-team at siedler25.org)
+// Copyright (C) 2005 - 2025 Settlers Freaks (sf-team at siedler25.org)
 //
 // SPDX-License-Identifier: GPL-2.0-or-later
 
@@ -89,8 +89,8 @@ inline int ArchivItem_Bitmap_Player::print(T_PixelBuffer& pixelBuffer, const Arc
                                            uint16_t from_y, uint16_t from_w, uint16_t from_h, bool only_player) const
 {
     return print(pixelBuffer.getPixelPtr(), pixelBuffer.getWidth(), pixelBuffer.getHeight(),
-                 traits::GetFormat<T_PixelBuffer>::value, palette, plClrStartIdx, to_x, to_y, from_x, from_y, from_w,
-                 from_h, only_player);
+                 traits::GetFormat_v<T_PixelBuffer>, palette, plClrStartIdx, to_x, to_y, from_x, from_y, from_w, from_h,
+                 only_player);
 }
 
 inline int libsiedler2::ArchivItem_Bitmap_Player::create(const uint8_t* buffer, uint16_t buffer_width,
@@ -107,7 +107,7 @@ inline int ArchivItem_Bitmap_Player::create(uint16_t width, uint16_t height, con
                                             const ArchivItem_Palette* palette, uint8_t plClrStartIdx)
 {
     return create(width, height, pixelBuffer.getPixelPtr(), pixelBuffer.getWidth(), pixelBuffer.getHeight(),
-                  traits::GetFormat<T_PixelBuffer>::value, palette, plClrStartIdx);
+                  traits::GetFormat_v<T_PixelBuffer>, palette, plClrStartIdx);
 }
 
 template<class T_PixelBuffer>

include/libsiedler2/GetFormat.h

@@ -1,11 +1,16 @@
-// Copyright (C) 2005 - 2021 Settlers Freaks (sf-team at siedler25.org)
+// Copyright (C) 2005 - 2025 Settlers Freaks (sf-team at siedler25.org)
 //
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #pragma once
 
+#include "enumTypes.h"
+
 namespace libsiedler2::traits {
 /// Return the texture/buffer format of the given type as the value member
 template<class T_PixelBuffer>
 struct GetFormat;
+
+template<class T_PixelBuffer>
+constexpr TextureFormat GetFormat_v = GetFormat<T_PixelBuffer>::value;
 } // namespace libsiedler2::traits

include/libsiedler2/ICloneable.h

@@ -1,4 +1,4 @@
-// Copyright (C) 2005 - 2021 Settlers Freaks (sf-team at siedler25.org)
+// Copyright (C) 2005 - 2025 Settlers Freaks (sf-team at siedler25.org)
 //
 // SPDX-License-Identifier: GPL-2.0-or-later
 
@@ -35,7 +35,7 @@ namespace detail {
     }
 } // namespace detail
 
-template<class T, std::enable_if_t<!std::is_pointer<T>::value, int> = 0>
+template<class T, std::enable_if_t<!std::is_pointer_v<T>, int> = 0>
 auto clone(const T& obj)
 {
     return std::unique_ptr<T>(detail::safePtrCast<T>(obj.clone()));

tests/testFolder.cpp

@@ -1,4 +1,4 @@
-// Copyright (C) 2005 - 2021 Settlers Freaks (sf-team at siedler25.org)
+// Copyright (C) 2005 - 2025 Settlers Freaks (sf-team at siedler25.org)
 //
 // SPDX-License-Identifier: GPL-2.0-or-later
 
@@ -44,8 +44,8 @@ struct FolderFixture
     {
         bfs::create_directories(lstPath);
         PixelBufferBGRA buffer(5, 3);
-        std::array<std::string, std::tuple_size<decltype(bmps)>::value> names = {"a", "1.player.nx5.ny7", "f",
-                                                                                 "3.rle.nx1.ny9"};
+        std::array<std::string, std::tuple_size_v<decltype(bmps)>> names = {"a", "1.player.nx5.ny7", "f",
+                                                                            "3.rle.nx1.ny9"};
 
         for(unsigned i = 0; i < bmps.size(); i++)
         {