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 f9d1391588
commit 0ee3c9f8e6
54 changed files with 190 additions and 255 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/Mod/Spreadsheet/Gui/SpreadsheetView.cpp
View File

@@ -432,7 +432,7 @@ void SheetView::confirmAliasChanged(const QString& text)
bool aliasOkay = true;
ui->cellAlias->setDocumentObject(sheet);
if (text.length() != 0 && !sheet->isValidAlias(Base::Tools::toStdString(text))) {
if (text.length() != 0 && !sheet->isValidAlias(text.toStdString())) {
aliasOkay = false;
}
@@ -444,8 +444,7 @@ void SheetView::confirmAliasChanged(const QString& text)
std::string current_alias;
(void)cell->getAlias(current_alias);
if (text != QString::fromUtf8(current_alias.c_str())) {
Base::Console().Error("Unable to set alias: %s\n",
Base::Tools::toStdString(text).c_str());
Base::Console().Error("Unable to set alias: %s\n", text.toStdString().c_str());
}
}
else {
@@ -479,7 +478,7 @@ void SheetView::aliasChanged(const QString& text)
warningColor = QLatin1String("rgb(200,0,0)"); // Dark red for light mode
}
if (!text.isEmpty() && !sheet->isValidAlias(Base::Tools::toStdString(text))) {
if (!text.isEmpty() && !sheet->isValidAlias(text.toStdString())) {
aliasOk = false;
}