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
@@ -36,7 +36,6 @@
|
||||
#include <App/PropertyUnits.h>
|
||||
#include <Base/Exception.h>
|
||||
#include <Base/Quantity.h>
|
||||
#include <Base/Tools.h>
|
||||
|
||||
#include "InputField.h"
|
||||
#include "BitmapFactory.h"
|
||||
@@ -120,7 +119,7 @@ void InputField::bind(const App::ObjectIdentifier &_path)
|
||||
std::shared_ptr<const Expression> expr(docObj->getExpression(getPath()).expression);
|
||||
|
||||
if (expr)
|
||||
newInput(Tools::fromStdString(expr->toString()));
|
||||
newInput(QString::fromStdString(expr->toString()));
|
||||
}
|
||||
|
||||
// Create document object, to initialize completer
|
||||
@@ -164,7 +163,7 @@ void InputField::updateText(const Base::Quantity& quant)
|
||||
std::shared_ptr<const Expression> e(getPath().getDocumentObject()->getExpression(getPath()).expression);
|
||||
|
||||
if (e) {
|
||||
setText(Tools::fromStdString(e->toString()));
|
||||
setText(QString::fromStdString(e->toString()));
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user