[QGIS Commit] r11851 - in trunk/qgis/src: core/composer ui

[svn_qgis at osgeo.org]

Author: jef
Date: 2009-10-26 11:17:43 -0400 (Mon, 26 Oct 2009)
New Revision: 11851

Modified:
   trunk/qgis/src/core/composer/qgscomposermap.cpp
   trunk/qgis/src/ui/qgsoptionsbase.ui
Log:
fix warnings

Modified: trunk/qgis/src/core/composer/qgscomposermap.cpp
===================================================================
--- trunk/qgis/src/core/composer/qgscomposermap.cpp	2009-10-26 15:16:38 UTC (rev 11850)
+++ trunk/qgis/src/core/composer/qgscomposermap.cpp	2009-10-26 15:17:43 UTC (rev 11851)
@@ -1036,7 +1036,7 @@
   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 @@
   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 @@
 double QgsComposerMap::mapUnitsToMM() const
 {
   double extentWidth = mExtent.width();
-  if ( !extentWidth > 0 )
+  if ( extentWidth <= 0 )
   {
     return 1;
   }

Modified: trunk/qgis/src/ui/qgsoptionsbase.ui
===================================================================
--- trunk/qgis/src/ui/qgsoptionsbase.ui	2009-10-26 15:16:38 UTC (rev 11850)
+++ trunk/qgis/src/ui/qgsoptionsbase.ui	2009-10-26 15:17:43 UTC (rev 11851)
@@ -12,9 +12,6 @@
   <property name="windowTitle" >
    <string>Options</string>
   </property>
-  <property name="windowIcon" >
-   <iconset/>
-  </property>
   <property name="sizeGripEnabled" >
    <bool>true</bool>
   </property>