summaryrefslogtreecommitdiffstats
path: root/src/widgets/qtextedit.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2012-07-28 15:50:52 -0500
committerTimothy Pearson <[email protected]>2012-07-28 15:50:52 -0500
commitebcb1d80bf517aceb69778e1e9f67e5f4da8c484 (patch)
tree2b17bdf68dd5a96e5ef742207426f65010aedac6 /src/widgets/qtextedit.cpp
parentb129c37241b8777665c2c063713d496e43e934b2 (diff)
downloadqt3-ebcb1d80bf517aceb69778e1e9f67e5f4da8c484.tar.gz
qt3-ebcb1d80bf517aceb69778e1e9f67e5f4da8c484.zip
Fix build warnings
Thanks to Bruce Sass for the patch!
Diffstat (limited to 'src/widgets/qtextedit.cpp')
-rw-r--r--src/widgets/qtextedit.cpp8
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();