Skip to content

Improve string handling in esnacc #114

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
JanFellner merged 2 commits into from
Dec 15, 2025
Merged

Improve string handling in esnacc #114

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
743a66a
BUILDSYS-568 Replaced setters for strings from std::string/std::wstri…
JanFellner Dec 15, 2025
eb2cb3f
BUILDSYS-568 bumped version to 6.0.35
JanFellner Dec 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 3 additions & 9 deletions cpp-lib/include/asn-incl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1926,27 +1926,21 @@ class SNACCDLL_API WideAsnString : public std::wstring, public AsnType, protecte
WideAsnString(const std::wstring& strUTF16);

// Set the string as ASCII string (the internal encoding to and from other encodings wil be ISO-8859-1)
void setASCII(const char* strAscii);
// Set the string as ASCII string (the internal encoding to and from other encodings wil be ISO-8859-1)
void setASCII(const std::string& strAscii);
void setASCII(std::string_view strAscii);
// Get the string as ASCII string (the internal encoding to and from other encodings wil be ISO-8859-1)
std::string getASCII() const;
// Get the string as ASCII string (the internal encoding to and from other encodings wil be ISO-8859-1)
void getASCII(std::string& strAscii) const;

// Set the string as UTF8 string
void setUTF8(const char* szUTF8);
// Set the string as UTF8 string
void setUTF8(const std::string& strUTF8);
void setUTF8(std::string_view strUTF8);
// Get the string as UTF8 string
std::string getUTF8() const;
// Get the string as UTF8 string
void getUTF8(std::string& strUTF8) const;

// Set the string as UTF16 (= Windows Unicode) string
void setUTF16(const wchar_t* szUTF16);
// Set the string as UTF16 (= Windows Unicode) string
void setUTF16(const std::wstring& strUTF16);
void setUTF16(std::wstring_view strUTF16);
// Get the string as UTF16 (= Windows Unicode) string
std::wstring getUTF16() const;
// Get the string as UTF16 (= Windows Unicode) string
Expand Down
25 changes: 5 additions & 20 deletions cpp-lib/src/asn-stringtype.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -564,14 +564,9 @@ WideAsnString::WideAsnString(const std::string& strASCII)
setASCII(strASCII.c_str());
}

void WideAsnString::setASCII(const char* strAscii)
void WideAsnString::setASCII(std::string_view strAscii)
{
assign(AsnStringConvert::AsciiToUTF16(strAscii));
}

void WideAsnString::setASCII(const std::string& strAscii)
{
assign(AsnStringConvert::AsciiToUTF16(strAscii.c_str()));
assign(AsnStringConvert::AsciiToUTF16(strAscii.data()));
}

std::string WideAsnString::getASCII() const
Expand All @@ -584,14 +579,9 @@ void WideAsnString::getASCII(std::string& strAscii) const
strAscii = AsnStringConvert::UTF16ToAscii(c_str());
}

void WideAsnString::setUTF8(const char* szUTF8)
void WideAsnString::setUTF8(std::string_view strUTF8)
{
assign(AsnStringConvert::UTF8ToUTF16(szUTF8));
}

void WideAsnString::setUTF8(const std::string& strUTF8)
{
assign(AsnStringConvert::UTF8ToUTF16(strUTF8.c_str()));
assign(AsnStringConvert::UTF8ToUTF16(strUTF8.data()));
}

std::string WideAsnString::getUTF8() const
Expand All @@ -604,12 +594,7 @@ void WideAsnString::getUTF8(std::string& strUTF8) const
strUTF8 = AsnStringConvert::UTF16ToUTF8(c_str());
}

void WideAsnString::setUTF16(const wchar_t* szUTF16)
{
assign(szUTF16);
}

void WideAsnString::setUTF16(const std::wstring& strUTF16)
void WideAsnString::setUTF16(std::wstring_view strUTF16)
{
assign(strUTF16);
}
Expand Down
6 changes: 3 additions & 3 deletions version.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#ifndef VERSION_H
#define VERSION_H

#define VERSION "6.0.34"
#define VERSION_RC 6, 0, 34
#define RELDATE "02.12.2025"
#define VERSION "6.0.35"
#define VERSION_RC 6, 0, 35
#define RELDATE "15.12.2025"

#endif // VERSION_H