some fixes (missing include, duplicated line, wrong variable name)

3nids · 3nids · commit c9e928932aca · 2015-12-23T16:00:33.000+01:00
diff --git a/src/app/nodetool/qgsmaptoolnodetool.cpp b/src/app/nodetool/qgsmaptoolnodetool.cpp
@@ -30,6 +30,7 @@
 
 #include <QMouseEvent>
 #include <QRubberBand>
+#include <QSettings>
 
 QgsMapToolNodeTool::QgsMapToolNodeTool( QgsMapCanvas* canvas )
     : QgsMapToolEdit( canvas )
@@ -129,7 +130,6 @@ void QgsMapToolNodeTool::canvasMoveEvent( QgsMapMouseEvent* e )
         mSelectRubberBand = nullptr;
       }
       QgsGeometryRubberBand* rb = new QgsGeometryRubberBand( mCanvas, mSelectedFeature->geometry()->type() );
-      QSettings settings;
       QColor color(
         settings.value( "/qgis/digitizing/line_color_red", 255 ).toInt(),
         settings.value( "/qgis/digitizing/line_color_green", 0 ).toInt(),
diff --git a/src/app/qgsoptions.cpp b/src/app/qgsoptions.cpp
@@ -804,7 +804,7 @@ QgsOptions::QgsOptions( QWidget *parent, Qt::WindowFlags fl ) :
   mFillColorToolButton->setContext( "gui" );
   mFillColorToolButton->setDefaultColor( QColor( 255, 0, 0, 30 ) );
 
-  mLineGhostCheckBox->setChecked( settings.value( "/qgis/digitizing/line_ghost", false ).toBool() );
+  mLineGhostCheckBox->setChecked( mSettings->value( "/qgis/digitizing/line_ghost", false ).toBool() );
 
   //default snap mode
   mDefaultSnapModeComboBox->insertItem( 0, tr( "To vertex" ), "to vertex" );
