Considerably lighten the burden on the overworked translation team

qgis · Jan 25, 2017 · be7d17e · be7d17e
1 parent deef5c9
commit be7d17e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
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() )
   {