ham-ref/wfview
1
0
Fork 0
mirror of https://github.com/wf-group/wfview synced 2026-08-13 17:32:59 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert change for Qt6 deprecation

Browse source
This commit is contained in:
Phil Taylor 2024-03-30 20:49:52 +00:00
parent 87c8cab9c2
commit f53d7dd411
4 changed files with 36 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

8
usbcontroller.cpp
View file

@ -2046,7 +2046,7 @@ void usbController::restoreController(USBDEVICE* dev, QString file)
dev->orientation = (quint8)settings->value("Orientation", 2).toInt();
dev->speed = (quint8)settings->value("Speed", 2).toInt();
dev->timeout = (quint8)settings->value("Timeout", 30).toInt();
dev->color.fromString(settings->value("Color", QColor(Qt::white).name(QColor::HexArgb)).toString());
dev->color.setNamedColor(settings->value("Color", QColor(Qt::white).name(QColor::HexArgb)).toString());
dev->lcd = (funcs)settings->value("LCD",0).toInt();
qInfo(logUsbControl()) << "Restore of" << dev->product << "path" << dev->path << "from" << file;
@ -2095,9 +2095,9 @@ void usbController::restoreController(USBDEVICE* dev, QString file)
settings->value("Top", 0).toInt(),
settings->value("Width", 0).toInt(),
settings->value("Height", 0).toInt());
but.textColour.fromString(settings->value("Colour", QColor(Qt::white).name(QColor::HexArgb)).toString());
but.backgroundOn.fromString(settings->value("BackgroundOn", QColor(Qt::lightGray).name(QColor::HexArgb)).toString());
but.backgroundOff.fromString(settings->value("BackgroundOff", QColor(Qt::blue).name(QColor::HexArgb)).toString());
but.textColour.setNamedColor(settings->value("Colour", QColor(Qt::white).name(QColor::HexArgb)).toString());
but.backgroundOn.setNamedColor(settings->value("BackgroundOn", QColor(Qt::lightGray).name(QColor::HexArgb)).toString());
but.backgroundOff.setNamedColor(settings->value("BackgroundOff", QColor(Qt::blue).name(QColor::HexArgb)).toString());
but.toggle = settings->value("Toggle", false).toBool();
#if (QT_VERSION > QT_VERSION_CHECK(6,0,0))
if (settings->value("Icon","") != "") {