Bug#502559: Include from libqt3-headers Fails With -Werror.

[Pat Suwalski <pats@xandros.com>]

Package: libqt3-headers
Version: 3:3.3.8b-5

Software that tries to build against Qt3's qimage.h with the -Werror
compiler flag will fail in Lenny. Apparently g++ has gotten more picky
about order of operations:

/usr/include/qt3/qimage.h: In member function 'bool
QImageTextKeyLang::operator<(const QImageTextKeyLang&) const':
/usr/include/qt3/qimage.h:61: error: suggest parentheses around &&
within ||

This can be worked around by using the -Wno-parentheses CPPFLAG, but it
would be far better if it were actually fixed in the header.

As such, I've written and tested the attached patch.

--Pat

Author: Pat Suwalski <pats@xandros.com>

This patch fixes the QImage header breaking with -Werror on Lenny:

/usr/include/qt3/qimage.h: In member function
  'bool QImageTextKeyLang::operator<(const QImageTextKeyLang&) const':
/usr/include/qt3/qimage.h:61: error: suggest parentheses around && within ||

--- a/src/kernel/qimage.h	2008-10-17 19:28:30.000000000 +0000
+++ b/src/kernel/qimage.h	2008-10-17 19:29:00.000000000 +0000
@@ -58,7 +58,7 @@
     QCString lang;
 
     bool operator< (const QImageTextKeyLang& other) const
-	{ return key < other.key || key==other.key && lang < other.lang; }
+	{ return key < other.key || (key==other.key && lang < other.lang); }
     bool operator== (const QImageTextKeyLang& other) const
 	{ return key==other.key && lang==other.lang; }
 };