From 3f93da8c1ad64e7b3c8356125d022f260513c183 Mon Sep 17 00:00:00 2001 From: Gavin MacGregor Date: Wed, 2 Apr 2025 19:05:22 +0100 Subject: [PATCH] Fix copy assignment --- src/qteletextdecoder/levelonepage.h | 2 +- src/qteletextdecoder/pagex26base.cpp | 2 +- src/qteletextdecoder/pagex26base.h | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/qteletextdecoder/levelonepage.h b/src/qteletextdecoder/levelonepage.h index 02f6c6e..13ce9ce 100644 --- a/src/qteletextdecoder/levelonepage.h +++ b/src/qteletextdecoder/levelonepage.h @@ -121,7 +121,7 @@ private: int pageNumber, subPageCodes; } m_composeLink[8]; - const int m_defaultCLUT[32] = { + static constexpr int m_defaultCLUT[32] = { 0x000, 0xf00, 0x0f0, 0xff0, 0x00f, 0xf0f, 0x0ff, 0xfff, 0x000, 0x700, 0x070, 0x770, 0x007, 0x707, 0x077, 0x777, 0xf05, 0xf70, 0x0f7, 0xffb, 0x0ca, 0x500, 0x652, 0xc77, diff --git a/src/qteletextdecoder/pagex26base.cpp b/src/qteletextdecoder/pagex26base.cpp index 730bc29..cb86c06 100644 --- a/src/qteletextdecoder/pagex26base.cpp +++ b/src/qteletextdecoder/pagex26base.cpp @@ -62,7 +62,7 @@ void PageX26Base::setEnhancementListFromPacket(int p, QByteArray pkt) // We write "dummy" reserved 11110 Row Triplets in the allocated entries which then get overwritten by the packet contents. // This is in case of missing packets so we can keep Local Object pointers valid. while (m_enhancements.size() < (p+1)*13) - m_enhancements.append(m_paddingX26Triplet); + m_enhancements.append( X26Triplet{ 41, 0x1e, 0 } ); X26Triplet newX26Triplet; diff --git a/src/qteletextdecoder/pagex26base.h b/src/qteletextdecoder/pagex26base.h index 32c3899..8d5fe1f 100644 --- a/src/qteletextdecoder/pagex26base.h +++ b/src/qteletextdecoder/pagex26base.h @@ -40,7 +40,6 @@ protected: bool packetFromEnhancementListNeeded(int n) const { return ((m_enhancements.size()+12) / 13) > n; }; X26TripletList m_enhancements; - const X26Triplet m_paddingX26Triplet { 41, 0x1e, 0 }; }; #endif