From 9fa25d6922097c64164a65da44b5f502493bbe47 Mon Sep 17 00:00:00 2001 From: Metehan Tuncbilek Date: Sun, 20 Oct 2024 13:40:24 +0300 Subject: [PATCH] review fix for string.hpp --- .gitea/workflows/build_pc.yml | 6 +++--- openVulkanoCpp/Data/Containers/String.hpp | 11 ++++++----- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/.gitea/workflows/build_pc.yml b/.gitea/workflows/build_pc.yml index 781fdcf..8b8ef2d 100644 --- a/.gitea/workflows/build_pc.yml +++ b/.gitea/workflows/build_pc.yml @@ -16,7 +16,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ windows_x64, ubuntu-latest, mac_arm ] + os: [ windows_x64, ubuntu-24.04, mac_arm ] steps: - name: Checkout @@ -24,13 +24,13 @@ jobs: with: submodules: true - name: Install Vulkan SDK - if: matrix.os == 'ubuntu-latest' + if: matrix.os == 'ubuntu-24.04' uses: humbletim/install-vulkan-sdk@v1.1.1 with: version: 1.3.250.1 cache: true - name: Install Dev Packages - if: matrix.os == 'ubuntu-latest' + if: matrix.os == 'ubuntu-24.04' run: > sudo apt update && sudo apt install -y extra-cmake-modules libwayland-dev libxkbcommon-dev xorg-dev libarchive-dev libassimp-dev ninja-build glslang-tools glslang-dev unzip zip libcurl4-openssl-dev libfreetype-dev libjpeg-turbo8-dev nasm && sudo wget https://sourceforge.net/projects/bin2c/files/1.1/bin2c-1.1.zip && sudo unzip bin2c-1.1.zip && cd bin2c && sudo gcc -o bin2c bin2c.c && sudo mv bin2c /usr/bin diff --git a/openVulkanoCpp/Data/Containers/String.hpp b/openVulkanoCpp/Data/Containers/String.hpp index 5c5defe..57ae75b 100644 --- a/openVulkanoCpp/Data/Containers/String.hpp +++ b/openVulkanoCpp/Data/Containers/String.hpp @@ -94,10 +94,9 @@ namespace OpenVulkano size_t FindStartIndexOf(const std::string_view& str) const { return m_string.find(str); } size_t FindEndIndexOf(const std::string_view& str) const { return m_string.rfind(str); } - String Trim() noexcept - { - return TrimBack().TrimFront(); - } + String& Trim() noexcept { return TrimBack().TrimFront(); } + + [[nodiscard]] String Trim() const { return Trim(); } String& TrimFront() noexcept { @@ -264,11 +263,13 @@ namespace OpenVulkano constexpr int64_t HexToInt() { return HexToInt(m_string); } - bool IsUrl(const std::string_view& str) + static bool IsUrl(const std::string_view& str) { return str.find("http://") == 0 || str.find("https://") == 0 || str.find("ftp://") == 0; } + bool IsUrl() const { return IsUrl(m_string); } + void ToUpper() noexcept { std::transform(m_string.begin(), m_string.end(), m_string.begin(),