Fix bad string encoding on windows

nyalldawson · nyalldawson · commit 9c30a0e72ec5 · 2017-04-07T12:45:37.000+10:00
diff --git a/src/app/qgsmaptoolrotatefeature.cpp b/src/app/qgsmaptoolrotatefeature.cpp
@@ -56,7 +56,7 @@ QgsAngleMagnetWidget::QgsAngleMagnetWidget( const QString &label, QWidget *paren
   mAngleSpinBox = new QgsDoubleSpinBox( this );
   mAngleSpinBox->setMinimum( -360 );
   mAngleSpinBox->setMaximum( 360 );
-  mAngleSpinBox->setSuffix( QStringLiteral( "°" ) );
+  mAngleSpinBox->setSuffix( trUtf8( "°" ) );
   mAngleSpinBox->setSingleStep( 1 );
   mAngleSpinBox->setValue( 0 );
   mAngleSpinBox->setShowClearButton( false );
@@ -66,7 +66,7 @@ QgsAngleMagnetWidget::QgsAngleMagnetWidget( const QString &label, QWidget *paren
   mMagnetSpinBox->setMinimum( 0 );
   mMagnetSpinBox->setMaximum( 180 );
   mMagnetSpinBox->setPrefix( tr( "Snap to " ) );
-  mMagnetSpinBox->setSuffix( QStringLiteral( "°" ) );
+  mMagnetSpinBox->setSuffix( trUtf8( "°" ) );
   mMagnetSpinBox->setSingleStep( 15 );
   mMagnetSpinBox->setValue( 0 );
   mMagnetSpinBox->setClearValue( 0, tr( "No snapping" ) );
diff --git a/src/gui/qgsadvanceddigitizingdockwidget.cpp b/src/gui/qgsadvanceddigitizingdockwidget.cpp
@@ -163,10 +163,10 @@ QgsAdvancedDigitizingDockWidget::QgsAdvancedDigitizingDockWidget( QgsMapCanvas *
   QActionGroup *angleButtonGroup = new QActionGroup( menu ); // actions are exclusive for common angles
   mCommonAngleActions = QMap<QAction *, int>();
   QList< QPair< int, QString > > commonAngles;
-  commonAngles << QPair<int, QString>( 0, tr( "Do not snap to common angles" ) );
-  commonAngles << QPair<int, QString>( 30, tr( "Snap to 30%1 angles" ).arg( QStringLiteral( "°" ) ) );
-  commonAngles << QPair<int, QString>( 45, tr( "Snap to 45%1 angles" ).arg( QStringLiteral( "°" ) ) );
-  commonAngles << QPair<int, QString>( 90, tr( "Snap to 90%1 angles" ).arg( QStringLiteral( "°" ) ) );
+  commonAngles << QPair<int, QString>( 0, trUtf8( "Do not snap to common angles" ) );
+  commonAngles << QPair<int, QString>( 30, trUtf8( "Snap to 30° angles" ) );
+  commonAngles << QPair<int, QString>( 45, trUtf8( "Snap to 45° angles" ) );
+  commonAngles << QPair<int, QString>( 90, trUtf8( "Snap to 90° angles" ) );
   for ( QList< QPair< int, QString > >::const_iterator it = commonAngles.begin(); it != commonAngles.end(); ++it )
   {
     QAction *action = new QAction( it->second, menu );
