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
@@ -50,7 +50,6 @@
|
||||
|
||||
#include <App/Application.h>
|
||||
#include <Base/Console.h>
|
||||
#include <Base/Tools.h>
|
||||
#include <Gui/FileDialog.h>
|
||||
#include <Mod/TechDraw/App/Preferences.h>
|
||||
|
||||
@@ -812,7 +811,7 @@ void MRichTextEdit::setDefFont(QString fontName)
|
||||
|
||||
QFont MRichTextEdit::getDefFont()
|
||||
{
|
||||
QString family = Base::Tools::fromStdString(Preferences::labelFont());
|
||||
QString family = QString::fromStdString(Preferences::labelFont());
|
||||
m_defFont = family;
|
||||
QFont result;
|
||||
result.setFamily(family);
|
||||
|
||||
Reference in New Issue
Block a user