Skip to content
Permalink
Browse files
fix compile errors and warnings
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@9530 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
jef committed Oct 24, 2008
1 parent 67fb200 commit b182a5eada54f1da8fa749128e6219a19a3de4fd
Showing with 4 additions and 5 deletions.
  1. +3 −3 src/core/composer/qgsnumericscalebarstyle.cpp
  2. +0 −1 src/core/qgsproject.cpp
  3. +1 −1 src/core/qgsvectorlayer.cpp
@@ -50,7 +50,7 @@ void QgsNumericScaleBarStyle::draw( QPainter* p, double xOffset ) const
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 @@ QRectF QgsNumericScaleBarStyle::calculateBoxSize() const
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,
@@ -1025,7 +1025,6 @@ bool QgsProject::write()
"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
@@ -2426,7 +2426,7 @@ bool QgsVectorLayer::readSymbology( const QDomNode& node, QString& errorMessage
QDomNode uniquevaluenode = node.namedItem( "uniquevalue" );

QgsRenderer * renderer = 0;
int returnCode;
int returnCode = 1;

if ( !singlenode.isNull() )
{

0 comments on commit b182a5e

Please sign in to comment.