diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-07-28 15:51:58 -0500 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-07-28 15:51:58 -0500 |
| commit | fe7969ef886d7287fa959929ddd33fbad8407884 (patch) | |
| tree | 589aacc109d27561a5188bb46bce27c78bad8f5b /src/widgets/qtextedit.cpp | |
| parent | dba8a853b65e5707e48450e5085e0ff0513b4203 (diff) | |
| download | tqt3-fe7969ef886d7287fa959929ddd33fbad8407884.tar.gz tqt3-fe7969ef886d7287fa959929ddd33fbad8407884.zip | |
Automated update from Qt3
Diffstat (limited to 'src/widgets/qtextedit.cpp')
| -rw-r--r-- | src/widgets/qtextedit.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/widgets/qtextedit.cpp b/src/widgets/qtextedit.cpp index df41d2d05..3475b2bf7 100644 --- a/src/widgets/qtextedit.cpp +++ b/src/widgets/qtextedit.cpp @@ -1395,11 +1395,11 @@ void TQTextEdit::keyPressEvent( TQKeyEvent *e ) break; default: { if ( e->text().length() && - ( !( e->state() & ControlButton ) && + ( ( !( e->state() & ControlButton ) && #ifndef Q_OS_MACX !( e->state() & AltButton ) && #endif - !( e->state() & MetaButton ) || + !( e->state() & MetaButton ) ) || ( ( (e->state()&ControlButton) | AltButton ) == (ControlButton|AltButton) ) ) && ( !e->ascii() || e->ascii() >= 32 || e->text() == "\t" ) ) { clearUndoRedoInfo = FALSE; @@ -2812,7 +2812,7 @@ void TQTextEdit::handleMouseMove( const TQPoint& pos ) if ( !mousePressed ) return; - if ( !scrollTimer->isActive() && pos.y() < contentsY() || pos.y() > contentsY() + visibleHeight() ) + if ( (!scrollTimer->isActive() && pos.y() < contentsY()) || pos.y() > contentsY() + visibleHeight() ) scrollTimer->start( 100, FALSE ); else if ( scrollTimer->isActive() && pos.y() >= contentsY() && pos.y() <= contentsY() + visibleHeight() ) scrollTimer->stop(); @@ -7181,7 +7181,7 @@ void TQTextEdit::optimDoAutoScroll() repaintContents( contentsX(), y, width(), h, FALSE ); } - if ( !scrollTimer->isActive() && pos.y() < 0 || pos.y() > height() ) + if ( (!scrollTimer->isActive() && pos.y() < 0) || pos.y() > height() ) scrollTimer->start( 100, FALSE ); else if ( scrollTimer->isActive() && pos.y() >= 0 && pos.y() <= height() ) scrollTimer->stop(); |