Apply lower case to member functions for the mssql driver

qgis · Jun 15, 2019 · 95ab580 · 95ab580
1 parent 941e3ff
commit 95ab580
Show file tree

Hide file tree

Showing 5 changed files with 99 additions and 99 deletions.
diff --git a/src/providers/mssql/qgsmssqlfeatureiterator.cpp b/src/providers/mssql/qgsmssqlfeatureiterator.cpp
@@ -66,7 +66,7 @@ QgsMssqlFeatureIterator::~QgsMssqlFeatureIterator()
   close();
 }
 
-double QgsMssqlFeatureIterator::ValidLat( const double latitude )
+double QgsMssqlFeatureIterator::validLat( const double latitude ) const
 {
   if ( latitude < -90.0 )
     return -90.0;
@@ -75,7 +75,7 @@ double QgsMssqlFeatureIterator::ValidLat( const double latitude )
   return latitude;
 }
 
-double QgsMssqlFeatureIterator::ValidLon( const double longitude )
+double QgsMssqlFeatureIterator::validLon( const double longitude ) const
 {
   if ( longitude < -15069.0 )
     return -15069.0;
@@ -164,11 +164,11 @@ void QgsMssqlFeatureIterator::BuildStatement( const QgsFeatureRequest &request )
     }
     else
     {
-      foo << qgsDoubleToString( ValidLon( mFilterRect.xMinimum() ) ) << ' ' << qgsDoubleToString( ValidLat( mFilterRect.yMinimum() ) ) << ", "
-          << qgsDoubleToString( ValidLon( mFilterRect.xMaximum() ) ) << ' ' << qgsDoubleToString( ValidLat( mFilterRect.yMinimum() ) ) << ", "
-          << qgsDoubleToString( ValidLon( mFilterRect.xMaximum() ) ) << ' ' << qgsDoubleToString( ValidLat( mFilterRect.yMaximum() ) ) << ", "
-          << qgsDoubleToString( ValidLon( mFilterRect.xMinimum() ) ) << ' ' << qgsDoubleToString( ValidLat( mFilterRect.yMaximum() ) ) << ", "
-          << qgsDoubleToString( ValidLon( mFilterRect.xMinimum() ) ) << ' ' << qgsDoubleToString( ValidLat( mFilterRect.yMinimum() ) );
+      foo << qgsDoubleToString( validLon( mFilterRect.xMinimum() ) ) << ' ' << qgsDoubleToString( validLat( mFilterRect.yMinimum() ) ) << ", "
+          << qgsDoubleToString( validLon( mFilterRect.xMaximum() ) ) << ' ' << qgsDoubleToString( validLat( mFilterRect.yMinimum() ) ) << ", "
+          << qgsDoubleToString( validLon( mFilterRect.xMaximum() ) ) << ' ' << qgsDoubleToString( validLat( mFilterRect.yMaximum() ) ) << ", "
+          << qgsDoubleToString( validLon( mFilterRect.xMinimum() ) ) << ' ' << qgsDoubleToString( validLat( mFilterRect.yMaximum() ) ) << ", "
+          << qgsDoubleToString( validLon( mFilterRect.xMinimum() ) ) << ' ' << qgsDoubleToString( validLat( mFilterRect.yMinimum() ) );
     }
 
     mStatement += QStringLiteral( " WHERE " );
@@ -406,7 +406,7 @@ bool QgsMssqlFeatureIterator::fetchFeature( QgsFeature &feature )
       QByteArray ar = mQuery->record().value( mSource->mGeometryColName ).toByteArray();
       if ( !ar.isEmpty() )
       {
-        std::unique_ptr<QgsAbstractGeometry> geom = mParser.ParseSqlGeometry( reinterpret_cast< unsigned char * >( ar.data() ), ar.size() );
+        std::unique_ptr<QgsAbstractGeometry> geom = mParser.parseSqlGeometry( reinterpret_cast< unsigned char * >( ar.data() ), ar.size() );
         if ( geom != nullptr )
         {
           feature.setGeometry( QgsGeometry( std::move( geom ) ) );

diff --git a/src/providers/mssql/qgsmssqlfeatureiterator.h b/src/providers/mssql/qgsmssqlfeatureiterator.h
@@ -95,8 +95,8 @@ class QgsMssqlFeatureIterator : public QgsAbstractFeatureIteratorFromSource<QgsM
 
     bool prepareOrderBy( const QList<QgsFeatureRequest::OrderByClause> &orderBys ) override;
 
-    double ValidLat( const double latitude );
-    double ValidLon( const double longitude );
+    double validLat( const double latitude ) const;
+    double validLon( const double longitude ) const;
 
     // The current database
     QSqlDatabase mDatabase;