Base: Drop QString-std::string conversion functions from Tools
Convenience helpers function Tools::toStdString and Tools::fromStdString were implemented for Qt4 or older to perform utf8 aware conversion as QString::toStdString/QString::fromStdString were using toAscii/fromAscii internally (see https://dreamswork.github.io/qt4/classQString.html). Since Qt5 QString uses toUtf8/fromUTf8, which makes the helper functions obsolete (see https://doc.qt.io/qt-5/qstring.html#fromStdString).
This commit is contained in:
committed by
Chris Hennes
parent
f9d1391588
commit
0ee3c9f8e6
@@ -281,27 +281,6 @@ struct BaseExport Tools
|
||||
static QString escapeEncodeFilename(const QString& s);
|
||||
static std::string escapeEncodeFilename(const std::string& s);
|
||||
|
||||
/**
|
||||
* @brief toStdString Convert a QString into a UTF-8 encoded std::string.
|
||||
* @param s String to convert.
|
||||
* @return A std::string encoded as UTF-8.
|
||||
*/
|
||||
static inline std::string toStdString(const QString& s)
|
||||
{
|
||||
QByteArray tmp = s.toUtf8();
|
||||
return {tmp.constData(), static_cast<size_t>(tmp.size())};
|
||||
}
|
||||
|
||||
/**
|
||||
* @brief fromStdString Convert a std::string encoded as UTF-8 into a QString.
|
||||
* @param s std::string, expected to be UTF-8 encoded.
|
||||
* @return String represented as a QString.
|
||||
*/
|
||||
static inline QString fromStdString(const std::string& s)
|
||||
{
|
||||
return QString::fromUtf8(s.c_str(), static_cast<int>(s.size()));
|
||||
}
|
||||
|
||||
/**
|
||||
* @brief quoted Creates a quoted string.
|
||||
* @param String to be quoted.
|
||||
|
||||
Reference in New Issue
Block a user