Skip to content
Permalink
Browse files
fix warnings
  • Loading branch information
jef-n committed Dec 15, 2013
1 parent c4b2480 commit 6e775b9020fb23979323c2c0d318d0bb46908459
@@ -32,7 +32,10 @@ class CORE_EXPORT QgsCoordinateTransformCache
~QgsCoordinateTransformCache();
/**Returns coordinate transformation. Cache keeps ownership
@param srcAuthId auth id string of source crs
@param destAuthId auth id string of dest crs*/
@param destAuthId auth id string of dest crs
@param srcDatumTransform id of source's datum transform
@param destDatumTransform id of destinations's datum transform
*/
const QgsCoordinateTransform* transform( const QString& srcAuthId, const QString& destAuthId, int srcDatumTransform = -1, int destDatumTransform = -1 );
/**Removes transformations where a changed crs is involved from the cache*/
void invalidateCrs( const QString& crsAuthId );
@@ -190,6 +190,7 @@ QgsFillSymbolLayerV2::QgsFillSymbolLayerV2( bool locked )

void QgsMarkerSymbolLayerV2::startRender( QgsSymbolV2RenderContext& context )
{
Q_UNUSED( context );
mOffsetExpression = expression( "offset" );
mHorizontalAnchorExpression = expression( "horizontal_anchor_point" );
mVerticalAnchorExpression = expression( "vertical_anchor_point" );
@@ -240,6 +240,7 @@ int main( int argc, char * argv[] )
QgsMapRenderer* theMapRenderer = new QgsMapRenderer();
theMapRenderer->setLabelingEngine( new QgsPalLabeling() );

#ifdef QGSMSDEBUG
// load standard test font from testdata.qrc (for unit tests)
bool testFontLoaded = false;
QFile testFont( ":/testdata/font/FreeSansQGIS.ttf" );
@@ -248,6 +249,7 @@ int main( int argc, char * argv[] )
int fontID = QFontDatabase::addApplicationFontFromData( testFont.readAll() );
testFontLoaded = ( fontID != -1 );
} // else app wasn't built with ENABLE_TESTS or not GUI app
#endif

while ( fcgi_accept() >= 0 )
{
@@ -873,6 +873,8 @@ void GlobePlugin::setSkyParameters( bool enabled, const QDateTime& dateTime, boo

#if OSGEARTH_VERSION_GREATER_OR_EQUAL( 2, 4, 0 )
mSkyNode->setAutoAmbience( autoAmbience );
#else
Q_UNUSED( autoAmbience );
#endif
mSkyNode->setDateTime( dateTime.date().year()
, dateTime.date().month()
@@ -800,6 +800,7 @@ void QgsOgrProvider::setRelevantFields( OGRLayerH ogrLayer, bool fetchGeometry,
mRelevantFieldsForNextFeature = false;

#else
Q_UNUSED( ogrLayer );
Q_UNUSED( fetchGeometry );
Q_UNUSED( fetchAttributes );
#endif

0 comments on commit 6e775b9

Please sign in to comment.