Skip to content

Commit

Permalink
modified comments slightly, ran clang-format
Browse files Browse the repository at this point in the history
  • Loading branch information
khatharr committed Mar 15, 2023
1 parent 485d904 commit 83779bd
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 8 deletions.
14 changes: 7 additions & 7 deletions include/SFML/System/String.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -109,17 +109,17 @@ class SFML_SYSTEM_API String
String(const char* ansiString, const std::locale& locale = std::locale());

////////////////////////////////////////////////////////////
/// \brief Construct from an ANSI string and a locale
/// \brief Construct from an ANSI string_view and a locale
///
/// The source string_view is converted to UTF-32 according
/// to the given locale.
///
/// \param ansiString ANSI string to convert
/// \param ansiString ANSI string_view to convert
/// \param locale Locale to use for conversion
///
////////////////////////////////////////////////////////////
String(std::string_view ansiString, const std::locale& locale = std::locale());

////////////////////////////////////////////////////////////
/// \brief Construct from an ANSI string and a locale
///
Expand All @@ -143,11 +143,11 @@ class SFML_SYSTEM_API String
////////////////////////////////////////////////////////////
/// \brief Construct from a wide string_view
///
/// \param wideString Wide string to convert
/// \param wideString Wide string_view to convert
///
////////////////////////////////////////////////////////////
String(std::wstring_view wideString);

////////////////////////////////////////////////////////////
/// \brief Construct from a wide string
///
Expand All @@ -167,11 +167,11 @@ class SFML_SYSTEM_API String
////////////////////////////////////////////////////////////
/// \brief Construct from an UTF-32 string_view
///
/// \param utf32String UTF-32 string to assign
/// \param utf32String UTF-32 string_view to assign
///
////////////////////////////////////////////////////////////
String(std::basic_string_view<std::uint32_t> utf32String);

////////////////////////////////////////////////////////////
/// \brief Construct from an UTF-32 string
///
Expand Down
3 changes: 2 additions & 1 deletion src/SFML/System/String.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,8 @@ String::String(std::basic_string_view<std::uint32_t> utf32String) : m_string(utf


////////////////////////////////////////////////////////////
String::String(const std::basic_string<std::uint32_t>& utf32String) : String(std::basic_string_view<std::uint32_t>(utf32String))
String::String(const std::basic_string<std::uint32_t>& utf32String) :
String(std::basic_string_view<std::uint32_t>(utf32String))
{
}

Expand Down

0 comments on commit 83779bd

Please sign in to comment.