Merge branch 'dev' into UnitTesting

src/IntelliHelper/IntelliToolsettings.h

@@ -5,33 +5,20 @@
 class UnitTest;
 
 class IntelliToolsettings {
-    friend UnitTest;
+friend UnitTest;
 public:
-/*!
- * \brief The LineStyle enum classifing all ways of drawing a line.
- */
-enum class LineStyle {
-		SOLID_LINE,
-		DOTTED_LINE
-};
-
 IntelliToolsettings();
 virtual ~IntelliToolsettings();
 
 int getLineWidth();
-void setLineWidth();
 void setLineWidth(int LineWidth);
 
 int getInnerAlpha();
-void setInnerAlpha();
 void setInnerAlpha(int innerAlpha);
 
-LineStyle getLinestyle();
-
 private:
 int lineWidth;
 int innerAlpha;
-LineStyle Linestyle;
 };
 
-#endif // INTELLITOOLSETTINGS_H
+#endif