Skip to content

Commit

Permalink
Drop function headers from the parser code
Browse files Browse the repository at this point in the history
  • Loading branch information
@szekerest @nyalldawson
szekerest authored and nyalldawson committed Jun 15, 2019
1 parent abc3922 commit 861ab7a
Showing 1 changed file with 0 additions and 56 deletions.
56 changes: 0 additions & 56 deletions src/providers/mssql/qgsmssqlgeometryparser.cpp
View file
Expand Up @@ -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()
{
}
Expand Down Expand Up @@ -200,10 +196,6 @@ void QgsMssqlGeometryParser::DumpMemoryToLog( const char *pszMsg, unsigned char
#endif
}

/************************************************************************/
/* readPoint() */
/************************************************************************/

QgsPoint QgsMssqlGeometryParser::readCoordinates( int iPoint )
{
if ( mIsGeography )
Expand All @@ -230,10 +222,6 @@ QgsPoint QgsMssqlGeometryParser::readCoordinates( int iPoint )
}
}

/************************************************************************/
/* readPointSequence() */
/************************************************************************/

const QgsPointSequence QgsMssqlGeometryParser::readPointSequence( int iPoint, int iNextPoint )
{
if ( iPoint >= iNextPoint )
Expand All @@ -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 )
Expand All @@ -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 >();
Expand All @@ -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 ) );
Expand All @@ -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 >();
Expand All @@ -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 >();
Expand All @@ -337,10 +305,6 @@ std::unique_ptr< QgsMultiLineString > QgsMssqlGeometryParser::readMultiLineStrin
return poMultiLineString;
}

/************************************************************************/
/* readPolygon() */
/************************************************************************/

std::unique_ptr< QgsPolygon > QgsMssqlGeometryParser::readPolygon( int iShape )
{
int iFigure;
Expand All @@ -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 >();
Expand All @@ -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;
Expand Down Expand Up @@ -442,10 +398,6 @@ std::unique_ptr< QgsCompoundCurve > QgsMssqlGeometryParser::readCompoundCurve( i
return poCompoundCurve;
}

/************************************************************************/
/* readCurvePolygon() */
/************************************************************************/

std::unique_ptr< QgsCurvePolygon > QgsMssqlGeometryParser::readCurvePolygon( int iShape )
{
int iFigure;
Expand Down Expand Up @@ -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 >();
Expand Down Expand Up @@ -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 )
Expand Down

0 comments on commit 861ab7a

Please sign in to comment.