Skip to content

Commit 32ceff3

Browse files
author
jef
committed
fix warnings
git-svn-id: http://svn.osgeo.org/qgis/trunk@11851 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent 08cdd0b commit 32ceff3

File tree

2 files changed

+3
-6
lines changed

2 files changed

+3
-6
lines changed

src/core/composer/qgscomposermap.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -1036,7 +1036,7 @@ int QgsComposerMap::xGridLines( QList< QPair< double, QLineF > >& lines ) const
10361036
QRectF mapBoundingRect = mapPolygon.boundingRect();
10371037
double currentLevel = ( int )(( mapBoundingRect.top() - mGridOffsetY ) / mGridIntervalY + 1.0 ) * mGridIntervalY + mGridOffsetY;
10381038

1039-
if ( !mRotation > 0.0 )
1039+
if ( mRotation <= 0.0 )
10401040
{
10411041
//no rotation. Do it 'the easy way'
10421042

@@ -1101,7 +1101,7 @@ int QgsComposerMap::yGridLines( QList< QPair< double, QLineF > >& lines ) const
11011101
QRectF mapBoundingRect = mapPolygon.boundingRect();
11021102
double currentLevel = ( int )(( mapBoundingRect.left() - mGridOffsetX ) / mGridIntervalX + 1.0 ) * mGridIntervalX + mGridOffsetX;
11031103

1104-
if ( !mRotation > 0.0 )
1104+
if ( mRotation <= 0.0 )
11051105
{
11061106
//no rotation. Do it 'the easy way'
11071107
double xCanvasCoord;
@@ -1312,7 +1312,7 @@ void QgsComposerMap::requestedExtent( QgsRectangle& extent ) const
13121312
double QgsComposerMap::mapUnitsToMM() const
13131313
{
13141314
double extentWidth = mExtent.width();
1315-
if ( !extentWidth > 0 )
1315+
if ( extentWidth <= 0 )
13161316
{
13171317
return 1;
13181318
}

src/ui/qgsoptionsbase.ui

-3
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,6 @@
1212
<property name="windowTitle" >
1313
<string>Options</string>
1414
</property>
15-
<property name="windowIcon" >
16-
<iconset/>
17-
</property>
1815
<property name="sizeGripEnabled" >
1916
<bool>true</bool>
2017
</property>

0 commit comments

Comments
 (0)