[QGIS Commit] r9530 - in trunk/qgis/src/core: . composer

[svn_qgis at osgeo.org]

Author: jef
Date: 2008-10-24 07:16:07 -0400 (Fri, 24 Oct 2008)
New Revision: 9530

Modified:
   trunk/qgis/src/core/composer/qgsnumericscalebarstyle.cpp
   trunk/qgis/src/core/qgsproject.cpp
   trunk/qgis/src/core/qgsvectorlayer.cpp
Log:
fix compile errors and warnings

Modified: trunk/qgis/src/core/composer/qgsnumericscalebarstyle.cpp
===================================================================
--- trunk/qgis/src/core/composer/qgsnumericscalebarstyle.cpp	2008-10-24 11:00:31 UTC (rev 9529)
+++ trunk/qgis/src/core/composer/qgsnumericscalebarstyle.cpp	2008-10-24 11:16:07 UTC (rev 9530)
@@ -50,7 +50,7 @@
   p->save();
   p->setFont( mScaleBar->font() );
 
-  mScaleBar->drawText( p, mScaleBar->pen().widthF() + mScaleBar->boxContentSpace(), mScaleBar->boxContentSpace() + mScaleBar->fontAscentMM( mScaleBar->font() ), scaleText(), mScaleBar->font() );
+  mScaleBar->drawText( p, mScaleBar->pen().widthF() + mScaleBar->boxContentSpace(), mScaleBar->boxContentSpace() + mScaleBar->fontAscentMillimeters( mScaleBar->font() ), scaleText(), mScaleBar->font() );
 
   p->restore();
 }
@@ -63,8 +63,8 @@
     return rect;
   }
 
-  double textWidth = mScaleBar->textWidthMM( mScaleBar->font(), scaleText() );
-  double textHeight = mScaleBar->fontAscentMM( mScaleBar->font() );
+  double textWidth = mScaleBar->textWidthMillimeters( mScaleBar->font(), scaleText() );
+  double textHeight = mScaleBar->fontAscentMillimeters( mScaleBar->font() );
 
   return QRectF( mScaleBar->transform().dx(), mScaleBar->transform().dy(), 2 * mScaleBar->boxContentSpace()
                  + 2 * mScaleBar->pen().width() + textWidth,

Modified: trunk/qgis/src/core/qgsproject.cpp
===================================================================
--- trunk/qgis/src/core/qgsproject.cpp	2008-10-24 11:00:31 UTC (rev 9529)
+++ trunk/qgis/src/core/qgsproject.cpp	2008-10-24 11:16:07 UTC (rev 9530)
@@ -1025,7 +1025,6 @@
                                        "may be corrupted on disk. Try clearing some space on the volume and "
                                        "check file permissions before pressing save again." ) +
                           imp_->file.fileName() );
-    return false;
   }
 
   dirty( false );               // reset to pristine state

Modified: trunk/qgis/src/core/qgsvectorlayer.cpp
===================================================================
--- trunk/qgis/src/core/qgsvectorlayer.cpp	2008-10-24 11:00:31 UTC (rev 9529)
+++ trunk/qgis/src/core/qgsvectorlayer.cpp	2008-10-24 11:16:07 UTC (rev 9530)
@@ -2426,7 +2426,7 @@
   QDomNode uniquevaluenode = node.namedItem( "uniquevalue" );
 
   QgsRenderer * renderer = 0;
-  int returnCode;
+  int returnCode = 1;
 
   if ( !singlenode.isNull() )
   {