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 <fatzer2@gmail.com>
(cherry picked from commit 9c5ea5617a)
r14.1.x
Alexander Golubev 8 months ago committed by Michele Calgaro
parent bca1fe4e8f
commit b44105403d
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF

@ -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;

@ -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();

Loading…
Cancel
Save