[Server] wmsInfoFormatSIA2045 to wmsInfoFormatSia2045: Qt style naming

qgis · May 21, 2017 · 087e7f75dc3b5a8e5e5a1ffb391e51bbe8d65c61 · 087e7f7
1 parent ca29b22
commit 087e7f75dc3b5a8e5e5a1ffb391e51bbe8d65c61
Unified Split

Showing with 5 additions and 5 deletions.

+1 −1 python/server/qgsserverprojectutils.sip

+1 −1 src/server/qgsserverprojectutils.cpp

+1 −1 src/server/qgsserverprojectutils.h

+2 −2 src/server/services/wms/qgswmsgetcapabilities.cpp
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();