Tag version 0.6.3-beta

Amendment to a468032, where refresh signal was not taken out of row loops.

README.md

@@ -1,5 +1,7 @@
 # QTeletextMaker
-QTeletextMaker is a teletext page editor in development. It is written in C++ using the Qt 5 widget libraries, and released under the GNU General Public License v3.0
+QTeletextMaker is a teletext page editor with an emphasis on Level 2.5 enhancement editing, released under the GNU General Public License v3.0
+
+It is written in C++ using the Qt 5 widget libraries but should also compile with Qt 6.
 
 Features
 - Load and save teletext pages in .tti format.
@@ -14,11 +16,11 @@ Features
 - Configurable zoom.
 - View teletext pages in 4:3, 16:9 pillar-box and 16:9 stretch aspect ratios.
 
-Although designed on and developed for Linux, the Qt 5 libraries are cross platform so a Windows executable can be built. A Windows executable can be found within the "Releases" link, compiled on a Linux host using [MXE](https://github.com/mxe/mxe) based on [these instructions](https://blog.8bitbuddhism.com/2018/08/22/cross-compiling-windows-applications-with-mxe/). After MXE is installed `make qtbase` should build and install the required dependencies to build QTeletextMaker.
+Although designed on and developed for Linux, the Qt libraries are cross platform so a Windows executable can be built. A Windows executable can be found within the "Releases" link, compiled on a Linux host using [MXE](https://github.com/mxe/mxe) based on [these instructions](https://blog.8bitbuddhism.com/2018/08/22/cross-compiling-windows-applications-with-mxe/). After MXE is installed `make qtbase` should build and install the required dependencies to build QTeletextMaker.
 
 ## Building
 ### Linux
-Install the QtCore, QtGui and QtWidgets libraries and build headers, along with the qmake tool. Depending on how qmake is installed, type `qmake && make -j3` or `qmake5 && make -j3` in a terminal to build, you can replace -j3 with the number of processor cores used for the compile process.
+Install version 5 or 6 of the QtCore, QtGui and QtWidgets libraries and build headers, along with the qmake tool. Depending on how qmake is installed, type `qmake && make -j3` or `qmake5 && make -j3` or `qmake6 && make -j3` in a terminal to build, you can replace -j3 with the number of processor cores used for the compile process.
 
 The above should place the qteletextmaker executable in the same directory as the source, type `./qteletextmaker` in the terminal to launch. Some Qt installs may place the executable into a "release" directory.
 
@@ -45,7 +47,7 @@ Most triplet modes will present varying widgets below which can be used to alter
 
 By checking "raw values" it is also possible to view and edit the raw Address, Mode and Data numbers of the triplets. When editing triplets this way, remember that address values 0-39 select a column triplet which has one set of modes and address values 40-63 select a row triplet which has a different set of modes.
 
-The full behaviour of X/26 enhancement triplets can be found in section 12.3 of the [Enhanced Teletext specification ETS 300 706](https://web.archive.org/web/20160326062859/https://www.phecap.nl/download/enhenced-teletext-specs.pdf).
+The full behaviour of X/26 enhancement triplets can be found in section 12.3 of the [Enhanced Teletext specification ETS 300 706](https://www.etsi.org/deliver/etsi_en/300700_300799/300706/01.02.01_60/en_300706v010201p.pdf).
 
 ### Setting the Active Position
 The Active Position, whether set explicitly by a "Set Active Position" triplet or by a row or column triplet, can only be moved in screen address order i.e. from left to right within a row and then from top to bottom across rows. In other words:

decode.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2023 Gavin MacGregor
+ * Copyright (C) 2020-2024 Gavin MacGregor
  *
  * This file is part of QTeletextMaker.
  *
@@ -98,26 +98,6 @@ void TeletextPageDecode::Invocation::buildMap(int level)
 			continue;
 
 		switch (triplet.modeExt()) {
-			case 0x21: // G1 character
-			case 0x22: // G3 character at Level 1.5
-			case 0x29: // G0 character
-			case 0x2b: // G3 character at Level 2.5
-			case 0x2f: // G2 character
-			case 0x30 ... 0x3f: // G0 character with diacritical
-				m_characterMap.insert(qMakePair(targetRow, targetColumn), triplet);
-				// Store rightmost column in this row for Adaptive Object attribute tracking
-				// QMap stores one value per key, QMap::insert will replace the value if the key already exists
-				m_rightMostColumn.insert(targetRow, targetColumn);
-				break;
-			case 0x20: // Foreground colour
-			case 0x23: // Background colour
-			case 0x27: // Additional flash functions
-			case 0x28: // Modified G0 and G2 character set designation
-			case 0x2c: // Display attributes
-			case 0x2e: // Font style
-				m_attributeMap.insert(qMakePair(targetRow, targetColumn), triplet);
-				m_rightMostColumn.insert(targetRow, targetColumn);
-				break;
 			case 0x00: // Full screen colour
 				if ((triplet.data() & 0x60) != 0x00)
 					break;
@@ -133,6 +113,31 @@ void TeletextPageDecode::Invocation::buildMap(int level)
 				if (targetRow == 0)
 					m_fullRowCLUTMap.insert(targetRow, triplet);
 				break;
+			case 0x20: // Foreground colour
+			case 0x23: // Background colour
+			case 0x27: // Additional flash functions
+			case 0x28: // Modified G0 and G2 character set designation
+			case 0x2c: // Display attributes
+			case 0x2e: // Font style
+				m_attributeMap.insert(qMakePair(targetRow, targetColumn), triplet);
+				// Store rightmost column in this row for Adaptive Object attribute tracking
+				// QMap stores one value per key, QMap::insert will replace the value if the key already exists
+				m_rightMostColumn.insert(targetRow, targetColumn);
+				break;
+			case 0x21: // G1 character
+			case 0x22: // G3 character at Level 1.5
+			case 0x29: // G0 character
+			case 0x2b: // G3 character at Level 2.5
+			case 0x2f: // G2 character
+				m_characterMap.insert(qMakePair(targetRow, targetColumn), triplet);
+				m_rightMostColumn.insert(targetRow, targetColumn);
+				break;
+			default:
+				if (triplet.modeExt() >= 0x30 && triplet.modeExt() <= 0x3f) {
+					// G0 character with diacritical
+					m_characterMap.insert(qMakePair(targetRow, targetColumn), triplet);
+					m_rightMostColumn.insert(targetRow, targetColumn);
+				}
 		}
 	}
 }
@@ -322,9 +327,10 @@ TeletextPageDecode::textCharacter TeletextPageDecode::characterFromTriplets(cons
 			case 0x2f: // G2 character
 				result = { charCode, 2, 0 };
 				break;
-			case 0x30 ... 0x3f: // G0 character with diacritical
+			default:
+				if (triplet.modeExt() >= 0x30 && triplet.modeExt() <= 0x3f)
+					// G0 character with diacritical
 					result = { charCode, 0, triplet.mode() & 0xf };
-				break;
 		}
 
 		if (m_level == 1)
@@ -848,8 +854,17 @@ void TeletextPageDecode::decodeRow(int r)
 							painter->bottomHalfCell[c].fragment = DoubleSizeBottomLeftQuarter;
 							painter->rightHalfCell = painter->result;
 							painter->rightHalfCell.fragment = DoubleSizeTopRightQuarter;
+							// The right half of this "if" statement (without the t != 2) is meant
+							// to a fix a bug where the bottom half of double-size characters in
+							// Passive Objects didn't appear.
+							// But the fix also caused the bottom right quarter of double-size
+							// characters in Active Objects to go missing when they overlapped
+							// the bottom half of a Level 1 double-height row.
+							// Hence the t != 2
+							if (t != 2 || painter->bottomHalfCell[c+1].character.code == 0x00) {
 								painter->bottomHalfCell[c+1] = painter->result;
 								painter->bottomHalfCell[c+1].fragment = DoubleSizeBottomRightQuarter;
+							}
 						} else {
 							// Double height
 							painter->result.fragment = DoubleHeightTopHalf;
@@ -936,7 +951,14 @@ void TeletextPageDecode::decodeRow(int r)
 		// Level 1 set-after spacing attributes
 		if (c < 40 && m_rowHeight[r] != BottomHalf)
 			switch (m_levelOnePage->character(r, c)) {
-				case 0x00 ... 0x07: // Alphanumeric and foreground colour
+				case 0x00:
+				case 0x01:
+				case 0x02:
+				case 0x03:
+				case 0x04:
+				case 0x05:
+				case 0x06:
+				case 0x07: // Alphanumeric and foreground colour
 					level1Mosaics = false;
 					level1ForegroundCLUT = m_levelOnePage->character(r, c);
 					if (m_level >= 2)
@@ -948,7 +970,14 @@ void TeletextPageDecode::decodeRow(int r)
 					level1HoldMosaicCharacter = 0x20;
 					level1HoldMosaicSeparated = false;
 					break;
-				case 0x10 ... 0x17: // Mosaic and foreground colour
+				case 0x10:
+				case 0x11:
+				case 0x12:
+				case 0x13:
+				case 0x14:
+				case 0x15:
+				case 0x16:
+				case 0x17: // Mosaic and foreground colour
 					level1Mosaics = true;
 					level1ForegroundCLUT = m_levelOnePage->character(r, c) & 0x07;
 					if (m_level >= 2)

decode.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2023 Gavin MacGregor
+ * Copyright (C) 2020-2024 Gavin MacGregor
  *
  * This file is part of QTeletextMaker.
  *
@@ -37,10 +37,10 @@ public:
 	TeletextPageDecode();
 	~TeletextPageDecode();
 	bool refresh(int r, int c) const { return m_refresh[r][c]; }
-	void setRefresh(int, int, bool);
+	void setRefresh(int r, int c, bool refresh);
 	void decodePage();
 	LevelOnePage *teletextPage() const { return m_levelOnePage; };
-	void setTeletextPage(LevelOnePage *);
+	void setTeletextPage(LevelOnePage *newCurrentPage);
 	void updateSidePanels();
 
 	unsigned char cellCharacterCode(int r, int c) const { return m_cell[r][c].character.code; };
@@ -50,9 +50,9 @@ public:
 	int cellG2CharacterSet(int r, int c) const { return m_cell[r][c].g2Set; };
 	int cellForegroundCLUT(int r, int c) const { return m_cell[r][c].attribute.foregroundCLUT; };
 	int cellBackgroundCLUT(int r, int c) const { return m_cell[r][c].attribute.backgroundCLUT; };
-	QColor cellForegroundQColor(int, int);
+	QColor cellForegroundQColor(int r, int c);
-	QColor cellBackgroundQColor(int, int);
+	QColor cellBackgroundQColor(int r, int c);
-	QColor cellFlashForegroundQColor(int, int);
+	QColor cellFlashForegroundQColor(int r, int c);
 	int cellFlashMode(int r, int c) const { return m_cell[r][c].attribute.flash.mode; };
 	int cellFlashRatePhase(int r, int c) const { return m_cell[r][c].attribute.flash.ratePhase; };
 	int cellFlash2HzPhaseNumber(int r, int c) const { return m_cell[r][c].attribute.flash.phase2HzShown; };
@@ -75,16 +75,16 @@ public:
 	int rightSidePanelColumns() const { return m_rightSidePanelColumns; };
 
 public slots:
-	void setLevel(int);
+	void setLevel(int level);
 
 signals:
-	void fullScreenColourChanged(QColor);
+	void fullScreenColourChanged(QColor newColour);
-	void fullRowColourChanged(int, QColor);
+	void fullRowColourChanged(int r, QColor newColour);
 	void sidePanelsChanged();
 
 protected:
-	inline void setFullScreenColour(int);
+	inline void setFullScreenColour(int newColour);
-	inline void setFullRowColour(int, int);
+	inline void setFullRowColour(int row, int newColour);
 
 	int m_finalFullScreenColour, m_level;
 	QColor m_finalFullScreenQColor;
@@ -219,15 +219,15 @@ private:
 
 		X26TripletList *tripletList() const { return m_tripletList; };
 		void clear();
-		void setTripletList(X26TripletList *);
+		void setTripletList(X26TripletList *tripletList);
 		int startTripletNumber() const { return m_startTripletNumber; };
-		void setStartTripletNumber(int);
+		void setStartTripletNumber(int n);
 		int endTripletNumber() const { return m_endTripletNumber; };
-		void setEndTripletNumber(int);
+		void setEndTripletNumber(int n);
 		int originRow() const { return m_originRow; };
 		int originColumn() const { return m_originColumn; };
-		void setOrigin(int, int);
+		void setOrigin(int row, int column);
-		void buildMap(int);
+		void buildMap(int level);
 
 		QList<QPair<int, int>> charPositions() const { return m_characterMap.uniqueKeys(); };
 		QList<QPair<int, int>> attrPositions() const { return m_attributeMap.uniqueKeys(); };
@@ -253,11 +253,11 @@ private:
 	static textPainter s_blankPainter;
 
 	void decodeRow(int r);
-	QColor cellQColor(int, int, ColourPart);
+	QColor cellQColor(int r, int c, ColourPart colourPart);
-	textCell& cellAtCharacterOrigin(int, int);
+	textCell& cellAtCharacterOrigin(int r, int c);
-	void buildInvocationList(Invocation &, int);
+	void buildInvocationList(Invocation &invocation, int objectType);
-	textCharacter characterFromTriplets(const QList<X26Triplet>);
+	textCharacter characterFromTriplets(const QList<X26Triplet> triplets);
-	inline void rotateFlashMovement(flashFunctions &);
+	inline void rotateFlashMovement(flashFunctions &flash);
 
 	bool m_refresh[25][72];
 	textCell m_cell[25][72];

document.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2023 Gavin MacGregor
+ * Copyright (C) 2020-2024 Gavin MacGregor
  *
  * This file is part of QTeletextMaker.
  *

document.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2023 Gavin MacGregor
+ * Copyright (C) 2020-2024 Gavin MacGregor
  *
  * This file is part of QTeletextMaker.
  *
@@ -67,19 +67,19 @@ public:
 	LevelOnePage* subPage(int p) const { return m_subPages[p]; }
 	LevelOnePage* currentSubPage() const { return m_subPages[m_currentSubPageIndex]; }
 	int currentSubPageIndex() const { return m_currentSubPageIndex; }
-	void selectSubPageIndex(int, bool=false);
+	void selectSubPageIndex(int newSubPageIndex, bool refresh=false);
 	void selectSubPageNext();
 	void selectSubPagePrevious();
-	void insertSubPage(int, bool);
+	void insertSubPage(int beforeSubPageIndex, bool copySubPage);
-	void deleteSubPage(int);
+	void deleteSubPage(int subPageToDelete);
-	void deleteSubPageToRecycle(int);
+	void deleteSubPageToRecycle(int subPageToRecycle);
-	void unDeleteSubPageFromRecycle(int);
+	void unDeleteSubPageFromRecycle(int subPage);
 	int pageNumber() const { return m_pageNumber; }
-	void setPageNumber(int);
+	void setPageNumber(int pageNumber);
-	void setPageNumberFromString(QString);
+	void setPageNumberFromString(QString pageNumberString);
 	QString description() const { return m_description; }
-	void setDescription(QString);
+	void setDescription(QString newDescription);
-	void setFastTextLinkPageNumberOnAllSubPages(int, int);
+	void setFastTextLinkPageNumberOnAllSubPages(int linkNumber, int pageNumber);
 	QUndoStack *undoStack() const { return m_undoStack; }
 	ClutModel *clutModel() const { return m_clutModel; }
 	int cursorRow() const { return m_cursorRow; }
@@ -88,7 +88,7 @@ public:
 	void cursorDown(bool shiftKey=false);
 	void cursorLeft(bool shiftKey=false);
 	void cursorRight(bool shiftKey=false);
-	void moveCursor(int, int, bool selectionInProgress=false);
+	void moveCursor(int cursorRow, int cursorColumn, bool selectionInProgress=false);
 	int selectionTopRow() const { return m_selectionCornerRow == -1 ? m_cursorRow : qMin(m_selectionCornerRow, m_cursorRow); }
 	int selectionBottomRow() const { return qMax(m_selectionCornerRow, m_cursorRow); }
 	int selectionLeftColumn() const { return m_selectionCornerColumn == -1 ? m_cursorColumn : qMin(m_selectionCornerColumn, m_cursorColumn); }
@@ -98,22 +98,21 @@ public:
 	bool selectionActive() const { return m_selectionSubPage == currentSubPage(); }
 	int selectionCornerRow() const { return m_selectionCornerRow == -1 ? m_cursorRow : m_selectionCornerRow; }
 	int selectionCornerColumn() const { return m_selectionCornerColumn == -1 ? m_cursorColumn : m_selectionCornerColumn; }
-	void setSelectionCorner(int, int);
+	void setSelectionCorner(int row, int column);
-	void setSelection(int, int, int, int);
+	void setSelection(int topRow, int leftColumn, int bottomRow, int rightColumn);
 	void cancelSelection();
 	int levelRequired() const;
 
 signals:
 	void cursorMoved();
 	void selectionMoved();
-	void colourChanged(int);
+	void colourChanged(int i);
-	void contentsChange(int);
 	void pageOptionsChanged();
 	void aboutToChangeSubPage();
 	void subPageSelected();
-	void refreshNeeded();
+	void contentsChanged();
 
-	void tripletCommandHighlight(int);
+	void tripletCommandHighlight(int tripletNumber);
 
 private:
 	QString m_description;

examples/Level3p5-CharDesignation.tti

@@ -0,0 +1,71 @@
+DE,Unlimited character sets with Level 3.5
+PN,19901
+SC,0001
+PS,8000
+CT,8,T
+OL,28,@@@|gpCu_@|wKpZA`UB_GQd^w}ww]_}_wM@D
+OL,28,D@@|g@@pC@|p@@CO|O@pA@\p]@@wAG\gYF@D
+OL,26,@laIA@Bma|mDRdo}eO~fo~gOoayA@BpawXH@Xi`
+OL,26,AYIaZia[Ib]ip^Iq_iq`IrbI~do}eO~fo~gOrA|
+OL,26,BXHPXi`YIaZia[Ib]ip^Iq_iq`IrbI~do}eO~fo~
+OL,26,CgOtawXHRXi`YIaZia[Ib]ip^Iq_iq`IrbI~do}
+OL,26,DeO~fo~gOvA|XhRXi`YIaZia[Ib]ip^Iq_iq`Ir
+OL,26,EbI~do}eO~fo~gOxawXh[Xi`YIaZia[Ib]ip^Iq
+OL,26,F_iq`IrbI~do}eO~fo~gOzA|XhjXi`YIaZia[Ib
+OL,26,G]ip^Iq_iq`IrbI~do}eO~fo~gO|awXhkXi`YIa
+OL,26,HZia[Ib]ip^Iq_iq`IrbI~do}eO~fo~gO~A|XH`
+OL,26,IXi`YIaZia[Ib]ip^Iq_iq`IrbI~do}eO~fo~gO
+OL,26,JhApCCCCCCCCCCCC
+OL,1, Level 3.5 allows unlimited char  F(1/2)
+OL,2, sets using the "Modified G0 and G2     
+OL,3, Character Set Designation" triplet.    
+OL,4,F                       `G0 lvl 1`` -G2`
+OL,5,FLevel 1 with         G ABCD abcd |     
+OL,6,F  Level 1.5 G2 chars                   
+OL,7,F`Char set```` `Bits``  `G0 X/26``` `G2`
+OL,8,FLatin        B0000xxxG                 
+OL,10,FCyrillic 1   B0100000G                 
+OL,11,F  Serbian/Croatian                     
+OL,12,FCyrillic 2   B0100100G                 
+OL,13,F  Russian/Bulgarian                    
+OL,14,FCyrillic 3   B0100101G                 
+OL,15,F  Ukranian                             
+OL,16,FGreek        B0110111G                 
+OL,18,FHebrew       B1010101G                 
+OL,20,FArabic       B1010111G                 
+OL,22,FLatin with   B1000000G                 
+OL,23,F  Arabic G2                            
+PN,19902
+SC,0002
+PS,8000
+CT,8,T
+OL,28,@@@|gpCu_@|wKpZA`UB_GQd^w}ww]_}_wM@D
+OL,28,D@@|g@@pC@|p@@CO|O@pA@\p]@@wAG\gYF@D
+OL,26,@layA@Bma|nD@Ao|BO}Co}DO~Eo~FOoayA@Bpaw
+OL,26,AhQaHH@qD@@H@rA|hQaHHPsD@@HPtawhQaHHRuD@
+OL,26,B@HRvA|hQaHhRwD@@hRxawhQaHh[yD@@h[zA|hQa
+OL,26,CHhj{D@@hj|awhQaHhk}D@@hk~A|hQaHH`D@@H`
+OL,26,DhAp_CxUaHI`Ii`JIaKiaLIbMibNIcOicPIdQid
+OL,26,ERIeSieTIfUifVIgWigXIhYihZIi[ii\Ij]ij^Ik
+OL,26,F_ik`IlailbImcimdIneinfIogioiD@Ao|BO}Co}
+OL,26,GDO~Eo~FOHIpIipJIqKiqLIrMirNIsOisPItQit
+OL,26,HRIuSiuTIvUivVIwWiwXIxYixZIy[iy\Iz]iz^I{
+OL,26,I_i{`I|ai|bI}ci}dI~ei~fIBBBBB
+OL,1, Level 3.5 allows unlimited char  F(2/2)
+OL,2, sets using the "Modified G0 and G2     
+OL,3, Character Set Designation" triplet.    
+OL,4,F`G2``` `G0 from level 1`````````` `NOS`
+OL,5,FL1.5  G@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_
+OL,6,        `abcdefghijklmnopqrstuvwxyz{|}~ 
+OL,7,F`G2``` `G0 from X/26 enhancements``````
+OL,8,FLatin G                                
+OL,10,FCyr 1 CG        CG    C G   C  FGCFC F 
+OL,11,       CG        CG    C G   C  FGCFC   
+OL,12,FCyr 2 CG        CG    C G   C  FGCFC F 
+OL,13,       CG        CG    C G   C  FGCFC   
+OL,14,FCyr 3 CG        CG    C G   C  FGCFC F 
+OL,15,       CG        CG    C G   C  FGCFC   
+OL,16,FGreek G                                
+OL,18,FHebrewG                                
+OL,20,FArabicG                                
+OL,22,FL/AbG2G                                

examples/SubObjects-TeletextStoreBag.tti

@@ -0,0 +1,36 @@
+DE,Parody of Microsoft Store icon
+PN,15400
+SC,0000
+PS,8000
+CT,8,T
+OL,28,@@@|gpCu_@|wKpZA`UB_GdN`M\LXKTJPILXwM@@
+OL,26,@iD@hq]jD@hq]kD@hq]lD@hq]mD@hq]nD@hq]oD@
+OL,26,Ahq]pD@ACLN@LPbZQ`OQcOXCOXbRqD@hQarD@hQa
+OL,26,BsD@ACLJcO_COtD@hQdvD@hQdxD@hQdzD@hQd|D@
+OL,26,CACLJBp^CO^Bx}D@hq]~D@hq]D@hq]_Cxu]A@L
+OL,26,DhshXCOxUaACLhshN@LQ@LYCOxUdACL_COiD@ACL
+OL,26,E_COxwhQ`LQaR@MRaS`MSaT@NTaU`NUaV@O
+OL,26,FVaBBBBBBBBBBBB
+OL,1,Twwf$$$                
+OL,2,T==9111                
+OL,3,Twwf$$$FWelcome to the 
+OL,4,T==9111                
+OL,5,Twwf$$$WTELETEXT STORE 
+OL,6,T==9111                
+OL,7,Twwf$$$                
+OL,8,T]           ^xWV]    tW\               
+OL,9,T]           ^WT\wwf$$W               
+OL,10,T]           ^WT\==911W               
+OL,11,T]       V]W                 \        
+OL,12,T]       W]                    \        
+OL,13,T]       W]                    \        
+OL,14,T]       W]Q   RS     \        
+OL,15,T]       W]Q   RS     \        
+OL,16,T]       W]Q                   \        
+OL,17,T]       W]Q  TUV     \        
+OL,18,T]       W]Q  TUV     \        
+OL,19,T]       W]                    \        
+OL,20,T]       Wo]                ^?\         
+OL,21,Twwf$$$                
+OL,22,T==9111                
+OL,23,Twwf$$$                

examples/Template-ActivePosition.tti

@@ -0,0 +1,9 @@
+PN,19900
+SC,0000
+PS,8000
+CT,8,T
+OL,26,@iD@@kfjD@@kfkD@@kflD@@kfmD@@kfnD@@kfoD@
+OL,26,A@kfpD@@kfqD@@kfrD@@kfsD@@kftD@@kfuD@@kf
+OL,26,BvD@@kfwD@@kfxD@@kfxD@@kfyD@@kfzD@@kf{D@
+OL,26,C@kf|D@@kf}D@@kf~D@@kfD@@kfCCCC
+OL,1,  Active Position across every row      

keymap.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2023 Gavin MacGregor
+ * Copyright (C) 2020-2024 Gavin MacGregor
  *
  * This file is part of QTeletextMaker.
  *
@@ -28,304 +28,304 @@ static const QMap<QChar, char> keymapping[24] = {
 	},
 
 	{ // 1 Cyrillic G0 1 Serbian/Croatian
-		{ 0x0427, 0x40 }, // Ч CYRILLIC CAPITAL LETTER CHE
+		{ QChar(0x0427), 0x40 }, // Ч CYRILLIC CAPITAL LETTER CHE
-		{ 0x0410, 0x41 }, // А CYRILLIC CAPITAL LETTER A
+		{ QChar(0x0410), 0x41 }, // А CYRILLIC CAPITAL LETTER A
-		{ 0x0411, 0x42 }, // Б CYRILLIC CAPITAL LETTER BE
+		{ QChar(0x0411), 0x42 }, // Б CYRILLIC CAPITAL LETTER BE
-		{ 0x0426, 0x43 }, // Ц CYRILLIC CAPITAL LETTER TSE
+		{ QChar(0x0426), 0x43 }, // Ц CYRILLIC CAPITAL LETTER TSE
-		{ 0x0414, 0x44 }, // Д CYRILLIC CAPITAL LETTER DE
+		{ QChar(0x0414), 0x44 }, // Д CYRILLIC CAPITAL LETTER DE
-		{ 0x0415, 0x45 }, // Е CYRILLIC CAPITAL LETTER IE
+		{ QChar(0x0415), 0x45 }, // Е CYRILLIC CAPITAL LETTER IE
-		{ 0x0424, 0x46 }, // Ф CYRILLIC CAPITAL LETTER EF
+		{ QChar(0x0424), 0x46 }, // Ф CYRILLIC CAPITAL LETTER EF
-		{ 0x0413, 0x47 }, // Г CYRILLIC CAPITAL LETTER GHE
+		{ QChar(0x0413), 0x47 }, // Г CYRILLIC CAPITAL LETTER GHE
-		{ 0x0425, 0x48 }, // Х CYRILLIC CAPITAL LETTER HA
+		{ QChar(0x0425), 0x48 }, // Х CYRILLIC CAPITAL LETTER HA
-		{ 0x0418, 0x49 }, // И CYRILLIC CAPITAL LETTER I
+		{ QChar(0x0418), 0x49 }, // И CYRILLIC CAPITAL LETTER I
-		{ 0x0408, 0x4a }, // Ј CYRILLIC CAPITAL LETTER JE
+		{ QChar(0x0408), 0x4a }, // Ј CYRILLIC CAPITAL LETTER JE
-		{ 0x041a, 0x4b }, // К CYRILLIC CAPITAL LETTER KA
+		{ QChar(0x041a), 0x4b }, // К CYRILLIC CAPITAL LETTER KA
-		{ 0x041b, 0x4c }, // Л CYRILLIC CAPITAL LETTER EL
+		{ QChar(0x041b), 0x4c }, // Л CYRILLIC CAPITAL LETTER EL
-		{ 0x041c, 0x4d }, // М CYRILLIC CAPITAL LETTER EM
+		{ QChar(0x041c), 0x4d }, // М CYRILLIC CAPITAL LETTER EM
-		{ 0x041d, 0x4e }, // Н CYRILLIC CAPITAL LETTER EN
+		{ QChar(0x041d), 0x4e }, // Н CYRILLIC CAPITAL LETTER EN
-		{ 0x041e, 0x4f }, // О CYRILLIC CAPITAL LETTER O
+		{ QChar(0x041e), 0x4f }, // О CYRILLIC CAPITAL LETTER O
-		{ 0x041f, 0x50 }, // П CYRILLIC CAPITAL LETTER PE
+		{ QChar(0x041f), 0x50 }, // П CYRILLIC CAPITAL LETTER PE
-		{ 0x040c, 0x51 }, // Ќ CYRILLIC CAPITAL LETTER KJE
+		{ QChar(0x040c), 0x51 }, // Ќ CYRILLIC CAPITAL LETTER KJE
-		{ 0x0420, 0x52 }, // Р CYRILLIC CAPITAL LETTER ER
+		{ QChar(0x0420), 0x52 }, // Р CYRILLIC CAPITAL LETTER ER
-		{ 0x0421, 0x53 }, // С CYRILLIC CAPITAL LETTER ES
+		{ QChar(0x0421), 0x53 }, // С CYRILLIC CAPITAL LETTER ES
-		{ 0x0422, 0x54 }, // Т CYRILLIC CAPITAL LETTER TE
+		{ QChar(0x0422), 0x54 }, // Т CYRILLIC CAPITAL LETTER TE
-		{ 0x0423, 0x55 }, // У CYRILLIC CAPITAL LETTER U
+		{ QChar(0x0423), 0x55 }, // У CYRILLIC CAPITAL LETTER U
-		{ 0x0412, 0x56 }, // В CYRILLIC CAPITAL LETTER VE
+		{ QChar(0x0412), 0x56 }, // В CYRILLIC CAPITAL LETTER VE
-		{ 0x0403, 0x57 }, // Ѓ CYRILLIC CAPITAL LETTER GJE
+		{ QChar(0x0403), 0x57 }, // Ѓ CYRILLIC CAPITAL LETTER GJE
-		{ 0x0409, 0x58 }, // Љ CYRILLIC CAPITAL LETTER LJE
+		{ QChar(0x0409), 0x58 }, // Љ CYRILLIC CAPITAL LETTER LJE
-		{ 0x040a, 0x59 }, // Њ CYRILLIC CAPITAL LETTER NJE
+		{ QChar(0x040a), 0x59 }, // Њ CYRILLIC CAPITAL LETTER NJE
-		{ 0x0417, 0x5a }, // З CYRILLIC CAPITAL LETTER ZE
+		{ QChar(0x0417), 0x5a }, // З CYRILLIC CAPITAL LETTER ZE
-		{ 0x040b, 0x5b }, // Ћ CYRILLIC CAPITAL LETTER TSHE
+		{ QChar(0x040b), 0x5b }, // Ћ CYRILLIC CAPITAL LETTER TSHE
-		{ 0x0416, 0x5c }, // Ж CYRILLIC CAPITAL LETTER ZHE
+		{ QChar(0x0416), 0x5c }, // Ж CYRILLIC CAPITAL LETTER ZHE
-		{ 0x0402, 0x5d }, // Ђ CYRILLIC CAPITAL LETTER DJE
+		{ QChar(0x0402), 0x5d }, // Ђ CYRILLIC CAPITAL LETTER DJE
-		{ 0x0428, 0x5e }, // Ш CYRILLIC CAPITAL LETTER SHA
+		{ QChar(0x0428), 0x5e }, // Ш CYRILLIC CAPITAL LETTER SHA
-		{ 0x040f, 0x5f }, // Џ CYRILLIC CAPITAL LETTER DZHE
+		{ QChar(0x040f), 0x5f }, // Џ CYRILLIC CAPITAL LETTER DZHE
-		{ 0x0447, 0x60 }, // ч CYRILLIC SMALL LETTER CHE
+		{ QChar(0x0447), 0x60 }, // ч CYRILLIC SMALL LETTER CHE
-		{ 0x0430, 0x61 }, // а CYRILLIC SMALL LETTER A
+		{ QChar(0x0430), 0x61 }, // а CYRILLIC SMALL LETTER A
-		{ 0x0431, 0x62 }, // б CYRILLIC SMALL LETTER BE
+		{ QChar(0x0431), 0x62 }, // б CYRILLIC SMALL LETTER BE
-		{ 0x0446, 0x63 }, // ц CYRILLIC SMALL LETTER TSE
+		{ QChar(0x0446), 0x63 }, // ц CYRILLIC SMALL LETTER TSE
-		{ 0x0434, 0x64 }, // д CYRILLIC SMALL LETTER DE
+		{ QChar(0x0434), 0x64 }, // д CYRILLIC SMALL LETTER DE
-		{ 0x0435, 0x65 }, // е CYRILLIC SMALL LETTER IE
+		{ QChar(0x0435), 0x65 }, // е CYRILLIC SMALL LETTER IE
-		{ 0x0444, 0x66 }, // ф CYRILLIC SMALL LETTER EF
+		{ QChar(0x0444), 0x66 }, // ф CYRILLIC SMALL LETTER EF
-		{ 0x0433, 0x67 }, // г CYRILLIC SMALL LETTER GHE
+		{ QChar(0x0433), 0x67 }, // г CYRILLIC SMALL LETTER GHE
-		{ 0x0445, 0x68 }, // х CYRILLIC SMALL LETTER HA
+		{ QChar(0x0445), 0x68 }, // х CYRILLIC SMALL LETTER HA
-		{ 0x0438, 0x69 }, // и CYRILLIC SMALL LETTER I
+		{ QChar(0x0438), 0x69 }, // и CYRILLIC SMALL LETTER I
-		{ 0x0458, 0x6a }, // ј CYRILLIC SMALL LETTER JE
+		{ QChar(0x0458), 0x6a }, // ј CYRILLIC SMALL LETTER JE
-		{ 0x043a, 0x6b }, // к CYRILLIC SMALL LETTER KA
+		{ QChar(0x043a), 0x6b }, // к CYRILLIC SMALL LETTER KA
-		{ 0x043b, 0x6c }, // л CYRILLIC SMALL LETTER EL
+		{ QChar(0x043b), 0x6c }, // л CYRILLIC SMALL LETTER EL
-		{ 0x043c, 0x6d }, // м CYRILLIC SMALL LETTER EM
+		{ QChar(0x043c), 0x6d }, // м CYRILLIC SMALL LETTER EM
-		{ 0x043d, 0x6e }, // н CYRILLIC SMALL LETTER EN
+		{ QChar(0x043d), 0x6e }, // н CYRILLIC SMALL LETTER EN
-		{ 0x043e, 0x6f }, // о CYRILLIC SMALL LETTER O
+		{ QChar(0x043e), 0x6f }, // о CYRILLIC SMALL LETTER O
-		{ 0x043f, 0x70 }, // п CYRILLIC SMALL LETTER PE
+		{ QChar(0x043f), 0x70 }, // п CYRILLIC SMALL LETTER PE
-		{ 0x045c, 0x71 }, // ќ CYRILLIC SMALL LETTER KJE
+		{ QChar(0x045c), 0x71 }, // ќ CYRILLIC SMALL LETTER KJE
-		{ 0x0440, 0x72 }, // р CYRILLIC SMALL LETTER ER
+		{ QChar(0x0440), 0x72 }, // р CYRILLIC SMALL LETTER ER
-		{ 0x0441, 0x73 }, // с CYRILLIC SMALL LETTER ES
+		{ QChar(0x0441), 0x73 }, // с CYRILLIC SMALL LETTER ES
-		{ 0x0442, 0x74 }, // т CYRILLIC SMALL LETTER TE
+		{ QChar(0x0442), 0x74 }, // т CYRILLIC SMALL LETTER TE
-		{ 0x0443, 0x75 }, // у CYRILLIC SMALL LETTER U
+		{ QChar(0x0443), 0x75 }, // у CYRILLIC SMALL LETTER U
-		{ 0x0432, 0x76 }, // в CYRILLIC SMALL LETTER VE
+		{ QChar(0x0432), 0x76 }, // в CYRILLIC SMALL LETTER VE
-		{ 0x0453, 0x77 }, // ѓ CYRILLIC SMALL LETTER GJE
+		{ QChar(0x0453), 0x77 }, // ѓ CYRILLIC SMALL LETTER GJE
-		{ 0x0459, 0x78 }, // љ CYRILLIC SMALL LETTER LJE
+		{ QChar(0x0459), 0x78 }, // љ CYRILLIC SMALL LETTER LJE
-		{ 0x045a, 0x79 }, // њ CYRILLIC SMALL LETTER NJE
+		{ QChar(0x045a), 0x79 }, // њ CYRILLIC SMALL LETTER NJE
-		{ 0x0437, 0x7a }, // з CYRILLIC SMALL LETTER ZE
+		{ QChar(0x0437), 0x7a }, // з CYRILLIC SMALL LETTER ZE
-		{ 0x045b, 0x7b }, // ћ CYRILLIC SMALL LETTER TSHE
+		{ QChar(0x045b), 0x7b }, // ћ CYRILLIC SMALL LETTER TSHE
-		{ 0x0436, 0x7c }, // ж CYRILLIC SMALL LETTER ZHE
+		{ QChar(0x0436), 0x7c }, // ж CYRILLIC SMALL LETTER ZHE
-		{ 0x0452, 0x7d }, // ђ CYRILLIC SMALL LETTER DJE
+		{ QChar(0x0452), 0x7d }, // ђ CYRILLIC SMALL LETTER DJE
-		{ 0x0448, 0x7e }  // ш CYRILLIC SMALL LETTER SHA
+		{ QChar(0x0448), 0x7e }  // ш CYRILLIC SMALL LETTER SHA
 	},
 
 	{ // 2 Cyrillic G0 2 Russian/Bulgarian
-		{ 0x044b, 0x26 }, // ы CYRILLIC SMALL LETTER YERU
+		{ QChar(0x044b), 0x26 }, // ы CYRILLIC SMALL LETTER YERU
-		{ 0x042e, 0x40 }, // Ю CYRILLIC CAPITAL LETTER YU
+		{ QChar(0x042e), 0x40 }, // Ю CYRILLIC CAPITAL LETTER YU
-		{ 0x0410, 0x41 }, // А CYRILLIC CAPITAL LETTER A
+		{ QChar(0x0410), 0x41 }, // А CYRILLIC CAPITAL LETTER A
-		{ 0x0411, 0x42 }, // Б CYRILLIC CAPITAL LETTER BE
+		{ QChar(0x0411), 0x42 }, // Б CYRILLIC CAPITAL LETTER BE
-		{ 0x0426, 0x43 }, // Ц CYRILLIC CAPITAL LETTER TSE
+		{ QChar(0x0426), 0x43 }, // Ц CYRILLIC CAPITAL LETTER TSE
-		{ 0x0414, 0x44 }, // Д CYRILLIC CAPITAL LETTER DE
+		{ QChar(0x0414), 0x44 }, // Д CYRILLIC CAPITAL LETTER DE
-		{ 0x0415, 0x45 }, // Е CYRILLIC CAPITAL LETTER IE
+		{ QChar(0x0415), 0x45 }, // Е CYRILLIC CAPITAL LETTER IE
-		{ 0x0424, 0x46 }, // Ф CYRILLIC CAPITAL LETTER EF
+		{ QChar(0x0424), 0x46 }, // Ф CYRILLIC CAPITAL LETTER EF
-		{ 0x0413, 0x47 }, // Г CYRILLIC CAPITAL LETTER GHE
+		{ QChar(0x0413), 0x47 }, // Г CYRILLIC CAPITAL LETTER GHE
-		{ 0x0425, 0x48 }, // Х CYRILLIC CAPITAL LETTER HA
+		{ QChar(0x0425), 0x48 }, // Х CYRILLIC CAPITAL LETTER HA
-		{ 0x0418, 0x49 }, // И CYRILLIC CAPITAL LETTER I
+		{ QChar(0x0418), 0x49 }, // И CYRILLIC CAPITAL LETTER I
-		{ 0x0419, 0x4a }, // Й CYRILLIC CAPITAL LETTER SHORT I
+		{ QChar(0x0419), 0x4a }, // Й CYRILLIC CAPITAL LETTER SHORT I
-		{ 0x041a, 0x4b }, // К CYRILLIC CAPITAL LETTER KA
+		{ QChar(0x041a), 0x4b }, // К CYRILLIC CAPITAL LETTER KA
-		{ 0x041b, 0x4c }, // Л CYRILLIC CAPITAL LETTER EL
+		{ QChar(0x041b), 0x4c }, // Л CYRILLIC CAPITAL LETTER EL
-		{ 0x041c, 0x4d }, // М CYRILLIC CAPITAL LETTER EM
+		{ QChar(0x041c), 0x4d }, // М CYRILLIC CAPITAL LETTER EM
-		{ 0x041d, 0x4e }, // Н CYRILLIC CAPITAL LETTER EN
+		{ QChar(0x041d), 0x4e }, // Н CYRILLIC CAPITAL LETTER EN
-		{ 0x041e, 0x4f }, // О CYRILLIC CAPITAL LETTER O
+		{ QChar(0x041e), 0x4f }, // О CYRILLIC CAPITAL LETTER O
-		{ 0x041f, 0x50 }, // П CYRILLIC CAPITAL LETTER PE
+		{ QChar(0x041f), 0x50 }, // П CYRILLIC CAPITAL LETTER PE
-		{ 0x042f, 0x51 }, // Я CYRILLIC CAPITAL LETTER YA
+		{ QChar(0x042f), 0x51 }, // Я CYRILLIC CAPITAL LETTER YA
-		{ 0x0420, 0x52 }, // Р CYRILLIC CAPITAL LETTER ER
+		{ QChar(0x0420), 0x52 }, // Р CYRILLIC CAPITAL LETTER ER
-		{ 0x0421, 0x53 }, // С CYRILLIC CAPITAL LETTER ES
+		{ QChar(0x0421), 0x53 }, // С CYRILLIC CAPITAL LETTER ES
-		{ 0x0422, 0x54 }, // Т CYRILLIC CAPITAL LETTER TE
+		{ QChar(0x0422), 0x54 }, // Т CYRILLIC CAPITAL LETTER TE
-		{ 0x0423, 0x55 }, // У CYRILLIC CAPITAL LETTER U
+		{ QChar(0x0423), 0x55 }, // У CYRILLIC CAPITAL LETTER U
-		{ 0x0416, 0x56 }, // Ж CYRILLIC CAPITAL LETTER ZHE
+		{ QChar(0x0416), 0x56 }, // Ж CYRILLIC CAPITAL LETTER ZHE
-		{ 0x0412, 0x57 }, // В CYRILLIC CAPITAL LETTER VE
+		{ QChar(0x0412), 0x57 }, // В CYRILLIC CAPITAL LETTER VE
-		{ 0x042c, 0x58 }, // Ь CYRILLIC CAPITAL LETTER SOFT SIGN
+		{ QChar(0x042c), 0x58 }, // Ь CYRILLIC CAPITAL LETTER SOFT SIGN
-		{ 0x042a, 0x59 }, // Ъ CYRILLIC CAPITAL LETTER HARD SIGN
+		{ QChar(0x042a), 0x59 }, // Ъ CYRILLIC CAPITAL LETTER HARD SIGN
-		{ 0x0417, 0x5a }, // З CYRILLIC CAPITAL LETTER ZE
+		{ QChar(0x0417), 0x5a }, // З CYRILLIC CAPITAL LETTER ZE
-		{ 0x0428, 0x5b }, // Ш CYRILLIC CAPITAL LETTER SHA
+		{ QChar(0x0428), 0x5b }, // Ш CYRILLIC CAPITAL LETTER SHA
-		{ 0x042d, 0x5c }, // Э CYRILLIC CAPITAL LETTER E
+		{ QChar(0x042d), 0x5c }, // Э CYRILLIC CAPITAL LETTER E
-		{ 0x0429, 0x5d }, // Щ CYRILLIC CAPITAL LETTER SHCHA
+		{ QChar(0x0429), 0x5d }, // Щ CYRILLIC CAPITAL LETTER SHCHA
-		{ 0x0427, 0x5e }, // Ч CYRILLIC CAPITAL LETTER CHE
+		{ QChar(0x0427), 0x5e }, // Ч CYRILLIC CAPITAL LETTER CHE
-		{ 0x042b, 0x5f }, // Ы CYRILLIC CAPITAL LETTER YERU
+		{ QChar(0x042b), 0x5f }, // Ы CYRILLIC CAPITAL LETTER YERU
-		{ 0x044e, 0x60 }, // ю CYRILLIC SMALL LETTER YU
+		{ QChar(0x044e), 0x60 }, // ю CYRILLIC SMALL LETTER YU
-		{ 0x0430, 0x61 }, // а CYRILLIC SMALL LETTER A
+		{ QChar(0x0430), 0x61 }, // а CYRILLIC SMALL LETTER A
-		{ 0x0431, 0x62 }, // б CYRILLIC SMALL LETTER BE
+		{ QChar(0x0431), 0x62 }, // б CYRILLIC SMALL LETTER BE
-		{ 0x0446, 0x63 }, // ц CYRILLIC SMALL LETTER TSE
+		{ QChar(0x0446), 0x63 }, // ц CYRILLIC SMALL LETTER TSE
-		{ 0x0434, 0x64 }, // д CYRILLIC SMALL LETTER DE
+		{ QChar(0x0434), 0x64 }, // д CYRILLIC SMALL LETTER DE
-		{ 0x0435, 0x65 }, // е CYRILLIC SMALL LETTER IE
+		{ QChar(0x0435), 0x65 }, // е CYRILLIC SMALL LETTER IE
-		{ 0x0444, 0x66 }, // ф CYRILLIC SMALL LETTER EF
+		{ QChar(0x0444), 0x66 }, // ф CYRILLIC SMALL LETTER EF
-		{ 0x0433, 0x67 }, // г CYRILLIC SMALL LETTER GHE
+		{ QChar(0x0433), 0x67 }, // г CYRILLIC SMALL LETTER GHE
-		{ 0x0445, 0x68 }, // х CYRILLIC SMALL LETTER HA
+		{ QChar(0x0445), 0x68 }, // х CYRILLIC SMALL LETTER HA
-		{ 0x0438, 0x69 }, // и CYRILLIC SMALL LETTER I
+		{ QChar(0x0438), 0x69 }, // и CYRILLIC SMALL LETTER I
-		{ 0x0439, 0x6a }, // й CYRILLIC SMALL LETTER SHORT I
+		{ QChar(0x0439), 0x6a }, // й CYRILLIC SMALL LETTER SHORT I
-		{ 0x043a, 0x6b }, // к CYRILLIC SMALL LETTER KA
+		{ QChar(0x043a), 0x6b }, // к CYRILLIC SMALL LETTER KA
-		{ 0x043b, 0x6c }, // л CYRILLIC SMALL LETTER EL
+		{ QChar(0x043b), 0x6c }, // л CYRILLIC SMALL LETTER EL
-		{ 0x043c, 0x6d }, // м CYRILLIC SMALL LETTER EM
+		{ QChar(0x043c), 0x6d }, // м CYRILLIC SMALL LETTER EM
-		{ 0x043d, 0x6e }, // н CYRILLIC SMALL LETTER EN
+		{ QChar(0x043d), 0x6e }, // н CYRILLIC SMALL LETTER EN
-		{ 0x043e, 0x6f }, // о CYRILLIC SMALL LETTER O
+		{ QChar(0x043e), 0x6f }, // о CYRILLIC SMALL LETTER O
-		{ 0x043f, 0x70 }, // п CYRILLIC SMALL LETTER PE
+		{ QChar(0x043f), 0x70 }, // п CYRILLIC SMALL LETTER PE
-		{ 0x044f, 0x71 }, // я CYRILLIC SMALL LETTER YA
+		{ QChar(0x044f), 0x71 }, // я CYRILLIC SMALL LETTER YA
-		{ 0x0440, 0x72 }, // р CYRILLIC SMALL LETTER ER
+		{ QChar(0x0440), 0x72 }, // р CYRILLIC SMALL LETTER ER
-		{ 0x0441, 0x73 }, // с CYRILLIC SMALL LETTER ES
+		{ QChar(0x0441), 0x73 }, // с CYRILLIC SMALL LETTER ES
-		{ 0x0442, 0x74 }, // т CYRILLIC SMALL LETTER TE
+		{ QChar(0x0442), 0x74 }, // т CYRILLIC SMALL LETTER TE
-		{ 0x0443, 0x75 }, // у CYRILLIC SMALL LETTER U
+		{ QChar(0x0443), 0x75 }, // у CYRILLIC SMALL LETTER U
-		{ 0x0436, 0x76 }, // ж CYRILLIC SMALL LETTER ZHE
+		{ QChar(0x0436), 0x76 }, // ж CYRILLIC SMALL LETTER ZHE
-		{ 0x0432, 0x77 }, // в CYRILLIC SMALL LETTER VE
+		{ QChar(0x0432), 0x77 }, // в CYRILLIC SMALL LETTER VE
-		{ 0x044c, 0x78 }, // ь CYRILLIC SMALL LETTER SOFT SIGN
+		{ QChar(0x044c), 0x78 }, // ь CYRILLIC SMALL LETTER SOFT SIGN
-		{ 0x044a, 0x79 }, // ъ CYRILLIC SMALL LETTER HARD SIGN
+		{ QChar(0x044a), 0x79 }, // ъ CYRILLIC SMALL LETTER HARD SIGN
-		{ 0x0437, 0x7a }, // з CYRILLIC SMALL LETTER ZE
+		{ QChar(0x0437), 0x7a }, // з CYRILLIC SMALL LETTER ZE
-		{ 0x0448, 0x7b }, // ш CYRILLIC SMALL LETTER SHA
+		{ QChar(0x0448), 0x7b }, // ш CYRILLIC SMALL LETTER SHA
-		{ 0x044d, 0x7c }, // э CYRILLIC SMALL LETTER E
+		{ QChar(0x044d), 0x7c }, // э CYRILLIC SMALL LETTER E
-		{ 0x0449, 0x7d }, // щ CYRILLIC SMALL LETTER SHCHA
+		{ QChar(0x0449), 0x7d }, // щ CYRILLIC SMALL LETTER SHCHA
-		{ 0x0447, 0x7e }  // ч CYRILLIC SMALL LETTER CHE
+		{ QChar(0x0447), 0x7e }  // ч CYRILLIC SMALL LETTER CHE
 	},
 
 	{ // 3 Cyrillic G0 3 Ukranian
-		{ 0x0457, 0x26 }, // ї CYRILLIC SMALL LETTER YI
+		{ QChar(0x0457), 0x26 }, // ї CYRILLIC SMALL LETTER YI
-		{ 0x042e, 0x40 }, // Ю CYRILLIC CAPITAL LETTER YU
+		{ QChar(0x042e), 0x40 }, // Ю CYRILLIC CAPITAL LETTER YU
-		{ 0x0410, 0x41 }, // А CYRILLIC CAPITAL LETTER A
+		{ QChar(0x0410), 0x41 }, // А CYRILLIC CAPITAL LETTER A
-		{ 0x0411, 0x42 }, // Б CYRILLIC CAPITAL LETTER BE
+		{ QChar(0x0411), 0x42 }, // Б CYRILLIC CAPITAL LETTER BE
-		{ 0x0426, 0x43 }, // Ц CYRILLIC CAPITAL LETTER TSE
+		{ QChar(0x0426), 0x43 }, // Ц CYRILLIC CAPITAL LETTER TSE
-		{ 0x0414, 0x44 }, // Д CYRILLIC CAPITAL LETTER DE
+		{ QChar(0x0414), 0x44 }, // Д CYRILLIC CAPITAL LETTER DE
-		{ 0x0415, 0x45 }, // Е CYRILLIC CAPITAL LETTER IE
+		{ QChar(0x0415), 0x45 }, // Е CYRILLIC CAPITAL LETTER IE
-		{ 0x0424, 0x46 }, // Ф CYRILLIC CAPITAL LETTER EF
+		{ QChar(0x0424), 0x46 }, // Ф CYRILLIC CAPITAL LETTER EF
-		{ 0x0413, 0x47 }, // Г CYRILLIC CAPITAL LETTER GHE
+		{ QChar(0x0413), 0x47 }, // Г CYRILLIC CAPITAL LETTER GHE
-		{ 0x0425, 0x48 }, // Х CYRILLIC CAPITAL LETTER HA
+		{ QChar(0x0425), 0x48 }, // Х CYRILLIC CAPITAL LETTER HA
-		{ 0x0418, 0x49 }, // И CYRILLIC CAPITAL LETTER I
+		{ QChar(0x0418), 0x49 }, // И CYRILLIC CAPITAL LETTER I
-		{ 0x0419, 0x4a }, // Й CYRILLIC CAPITAL LETTER SHORT I
+		{ QChar(0x0419), 0x4a }, // Й CYRILLIC CAPITAL LETTER SHORT I
-		{ 0x041a, 0x4b }, // К CYRILLIC CAPITAL LETTER KA
+		{ QChar(0x041a), 0x4b }, // К CYRILLIC CAPITAL LETTER KA
-		{ 0x041b, 0x4c }, // Л CYRILLIC CAPITAL LETTER EL
+		{ QChar(0x041b), 0x4c }, // Л CYRILLIC CAPITAL LETTER EL
-		{ 0x041c, 0x4d }, // М CYRILLIC CAPITAL LETTER EM
+		{ QChar(0x041c), 0x4d }, // М CYRILLIC CAPITAL LETTER EM
-		{ 0x041d, 0x4e }, // Н CYRILLIC CAPITAL LETTER EN
+		{ QChar(0x041d), 0x4e }, // Н CYRILLIC CAPITAL LETTER EN
-		{ 0x041e, 0x4f }, // О CYRILLIC CAPITAL LETTER O
+		{ QChar(0x041e), 0x4f }, // О CYRILLIC CAPITAL LETTER O
-		{ 0x041f, 0x50 }, // П CYRILLIC CAPITAL LETTER PE
+		{ QChar(0x041f), 0x50 }, // П CYRILLIC CAPITAL LETTER PE
-		{ 0x042f, 0x51 }, // Я CYRILLIC CAPITAL LETTER YA
+		{ QChar(0x042f), 0x51 }, // Я CYRILLIC CAPITAL LETTER YA
-		{ 0x0420, 0x52 }, // Р CYRILLIC CAPITAL LETTER ER
+		{ QChar(0x0420), 0x52 }, // Р CYRILLIC CAPITAL LETTER ER
-		{ 0x0421, 0x53 }, // С CYRILLIC CAPITAL LETTER ES
+		{ QChar(0x0421), 0x53 }, // С CYRILLIC CAPITAL LETTER ES
-		{ 0x0422, 0x54 }, // Т CYRILLIC CAPITAL LETTER TE
+		{ QChar(0x0422), 0x54 }, // Т CYRILLIC CAPITAL LETTER TE
-		{ 0x0423, 0x55 }, // У CYRILLIC CAPITAL LETTER U
+		{ QChar(0x0423), 0x55 }, // У CYRILLIC CAPITAL LETTER U
-		{ 0x0416, 0x56 }, // Ж CYRILLIC CAPITAL LETTER ZHE
+		{ QChar(0x0416), 0x56 }, // Ж CYRILLIC CAPITAL LETTER ZHE
-		{ 0x0412, 0x57 }, // В CYRILLIC CAPITAL LETTER VE
+		{ QChar(0x0412), 0x57 }, // В CYRILLIC CAPITAL LETTER VE
-		{ 0x042c, 0x58 }, // Ь CYRILLIC CAPITAL LETTER SOFT SIGN
+		{ QChar(0x042c), 0x58 }, // Ь CYRILLIC CAPITAL LETTER SOFT SIGN
-		{ 0x0406, 0x59 }, // І CYRILLIC CAPITAL LETTER BYELORUSSIAN-UKRAINIAN I
+		{ QChar(0x0406), 0x59 }, // І CYRILLIC CAPITAL LETTER BYELORUSSIAN-UKRAINIAN I
-		{ 0x0417, 0x5a }, // З CYRILLIC CAPITAL LETTER ZE
+		{ QChar(0x0417), 0x5a }, // З CYRILLIC CAPITAL LETTER ZE
-		{ 0x0428, 0x5b }, // Ш CYRILLIC CAPITAL LETTER SHA
+		{ QChar(0x0428), 0x5b }, // Ш CYRILLIC CAPITAL LETTER SHA
-		{ 0x0404, 0x5c }, // Є CYRILLIC CAPITAL LETTER UKRAINIAN IE
+		{ QChar(0x0404), 0x5c }, // Є CYRILLIC CAPITAL LETTER UKRAINIAN IE
-		{ 0x0429, 0x5d }, // Щ CYRILLIC CAPITAL LETTER SHCHA
+		{ QChar(0x0429), 0x5d }, // Щ CYRILLIC CAPITAL LETTER SHCHA
-		{ 0x0427, 0x5e }, // Ч CYRILLIC CAPITAL LETTER CHE
+		{ QChar(0x0427), 0x5e }, // Ч CYRILLIC CAPITAL LETTER CHE
-		{ 0x0407, 0x5f }, // Ї CYRILLIC CAPITAL LETTER YI
+		{ QChar(0x0407), 0x5f }, // Ї CYRILLIC CAPITAL LETTER YI
-		{ 0x044e, 0x60 }, // ю CYRILLIC SMALL LETTER YU
+		{ QChar(0x044e), 0x60 }, // ю CYRILLIC SMALL LETTER YU
-		{ 0x0430, 0x61 }, // а CYRILLIC SMALL LETTER A
+		{ QChar(0x0430), 0x61 }, // а CYRILLIC SMALL LETTER A
-		{ 0x0431, 0x62 }, // б CYRILLIC SMALL LETTER BE
+		{ QChar(0x0431), 0x62 }, // б CYRILLIC SMALL LETTER BE
-		{ 0x0446, 0x63 }, // ц CYRILLIC SMALL LETTER TSE
+		{ QChar(0x0446), 0x63 }, // ц CYRILLIC SMALL LETTER TSE
-		{ 0x0434, 0x64 }, // д CYRILLIC SMALL LETTER DE
+		{ QChar(0x0434), 0x64 }, // д CYRILLIC SMALL LETTER DE
-		{ 0x0435, 0x65 }, // е CYRILLIC SMALL LETTER IE
+		{ QChar(0x0435), 0x65 }, // е CYRILLIC SMALL LETTER IE
-		{ 0x0444, 0x66 }, // ф CYRILLIC SMALL LETTER EF
+		{ QChar(0x0444), 0x66 }, // ф CYRILLIC SMALL LETTER EF
-		{ 0x0433, 0x67 }, // г CYRILLIC SMALL LETTER GHE
+		{ QChar(0x0433), 0x67 }, // г CYRILLIC SMALL LETTER GHE
-		{ 0x0445, 0x68 }, // х CYRILLIC SMALL LETTER HA
+		{ QChar(0x0445), 0x68 }, // х CYRILLIC SMALL LETTER HA
-		{ 0x0438, 0x69 }, // и CYRILLIC SMALL LETTER I
+		{ QChar(0x0438), 0x69 }, // и CYRILLIC SMALL LETTER I
-		{ 0x0439, 0x6a }, // й CYRILLIC SMALL LETTER SHORT I
+		{ QChar(0x0439), 0x6a }, // й CYRILLIC SMALL LETTER SHORT I
-		{ 0x043a, 0x6b }, // к CYRILLIC SMALL LETTER KA
+		{ QChar(0x043a), 0x6b }, // к CYRILLIC SMALL LETTER KA
-		{ 0x043b, 0x6c }, // л CYRILLIC SMALL LETTER EL
+		{ QChar(0x043b), 0x6c }, // л CYRILLIC SMALL LETTER EL
-		{ 0x043c, 0x6d }, // м CYRILLIC SMALL LETTER EM
+		{ QChar(0x043c), 0x6d }, // м CYRILLIC SMALL LETTER EM
-		{ 0x043d, 0x6e }, // н CYRILLIC SMALL LETTER EN
+		{ QChar(0x043d), 0x6e }, // н CYRILLIC SMALL LETTER EN
-		{ 0x043e, 0x6f }, // о CYRILLIC SMALL LETTER O
+		{ QChar(0x043e), 0x6f }, // о CYRILLIC SMALL LETTER O
-		{ 0x043f, 0x70 }, // п CYRILLIC SMALL LETTER PE
+		{ QChar(0x043f), 0x70 }, // п CYRILLIC SMALL LETTER PE
-		{ 0x044f, 0x71 }, // я CYRILLIC SMALL LETTER YA
+		{ QChar(0x044f), 0x71 }, // я CYRILLIC SMALL LETTER YA
-		{ 0x0440, 0x72 }, // р CYRILLIC SMALL LETTER ER
+		{ QChar(0x0440), 0x72 }, // р CYRILLIC SMALL LETTER ER
-		{ 0x0441, 0x73 }, // с CYRILLIC SMALL LETTER ES
+		{ QChar(0x0441), 0x73 }, // с CYRILLIC SMALL LETTER ES
-		{ 0x0442, 0x74 }, // т CYRILLIC SMALL LETTER TE
+		{ QChar(0x0442), 0x74 }, // т CYRILLIC SMALL LETTER TE
-		{ 0x0443, 0x75 }, // у CYRILLIC SMALL LETTER U
+		{ QChar(0x0443), 0x75 }, // у CYRILLIC SMALL LETTER U
-		{ 0x0436, 0x76 }, // ж CYRILLIC SMALL LETTER ZHE
+		{ QChar(0x0436), 0x76 }, // ж CYRILLIC SMALL LETTER ZHE
-		{ 0x0432, 0x77 }, // в CYRILLIC SMALL LETTER VE
+		{ QChar(0x0432), 0x77 }, // в CYRILLIC SMALL LETTER VE
-		{ 0x044c, 0x78 }, // ь CYRILLIC SMALL LETTER SOFT SIGN
+		{ QChar(0x044c), 0x78 }, // ь CYRILLIC SMALL LETTER SOFT SIGN
-		{ 0x0456, 0x79 }, // і CYRILLIC SMALL LETTER BYELORUSSIAN-UKRAINIAN I
+		{ QChar(0x0456), 0x79 }, // і CYRILLIC SMALL LETTER BYELORUSSIAN-UKRAINIAN I
-		{ 0x0437, 0x7a }, // з CYRILLIC SMALL LETTER ZE
+		{ QChar(0x0437), 0x7a }, // з CYRILLIC SMALL LETTER ZE
-		{ 0x0448, 0x7b }, // ш CYRILLIC SMALL LETTER SHA
+		{ QChar(0x0448), 0x7b }, // ш CYRILLIC SMALL LETTER SHA
-		{ 0x0454, 0x7c }, // є CYRILLIC SMALL LETTER UKRAINIAN IE
+		{ QChar(0x0454), 0x7c }, // є CYRILLIC SMALL LETTER UKRAINIAN IE
-		{ 0x0449, 0x7d }, // щ CYRILLIC SMALL LETTER SHCHA
+		{ QChar(0x0449), 0x7d }, // щ CYRILLIC SMALL LETTER SHCHA
-		{ 0x0447, 0x7e }  // ч CYRILLIC SMALL LETTER CHE
+		{ QChar(0x0447), 0x7e }  // ч CYRILLIC SMALL LETTER CHE
 	},
 
 	{ // 4 Greek
-		{ 0x0390, 0x40 }, // ΐ GREEK SMALL LETTER IOTA WITH DIALYTIKA AND TONOS
+		{ QChar(0x0390), 0x40 }, // ΐ GREEK SMALL LETTER IOTA WITH DIALYTIKA AND TONOS
-		{ 0x0391, 0x41 }, // Α GREEK CAPITAL LETTER ALPHA
+		{ QChar(0x0391), 0x41 }, // Α GREEK CAPITAL LETTER ALPHA
-		{ 0x0392, 0x42 }, // Β GREEK CAPITAL LETTER BETA
+		{ QChar(0x0392), 0x42 }, // Β GREEK CAPITAL LETTER BETA
-		{ 0x0393, 0x43 }, // Γ GREEK CAPITAL LETTER GAMMA
+		{ QChar(0x0393), 0x43 }, // Γ GREEK CAPITAL LETTER GAMMA
-		{ 0x0394, 0x44 }, // Δ GREEK CAPITAL LETTER DELTA
+		{ QChar(0x0394), 0x44 }, // Δ GREEK CAPITAL LETTER DELTA
-		{ 0x0395, 0x45 }, // Ε GREEK CAPITAL LETTER EPSILON
+		{ QChar(0x0395), 0x45 }, // Ε GREEK CAPITAL LETTER EPSILON
-		{ 0x0396, 0x46 }, // Ζ GREEK CAPITAL LETTER ZETA
+		{ QChar(0x0396), 0x46 }, // Ζ GREEK CAPITAL LETTER ZETA
-		{ 0x0397, 0x47 }, // Η GREEK CAPITAL LETTER ETA
+		{ QChar(0x0397), 0x47 }, // Η GREEK CAPITAL LETTER ETA
-		{ 0x0398, 0x48 }, // Θ GREEK CAPITAL LETTER THETA
+		{ QChar(0x0398), 0x48 }, // Θ GREEK CAPITAL LETTER THETA
-		{ 0x0399, 0x49 }, // Ι GREEK CAPITAL LETTER IOTA
+		{ QChar(0x0399), 0x49 }, // Ι GREEK CAPITAL LETTER IOTA
-		{ 0x039a, 0x4a }, // Κ GREEK CAPITAL LETTER KAPPA
+		{ QChar(0x039a), 0x4a }, // Κ GREEK CAPITAL LETTER KAPPA
-		{ 0x039b, 0x4b }, // Λ GREEK CAPITAL LETTER LAMBDA
+		{ QChar(0x039b), 0x4b }, // Λ GREEK CAPITAL LETTER LAMBDA
-		{ 0x039c, 0x4c }, // Μ GREEK CAPITAL LETTER MU
+		{ QChar(0x039c), 0x4c }, // Μ GREEK CAPITAL LETTER MU
-		{ 0x039d, 0x4d }, // Ν GREEK CAPITAL LETTER NU
+		{ QChar(0x039d), 0x4d }, // Ν GREEK CAPITAL LETTER NU
-		{ 0x039e, 0x4e }, // Ξ GREEK CAPITAL LETTER XI
+		{ QChar(0x039e), 0x4e }, // Ξ GREEK CAPITAL LETTER XI
-		{ 0x039f, 0x4f }, // Ο GREEK CAPITAL LETTER OMICRON
+		{ QChar(0x039f), 0x4f }, // Ο GREEK CAPITAL LETTER OMICRON
-		{ 0x03a0, 0x50 }, // Π GREEK CAPITAL LETTER PI
+		{ QChar(0x03a0), 0x50 }, // Π GREEK CAPITAL LETTER PI
-		{ 0x03a1, 0x51 }, // Ρ GREEK CAPITAL LETTER RHO
+		{ QChar(0x03a1), 0x51 }, // Ρ GREEK CAPITAL LETTER RHO
-		{ 0x03a3, 0x53 }, // Σ GREEK CAPITAL LETTER SIGMA
+		{ QChar(0x03a3), 0x53 }, // Σ GREEK CAPITAL LETTER SIGMA
-		{ 0x03a4, 0x54 }, // Τ GREEK CAPITAL LETTER TAU
+		{ QChar(0x03a4), 0x54 }, // Τ GREEK CAPITAL LETTER TAU
-		{ 0x03a5, 0x55 }, // Υ GREEK CAPITAL LETTER UPSILON
+		{ QChar(0x03a5), 0x55 }, // Υ GREEK CAPITAL LETTER UPSILON
-		{ 0x03a6, 0x56 }, // Φ GREEK CAPITAL LETTER PHI
+		{ QChar(0x03a6), 0x56 }, // Φ GREEK CAPITAL LETTER PHI
-		{ 0x03a7, 0x57 }, // Χ GREEK CAPITAL LETTER CHI
+		{ QChar(0x03a7), 0x57 }, // Χ GREEK CAPITAL LETTER CHI
-		{ 0x03a8, 0x58 }, // Ψ GREEK CAPITAL LETTER PSI
+		{ QChar(0x03a8), 0x58 }, // Ψ GREEK CAPITAL LETTER PSI
-		{ 0x03a9, 0x59 }, // Ω GREEK CAPITAL LETTER OMEGA
+		{ QChar(0x03a9), 0x59 }, // Ω GREEK CAPITAL LETTER OMEGA
-		{ 0x03aa, 0x5a }, // Ϊ GREEK CAPITAL LETTER IOTA WITH DIALYTIKA
+		{ QChar(0x03aa), 0x5a }, // Ϊ GREEK CAPITAL LETTER IOTA WITH DIALYTIKA
-		{ 0x03ab, 0x5b }, // Ϋ GREEK CAPITAL LETTER UPSILON WITH DIALYTIKA
+		{ QChar(0x03ab), 0x5b }, // Ϋ GREEK CAPITAL LETTER UPSILON WITH DIALYTIKA
-		{ 0x03ac, 0x5c }, // ά GREEK SMALL LETTER ALPHA WITH TONOS
+		{ QChar(0x03ac), 0x5c }, // ά GREEK SMALL LETTER ALPHA WITH TONOS
-		{ 0x03ad, 0x5d }, // έ GREEK SMALL LETTER EPSILON WITH TONOS
+		{ QChar(0x03ad), 0x5d }, // έ GREEK SMALL LETTER EPSILON WITH TONOS
-		{ 0x03ae, 0x5e }, // ή GREEK SMALL LETTER ETA WITH TONOS
+		{ QChar(0x03ae), 0x5e }, // ή GREEK SMALL LETTER ETA WITH TONOS
-		{ 0x03af, 0x5f }, // ί GREEK SMALL LETTER IOTO WITH TONOS
+		{ QChar(0x03af), 0x5f }, // ί GREEK SMALL LETTER IOTO WITH TONOS
-		{ 0x03b0, 0x60 }, // ΰ GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND TONOS
+		{ QChar(0x03b0), 0x60 }, // ΰ GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND TONOS
-		{ 0x03b1, 0x61 }, // α GREEK SMALL LETTER ALPHA
+		{ QChar(0x03b1), 0x61 }, // α GREEK SMALL LETTER ALPHA
-		{ 0x03b2, 0x62 }, // β GREEK SMALL LETTER BETA
+		{ QChar(0x03b2), 0x62 }, // β GREEK SMALL LETTER BETA
-		{ 0x03b3, 0x63 }, // γ GREEK SMALL LETTER GAMMA
+		{ QChar(0x03b3), 0x63 }, // γ GREEK SMALL LETTER GAMMA
-		{ 0x03b4, 0x64 }, // δ GREEK SMALL LETTER DELTA
+		{ QChar(0x03b4), 0x64 }, // δ GREEK SMALL LETTER DELTA
-		{ 0x03b5, 0x65 }, // ε GREEK SMALL LETTER EPSILON
+		{ QChar(0x03b5), 0x65 }, // ε GREEK SMALL LETTER EPSILON
-		{ 0x03b6, 0x66 }, // ζ GREEK SMALL LETTER ZETA
+		{ QChar(0x03b6), 0x66 }, // ζ GREEK SMALL LETTER ZETA
-		{ 0x03b7, 0x67 }, // η GREEK SMALL LETTER ETA
+		{ QChar(0x03b7), 0x67 }, // η GREEK SMALL LETTER ETA
-		{ 0x03b8, 0x68 }, // θ GREEK SMALL LETTER THETA
+		{ QChar(0x03b8), 0x68 }, // θ GREEK SMALL LETTER THETA
-		{ 0x03b9, 0x69 }, // ι GREEK SMALL LETTER IOTA
+		{ QChar(0x03b9), 0x69 }, // ι GREEK SMALL LETTER IOTA
-		{ 0x03ba, 0x6a }, // κ GREEK SMALL LETTER KAPPA
+		{ QChar(0x03ba), 0x6a }, // κ GREEK SMALL LETTER KAPPA
-		{ 0x03bb, 0x6b }, // λ GREEK SMALL LETTER LAMBDA
+		{ QChar(0x03bb), 0x6b }, // λ GREEK SMALL LETTER LAMBDA
-		{ 0x03bc, 0x6c }, // μ GREEK SMALL LETTER MU
+		{ QChar(0x03bc), 0x6c }, // μ GREEK SMALL LETTER MU
-		{ 0x03bd, 0x6d }, // ν GREEK SMALL LETTER NU
+		{ QChar(0x03bd), 0x6d }, // ν GREEK SMALL LETTER NU
-		{ 0x03be, 0x6e }, // ξ GREEK SMALL LETTER XI
+		{ QChar(0x03be), 0x6e }, // ξ GREEK SMALL LETTER XI
-		{ 0x03bf, 0x6f }, // ο GREEK SMALL LETTER OMICRON
+		{ QChar(0x03bf), 0x6f }, // ο GREEK SMALL LETTER OMICRON
-		{ 0x03c0, 0x70 }, // π GREEK SMALL LETTER PI
+		{ QChar(0x03c0), 0x70 }, // π GREEK SMALL LETTER PI
-		{ 0x03c1, 0x71 }, // ρ GREEK SMALL LETTER RHO
+		{ QChar(0x03c1), 0x71 }, // ρ GREEK SMALL LETTER RHO
-		{ 0x03c2, 0x72 }, // ς GREEK SMALL LETTER FINAL SIGMA
+		{ QChar(0x03c2), 0x72 }, // ς GREEK SMALL LETTER FINAL SIGMA
-		{ 0x03c3, 0x73 }, // σ GREEK SMALL LETTER SIGMA
+		{ QChar(0x03c3), 0x73 }, // σ GREEK SMALL LETTER SIGMA
-		{ 0x03c4, 0x74 }, // τ GREEK SMALL LETTER TAU
+		{ QChar(0x03c4), 0x74 }, // τ GREEK SMALL LETTER TAU
-		{ 0x03c5, 0x75 }, // υ GREEK SMALL LETTER UPSILON
+		{ QChar(0x03c5), 0x75 }, // υ GREEK SMALL LETTER UPSILON
-		{ 0x03c6, 0x76 }, // φ GREEK SMALL LETTER PHI
+		{ QChar(0x03c6), 0x76 }, // φ GREEK SMALL LETTER PHI
-		{ 0x03c7, 0x77 }, // χ GREEK SMALL LETTER CHI
+		{ QChar(0x03c7), 0x77 }, // χ GREEK SMALL LETTER CHI
-		{ 0x03c8, 0x78 }, // ψ GREEK SMALL LETTER PSI
+		{ QChar(0x03c8), 0x78 }, // ψ GREEK SMALL LETTER PSI
-		{ 0x03c9, 0x79 }, // ω GREEK SMALL LETTER OMEGA
+		{ QChar(0x03c9), 0x79 }, // ω GREEK SMALL LETTER OMEGA
-		{ 0x03ca, 0x7a }, // ϊ GREEK SMALL LETTER IOTA WITH DIALYTIKA
+		{ QChar(0x03ca), 0x7a }, // ϊ GREEK SMALL LETTER IOTA WITH DIALYTIKA
-		{ 0x03cb, 0x7b }, // ϋ GREEK SMALL LETTER UPSILON WITH DIALYTIKA
+		{ QChar(0x03cb), 0x7b }, // ϋ GREEK SMALL LETTER UPSILON WITH DIALYTIKA
-		{ 0x03cc, 0x7c }, // ό GREEK SMALL LETTER OMICRON WITH TONOS
+		{ QChar(0x03cc), 0x7c }, // ό GREEK SMALL LETTER OMICRON WITH TONOS
-		{ 0x03cd, 0x7d }, // ύ GREEK SMALL LETTER UPSILON WITH TONOS
+		{ QChar(0x03cd), 0x7d }, // ύ GREEK SMALL LETTER UPSILON WITH TONOS
-		{ 0x03ce, 0x7e }  // ώ GREEK SMALL LETTER OMEGA WITH TONOS
+		{ QChar(0x03ce), 0x7e }  // ώ GREEK SMALL LETTER OMEGA WITH TONOS
 	},
 
 	{ // TODO 5 Arabic G0
 	},
 
 	{ // 6 Hebrew G0
-		{ 0x05d0, 0x60 }, // א HEBREW LETTER ALEF
+		{ QChar(0x05d0), 0x60 }, // א HEBREW LETTER ALEF
-		{ 0x05d1, 0x61 }, // ב HEBREW LETTER BET
+		{ QChar(0x05d1), 0x61 }, // ב HEBREW LETTER BET
-		{ 0x05d2, 0x62 }, // ג HEBREW LETTER GIMEL
+		{ QChar(0x05d2), 0x62 }, // ג HEBREW LETTER GIMEL
-		{ 0x05d3, 0x63 }, // ד HEBREW LETTER DALET
+		{ QChar(0x05d3), 0x63 }, // ד HEBREW LETTER DALET
-		{ 0x05d4, 0x64 }, // ה HEBREW LETTER HE
+		{ QChar(0x05d4), 0x64 }, // ה HEBREW LETTER HE
-		{ 0x05d5, 0x65 }, // ו HEBREW LETTER VAV
+		{ QChar(0x05d5), 0x65 }, // ו HEBREW LETTER VAV
-		{ 0x05d6, 0x66 }, // ז HEBREW LETTER ZAYIN
+		{ QChar(0x05d6), 0x66 }, // ז HEBREW LETTER ZAYIN
-		{ 0x05d7, 0x67 }, // ח HEBREW LETTER HET
+		{ QChar(0x05d7), 0x67 }, // ח HEBREW LETTER HET
-		{ 0x05d8, 0x68 }, // ט HEBREW LETTER TET
+		{ QChar(0x05d8), 0x68 }, // ט HEBREW LETTER TET
-		{ 0x05d9, 0x69 }, // י HEBREW LETTER YOD
+		{ QChar(0x05d9), 0x69 }, // י HEBREW LETTER YOD
-		{ 0x05da, 0x6a }, // ך HEBREW LETTER FINAL KAF
+		{ QChar(0x05da), 0x6a }, // ך HEBREW LETTER FINAL KAF
-		{ 0x05db, 0x6b }, // כ HEBREW LETTER KAF
+		{ QChar(0x05db), 0x6b }, // כ HEBREW LETTER KAF
-		{ 0x05dc, 0x6c }, // ל HEBREW LETTER LAMED
+		{ QChar(0x05dc), 0x6c }, // ל HEBREW LETTER LAMED
-		{ 0x05dd, 0x6d }, // ם HEBREW LETTER FINAL MEM
+		{ QChar(0x05dd), 0x6d }, // ם HEBREW LETTER FINAL MEM
-		{ 0x05de, 0x6e }, // מ HEBREW LETTER MEM
+		{ QChar(0x05de), 0x6e }, // מ HEBREW LETTER MEM
-		{ 0x05df, 0x6f }, // ן HEBREW LETTER FINAL NUN
+		{ QChar(0x05df), 0x6f }, // ן HEBREW LETTER FINAL NUN
-		{ 0x05e0, 0x70 }, // נ HEBREW LETTER NUN
+		{ QChar(0x05e0), 0x70 }, // נ HEBREW LETTER NUN
-		{ 0x05e1, 0x71 }, // ס HEBREW LETTER SAMEKH
+		{ QChar(0x05e1), 0x71 }, // ס HEBREW LETTER SAMEKH
-		{ 0x05e2, 0x72 }, // ע HEBREW LETTER AYIN
+		{ QChar(0x05e2), 0x72 }, // ע HEBREW LETTER AYIN
-		{ 0x05e3, 0x73 }, // ף HEBREW LETTER FINAL PE
+		{ QChar(0x05e3), 0x73 }, // ף HEBREW LETTER FINAL PE
-		{ 0x05e4, 0x74 }, // פ HEBREW LETTER PE
+		{ QChar(0x05e4), 0x74 }, // פ HEBREW LETTER PE
-		{ 0x05e5, 0x75 }, // ץ HEBREW LETTER FINAL TSADI
+		{ QChar(0x05e5), 0x75 }, // ץ HEBREW LETTER FINAL TSADI
-		{ 0x05e6, 0x76 }, // צ HEBREW LETTER TSADI
+		{ QChar(0x05e6), 0x76 }, // צ HEBREW LETTER TSADI
-		{ 0x05e7, 0x77 }, // ק HEBREW LETTER QOF
+		{ QChar(0x05e7), 0x77 }, // ק HEBREW LETTER QOF
-		{ 0x05e8, 0x78 }, // ר HEBREW LETTER RESH
+		{ QChar(0x05e8), 0x78 }, // ר HEBREW LETTER RESH
-		{ 0x05e9, 0x79 }, // ש HEBREW LETTER SHIN
+		{ QChar(0x05e9), 0x79 }, // ש HEBREW LETTER SHIN
-		{ 0x05ea, 0x7a }, // ת HEBREW LETTER TAV
+		{ QChar(0x05ea), 0x7a }, // ת HEBREW LETTER TAV
-		{ 0x20aa, 0x7b }, // ₪ NEW SHEQEL SIGN
+		{ QChar(0x20aa), 0x7b }, // ₪ NEW SHEQEL SIGN
-		{ 0x00be, 0x7d }, // ½ VULGAR FRACTION THREE QUARTERS
+		{ QChar(0x00be), 0x7d }, // ½ VULGAR FRACTION THREE QUARTERS
-		{ 0x00f7, 0x7e }  // ÷ DIVISION SIGN
+		{ QChar(0x00f7), 0x7e }  // ÷ DIVISION SIGN
 	},
 
 	// Only used by X/26 enhancements, not directly by keyboard
@@ -339,189 +339,189 @@ static const QMap<QChar, char> keymapping[24] = {
 	},
 
 	{ // 11 Czech/Slovak
-		{ 0x016f, 0x24 }, // ů LATIN SMALL LETTER U WITH RING ABOVE
+		{ QChar(0x016f), 0x24 }, // ů LATIN SMALL LETTER U WITH RING ABOVE
-		{ 0x010d, 0x40 }, // č LATIN SMALL LETTER C WITH CARON
+		{ QChar(0x010d), 0x40 }, // č LATIN SMALL LETTER C WITH CARON
-		{ 0x0165, 0x5b }, // ť LATIN SMALL LETTER T WITH CARON
+		{ QChar(0x0165), 0x5b }, // ť LATIN SMALL LETTER T WITH CARON
-		{ 0x017e, 0x5c }, // ž LATIN SMALL LETTER Z WITH CARON
+		{ QChar(0x017e), 0x5c }, // ž LATIN SMALL LETTER Z WITH CARON
-		{ 0x00fd, 0x5d }, // ý LATIN SMALL LETTER Y WITH ACUTE
+		{ QChar(0x00fd), 0x5d }, // ý LATIN SMALL LETTER Y WITH ACUTE
-		{ 0x00ed, 0x5e }, // í LATIN SMALL LETTER I WITH ACUTE
+		{ QChar(0x00ed), 0x5e }, // í LATIN SMALL LETTER I WITH ACUTE
-		{ 0x0159, 0x5f }, // ř LATIN SMALL LETTER R WITH CARON
+		{ QChar(0x0159), 0x5f }, // ř LATIN SMALL LETTER R WITH CARON
-		{ 0x00e9, 0x60 }, // é LATIN SMALL LETTER E WITH ACUTE
+		{ QChar(0x00e9), 0x60 }, // é LATIN SMALL LETTER E WITH ACUTE
-		{ 0x00e1, 0x7b }, // á LATIN SMALL LETTER A WITH ACUTE
+		{ QChar(0x00e1), 0x7b }, // á LATIN SMALL LETTER A WITH ACUTE
-		{ 0x011b, 0x7c }, // ě LATIN SMALL LETTER E WITH CARON
+		{ QChar(0x011b), 0x7c }, // ě LATIN SMALL LETTER E WITH CARON
-		{ 0x00fa, 0x7d }, // ú LATIN SMALL LETTER U WITH ACUTE
+		{ QChar(0x00fa), 0x7d }, // ú LATIN SMALL LETTER U WITH ACUTE
-		{ 0x0161, 0x7e }  // š LATIN SMALL LETTER S WITH CARON
+		{ QChar(0x0161), 0x7e }  // š LATIN SMALL LETTER S WITH CARON
 	},
 
 	{ // 12 English
-		{ 0x00a3, 0x23 }, // £ POUND SIGN
+		{ QChar(0x00a3), 0x23 }, // £ POUND SIGN
-		{ 0x0023, 0x5f }, // # NUMBER SIGN
+		{ QChar(0x0023), 0x5f }, // # NUMBER SIGN
-		{ 0x005f, 0x60 }, // ─ LOW LINE - rendered as U+2500 BOX DRAWINGS LIGHT HORIZONTAL
+		{ QChar(0x005f), 0x60 }, // ─ LOW LINE - rendered as U+2500 BOX DRAWINGS LIGHT HORIZONTAL
 
-		{ 0x00bc, 0x7b }, // ¼ VULGAR FRACTION ONE QUARTER
+		{ QChar(0x00bc), 0x7b }, // ¼ VULGAR FRACTION ONE QUARTER
-		{ 0x00bd, 0x5c }, // ½ VULGAR FRACTION ONE HALF
+		{ QChar(0x00bd), 0x5c }, // ½ VULGAR FRACTION ONE HALF
-		{ 0x00be, 0x7b }, // ¾ VULGAR FRACTION THREE QUARTERS
+		{ QChar(0x00be), 0x7b }, // ¾ VULGAR FRACTION THREE QUARTERS
-		{ 0x00f7, 0x7e }  // ÷ DIVISION SIGN
+		{ QChar(0x00f7), 0x7e }  // ÷ DIVISION SIGN
 	},
 
 	{ // 13 Estonian
-		{ 0x00f5, 0x24 }, // õ LATIN SMALL LETTER O WITH TILDE
+		{ QChar(0x00f5), 0x24 }, // õ LATIN SMALL LETTER O WITH TILDE
-		{ 0x0160, 0x40 }, // Š LATIN CAPITAL LETTER S WITH CARON
+		{ QChar(0x0160), 0x40 }, // Š LATIN CAPITAL LETTER S WITH CARON
-		{ 0x00c4, 0x5b }, // Ä LATIN CAPITAL LETTER A WITH DIAERESIS
+		{ QChar(0x00c4), 0x5b }, // Ä LATIN CAPITAL LETTER A WITH DIAERESIS
-		{ 0x00d6, 0x5c }, // Ö LATIN CAPITAL LETTER O WITH DIAERESIS
+		{ QChar(0x00d6), 0x5c }, // Ö LATIN CAPITAL LETTER O WITH DIAERESIS
-		{ 0x017d, 0x5d }, // Ž LATIN CAPITAL LETTER Z WITH CARON
+		{ QChar(0x017d), 0x5d }, // Ž LATIN CAPITAL LETTER Z WITH CARON
-		{ 0x00dc, 0x5e }, // Ü LATIN CAPITAL LETTER U WITH DIAERESIS
+		{ QChar(0x00dc), 0x5e }, // Ü LATIN CAPITAL LETTER U WITH DIAERESIS
-		{ 0x00d5, 0x5f }, // Õ LATIN CAPITAL LETTER O WITH TILDE
+		{ QChar(0x00d5), 0x5f }, // Õ LATIN CAPITAL LETTER O WITH TILDE
-		{ 0x0161, 0x60 }, // š LATIN SMALL LETTER S WITH CARON
+		{ QChar(0x0161), 0x60 }, // š LATIN SMALL LETTER S WITH CARON
-		{ 0x00e4, 0x7b }, // ä LATIN SMALL LETTER A WITH DIAERESIS
+		{ QChar(0x00e4), 0x7b }, // ä LATIN SMALL LETTER A WITH DIAERESIS
-		{ 0x00f6, 0x7c }, // ö LATIN SMALL LETTER O WITH DIAERESIS
+		{ QChar(0x00f6), 0x7c }, // ö LATIN SMALL LETTER O WITH DIAERESIS
-		{ 0x017e, 0x7d }, // ž LATIN SMALL LETTER Z WITH CARON
+		{ QChar(0x017e), 0x7d }, // ž LATIN SMALL LETTER Z WITH CARON
-		{ 0x00fc, 0x7e }  // ü LATIN SMALL LETTER U WITH DIAERESIS
+		{ QChar(0x00fc), 0x7e }  // ü LATIN SMALL LETTER U WITH DIAERESIS
 	},
 
 	{ // 14 French - aze qsd wxc
-		{ 0x00e9, 0x23 }, // é LATIN SMALL LETTER E WITH ACUTE
+		{ QChar(0x00e9), 0x23 }, // é LATIN SMALL LETTER E WITH ACUTE
-		{ 0x00ef, 0x24 }, // ï LATIN SMALL LETTER I WITH DIAERESIS
+		{ QChar(0x00ef), 0x24 }, // ï LATIN SMALL LETTER I WITH DIAERESIS
-		{ 0x00e0, 0x40 }, // à LATIN SMALL LETTER A WITH GRAVE
+		{ QChar(0x00e0), 0x40 }, // à LATIN SMALL LETTER A WITH GRAVE
-		{ 0x00eb, 0x5b }, // ë LATIN SMALL LETTER E WITH DIAERESIS
+		{ QChar(0x00eb), 0x5b }, // ë LATIN SMALL LETTER E WITH DIAERESIS
-		{ 0x00ea, 0x5c }, // ê LATIN SMALL LETTER E WITH CIRCUMFLEX
+		{ QChar(0x00ea), 0x5c }, // ê LATIN SMALL LETTER E WITH CIRCUMFLEX
-		{ 0x00f9, 0x5d }, // ù LATIN SMALL LETTER U WITH GRAVE
+		{ QChar(0x00f9), 0x5d }, // ù LATIN SMALL LETTER U WITH GRAVE
-		{ 0x00ee, 0x5e }, // î LATIN SMALL LETTER I WITH CIRCUMFLEX
+		{ QChar(0x00ee), 0x5e }, // î LATIN SMALL LETTER I WITH CIRCUMFLEX
-		{ 0x0023, 0x5f }, // # NUMBER SIGN
+		{ QChar(0x0023), 0x5f }, // # NUMBER SIGN
-		{ 0x00e8, 0x60 }, // è LATIN SMALL LETTER E WITH GRAVE
+		{ QChar(0x00e8), 0x60 }, // è LATIN SMALL LETTER E WITH GRAVE
-		{ 0x00e2, 0x7b }, // â LATIN SMALL LETTER A WITH CIRCUMFLEX
+		{ QChar(0x00e2), 0x7b }, // â LATIN SMALL LETTER A WITH CIRCUMFLEX
-		{ 0x00f4, 0x7c }, // ô LATIN SMALL LETTER O WITH CIRCUMFLEX
+		{ QChar(0x00f4), 0x7c }, // ô LATIN SMALL LETTER O WITH CIRCUMFLEX
-		{ 0x00fb, 0x7d }, // û LATIN SMALL LETTER U WITH CIRCUMFLEX
+		{ QChar(0x00fb), 0x7d }, // û LATIN SMALL LETTER U WITH CIRCUMFLEX
-		{ 0x00e7, 0x7e }  // ç LATIN SMALL LETTER C WITH CEDILLA
+		{ QChar(0x00e7), 0x7e }  // ç LATIN SMALL LETTER C WITH CEDILLA
 	},
 
 	{ // 15 German
-		{ 0x00a7, 0x40 }, // § SECTION SIGN
+		{ QChar(0x00a7), 0x40 }, // § SECTION SIGN
-		{ 0x00c4, 0x5b }, // Ä LATIN CAPITAL LETTER A WITH DIAERESIS
+		{ QChar(0x00c4), 0x5b }, // Ä LATIN CAPITAL LETTER A WITH DIAERESIS
-		{ 0x00d6, 0x5c }, // Ö LATIN CAPITAL LETTER O WITH DIAERESIS
+		{ QChar(0x00d6), 0x5c }, // Ö LATIN CAPITAL LETTER O WITH DIAERESIS
-		{ 0x00dc, 0x5d }, // Ü LATIN CAPITAL LETTER U WITH DIAERESIS
+		{ QChar(0x00dc), 0x5d }, // Ü LATIN CAPITAL LETTER U WITH DIAERESIS
-		{ 0x00b0, 0x60 }, // ° DEGREE SIGN
+		{ QChar(0x00b0), 0x60 }, // ° DEGREE SIGN
-		{ 0x00e4, 0x7b }, // ä LATIN SMALL LETTER A WITH DIAERESIS
+		{ QChar(0x00e4), 0x7b }, // ä LATIN SMALL LETTER A WITH DIAERESIS
-		{ 0x00f6, 0x7c }, // ö LATIN SMALL LETTER O WITH DIAERESIS
+		{ QChar(0x00f6), 0x7c }, // ö LATIN SMALL LETTER O WITH DIAERESIS
-		{ 0x00fc, 0x7d }, // ü LATIN SMALL LETTER U WITH DIAERESIS
+		{ QChar(0x00fc), 0x7d }, // ü LATIN SMALL LETTER U WITH DIAERESIS
-		{ 0x00df, 0x7e }  // ß LATIN SMALL LETTER SHARP S
+		{ QChar(0x00df), 0x7e }  // ß LATIN SMALL LETTER SHARP S
 	},
 
 	{ // 16 Italian
-		{ 0x00a3, 0x23 }, // £ POUND SIGN
+		{ QChar(0x00a3), 0x23 }, // £ POUND SIGN
-		{ 0x00e9, 0x40 }, // é LATIN SMALL LETTER E WITH ACUTE
+		{ QChar(0x00e9), 0x40 }, // é LATIN SMALL LETTER E WITH ACUTE
-		{ 0x00b0, 0x5b }, // ° DEGREE SIGN
+		{ QChar(0x00b0), 0x5b }, // ° DEGREE SIGN
-		{ 0x00e7, 0x5c }, // ç LATIN SMALL LETTER C WITH CEDILLA
+		{ QChar(0x00e7), 0x5c }, // ç LATIN SMALL LETTER C WITH CEDILLA
-		{ 0x0023, 0x5f }, // # NUMBER SIGN
+		{ QChar(0x0023), 0x5f }, // # NUMBER SIGN
-		{ 0x00f9, 0x60 }, // ù LATIN SMALL LETTER U WITH GRAVE
+		{ QChar(0x00f9), 0x60 }, // ù LATIN SMALL LETTER U WITH GRAVE
-		{ 0x00e0, 0x7b }, // à LATIN SMALL LETTER A WITH GRAVE
+		{ QChar(0x00e0), 0x7b }, // à LATIN SMALL LETTER A WITH GRAVE
-		{ 0x00f2, 0x7c }, // ò LATIN SMALL LETTER O WITH GRAVE
+		{ QChar(0x00f2), 0x7c }, // ò LATIN SMALL LETTER O WITH GRAVE
-		{ 0x00e8, 0x7d }, // è LATIN SMALL LETTER E WITH GRAVE
+		{ QChar(0x00e8), 0x7d }, // è LATIN SMALL LETTER E WITH GRAVE
-		{ 0x00ec, 0x7e }  // ì LATIN SMALL LETTER I WITH GRAVE
+		{ QChar(0x00ec), 0x7e }  // ì LATIN SMALL LETTER I WITH GRAVE
 	},
 
 	{ // 17 Lettish/Lithuanian
-		{ 0x0160, 0x40 }, // Š LATIN CAPITAL LETTER S WITH CARON
+		{ QChar(0x0160), 0x40 }, // Š LATIN CAPITAL LETTER S WITH CARON
-		{ 0x0117, 0x5b }, // ė LATIN SMALL LETTER E WITH DOT ABOVE
+		{ QChar(0x0117), 0x5b }, // ė LATIN SMALL LETTER E WITH DOT ABOVE
-		{ 0x0119, 0x5c }, // ę LATIN SMALL LETTER E WITH OGONEK
+		{ QChar(0x0119), 0x5c }, // ę LATIN SMALL LETTER E WITH OGONEK
-		{ 0x017d, 0x5d }, // Ž LATIN CAPITAL LETTER Z WITH CARON
+		{ QChar(0x017d), 0x5d }, // Ž LATIN CAPITAL LETTER Z WITH CARON
-		{ 0x010d, 0x5e }, // č LATIN SMALL LETTER C WITH CARON
+		{ QChar(0x010d), 0x5e }, // č LATIN SMALL LETTER C WITH CARON
-		{ 0x016b, 0x5f }, // ū LATIN SMALL LETTER U WITH MACRON
+		{ QChar(0x016b), 0x5f }, // ū LATIN SMALL LETTER U WITH MACRON
-		{ 0x0161, 0x60 }, // š LATIN SMALL LETTER S WITH CARON
+		{ QChar(0x0161), 0x60 }, // š LATIN SMALL LETTER S WITH CARON
-		{ 0x0105, 0x7b }, // ą LATIN SMALL LETTER A WITH OGONEK
+		{ QChar(0x0105), 0x7b }, // ą LATIN SMALL LETTER A WITH OGONEK
-		{ 0x0173, 0x7c }, // ų LATIN SMALL LETTER U WITH OGONEK
+		{ QChar(0x0173), 0x7c }, // ų LATIN SMALL LETTER U WITH OGONEK
-		{ 0x017e, 0x7d }, // ž LATIN SMALL LETTER Z WITH CARON
+		{ QChar(0x017e), 0x7d }, // ž LATIN SMALL LETTER Z WITH CARON
-		{ 0x012f, 0x7e }  // į LATIN SMALL LETTER I WITH OGONEK
+		{ QChar(0x012f), 0x7e }  // į LATIN SMALL LETTER I WITH OGONEK
 	},
 
 	{ // 18 Polish
-		{ 0x0144, 0x24 }, // ń LATIN SMALL LETTER N WITH ACUTE
+		{ QChar(0x0144), 0x24 }, // ń LATIN SMALL LETTER N WITH ACUTE
-		{ 0x0105, 0x40 }, // ą LATIN SMALL LETTER A WITH OGONEK
+		{ QChar(0x0105), 0x40 }, // ą LATIN SMALL LETTER A WITH OGONEK
-		{ 0x017b, 0x5b }, // Ż LATIN CAPITAL LETTER Z WITH DOT ABOVE - rendered as U+01B5 ...WITH STROKE
+		{ QChar(0x017b), 0x5b }, // Ż LATIN CAPITAL LETTER Z WITH DOT ABOVE - rendered as U+01B5 ...WITH STROKE
-		{ 0x015a, 0x5c }, // Ś LATIN CAPITAL LETTER S WITH ACUTE
+		{ QChar(0x015a), 0x5c }, // Ś LATIN CAPITAL LETTER S WITH ACUTE
-		{ 0x0141, 0x5d }, // Ł LATIN CAPITAL LETTER L WITH STROKE
+		{ QChar(0x0141), 0x5d }, // Ł LATIN CAPITAL LETTER L WITH STROKE
-		{ 0x0107, 0x5e }, // ć LATIN SMALL LETTER C WITH ACUTE
+		{ QChar(0x0107), 0x5e }, // ć LATIN SMALL LETTER C WITH ACUTE
-		{ 0x00f3, 0x5f }, // ó LATIN SMALL LETTER O WITH ACUTE
+		{ QChar(0x00f3), 0x5f }, // ó LATIN SMALL LETTER O WITH ACUTE
-		{ 0x0119, 0x60 }, // ę LATIN SMALL LETTER E WITH OGONEK
+		{ QChar(0x0119), 0x60 }, // ę LATIN SMALL LETTER E WITH OGONEK
-		{ 0x017c, 0x7b }, // ż LATIN SMALL LETTER Z WITH DOT ABOVE
+		{ QChar(0x017c), 0x7b }, // ż LATIN SMALL LETTER Z WITH DOT ABOVE
-		{ 0x015b, 0x7c }, // ś LATIN SMALL LETTER S WITH ACUTE
+		{ QChar(0x015b), 0x7c }, // ś LATIN SMALL LETTER S WITH ACUTE
-		{ 0x0142, 0x7d }, // ł LATIN SMALL LETTER L WITH STROKE
+		{ QChar(0x0142), 0x7d }, // ł LATIN SMALL LETTER L WITH STROKE
-		{ 0x017a, 0x7e }  // ź LATIN SMALL LETTER Z WITH ACUTE
+		{ QChar(0x017a), 0x7e }  // ź LATIN SMALL LETTER Z WITH ACUTE
 	},
 
 	{ // 19 Portuguese/Spanish
-		{ 0x00e7, 0x23 }, // ç LATIN SMALL LETTER C WITH CEDILLA
+		{ QChar(0x00e7), 0x23 }, // ç LATIN SMALL LETTER C WITH CEDILLA
-		{ 0x00a1, 0x40 }, // ¡ INVERTED EXCLAMATION MARK
+		{ QChar(0x00a1), 0x40 }, // ¡ INVERTED EXCLAMATION MARK
-		{ 0x00e1, 0x5b }, // á LATIN SMALL LETTER A WITH ACUTE
+		{ QChar(0x00e1), 0x5b }, // á LATIN SMALL LETTER A WITH ACUTE
-		{ 0x00e9, 0x5c }, // é LATIN SMALL LETTER E WITH ACUTE
+		{ QChar(0x00e9), 0x5c }, // é LATIN SMALL LETTER E WITH ACUTE
-		{ 0x00ed, 0x5d }, // í LATIN SMALL LETTER I WITH ACUTE
+		{ QChar(0x00ed), 0x5d }, // í LATIN SMALL LETTER I WITH ACUTE
-		{ 0x00f3, 0x5e }, // ó LATIN SMALL LETTER O WITH ACUTE
+		{ QChar(0x00f3), 0x5e }, // ó LATIN SMALL LETTER O WITH ACUTE
-		{ 0x00fa, 0x5f }, // ú LATIN SMALL LETTER U WITH ACUTE
+		{ QChar(0x00fa), 0x5f }, // ú LATIN SMALL LETTER U WITH ACUTE
-		{ 0x00bf, 0x60 }, // ¿ INVERTED QUESTION MARK
+		{ QChar(0x00bf), 0x60 }, // ¿ INVERTED QUESTION MARK
-		{ 0x00fc, 0x7b }, // ü LATIN SMALL LETTER U WITH DIAERESIS
+		{ QChar(0x00fc), 0x7b }, // ü LATIN SMALL LETTER U WITH DIAERESIS
-		{ 0x00f1, 0x7c }, // ñ LATIN SMALL LETTER N WITH TILDE
+		{ QChar(0x00f1), 0x7c }, // ñ LATIN SMALL LETTER N WITH TILDE
-		{ 0x00e8, 0x7d }, // è LATIN SMALL LETTER E WITH GRAVE
+		{ QChar(0x00e8), 0x7d }, // è LATIN SMALL LETTER E WITH GRAVE
-		{ 0x00e0, 0x7e }  // à LATIN SMALL LETTER A WITH GRAVE
+		{ QChar(0x00e0), 0x7e }  // à LATIN SMALL LETTER A WITH GRAVE
 	},
 
 	{ // 20 Rumanian
-		{ 0x00a4, 0x24 }, // ¤ CURRENCY SIGN
+		{ QChar(0x00a4), 0x24 }, // ¤ CURRENCY SIGN
-		{ 0x021a, 0x40 }, // Ț LATIN CAPITAL LETTER T WITH COMMA BELOW
+		{ QChar(0x021a), 0x40 }, // Ț LATIN CAPITAL LETTER T WITH COMMA BELOW
-		{ 0x00c2, 0x5b }, // Â LATIN CAPITAL LETTER A WITH CIRCUMFLEX
+		{ QChar(0x00c2), 0x5b }, // Â LATIN CAPITAL LETTER A WITH CIRCUMFLEX
-		{ 0x0218, 0x5c }, // Ș LATIN CAPITAL LETTER S WITH COMMA BELOW
+		{ QChar(0x0218), 0x5c }, // Ș LATIN CAPITAL LETTER S WITH COMMA BELOW
-		{ 0x0102, 0x5d }, // Ă LATIN CAPITAL LETTER A WITH BREVE
+		{ QChar(0x0102), 0x5d }, // Ă LATIN CAPITAL LETTER A WITH BREVE
-		{ 0x00c3, 0x5e }, // Î LATIN CAPITAL LETTER I WITH CIRCUMFLEX
+		{ QChar(0x00c3), 0x5e }, // Î LATIN CAPITAL LETTER I WITH CIRCUMFLEX
-		{ 0x0131, 0x5f }, // ı LATIN SMALL LETTER DOTLESS I
+		{ QChar(0x0131), 0x5f }, // ı LATIN SMALL LETTER DOTLESS I
-		{ 0x021b, 0x60 }, // ț LATIN SMALL LETTER T WITH COMMA BELOW
+		{ QChar(0x021b), 0x60 }, // ț LATIN SMALL LETTER T WITH COMMA BELOW
-		{ 0x00e2, 0x7b }, // â LATIN SMALL LETTER A WITH CIRCUMFLEX
+		{ QChar(0x00e2), 0x7b }, // â LATIN SMALL LETTER A WITH CIRCUMFLEX
-		{ 0x0219, 0x7c }, // ș LATIN SMALL LETTER S WITH COMMA BELOW
+		{ QChar(0x0219), 0x7c }, // ș LATIN SMALL LETTER S WITH COMMA BELOW
-		{ 0x0103, 0x7d }, // ă LATIN SMALL LETTER A WITH BREVE
+		{ QChar(0x0103), 0x7d }, // ă LATIN SMALL LETTER A WITH BREVE
-		{ 0x00ee, 0x7e }  // î LATIN SMALL LETTER I WITH CIRCUMFLEX
+		{ QChar(0x00ee), 0x7e }  // î LATIN SMALL LETTER I WITH CIRCUMFLEX
 	},
 
 	{ // 21 Serbian/Croatian/Slovenian
-		{ 0x00cb, 0x24 }, // Ë LATIN CAPITAL LETTER E WITH DIAERESIS
+		{ QChar(0x00cb), 0x24 }, // Ë LATIN CAPITAL LETTER E WITH DIAERESIS
-		{ 0x010c, 0x40 }, // Č LATIN CAPITAL LETTER C WITH CARON
+		{ QChar(0x010c), 0x40 }, // Č LATIN CAPITAL LETTER C WITH CARON
-		{ 0x0106, 0x5b }, // Ć LATIN CAPITAL LETTER C WITH ACUTE
+		{ QChar(0x0106), 0x5b }, // Ć LATIN CAPITAL LETTER C WITH ACUTE
-		{ 0x017d, 0x5c }, // Ž LATIN CAPITAL LETTER Z WITH CARON
+		{ QChar(0x017d), 0x5c }, // Ž LATIN CAPITAL LETTER Z WITH CARON
-		{ 0x0110, 0x5d }, // Đ LATIN CAPITAL LETTER D WITH STROKE
+		{ QChar(0x0110), 0x5d }, // Đ LATIN CAPITAL LETTER D WITH STROKE
-		{ 0x0160, 0x5e }, // Š LATIN CAPITAL LETTER S WITH CARON
+		{ QChar(0x0160), 0x5e }, // Š LATIN CAPITAL LETTER S WITH CARON
-		{ 0x00eb, 0x5f }, // ë LATIN SMALL LETTER E WITH DIAERESIS
+		{ QChar(0x00eb), 0x5f }, // ë LATIN SMALL LETTER E WITH DIAERESIS
-		{ 0x010d, 0x60 }, // č LATIN SMALL LETTER C WITH CARON
+		{ QChar(0x010d), 0x60 }, // č LATIN SMALL LETTER C WITH CARON
-		{ 0x0107, 0x7b }, // ć LATIN SMALL LETTER C WITH ACUTE
+		{ QChar(0x0107), 0x7b }, // ć LATIN SMALL LETTER C WITH ACUTE
-		{ 0x017e, 0x7c }, // ž LATIN SMALL LETTER Z WITH CARON
+		{ QChar(0x017e), 0x7c }, // ž LATIN SMALL LETTER Z WITH CARON
-		{ 0x0111, 0x7d }, // đ LATIN SMALL LETTER D WITH STROKE
+		{ QChar(0x0111), 0x7d }, // đ LATIN SMALL LETTER D WITH STROKE
-		{ 0x0161, 0x7e }  // š LATIN SMALL LETTER S WITH CARON
+		{ QChar(0x0161), 0x7e }  // š LATIN SMALL LETTER S WITH CARON
 	},
 
 	{ // 22 Swedish/Finnish/Hungarian
-		{ 0x00a4, 0x24 }, // ¤ CURRENCY SIGN
+		{ QChar(0x00a4), 0x24 }, // ¤ CURRENCY SIGN
-		{ 0x00c9, 0x40 }, // É LATIN CAPITAL LETTER E WITH ACUTE
+		{ QChar(0x00c9), 0x40 }, // É LATIN CAPITAL LETTER E WITH ACUTE
-		{ 0x00c4, 0x5b }, // Ä LATIN CAPITAL LETTER A WITH DIAERESIS
+		{ QChar(0x00c4), 0x5b }, // Ä LATIN CAPITAL LETTER A WITH DIAERESIS
-		{ 0x00d6, 0x5c }, // Ö LATIN CAPITAL LETTER O WITH DIAERESIS
+		{ QChar(0x00d6), 0x5c }, // Ö LATIN CAPITAL LETTER O WITH DIAERESIS
-		{ 0x00c5, 0x5d }, // Å LATIN CAPITAL LETTER A WITH RING ABOVE
+		{ QChar(0x00c5), 0x5d }, // Å LATIN CAPITAL LETTER A WITH RING ABOVE
-		{ 0x00dc, 0x5e }, // Ü LATIN CAPITAL LETTER U WITH DIAERESIS
+		{ QChar(0x00dc), 0x5e }, // Ü LATIN CAPITAL LETTER U WITH DIAERESIS
-		{ 0x00e9, 0x60 }, // é LATIN SMALL LETTER E WITH ACUTE
+		{ QChar(0x00e9), 0x60 }, // é LATIN SMALL LETTER E WITH ACUTE
-		{ 0x00e4, 0x7b }, // ä LATIN SMALL LETTER A WITH DIAERESIS
+		{ QChar(0x00e4), 0x7b }, // ä LATIN SMALL LETTER A WITH DIAERESIS
-		{ 0x00f6, 0x7c }, // ö LATIN SMALL LETTER O WITH DIAERESIS
+		{ QChar(0x00f6), 0x7c }, // ö LATIN SMALL LETTER O WITH DIAERESIS
-		{ 0x00e5, 0x7d }, // å LATIN SMALL LETTER A WITH RING ABOVE
+		{ QChar(0x00e5), 0x7d }, // å LATIN SMALL LETTER A WITH RING ABOVE
-		{ 0x00fc, 0x7e }  // ü LATIN SMALL LETTER U WITH DIAERESIS
+		{ QChar(0x00fc), 0x7e }  // ü LATIN SMALL LETTER U WITH DIAERESIS
 	},
 
 	{ // 23 Turkish
-		{ 0x20ba, 0x23 }, // ₺ TURKISH LIRA SIGN
+		{ QChar(0x20ba), 0x23 }, // ₺ TURKISH LIRA SIGN
-		{ 0x011f, 0x24 }, // ğ LATIN SMALL LETTER G WITH BREVE
+		{ QChar(0x011f), 0x24 }, // ğ LATIN SMALL LETTER G WITH BREVE
-		{ 0x0130, 0x40 }, // İ LATIN CAPITAL LETTER I WITH DOT ABOVE
+		{ QChar(0x0130), 0x40 }, // İ LATIN CAPITAL LETTER I WITH DOT ABOVE
-		{ 0x015e, 0x5b }, // Ş LATIN CAPITAL LETTER S WITH CEDILLA
+		{ QChar(0x015e), 0x5b }, // Ş LATIN CAPITAL LETTER S WITH CEDILLA
-		{ 0x00d6, 0x5c }, // Ö LATIN CAPITAL LETTER O WITH DIAERESIS
+		{ QChar(0x00d6), 0x5c }, // Ö LATIN CAPITAL LETTER O WITH DIAERESIS
-		{ 0x00c7, 0x5d }, // Ç LATIN CAPITAL LETTER C WITH CEDILLA
+		{ QChar(0x00c7), 0x5d }, // Ç LATIN CAPITAL LETTER C WITH CEDILLA
-		{ 0x00dc, 0x5e }, // Ü LATIN CAPITAL LETTER U WITH DIAERESIS
+		{ QChar(0x00dc), 0x5e }, // Ü LATIN CAPITAL LETTER U WITH DIAERESIS
-		{ 0x011e, 0x5f }, // Ğ LATIN CAPITAL LETTER G WITH BREVE
+		{ QChar(0x011e), 0x5f }, // Ğ LATIN CAPITAL LETTER G WITH BREVE
-		{ 0x0131, 0x60 }, // ı LATIN SMALL LETTER DOTLESS I
+		{ QChar(0x0131), 0x60 }, // ı LATIN SMALL LETTER DOTLESS I
-		{ 0x015f, 0x7b }, // ş LATIN SMALL LETTER S WITH CEDILLA
+		{ QChar(0x015f), 0x7b }, // ş LATIN SMALL LETTER S WITH CEDILLA
-		{ 0x00f6, 0x7c }, // ö LATIN SMALL LETTER O WITH DIAERESIS
+		{ QChar(0x00f6), 0x7c }, // ö LATIN SMALL LETTER O WITH DIAERESIS
-		{ 0x00e7, 0x7d }, // ç LATIN SMALL LETTER C WITH CEDILLA
+		{ QChar(0x00e7), 0x7d }, // ç LATIN SMALL LETTER C WITH CEDILLA
-		{ 0x00fc, 0x7e }  // ü LATIN SMALL LETTER U WITH DIAERESIS
+		{ QChar(0x00fc), 0x7e }  // ü LATIN SMALL LETTER U WITH DIAERESIS
 	}
 };
 

levelonecommands.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2023 Gavin MacGregor
+ * Copyright (C) 2020-2024 Gavin MacGregor
  *
  * This file is part of QTeletextMaker.
  *
@@ -22,6 +22,7 @@
 #include <QByteArrayList>
 #include <QClipboard>
 #include <QMimeData>
+#include <QRegularExpression>
 
 #include "levelonecommands.h"
 
@@ -37,6 +38,49 @@ LevelOneCommand::LevelOneCommand(TeletextDocument *teletextDocument, QUndoComman
 	m_firstDo = true;
 }
 
+
+StoreOldCharactersCommand::StoreOldCharactersCommand(TeletextDocument *teletextDocument, QUndoCommand *parent) : LevelOneCommand(teletextDocument, parent)
+{
+}
+
+void StoreOldCharactersCommand::storeOldCharacters(int topRow, int leftColumn, int bottomRow, int rightColumn)
+{
+	for (int r=topRow; r<=bottomRow; r++) {
+		QByteArray rowArray;
+
+		for (int c=leftColumn; c<=rightColumn; c++)
+			// Guard against size of pasted block going beyond last line or column
+			if (r < 25 && c < 40)
+				rowArray.append(m_teletextDocument->currentSubPage()->character(r, c));
+			else
+				// Gone beyond last line or column - store a filler character which we won't see
+				// Not sure if this is really necessary as out-of-bounds access might not occur?
+				rowArray.append(0x7f);
+
+		m_oldCharacters.append(rowArray);
+	}
+}
+
+void StoreOldCharactersCommand::retrieveOldCharacters(int topRow, int leftColumn, int bottomRow, int rightColumn)
+{
+	int arrayR = 0;
+	int arrayC;
+
+	for (int r=topRow; r<=bottomRow; r++) {
+		arrayC = 0;
+		for (int c=leftColumn; c<=rightColumn; c++)
+			// Guard against size of pasted block going beyond last line or column
+			if (r < 25 && c < 40) {
+				m_teletextDocument->currentSubPage()->setCharacter(r, c, m_oldCharacters[arrayR].at(arrayC));
+
+				arrayC++;
+			}
+
+		arrayR++;
+	}
+}
+
+
 TypeCharacterCommand::TypeCharacterCommand(TeletextDocument *teletextDocument, unsigned char newCharacter, bool insertMode, QUndoCommand *parent) : LevelOneCommand(teletextDocument, parent)
 {
 	m_columnStart = m_columnEnd = m_column;
@@ -71,7 +115,7 @@ void TypeCharacterCommand::redo()
 
 	m_teletextDocument->moveCursor(m_row, m_columnEnd);
 	m_teletextDocument->cursorRight();
-	emit m_teletextDocument->contentsChange(m_row);
+	emit m_teletextDocument->contentsChanged();
 }
 
 void TypeCharacterCommand::undo()
@@ -82,7 +126,7 @@ void TypeCharacterCommand::undo()
 		m_teletextDocument->currentSubPage()->setCharacter(m_row, c, m_oldRowContents[c]);
 
 	m_teletextDocument->moveCursor(m_row, m_columnStart);
-	emit m_teletextDocument->contentsChange(m_row);
+	emit m_teletextDocument->contentsChanged();
 }
 
 bool TypeCharacterCommand::mergeWith(const QUndoCommand *command)
@@ -121,7 +165,7 @@ void ToggleMosaicBitCommand::redo()
 	m_teletextDocument->currentSubPage()->setCharacter(m_row, m_column, m_newCharacter);
 
 	m_teletextDocument->moveCursor(m_row, m_column);
-	emit m_teletextDocument->contentsChange(m_row);
+	emit m_teletextDocument->contentsChanged();
 }
 
 void ToggleMosaicBitCommand::undo()
@@ -130,7 +174,7 @@ void ToggleMosaicBitCommand::undo()
 	m_teletextDocument->currentSubPage()->setCharacter(m_row, m_column, m_oldCharacter);
 
 	m_teletextDocument->moveCursor(m_row, m_column);
-	emit m_teletextDocument->contentsChange(m_row);
+	emit m_teletextDocument->contentsChanged();
 }
 
 bool ToggleMosaicBitCommand::mergeWith(const QUndoCommand *command)
@@ -182,7 +226,7 @@ void BackspaceKeyCommand::redo()
 		m_teletextDocument->currentSubPage()->setCharacter(m_row, c, m_newRowContents[c]);
 
 	m_teletextDocument->moveCursor(m_row, m_columnEnd);
-	emit m_teletextDocument->contentsChange(m_row);
+	emit m_teletextDocument->contentsChanged();
 }
 
 void BackspaceKeyCommand::undo()
@@ -194,7 +238,7 @@ void BackspaceKeyCommand::undo()
 
 	m_teletextDocument->moveCursor(m_row, m_columnStart);
 	m_teletextDocument->cursorRight();
-	emit m_teletextDocument->contentsChange(m_row);
+	emit m_teletextDocument->contentsChanged();
 }
 
 bool BackspaceKeyCommand::mergeWith(const QUndoCommand *command)
@@ -236,7 +280,7 @@ void DeleteKeyCommand::redo()
 		m_teletextDocument->currentSubPage()->setCharacter(m_row, c, m_newRowContents[c]);
 
 	m_teletextDocument->moveCursor(m_row, m_column);
-	emit m_teletextDocument->contentsChange(m_row);
+	emit m_teletextDocument->contentsChanged();
 }
 
 void DeleteKeyCommand::undo()
@@ -247,7 +291,7 @@ void DeleteKeyCommand::undo()
 		m_teletextDocument->currentSubPage()->setCharacter(m_row, c, m_oldRowContents[c]);
 
 	m_teletextDocument->moveCursor(m_row, m_column);
-	emit m_teletextDocument->contentsChange(m_row);
+	emit m_teletextDocument->contentsChanged();
 }
 
 bool DeleteKeyCommand::mergeWith(const QUndoCommand *command)
@@ -290,7 +334,7 @@ void InsertRowCommand::redo()
 		for (int c=0; c<40; c++)
 			m_teletextDocument->currentSubPage()->setCharacter(m_row, c, ' ');
 
-	emit m_teletextDocument->refreshNeeded();
+	emit m_teletextDocument->contentsChanged();
 }
 
 void InsertRowCommand::undo()
@@ -305,7 +349,7 @@ void InsertRowCommand::undo()
 	for (int c=0; c<40; c++)
 		m_teletextDocument->currentSubPage()->setCharacter(23, c, m_deletedBottomRow[c]);
 
-	emit m_teletextDocument->refreshNeeded();
+	emit m_teletextDocument->contentsChanged();
 }
 
 
@@ -330,7 +374,7 @@ void DeleteRowCommand::redo()
 		for (int c=0; c<40; c++)
 			m_teletextDocument->currentSubPage()->setCharacter(blankingRow, c, ' ');
 
-	emit m_teletextDocument->refreshNeeded();
+	emit m_teletextDocument->contentsChanged();
 }
 
 void DeleteRowCommand::undo()
@@ -345,12 +389,12 @@ void DeleteRowCommand::undo()
 	for (int c=0; c<40; c++)
 		m_teletextDocument->currentSubPage()->setCharacter(m_row, c, m_deletedRow[c]);
 
-	emit m_teletextDocument->refreshNeeded();
+	emit m_teletextDocument->contentsChanged();
 }
 
 
 #ifndef QT_NO_CLIPBOARD
-CutCommand::CutCommand(TeletextDocument *teletextDocument, QUndoCommand *parent) : LevelOneCommand(teletextDocument, parent)
+CutCommand::CutCommand(TeletextDocument *teletextDocument, QUndoCommand *parent) : StoreOldCharactersCommand(teletextDocument, parent)
 {
 	m_selectionTopRow = m_teletextDocument->selectionTopRow();
 	m_selectionBottomRow = m_teletextDocument->selectionBottomRow();
@@ -360,15 +404,7 @@ CutCommand::CutCommand(TeletextDocument *teletextDocument, QUndoCommand *parent)
 	m_selectionCornerRow = m_teletextDocument->selectionCornerRow();
 	m_selectionCornerColumn = m_teletextDocument->selectionCornerColumn();
 
-	// Store copy of the characters that we're about to blank
+	storeOldCharacters(m_selectionTopRow, m_selectionLeftColumn, m_selectionBottomRow, m_selectionRightColumn);
-	for (int r=m_selectionTopRow; r<=m_selectionBottomRow; r++) {
-		QByteArray rowArray;
-
-		for (int c=m_selectionLeftColumn; c<=m_selectionRightColumn; c++)
-			rowArray.append(m_teletextDocument->currentSubPage()->character(r, c));
-
-		m_deletedCharacters.append(rowArray);
-	}
 
 	setText(QObject::tr("cut"));
 }
@@ -380,32 +416,25 @@ void CutCommand::redo()
 	for (int r=m_selectionTopRow; r<=m_selectionBottomRow; r++) {
 		for (int c=m_selectionLeftColumn; c<=m_selectionRightColumn; c++)
 			m_teletextDocument->currentSubPage()->setCharacter(r, c, 0x20);
-		emit m_teletextDocument->contentsChange(r);
 	}
+
+	emit m_teletextDocument->contentsChanged();
 }
 
 void CutCommand::undo()
 {
 	m_teletextDocument->selectSubPageIndex(m_subPageIndex);
 
-	int arrayR = 0;
+	retrieveOldCharacters(m_selectionTopRow, m_selectionLeftColumn, m_selectionBottomRow, m_selectionRightColumn);
-	int arrayC;
 
-	for (int r=m_selectionTopRow; r<=m_selectionBottomRow; r++) {
+	emit m_teletextDocument->contentsChanged();
-		arrayC = 0;
-		for (int c=m_selectionLeftColumn; c<=m_selectionRightColumn; c++)
-			m_teletextDocument->currentSubPage()->setCharacter(r, c, m_deletedCharacters[arrayR].at(arrayC++));
-
-		emit m_teletextDocument->contentsChange(r);
-		arrayR++;
-	}
 
 	m_teletextDocument->setSelectionCorner(m_selectionCornerRow, m_selectionCornerColumn);
 	m_teletextDocument->moveCursor(m_row, m_column, true);
 }
 
 
-PasteCommand::PasteCommand(TeletextDocument *teletextDocument, int pageCharSet, QUndoCommand *parent) : LevelOneCommand(teletextDocument, parent)
+PasteCommand::PasteCommand(TeletextDocument *teletextDocument, int pageCharSet, QUndoCommand *parent) : StoreOldCharactersCommand(teletextDocument, parent)
 {
 	const QClipboard *clipboard = QApplication::clipboard();
 	const QMimeData *mimeData = clipboard->mimeData();
@@ -459,7 +488,7 @@ PasteCommand::PasteCommand(TeletextDocument *teletextDocument, int pageCharSet,
 		const int rightColumn = m_selectionActive ? m_pasteRightColumn : 39;
 
 		// Parse line-feeds in the clipboard data
-		QStringList plainTextData = mimeData->text().split(QRegExp("\n|\r\n|\r"));
+		QStringList plainTextData = mimeData->text().split(QRegularExpression("\n|\r\n|\r"));
 
 		// "if" statement will be false if clipboard data is a single line of text
 		// that will fit from the cursor position
@@ -552,7 +581,7 @@ PasteCommand::PasteCommand(TeletextDocument *teletextDocument, int pageCharSet,
 				// that won't overwrite what's on the page
 				if (charToConvert == QChar::Null)
 					convertedChar = -1;
-				else if (charToConvert >= 0x01 && charToConvert <= 0x1f)
+				else if (charToConvert >= QChar(0x01) && charToConvert <= QChar(0x1f))
 					convertedChar = ' ';
 				else if (keymapping[pageCharSet].contains(charToConvert))
 					// Remapped character or non-Latin character converted successfully
@@ -583,21 +612,7 @@ PasteCommand::PasteCommand(TeletextDocument *teletextDocument, int pageCharSet,
 	if (m_clipboardDataWidth == 0 || m_clipboardDataHeight == 0)
 		return;
 
-	// Store copy of the characters that we're about to overwrite
+	storeOldCharacters(m_pasteTopRow, m_pasteLeftColumn, m_pasteBottomRow, m_pasteRightColumn);
-	for (int r=m_pasteTopRow; r<=m_pasteBottomRow; r++) {
-		QByteArray rowArray;
-
-		for (int c=m_pasteLeftColumn; c<=m_pasteRightColumn; c++)
-			// Guard against size of pasted block going beyond last line or column
-			if (r < 25 && c < 40)
-				rowArray.append(m_teletextDocument->currentSubPage()->character(r, c));
-			else
-				// Gone beyond last line or column - store a filler character which we won't see
-				// Not sure if this is really necessary as out-of-bounds access might not occur?
-				rowArray.append(0x7f);
-
-		m_deletedCharacters.append(rowArray);
-	}
 
 	setText(QObject::tr("paste"));
 }
@@ -634,9 +649,6 @@ void PasteCommand::redo()
 				}
 			}
 
-		if (r < 25)
-			emit m_teletextDocument->contentsChange(r);
-
 		arrayR++;
 		// If paste area is taller than clipboard data, repeat the pattern
 		// if it wasn't plain text
@@ -648,6 +660,8 @@ void PasteCommand::redo()
 		}
 	}
 
+	emit m_teletextDocument->contentsChanged();
+
 	if (m_selectionActive) {
 		m_teletextDocument->setSelectionCorner(m_selectionCornerRow, m_selectionCornerColumn);
 		m_teletextDocument->moveCursor(m_row, m_column, true);
@@ -664,24 +678,9 @@ void PasteCommand::undo()
 
 	m_teletextDocument->selectSubPageIndex(m_subPageIndex);
 
-	int arrayR = 0;
+	retrieveOldCharacters(m_pasteTopRow, m_pasteLeftColumn, m_pasteBottomRow, m_pasteRightColumn);
-	int arrayC;
 
-	for (int r=m_pasteTopRow; r<=m_pasteBottomRow; r++) {
+	emit m_teletextDocument->contentsChanged();
-		arrayC = 0;
-		for (int c=m_pasteLeftColumn; c<=m_pasteRightColumn; c++)
-			// Guard against size of pasted block going beyond last line or column
-			if (r < 25 && c < 40) {
-				m_teletextDocument->currentSubPage()->setCharacter(r, c, m_deletedCharacters[arrayR].at(arrayC));
-
-				arrayC++;
-			}
-
-		if (r < 25)
-			emit m_teletextDocument->contentsChange(r);
-
-		arrayR++;
-	}
 
 	if (!m_selectionActive)
 		m_teletextDocument->moveCursor(m_row, m_column);
@@ -745,7 +744,7 @@ void SetFullScreenColourCommand::redo()
 	m_teletextDocument->selectSubPageIndex(m_subPageIndex);
 	m_teletextDocument->currentSubPage()->setDefaultScreenColour(m_newColour);
 
-	emit m_teletextDocument->refreshNeeded();
+	emit m_teletextDocument->contentsChanged();
 	emit m_teletextDocument->pageOptionsChanged();
 }
 
@@ -754,7 +753,7 @@ void SetFullScreenColourCommand::undo()
 	m_teletextDocument->selectSubPageIndex(m_subPageIndex);
 	m_teletextDocument->currentSubPage()->setDefaultScreenColour(m_oldColour);
 
-	emit m_teletextDocument->refreshNeeded();
+	emit m_teletextDocument->contentsChanged();
 	emit m_teletextDocument->pageOptionsChanged();
 }
 
@@ -784,7 +783,7 @@ void SetFullRowColourCommand::redo()
 	m_teletextDocument->selectSubPageIndex(m_subPageIndex);
 	m_teletextDocument->currentSubPage()->setDefaultRowColour(m_newColour);
 
-	emit m_teletextDocument->refreshNeeded();
+	emit m_teletextDocument->contentsChanged();
 	emit m_teletextDocument->pageOptionsChanged();
 }
 
@@ -793,7 +792,7 @@ void SetFullRowColourCommand::undo()
 	m_teletextDocument->selectSubPageIndex(m_subPageIndex);
 	m_teletextDocument->currentSubPage()->setDefaultRowColour(m_oldColour);
 
-	emit m_teletextDocument->refreshNeeded();
+	emit m_teletextDocument->contentsChanged();
 	emit m_teletextDocument->pageOptionsChanged();
 }
 
@@ -823,7 +822,7 @@ void SetCLUTRemapCommand::redo()
 	m_teletextDocument->selectSubPageIndex(m_subPageIndex);
 	m_teletextDocument->currentSubPage()->setColourTableRemap(m_newMap);
 
-	emit m_teletextDocument->refreshNeeded();
+	emit m_teletextDocument->contentsChanged();
 	emit m_teletextDocument->pageOptionsChanged();
 }
 
@@ -832,7 +831,7 @@ void SetCLUTRemapCommand::undo()
 	m_teletextDocument->selectSubPageIndex(m_subPageIndex);
 	m_teletextDocument->currentSubPage()->setColourTableRemap(m_oldMap);
 
-	emit m_teletextDocument->refreshNeeded();
+	emit m_teletextDocument->contentsChanged();
 	emit m_teletextDocument->pageOptionsChanged();
 }
 
@@ -862,7 +861,7 @@ void SetBlackBackgroundSubstCommand::redo()
 	m_teletextDocument->selectSubPageIndex(m_subPageIndex);
 	m_teletextDocument->currentSubPage()->setBlackBackgroundSubst(m_newSub);
 
-	emit m_teletextDocument->refreshNeeded();
+	emit m_teletextDocument->contentsChanged();
 	emit m_teletextDocument->pageOptionsChanged();
 }
 
@@ -871,7 +870,7 @@ void SetBlackBackgroundSubstCommand::undo()
 	m_teletextDocument->selectSubPageIndex(m_subPageIndex);
 	m_teletextDocument->currentSubPage()->setBlackBackgroundSubst(m_oldSub);
 
-	emit m_teletextDocument->refreshNeeded();
+	emit m_teletextDocument->contentsChanged();
 	emit m_teletextDocument->pageOptionsChanged();
 }
 
@@ -903,7 +902,7 @@ void SetColourCommand::redo()
 	m_teletextDocument->currentSubPage()->setCLUT(m_colourIndex, m_newColour);
 
 	emit m_teletextDocument->colourChanged(m_colourIndex);
-	emit m_teletextDocument->refreshNeeded();
+	emit m_teletextDocument->contentsChanged();
 }
 
 void SetColourCommand::undo()
@@ -912,7 +911,7 @@ void SetColourCommand::undo()
 	m_teletextDocument->currentSubPage()->setCLUT(m_colourIndex, m_oldColour);
 
 	emit m_teletextDocument->colourChanged(m_colourIndex);
-	emit m_teletextDocument->refreshNeeded();
+	emit m_teletextDocument->contentsChanged();
 }
 
 
@@ -933,7 +932,7 @@ void ResetCLUTCommand::redo()
 		emit m_teletextDocument->colourChanged(i);
 	}
 
-	emit m_teletextDocument->refreshNeeded();
+	emit m_teletextDocument->contentsChanged();
 }
 
 void ResetCLUTCommand::undo()
@@ -944,5 +943,5 @@ void ResetCLUTCommand::undo()
 		emit m_teletextDocument->colourChanged(i);
 	}
 
-	emit m_teletextDocument->refreshNeeded();
+	emit m_teletextDocument->contentsChanged();
 }

levelonecommands.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2023 Gavin MacGregor
+ * Copyright (C) 2020-2024 Gavin MacGregor
  *
  * This file is part of QTeletextMaker.
  *
@@ -28,7 +28,7 @@
 class LevelOneCommand : public QUndoCommand
 {
 public:
-	LevelOneCommand(TeletextDocument *, QUndoCommand *parent = 0);
+	LevelOneCommand(TeletextDocument *teletextDocument, QUndoCommand *parent = 0);
 
 protected:
 	TeletextDocument *m_teletextDocument;
@@ -36,16 +36,28 @@ protected:
 	bool m_firstDo;
 };
 
+class StoreOldCharactersCommand : public LevelOneCommand
+{
+public:
+	StoreOldCharactersCommand(TeletextDocument *teletextDocument, QUndoCommand *parent = 0);
+
+protected:
+	void storeOldCharacters(int topRow, int leftColumn, int bottomRow, int rightColumn);
+	void retrieveOldCharacters(int topRow, int leftColumn, int bottomRow, int rightColumn);
+
+	QByteArrayList m_oldCharacters;
+};
+
 class TypeCharacterCommand : public LevelOneCommand
 {
 public:
 	enum { Id = 101 };
 
-	TypeCharacterCommand(TeletextDocument *, unsigned char, bool, QUndoCommand *parent = 0);
+	TypeCharacterCommand(TeletextDocument *teletextDocument, unsigned char newCharacter, bool insertMode, QUndoCommand *parent = 0);
 
 	void redo() override;
 	void undo() override;
-	bool mergeWith(const QUndoCommand *) override;
+	bool mergeWith(const QUndoCommand *command) override;
 	int id() const override { return Id; }
 
 private:
@@ -59,11 +71,11 @@ class ToggleMosaicBitCommand : public LevelOneCommand
 public:
 	enum { Id = 102 };
 
-	ToggleMosaicBitCommand(TeletextDocument *, unsigned char, QUndoCommand *parent = 0);
+	ToggleMosaicBitCommand(TeletextDocument *teletextDocument, unsigned char bitToToggle, QUndoCommand *parent = 0);
 
 	void redo() override;
 	void undo() override;
-	bool mergeWith(const QUndoCommand *) override;
+	bool mergeWith(const QUndoCommand *command) override;
 	int id() const override { return Id; }
 
 private:
@@ -75,11 +87,11 @@ class BackspaceKeyCommand : public LevelOneCommand
 public:
 	enum { Id = 103 };
 
-	BackspaceKeyCommand(TeletextDocument *, bool insertMode, QUndoCommand *parent = 0);
+	BackspaceKeyCommand(TeletextDocument *teletextDocument, bool insertMode, QUndoCommand *parent = 0);
 
 	void redo() override;
 	void undo() override;
-	bool mergeWith(const QUndoCommand *) override;
+	bool mergeWith(const QUndoCommand *command) override;
 	int id() const override { return Id; }
 
 private:
@@ -93,11 +105,11 @@ class DeleteKeyCommand : public LevelOneCommand
 public:
 	enum { Id = 104 };
 
-	DeleteKeyCommand(TeletextDocument *, QUndoCommand *parent = 0);
+	DeleteKeyCommand(TeletextDocument *teletextDocument, QUndoCommand *parent = 0);
 
 	void redo() override;
 	void undo() override;
-	bool mergeWith(const QUndoCommand *) override;
+	bool mergeWith(const QUndoCommand *command) override;
 	int id() const override { return Id; }
 
 private:
@@ -107,7 +119,7 @@ private:
 class InsertSubPageCommand : public LevelOneCommand
 {
 public:
-	InsertSubPageCommand(TeletextDocument *, bool, bool, QUndoCommand *parent = 0);
+	InsertSubPageCommand(TeletextDocument *teletextDocument, bool afterCurrentSubPage, bool copySubPage, QUndoCommand *parent = 0);
 
 	void redo() override;
 	void undo() override;
@@ -120,7 +132,7 @@ private:
 class DeleteSubPageCommand : public LevelOneCommand
 {
 public:
-	DeleteSubPageCommand(TeletextDocument *, QUndoCommand *parent = 0);
+	DeleteSubPageCommand(TeletextDocument *teletextDocument, QUndoCommand *parent = 0);
 
 	void redo() override;
 	void undo() override;
@@ -129,7 +141,7 @@ public:
 class InsertRowCommand : public LevelOneCommand
 {
 public:
-	InsertRowCommand(TeletextDocument *, bool, QUndoCommand *parent = 0);
+	InsertRowCommand(TeletextDocument *teletextDocument, bool copyRow, QUndoCommand *parent = 0);
 
 	void redo() override;
 	void undo() override;
@@ -142,7 +154,7 @@ private:
 class DeleteRowCommand : public LevelOneCommand
 {
 public:
-	DeleteRowCommand(TeletextDocument *, QUndoCommand *parent = 0);
+	DeleteRowCommand(TeletextDocument *teletextDocument, QUndoCommand *parent = 0);
 
 	void redo() override;
 	void undo() override;
@@ -152,30 +164,29 @@ private:
 };
 
 #ifndef QT_NO_CLIPBOARD
-class CutCommand : public LevelOneCommand
+class CutCommand : public StoreOldCharactersCommand
 {
 public:
-	CutCommand(TeletextDocument *, QUndoCommand *parent = 0);
+	CutCommand(TeletextDocument *teletextDocument, QUndoCommand *parent = 0);
 
 	void redo() override;
 	void undo() override;
 
 private:
-	QByteArrayList m_deletedCharacters;
 	int m_selectionTopRow, m_selectionBottomRow, m_selectionLeftColumn, m_selectionRightColumn;
 	int m_selectionCornerRow, m_selectionCornerColumn;
 };
 
-class PasteCommand : public LevelOneCommand
+class PasteCommand : public StoreOldCharactersCommand
 {
 public:
-	PasteCommand(TeletextDocument *, int, QUndoCommand *parent = 0);
+	PasteCommand(TeletextDocument *teletextDocument, int pageCharSet, QUndoCommand *parent = 0);
 
 	void redo() override;
 	void undo() override;
 
 private:
-	QByteArrayList m_deletedCharacters, m_pastingCharacters;
+	QByteArrayList m_pastingCharacters;
 	int m_pasteTopRow, m_pasteBottomRow, m_pasteLeftColumn, m_pasteRightColumn;
 	int m_clipboardDataHeight, m_clipboardDataWidth;
 	int m_selectionCornerRow, m_selectionCornerColumn;
@@ -188,11 +199,11 @@ class SetFullScreenColourCommand : public LevelOneCommand
 public:
 	enum { Id = 105 };
 
-	SetFullScreenColourCommand(TeletextDocument *, int, QUndoCommand *parent = 0);
+	SetFullScreenColourCommand(TeletextDocument *teletextDocument, int newColour, QUndoCommand *parent = 0);
 
 	void redo() override;
 	void undo() override;
-	bool mergeWith(const QUndoCommand *) override;
+	bool mergeWith(const QUndoCommand *command) override;
 	int id() const override { return Id; }
 
 private:
@@ -204,11 +215,11 @@ class SetFullRowColourCommand : public LevelOneCommand
 public:
 	enum { Id = 106 };
 
-	SetFullRowColourCommand(TeletextDocument *, int, QUndoCommand *parent = 0);
+	SetFullRowColourCommand(TeletextDocument *teletextDocument, int newColour, QUndoCommand *parent = 0);
 
 	void redo() override;
 	void undo() override;
-	bool mergeWith(const QUndoCommand *) override;
+	bool mergeWith(const QUndoCommand *command) override;
 	int id() const override { return Id; }
 
 private:
@@ -220,11 +231,11 @@ class SetCLUTRemapCommand : public LevelOneCommand
 public:
 	enum { Id = 107 };
 
-	SetCLUTRemapCommand(TeletextDocument *, int, QUndoCommand *parent = 0);
+	SetCLUTRemapCommand(TeletextDocument *teletextDocument, int newMap, QUndoCommand *parent = 0);
 
 	void redo() override;
 	void undo() override;
-	bool mergeWith(const QUndoCommand *) override;
+	bool mergeWith(const QUndoCommand *command) override;
 	int id() const override { return Id; }
 
 private:
@@ -236,11 +247,11 @@ class SetBlackBackgroundSubstCommand : public LevelOneCommand
 public:
 	enum { Id = 108 };
 
-	SetBlackBackgroundSubstCommand(TeletextDocument *, bool, QUndoCommand *parent = 0);
+	SetBlackBackgroundSubstCommand(TeletextDocument *teletextDocument, bool newSub, QUndoCommand *parent = 0);
 
 	void redo() override;
 	void undo() override;
-	bool mergeWith(const QUndoCommand *) override;
+	bool mergeWith(const QUndoCommand *command) override;
 	int id() const override { return Id; }
 
 private:
@@ -250,7 +261,7 @@ private:
 class SetColourCommand : public LevelOneCommand
 {
 public:
-	SetColourCommand(TeletextDocument *, int, int, QUndoCommand *parent = 0);
+	SetColourCommand(TeletextDocument *teletextDocument, int colourIndex, int newColour, QUndoCommand *parent = 0);
 
 	void redo() override;
 	void undo() override;
@@ -262,7 +273,7 @@ private:
 class ResetCLUTCommand : public LevelOneCommand
 {
 public:
-	ResetCLUTCommand(TeletextDocument *, int, QUndoCommand *parent = 0);
+	ResetCLUTCommand(TeletextDocument *teletextDocument, int colourTable, QUndoCommand *parent = 0);
 
 	void redo() override;
 	void undo() override;

levelonepage.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2023 Gavin MacGregor
+ * Copyright (C) 2020-2024 Gavin MacGregor
  *
  * This file is part of QTeletextMaker.
  *
@@ -431,9 +431,12 @@ int LevelOnePage::levelRequired() const
 				case 0x1f: // Termination
 				case 0x22: // G3 character @ Level 1.5
 				case 0x2f: // G2 character
-				case 0x30 ... 0x3f: // G0 character with diacritical
 					levelSeen = 1;
 					break;
+				default:
+					if (m_enhancements.at(i).modeExt() >= 0x30 && m_enhancements.at(i).modeExt() <= 0x3f)
+						// G0 character with diacritical
+						levelSeen = 1;
 			}
 
 		if (levelSeen < 2)
@@ -441,14 +444,23 @@ int LevelOnePage::levelRequired() const
 				// Check for Level 2.5 triplets
 				case 0x00: // Full screen colour
 				case 0x01: // Full row colour
-				case 0x10 ... 0x13: // Origin Modifer and Object Invocation
+				case 0x10: // Origin Modifier
-				case 0x15 ... 0x17: // Object Definition
+				case 0x11: // Invoke Active Object
+				case 0x12: // Invoke Adaptive Object
+				case 0x13: // Invoke Passive Object
+				case 0x15: // Define Active Object
+				case 0x16: // Define Adaptive Object
+				case 0x17: // Define Passive Object
 				case 0x18: // DRCS Mode
 				case 0x20: // Foreground colour
 				case 0x21: // G1 character
 				case 0x23: // Background colour
-				case 0x27 ... 0x29: // Flash functions, G0 and G2 charset designation, G0 character @ Level 2.5
+				case 0x27: // Flash functions
-				case 0x2b ... 0x2d: // G3 character @ Level 2.5, display attributes, DRCS character
+				case 0x28: // G0 and G2 charset designation
+				case 0x29: // G0 character @ Level 2.5
+				case 0x2b: // G3 character @ Level 2.5
+				case 0x2c: // Display attributes
+				case 0x2d: // DRCS character
 					levelSeen = 2;
 					break;
 			}
@@ -456,7 +468,9 @@ int LevelOnePage::levelRequired() const
 		if (levelSeen == 2)
 			switch (m_enhancements.at(i).modeExt()) {
 				// Check for triplets with "required at Level 3.5 only" parameters
-				case 0x15 ... 0x17: // Object Definition
+				case 0x15: // Define Active Object
+				case 0x16: // Define Adaptive Object
+				case 0x17: // Define Passive Object
 					if ((m_enhancements.at(i).address() & 0x18) == 0x10)
 						return 3;
 					break;

levelonepage.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2023 Gavin MacGregor
+ * Copyright (C) 2020-2024 Gavin MacGregor
  *
  * This file is part of QTeletextMaker.
  *
@@ -36,19 +36,19 @@ public:
 	enum CycleTypeEnum { CTcycles, CTseconds };
 
 	LevelOnePage();
-	LevelOnePage(const PageBase &);
+	LevelOnePage(const PageBase &other);
 
 	bool isEmpty() const override;
 
-	QByteArray packet(int) const override;
+	QByteArray packet(int packetNumber) const override;
-	QByteArray packet(int, int) const override;
+	QByteArray packet(int packetNumber, int designationCode) const override;
-	bool packetExists(int) const override;
+	bool packetExists(int packetNumber) const override;
-	bool packetExists(int, int) const override;
+	bool packetExists(int packetNumber, int designationCode) const override;
-	bool setPacket(int, QByteArray) override;
+	bool setPacket(int packetNumber, QByteArray packetContents) override;
-	bool setPacket(int, int, QByteArray) override;
+	bool setPacket(int packetNumber, int designationCode, QByteArray packetContents) override;
 
 	bool controlBit(int bitNumber) const override;
-	bool setControlBit(int, bool) override;
+	bool setControlBit(int bitNumber, bool active) override;
 
 	void clearPage();
 
@@ -56,53 +56,53 @@ public:
 
 /*	void setSubPageNumber(int); */
 	int cycleValue() const { return m_cycleValue; };
-	void setCycleValue(int);
+	void setCycleValue(int newValue);
 	CycleTypeEnum cycleType() const { return m_cycleType; };
-	void setCycleType(CycleTypeEnum);
+	void setCycleType(CycleTypeEnum newType);
 	int defaultCharSet() const { return m_defaultCharSet; }
-	void setDefaultCharSet(int);
+	void setDefaultCharSet(int newDefaultCharSet);
 	int defaultNOS() const { return m_defaultNOS; }
-	void setDefaultNOS(int);
+	void setDefaultNOS(int defaultNOS);
 	int secondCharSet() const { return m_secondCharSet; }
-	void setSecondCharSet(int);
+	void setSecondCharSet(int newSecondCharSet);
 	int secondNOS() const { return m_secondNOS; }
-	void setSecondNOS(int);
+	void setSecondNOS(int newSecondNOS);
 	unsigned char character(int row, int column) const { return m_level1Page[row][column]; }
-	void setCharacter(int, int, unsigned char);
+	void setCharacter(int row, int column, unsigned char newCharacter);
 	int defaultScreenColour() const { return m_defaultScreenColour; }
-	void setDefaultScreenColour(int);
+	void setDefaultScreenColour(int newDefaultScreenColour);
 	int defaultRowColour() const { return m_defaultRowColour; }
-	void setDefaultRowColour(int);
+	void setDefaultRowColour(int newDefaultRowColour);
 	int colourTableRemap() const { return m_colourTableRemap; }
-	void setColourTableRemap(int);
+	void setColourTableRemap(int newColourTableRemap);
 	bool blackBackgroundSubst() const { return m_blackBackgroundSubst; }
-	void setBlackBackgroundSubst(bool);
+	void setBlackBackgroundSubst(bool newBlackBackgroundSubst);
 	int CLUT(int index, int renderLevel=3) const;
-	void setCLUT(int, int);
+	void setCLUT(int index, int newColour);
 	QColor CLUTtoQColor(int index, int renderlevel=3) const;
-	bool isPaletteDefault(int) const;
+	bool isPaletteDefault(int colour) const;
-	bool isPaletteDefault(int, int) const;
+	bool isPaletteDefault(int fromColour, int toColour) const;
 	int levelRequired() const;
 	bool leftSidePanelDisplayed() const { return m_leftSidePanelDisplayed; }
-	void setLeftSidePanelDisplayed(bool);
+	void setLeftSidePanelDisplayed(bool newLeftSidePanelDisplayed);
 	bool rightSidePanelDisplayed() const { return m_rightSidePanelDisplayed; }
-	void setRightSidePanelDisplayed(bool);
+	void setRightSidePanelDisplayed(bool newRightSidePanelDisplayed);
 	int sidePanelColumns() const { return m_sidePanelColumns; }
-	void setSidePanelColumns(int);
+	void setSidePanelColumns(int newSidePanelColumns);
 	bool sidePanelStatusL25() const { return m_sidePanelStatusL25; }
-	void setSidePanelStatusL25(bool);
+	void setSidePanelStatusL25(bool newSidePanelStatusL25);
 	int fastTextLinkPageNumber(int linkNumber) const { return m_fastTextLink[linkNumber].pageNumber; }
-	void setFastTextLinkPageNumber(int, int);
+	void setFastTextLinkPageNumber(int linkNumber, int pageNumber);
 	int composeLinkFunction(int linkNumber) const { return m_composeLink[linkNumber].function; }
-	void setComposeLinkFunction(int, int);
+	void setComposeLinkFunction(int linkNumber, int newFunction);
 	bool composeLinkLevel2p5(int linkNumber) const { return m_composeLink[linkNumber].level2p5; }
-	void setComposeLinkLevel2p5(int, bool);
+	void setComposeLinkLevel2p5(int linkNumber, bool newRequired);
 	bool composeLinkLevel3p5(int linkNumber) const { return m_composeLink[linkNumber].level3p5; }
-	void setComposeLinkLevel3p5(int, bool);
+	void setComposeLinkLevel3p5(int linkNumber, bool newRequired);
 	int composeLinkPageNumber(int linkNumber) const { return m_composeLink[linkNumber].pageNumber; }
-	void setComposeLinkPageNumber(int, int);
+	void setComposeLinkPageNumber(int linkNumber, int newPageNumber);
 	int composeLinkSubPageCodes(int linkNumber) const { return m_composeLink[linkNumber].subPageCodes; }
-	void setComposeLinkSubPageCodes(int, int);
+	void setComposeLinkSubPageCodes(int linkNumber, int newSubPageCodes);
 
 private:
 	unsigned char m_level1Page[25][40];

loadsave.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2023 Gavin MacGregor
+ * Copyright (C) 2020-2024 Gavin MacGregor
  *
  * This file is part of QTeletextMaker.
  *
@@ -419,7 +419,11 @@ void saveTTI(QSaveFile &file, const TeletextDocument &document)
 		}
 	};
 
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
 	outStream.setCodec("ISO-8859-1");
+#else
+	outStream.setEncoding(QStringConverter::Latin1);
+#endif
 
 	if (!document.description().isEmpty())
 #if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
@@ -558,7 +562,11 @@ void exportM29File(QSaveFile &file, const TeletextDocument &document)
 		}
 	};
 
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
 	outStream.setCodec("ISO-8859-1");
+#else
+	outStream.setEncoding(QStringConverter::Latin1);
+#endif
 
 	if (!document.description().isEmpty())
 #if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)

loadsave.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2023 Gavin MacGregor
+ * Copyright (C) 2020-2024 Gavin MacGregor
  *
  * This file is part of QTeletextMaker.
  *
@@ -30,18 +30,18 @@
 #include "levelonepage.h"
 #include "pagebase.h"
 
-void loadTTI(QFile *, TeletextDocument *);
+void loadTTI(QFile *inFile, TeletextDocument *document);
-void importT42(QFile *, TeletextDocument *);
+void importT42(QFile *inFile, TeletextDocument *document);
 
-int controlBitsToPS(PageBase *);
+int controlBitsToPS(PageBase *subPage);
 
-void saveTTI(QSaveFile &, const TeletextDocument &);
+void saveTTI(QSaveFile &file, const TeletextDocument &document);
-void exportT42File(QSaveFile &, const TeletextDocument &);
+void exportT42File(QSaveFile &file, const TeletextDocument &document);
-void exportM29File(QSaveFile &, const TeletextDocument &);
+void exportM29File(QSaveFile &file, const TeletextDocument &document);
 
-QByteArray rowPacketAlways(PageBase *, int);
+QByteArray rowPacketAlways(PageBase *subPage, int packetNumber);
 
-QString exportHashStringPage(LevelOnePage *);
+QString exportHashStringPage(LevelOnePage *subPage);
 QString exportHashStringPackets(LevelOnePage *subPage);
 
 #endif

main.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2023 Gavin MacGregor
+ * Copyright (C) 2020-2024 Gavin MacGregor
  *
  * This file is part of QTeletextMaker.
  *
@@ -30,7 +30,7 @@ int main(int argc, char *argv[])
 	QApplication::setApplicationDisplayName(QApplication::applicationName());
 	QApplication::setOrganizationName("gkmac.co.uk");
 	QApplication::setOrganizationDomain("gkmac.co.uk");
-	QApplication::setApplicationVersion("0.6.2-alpha");
+	QApplication::setApplicationVersion("0.6.3-beta");
 	QCommandLineParser parser;
 	parser.setApplicationDescription(QApplication::applicationName());
 	parser.addHelpOption();

mainwidget.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2023 Gavin MacGregor
+ * Copyright (C) 2020-2024 Gavin MacGregor
  *
  * This file is part of QTeletextMaker.
  *
@@ -62,8 +62,7 @@ TeletextWidget::TeletextWidget(QFrame *parent) : QFrame(parent)
 	connect(&m_pageRender, &TeletextPageRender::flashChanged, this, &TeletextWidget::updateFlashTimer);
 	connect(&m_pageDecode, &TeletextPageDecode::sidePanelsChanged, this, &TeletextWidget::changeSize);
 	connect(m_teletextDocument, &TeletextDocument::subPageSelected, this, &TeletextWidget::subPageSelected);
-	connect(m_teletextDocument, &TeletextDocument::contentsChange, this, &TeletextWidget::refreshRow);
+	connect(m_teletextDocument, &TeletextDocument::contentsChanged, this, &TeletextWidget::refreshPage);
-	connect(m_teletextDocument, &TeletextDocument::refreshNeeded, this, &TeletextWidget::refreshPage);
 	connect(m_teletextDocument, &TeletextDocument::colourChanged, &m_pageRender, &TeletextPageRender::colourChanged);
 }
 
@@ -94,15 +93,6 @@ void TeletextWidget::subPageSelected()
 	update();
 }
 
-void TeletextWidget::refreshRow(int rowChanged)
-{
-	Q_UNUSED(rowChanged);
-
-	// TODO trace signals where this is called so we can remove this
-	m_pageDecode.decodePage();
-	update();
-}
-
 void TeletextWidget::refreshPage()
 {
 	m_pageDecode.decodePage();
@@ -115,11 +105,11 @@ void TeletextWidget::paintEvent(QPaintEvent *event)
 	QPainter widgetPainter(this);
 
 	m_pageRender.renderPage();
-	widgetPainter.drawPixmap(m_pageDecode.leftSidePanelColumns()*12, 0, *m_pageRender.pagePixmap(m_flashPhase), 0, 0, 480, 250);
+	widgetPainter.drawImage(m_pageDecode.leftSidePanelColumns()*12, 0, *m_pageRender.image(m_flashPhase), 0, 0, 480, 250);
 	if (m_pageDecode.leftSidePanelColumns())
-		widgetPainter.drawPixmap(0, 0, *m_pageRender.pagePixmap(m_flashPhase), 864-m_pageDecode.leftSidePanelColumns()*12, 0, m_pageDecode.leftSidePanelColumns()*12, 250);
+		widgetPainter.drawImage(0, 0, *m_pageRender.image(m_flashPhase), 864-m_pageDecode.leftSidePanelColumns()*12, 0, m_pageDecode.leftSidePanelColumns()*12, 250);
 	if (m_pageDecode.rightSidePanelColumns())
-		widgetPainter.drawPixmap(480+m_pageDecode.leftSidePanelColumns()*12, 0, *m_pageRender.pagePixmap(m_flashPhase), 480, 0, m_pageDecode.rightSidePanelColumns()*12, 250);
+		widgetPainter.drawImage(480+m_pageDecode.leftSidePanelColumns()*12, 0, *m_pageRender.image(m_flashPhase), 480, 0, m_pageDecode.rightSidePanelColumns()*12, 250);
 }
 
 void TeletextWidget::updateFlashTimer(int newFlashTimer)
@@ -410,7 +400,7 @@ void TeletextWidget::selectionToClipboard()
 			nativeData[i++] = m_teletextDocument->currentSubPage()->character(r, c);
 
 			if (m_teletextDocument->currentSubPage()->character(r, c) >= 0x20)
-				plainTextData.append(keymapping[m_pageDecode.level1CharSet(r, c)].key(m_teletextDocument->currentSubPage()->character(r, c), m_teletextDocument->currentSubPage()->character(r, c)));
+				plainTextData.append(keymapping[m_pageDecode.level1CharSet(r, c)].key(m_teletextDocument->currentSubPage()->character(r, c), QChar(m_teletextDocument->currentSubPage()->character(r, c))));
 			else
 				plainTextData.append(' ');
 		}

mainwidget.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2023 Gavin MacGregor
+ * Copyright (C) 2020-2024 Gavin MacGregor
  *
  * This file is part of QTeletextMaker.
  *
@@ -43,15 +43,15 @@ class TeletextWidget : public QFrame
 public:
 	TeletextWidget(QFrame *parent = 0);
 	~TeletextWidget();
-	void setCharacter(unsigned char);
+	void setCharacter(unsigned char newCharacter);
-	void toggleCharacterBit(unsigned char);
+	void toggleCharacterBit(unsigned char bitToToggle);
 	bool insertMode() const { return m_insertMode; };
-	void setInsertMode(bool);
+	void setInsertMode(bool insertMode);
 	bool showControlCodes() const { return m_pageRender.showControlCodes(); };
 
 	QSize sizeHint() { return QSize(480+(pageDecode()->leftSidePanelColumns()+pageDecode()->rightSidePanelColumns())*12, 250); }
 
-	void inputMethodEvent(QInputMethodEvent *);
+	void inputMethodEvent(QInputMethodEvent *event);
 
 	TeletextDocument* document() const { return m_teletextDocument; }
 	TeletextPageDecode *pageDecode() { return &m_pageDecode; }
@@ -64,18 +64,17 @@ signals:
 public slots:
 	void subPageSelected();
 	void refreshPage();
-	void setReveal(bool);
+	void setReveal(bool reveal);
-	void setMix(bool);
+	void setMix(bool mix);
-	void setShowControlCodes(bool);
+	void setShowControlCodes(bool showControlCodes);
-	void updateFlashTimer(int);
+	void updateFlashTimer(int newFlashTimer);
-	void pauseFlash(bool);
+	void pauseFlash(bool pauseNow);
-	void refreshRow(int);
 
-	void setControlBit(int, bool);
+	void setControlBit(int bitNumber, bool active);
-	void setDefaultCharSet(int);
+	void setDefaultCharSet(int newDefaultCharSet);
-	void setDefaultNOS(int);
+	void setDefaultNOS(int newDefaultNOS);
-	void setSidePanelWidths(int, int);
+	void setSidePanelWidths(int newLeftSidePanelColumns, int newRightSidePanelColumns);
-	void setSidePanelAtL35Only(bool);
+	void setSidePanelAtL35Only(bool newSidePanelAtL35Only);
 
 	void cut();
 	void copy();
@@ -105,7 +104,7 @@ private:
 	void timerEvent(QTimerEvent *event) override;
 	void selectionToClipboard();
 
-	QPair<int, int> mouseToRowAndColumn(const QPoint &);
+	QPair<int, int> mouseToRowAndColumn(const QPoint &mousePosition);
 };
 
 class LevelOneScene : public QGraphicsScene
@@ -113,27 +112,27 @@ class LevelOneScene : public QGraphicsScene
 	Q_OBJECT
 
 public:
-	LevelOneScene(QWidget *, QObject *parent = nullptr);
+	LevelOneScene(QWidget *levelOneWidget, QObject *parent = nullptr);
-	void setBorderDimensions(int, int, int, int, int);
+	void setBorderDimensions(int sceneWidth, int sceneHeight, int widgetWidth, int leftSidePanelColumns, int rightSidePanelColumns);
 	QGraphicsRectItem *cursorRectItem() const { return m_cursorRectItem; }
 
 public slots:
 	void updateCursor();
 	void updateSelection();
-	void setMix(bool);
+	void setMix(bool mix);
-	void toggleGrid(bool);
+	void toggleGrid(bool gridOn);
-	void hideGUIElements(bool);
+	void hideGUIElements(bool hidden);
-	void setFullScreenColour(const QColor &);
+	void setFullScreenColour(const QColor &newColor);
-	void setFullRowColour(int, const QColor &);
+	void setFullRowColour(int row, const QColor &newColor);
 
 signals:
 	void mouseZoomIn();
 	void mouseZoomOut();
 
 protected:
-	bool eventFilter(QObject *, QEvent *);
+	bool eventFilter(QObject *object, QEvent *event);
-	void keyPressEvent(QKeyEvent *);
+	void keyPressEvent(QKeyEvent *event);
-	void keyReleaseEvent(QKeyEvent *);
+	void keyReleaseEvent(QKeyEvent *keyEvent);
 
 private:
 	QGraphicsRectItem *m_fullScreenTopRectItem, *m_fullScreenBottomRectItem;

mainwindow.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2023 Gavin MacGregor
+ * Copyright (C) 2020-2024 Gavin MacGregor
  *
  * This file is part of QTeletextMaker.
  *
@@ -17,6 +17,7 @@
  * along with QTeletextMaker.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+#include <QActionGroup>
 #include <QApplication>
 #include <QDesktopServices>
 #include <QFileDialog>
@@ -27,7 +28,7 @@
 #include <QPainter>
 #include <QPushButton>
 #include <QRadioButton>
-#include <QRegExp>
+#include <QRegularExpression>
 #include <QSaveFile>
 #include <QScreen>
 #include <QSettings>
@@ -241,7 +242,7 @@ void MainWindow::about()
 	QMessageBox::about(this, tr("About"), QString("<b>%1</b><br>"
 	"An open source Level 2.5 teletext page editor.<br>"
 	"<i>Version %2</i><br><br>"
-	"Copyright (C) 2020-2023 Gavin MacGregor<br><br>"
+	"Copyright (C) 2020-2024 Gavin MacGregor<br><br>"
 	"Released under the GNU General Public License version 3<br>"
 	"<a href=\"https://github.com/gkthemac/qteletextmaker\">https://github.com/gkthemac/qteletextmaker</a>").arg(QApplication::applicationDisplayName()).arg(QApplication::applicationVersion()));
 }
@@ -354,7 +355,7 @@ void MainWindow::createActions()
 
 	const QIcon reloadIcon = QIcon::fromTheme("document-revert");
 	QAction *reloadAct = fileMenu->addAction(reloadIcon, tr("Reload"), this, &MainWindow::reload);
-	reloadAct->setShortcuts(QKeySequence::Refresh);
+	reloadAct->setShortcut(QKeySequence(Qt::Key_F5));
 	reloadAct->setStatusTip(tr("Reload the document from disk"));
 
 	fileMenu->addSeparator();
@@ -461,17 +462,17 @@ void MainWindow::createActions()
 #endif // !QT_NO_CLIPBOARD
 
 	QAction *insertBlankRowAct = editMenu->addAction(tr("Insert blank row"));
-	insertBlankRowAct->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_I));
+	insertBlankRowAct->setShortcut(QKeySequence(Qt::CTRL | Qt::Key_I));
 	insertBlankRowAct->setStatusTip(tr("Insert a blank row at the cursor position"));
 	connect(insertBlankRowAct, &QAction::triggered, [=]() { insertRow(false); } );
 
 	QAction *insertCopyRowAct = editMenu->addAction(tr("Insert copy row"));
-	insertCopyRowAct->setShortcut(QKeySequence(Qt::CTRL + Qt::SHIFT + Qt::Key_I));
+	insertCopyRowAct->setShortcut(QKeySequence(Qt::CTRL | Qt::SHIFT | Qt::Key_I));
 	insertCopyRowAct->setStatusTip(tr("Insert a row that's a copy of the row at the cursor position"));
 	connect(insertCopyRowAct, &QAction::triggered, [=]() { insertRow(true); } );
 
 	QAction *deleteRowAct = editMenu->addAction(tr("Delete row"));
-	deleteRowAct->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_D));
+	deleteRowAct->setShortcut(QKeySequence(Qt::CTRL | Qt::Key_D));
 	deleteRowAct->setStatusTip(tr("Delete the row at the cursor position"));
 	connect(deleteRowAct, &QAction::triggered, this, &MainWindow::deleteRow);
 
@@ -497,26 +498,26 @@ void MainWindow::createActions()
 
 	QAction *revealAct = viewMenu->addAction(tr("&Reveal"));
 	revealAct->setCheckable(true);
-	revealAct->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_R));
+	revealAct->setShortcut(QKeySequence(Qt::CTRL | Qt::Key_R));
 	revealAct->setStatusTip(tr("Toggle reveal"));
 	connect(revealAct, &QAction::toggled, m_textWidget, &TeletextWidget::setReveal);
 
 	QAction *mixAct = viewMenu->addAction(tr("&Mix"));
 	mixAct->setCheckable(true);
-	mixAct->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_M));
+	mixAct->setShortcut(QKeySequence(Qt::CTRL | Qt::Key_M));
 	mixAct->setStatusTip(tr("Toggle mix"));
 	connect(mixAct, &QAction::toggled, m_textWidget, &TeletextWidget::setMix);
 	connect(mixAct, &QAction::toggled, m_textScene, &LevelOneScene::setMix);
 
 	QAction *gridAct = viewMenu->addAction(tr("&Grid"));
 	gridAct->setCheckable(true);
-	gridAct->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_G));
+	gridAct->setShortcut(QKeySequence(Qt::CTRL | Qt::Key_G));
 	gridAct->setStatusTip(tr("Toggle the text grid"));
 	connect(gridAct, &QAction::toggled, m_textScene, &LevelOneScene::toggleGrid);
 
 	QAction *showControlCodesAct = viewMenu->addAction(tr("Show control codes"));
 	showControlCodesAct->setCheckable(true);
-	showControlCodesAct->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_T));
+	showControlCodesAct->setShortcut(QKeySequence(Qt::CTRL | Qt::Key_T));
 	showControlCodesAct->setStatusTip(tr("Toggle showing of control codes"));
 	connect(showControlCodesAct, &QAction::toggled, m_textWidget, &TeletextWidget::setShowControlCodes);
 
@@ -571,7 +572,7 @@ void MainWindow::createActions()
 	connect(zoomOutAct, &QAction::triggered, this, &MainWindow::zoomOut);
 
 	QAction *zoomResetAct = viewMenu->addAction(tr("Reset zoom"));
-	zoomResetAct->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_0));
+	zoomResetAct->setShortcut(QKeySequence(Qt::CTRL | Qt::Key_0));
 	zoomResetAct->setStatusTip(tr("Reset zoom level"));
 	connect(zoomResetAct, &QAction::triggered, this, &MainWindow::zoomReset);
 
@@ -583,19 +584,19 @@ void MainWindow::createActions()
 		const char *colours[] = { "Black", "Red", "Green", "Yellow", "Blue", "Magenta", "Cyan", "White" };
 
 		QAction *alphaColour = alphaColourSubMenu->addAction(tr(colours[i]));
-		alphaColour->setShortcut(QKeySequence(Qt::Key_Escape, Qt::Key_0 + i));
+		alphaColour->setShortcut(QKeySequence(QString("Esc, %1").arg(i)));
 		alphaColour->setStatusTip(QString("Insert alphanumeric %1 attribute").arg(QString(colours[i]).toLower()));
 		connect(alphaColour, &QAction::triggered, [=]() { m_textWidget->setCharacter(i); });
 
 		QAction *mosaicColour = mosaicColourSubMenu->addAction(tr(colours[i]));
-		mosaicColour->setShortcut(QKeySequence(Qt::Key_Escape, Qt::SHIFT + Qt::Key_0 + i));
+		mosaicColour->setShortcut(QKeySequence(QString("Esc, Shift+%1").arg(i)));
 		mosaicColour->setStatusTip(QString("Insert mosaic %1 attribute").arg(QString(colours[i]).toLower()));
 		connect(mosaicColour, &QAction::triggered, [=]() { m_textWidget->setCharacter(i+0x10); });
 	}
 
 	QMenu *mosaicsStyleSubMenu = insertMenu->addMenu(tr("Mosaics style"));
 	QAction *mosaicsSeparatedAct = mosaicsStyleSubMenu->addAction(tr("Separated mosaics"));
-	mosaicsSeparatedAct->setShortcut(QKeySequence(Qt::Key_Escape, Qt::SHIFT + Qt::Key_S));
+	mosaicsSeparatedAct->setShortcut(QKeySequence(Qt::NoModifier | Qt::Key_Escape, Qt::SHIFT | Qt::Key_S));
 	mosaicsSeparatedAct->setStatusTip(tr("Insert separated mosaics attribute"));
 	connect(mosaicsSeparatedAct, &QAction::triggered, [=]() { m_textWidget->setCharacter(0x1a); });
 	QAction *mosaicsContiguousAct = mosaicsStyleSubMenu->addAction(tr("Contiguous mosaics"));
@@ -605,7 +606,7 @@ void MainWindow::createActions()
 
 	QMenu *mosaicsHoldSubMenu = insertMenu->addMenu(tr("Mosaics hold"));
 	QAction *mosaicsHoldAct = mosaicsHoldSubMenu->addAction(tr("Hold mosaics"));
-	mosaicsHoldAct->setShortcut(QKeySequence(Qt::Key_Escape, Qt::SHIFT + Qt::Key_H));
+	mosaicsHoldAct->setShortcut(QKeySequence(Qt::NoModifier | Qt::Key_Escape, Qt::SHIFT | Qt::Key_H));
 	mosaicsHoldAct->setStatusTip(tr("Insert hold mosaics attribute"));
 	connect(mosaicsHoldAct, &QAction::triggered, [=]() { m_textWidget->setCharacter(0x1e); });
 	QAction *mosaicsReleaseAct = mosaicsHoldSubMenu->addAction(tr("Release mosaics"));
@@ -615,7 +616,7 @@ void MainWindow::createActions()
 
 	QMenu *backgroundColourSubMenu = insertMenu->addMenu(tr("Background colour"));
 	QAction *backgroundNewAct = backgroundColourSubMenu->addAction(tr("New background"));
-	backgroundNewAct->setShortcut(QKeySequence(Qt::Key_Escape, Qt::SHIFT + Qt::Key_N));
+	backgroundNewAct->setShortcut(QKeySequence(Qt::NoModifier | Qt::Key_Escape, Qt::SHIFT | Qt::Key_N));
 	backgroundNewAct->setStatusTip(tr("Insert new background attribute"));
 	connect(backgroundNewAct, &QAction::triggered, [=]() { m_textWidget->setCharacter(0x1d); });
 	QAction *backgroundBlackAct = backgroundColourSubMenu->addAction(tr("Black background"));
@@ -629,15 +630,15 @@ void MainWindow::createActions()
 	textSizeNormalAct->setStatusTip(tr("Insert normal size attribute"));
 	connect(textSizeNormalAct, &QAction::triggered, [=]() { m_textWidget->setCharacter(0x0c); });
 	QAction *textSizeDoubleHeightAct = textSizeSubMenu->addAction(tr("Double height"));
-	textSizeDoubleHeightAct->setShortcut(QKeySequence(Qt::Key_Escape, Qt::SHIFT + Qt::Key_D));
+	textSizeDoubleHeightAct->setShortcut(QKeySequence(Qt::NoModifier | Qt::Key_Escape, Qt::SHIFT | Qt::Key_D));
 	textSizeDoubleHeightAct->setStatusTip(tr("Insert double height attribute"));
 	connect(textSizeDoubleHeightAct, &QAction::triggered, [=]() { m_textWidget->setCharacter(0x0d); });
 	QAction *textSizeDoubleWidthAct = textSizeSubMenu->addAction(tr("Double width"));
-	textSizeDoubleWidthAct->setShortcut(QKeySequence(Qt::Key_Escape, Qt::CTRL + Qt::Key_D));
+	textSizeDoubleWidthAct->setShortcut(QKeySequence(Qt::NoModifier | Qt::Key_Escape, Qt::CTRL | Qt::Key_D));
 	textSizeDoubleWidthAct->setStatusTip(tr("Insert double width attribute"));
 	connect(textSizeDoubleWidthAct, &QAction::triggered, [=]() { m_textWidget->setCharacter(0x0e); });
 	QAction *textSizeDoubleSizeAct = textSizeSubMenu->addAction(tr("Double size"));
-	textSizeDoubleSizeAct->setShortcut(QKeySequence(Qt::Key_Escape, Qt::CTRL + Qt::SHIFT + Qt::Key_D));
+	textSizeDoubleSizeAct->setShortcut(QKeySequence(Qt::NoModifier | Qt::Key_Escape, Qt::CTRL | Qt::SHIFT | Qt::Key_D));
 	textSizeDoubleSizeAct->setStatusTip(tr("Insert double size attribute"));
 	connect(textSizeDoubleSizeAct, &QAction::triggered, [=]() { m_textWidget->setCharacter(0x0f); });
 
@@ -648,7 +649,7 @@ void MainWindow::createActions()
 
 	QMenu *flashSubMenu = insertMenu->addMenu(tr("Flash"));
 	QAction *flashFlashingAct = flashSubMenu->addAction(tr("Flashing"));
-	flashFlashingAct->setShortcut(QKeySequence(Qt::Key_Escape, Qt::SHIFT + Qt::Key_F));
+	flashFlashingAct->setShortcut(QKeySequence(Qt::NoModifier | Qt::Key_Escape, Qt::SHIFT | Qt::Key_F));
 	flashFlashingAct->setStatusTip(tr("Insert flashing attribute"));
 	connect(flashFlashingAct, &QAction::triggered, [=]() { m_textWidget->setCharacter(0x08); });
 	QAction *flashSteadyAct = flashSubMenu->addAction(tr("Steady"));
@@ -658,7 +659,7 @@ void MainWindow::createActions()
 
 	QMenu *boxingSubMenu = insertMenu->addMenu(tr("Box"));
 	QAction *boxingStartAct = boxingSubMenu->addAction(tr("Start box"));
-	boxingStartAct->setShortcut(QKeySequence(Qt::Key_Escape, Qt::SHIFT + Qt::Key_X));
+	boxingStartAct->setShortcut(QKeySequence(Qt::NoModifier | Qt::Key_Escape, Qt::SHIFT | Qt::Key_X));
 	boxingStartAct->setStatusTip(tr("Insert start box attribute"));
 	connect(boxingStartAct, &QAction::triggered, [=]() { m_textWidget->setCharacter(0x0b); });
 	QAction *boxingEndAct = boxingSubMenu->addAction(tr("End box"));
@@ -667,7 +668,7 @@ void MainWindow::createActions()
 	connect(boxingEndAct, &QAction::triggered, [=]() { m_textWidget->setCharacter(0x0a); });
 
 	QAction *escSwitchAct = insertMenu->addAction(tr("ESC/switch"));
-	escSwitchAct->setShortcut(QKeySequence(Qt::Key_Escape, Qt::CTRL + Qt::Key_S));
+	escSwitchAct->setShortcut(QKeySequence(Qt::NoModifier | Qt::Key_Escape, Qt::CTRL | Qt::Key_S));
 	escSwitchAct->setStatusTip(tr("Insert ESC/switch character set attribute"));
 	connect(escSwitchAct, &QAction::triggered, [=]() { m_textWidget->setCharacter(0x1b); });
 
@@ -822,6 +823,8 @@ void MainWindow::createStatusBar()
 
 	m_insertModePushButton = new QPushButton("OVERWRITE");
 	m_insertModePushButton->setFlat(true);
+	m_insertModePushButton->setMinimumHeight(m_subPageLabel->height());
+	m_insertModePushButton->setMaximumHeight(m_subPageLabel->height());
 	m_insertModePushButton->setFocusProxy(m_textWidget);
 	statusBar()->addPermanentWidget(m_insertModePushButton);
 	connect(m_insertModePushButton, &QPushButton::clicked, this, &MainWindow::toggleInsertMode);
@@ -841,6 +844,7 @@ void MainWindow::createStatusBar()
 	connect(m_levelRadioButton[1], &QAbstractButton::clicked, [=]() { m_textWidget->pageDecode()->setLevel(1); m_textWidget->update(); m_paletteDockWidget->setLevel3p5Accepted(false);});
 	connect(m_levelRadioButton[2], &QAbstractButton::clicked, [=]() { m_textWidget->pageDecode()->setLevel(2); m_textWidget->update(); m_paletteDockWidget->setLevel3p5Accepted(false);});
 	connect(m_levelRadioButton[3], &QAbstractButton::clicked, [=]() { m_textWidget->pageDecode()->setLevel(3); m_textWidget->update(); m_paletteDockWidget->setLevel3p5Accepted(true);});
+
 	statusBar()->showMessage(tr("Ready"));
 }
 
@@ -1132,7 +1136,7 @@ void MainWindow::exportM29()
 	else {
 		exportFileName = QFileInfo(m_curFile).fileName();
 		// Suggest a new filename to avoid clobbering the original file
-		if (QRegExp(("^[Pp]?[1-8][0-9A-Fa-f][0-9A-Fa-f]")).indexIn(exportFileName) != -1) {
+		if (QRegularExpression(("^[Pp]?[1-8][0-9A-Fa-f][0-9A-Fa-f]")).match(exportFileName).hasMatch()) {
 			// Page number forms start of file name, change it to xFF
 			if (exportFileName.at(0) == 'P' || exportFileName.at(0) == 'p') {
 				exportFileName[2] = 'F';

mainwindow.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2023 Gavin MacGregor
+ * Copyright (C) 2020-2024 Gavin MacGregor
  *
  * This file is part of QTeletextMaker.
  *
@@ -61,7 +61,7 @@ private slots:
 	bool saveAs();
 	void reload();
 	void exportAuto();
-	void exportT42(bool);
+	void exportT42(bool fromAuto);
 	void exportZXNet();
 	void exportEditTF();
 	void exportPNG();
@@ -73,15 +73,15 @@ private slots:
 	void updatePageWidgets();
 	void updateCursorPosition();
 
-	void insertRow(bool);
+	void insertRow(bool copyRow);
 	void deleteRow();
-	void insertSubPage(bool, bool);
+	void insertSubPage(bool afterCurrentSubPage, bool copyCurrentSubPage);
 	void deleteSubPage();
 
 	void setSceneDimensions();
-	void setBorder(int);
+	void setBorder(int newViewBorder);
-	void setAspectRatio(int);
+	void setAspectRatio(int newViewAspectRatio);
-	void setSmoothTransform(bool);
+	void setSmoothTransform(bool smoothTransform);
 	void zoomIn();
 	void zoomOut();
 	void zoomReset();

pagebase.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2023 Gavin MacGregor
+ * Copyright (C) 2020-2024 Gavin MacGregor
  *
  * This file is part of QTeletextMaker.
  *

pagebase.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2023 Gavin MacGregor
+ * Copyright (C) 2020-2024 Gavin MacGregor
  *
  * This file is part of QTeletextMaker.
  *
@@ -35,17 +35,17 @@ public:
 
 	virtual bool isEmpty() const;
 
-	virtual QByteArray packet(int) const;
+	virtual QByteArray packet(int i) const;
-	virtual QByteArray packet(int, int) const;
+	virtual QByteArray packet(int i, int j) const;
 	virtual bool packetExists(int i) const { return m_displayPackets[i] != nullptr; }
 	virtual bool packetExists(int i, int j) const { return m_designationPackets[i-26][j] != nullptr; }
-	virtual bool setPacket(int, QByteArray);
+	virtual bool setPacket(int i, QByteArray packetContents);
-	virtual bool setPacket(int, int, QByteArray);
+	virtual bool setPacket(int i, int j, QByteArray packetContents);
 //	bool deletePacket(int);
 //	bool deletePacket(int, int);
 
 	virtual bool controlBit(int bitNumber) const { return m_controlBits[bitNumber]; }
-	virtual bool setControlBit(int, bool);
+	virtual bool setControlBit(int bitNumber, bool active);
 
 private:
 	bool m_controlBits[11];

pagecomposelinksdockwidget.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2023 Gavin MacGregor
+ * Copyright (C) 2020-2024 Gavin MacGregor
  *
  * This file is part of QTeletextMaker.
  *
@@ -24,7 +24,7 @@
 #include <QLineEdit>
 #include <QMap>
 #include <QPair>
-#include <QRegExpValidator>
+#include <QRegularExpressionValidator>
 #include <QString>
 
 #include "pagecomposelinksdockwidget.h"
@@ -61,7 +61,7 @@ PageComposeLinksDockWidget::PageComposeLinksDockWidget(TeletextWidget *parent):
 	level3p5OnlyLabel->setAlignment(Qt::AlignCenter);
 	x27Layout->addWidget(level3p5OnlyLabel, 6, 0, 1, 5);
 
-	m_pageNumberValidator = new QRegExpValidator(QRegExp("[1-8][0-9A-Fa-f][0-9A-Fa-f]"), this);
+	m_pageNumberValidator = new QRegularExpressionValidator(QRegularExpression("[1-8][0-9A-Fa-f][0-9A-Fa-f]"), this);
 
 	for (int i=0; i<8; i++) {
 		if (i < 4) {
@@ -124,7 +124,7 @@ void PageComposeLinksDockWidget::setComposeLinkSubPageNumbers(int linkNumber, co
 	if (!newSubPagesString.isEmpty()) {
 		// Turn user-entered comma separated subpages and subpage-ranges into bits
 		// First we do the "comma separated"
-		const QStringList items = newSubPagesString.split(QLatin1Char(','), QString::SkipEmptyParts);
+		const QStringList items = newSubPagesString.split(QLatin1Char(','), Qt::SkipEmptyParts);
 		// Now see if there's valid single numbers or ranges between the commas
 		for (const QString &item : items) {
 			if (item.isEmpty())

pagecomposelinksdockwidget.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2023 Gavin MacGregor
+ * Copyright (C) 2020-2024 Gavin MacGregor
  *
  * This file is part of QTeletextMaker.
  *
@@ -24,7 +24,7 @@
 #include <QComboBox>
 #include <QDockWidget>
 #include <QLineEdit>
-#include <QRegExpValidator>
+#include <QRegularExpressionValidator>
 #include <QString>
 
 #include "mainwidget.h"
@@ -38,15 +38,15 @@ public:
 	void updateWidgets();
 
 private:
-	void setComposeLinkPageNumber(int, const QString &);
+	void setComposeLinkPageNumber(int linkNumber, const QString &newPageNumberString);
-	void setComposeLinkSubPageNumbers(int, const QString &);
+	void setComposeLinkSubPageNumbers(int linkNumber, const QString &newSubPagesString);
 
 	TeletextWidget *m_parentMainWidget;
 	QCheckBox *m_composeLinkLevelCheckbox[4][2]; // For links 0-3
 	QComboBox *m_composeLinkFunctionComboBox[4]; // For links 4-7; remember to subtract 4!
 	QLineEdit *m_composeLinkPageNumberLineEdit[8], *m_composeLinkSubPageNumbersLineEdit[8];
 
-	QRegExpValidator *m_pageNumberValidator;
+	QRegularExpressionValidator *m_pageNumberValidator;
 };
 
 #endif

pageenhancementsdockwidget.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2023 Gavin MacGregor
+ * Copyright (C) 2020-2024 Gavin MacGregor
  *
  * This file is part of QTeletextMaker.
  *

pageenhancementsdockwidget.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2023 Gavin MacGregor
+ * Copyright (C) 2020-2024 Gavin MacGregor
  *
  * This file is part of QTeletextMaker.
  *
@@ -36,8 +36,8 @@ public:
 	void updateWidgets();
 
 private:
-	void setLeftSidePanelWidth(int);
+	void setLeftSidePanelWidth(int newLeftPanelSize);
-	void setRightSidePanelWidth(int);
+	void setRightSidePanelWidth(int newRightPanelSize);
 
 	TeletextWidget *m_parentMainWidget;
 	QComboBox *m_defaultScreenColourCombo, *m_defaultRowColourCombo, *m_colourTableCombo;

pageoptionsdockwidget.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2023 Gavin MacGregor
+ * Copyright (C) 2020-2024 Gavin MacGregor
  *
  * This file is part of QTeletextMaker.
  *
@@ -24,7 +24,7 @@
 #include <QHBoxLayout>
 #include <QLabel>
 #include <QLineEdit>
-#include <QRegExpValidator>
+#include <QRegularExpressionValidator>
 #include <QSpinBox>
 #include <QVBoxLayout>
 
@@ -41,7 +41,7 @@ PageOptionsDockWidget::PageOptionsDockWidget(TeletextWidget *parent): QDockWidge
 	this->setWindowTitle("Page options");
 
 	// Page number
-	m_pageNumberValidator = new QRegExpValidator(QRegExp("[1-8][0-9A-Fa-f][0-9A-Fa-f]"), this);
+	m_pageNumberValidator = new QRegularExpressionValidator(QRegularExpression("[1-8][0-9A-Fa-f][0-9A-Fa-f]"), this);
 
 	QHBoxLayout *pageNumberLayout = new QHBoxLayout;
 	pageNumberLayout->addWidget(new QLabel(tr("Page number")));
@@ -192,6 +192,9 @@ void PageOptionsDockWidget::updateWidgets()
 	m_defaultNOSCombo->setCurrentIndex(m_defaultNOSCombo->findData((m_parentMainWidget->document()->currentSubPage()->defaultCharSet() << 3) | m_parentMainWidget->document()->currentSubPage()->defaultNOS()));
 	m_defaultNOSCombo->blockSignals(false);
 	m_secondRegionCombo->blockSignals(true);
+	if (m_parentMainWidget->document()->currentSubPage()->secondCharSet() == 15)
+		m_secondRegionCombo->setCurrentIndex(0);
+	else
 		m_secondRegionCombo->setCurrentText(QString::number(m_parentMainWidget->document()->currentSubPage()->secondCharSet()));
 	m_secondRegionCombo->blockSignals(false);
 	m_secondNOSCombo->blockSignals(true);

pageoptionsdockwidget.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2023 Gavin MacGregor
+ * Copyright (C) 2020-2024 Gavin MacGregor
  *
  * This file is part of QTeletextMaker.
  *
@@ -24,7 +24,7 @@
 #include <QComboBox>
 #include <QDockWidget>
 #include <QLineEdit>
-#include <QRegExpValidator>
+#include <QRegularExpressionValidator>
 #include <QSpinBox>
 
 #include "mainwidget.h"
@@ -46,10 +46,10 @@ private:
 	QComboBox *m_defaultRegionCombo, *m_defaultNOSCombo, *m_secondRegionCombo, *m_secondNOSCombo;
 	QLineEdit *m_fastTextEdit[6];
 
-	QRegExpValidator *m_pageNumberValidator;
+	QRegularExpressionValidator *m_pageNumberValidator;
 
-	void addRegionList(QComboBox *);
+	void addRegionList(QComboBox *regionCombo);
-	void setFastTextLinkPageNumber(int, const QString &);
+	void setFastTextLinkPageNumber(int linkNumber, const QString &pageNumberString);
 	void setDefaultRegion();
 	void setDefaultNOS();
 	void setSecondRegion();

pagex26base.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2023 Gavin MacGregor
+ * Copyright (C) 2020-2024 Gavin MacGregor
  *
  * This file is part of QTeletextMaker.
  *

pagex26base.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2023 Gavin MacGregor
+ * Copyright (C) 2020-2024 Gavin MacGregor
  *
  * This file is part of QTeletextMaker.
  *
@@ -35,8 +35,8 @@ public:
 	virtual int maxEnhancements() const =0;
 
 protected:
-	QByteArray packetFromEnhancementList(int) const;
+	QByteArray packetFromEnhancementList(int packetNumber) const;
-	void setEnhancementListFromPacket(int, QByteArray);
+	void setEnhancementListFromPacket(int packetNumber, QByteArray packetContents);
 	bool packetFromEnhancementListNeeded(int n) const { return ((m_enhancements.size()+12) / 13) > n; };
 
 	X26TripletList m_enhancements;

palettedockwidget.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2023 Gavin MacGregor
+ * Copyright (C) 2020-2024 Gavin MacGregor
  *
  * This file is part of QTeletextMaker.
  *

palettedockwidget.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2023 Gavin MacGregor
+ * Copyright (C) 2020-2024 Gavin MacGregor
  *
  * This file is part of QTeletextMaker.
  *
@@ -35,19 +35,19 @@ public:
 	void updateAllColourButtons();
 
 public slots:
-	void updateColourButton(int);
+	void updateColourButton(int colourIndex);
-	void setLevel3p5Accepted(bool);
+	void setLevel3p5Accepted(bool b);
 
 protected:
-	void showEvent(QShowEvent *);
+	void showEvent(QShowEvent *event);
 
 private slots:
-	void selectColour(int);
+	void selectColour(int colourIndex);
-	void setLevel3p5Seen(bool);
+	void setLevel3p5Seen(bool b);
 	void updateLevel3p5Cursor();
 
 private:
-	void resetCLUT(int);
+	void resetCLUT(int colourTable);
 
 	QPushButton *m_colourButton[32], *m_resetButton[4];
 	QCheckBox *m_showHexValuesCheckBox;

render.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2023 Gavin MacGregor
+ * Copyright (C) 2020-2024 Gavin MacGregor
  *
  * This file is part of QTeletextMaker.
  *
@@ -18,6 +18,8 @@
  */
 
 #include <QBitmap>
+#include <QColor>
+#include <QImage>
 #include <QPainter>
 #include <QPixmap>
 
@@ -28,27 +30,31 @@
 int TeletextFontBitmap::s_instances = 0;
 
 QBitmap *TeletextFontBitmap::s_fontBitmap = nullptr;
+QImage *TeletextFontBitmap::s_fontImage = nullptr;
 
 TeletextFontBitmap::TeletextFontBitmap()
 {
-	if (s_instances == 0)
+	if (s_instances == 0) {
 		s_fontBitmap = new QBitmap(":/images/teletextfont.png");
+		s_fontImage = new QImage(s_fontBitmap->toImage());
+	}
 	s_instances++;
 }
 
 TeletextFontBitmap::~TeletextFontBitmap()
 {
 	s_instances--;
-	if (s_instances == 0)
+	if (s_instances == 0) {
+		delete s_fontImage;
 		delete s_fontBitmap;
 	}
+}
 
 
 TeletextPageRender::TeletextPageRender()
 {
 	for (int i=0; i<6; i++)
-		m_pagePixmap[i] = new QPixmap(864, 250);
+		m_pageImage[i] = new QImage(864, 250, QImage::Format_ARGB32_Premultiplied);
-	m_pagePixmap[0]->fill(Qt::transparent);
 
 	m_reveal = false;
 	m_mix = false;
@@ -65,7 +71,7 @@ TeletextPageRender::TeletextPageRender()
 TeletextPageRender::~TeletextPageRender()
 {
 	for (int i=0; i<6; i++)
-		delete m_pagePixmap[i];
+		delete m_pageImage[i];
 }
 
 void TeletextPageRender::setDecoder(TeletextPageDecode *decoder)
@@ -73,180 +79,146 @@ void TeletextPageRender::setDecoder(TeletextPageDecode *decoder)
 	m_decoder = decoder;
 }
 
-inline void TeletextPageRender::drawFromBitmap(QPainter &pixmapPainter, int r, int c, const QBitmap bitmap, TeletextPageDecode::CharacterFragment characterFragment)
+inline void TeletextPageRender::drawFromBitmap(QPainter &painter, int r, int c, const QImage image, TeletextPageDecode::CharacterFragment characterFragment)
 {
 	switch (characterFragment) {
 		case TeletextPageDecode::NormalSize:
-			pixmapPainter.drawPixmap(c*12, r*10, bitmap);
+			painter.drawImage(c*12, r*10, image);
 			break;
 		case TeletextPageDecode::DoubleHeightTopHalf:
-			pixmapPainter.drawPixmap(c*12, r*10, 12, 10, bitmap, 0, 0, 12, 5);
+			painter.drawImage(QRect(c*12, r*10, 12, 10), image, QRect(0, 0, 12, 5));
 			break;
 		case TeletextPageDecode::DoubleHeightBottomHalf:
-			pixmapPainter.drawPixmap(c*12, r*10, 12, 10, bitmap, 0, 5, 12, 5);
+			painter.drawImage(QRect(c*12, r*10, 12, 10), image, QRect(0, 5, 12, 5));
 			break;
 		case TeletextPageDecode::DoubleWidthLeftHalf:
-			pixmapPainter.drawPixmap(c*12, r*10, 12, 10, bitmap, 0, 0, 6, 10);
+			painter.drawImage(QRect(c*12, r*10, 12, 10), image, QRect(0, 0, 6, 10));
 			break;
 		case TeletextPageDecode::DoubleWidthRightHalf:
-			pixmapPainter.drawPixmap(c*12, r*10, 12, 10, bitmap, 6, 0, 6, 10);
+			painter.drawImage(QRect(c*12, r*10, 12, 10), image, QRect(6, 0, 6, 10));
 			break;
 		case TeletextPageDecode::DoubleSizeTopLeftQuarter:
-			pixmapPainter.drawPixmap(c*12, r*10, 12, 10, bitmap, 0, 0, 6, 5);
+			painter.drawImage(QRect(c*12, r*10, 12, 10), image, QRect(0, 0, 6, 5));
 			break;
 		case TeletextPageDecode::DoubleSizeTopRightQuarter:
-			pixmapPainter.drawPixmap(c*12, r*10, 12, 10, bitmap, 6, 0, 6, 5);
+			painter.drawImage(QRect(c*12, r*10, 12, 10), image, QRect(6, 0, 6, 5));
 			break;
 		case TeletextPageDecode::DoubleSizeBottomLeftQuarter:
-			pixmapPainter.drawPixmap(c*12, r*10, 12, 10, bitmap, 0, 5, 6, 5);
+			painter.drawImage(QRect(c*12, r*10, 12, 10), image, QRect(0, 5, 6, 5));
 			break;
 		case TeletextPageDecode::DoubleSizeBottomRightQuarter:
-			pixmapPainter.drawPixmap(c*12, r*10, 12, 10, bitmap, 6, 5, 6, 5);
+			painter.drawImage(QRect(c*12, r*10, 12, 10), image, QRect(6, 5, 6, 5));
 			break;
 	}
 }
 
-inline void TeletextPageRender::drawFromFontBitmap(QPainter &pixmapPainter, int r, int c, unsigned char characterCode, int characterSet, TeletextPageDecode::CharacterFragment characterFragment)
+inline void TeletextPageRender::drawFromFontBitmap(QPainter &painter, int r, int c, unsigned char characterCode, int characterSet, TeletextPageDecode::CharacterFragment characterFragment)
 {
 	switch (characterFragment) {
 		case TeletextPageDecode::NormalSize:
-			pixmapPainter.drawPixmap(c*12, r*10, *m_fontBitmap.rawBitmap(), (characterCode-32)*12, characterSet*10, 12, 10);
+			painter.drawImage(c*12, r*10, *m_fontBitmap.image(), (characterCode-32)*12, characterSet*10, 12, 10);
 			break;
 		case TeletextPageDecode::DoubleHeightTopHalf:
-			pixmapPainter.drawPixmap(c*12, r*10, 12, 10, *m_fontBitmap.rawBitmap(), (characterCode-32)*12, characterSet*10, 12, 5);
+			painter.drawImage(QRect(c*12, r*10, 12, 10), *m_fontBitmap.image(), QRect((characterCode-32)*12, characterSet*10, 12, 5));
 			break;
 		case TeletextPageDecode::DoubleHeightBottomHalf:
-			pixmapPainter.drawPixmap(c*12, r*10, 12, 10, *m_fontBitmap.rawBitmap(), (characterCode-32)*12, characterSet*10+5, 12, 5);
+			painter.drawImage(QRect(c*12, r*10, 12, 10), *m_fontBitmap.image(), QRect((characterCode-32)*12, characterSet*10+5, 12, 5));
 			break;
 		case TeletextPageDecode::DoubleWidthLeftHalf:
-			pixmapPainter.drawPixmap(c*12, r*10, 12, 10, *m_fontBitmap.rawBitmap(), (characterCode-32)*12, characterSet*10, 6, 10);
+			painter.drawImage(QRect(c*12, r*10, 12, 10), *m_fontBitmap.image(), QRect((characterCode-32)*12, characterSet*10, 6, 10));
 			break;
 		case TeletextPageDecode::DoubleWidthRightHalf:
-			pixmapPainter.drawPixmap(c*12, r*10, 12, 10, *m_fontBitmap.rawBitmap(), (characterCode-32)*12+6, characterSet*10, 6, 10);
+			painter.drawImage(QRect(c*12, r*10, 12, 10), *m_fontBitmap.image(), QRect((characterCode-32)*12+6, characterSet*10, 6, 10));
 			break;
 		case TeletextPageDecode::DoubleSizeTopLeftQuarter:
-			pixmapPainter.drawPixmap(c*12, r*10, 12, 10, *m_fontBitmap.rawBitmap(), (characterCode-32)*12, characterSet*10, 6, 5);
+			painter.drawImage(QRect(c*12, r*10, 12, 10), *m_fontBitmap.image(), QRect((characterCode-32)*12, characterSet*10, 6, 5));
 			break;
 		case TeletextPageDecode::DoubleSizeTopRightQuarter:
-			pixmapPainter.drawPixmap(c*12, r*10, 12, 10, *m_fontBitmap.rawBitmap(), (characterCode-32)*12+6, characterSet*10, 6, 5);
+			painter.drawImage(QRect(c*12, r*10, 12, 10), *m_fontBitmap.image(), QRect((characterCode-32)*12+6, characterSet*10, 6, 5));
 			break;
 		case TeletextPageDecode::DoubleSizeBottomLeftQuarter:
-			pixmapPainter.drawPixmap(c*12, r*10, 12, 10, *m_fontBitmap.rawBitmap(), (characterCode-32)*12, characterSet*10+5, 6, 5);
+			painter.drawImage(QRect(c*12, r*10, 12, 10), *m_fontBitmap.image(), QRect((characterCode-32)*12, characterSet*10+5, 6, 5));
 			break;
 		case TeletextPageDecode::DoubleSizeBottomRightQuarter:
-			pixmapPainter.drawPixmap(c*12, r*10, 12, 10, *m_fontBitmap.rawBitmap(), (characterCode-32)*12+6, characterSet*10+5, 6, 5);
+			painter.drawImage(QRect(c*12, r*10, 12, 10), *m_fontBitmap.image(), QRect((characterCode-32)*12+6, characterSet*10+5, 6, 5));
 			break;
 	}
 }
 
-inline void TeletextPageRender::drawCharacter(QPainter &pixmapPainter, int r, int c, unsigned char characterCode, int characterSet, int characterDiacritical, TeletextPageDecode::CharacterFragment characterFragment)
+inline void TeletextPageRender::drawCharacter(QPainter &painter, int r, int c, unsigned char characterCode, int characterSet, int characterDiacritical, TeletextPageDecode::CharacterFragment characterFragment)
 {
 	const bool dontUnderline = characterCode == 0x00;
 	if (dontUnderline)
 		characterCode = 0x20;
 
-	// If either foreground or background is set to transparent
-	// tinker with the QPainter settings so we get the desired result
-	if (!pixmapPainter.background().isOpaque()) {
-		if (pixmapPainter.pen().color().alpha() == 0) {
-			// Transparent foreground and background
-			pixmapPainter.setCompositionMode(QPainter::CompositionMode_Clear);
-			pixmapPainter.eraseRect(c*12, r*10, 12, 10);
-			pixmapPainter.setCompositionMode(QPainter::CompositionMode_SourceOver);
-
-			return;
-		} else
-			// Transparent background, opaque foreground
-			pixmapPainter.setCompositionMode(QPainter::CompositionMode_Source);
-	} else if (pixmapPainter.pen().color().alpha() == 0) {
-		// Transparent foreground, opaque background
-		// Deal with optimising G1 solid 7/F blocks and spaces now
-		// otherwise the same optimisations later on won't work with
-		// our tinkered QPainter settings
-		if (characterCode == 0x7f && characterSet == 24) {
-			pixmapPainter.setCompositionMode(QPainter::CompositionMode_Clear);
-			pixmapPainter.eraseRect(c*12, r*10, 12, 10);
-			pixmapPainter.setCompositionMode(QPainter::CompositionMode_SourceOver);
-
-			return;
-		}
-
-		pixmapPainter.fillRect(c*12, r*10, 12, 10, m_decoder->cellBackgroundQColor(r, c));
-
 	if (characterCode == 0x20 && characterSet < 25 && characterDiacritical == 0)
-			return;
+		painter.fillRect(c*12, r*10, 12, 10, m_backgroundQColor);
-
-		pixmapPainter.setBackground(QColor(0, 0, 0, 0));
-		pixmapPainter.setPen(QColor(255, 255, 255, 255));
-		pixmapPainter.setCompositionMode(QPainter::CompositionMode_DestinationOut);
-	}
-
-	if (characterCode == 0x20 && characterSet < 25 && characterDiacritical == 0)
-		pixmapPainter.fillRect(c*12, r*10, 12, 10, pixmapPainter.background().color());
 	else if (characterCode == 0x7f && characterSet == 24)
-		pixmapPainter.fillRect(c*12, r*10, 12, 10, pixmapPainter.pen().color());
+		painter.fillRect(c*12, r*10, 12, 10, m_foregroundQColor);
 	else if ((m_decoder->cellBold(r, c) || m_decoder->cellItalic(r, c)) && characterSet < 24)
-		drawBoldOrItalicCharacter(pixmapPainter, r, c, characterCode, characterSet, characterFragment);
+		drawBoldOrItalicCharacter(painter, r, c, characterCode, characterSet, characterFragment);
-	else
+	else {
-		drawFromFontBitmap(pixmapPainter, r, c, characterCode, characterSet, characterFragment);
+		m_fontBitmap.image()->setColorTable(QVector<QRgb>{m_backgroundQColor.rgba(), m_foregroundQColor.rgba()});
+		drawFromFontBitmap(painter, r, c, characterCode, characterSet, characterFragment);
+	}
 
-	if (m_decoder->cellUnderlined(r, c) && !dontUnderline)
+	if (m_decoder->cellUnderlined(r, c) && !dontUnderline) {
+		painter.setPen(m_foregroundQColor);
 		switch (characterFragment) {
 			case TeletextPageDecode::NormalSize:
 			case TeletextPageDecode::DoubleWidthLeftHalf:
 			case TeletextPageDecode::DoubleWidthRightHalf:
-				pixmapPainter.drawLine(c*12, r*10+9, c*12+11, r*10+9);
+				painter.drawLine(c*12, r*10+9, c*12+11, r*10+9);
 				break;
 			case TeletextPageDecode::DoubleHeightBottomHalf:
 			case TeletextPageDecode::DoubleSizeBottomLeftQuarter:
 			case TeletextPageDecode::DoubleSizeBottomRightQuarter:
-				pixmapPainter.drawRect(c*12, r*10+8, 11, 1);
+				painter.drawRect(c*12, r*10+8, 11, 1);
 				break;
 			default:
 				break;
 		}
+	}
 
 	if (characterDiacritical != 0) {
-		pixmapPainter.setCompositionMode(QPainter::CompositionMode_SourceOver);
+		painter.setCompositionMode(QPainter::CompositionMode_SourceOver);
-		pixmapPainter.setBackgroundMode(Qt::TransparentMode);
+		m_fontBitmap.image()->setColorTable(QVector<QRgb>{0x00000000, m_foregroundQColor.rgba()});
-		drawFromFontBitmap(pixmapPainter, r, c, characterDiacritical+64, 7, characterFragment);
+		drawFromFontBitmap(painter, r, c, characterDiacritical+64, 7, characterFragment);
-		pixmapPainter.setBackgroundMode(Qt::OpaqueMode);
+		painter.setCompositionMode(QPainter::CompositionMode_Source);
+	}
 }
 
-	if (pixmapPainter.compositionMode() != QPainter::CompositionMode_SourceOver)
+inline void TeletextPageRender::drawBoldOrItalicCharacter(QPainter &painter, int r, int c, unsigned char characterCode, int characterSet, TeletextPageDecode::CharacterFragment characterFragment)
-		pixmapPainter.setCompositionMode(QPainter::CompositionMode_SourceOver);
-}
-
-inline void TeletextPageRender::drawBoldOrItalicCharacter(QPainter &pixmapPainter, int r, int c, unsigned char characterCode, int characterSet, TeletextPageDecode::CharacterFragment characterFragment)
 {
-	QBitmap bitmap = QBitmap(12, 10);
+	QImage styledImage = QImage(12, 10, QImage::Format_Mono);
-	QPainter bitmapPainter;
+	QPainter styledPainter;
+
+	m_fontBitmap.image()->setColorTable(QVector<QRgb>{m_backgroundQColor.rgba(), m_foregroundQColor.rgba()});
+	styledImage.setColorTable(QVector<QRgb>{m_backgroundQColor.rgba(), m_foregroundQColor.rgba()});
 
-	// TODO italic glyph-making is VERY slow!
 	if (m_decoder->cellItalic(r, c)) {
-		bitmap.clear();
+		styledImage.fill(0);
 
-		bitmapPainter.begin(&bitmap);
+		styledPainter.begin(&styledImage);
-		bitmapPainter.setBackgroundMode(Qt::OpaqueMode);
+		styledPainter.setCompositionMode(QPainter::CompositionMode_Source);
-		bitmapPainter.drawPixmap(1, 0, *m_fontBitmap.rawBitmap(), (characterCode-32)*12, characterSet*10, 11, 3);
+		styledPainter.drawImage(1, 0, *m_fontBitmap.image(), (characterCode-32)*12, characterSet*10, 11, 3);
-		bitmapPainter.drawPixmap(0, 3, *m_fontBitmap.rawBitmap(), (characterCode-32)*12, characterSet*10+3, 12, 3);
+		styledPainter.drawImage(0, 3, *m_fontBitmap.image(), (characterCode-32)*12, characterSet*10+3, 12, 3);
-		bitmapPainter.drawPixmap(0, 6, *m_fontBitmap.rawBitmap(), (characterCode-32)*12+1, characterSet*10+6, 11, 4);
+		styledPainter.drawImage(0, 6, *m_fontBitmap.image(), (characterCode-32)*12+1, characterSet*10+6, 11, 4);
-		bitmapPainter.end();
+		styledPainter.end();
 	} else
-		bitmap = m_fontBitmap.rawBitmap()->copy((characterCode-32)*12, characterSet*10, 12, 10);
+		styledImage = m_fontBitmap.image()->copy((characterCode-32)*12, characterSet*10, 12, 10);
 
 	if (m_decoder->cellBold(r, c)) {
-		QBitmap boldeningBitmap;
+		QImage boldeningImage;
 
-		boldeningBitmap = bitmap.copy();
+		boldeningImage = styledImage.copy();
-		bitmapPainter.begin(&bitmap);
+		styledPainter.begin(&styledImage);
-		// No idea why we need this setPen workaround when character is made italic first?!
+		styledPainter.setCompositionMode(QPainter::CompositionMode_SourceOver);
-		if (!m_decoder->cellItalic(r, c))
+		boldeningImage.setColorTable(QVector<QRgb>{0x00000000, m_foregroundQColor.rgba()});
-			bitmapPainter.setPen(Qt::color0);
+		styledPainter.drawImage(1, 0, boldeningImage);
-		bitmapPainter.drawPixmap(1, 0, boldeningBitmap);
+		styledPainter.end();
-		bitmapPainter.end();
 	}
-	drawFromBitmap(pixmapPainter, r, c, bitmap, characterFragment);
+	drawFromBitmap(painter, r, c, styledImage, characterFragment);
 }
 
 void TeletextPageRender::renderPage(bool force)
@@ -257,12 +229,12 @@ void TeletextPageRender::renderPage(bool force)
 
 void TeletextPageRender::renderRow(int r, int ph, bool force)
 {
-	QPainter pixmapPainter;
+	QPainter painter;
 	int flashingRow = 0;
 	bool rowRefreshed = false;
 
-	pixmapPainter.begin(m_pagePixmap[ph]);
+	painter.begin(m_pageImage[ph]);
-	pixmapPainter.setBackgroundMode(Qt::OpaqueMode);
+	painter.setCompositionMode(QPainter::CompositionMode_Source);
 
 	for (int c=0; c<72; c++) {
 		bool controlCodeChanged = false;
@@ -304,7 +276,7 @@ void TeletextPageRender::renderRow(int r, int ph, bool force)
 			}
 
 			if (m_decoder->cellFlashMode(r, c) == 0)
-				pixmapPainter.setPen(m_decoder->cellForegroundQColor(r, c));
+				m_foregroundQColor = m_decoder->cellForegroundQColor(r, c);
 			else {
 				// Flashing cell, decide if phase in this cycle is on or off
 				bool phaseOn;
@@ -316,9 +288,9 @@ void TeletextPageRender::renderRow(int r, int ph, bool force)
 
 				// If flashing to adjacent CLUT select the appropriate foreground colour
 				if (m_decoder->cellFlashMode(r, c) == 3 && !phaseOn)
-					pixmapPainter.setPen(m_decoder->cellFlashForegroundQColor(r, c));
+					m_foregroundQColor = m_decoder->cellFlashForegroundQColor(r, c);
 				else
-					pixmapPainter.setPen(m_decoder->cellForegroundQColor(r, c));
+					m_foregroundQColor = m_decoder->cellForegroundQColor(r, c);
 
 				// If flashing mode is Normal or Invert, draw a space instead of a character on phase
 				if ((m_decoder->cellFlashMode(r, c) == 1 || m_decoder->cellFlashMode(r, c) == 2) && !phaseOn) {
@@ -330,21 +302,22 @@ void TeletextPageRender::renderRow(int r, int ph, bool force)
 			}
 
 			if (!m_mix || m_decoder->cellBoxed(r, c))
-				pixmapPainter.setBackground(m_decoder->cellBackgroundQColor(r, c));
+				m_backgroundQColor = m_decoder->cellBackgroundQColor(r, c);
 			else
-				pixmapPainter.setBackground(Qt::transparent);
+				m_backgroundQColor = Qt::transparent;
 
-			drawCharacter(pixmapPainter, r, c, characterCode, characterSet, characterDiacritical, m_decoder->cellCharacterFragment(r, c));
+			drawCharacter(painter, r, c, characterCode, characterSet, characterDiacritical, m_decoder->cellCharacterFragment(r, c));
 
 			if (m_showControlCodes && c < 40 && m_decoder->teletextPage()->character(r, c) < 0x20) {
-				pixmapPainter.setBackground(QColor(0, 0, 0, 128));
+				painter.setCompositionMode(QPainter::CompositionMode_SourceOver);
-				pixmapPainter.setPen(QColor(255, 255, 255, 224));
+				m_fontBitmap.image()->setColorTable(QVector<QRgb>{0x7f000000, 0xe0ffffff});
-				pixmapPainter.drawPixmap(c*12, r*10, *m_fontBitmap.rawBitmap(), (m_decoder->teletextPage()->character(r, c)+32)*12, 250, 12, 10);
+				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);
 			}
 		}
 	}
 
-	pixmapPainter.end();
+	painter.end();
 
 	if (ph != 0)
 		return;
@@ -361,30 +334,30 @@ void TeletextPageRender::renderRow(int r, int ph, bool force)
 	// copy this rendered line into the other flash pixmap buffers and then re-render
 	// the flashing cells in those buffers
 	if (rowRefreshed && m_flashBuffersHz > 0) {
-		pixmapPainter.begin(m_pagePixmap[3]);
+		painter.begin(m_pageImage[3]);
-		pixmapPainter.setCompositionMode(QPainter::CompositionMode_Source);
+		painter.setCompositionMode(QPainter::CompositionMode_Source);
-		pixmapPainter.drawPixmap(0, r*10, *m_pagePixmap[0], 0, r*10, 864, 10);
+		painter.drawImage(0, r*10, *m_pageImage[0], 0, r*10, 864, 10);
-		pixmapPainter.end();
+		painter.end();
 
 		renderRow(r, 3);
 
 		if (m_flashBuffersHz == 2) {
-			pixmapPainter.begin(m_pagePixmap[1]);
+			painter.begin(m_pageImage[1]);
-			pixmapPainter.setCompositionMode(QPainter::CompositionMode_Source);
+			painter.setCompositionMode(QPainter::CompositionMode_Source);
-			pixmapPainter.drawPixmap(0, r*10, *m_pagePixmap[0], 0, r*10, 864, 10);
+			painter.drawImage(0, r*10, *m_pageImage[0], 0, r*10, 864, 10);
-			pixmapPainter.end();
+			painter.end();
-			pixmapPainter.begin(m_pagePixmap[2]);
+			painter.begin(m_pageImage[2]);
-			pixmapPainter.setCompositionMode(QPainter::CompositionMode_Source);
+			painter.setCompositionMode(QPainter::CompositionMode_Source);
-			pixmapPainter.drawPixmap(0, r*10, *m_pagePixmap[0], 0, r*10, 864, 10);
+			painter.drawImage(0, r*10, *m_pageImage[0], 0, r*10, 864, 10);
-			pixmapPainter.end();
+			painter.end();
-			pixmapPainter.begin(m_pagePixmap[4]);
+			painter.begin(m_pageImage[4]);
-			pixmapPainter.setCompositionMode(QPainter::CompositionMode_Source);
+			painter.setCompositionMode(QPainter::CompositionMode_Source);
-			pixmapPainter.drawPixmap(0, r*10, *m_pagePixmap[3], 0, r*10, 864, 10);
+			painter.drawImage(0, r*10, *m_pageImage[3], 0, r*10, 864, 10);
-			pixmapPainter.end();
+			painter.end();
-			pixmapPainter.begin(m_pagePixmap[5]);
+			painter.begin(m_pageImage[5]);
-			pixmapPainter.setCompositionMode(QPainter::CompositionMode_Source);
+			painter.setCompositionMode(QPainter::CompositionMode_Source);
-			pixmapPainter.drawPixmap(0, r*10, *m_pagePixmap[3], 0, r*10, 864, 10);
+			painter.drawImage(0, r*10, *m_pageImage[3], 0, r*10, 864, 10);
-			pixmapPainter.end();
+			painter.end();
 
 			renderRow(r, 1);
 			renderRow(r, 2);
@@ -427,12 +400,12 @@ void TeletextPageRender::setRowFlashStatus(int r, int rowFlashHz)
 	// If we get here, new flash Hz for this row is higher than the entire flash Hz
 	// so prepare the pixmap flash buffers
 	if (m_flashBuffersHz == 0)
-		*m_pagePixmap[3] = m_pagePixmap[0]->copy();
+		*m_pageImage[3] = m_pageImage[0]->copy();
 	if (rowFlashHz == 2) {
-		*m_pagePixmap[1] = m_pagePixmap[0]->copy();
+		*m_pageImage[1] = m_pageImage[0]->copy();
-		*m_pagePixmap[2] = m_pagePixmap[0]->copy();
+		*m_pageImage[2] = m_pageImage[0]->copy();
-		*m_pagePixmap[4] = m_pagePixmap[3]->copy();
+		*m_pageImage[4] = m_pageImage[3]->copy();
-		*m_pagePixmap[5] = m_pagePixmap[3]->copy();
+		*m_pageImage[5] = m_pageImage[3]->copy();
 	}
 
 	m_flashBuffersHz = rowFlashHz;

render.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2023 Gavin MacGregor
+ * Copyright (C) 2020-2024 Gavin MacGregor
  *
  * This file is part of QTeletextMaker.
  *
@@ -21,6 +21,8 @@
 #define RENDER_H
 
 #include <QBitmap>
+#include <QColor>
+#include <QImage>
 #include <QPixmap>
 
 #include "decode.h"
@@ -32,10 +34,12 @@ public:
 	~TeletextFontBitmap();
 
 	QBitmap *rawBitmap() const { return s_fontBitmap; }
+	QImage *image() const { return s_fontImage; }
 
 private:
 	static int s_instances;
 	static QBitmap* s_fontBitmap;
+	static QImage* s_fontImage;
 };
 
 class TeletextPageRender : public QObject
@@ -46,37 +50,38 @@ public:
 	TeletextPageRender();
 	~TeletextPageRender();
 
-	QPixmap* pagePixmap(int i) const { return m_pagePixmap[i]; };
+	QImage* image(int i) const { return m_pageImage[i]; };
 	bool mix() const { return m_mix; };
-	void setDecoder(TeletextPageDecode *);
+	void setDecoder(TeletextPageDecode *decoder);
 	void renderPage(bool force=false);
 	bool showControlCodes() const { return m_showControlCodes; };
 
 public slots:
-	void colourChanged(int);
+	void colourChanged(int index);
-	void setReveal(bool);
+	void setReveal(bool reveal);
-	void setMix(bool);
+	void setMix(bool mix);
-	void setShowControlCodes(bool);
+	void setShowControlCodes(bool showControlCodes);
 
 signals:
-	void flashChanged(int);
+	void flashChanged(int newFlashHz);
 
 protected:
 	TeletextFontBitmap m_fontBitmap;
-	QPixmap* m_pagePixmap[6];
+	QImage* m_pageImage[6];
 	unsigned char m_controlCodeCache[25][40];
 	bool m_reveal, m_mix, m_showControlCodes;
 	int m_flashBuffersHz;
 	int m_flashingRow[25];
 
 private:
-	inline void drawFromBitmap(QPainter &, int, int, const QBitmap, TeletextPageDecode::CharacterFragment);
+	inline void drawFromBitmap(QPainter &, int, int, const QImage, TeletextPageDecode::CharacterFragment);
-	inline void drawFromFontBitmap(QPainter &, int, int, unsigned char, int, TeletextPageDecode::CharacterFragment);
+	inline void drawFromFontBitmap(QPainter &painter, int r, int c, unsigned char characterCode, int characterSet, TeletextPageDecode::CharacterFragment characterFragment);
-	inline void drawCharacter(QPainter &, int, int, unsigned char, int, int, TeletextPageDecode::CharacterFragment);
+	inline void drawCharacter(QPainter &painter, int r, int c, unsigned char characterCode, int characterSet, int characterDiacritical, TeletextPageDecode::CharacterFragment characterFragment);
-	inline void drawBoldOrItalicCharacter(QPainter &, int, int, unsigned char, int, TeletextPageDecode::CharacterFragment);
+	inline void drawBoldOrItalicCharacter(QPainter &painter, int r, int c, unsigned char characterCode, int characterSet, TeletextPageDecode::CharacterFragment characterFragment);
-	void renderRow(int, int, bool force=false);
+	void renderRow(int r, int ph, bool force=false);
-	void setRowFlashStatus(int, int);
+	void setRowFlashStatus(int r, int rowFlashHz);
 
+	QColor m_foregroundQColor, m_backgroundQColor;
 	TeletextPageDecode *m_decoder;
 };
 

x26commands.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2023 Gavin MacGregor
+ * Copyright (C) 2020-2024 Gavin MacGregor
  *
  * This file is part of QTeletextMaker.
  *
@@ -68,7 +68,7 @@ void InsertTripletCommand::redo()
 	if (changingSubPage)
 		m_teletextDocument->emit subPageSelected();
 	else
-		m_teletextDocument->emit refreshNeeded();
+		m_teletextDocument->emit contentsChanged();
 
 	if (m_firstDo)
 		m_firstDo = false;
@@ -107,7 +107,7 @@ void InsertTripletCommand::undo()
 	if (changingSubPage)
 		m_teletextDocument->emit subPageSelected();
 	else
-		m_teletextDocument->emit refreshNeeded();
+		m_teletextDocument->emit contentsChanged();
 }
 
 
@@ -155,7 +155,7 @@ void DeleteTripletCommand::redo()
 	if (changingSubPage)
 		m_teletextDocument->emit subPageSelected();
 	else
-		m_teletextDocument->emit refreshNeeded();
+		m_teletextDocument->emit contentsChanged();
 }
 
 void DeleteTripletCommand::undo()
@@ -189,7 +189,7 @@ void DeleteTripletCommand::undo()
 	if (changingSubPage)
 		m_teletextDocument->emit subPageSelected();
 	else
-		m_teletextDocument->emit refreshNeeded();
+		m_teletextDocument->emit contentsChanged();
 
 	m_teletextDocument->emit tripletCommandHighlight(m_row);
 }
@@ -225,7 +225,7 @@ void EditTripletCommand::redo()
 
 	m_teletextDocument->currentSubPage()->enhancements()->replace(m_row, m_newTriplet);
 	m_x26Model->emit dataChanged(m_x26Model->createIndex(m_row, 0), m_x26Model->createIndex(m_row, 3), {m_role});
-	m_teletextDocument->emit refreshNeeded();
+	m_teletextDocument->emit contentsChanged();
 
 	if (m_firstDo)
 		m_firstDo = false;
@@ -240,7 +240,7 @@ void EditTripletCommand::undo()
 
 	m_teletextDocument->currentSubPage()->enhancements()->replace(m_row, m_oldTriplet);
 	m_x26Model->emit dataChanged(m_x26Model->createIndex(m_row, 0), m_x26Model->createIndex(m_row, 3), {m_role});
-	m_teletextDocument->emit refreshNeeded();
+	m_teletextDocument->emit contentsChanged();
 	m_teletextDocument->emit tripletCommandHighlight(m_row);
 }
 

x26commands.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2023 Gavin MacGregor
+ * Copyright (C) 2020-2024 Gavin MacGregor
  *
  * This file is part of QTeletextMaker.
  *
@@ -29,7 +29,7 @@
 class InsertTripletCommand : public QUndoCommand
 {
 public:
-	InsertTripletCommand(TeletextDocument *, X26Model *, int, int, const X26Triplet, QUndoCommand *parent = 0);
+	InsertTripletCommand(TeletextDocument *teletextDocument, X26Model *x26Model, int row, int count, const X26Triplet newTriplet, QUndoCommand *parent = 0);
 
 	void redo() override;
 	void undo() override;
@@ -45,7 +45,7 @@ private:
 class DeleteTripletCommand : public QUndoCommand
 {
 public:
-	DeleteTripletCommand(TeletextDocument *, X26Model *, int, int, QUndoCommand *parent = 0);
+	DeleteTripletCommand(TeletextDocument *teletextDocument, X26Model *x26Model, int row, int count, QUndoCommand *parent = 0);
 
 	void redo() override;
 	void undo() override;
@@ -63,7 +63,7 @@ public:
 	enum { Id = 201 };
 	enum EditTripletEnum { ETaddress, ETmode, ETdata };
 
-	EditTripletCommand(TeletextDocument *, X26Model *, int, int, int, int, int, QUndoCommand *parent = 0);
+	EditTripletCommand(TeletextDocument *teletextDocument, X26Model *x26Model, int row, int tripletPart, int bitsToKeep, int newValue, int role, QUndoCommand *parent = 0);
 
 	void redo() override;
 	void undo() override;

x26dockwidget.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2023 Gavin MacGregor
+ * Copyright (C) 2020-2024 Gavin MacGregor
  *
  * This file is part of QTeletextMaker.
  *
@@ -748,7 +748,23 @@ void X26DockWidget::updateAllCookedTripletWidgets(const QModelIndex &index)
 		case 0x22: // G3 character at Level 1.5
 		case 0x29: // G0 character
 		case 0x2b: // G3 character at Level 2.5
-		case 0x2f ... 0x3f: // G2 character, G0 character with diacritical
+		case 0x2f: // G2 character
+		case 0x30:
+		case 0x31:
+		case 0x32:
+		case 0x33:
+		case 0x34:
+		case 0x35:
+		case 0x36:
+		case 0x37:
+		case 0x38:
+		case 0x39:
+		case 0x3a:
+		case 0x3b:
+		case 0x3c:
+		case 0x3d:
+		case 0x3e:
+		case 0x3f: // G0 character with diacritical
 			m_characterCodeComboBox->blockSignals(true);
 			if (modeExt == 0x21)
 				m_characterListModel.setCharacterSet(24);
@@ -788,8 +804,12 @@ void X26DockWidget::updateAllCookedTripletWidgets(const QModelIndex &index)
 			m_displayAttributeUnderlineCheckBox->blockSignals(false);
 			m_tripletParameterStackedLayout->setCurrentIndex(4);
 			break;
-		case 0x11 ... 0x13: // Invoke object
+		case 0x11: // Invoke Active Object
-		case 0x15 ... 0x17: // Define object
+		case 0x12: // Invoke Adaptive Object
+		case 0x13: // Invoke Passive Object
+		case 0x15: // Define Active Object
+		case 0x16: // Define Adaptive Object
+		case 0x17: // Define Passive Object
 			if (index.model()->data(index.model()->index(index.row(), 1), Qt::UserRole).toInt() & 0x04) {
 				// Define object
 				m_objectSourceComboBox->setVisible(false);

x26dockwidget.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2023 Gavin MacGregor
+ * Copyright (C) 2020-2024 Gavin MacGregor
  *
  * This file is part of QTeletextMaker.
  *
@@ -46,7 +46,7 @@ public:
 
 	int rowCount(const QModelIndex &parent = QModelIndex()) const override;
 	QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
-	void setCharacterSet(int);
+	void setCharacterSet(int characterSet);
 
 private:
 	TeletextFontBitmap m_fontBitmap;
@@ -61,24 +61,24 @@ public:
 	X26DockWidget(TeletextWidget *parent);
 
 public slots:
-	void insertTriplet(int, bool);
+	void insertTriplet(int modeExt, bool after);
 	void insertTripletCopy();
 	void deleteTriplet();
 	void customMenuRequested(QPoint pos);
 	void loadX26List();
 	void unloadX26List();
-	void rowSelected(const QModelIndex &, const QModelIndex &);
+	void rowSelected(const QModelIndex &current, const QModelIndex &previous);
-	void updateAllRawTripletSpinBoxes(const QModelIndex &);
+	void updateAllRawTripletSpinBoxes(const QModelIndex &index);
-	void updateRawTripletDataSpinBox(const QModelIndex &);
+	void updateRawTripletDataSpinBox(const QModelIndex &index);
-	void updateAllCookedTripletWidgets(const QModelIndex &);
+	void updateAllCookedTripletWidgets(const QModelIndex & index);
-	void rawTripletAddressSpinBoxChanged(int);
+	void rawTripletAddressSpinBoxChanged(int value);
-	void rawTripletModeSpinBoxChanged(int);
+	void rawTripletModeSpinBoxChanged(int value);
-	void rawTripletDataSpinBoxChanged(int);
+	void rawTripletDataSpinBoxChanged(int value);
-	void cookedRowSpinBoxChanged(const int);
+	void cookedRowSpinBoxChanged(const int value);
-	void cookedColumnSpinBoxChanged(const int);
+	void cookedColumnSpinBoxChanged(const int value);
-	void cookedModeMenuSelected(const int);
+	void cookedModeMenuSelected(const int value);
-	void updateModelFromCookedWidget(const int, const int);
+	void updateModelFromCookedWidget(const int value, const int role);
-	void selectX26ListRow(int);
+	void selectX26ListRow(int row);
 
 protected:
 	void keyPressEvent(QKeyEvent *event) override;

x26model.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2023 Gavin MacGregor
+ * Copyright (C) 2020-2024 Gavin MacGregor
  *
  * This file is part of QTeletextMaker.
  *
@@ -21,7 +21,6 @@
 
 #include <QList>
 
-#include "render.h"
 #include "x26commands.h"
 
 X26Model::X26Model(TeletextWidget *parent): QAbstractListModel(parent)
@@ -134,7 +133,9 @@ QVariant X26Model::data(const QModelIndex &index, int role) const
 			case 0x10: // Origin Modifier
 				// For Set Active Position and Origin Modifier, data is the column, so return blank
 				return QVariant();
-			case 0x11 ... 0x13: // Invoke object
+			case 0x11: // Invoke Active Object
+			case 0x12: // Invoke Adaptive Object
+			case 0x13: // Invoke Passive Object
 				switch (triplet.address() & 0x18) {
 					case 0x08:
 						return QString("Local: d%1 t%2").arg((triplet.data() >> 4) | ((triplet.address() & 0x01) << 3)).arg(triplet.data() & 0x0f);
@@ -152,7 +153,9 @@ QVariant X26Model::data(const QModelIndex &index, int role) const
 				else
 					result.append("1-9");
 				return result;
-			case 0x15 ... 0x17: // Define object
+			case 0x15: // Define Active Object
+			case 0x16: // Define Adaptive Object
+			case 0x17: // Define Passive Object
 				switch (triplet.address() & 0x18) {
 					case 0x08:
 						return "Local: L2.5 only";
@@ -212,7 +215,12 @@ QVariant X26Model::data(const QModelIndex &index, int role) const
 						break;
 				}
 				break;
-			case 0x08 ... 0x0d: // PDC
+			case 0x08: // PDC country of origin & programme source
+			case 0x09: // PDC month & day
+			case 0x0a: // PDC cursor row & announced start hour
+			case 0x0b: // PDC cursor row & announced finish hour
+			case 0x0c: // PDC cursor row & local time offset
+			case 0x0d: // PDC series ID & series code
 				return QString("0x%1").arg(triplet.data(), 2, 16, QChar('0'));
 			case 0x20: // Foreground colour
 			case 0x23: // Background colour
@@ -223,7 +231,7 @@ QVariant X26Model::data(const QModelIndex &index, int role) const
 			case 0x22: // G3 mosaic character at level 1.5
 			case 0x29: // G0 character
 			case 0x2b: // G3 mosaic character at level >=2.5
-			case 0x2f ... 0x3f: // G2 character or G0 diacritical mark
+			case 0x2f: // G2 character
 				if (triplet.data() >= 0x20)
 					return QString("0x%1").arg(triplet.data(), 2, 16);
 				break;
@@ -339,7 +347,12 @@ QVariant X26Model::data(const QModelIndex &index, int role) const
 				return result;
 			case 0x26: // PDC
 				return QString("0x%1").arg(triplet.data(), 2, 16, QChar('0'));
-			default: // Reserved
+			default:
+				if (triplet.modeExt() >= 0x30 && triplet.modeExt() <= 0x3f && triplet.data() >= 0x20)
+					// G0 with diacritical
+					return QString("0x%1").arg(triplet.data(), 2, 16);
+				else
+					// Reserved
 					return QString("Reserved 0x%1").arg(triplet.data(), 2, 16, QChar('0'));
 		}
 		// Reserved mode or data
@@ -372,11 +385,11 @@ QVariant X26Model::data(const QModelIndex &index, int role) const
 				if (triplet.data() >= 0x20)
 					return m_fontBitmap.rawBitmap()->copy((triplet.data()-32)*12, m_parentMainWidget->pageDecode()->cellG2CharacterSet(triplet.activePositionRow(), triplet.activePositionColumn())*10, 12, 10);
 				break;
-			case 0x29: // G0 character
+			default:
-			case 0x30 ... 0x3f: // G0 diacritical mark
+				if (triplet.modeExt() == 0x29 || (triplet.modeExt() >= 0x30 && triplet.modeExt() <= 0x3f))
+					// G0 character or G0 diacritical mark
 					if (triplet.data() >= 0x20)
 						return m_fontBitmap.rawBitmap()->copy((triplet.data()-32)*12, m_parentMainWidget->pageDecode()->cellG0CharacterSet(triplet.activePositionRow(), triplet.activePositionColumn())*10, 12, 10);
-				break;
 		}
 
 	if (role == Qt::EditRole && index.column() == 2)
@@ -397,7 +410,9 @@ QVariant X26Model::data(const QModelIndex &index, int role) const
 			if (role == Qt::UserRole+1) // Colour index
 				return triplet.data() & 0x1f;
 			break;
-		case 0x11 ... 0x13: // Invoke object
+		case 0x11: // Invoke Active Object
+		case 0x12: // Invoke Adaptive Object
+		case 0x13: // Invoke Passive Object
 			switch (role) {
 				case Qt::UserRole+1: // Object source: Local, POP or GPOP
 					return ((triplet.address() & 0x18) >> 3) - 1;
@@ -421,7 +436,9 @@ QVariant X26Model::data(const QModelIndex &index, int role) const
 					return (triplet.data() & 0x10) >> 4;
 			}
 			break;
-		case 0x15 ... 0x17: // Define object
+		case 0x15: // Define Active Object
+		case 0x16: // Define Adaptive Object
+		case 0x17: // Define Passive Object
 			switch (role) {
 				case Qt::UserRole+1: // Required at which levels
 					return ((triplet.address() & 0x18) >> 3) - 1;
@@ -496,12 +513,12 @@ QVariant X26Model::data(const QModelIndex &index, int role) const
 			if (role == Qt::UserRole+2) // Character set
 				return m_parentMainWidget->pageDecode()->cellG2CharacterSet(triplet.activePositionRow(), triplet.activePositionColumn());
 			break;
-		case 0x29: // G0 character
+		default:
-		case 0x30 ... 0x3f: // G0 diacritical mark
+			if (triplet.modeExt() == 0x29 || (triplet.modeExt() >= 0x30 && triplet.modeExt() <= 0x3f))
+				// G0 character or G0 diacritical mark
 				// Qt::UserRole+1 is character number, returned by default below
 				if (role == Qt::UserRole+2) // Character set
 					return m_parentMainWidget->pageDecode()->cellG0CharacterSet(triplet.activePositionRow(), triplet.activePositionColumn());
-			break;
 	};
 
 	// For characters and other triplet modes, return the complete data value
@@ -635,15 +652,6 @@ bool X26Model::setData(const QModelIndex &index, const QVariant &value, int role
 						if (triplet.data() & 0x78)
 							m_parentMainWidget->document()->undoStack()->push(new EditTripletCommand(m_parentMainWidget->document(), this, index.row(), EditTripletCommand::ETdata, 0x07, 0x00, role));
 						break;
-					case 0x21: // G1 mosaic character
-					case 0x22: // G3 mosaic character at level 1.5
-					case 0x29: // G0 character
-					case 0x2b: // G3 mosaic character at level >=2.5
-					case 0x2f ... 0x3f: // G2 character or G0 diacritical mark
-						// Data range 0x20-0x7f
-						if (triplet.data() < 0x20)
-							m_parentMainWidget->document()->undoStack()->push(new EditTripletCommand(m_parentMainWidget->document(), this, index.row(), EditTripletCommand::ETdata, 0x00, 0x20, role));
-						break;
 					case 0x27: // Additional flash functions
 						// D6 and D5 must be clear, D4 and D3 set is reserved phase
 						if (triplet.data() >= 0x18)
@@ -660,6 +668,20 @@ bool X26Model::setData(const QModelIndex &index, const QVariant &value, int role
 						if ((triplet.data() & 0x3f) >= 48)
 							m_parentMainWidget->document()->undoStack()->push(new EditTripletCommand(m_parentMainWidget->document(), this, index.row(), EditTripletCommand::ETdata, 0x40, 0x77, role));
 						break;
+					case 0x21: // G1 mosaic character
+					case 0x22: // G3 mosaic character at level 1.5
+					case 0x29: // G0 character
+					case 0x2b: // G3 mosaic character at level >=2.5
+					case 0x2f: // G2 character
+						// Data range 0x20-0x7f
+						if (triplet.data() < 0x20)
+							m_parentMainWidget->document()->undoStack()->push(new EditTripletCommand(m_parentMainWidget->document(), this, index.row(), EditTripletCommand::ETdata, 0x00, 0x20, role));
+						break;
+					default:
+						if (intValue >= 0x30 && intValue <= 0x3f && triplet.data() < 0x20)
+						// G0 diacritical mark
+						// Data range 0x20-0x7f
+							m_parentMainWidget->document()->undoStack()->push(new EditTripletCommand(m_parentMainWidget->document(), this, index.row(), EditTripletCommand::ETdata, 0x00, 0x20, role));
 				}
 				return true;
 		}
@@ -681,7 +703,9 @@ bool X26Model::setData(const QModelIndex &index, const QVariant &value, int role
 					break;
 			}
 			break;
-		case 0x11 ... 0x13: // Invoke object
+		case 0x11: // Invoke Active Object
+		case 0x12: // Invoke Adaptive Object
+		case 0x13: // Invoke Passive Object
 			switch (role) {
 				case Qt::UserRole+1: // Object source: Local, POP or GPOP
 					m_parentMainWidget->document()->undoStack()->push(new EditTripletCommand(m_parentMainWidget->document(), this, index.row(), EditTripletCommand::ETaddress, 0x27, (intValue+1) << 3, role));
@@ -711,7 +735,9 @@ bool X26Model::setData(const QModelIndex &index, const QVariant &value, int role
 					return true;
 			}
 			break;
-		case 0x15 ... 0x17: // Define object
+		case 0x15: // Define Active Object
+		case 0x16: // Define Adaptive Object
+		case 0x17: // Define Passive Object
 			switch (role) {
 				case Qt::UserRole+1: // Required at which levels
 					m_parentMainWidget->document()->undoStack()->push(new EditTripletCommand(m_parentMainWidget->document(), this, index.row(), EditTripletCommand::ETaddress, 0x27, (intValue+1) << 3, role));

x26model.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2023 Gavin MacGregor
+ * Copyright (C) 2020-2024 Gavin MacGregor
  *
  * This file is part of QTeletextMaker.
  *
@@ -22,7 +22,6 @@
 
 #include <QAbstractListModel>
 #include "mainwidget.h"
-#include "render.h"
 
 class X26Model : public QAbstractListModel
 {
@@ -30,7 +29,7 @@ class X26Model : public QAbstractListModel
 
 public:
 	X26Model(TeletextWidget *parent);
-	void setX26ListLoaded(bool);
+	void setX26ListLoaded(bool newListLoaded);
 	int rowCount(const QModelIndex &parent = QModelIndex()) const override ;
 	int columnCount(const QModelIndex &parent = QModelIndex()) const override;
 	QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;

x26triplets.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2023 Gavin MacGregor
+ * Copyright (C) 2020-2024 Gavin MacGregor
  *
  * This file is part of QTeletextMaker.
  *
@@ -124,7 +124,9 @@ void X26TripletList::updateInternalData()
 					    m_list.at(i+1).modeExt() > 0x13)
 						triplet->m_error = X26Triplet::OriginModifierAlone;
 					break;
-				case 0x11 ... 0x13: // Invoke Object
+				case 0x11: // Invoke Active Object
+				case 0x12: // Invoke Adaptive Object
+				case 0x13: // Invoke Passive Object
 					if (triplet->objectSource() == X26Triplet::LocalObject) {
 						if (triplet->objectLocalTripletNumber() > 12 ||
 							triplet->objectLocalIndex() > (m_list.size()-1) ||
@@ -135,7 +137,9 @@ void X26TripletList::updateInternalData()
 							triplet->m_error = X26Triplet::InvokeTypeMismatch;
 					}
 					break;
-				case 0x15 ... 0x17: // Define Object
+				case 0x15: // Define Active Object
+				case 0x16: // Define Adaptive Object
+				case 0x17: // Define Passive Object
 					activePosition.reset();
 					// Make sure data field holds correct place of triplet
 					// otherwise the object won't appear
@@ -145,7 +149,12 @@ void X26TripletList::updateInternalData()
 					if ((triplet->m_data & 0x30) == 0x00)
 						triplet->m_reservedData = true;
 				case 0x1f: // Termination marker
-				case 0x08 ... 0x0d: // PDC
+				case 0x08: // PDC country of origin & programme source
+				case 0x09: // PDC month & day
+				case 0x0a: // PDC cursor row & announced start hour
+				case 0x0b: // PDC cursor row & announced finish hour
+				case 0x0c: // PDC cursor row & local time offset
+				case 0x0d: // PDC series ID & series code
 					break;
 				default:
 					triplet->m_reservedMode = true;
@@ -158,18 +167,10 @@ void X26TripletList::updateInternalData()
 		else
 			switch (triplet->modeExt()) {
 				case 0x20: // Foreground colour
-				case 0x23: // Foreground colour
+				case 0x23: // Background colour
 					if (triplet->m_data & 0x60)
 						triplet->m_reservedData = true;
 					break;
-				case 0x21: // G1 mosaic character
-				case 0x22: // G3 mosaic character at level 1.5
-				case 0x29: // G0 character
-				case 0x2b: // G3 mosaic character at level >=2.5
-				case 0x2f ... 0x3f: // G2 character or G0 diacritical mark
-					if (triplet->m_data < 0x20)
-						triplet->m_reservedData = true;
-					break;
 				case 0x27: // Additional flash functions
 					if (triplet->m_data >= 0x18)
 						triplet->m_reservedData = true;
@@ -193,6 +194,19 @@ void X26TripletList::updateInternalData()
 					if ((triplet->m_data & 0x3f) >= 48)
 						// Should really be an error?
 						triplet->m_reservedData = true;
+					break;
+				case 0x21: // G1 mosaic character
+				case 0x22: // G3 mosaic character at level 1.5
+				case 0x29: // G0 character
+				case 0x2b: // G3 mosaic character at level >=2.5
+				case 0x2f: // G2 character
+					if (triplet->m_data < 0x20)
+						triplet->m_reservedData = true;
+					break;
+				default:
+					if (triplet->modeExt() >= 0x30 && triplet->modeExt() <= 0x3f && triplet->m_data < 0x20)
+						// G0 diacritical mark
+						triplet->m_reservedData = true;
 			}
 
 		triplet->m_activePositionRow = activePosition.row();
@@ -217,15 +231,18 @@ void X26TripletList::updateInternalData()
 					activePosition.setColumn(8);
 				break;
 			case 0x22: // G3 mosaic character at level 1.5
-			case 0x2f ... 0x3f: // G2 character or G0 diacritical mark
+			case 0x2f: // G2 character
 				activePosition.setColumn(triplet->addressColumn());
 				break;
+			default:
+				if (triplet->modeExt() >= 0x30 && triplet->modeExt() <= 0x3f)
+					// G0 diacritical mark
+					activePosition.setColumn(triplet->addressColumn());
 		}
 
 		triplet->m_activePositionRow1p5 = activePosition.row();
 		triplet->m_activePositionColumn1p5 = activePosition.column();
 	}
-
 }
 
 void X26TripletList::append(const X26Triplet &value)

x26triplets.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2023 Gavin MacGregor
+ * Copyright (C) 2020-2024 Gavin MacGregor
  *
  * This file is part of QTeletextMaker.
  *
@@ -34,7 +34,7 @@ public:
 
 //	X26Triplet &operator=(const X26Triplet &other);
 
-	X26Triplet(int, int, int);
+	X26Triplet(int address, int mode, int data);
 
 	int address() const { return m_address; }
 	int mode() const { return m_mode; }
@@ -44,20 +44,20 @@ public:
 	int addressColumn() const { return (m_address); }
 	bool isRowTriplet() const { return (m_address >= 40); }
 
-	void setAddress(int);
+	void setAddress(int address);
-	void setMode(int);
+	void setMode(int mode);
-	void setData(int);
+	void setData(int data);
-	void setAddressRow(int);
+	void setAddressRow(int addressRow);
-	void setAddressColumn(int);
+	void setAddressColumn(int addressColumn);
 
 	int objectSource() const { return (m_address & 0x18) >> 3; }
 
 	int objectLocalDesignationCode() const { return (((m_address & 0x01) << 3) | (m_data >> 4)); }
 	int objectLocalTripletNumber() const { return m_data & 0x0f; }
 	int objectLocalIndex() const { return objectLocalDesignationCode() * 13 + objectLocalTripletNumber(); }
-	void setObjectLocalDesignationCode(int);
+	void setObjectLocalDesignationCode(int i);
-	void setObjectLocalTripletNumber(int);
+	void setObjectLocalTripletNumber(int i);
-	void setObjectLocalIndex(int);
+	void setObjectLocalIndex(int i);
 
 	int activePositionRow() const { return m_activePositionRow; }
 	int activePositionColumn() const { return m_activePositionColumn; }
@@ -85,10 +85,10 @@ private:
 class X26TripletList
 {
 public:
-	void append(const X26Triplet &);
+	void append(const X26Triplet &value);
-	void insert(int, const X26Triplet &);
+	void insert(int i, const X26Triplet &value);
-	void removeAt(int);
+	void removeAt(int i);
-	void replace(int, const X26Triplet &);
+	void replace(int i, const X26Triplet &value);
 
 	void removeLast() { m_list.removeLast(); }