fix warnings

git-svn-id: http://svn.osgeo.org/qgis/trunk@11851 c8812cc2-4d05-0410-92ff-de0c093fc19c

Author: jef

src/core/composer/qgscomposermap.cpp

@@ -1036,7 +1036,7 @@ int QgsComposerMap::xGridLines( QList< QPair< double, QLineF > >& lines ) const
   QRectF mapBoundingRect = mapPolygon.boundingRect();
   double currentLevel = ( int )(( mapBoundingRect.top() - mGridOffsetY ) / mGridIntervalY + 1.0 ) * mGridIntervalY + mGridOffsetY;
 
-  if ( !mRotation > 0.0 )
+  if ( mRotation <= 0.0 )
   {
     //no rotation. Do it 'the easy way'
 
@@ -1101,7 +1101,7 @@ int QgsComposerMap::yGridLines( QList< QPair< double, QLineF > >& lines ) const
   QRectF mapBoundingRect = mapPolygon.boundingRect();
   double currentLevel = ( int )(( mapBoundingRect.left() - mGridOffsetX ) / mGridIntervalX + 1.0 ) * mGridIntervalX + mGridOffsetX;
 
-  if ( !mRotation > 0.0 )
+  if ( mRotation <= 0.0 )
   {
     //no rotation. Do it 'the easy way'
     double xCanvasCoord;
@@ -1312,7 +1312,7 @@ void QgsComposerMap::requestedExtent( QgsRectangle& extent ) const
 double QgsComposerMap::mapUnitsToMM() const
 {
   double extentWidth = mExtent.width();
-  if ( !extentWidth > 0 )
+  if ( extentWidth <= 0 )
   {
     return 1;
   }

src/ui/qgsoptionsbase.ui

@@ -12,9 +12,6 @@
   <property name="windowTitle" >
    <string>Options</string>
   </property>
-  <property name="windowIcon" >
-   <iconset/>
-  </property>
   <property name="sizeGripEnabled" >
    <bool>true</bool>
   </property>