diff --git a/src/qteletextdecoder/document.cpp b/src/qteletextdecoder/document.cpp index bf26bb7..3758f7b 100644 --- a/src/qteletextdecoder/document.cpp +++ b/src/qteletextdecoder/document.cpp @@ -52,7 +52,7 @@ void ClutModel::setSubPage(LevelOnePage *subPage) { if (subPage != m_subPage) { m_subPage = subPage; - emit dataChanged(createIndex(0, 0), createIndex(31, 0), QVector(Qt::DecorationRole)); + emit dataChanged(createIndex(0, 0), createIndex(31, 0), QList(Qt::DecorationRole)); } } diff --git a/src/qteletextdecoder/render.cpp b/src/qteletextdecoder/render.cpp index e439b33..32a66db 100644 --- a/src/qteletextdecoder/render.cpp +++ b/src/qteletextdecoder/render.cpp @@ -161,7 +161,7 @@ inline void TeletextPageRender::drawCharacter(QPainter &painter, int r, int c, u else if ((m_decoder->cellBold(r, c) || m_decoder->cellItalic(r, c)) && characterSet < 24) drawBoldOrItalicCharacter(painter, r, c, characterCode, characterSet, characterFragment); else { - m_fontBitmap.image()->setColorTable(QVector{m_backgroundQColor.rgba(), m_foregroundQColor.rgba()}); + m_fontBitmap.image()->setColorTable(QList{m_backgroundQColor.rgba(), m_foregroundQColor.rgba()}); drawFromFontBitmap(painter, r, c, characterCode, characterSet, characterFragment); } @@ -185,7 +185,7 @@ inline void TeletextPageRender::drawCharacter(QPainter &painter, int r, int c, u if (characterDiacritical != 0) { painter.setCompositionMode(QPainter::CompositionMode_SourceOver); - m_fontBitmap.image()->setColorTable(QVector{0x00000000, m_foregroundQColor.rgba()}); + m_fontBitmap.image()->setColorTable(QList{0x00000000, m_foregroundQColor.rgba()}); drawFromFontBitmap(painter, r, c, characterDiacritical+64, 7, characterFragment); painter.setCompositionMode(QPainter::CompositionMode_Source); } @@ -196,8 +196,8 @@ inline void TeletextPageRender::drawBoldOrItalicCharacter(QPainter &painter, int QImage styledImage = QImage(12, 10, QImage::Format_Mono); QPainter styledPainter; - m_fontBitmap.image()->setColorTable(QVector{m_backgroundQColor.rgba(), m_foregroundQColor.rgba()}); - styledImage.setColorTable(QVector{m_backgroundQColor.rgba(), m_foregroundQColor.rgba()}); + m_fontBitmap.image()->setColorTable(QList{m_backgroundQColor.rgba(), m_foregroundQColor.rgba()}); + styledImage.setColorTable(QList{m_backgroundQColor.rgba(), m_foregroundQColor.rgba()}); if (m_decoder->cellItalic(r, c)) { styledImage.fill(0); @@ -217,7 +217,7 @@ inline void TeletextPageRender::drawBoldOrItalicCharacter(QPainter &painter, int boldeningImage = styledImage.copy(); styledPainter.begin(&styledImage); styledPainter.setCompositionMode(QPainter::CompositionMode_SourceOver); - boldeningImage.setColorTable(QVector{0x00000000, m_foregroundQColor.rgba()}); + boldeningImage.setColorTable(QList{0x00000000, m_foregroundQColor.rgba()}); styledPainter.drawImage(1, 0, boldeningImage); styledPainter.end(); } @@ -324,7 +324,7 @@ void TeletextPageRender::renderRow(int r, int ph, bool force) if (m_showControlCodes && c < 40 && m_decoder->teletextPage()->character(r, c) < 0x20) { painter.setCompositionMode(QPainter::CompositionMode_SourceOver); - m_fontBitmap.image()->setColorTable(QVector{0x7f000000, 0xe0ffffff}); + m_fontBitmap.image()->setColorTable(QList{0x7f000000, 0xe0ffffff}); painter.drawImage(c*12, r*10, *m_fontBitmap.image(), (m_decoder->teletextPage()->character(r, c)+32)*12, 250, 12, 10); painter.setCompositionMode(QPainter::CompositionMode_Source); } diff --git a/src/qteletextmaker/levelonecommands.cpp b/src/qteletextmaker/levelonecommands.cpp index 6f39664..ff9d799 100644 --- a/src/qteletextmaker/levelonecommands.cpp +++ b/src/qteletextmaker/levelonecommands.cpp @@ -810,7 +810,7 @@ PasteCommand::PasteCommand(TeletextDocument *teletextDocument, int pageCharSet, imageData.convertTo(QImage::Format_MonoLSB); else // Only pure black and white images convert reliably this way... - imageData = imageData.convertToFormat(QImage::Format_MonoLSB, QVector{0x000000ff, 0xffffffff}); + imageData = imageData.convertToFormat(QImage::Format_MonoLSB, QList{0x000000ff, 0xffffffff}); for (int r=0; r(Qt::DecorationRole)); + emit dataChanged(createIndex(0, 0), createIndex(95, 0), QList(Qt::DecorationRole)); } } @@ -83,7 +83,7 @@ void CharacterListModel::setG1AndBlastCharacterSet(int characterSet) if (characterSet != m_characterSet || !m_mosaic) { m_characterSet = characterSet; m_mosaic = true; - emit dataChanged(createIndex(0, 0), createIndex(95, 0), QVector(Qt::DecorationRole)); + emit dataChanged(createIndex(0, 0), createIndex(95, 0), QList(Qt::DecorationRole)); } }