From b44105403d840b671b01410c34935de1c8738227 Mon Sep 17 00:00:00 2001 From: Alexander Golubev Date: Tue, 19 Mar 2024 08:37:25 +0300 Subject: [PATCH] TQTextEdit: remove one of two readOnly flags There were two flags for read-only with different capitalization: readonly and readOnly. This was probably a mistake. Signed-off-by: Alexander Golubev (cherry picked from commit 9c5ea5617a3bc0e69213e2361dd02d70f14f4708) --- src/widgets/ntqtextedit.h | 6 +++--- src/widgets/qtextedit.cpp | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/widgets/ntqtextedit.h b/src/widgets/ntqtextedit.h index 25f0e073..01b809d0 100644 --- a/src/widgets/ntqtextedit.h +++ b/src/widgets/ntqtextedit.h @@ -271,7 +271,7 @@ public: TQSize sizeHint() const; - bool isReadOnly() const { return readonly; } + bool isReadOnly() const { return readOnly; } void getCursorPosition( int *parag, int *index ) const; @@ -582,11 +582,11 @@ private: bool mousePressed : 1; bool cursorVisible : 1; bool blinkCursorVisible : 1; - bool readOnly : 1; + bool noop: 1; //< Removed; keep as padding for binary compat or reuse if needed bool modified : 1; bool mightStartDrag : 1; bool inDnD : 1; - bool readonly : 1; + bool readOnly : 1; bool undoEnabled : 1; bool overWrite : 1; diff --git a/src/widgets/qtextedit.cpp b/src/widgets/qtextedit.cpp index 723ccc57..bac58af1 100644 --- a/src/widgets/qtextedit.cpp +++ b/src/widgets/qtextedit.cpp @@ -953,7 +953,7 @@ void TQTextEdit::init() d = new TQTextEditPrivate; doc->formatCollection()->setPaintDevice( this ); undoEnabled = TRUE; - readonly = TRUE; + readOnly = TRUE; setReadOnly( FALSE ); setFrameStyle( LineEditPanel | Sunken ); connect( doc, TQ_SIGNAL( minimumWidthChanged(int) ), @@ -2920,7 +2920,7 @@ void TQTextEdit::updateMicroFocusHint() if ( hasFocus() || viewport()->hasFocus() ) { int h = c.paragraph()->lineHeightOfChar( cursor->index() ); - if ( !readonly ) { + if ( !readOnly ) { TQFont f = c.paragraph()->at( c.index() )->format()->font(); setMicroFocusHint( c.x() - contentsX() + frameWidth(), c.y() + cursor->paragraph()->rect().y() - contentsY() + frameWidth(), 0, h, TRUE, &f ); @@ -5895,15 +5895,15 @@ void TQTextEdit::windowActivationChange( bool oldActive ) void TQTextEdit::setReadOnly( bool b ) { - if ( (bool) readonly == b ) + if ( (bool) readOnly == b ) return; - readonly = b; + readOnly = b; #ifndef TQT_NO_CURSOR - if ( readonly ) + if ( readOnly ) viewport()->setCursor( arrowCursor ); else viewport()->setCursor( ibeamCursor ); - setInputMethodEnabled( !readonly ); + setInputMethodEnabled( !readOnly ); #endif #ifdef QT_TEXTEDIT_OPTIMIZATION checkOptimMode();