SVN commit 826543 by jaham: SVN_SILENT krazy fixes M +2 -2 flake/KoPatternBackground.cpp M +1 -1 guiutils/KoRuler.cpp M +1 -1 main/KoApplication.cpp M +7 -7 main/KoOdfGraphicStyles.cpp --- trunk/koffice/libs/flake/KoPatternBackground.cpp #826542:826543 @@ -341,7 +341,7 @@ { QString height = styleStack.property( KoXmlNS::draw, "fill-image-height" ); if( height.endsWith( '%' ) ) - d->targetImageSizePercent.setHeight( height.remove( "%" ).toDouble() ); + d->targetImageSizePercent.setHeight( height.remove( '%' ).toDouble() ); else d->targetImageSize.setHeight( KoUnit::parseValue( height ) ); } @@ -349,7 +349,7 @@ { QString width = styleStack.property( KoXmlNS::draw, "fill-image-width" ); if( width.endsWith( '%' ) ) - d->targetImageSizePercent.setWidth( width.remove( "%" ).toDouble() ); + d->targetImageSizePercent.setWidth( width.remove( '%' ).toDouble() ); else d->targetImageSize.setWidth( KoUnit::parseValue( width ) ); } --- trunk/koffice/libs/guiutils/KoRuler.cpp #826542:826543 @@ -546,7 +546,7 @@ font.setPointSize(6); QFontMetrics fontMetrics(font); QString label = d->unit.toUserStringValue( - d->viewConverter->viewToDocumentX(line.length())) + " " + KoUnit::unitName(d->unit); + d->viewConverter->viewToDocumentX(line.length())) + ' ' + KoUnit::unitName(d->unit); QPointF labelPosition = QPointF(midPoint.x() - fontMetrics.width(label)/2, midPoint.y() + fontMetrics.ascent()/2); painter.setFont(font); --- trunk/koffice/libs/main/KoApplication.cpp #826542:826543 @@ -204,7 +204,7 @@ QString templateName = templateInfo.readUrl(); KUrl templateURL; - templateURL.setPath( templateBase.directory() + "/" + templateName ); + templateURL.setPath( templateBase.directory() + '/' + templateName ); if ( shell->openDocument(doc, templateURL )) { doc->resetURL(); doc->setEmpty(); --- trunk/koffice/libs/main/KoOdfGraphicStyles.cpp #826542:826543 @@ -215,8 +215,8 @@ { QRadialGradient * rg = new QRadialGradient(); // TODO : find out whether Oasis works with boundingBox only? - double cx = KoUnit::parseValue( e->attributeNS( KoXmlNS::draw, "cx", QString() ).remove("%") ); - double cy = KoUnit::parseValue( e->attributeNS( KoXmlNS::draw, "cy", QString() ).remove("%") ); + double cx = KoUnit::parseValue( e->attributeNS( KoXmlNS::draw, "cx", QString() ).remove('%') ); + double cy = KoUnit::parseValue( e->attributeNS( KoXmlNS::draw, "cy", QString() ).remove('%') ); rg->setCenter( QPointF( size.width() * 0.01 * cx, size.height() * 0.01 * cy ) ); rg->setFocalPoint( rg->center() ); double dx = 0.5 * size.width(); @@ -241,12 +241,12 @@ QGradientStop start; start.first = 0.0; start.second = QColor( e->attributeNS( KoXmlNS::draw, "start-color", QString() ) ); - start.second.setAlphaF( 0.01 * e->attributeNS( KoXmlNS::draw, "start-intensity", "100" ).remove("%").toDouble() ); + start.second.setAlphaF( 0.01 * e->attributeNS( KoXmlNS::draw, "start-intensity", "100" ).remove('%').toDouble() ); QGradientStop end; end.first = 1.0; end.second = QColor( e->attributeNS( KoXmlNS::draw, "end-color", QString() ) ); - end.second.setAlphaF( 0.01 * e->attributeNS( KoXmlNS::draw, "end-intensity", "100" ).remove("%").toDouble() ); + end.second.setAlphaF( 0.01 * e->attributeNS( KoXmlNS::draw, "end-intensity", "100" ).remove('%').toDouble() ); QGradientStops stops; gradient->setStops( stops << start << end ); @@ -369,13 +369,13 @@ QString height = styleStack.property( KoXmlNS::draw, "fill-image-height" ); double newHeight = 0.0; if( height.endsWith( '%' ) ) - newHeight = 0.01 * height.remove( "%" ).toDouble() * imageSize.height(); + newHeight = 0.01 * height.remove( '%' ).toDouble() * imageSize.height(); else newHeight = KoUnit::parseValue( height ); QString width = styleStack.property( KoXmlNS::draw, "fill-image-width" ); double newWidth = 0.0; if( width.endsWith( '%' ) ) - newWidth = 0.01 * width.remove( "%" ).toDouble() * imageSize.width(); + newWidth = 0.01 * width.remove( '%' ).toDouble() * imageSize.width(); else newWidth = KoUnit::parseValue( width ); if( newHeight > 0.0 ) @@ -601,7 +601,7 @@ QColor color = tmpPen.color(); QString opacity = styleStack.property( KoXmlNS::svg, "stroke-opacity" ); if( opacity.endsWith( '%' ) ) - color.setAlphaF( 0.01 * opacity.remove( "%" ).toDouble() ); + color.setAlphaF( 0.01 * opacity.remove( '%' ).toDouble() ); else color.setAlphaF( opacity.toDouble() ); tmpPen.setColor( color );