From f8eaa6eff4f97ed77e62ec5b2fc3c204dd0643e1 Mon Sep 17 00:00:00 2001
From: wmayer <wmayer@users.sourceforge.net>
Date: Fri, 26 Jan 2018 17:21:02 +0100
Subject: [PATCH] fix const correctness, restore sketcher icon

---
 src/Mod/Sketcher/App/SketchObject.cpp       | 2 +-
 src/Mod/Sketcher/App/SketchObject.h         | 2 +-
 src/Mod/Sketcher/Gui/Resources/Sketcher.qrc | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/Mod/Sketcher/App/SketchObject.cpp b/src/Mod/Sketcher/App/SketchObject.cpp
index 1772d93402..41c17a9777 100644
--- a/src/Mod/Sketcher/App/SketchObject.cpp
+++ b/src/Mod/Sketcher/App/SketchObject.cpp
@@ -439,7 +439,7 @@ int SketchObject::setVirtualSpace(int ConstrId, bool isinvirtualspace)
     return 0;
 }
 
-int SketchObject::getVirtualSpace(int ConstrId, bool &isinvirtualspace)
+int SketchObject::getVirtualSpace(int ConstrId, bool &isinvirtualspace) const
 {
     const std::vector<Constraint *> &vals = this->Constraints.getValues();
 
diff --git a/src/Mod/Sketcher/App/SketchObject.h b/src/Mod/Sketcher/App/SketchObject.h
index f71b28ac6b..ae756df62b 100644
--- a/src/Mod/Sketcher/App/SketchObject.h
+++ b/src/Mod/Sketcher/App/SketchObject.h
@@ -172,7 +172,7 @@ public:
     /// set the driving status of this constraint and solve
     int setVirtualSpace(int ConstrId, bool isinvirtualspace);
     /// get the driving status of this constraint
-    int getVirtualSpace(int ConstrId, bool &isinvirtualspace);
+    int getVirtualSpace(int ConstrId, bool &isinvirtualspace) const;
     /// toggle the driving status of this constraint
     int toggleVirtualSpace(int ConstrId);
     /// move this point to a new location and solve
diff --git a/src/Mod/Sketcher/Gui/Resources/Sketcher.qrc b/src/Mod/Sketcher/Gui/Resources/Sketcher.qrc
index 239fb354ec..8f8daa0da4 100644
--- a/src/Mod/Sketcher/Gui/Resources/Sketcher.qrc
+++ b/src/Mod/Sketcher/Gui/Resources/Sketcher.qrc
@@ -156,6 +156,7 @@
         <file>icons/Sketcher_MergeSketch.svg</file>
         <file>icons/Sketcher_MirrorSketch.svg</file>
         <file>icons/Sketcher_NewSketch.svg</file>
+        <file alias="icons/preferences-sketcher.svg">icons/Sketcher_NewSketch.svg</file>
         <file>icons/Sketcher_Parabolic_Arc.svg</file>
         <file>icons/Sketcher_Parabolic_Arc_Constr.svg</file>
         <file>icons/Sketcher_ProfilesHexagon1.svg</file>