[Server] wmsInfoFormatSIA2045 to wmsInfoFormatSia2045: Qt style naming

rldhont · rldhont · commit 087e7f75dc3b · 2017-05-21T10:43:03.000+02:00
diff --git a/python/server/qgsserverprojectutils.sip b/python/server/qgsserverprojectutils.sip
@@ -121,7 +121,7 @@ namespace QgsServerProjectUtils
       * \param project the QGIS project
       * \returns if the info format is SIA20145.
       */
-    bool wmsInfoFormatSIA2045( const QgsProject &project );
+    bool wmsInfoFormatSia2045( const QgsProject &project );
 
     /** Returns if Inspire is activated.
       * \param project the QGIS project
diff --git a/src/server/qgsserverprojectutils.cpp b/src/server/qgsserverprojectutils.cpp
@@ -92,7 +92,7 @@ bool QgsServerProjectUtils::wmsUseLayerIds( const QgsProject &project )
   return project.readBoolEntry( QStringLiteral( "WMSUseLayerIDs" ), QStringLiteral( "/" ) );
 }
 
-bool QgsServerProjectUtils::wmsInfoFormatSIA2045( const QgsProject &project )
+bool QgsServerProjectUtils::wmsInfoFormatSia2045( const QgsProject &project )
 {
   QString sia2045 = project.readEntry( QStringLiteral( "WMSInfoFormatSIA2045" ), QStringLiteral( "/" ), "" );
 
diff --git a/src/server/qgsserverprojectutils.h b/src/server/qgsserverprojectutils.h
@@ -123,7 +123,7 @@ namespace QgsServerProjectUtils
     * \param project the QGIS project
     * \returns if the info format is SIA20145.
     */
-  SERVER_EXPORT bool wmsInfoFormatSIA2045( const QgsProject &project );
+  SERVER_EXPORT bool wmsInfoFormatSia2045( const QgsProject &project );
 
   /** Returns if Inspire is activated.
     * \param project the QGIS project
diff --git a/src/server/services/wms/qgswmsgetcapabilities.cpp b/src/server/services/wms/qgswmsgetcapabilities.cpp
@@ -224,7 +224,7 @@ namespace QgsWms
 
   QDomElement getServiceElement( QDomDocument &doc, const QgsProject *project, const QString &version )
   {
-    bool sia2045 = QgsServerProjectUtils::wmsInfoFormatSIA2045( *project );
+    bool sia2045 = QgsServerProjectUtils::wmsInfoFormatSia2045( *project );
 
     //Service element
     QDomElement serviceElem = doc.createElement( QStringLiteral( "Service" ) );
@@ -819,7 +819,7 @@ namespace QgsWms
                                     bool projectSettings )
     {
       bool useLayerIds = QgsServerProjectUtils::wmsUseLayerIds( *project );
-      bool siaFormat = QgsServerProjectUtils::wmsInfoFormatSIA2045( *project );
+      bool siaFormat = QgsServerProjectUtils::wmsInfoFormatSia2045( *project );
       QStringList restrictedLayers = QgsServerProjectUtils::wmsRestrictedLayers( *project );
 
       QList< QgsLayerTreeNode * > layerTreeGroupChildren = layerTreeGroup->children();

Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,7 @@ bool QgsServerProjectUtils::wmsUseLayerIds( const QgsProject &project )`
`92`	`92`	`return project.readBoolEntry( QStringLiteral( "WMSUseLayerIDs" ), QStringLiteral( "/" ) );`
`93`	`93`	`}`
`94`	`94`
`95`		`-bool QgsServerProjectUtils::wmsInfoFormatSIA2045( const QgsProject &project )`
	`95`	`+bool QgsServerProjectUtils::wmsInfoFormatSia2045( const QgsProject &project )`
`96`	`96`	`{`
`97`	`97`	`QString sia2045 = project.readEntry( QStringLiteral( "WMSInfoFormatSIA2045" ), QStringLiteral( "/" ), "" );`
`98`	`98`
Original file line number	Diff line number	Diff line change
`@@ -224,7 +224,7 @@ namespace QgsWms`
`224`	`224`
`225`	`225`	`QDomElement getServiceElement( QDomDocument &doc, const QgsProject *project, const QString &version )`
`226`	`226`	`{`
`227`		`- bool sia2045 = QgsServerProjectUtils::wmsInfoFormatSIA2045( *project );`
	`227`	`+ bool sia2045 = QgsServerProjectUtils::wmsInfoFormatSia2045( *project );`
`228`	`228`
`229`	`229`	`//Service element`
`230`	`230`	`QDomElement serviceElem = doc.createElement( QStringLiteral( "Service" ) );`
`@@ -819,7 +819,7 @@ namespace QgsWms`
`819`	`819`	`bool projectSettings )`
`820`	`820`	`{`
`821`	`821`	`bool useLayerIds = QgsServerProjectUtils::wmsUseLayerIds( *project );`
`822`		`- bool siaFormat = QgsServerProjectUtils::wmsInfoFormatSIA2045( *project );`
	`822`	`+ bool siaFormat = QgsServerProjectUtils::wmsInfoFormatSia2045( *project );`
`823`	`823`	`QStringList restrictedLayers = QgsServerProjectUtils::wmsRestrictedLayers( *project );`
`824`	`824`
`825`	`825`	`QList< QgsLayerTreeNode * > layerTreeGroupChildren = layerTreeGroup->children();`