From dff5fea9760383984c2e60949341ebdc07eaab5a Mon Sep 17 00:00:00 2001 From: flow Date: Thu, 3 Nov 2022 16:59:03 -0300 Subject: [PATCH] feat: add more separation between types of std::string in StringUtils Signed-off-by: flow --- launcher/StringUtils.h | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/launcher/StringUtils.h b/launcher/StringUtils.h index d7706b0f..1799605b 100644 --- a/launcher/StringUtils.h +++ b/launcher/StringUtils.h @@ -5,15 +5,27 @@ namespace StringUtils { #if defined Q_OS_WIN32 -inline std::wstring toStdString(QString s) +using string = std::wstring; + +inline string toStdString(QString s) { return s.toStdWString(); } +inline QString fromStdString(string s) +{ + return QString::fromStdWString(s); +} #else -inline std::string toStdString(QString s) +using string = std::string; + +inline string toStdString(QString s) { return s.toStdString(); } +inline QString fromStdString(string s) +{ + return QString::fromStdString(s); +} #endif int naturalCompare(const QString& s1, const QString& s2, Qt::CaseSensitivity cs);