Considerably lighten the burden on the overworked translation team

nyalldawson · nyalldawson · commit be7d17eb95d9 · 2017-01-25T10:00:06.000+10:00
diff --git a/src/core/qgsvectorlayer.cpp b/src/core/qgsvectorlayer.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 );
diff --git a/src/gui/qgstextannotationitem.cpp b/src/gui/qgstextannotationitem.cpp
@@ -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() )
   {

Original file line number	Diff line number	Diff line change
`@@ -4321,15 +4321,15 @@ QString QgsVectorLayer::getStyleFromDatabase( const QString& styleId, QString &m`
`4321`	`4321`	`if ( !myLib )`
`4322`	`4322`	`{`
`4323`	`4323`	`msgError = QObject::tr( "Unable to load %1 provider" ).arg( mProviderKey );`
`4324`		`- return QObject::tr( "" );`
	`4324`	`+ return QString();`
`4325`	`4325`	`}`
`4326`	`4326`	`getStyleById_t* getStyleByIdMethod = reinterpret_cast< getStyleById_t * >( cast_to_fptr( myLib->resolve( "getStyleById" ) ) );`
`4327`	`4327`
`4328`	`4328`	`if ( !getStyleByIdMethod )`
`4329`	`4329`	`{`
`4330`	`4330`	`delete myLib;`
`4331`	`4331`	`msgError = QObject::tr( "Provider %1 has no %2 method" ).arg( mProviderKey, QStringLiteral( "getStyleById" ) );`
`4332`		`- return QObject::tr( "" );`
	`4332`	`+ return QString();`
`4333`	`4333`	`}`
`4334`	`4334`
`4335`	`4335`	`return getStyleByIdMethod( mDataSource, styleId, msgError );`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@`
`19`	`19`	`#include <QDomDocument>`
`20`	`20`	`#include <QPainter>`
`21`	`21`
`22`		`-QgsTextAnnotationItem::QgsTextAnnotationItem( QgsMapCanvas* canvas ): QgsAnnotationItem( canvas ), mDocument( new QTextDocument( QObject::tr( "" ) ) )`
	`22`	`+QgsTextAnnotationItem::QgsTextAnnotationItem( QgsMapCanvas* canvas ): QgsAnnotationItem( canvas ), mDocument( new QTextDocument( QString() ) )`
`23`	`23`	`{`
`24`	`24`	`mDocument->setUseDesignMetrics( true );`
`25`	`25`	`}`
`@@ -101,7 +101,7 @@ void QgsTextAnnotationItem::readXml( const QDomDocument& doc, const QDomElement&`
`101`	`101`	`{`
`102`	`102`	`delete mDocument;`
`103`	`103`	`mDocument = new QTextDocument;`
`104`		`- mDocument->setHtml( itemElem.attribute( QStringLiteral( "document" ), QObject::tr( "" ) ) );`
	`104`	`+ mDocument->setHtml( itemElem.attribute( QStringLiteral( "document" ), QString() ) );`
`105`	`105`	`QDomElement annotationElem = itemElem.firstChildElement( QStringLiteral( "AnnotationItem" ) );`
`106`	`106`	`if ( !annotationElem.isNull() )`
`107`	`107`	`{`