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
@@ -788,7 +788,7 @@ QStringList ExpressionCompleter::splitPath(const QString& input) const
|
||||
stringList.back().resize(stringList.back().size() - trim.size());
|
||||
}
|
||||
while (stringListIter != stringList.end()) {
|
||||
resultList << Base::Tools::fromStdString(*stringListIter);
|
||||
resultList << QString::fromStdString(*stringListIter);
|
||||
++stringListIter;
|
||||
}
|
||||
}
|
||||
@@ -797,7 +797,7 @@ QStringList ExpressionCompleter::splitPath(const QString& input) const
|
||||
if (!lastElem.empty()) {
|
||||
// erase the separator
|
||||
lastElem.erase(lastElem.begin());
|
||||
resultList << Base::Tools::fromStdString(lastElem);
|
||||
resultList << QString::fromStdString(lastElem);
|
||||
}
|
||||
else {
|
||||
// add empty string to allow completion after "." or "#"
|
||||
|
||||
Reference in New Issue
Block a user