From 8c056a3edbcd4da33ce8f32db1b2f75c152acb32 Mon Sep 17 00:00:00 2001 From: Bill Somerville Date: Sat, 24 Apr 2021 15:01:50 +0100 Subject: [PATCH] Repair a regression in parsing map65 UI colours --- map65/devsetup.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/map65/devsetup.cpp b/map65/devsetup.cpp index abd0734a9..01f373e60 100644 --- a/map65/devsetup.cpp +++ b/map65/devsetup.cpp @@ -2,6 +2,7 @@ #include "mainwindow.h" #include #include +#include #include #define MAXDEVICES 200 @@ -111,10 +112,8 @@ void DevSetup::initDlg() ui.mult570TxSpinBox->setValue(m_mult570Tx); ui.cal570SpinBox->setValue(m_cal570); ui.sbTxOffset->setValue(m_TxOffset); - QTextStream its {&m_colors, QIODevice::ReadOnly}; - its.setIntegerBase (16); - its.setFieldWidth (2); - its >> r >> g >> b >> r0 >> g0 >> b0 >> r1 >> g1 >> b1 >> r2 >> g2 >> b2 >> r3 >> g3 >> b3; + ::sscanf (m_colors.toLatin1(),"%2x%2x%2x%2x%2x%2x%2x%2x%2x%2x%2x%2x%2x%2x%2x", + &r,&g,&b,&r0,&g0,&b0,&r1,&g1,&b1,&r2,&g2,&b2,&r3,&g3,&b3); updateColorLabels(); ui.sbBackgroundRed->setValue(r); ui.sbBackgroundGreen->setValue(g);