kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Base: Drop QString-std::string conversion functions from Tools

Browse Source 
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:
Ladislav Michl
2024-12-02 12:34:11 +01:00
committed by Chris Hennes
parent 1a13d25811
commit e62b91ada4
54 changed files with 190 additions and 255 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Mod/Spreadsheet/Gui/PropertiesDialog.cpp
View File

@@ -111,9 +111,9 @@ PropertiesDialog::PropertiesDialog(Sheet* _sheet,
ui->styleUnderline->setChecked(true);
}
ui->displayUnit->setText(Base::Tools::fromStdString(displayUnit.stringRep));
ui->displayUnit->setText(QString::fromStdString(displayUnit.stringRep));
ui->alias->setText(Base::Tools::fromStdString(alias));
ui->alias->setText(QString::fromStdString(alias));
// Colors
connect(ui->foregroundColor,
@@ -241,9 +241,9 @@ void PropertiesDialog::aliasChanged(const QString& text)
{
QPalette palette = ui->alias->palette();
aliasOk = text.isEmpty() || sheet->isValidAlias(Base::Tools::toStdString(text));
aliasOk = text.isEmpty() || sheet->isValidAlias(text.toStdString());
alias = aliasOk ? Base::Tools::toStdString(text) : "";
alias = aliasOk ? text.toStdString() : "";
palette.setColor(QPalette::Text, aliasOk ? Qt::black : Qt::red);
ui->alias->setPalette(palette);
ui->buttonBox->button(QDialogButtonBox::Ok)->setEnabled(displayUnitOk && aliasOk);