diff options
| author | Darrell Anderson <[email protected]> | 2012-08-03 08:49:35 -0500 |
|---|---|---|
| committer | Darrell Anderson <[email protected]> | 2012-08-03 08:49:35 -0500 |
| commit | 92b8aca467ad650f9b77a5b6a0f56c27ecbfe80a (patch) | |
| tree | 3de07468347367bdef8e6c0d765bdb209585a189 /src/xml | |
| parent | da067173fd2ab6bca5943294a439c4992323227a (diff) | |
| parent | ebcb1d80bf517aceb69778e1e9f67e5f4da8c484 (diff) | |
| download | qt3-92b8aca467ad650f9b77a5b6a0f56c27ecbfe80a.tar.gz qt3-92b8aca467ad650f9b77a5b6a0f56c27ecbfe80a.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/qt3
Diffstat (limited to 'src/xml')
| -rw-r--r-- | src/xml/qdom.cpp | 4 | ||||
| -rw-r--r-- | src/xml/qsvgdevice.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/xml/qdom.cpp b/src/xml/qdom.cpp index 524c638..a6f2462 100644 --- a/src/xml/qdom.cpp +++ b/src/xml/qdom.cpp @@ -3655,8 +3655,8 @@ static bool isXmlChar(const QChar &c) return uc == 0x9 || uc == 0xA || uc == 0xD - || 0x20 <= uc && uc <= 0xD7FF - || 0xE000 <= uc && uc <= 0xFFFD; + || ( 0x20 <= uc && uc <= 0xD7FF ) + || ( 0xE000 <= uc && uc <= 0xFFFD ); } /* diff --git a/src/xml/qsvgdevice.cpp b/src/xml/qsvgdevice.cpp index 1f184f1..0615871 100644 --- a/src/xml/qsvgdevice.cpp +++ b/src/xml/qsvgdevice.cpp @@ -1433,8 +1433,8 @@ void QSvgDevice::drawPath( const QString &data ) // if possible, reflect last control point if smooth shorthand if ( mode == 6 || mode == 8 ) { // smooth 'S' and 'T' bool cont = mode == lastMode || - mode == 6 && lastMode == 5 || // 'S' and 'C' - mode == 8 && lastMode == 7; // 'T' and 'Q' + ( mode == 6 && lastMode == 5 ) || // 'S' and 'C' + ( mode == 8 && lastMode == 7 ); // 'T' and 'Q' x = cont ? 2*x-controlX : x; y = cont ? 2*y-controlY : y; quad.setPoint( 1, int(x), int(y) ); |