Drop function headers from the parser code

szekerest · nyalldawson · commit 861ab7a9fd98 · 2019-06-15T15:16:42.000+10:00
diff --git a/src/providers/mssql/qgsmssqlgeometryparser.cpp b/src/providers/mssql/qgsmssqlgeometryparser.cpp
@@ -159,10 +159,6 @@ SegmentType (1 byte)
 #define ReadZ(iPoint) (ReadDouble(mPointPos + 16 * mNumPoints + 8 * (iPoint)))
 #define ReadM(iPoint) (ReadDouble(mPointPos + 24 * mNumPoints + 8 * (iPoint)))
 
-/************************************************************************/
-/*                   QgsMssqlGeometryParser()                           */
-/************************************************************************/
-
 QgsMssqlGeometryParser::QgsMssqlGeometryParser()
 {
 }
@@ -200,10 +196,6 @@ void QgsMssqlGeometryParser::DumpMemoryToLog( const char *pszMsg, unsigned char
 #endif
 }
 
-/************************************************************************/
-/*                         readPoint()                                  */
-/************************************************************************/
-
 QgsPoint QgsMssqlGeometryParser::readCoordinates( int iPoint )
 {
   if ( mIsGeography )
@@ -230,10 +222,6 @@ QgsPoint QgsMssqlGeometryParser::readCoordinates( int iPoint )
   }
 }
 
-/************************************************************************/
-/*                         readPointSequence()                          */
-/************************************************************************/
-
 const QgsPointSequence QgsMssqlGeometryParser::readPointSequence( int iPoint, int iNextPoint )
 {
   if ( iPoint >= iNextPoint )
@@ -252,10 +240,6 @@ const QgsPointSequence QgsMssqlGeometryParser::readPointSequence( int iPoint, in
   return pts;
 }
 
-/************************************************************************/
-/*                         readPoint()                                  */
-/************************************************************************/
-
 std::unique_ptr< QgsPoint > QgsMssqlGeometryParser::readPoint( int iFigure )
 {
   if ( iFigure < mNumFigures )
@@ -269,10 +253,6 @@ std::unique_ptr< QgsPoint > QgsMssqlGeometryParser::readPoint( int iFigure )
   return nullptr;
 }
 
-/************************************************************************/
-/*                         readMultiPoint()                             */
-/************************************************************************/
-
 std::unique_ptr< QgsMultiPoint > QgsMssqlGeometryParser::readMultiPoint( int iShape )
 {
   std::unique_ptr< QgsMultiPoint > poMultiPoint = qgis::make_unique< QgsMultiPoint >();
@@ -288,10 +268,6 @@ std::unique_ptr< QgsMultiPoint > QgsMssqlGeometryParser::readMultiPoint( int iSh
   return poMultiPoint;
 }
 
-/************************************************************************/
-/*                         readLineString()                             */
-/************************************************************************/
-
 std::unique_ptr< QgsLineString > QgsMssqlGeometryParser::readLineString( int iPoint, int iNextPoint )
 {
   return qgis::make_unique< QgsLineString >( readPointSequence( iPoint, iNextPoint ) );
@@ -302,10 +278,6 @@ std::unique_ptr< QgsLineString > QgsMssqlGeometryParser::readLineString( int iFi
   return readLineString( PointOffset( iFigure ), NextPointOffset( iFigure ) );
 }
 
-/************************************************************************/
-/*                         readCircularString()                         */
-/************************************************************************/
-
 std::unique_ptr< QgsCircularString > QgsMssqlGeometryParser::readCircularString( int iPoint, int iNextPoint )
 {
   std::unique_ptr< QgsCircularString > poCircularString = qgis::make_unique< QgsCircularString >();
@@ -318,10 +290,6 @@ std::unique_ptr< QgsCircularString > QgsMssqlGeometryParser::readCircularString(
   return readCircularString( PointOffset( iFigure ), NextPointOffset( iFigure ) );
 }
 
-/************************************************************************/
-/*                         readMultiLineString()                        */
-/************************************************************************/
-
 std::unique_ptr< QgsMultiLineString > QgsMssqlGeometryParser::readMultiLineString( int iShape )
 {
   std::unique_ptr< QgsMultiLineString > poMultiLineString = qgis::make_unique< QgsMultiLineString >();
@@ -337,10 +305,6 @@ std::unique_ptr< QgsMultiLineString > QgsMssqlGeometryParser::readMultiLineStrin
   return poMultiLineString;
 }
 
-/************************************************************************/
-/*                         readPolygon()                                */
-/************************************************************************/
-
 std::unique_ptr< QgsPolygon > QgsMssqlGeometryParser::readPolygon( int iShape )
 {
   int iFigure;
@@ -360,10 +324,6 @@ std::unique_ptr< QgsPolygon > QgsMssqlGeometryParser::readPolygon( int iShape )
   return poPoly;
 }
 
-/************************************************************************/
-/*                         readMultiPolygon()                           */
-/************************************************************************/
-
 std::unique_ptr< QgsMultiPolygon > QgsMssqlGeometryParser::readMultiPolygon( int iShape )
 {
   std::unique_ptr< QgsMultiPolygon > poMultiPolygon = qgis::make_unique< QgsMultiPolygon >();
@@ -379,10 +339,6 @@ std::unique_ptr< QgsMultiPolygon > QgsMssqlGeometryParser::readMultiPolygon( int
   return poMultiPolygon;
 }
 
-/************************************************************************/
-/*                         readCompoundCurve()                          */
-/************************************************************************/
-
 std::unique_ptr< QgsCompoundCurve > QgsMssqlGeometryParser::readCompoundCurve( int iFigure )
 {
   int iPoint, iNextPoint, nPointsPrepared;
@@ -442,10 +398,6 @@ std::unique_ptr< QgsCompoundCurve > QgsMssqlGeometryParser::readCompoundCurve( i
   return poCompoundCurve;
 }
 
-/************************************************************************/
-/*                         readCurvePolygon()                         */
-/************************************************************************/
-
 std::unique_ptr< QgsCurvePolygon > QgsMssqlGeometryParser::readCurvePolygon( int iShape )
 {
   int iFigure;
@@ -481,10 +433,6 @@ std::unique_ptr< QgsCurvePolygon > QgsMssqlGeometryParser::readCurvePolygon( int
   return poPoly;
 }
 
-/************************************************************************/
-/*                         readGeometryCollection()                     */
-/************************************************************************/
-
 std::unique_ptr< QgsGeometryCollection > QgsMssqlGeometryParser::readGeometryCollection( int iShape )
 {
   std::unique_ptr< QgsGeometryCollection> poGeomColl = qgis::make_unique< QgsGeometryCollection >();
@@ -531,10 +479,6 @@ std::unique_ptr< QgsGeometryCollection > QgsMssqlGeometryParser::readGeometryCol
   return poGeomColl;
 }
 
-/************************************************************************/
-/*                         parseSqlGeometry()                           */
-/************************************************************************/
-
 std::unique_ptr<QgsAbstractGeometry> QgsMssqlGeometryParser::parseSqlGeometry( unsigned char *pszInput, int nLen )
 {
   if ( nLen < 10 )

Original file line number	Diff line number	Diff line change
`@@ -159,10 +159,6 @@ SegmentType (1 byte)`
`159`	`159`	`#define ReadZ(iPoint) (ReadDouble(mPointPos + 16 * mNumPoints + 8 * (iPoint)))`
`160`	`160`	`#define ReadM(iPoint) (ReadDouble(mPointPos + 24 * mNumPoints + 8 * (iPoint)))`
`161`	`161`
`162`		`-/************************************************************************/`
`163`		`-/* QgsMssqlGeometryParser() */`
`164`		`-/************************************************************************/`
`165`		`-`
`166`	`162`	`QgsMssqlGeometryParser::QgsMssqlGeometryParser()`
`167`	`163`	`{`
`168`	`164`	`}`
`@@ -200,10 +196,6 @@ void QgsMssqlGeometryParser::DumpMemoryToLog( const char *pszMsg, unsigned char`
`200`	`196`	`#endif`
`201`	`197`	`}`
`202`	`198`
`203`		`-/************************************************************************/`
`204`		`-/* readPoint() */`
`205`		`-/************************************************************************/`
`206`		`-`
`207`	`199`	`QgsPoint QgsMssqlGeometryParser::readCoordinates( int iPoint )`
`208`	`200`	`{`
`209`	`201`	`if ( mIsGeography )`
`@@ -230,10 +222,6 @@ QgsPoint QgsMssqlGeometryParser::readCoordinates( int iPoint )`
`230`	`222`	`}`
`231`	`223`	`}`
`232`	`224`
`233`		`-/************************************************************************/`
`234`		`-/* readPointSequence() */`
`235`		`-/************************************************************************/`
`236`		`-`
`237`	`225`	`const QgsPointSequence QgsMssqlGeometryParser::readPointSequence( int iPoint, int iNextPoint )`
`238`	`226`	`{`
`239`	`227`	`if ( iPoint >= iNextPoint )`
`@@ -252,10 +240,6 @@ const QgsPointSequence QgsMssqlGeometryParser::readPointSequence( int iPoint, in`
`252`	`240`	`return pts;`
`253`	`241`	`}`
`254`	`242`
`255`		`-/************************************************************************/`
`256`		`-/* readPoint() */`
`257`		`-/************************************************************************/`
`258`		`-`
`259`	`243`	`std::unique_ptr< QgsPoint > QgsMssqlGeometryParser::readPoint( int iFigure )`
`260`	`244`	`{`
`261`	`245`	`if ( iFigure < mNumFigures )`
`@@ -269,10 +253,6 @@ std::unique_ptr< QgsPoint > QgsMssqlGeometryParser::readPoint( int iFigure )`
`269`	`253`	`return nullptr;`
`270`	`254`	`}`
`271`	`255`
`272`		`-/************************************************************************/`
`273`		`-/* readMultiPoint() */`
`274`		`-/************************************************************************/`
`275`		`-`
`276`	`256`	`std::unique_ptr< QgsMultiPoint > QgsMssqlGeometryParser::readMultiPoint( int iShape )`
`277`	`257`	`{`
`278`	`258`	`std::unique_ptr< QgsMultiPoint > poMultiPoint = qgis::make_unique< QgsMultiPoint >();`
`@@ -288,10 +268,6 @@ std::unique_ptr< QgsMultiPoint > QgsMssqlGeometryParser::readMultiPoint( int iSh`
`288`	`268`	`return poMultiPoint;`
`289`	`269`	`}`
`290`	`270`
`291`		`-/************************************************************************/`
`292`		`-/* readLineString() */`
`293`		`-/************************************************************************/`
`294`		`-`
`295`	`271`	`std::unique_ptr< QgsLineString > QgsMssqlGeometryParser::readLineString( int iPoint, int iNextPoint )`
`296`	`272`	`{`
`297`	`273`	`return qgis::make_unique< QgsLineString >( readPointSequence( iPoint, iNextPoint ) );`
`@@ -302,10 +278,6 @@ std::unique_ptr< QgsLineString > QgsMssqlGeometryParser::readLineString( int iFi`
`302`	`278`	`return readLineString( PointOffset( iFigure ), NextPointOffset( iFigure ) );`
`303`	`279`	`}`
`304`	`280`
`305`		`-/************************************************************************/`
`306`		`-/* readCircularString() */`
`307`		`-/************************************************************************/`
`308`		`-`
`309`	`281`	`std::unique_ptr< QgsCircularString > QgsMssqlGeometryParser::readCircularString( int iPoint, int iNextPoint )`
`310`	`282`	`{`
`311`	`283`	`std::unique_ptr< QgsCircularString > poCircularString = qgis::make_unique< QgsCircularString >();`
`@@ -318,10 +290,6 @@ std::unique_ptr< QgsCircularString > QgsMssqlGeometryParser::readCircularString(`
`318`	`290`	`return readCircularString( PointOffset( iFigure ), NextPointOffset( iFigure ) );`
`319`	`291`	`}`
`320`	`292`
`321`		`-/************************************************************************/`
`322`		`-/* readMultiLineString() */`
`323`		`-/************************************************************************/`
`324`		`-`
`325`	`293`	`std::unique_ptr< QgsMultiLineString > QgsMssqlGeometryParser::readMultiLineString( int iShape )`
`326`	`294`	`{`
`327`	`295`	`std::unique_ptr< QgsMultiLineString > poMultiLineString = qgis::make_unique< QgsMultiLineString >();`
`@@ -337,10 +305,6 @@ std::unique_ptr< QgsMultiLineString > QgsMssqlGeometryParser::readMultiLineStrin`
`337`	`305`	`return poMultiLineString;`
`338`	`306`	`}`
`339`	`307`
`340`		`-/************************************************************************/`
`341`		`-/* readPolygon() */`
`342`		`-/************************************************************************/`
`343`		`-`
`344`	`308`	`std::unique_ptr< QgsPolygon > QgsMssqlGeometryParser::readPolygon( int iShape )`
`345`	`309`	`{`
`346`	`310`	`int iFigure;`
`@@ -360,10 +324,6 @@ std::unique_ptr< QgsPolygon > QgsMssqlGeometryParser::readPolygon( int iShape )`
`360`	`324`	`return poPoly;`
`361`	`325`	`}`
`362`	`326`
`363`		`-/************************************************************************/`
`364`		`-/* readMultiPolygon() */`
`365`		`-/************************************************************************/`
`366`		`-`
`367`	`327`	`std::unique_ptr< QgsMultiPolygon > QgsMssqlGeometryParser::readMultiPolygon( int iShape )`
`368`	`328`	`{`
`369`	`329`	`std::unique_ptr< QgsMultiPolygon > poMultiPolygon = qgis::make_unique< QgsMultiPolygon >();`
`@@ -379,10 +339,6 @@ std::unique_ptr< QgsMultiPolygon > QgsMssqlGeometryParser::readMultiPolygon( int`
`379`	`339`	`return poMultiPolygon;`
`380`	`340`	`}`
`381`	`341`
`382`		`-/************************************************************************/`
`383`		`-/* readCompoundCurve() */`
`384`		`-/************************************************************************/`
`385`		`-`
`386`	`342`	`std::unique_ptr< QgsCompoundCurve > QgsMssqlGeometryParser::readCompoundCurve( int iFigure )`
`387`	`343`	`{`
`388`	`344`	`int iPoint, iNextPoint, nPointsPrepared;`
`@@ -442,10 +398,6 @@ std::unique_ptr< QgsCompoundCurve > QgsMssqlGeometryParser::readCompoundCurve( i`
`442`	`398`	`return poCompoundCurve;`
`443`	`399`	`}`
`444`	`400`
`445`		`-/************************************************************************/`
`446`		`-/* readCurvePolygon() */`
`447`		`-/************************************************************************/`
`448`		`-`
`449`	`401`	`std::unique_ptr< QgsCurvePolygon > QgsMssqlGeometryParser::readCurvePolygon( int iShape )`
`450`	`402`	`{`
`451`	`403`	`int iFigure;`
`@@ -481,10 +433,6 @@ std::unique_ptr< QgsCurvePolygon > QgsMssqlGeometryParser::readCurvePolygon( int`
`481`	`433`	`return poPoly;`
`482`	`434`	`}`
`483`	`435`
`484`		`-/************************************************************************/`
`485`		`-/* readGeometryCollection() */`
`486`		`-/************************************************************************/`
`487`		`-`
`488`	`436`	`std::unique_ptr< QgsGeometryCollection > QgsMssqlGeometryParser::readGeometryCollection( int iShape )`
`489`	`437`	`{`
`490`	`438`	`std::unique_ptr< QgsGeometryCollection> poGeomColl = qgis::make_unique< QgsGeometryCollection >();`
`@@ -531,10 +479,6 @@ std::unique_ptr< QgsGeometryCollection > QgsMssqlGeometryParser::readGeometryCol`
`531`	`479`	`return poGeomColl;`
`532`	`480`	`}`
`533`	`481`
`534`		`-/************************************************************************/`
`535`		`-/* parseSqlGeometry() */`
`536`		`-/************************************************************************/`
`537`		`-`
`538`	`482`	`std::unique_ptr<QgsAbstractGeometry> QgsMssqlGeometryParser::parseSqlGeometry( unsigned char *pszInput, int nLen )`
`539`	`483`	`{`
`540`	`484`	`if ( nLen < 10 )`