sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-11-04 00:04:25 -05:00
Code Issues Packages Projects Releases Wiki Activity

Considerably lighten the burden on the overworked translation team

Browse Source
This commit is contained in:
Nyall Dawson 2017-01-25 10:00:06 +10:00
parent deef5c95f2
commit be7d17eb95
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/core/qgsvectorlayer.cpp
View File

@ -4321,7 +4321,7 @@ 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" ) ) );
@ -4329,7 +4329,7 @@ QString QgsVectorLayer::getStyleFromDatabase( const QString& styleId, QString &m
{
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 );

4
src/gui/qgstextannotationitem.cpp
View File

@ -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() )
{