Skip to content

Commit

Permalink
Fix valgrind jump on uninitialised values warnings
Browse files Browse the repository at this point in the history
  • Loading branch information
nyalldawson authored and m-kuhn committed Aug 7, 2017
1 parent f976e8b commit c6d8827
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 2 deletions.
2 changes: 1 addition & 1 deletion src/app/qgisapp.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -6329,7 +6329,7 @@ void QgisApp::saveAsVectorFileGeneral( QgsVectorLayer* vlayer, bool symbologyOpt

void QgisApp::checkForDeprecatedLabelsInProject()
{
bool ok;
bool ok = false;
QgsProject::instance()->readBoolEntry( "DeprecatedLabels", "/Enabled", false, &ok );
if ( ok ) // project already flagged (regardless of project property value)
{
Expand Down
3 changes: 2 additions & 1 deletion src/core/qgssnappingutils.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -609,7 +609,8 @@ void QgsSnappingUtils::readConfigFromProject()
setSnapOnIntersections( QgsProject::instance()->readNumEntry( "Digitizing", "/IntersectionSnapping", 0 ) );

//read snapping settings from project
bool snappingDefinedInProject, ok;
bool snappingDefinedInProject = false;
bool ok = false;
QStringList layerIdList = QgsProject::instance()->readListEntry( "Digitizing", "/LayerSnappingList", QStringList(), &snappingDefinedInProject );
QStringList enabledList = QgsProject::instance()->readListEntry( "Digitizing", "/LayerSnappingEnabledList", QStringList(), &ok );
QStringList toleranceList = QgsProject::instance()->readListEntry( "Digitizing", "/LayerSnappingToleranceList", QStringList(), &ok );
Expand Down
1 change: 1 addition & 0 deletions src/core/qgsvectorlayercache.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
QgsVectorLayerCache::QgsVectorLayerCache( QgsVectorLayer* layer, int cacheSize, QObject* parent )
: QObject( parent )
, mLayer( layer )
, mCacheGeometry( true )
, mFullCache( false )
{
mCache.setMaxCost( cacheSize );
Expand Down

0 comments on commit c6d8827

Please sign in to comment.