From 2125b80b8d0b34b38b6beb15f3f0262bdb66efa4 Mon Sep 17 00:00:00 2001 From: SirLynix Date: Thu, 4 Jan 2024 14:40:50 +0100 Subject: [PATCH] Use std::string_view for strings --- .../Nazara/Core/SignalHandlerAppComponent.hpp | 3 ++- .../Utility/Components/NodeComponent.hpp | 2 +- .../Components/SkeletonComponentBase.hpp | 2 +- .../Components/SkeletonComponentBase.inl | 2 +- include/Nazara/Utility/RichTextDrawer.hpp | 2 +- src/Nazara/Core/SignalHandlerAppComponent.cpp | 19 +++++++++---------- src/Nazara/Renderer/Renderer.cpp | 2 +- .../Utility/Components/NodeComponent.cpp | 2 +- src/Nazara/Utility/RichTextDrawer.cpp | 2 +- 9 files changed, 18 insertions(+), 18 deletions(-) diff --git a/include/Nazara/Core/SignalHandlerAppComponent.hpp b/include/Nazara/Core/SignalHandlerAppComponent.hpp index 2497dfc50..e2bf7b748 100644 --- a/include/Nazara/Core/SignalHandlerAppComponent.hpp +++ b/include/Nazara/Core/SignalHandlerAppComponent.hpp @@ -9,6 +9,7 @@ #include #include +#include namespace Nz { @@ -26,7 +27,7 @@ namespace Nz private: void InstallSignalHandler(); - static void HandleInterruptSignal(const char* signalName); + static void HandleInterruptSignal(std::string_view signalName); }; } diff --git a/include/Nazara/Utility/Components/NodeComponent.hpp b/include/Nazara/Utility/Components/NodeComponent.hpp index e5e47612b..3f59f98c5 100644 --- a/include/Nazara/Utility/Components/NodeComponent.hpp +++ b/include/Nazara/Utility/Components/NodeComponent.hpp @@ -22,7 +22,7 @@ namespace Nz ~NodeComponent() = default; void SetParent(entt::handle entity, bool keepDerived = false); - void SetParentJoint(entt::handle entity, const std::string& jointName, bool keepDerived = false); + void SetParentJoint(entt::handle entity, std::string_view jointName, bool keepDerived = false); void SetParentJoint(entt::handle entity, std::size_t jointIndex, bool keepDerived = false); using Node::SetParent; diff --git a/include/Nazara/Utility/Components/SkeletonComponentBase.hpp b/include/Nazara/Utility/Components/SkeletonComponentBase.hpp index e378b9625..86291a399 100644 --- a/include/Nazara/Utility/Components/SkeletonComponentBase.hpp +++ b/include/Nazara/Utility/Components/SkeletonComponentBase.hpp @@ -20,7 +20,7 @@ namespace Nz SkeletonComponentBase(SkeletonComponentBase&&) noexcept = default; ~SkeletonComponentBase() = default; - inline std::size_t FindJointByName(const std::string& jointName) const; + inline std::size_t FindJointByName(std::string_view jointName) const; inline const Joint& GetAttachedJoint(std::size_t jointIndex) const; inline const std::shared_ptr& GetSkeleton() const; diff --git a/include/Nazara/Utility/Components/SkeletonComponentBase.inl b/include/Nazara/Utility/Components/SkeletonComponentBase.inl index 32f9363e6..4e7f4d2e9 100644 --- a/include/Nazara/Utility/Components/SkeletonComponentBase.inl +++ b/include/Nazara/Utility/Components/SkeletonComponentBase.inl @@ -11,7 +11,7 @@ namespace Nz { } - inline std::size_t SkeletonComponentBase::FindJointByName(const std::string& jointName) const + inline std::size_t SkeletonComponentBase::FindJointByName(std::string_view jointName) const { return m_referenceSkeleton->GetJointIndex(jointName); } diff --git a/include/Nazara/Utility/RichTextDrawer.hpp b/include/Nazara/Utility/RichTextDrawer.hpp index 99c151223..e450a2702 100644 --- a/include/Nazara/Utility/RichTextDrawer.hpp +++ b/include/Nazara/Utility/RichTextDrawer.hpp @@ -104,7 +104,7 @@ namespace Nz inline void ConnectFontSlots(); inline void DisconnectFontSlots(); bool GenerateGlyph(Glyph& glyph, char32_t character, float outlineThickness, bool lineWrap, const Font& font, const Color& color, TextStyleFlags style, float lineSpacingOffset, unsigned int characterSize, int renderOrder, int* advance) const; - void GenerateGlyphs(const Font& font, const Color& color, TextStyleFlags style, unsigned int characterSize, const Color& outlineColor, float characterSpacingOffset, float lineSpacingOffset, float outlineThickness, const std::string& text) const; + void GenerateGlyphs(const Font& font, const Color& color, TextStyleFlags style, unsigned int characterSize, const Color& outlineColor, float characterSpacingOffset, float lineSpacingOffset, float outlineThickness, std::string_view text) const; inline float GetLineHeight(const Block& block) const; inline float GetLineHeight(float lineSpacingOffset, const Font::SizeInfo& sizeInfo) const; inline std::size_t HandleFontAddition(const std::shared_ptr& font); diff --git a/src/Nazara/Core/SignalHandlerAppComponent.cpp b/src/Nazara/Core/SignalHandlerAppComponent.cpp index 77cc5a814..23cf24d25 100644 --- a/src/Nazara/Core/SignalHandlerAppComponent.cpp +++ b/src/Nazara/Core/SignalHandlerAppComponent.cpp @@ -6,6 +6,7 @@ #include #include #include +#include #if defined(NAZARA_PLATFORM_WINDOWS) #include @@ -27,16 +28,14 @@ namespace Nz { switch (ctrlType) { - case CTRL_C_EVENT: HandleInterruptSignal("CTRL_C"); break; - case CTRL_BREAK_EVENT: HandleInterruptSignal("CTRL_BREAK"); break; - case CTRL_CLOSE_EVENT: HandleInterruptSignal("CTRL_CLOSE"); break; - case CTRL_LOGOFF_EVENT: HandleInterruptSignal("CTRL_LOGOFF"); break; + case CTRL_C_EVENT: HandleInterruptSignal("CTRL_C"); break; + case CTRL_BREAK_EVENT: HandleInterruptSignal("CTRL_BREAK"); break; + case CTRL_CLOSE_EVENT: HandleInterruptSignal("CTRL_CLOSE"); break; + case CTRL_LOGOFF_EVENT: HandleInterruptSignal("CTRL_LOGOFF"); break; case CTRL_SHUTDOWN_EVENT: HandleInterruptSignal("CTRL_SHUTDOWN"); break; default: - { - std::string signalName = ""; - HandleInterruptSignal(signalName.c_str()); - } + HandleInterruptSignal(Format("", ctrlType)); + break; } return TRUE; @@ -61,10 +60,10 @@ namespace Nz NazaraError("failed to install interruption signal handlers"); } - void SignalHandlerAppComponent::HandleInterruptSignal(const char* signalName) + void SignalHandlerAppComponent::HandleInterruptSignal(std::string_view signalName) { assert(ApplicationBase::Instance()); - NazaraNotice("received interruption signal " + std::string(signalName) + ", exiting..."); + NazaraNotice("received interruption signal {0}, exiting...", signalName); ApplicationBase::Instance()->Quit(); } diff --git a/src/Nazara/Renderer/Renderer.cpp b/src/Nazara/Renderer/Renderer.cpp index 07331d409..4f755872e 100644 --- a/src/Nazara/Renderer/Renderer.cpp +++ b/src/Nazara/Renderer/Renderer.cpp @@ -211,7 +211,7 @@ namespace Nz void Renderer::Config::Override(const CommandLineParameters& parameters) { std::string_view value; - auto GetParameter = [&](const std::string& paramName, const char* envName, std::string_view* var) + auto GetParameter = [&](std::string_view paramName, const char* envName, std::string_view* var) { if (parameters.GetParameter(paramName, var)) return true; diff --git a/src/Nazara/Utility/Components/NodeComponent.cpp b/src/Nazara/Utility/Components/NodeComponent.cpp index 622843372..b35cce205 100644 --- a/src/Nazara/Utility/Components/NodeComponent.cpp +++ b/src/Nazara/Utility/Components/NodeComponent.cpp @@ -18,7 +18,7 @@ namespace Nz Node::SetParent(nodeComponent, keepDerived); } - void NodeComponent::SetParentJoint(entt::handle entity, const std::string& jointName, bool keepDerived) + void NodeComponent::SetParentJoint(entt::handle entity, std::string_view jointName, bool keepDerived) { SkeletonComponentBase* skeletonComponent = entity.try_get(); if (!skeletonComponent) diff --git a/src/Nazara/Utility/RichTextDrawer.cpp b/src/Nazara/Utility/RichTextDrawer.cpp index 985766792..0a3bdef55 100644 --- a/src/Nazara/Utility/RichTextDrawer.cpp +++ b/src/Nazara/Utility/RichTextDrawer.cpp @@ -376,7 +376,7 @@ namespace Nz return false; }; - void RichTextDrawer::GenerateGlyphs(const Font& font, const Color& color, TextStyleFlags style, unsigned int characterSize, const Color& outlineColor, float characterSpacingOffset, float lineSpacingOffset, float outlineThickness, const std::string& text) const + void RichTextDrawer::GenerateGlyphs(const Font& font, const Color& color, TextStyleFlags style, unsigned int characterSize, const Color& outlineColor, float characterSpacingOffset, float lineSpacingOffset, float outlineThickness, std::string_view text) const { if (text.empty()) return;