Skip to content
Permalink
Browse files

Considerably lighten the burden on the overworked translation team

  • Loading branch information
nyalldawson committed Jan 25, 2017
1 parent deef5c9 commit be7d17eb95d9d50b5c351d02e5d96550e84902a5
Showing with 4 additions and 4 deletions.
  1. +2 −2 src/core/qgsvectorlayer.cpp
  2. +2 −2 src/gui/qgstextannotationitem.cpp
@@ -4321,15 +4321,15 @@ QString QgsVectorLayer::getStyleFromDatabase( const QString& styleId, QString &m
if ( !myLib )
{
msgError = QObject::tr( "Unable to load %1 provider" ).arg( mProviderKey );
return QObject::tr( "" );
return QString();
}
getStyleById_t* getStyleByIdMethod = reinterpret_cast< getStyleById_t * >( cast_to_fptr( myLib->resolve( "getStyleById" ) ) );

if ( !getStyleByIdMethod )
{
delete myLib;
msgError = QObject::tr( "Provider %1 has no %2 method" ).arg( mProviderKey, QStringLiteral( "getStyleById" ) );
return QObject::tr( "" );
return QString();
}

return getStyleByIdMethod( mDataSource, styleId, msgError );
@@ -19,7 +19,7 @@
#include <QDomDocument>
#include <QPainter>

QgsTextAnnotationItem::QgsTextAnnotationItem( QgsMapCanvas* canvas ): QgsAnnotationItem( canvas ), mDocument( new QTextDocument( QObject::tr( "" ) ) )
QgsTextAnnotationItem::QgsTextAnnotationItem( QgsMapCanvas* canvas ): QgsAnnotationItem( canvas ), mDocument( new QTextDocument( QString() ) )
{
mDocument->setUseDesignMetrics( true );
}
@@ -101,7 +101,7 @@ void QgsTextAnnotationItem::readXml( const QDomDocument& doc, const QDomElement&
{
delete mDocument;
mDocument = new QTextDocument;
mDocument->setHtml( itemElem.attribute( QStringLiteral( "document" ), QObject::tr( "" ) ) );
mDocument->setHtml( itemElem.attribute( QStringLiteral( "document" ), QString() ) );
QDomElement annotationElem = itemElem.firstChildElement( QStringLiteral( "AnnotationItem" ) );
if ( !annotationElem.isNull() )
{

0 comments on commit be7d17e

Please sign in to comment.
You can’t perform that action at this time.