diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-07-28 15:50:52 -0500 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2012-08-04 14:53:35 +0200 |
| commit | 5ae82a06c308960c66757b0a956500b05b83f002 (patch) | |
| tree | e73bef929c230d306f377880042ce09894812ccd /src/widgets/qtextedit.cpp | |
| parent | e9fed234b762ffe73037d70bf29ce90ea7ab8d37 (diff) | |
| download | qt3-5ae82a06c308960c66757b0a956500b05b83f002.tar.gz qt3-5ae82a06c308960c66757b0a956500b05b83f002.zip | |
Fix build warningsv3.5.13.1
Thanks to Bruce Sass for the patch!
(cherry picked from commit ebcb1d80bf517aceb69778e1e9f67e5f4da8c484)
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 0908e84..e45e42d 100644 --- a/src/widgets/qtextedit.cpp +++ b/src/widgets/qtextedit.cpp @@ -1395,11 +1395,11 @@ void QTextEdit::keyPressEvent( QKeyEvent *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 QTextEdit::handleMouseMove( const QPoint& 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 QTextEdit::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(); |