From 083d32559ddb247bcc18a22a525a416c8ec743b5 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Sun, 12 Feb 2012 19:13:32 -0600
Subject: [PATCH] Fix a few more build warnings

---
 src/kernel/qimage.cpp          | 10 +++++-----
 src/kernel/qlayout.cpp         |  4 ++--
 src/kernel/qobject.cpp         |  8 ++++----
 src/kernel/qprinter.cpp        |  9 ++++++---
 src/kernel/qsimplerichtext.cpp |  4 ++--
 5 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/src/kernel/qimage.cpp b/src/kernel/qimage.cpp
index d5a18b9..b55a0e7 100644
--- a/src/kernel/qimage.cpp
+++ b/src/kernel/qimage.cpp
@@ -6082,10 +6082,10 @@ void bitBlt( QImage* dst, int dx, int dy, const QImage* src,
     //   - 1 bit, identical palette and byte-aligned area
     //
     if ( haveSamePalette(*dst,*src)
-	 && ( dst->depth() != 1 ||
-	      !( (dx&7) || (sx&7) ||
-		 ((sw&7) && (sx+sw < src->width()) ||
-		  (dx+sw < dst->width()) ) ) ) )
+	 && ( (dst->depth() != 1) ||
+	      (!( (dx&7) || (sx&7) ||
+		 (((sw&7) && (sx+sw < src->width())) ||
+		  (dx+sw < dst->width()) ) )) ) )
 	{
 	    // easy to copy
 	} else if ( dst->depth() != 32 ) {
@@ -6103,7 +6103,7 @@ void bitBlt( QImage* dst, int dx, int dy, const QImage* src,
     // Now assume palette can be ignored
 
     if ( dst->depth() != src->depth() ) {
-	if ( sw == src->width() && sh == src->height() || dst->depth()==32 ) {
+	if ( ((sw == src->width()) && (sh == src->height())) || (dst->depth()==32) ) {
 	    QImage srcconv = src->convertDepth( dst->depth(), conversion_flags );
 	    bitBlt( dst, dx, dy, &srcconv, sx, sy, sw, sh, conversion_flags );
 	} else {
diff --git a/src/kernel/qlayout.cpp b/src/kernel/qlayout.cpp
index c2418b6..de9f5b9 100644
--- a/src/kernel/qlayout.cpp
+++ b/src/kernel/qlayout.cpp
@@ -433,7 +433,7 @@ void QGridLayoutData::setSize( int r, int c )
 void QGridLayoutData::setNextPosAfter( int row, int col )
 {
     if ( addVertical ) {
-	if ( col > nextC || col == nextC && row >= nextR ) {
+	if ( (col > nextC) || ((col == nextC) && (row >= nextR)) ) {
 	    nextR = row + 1;
 	    nextC = col;
 	    if ( nextR >= rr ) {
@@ -442,7 +442,7 @@ void QGridLayoutData::setNextPosAfter( int row, int col )
 	    }
 	}
     } else {
-	if ( row > nextR || row == nextR && col >= nextC ) {
+	if ( (row > nextR) || ((row == nextR) && (col >= nextC)) ) {
 	    nextR = row;
 	    nextC = col + 1;
 	    if ( nextC >= cc ) {
diff --git a/src/kernel/qobject.cpp b/src/kernel/qobject.cpp
index 7790676..7e01dec 100644
--- a/src/kernel/qobject.cpp
+++ b/src/kernel/qobject.cpp
@@ -2113,8 +2113,8 @@ bool QObject::disconnectInternal( const QObject *sender, int signal_index,
 		    success = TRUE;
 		    c = clist->next();
 		} else if ( r == c->object() &&
-			    ( member_index == -1 ||
-			      member_index == c->member() && c->memberType() == membcode ) ) {
+			    ( (member_index == -1) ||
+			      ((member_index == c->member()) && (c->memberType() == membcode)) ) ) {
 		    removeObjFromList( c->object()->senderObjects, s, TRUE );
 		    success = TRUE;
 		    clist->remove();
@@ -2138,8 +2138,8 @@ bool QObject::disconnectInternal( const QObject *sender, int signal_index,
 		success = TRUE;
 		c = clist->next();
 	    } else if ( r == c->object() &&
-			( member_index == -1 ||
-			  member_index == c->member() && c->memberType() == membcode ) ) {
+			( (member_index == -1) ||
+			  ((member_index == c->member()) && (c->memberType() == membcode)) ) ) {
 		removeObjFromList( c->object()->senderObjects, s, TRUE );
 		success = TRUE;
 		clist->remove();
diff --git a/src/kernel/qprinter.cpp b/src/kernel/qprinter.cpp
index 31e1ec4..0db6dce 100644
--- a/src/kernel/qprinter.cpp
+++ b/src/kernel/qprinter.cpp
@@ -973,13 +973,16 @@ QPrinter::PaperSource QPrinter::paperSource() const
 */
 void QPrinter::setPrintRange( PrintRange range )
 {
-    if( range != AllPages )
+    if( range != AllPages ) {
 	if( range == Selection
-	    && !isOptionEnabled( PrintSelection ) )
+	    && !isOptionEnabled( PrintSelection ) ) {
 	    setOptionEnabled( PrintSelection, TRUE );
+	}
 	else if( range == PageRange
-		 && !isOptionEnabled( PrintPageRange ) )
+		 && !isOptionEnabled( PrintPageRange ) ) {
 	    setOptionEnabled( PrintPageRange, TRUE );
+	}
+    }
     d->printRange = range;
 }
 
diff --git a/src/kernel/qsimplerichtext.cpp b/src/kernel/qsimplerichtext.cpp
index 9712b90..8974037 100644
--- a/src/kernel/qsimplerichtext.cpp
+++ b/src/kernel/qsimplerichtext.cpp
@@ -244,8 +244,8 @@ void QSimpleRichText::setWidth( QPainter *p, int w )
     if ( w == d->cachedWidth  && d->cachedWidthWithPainter )
 	return;
     d->doc->formatter()->setAllowBreakInWords( d->doc->isPageBreakEnabled() ||
-		       p && p->device() &&
-		     p->device()->devType() == QInternal::Printer );
+		       (p && p->device() &&
+		     (p->device()->devType() == QInternal::Printer)) );
     p->save();
     d->cachedWidth = w;
     d->cachedWidthWithPainter = TRUE;