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
@@ -23,7 +23,6 @@
|
||||
#include "PreCompiled.h"
|
||||
|
||||
#include <Base/Console.h>
|
||||
#include <Base/Tools.h>
|
||||
#include <Base/UnitsApi.h>
|
||||
#include <Gui/Application.h>
|
||||
#include <Gui/BitmapFactory.h>
|
||||
@@ -170,9 +169,9 @@ void TaskCenterLine::setUiPrimary()
|
||||
|
||||
if (m_partFeat) {
|
||||
std::string baseName = m_partFeat->getNameInDocument();
|
||||
ui->leBaseView->setText(Base::Tools::fromStdString(baseName));
|
||||
ui->leBaseView->setText(QString::fromStdString(baseName));
|
||||
for (auto& s: m_subNames) {
|
||||
QString listItem = Base::Tools::fromStdString(s);
|
||||
QString listItem = QString::fromStdString(s);
|
||||
ui->lstSubList->addItem(listItem);
|
||||
}
|
||||
}
|
||||
@@ -212,8 +211,8 @@ void TaskCenterLine::setUiEdit()
|
||||
setWindowTitle(QObject::tr("Edit Center Line"));
|
||||
if (m_partFeat) {
|
||||
std::string baseName = m_partFeat->getNameInDocument();
|
||||
ui->leBaseView->setText(Base::Tools::fromStdString(baseName));
|
||||
QString listItem = Base::Tools::fromStdString(m_edgeName);
|
||||
ui->leBaseView->setText(QString::fromStdString(baseName));
|
||||
QString listItem = QString::fromStdString(m_edgeName);
|
||||
ui->lstSubList->addItem(listItem);
|
||||
}
|
||||
ui->cpLineColor->setColor(m_cl->m_format.getColor().asValue<QColor>());
|
||||
|
||||
Reference in New Issue
Block a user