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

5
src/Gui/Widgets.cpp
View File

@@ -40,7 +40,6 @@
# include <QToolTip>
#endif
#include <Base/Tools.h>
#include <Base/Exception.h>
#include <Base/Interpreter.h>
#include <App/ExpressionParser.h>
@@ -1615,7 +1614,7 @@ void ExpLineEdit::onChange() {
QPalette p(palette());
p.setColor(QPalette::Text, Qt::lightGray);
setPalette(p);
iconLabel->setExpressionText(Base::Tools::fromStdString(getExpression()->toString()));
iconLabel->setExpressionText(QString::fromStdString(getExpression()->toString()));
}
else {
setReadOnly(false);
@@ -1645,7 +1644,7 @@ void ExpLineEdit::resizeEvent(QResizeEvent * event)
QPalette p(palette());
p.setColor(QPalette::Text, Qt::lightGray);
setPalette(p);
iconLabel->setExpressionText(Base::Tools::fromStdString(getExpression()->toString()));
iconLabel->setExpressionText(QString::fromStdString(getExpression()->toString()));
}
else {
setReadOnly(false);