Fix some warnings

qgis · Aug 31, 2018 · 07037ec44a140ebcd5ba181deb7a925fdfaa2890 · 07037ec
1 parent 948a312
commit 07037ec44a140ebcd5ba181deb7a925fdfaa2890
Unified Split

Showing with 3 additions and 5 deletions.

+0 −1 src/app/qgsprojectproperties.cpp

+1 −1 src/core/expression/qgsexpressionnode.h

+1 −1 src/core/raster/qgsrasterrenderer.cpp

+1 −1 src/core/raster/qgsrasterrenderer.h

+0 −1 src/server/services/wmts/qgswmtsutils.cpp
diff --git a/src/app/qgsprojectproperties.cpp b/src/app/qgsprojectproperties.cpp
@@ -974,7 +974,6 @@ void QgsProjectProperties::apply()
       degreeFormat = QStringLiteral( "MU" );
       break;
     case DecimalDegrees:
-    default:
       degreeFormat = QStringLiteral( "D" );
       break;
   }

diff --git a/src/core/expression/qgsexpressionnode.h b/src/core/expression/qgsexpressionnode.h
@@ -66,7 +66,7 @@ class CORE_EXPORT QgsExpressionNode SIP_ABSTRACT
     SIP_END
 #endif
 
-    Q_DECLARE_TR_FUNCTIONS( QgsExpressionNode );
+    Q_DECLARE_TR_FUNCTIONS( QgsExpressionNode )
 
   public:
 

diff --git a/src/core/raster/qgsrasterrenderer.cpp b/src/core/raster/qgsrasterrenderer.cpp
@@ -49,7 +49,7 @@ int QgsRasterRenderer::bandCount() const
 
 Qgis::DataType QgsRasterRenderer::dataType( int bandNo ) const
 {
-  QgsDebugMsgLevel( "Entered", 4 );
+  QgsDebugMsgLevel( QStringLiteral( "Entered" ), 4 );
 
   if ( mOn ) return Qgis::ARGB32_Premultiplied;
 

diff --git a/src/core/raster/qgsrasterrenderer.h b/src/core/raster/qgsrasterrenderer.h
@@ -37,7 +37,7 @@ class QgsRasterTransparency;
 class CORE_EXPORT QgsRasterRenderer : public QgsRasterInterface
 {
 
-    Q_DECLARE_TR_FUNCTIONS( QgsRasterRenderer );
+    Q_DECLARE_TR_FUNCTIONS( QgsRasterRenderer )
 
   public:
 

diff --git a/src/server/services/wmts/qgswmtsutils.cpp b/src/server/services/wmts/qgswmtsutils.cpp
@@ -39,7 +39,6 @@ namespace QgsWmts
 
     QgsCoordinateReferenceSystem wgs84 = QgsCoordinateReferenceSystem::fromOgcWmsCrs( GEO_EPSG_CRS_AUTHID );
 
-    int DOTS_PER_INCH = 72;
     double METERS_PER_INCH = 0.02540005080010160020;
     QMap< QgsUnitTypes::DistanceUnit, double> INCHES_PER_UNIT = populateInchesPerUnit();
     int tileWidth = 256;