Replace getter names

pblottiere · pblottiere · commit d67875fee86e · 2019-02-26T08:24:37.000Z
diff --git a/src/server/services/wms/qgswmsgetlegendgraphics.cpp b/src/server/services/wms/qgswmsgetlegendgraphics.cpp
@@ -85,7 +85,7 @@ namespace QgsWms
 
     if ( result )
     {
-      writeImage( response, *result,  format, renderer.getImageQuality() );
+      writeImage( response, *result,  format, renderer.imageQuality() );
       if ( cacheManager )
       {
         QByteArray content = response.data();
diff --git a/src/server/services/wms/qgswmsgetmap.cpp b/src/server/services/wms/qgswmsgetmap.cpp
@@ -42,7 +42,7 @@ namespace QgsWms
     if ( result )
     {
       QString format = params.value( QStringLiteral( "FORMAT" ), QStringLiteral( "PNG" ) );
-      writeImage( response, *result, format, renderer.getImageQuality() );
+      writeImage( response, *result, format, renderer.imageQuality() );
     }
     else
     {
diff --git a/src/server/services/wms/qgswmsrenderer.cpp b/src/server/services/wms/qgswmsrenderer.cpp
@@ -1753,10 +1753,10 @@ namespace QgsWms
         {
           QDomElement bBoxElem = infoDocument.createElement( QStringLiteral( "BoundingBox" ) );
           bBoxElem.setAttribute( version == QLatin1String( "1.1.1" ) ? "SRS" : "CRS", outputCrs.authid() );
-          bBoxElem.setAttribute( QStringLiteral( "minx" ), qgsDoubleToString( box.xMinimum(), getWMSPrecision() ) );
-          bBoxElem.setAttribute( QStringLiteral( "maxx" ), qgsDoubleToString( box.xMaximum(), getWMSPrecision() ) );
-          bBoxElem.setAttribute( QStringLiteral( "miny" ), qgsDoubleToString( box.yMinimum(), getWMSPrecision() ) );
-          bBoxElem.setAttribute( QStringLiteral( "maxy" ), qgsDoubleToString( box.yMaximum(), getWMSPrecision() ) );
+          bBoxElem.setAttribute( QStringLiteral( "minx" ), qgsDoubleToString( box.xMinimum(), wmsPrecision() ) );
+          bBoxElem.setAttribute( QStringLiteral( "maxx" ), qgsDoubleToString( box.xMaximum(), wmsPrecision() ) );
+          bBoxElem.setAttribute( QStringLiteral( "miny" ), qgsDoubleToString( box.yMinimum(), wmsPrecision() ) );
+          bBoxElem.setAttribute( QStringLiteral( "maxy" ), qgsDoubleToString( box.yMaximum(), wmsPrecision() ) );
           featureElement.appendChild( bBoxElem );
         }
 
@@ -1787,7 +1787,7 @@ namespace QgsWms
             }
             QDomElement geometryElement = infoDocument.createElement( QStringLiteral( "Attribute" ) );
             geometryElement.setAttribute( QStringLiteral( "name" ), QStringLiteral( "geometry" ) );
-            geometryElement.setAttribute( QStringLiteral( "value" ), geom.asWkt( getWMSPrecision() ) );
+            geometryElement.setAttribute( QStringLiteral( "value" ), geom.asWkt( wmsPrecision() ) );
             geometryElement.setAttribute( QStringLiteral( "type" ), QStringLiteral( "derived" ) );
             featureElement.appendChild( geometryElement );
           }
@@ -2459,11 +2459,11 @@ namespace QgsWms
       QDomElement boxElem;
       if ( version < 3 )
       {
-        boxElem = QgsOgcUtils::rectangleToGMLBox( &box, doc, getWMSPrecision() );
+        boxElem = QgsOgcUtils::rectangleToGMLBox( &box, doc, wmsPrecision() );
       }
       else
       {
-        boxElem = QgsOgcUtils::rectangleToGMLEnvelope( &box, doc, getWMSPrecision() );
+        boxElem = QgsOgcUtils::rectangleToGMLEnvelope( &box, doc, wmsPrecision() );
       }
 
       if ( crs.isValid() )
@@ -2487,11 +2487,11 @@ namespace QgsWms
       QDomElement gmlElem;
       if ( version < 3 )
       {
-        gmlElem = QgsOgcUtils::geometryToGML( geom, doc, getWMSPrecision() );
+        gmlElem = QgsOgcUtils::geometryToGML( geom, doc, wmsPrecision() );
       }
       else
       {
-        gmlElem = QgsOgcUtils::geometryToGML( geom, doc, QStringLiteral( "GML3" ), getWMSPrecision() );
+        gmlElem = QgsOgcUtils::geometryToGML( geom, doc, QStringLiteral( "GML3" ), wmsPrecision() );
       }
 
       if ( !gmlElem.isNull() )
@@ -2564,7 +2564,7 @@ namespace QgsWms
     return value;
   }
 
-  int QgsRenderer::getImageQuality() const
+  int QgsRenderer::imageQuality() const
   {
     // First taken from QGIS project
     int imageQuality = QgsServerProjectUtils::wmsImageQuality( *mProject );
@@ -2578,7 +2578,7 @@ namespace QgsWms
     return imageQuality;
   }
 
-  int QgsRenderer::getWMSPrecision() const
+  int QgsRenderer::wmsPrecision() const
   {
     // First taken from QGIS project and the default value is 6
     int WMSPrecision = QgsServerProjectUtils::wmsFeatureInfoPrecision( *mProject );
diff --git a/src/server/services/wms/qgswmsrenderer.h b/src/server/services/wms/qgswmsrenderer.h
@@ -309,10 +309,10 @@ namespace QgsWms
     public:
 
       //! Returns the image quality to use for getMap request
-      int getImageQuality() const;
+      int imageQuality() const;
 
       //! Returns the precision to use for GetFeatureInfo request
-      int getWMSPrecision() const;
+      int wmsPrecision() const;
 
   };
 

Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,7 @@ namespace QgsWms`
`85`	`85`
`86`	`86`	`if ( result )`
`87`	`87`	`{`
`88`		`- writeImage( response, *result, format, renderer.getImageQuality() );`
	`88`	`+ writeImage( response, *result, format, renderer.imageQuality() );`
`89`	`89`	`if ( cacheManager )`
`90`	`90`	`{`
`91`	`91`	`QByteArray content = response.data();`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ namespace QgsWms`
`42`	`42`	`if ( result )`
`43`	`43`	`{`
`44`	`44`	`QString format = params.value( QStringLiteral( "FORMAT" ), QStringLiteral( "PNG" ) );`
`45`		`- writeImage( response, *result, format, renderer.getImageQuality() );`
	`45`	`+ writeImage( response, *result, format, renderer.imageQuality() );`
`46`	`46`	`}`
`47`	`47`	`else`
`48`	`48`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1753,10 +1753,10 @@ namespace QgsWms`
`1753`	`1753`	`{`
`1754`	`1754`	`QDomElement bBoxElem = infoDocument.createElement( QStringLiteral( "BoundingBox" ) );`
`1755`	`1755`	`bBoxElem.setAttribute( version == QLatin1String( "1.1.1" ) ? "SRS" : "CRS", outputCrs.authid() );`
`1756`		`- bBoxElem.setAttribute( QStringLiteral( "minx" ), qgsDoubleToString( box.xMinimum(), getWMSPrecision() ) );`
`1757`		`- bBoxElem.setAttribute( QStringLiteral( "maxx" ), qgsDoubleToString( box.xMaximum(), getWMSPrecision() ) );`
`1758`		`- bBoxElem.setAttribute( QStringLiteral( "miny" ), qgsDoubleToString( box.yMinimum(), getWMSPrecision() ) );`
`1759`		`- bBoxElem.setAttribute( QStringLiteral( "maxy" ), qgsDoubleToString( box.yMaximum(), getWMSPrecision() ) );`
	`1756`	`+ bBoxElem.setAttribute( QStringLiteral( "minx" ), qgsDoubleToString( box.xMinimum(), wmsPrecision() ) );`
	`1757`	`+ bBoxElem.setAttribute( QStringLiteral( "maxx" ), qgsDoubleToString( box.xMaximum(), wmsPrecision() ) );`
	`1758`	`+ bBoxElem.setAttribute( QStringLiteral( "miny" ), qgsDoubleToString( box.yMinimum(), wmsPrecision() ) );`
	`1759`	`+ bBoxElem.setAttribute( QStringLiteral( "maxy" ), qgsDoubleToString( box.yMaximum(), wmsPrecision() ) );`
`1760`	`1760`	`featureElement.appendChild( bBoxElem );`
`1761`	`1761`	`}`
`1762`	`1762`
`@@ -1787,7 +1787,7 @@ namespace QgsWms`
`1787`	`1787`	`}`
`1788`	`1788`	`QDomElement geometryElement = infoDocument.createElement( QStringLiteral( "Attribute" ) );`
`1789`	`1789`	`geometryElement.setAttribute( QStringLiteral( "name" ), QStringLiteral( "geometry" ) );`
`1790`		`- geometryElement.setAttribute( QStringLiteral( "value" ), geom.asWkt( getWMSPrecision() ) );`
	`1790`	`+ geometryElement.setAttribute( QStringLiteral( "value" ), geom.asWkt( wmsPrecision() ) );`
`1791`	`1791`	`geometryElement.setAttribute( QStringLiteral( "type" ), QStringLiteral( "derived" ) );`
`1792`	`1792`	`featureElement.appendChild( geometryElement );`
`1793`	`1793`	`}`
`@@ -2459,11 +2459,11 @@ namespace QgsWms`
`2459`	`2459`	`QDomElement boxElem;`
`2460`	`2460`	`if ( version < 3 )`
`2461`	`2461`	`{`
`2462`		`- boxElem = QgsOgcUtils::rectangleToGMLBox( &box, doc, getWMSPrecision() );`
	`2462`	`+ boxElem = QgsOgcUtils::rectangleToGMLBox( &box, doc, wmsPrecision() );`
`2463`	`2463`	`}`
`2464`	`2464`	`else`
`2465`	`2465`	`{`
`2466`		`- boxElem = QgsOgcUtils::rectangleToGMLEnvelope( &box, doc, getWMSPrecision() );`
	`2466`	`+ boxElem = QgsOgcUtils::rectangleToGMLEnvelope( &box, doc, wmsPrecision() );`
`2467`	`2467`	`}`
`2468`	`2468`
`2469`	`2469`	`if ( crs.isValid() )`
`@@ -2487,11 +2487,11 @@ namespace QgsWms`
`2487`	`2487`	`QDomElement gmlElem;`
`2488`	`2488`	`if ( version < 3 )`
`2489`	`2489`	`{`
`2490`		`- gmlElem = QgsOgcUtils::geometryToGML( geom, doc, getWMSPrecision() );`
	`2490`	`+ gmlElem = QgsOgcUtils::geometryToGML( geom, doc, wmsPrecision() );`
`2491`	`2491`	`}`
`2492`	`2492`	`else`
`2493`	`2493`	`{`
`2494`		`- gmlElem = QgsOgcUtils::geometryToGML( geom, doc, QStringLiteral( "GML3" ), getWMSPrecision() );`
	`2494`	`+ gmlElem = QgsOgcUtils::geometryToGML( geom, doc, QStringLiteral( "GML3" ), wmsPrecision() );`
`2495`	`2495`	`}`
`2496`	`2496`
`2497`	`2497`	`if ( !gmlElem.isNull() )`
`@@ -2564,7 +2564,7 @@ namespace QgsWms`
`2564`	`2564`	`return value;`
`2565`	`2565`	`}`
`2566`	`2566`
`2567`		`- int QgsRenderer::getImageQuality() const`
	`2567`	`+ int QgsRenderer::imageQuality() const`
`2568`	`2568`	`{`
`2569`	`2569`	`// First taken from QGIS project`
`2570`	`2570`	`int imageQuality = QgsServerProjectUtils::wmsImageQuality( *mProject );`
`@@ -2578,7 +2578,7 @@ namespace QgsWms`
`2578`	`2578`	`return imageQuality;`
`2579`	`2579`	`}`
`2580`	`2580`
`2581`		`- int QgsRenderer::getWMSPrecision() const`
	`2581`	`+ int QgsRenderer::wmsPrecision() const`
`2582`	`2582`	`{`
`2583`	`2583`	`// First taken from QGIS project and the default value is 6`
`2584`	`2584`	`int WMSPrecision = QgsServerProjectUtils::wmsFeatureInfoPrecision( *mProject );`