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

Qt6: QColor::setNamedColor is deprecated since Qt 6.6

Browse Source
This commit is contained in:
wmayer
2024-09-11 15:41:04 +02:00
parent 305e94e493
commit 3b91fd33e0
4 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Gui/MainWindow.cpp
View File

@@ -2118,8 +2118,7 @@ QPixmap MainWindow::splashImage() const
y = h - 20;
}
QColor color;
color.setNamedColor(QString::fromLatin1(tc->second.c_str()));
QColor color(QString::fromLatin1(tc->second.c_str()));
if (color.isValid()) {
painter.setPen(color);
painter.setFont(fontExe);
@@ -2129,8 +2128,7 @@ QPixmap MainWindow::splashImage() const
}
painter.setFont(fontVer);
painter.drawText(x + (l + 235), y - 7, version);
QColor warningColor;
warningColor.setNamedColor(QString::fromLatin1(wc->second.c_str()));
QColor warningColor(QString::fromLatin1(wc->second.c_str()));
if (suffix == QLatin1String("dev") && warningColor.isValid()) {
fontVer.setPointSizeF(14.0);
painter.setFont(fontVer);

2
src/Gui/Splashscreen.cpp
View File

@@ -162,7 +162,7 @@ public:
// choose text color
auto tc = cfg.find("SplashTextColor");
if (tc != cfg.end()) {
QColor col; col.setNamedColor(QString::fromLatin1(tc->second.c_str()));
QColor col(QString::fromStdString(tc->second));
if (col.isValid()) {
textColor = col;
}

4
src/Gui/View3DPy.cpp
View File

@@ -877,7 +877,7 @@ Py::Object View3DInventorPy::saveImage(const Py::Tuple& args)
if (colname.compare(QLatin1String("Current"), Qt::CaseInsensitive) == 0)
bg = QColor(); // assign an invalid color here
else
bg.setNamedColor(colname);
bg = QColor(colname);
QImage img;
getView3DIventorPtr()->getViewer()->savePicture(w, h, s, bg, img);
@@ -926,7 +926,7 @@ Py::Object View3DInventorPy::saveVectorGraphic(const Py::Tuple& args)
if (colname.compare(QLatin1String("Current"), Qt::CaseInsensitive) == 0)
bg = getView3DIventorPtr()->getViewer()->backgroundColor();
else
bg.setNamedColor(colname);
bg = QColor(colname);
getView3DIventorPtr()->getViewer()->saveGraphic(ps,bg,vo.get());
out->closeFile();

3
src/Mod/Spreadsheet/Gui/SheetTableView.cpp
View File

@@ -1159,8 +1159,7 @@ QString SheetTableView::toHtml() const
boldFont.setBold(true);
boldFormat.setFont(boldFont);
QColor bgColor;
bgColor.setNamedColor(QLatin1String("#f0f0f0"));
QColor bgColor(QLatin1String("#f0f0f0"));
QTextCharFormat bgFormat;
bgFormat.setBackground(QBrush(bgColor));