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
@@ -221,7 +221,7 @@ void TaskLeaderLine::setUiPrimary()
|
||||
|
||||
if (m_baseFeat) {
|
||||
std::string baseName = m_baseFeat->getNameInDocument();
|
||||
ui->tbBaseView->setText(Base::Tools::fromStdString(baseName));
|
||||
ui->tbBaseView->setText(QString::fromStdString(baseName));
|
||||
}
|
||||
|
||||
ui->pbTracker->setText(tr("Pick points"));
|
||||
@@ -264,7 +264,7 @@ void TaskLeaderLine::setUiEdit()
|
||||
|
||||
if (m_lineFeat) {
|
||||
std::string baseName = m_lineFeat->LeaderParent.getValue()->getNameInDocument();
|
||||
ui->tbBaseView->setText(Base::Tools::fromStdString(baseName));
|
||||
ui->tbBaseView->setText(QString::fromStdString(baseName));
|
||||
|
||||
DrawGuiUtil::loadArrowBox(ui->cboxStartSym);
|
||||
ui->cboxStartSym->setCurrentIndex(m_lineFeat->StartSymbol.getValue());
|
||||
|
||||
Reference in New Issue
Block a user