Capabilities cleanup

src/control/Control.cpp

@@ -1706,16 +1706,16 @@ void Control::toolChanged()
 
 	fireActionSelected(GROUP_TOOL, at);
 
-	fireEnableAction(ACTION_SELECT_COLOR, toolHandler->isEnableColor());
-	fireEnableAction(ACTION_SELECT_COLOR_CUSTOM, toolHandler->isEnableColor());
+	fireEnableAction(ACTION_SELECT_COLOR, toolHandler->hasCapability(TOOL_CAP_COLOR));
+	fireEnableAction(ACTION_SELECT_COLOR_CUSTOM, toolHandler->hasCapability(TOOL_CAP_COLOR));
 
-	fireEnableAction(ACTION_RULER, toolHandler->isEnableRuler());
-	fireEnableAction(ACTION_TOOL_DRAW_RECT, toolHandler->isEnableRectangle());
-	fireEnableAction(ACTION_TOOL_DRAW_CIRCLE, toolHandler->isEnableCircle());
-	fireEnableAction(ACTION_TOOL_DRAW_ARROW, toolHandler->isEnableArrow());
-	fireEnableAction(ACTION_SHAPE_RECOGNIZER, toolHandler->isEnableShapreRecognizer());
+	fireEnableAction(ACTION_RULER, toolHandler->hasCapability(TOOL_CAP_RULER));
+	fireEnableAction(ACTION_TOOL_DRAW_RECT, toolHandler->hasCapability(TOOL_CAP_RECTANGLE));
+	fireEnableAction(ACTION_TOOL_DRAW_CIRCLE, toolHandler->hasCapability(TOOL_CAP_CIRCLE));
+	fireEnableAction(ACTION_TOOL_DRAW_ARROW, toolHandler->hasCapability(TOOL_CAP_ARROW));
+	fireEnableAction(ACTION_SHAPE_RECOGNIZER, toolHandler->hasCapability(TOOL_CAP_RECOGNIZER));
 
-	bool enableSize = toolHandler->isEnableSize();
+	bool enableSize = toolHandler->hasCapability(TOOL_CAP_SIZE);
 
 	fireEnableAction(ACTION_SIZE_MEDIUM, enableSize);
 	fireEnableAction(ACTION_SIZE_THICK, enableSize);
@@ -1729,7 +1729,7 @@ void Control::toolChanged()
 	}
 
 	// Update color
-	if (toolHandler->isEnableColor())
+	if (toolHandler->hasCapability(TOOL_CAP_COLOR))
 	{
 		toolColorChanged(false);
 	}

src/control/ToolHandler.cpp

@@ -203,53 +203,11 @@ ToolType ToolHandler::getToolType()
 	return this->current->type;
 }
 
-bool ToolHandler::isEnableColor()
+bool ToolHandler::hasCapability(ToolCapabilities cap)
 {
 	XOJ_CHECK_TYPE(ToolHandler);
 
-	return current->capabilities & TOOL_CAP_COLOR != 0;
-}
-
-bool ToolHandler::isEnableSize()
-{
-	XOJ_CHECK_TYPE(ToolHandler);
-
-	return current->capabilities & TOOL_CAP_SIZE != 0;
-}
-
-bool ToolHandler::isEnableRuler()
-{
-	XOJ_CHECK_TYPE(ToolHandler);
-
-	return current->capabilities & TOOL_CAP_RULER != 0;
-}
-
-bool ToolHandler::isEnableRectangle()
-{
-	XOJ_CHECK_TYPE(ToolHandler);
-
-	return current->capabilities & TOOL_CAP_RECTANGLE != 0;
-}
-
-bool ToolHandler::isEnableCircle()
-{
-	XOJ_CHECK_TYPE(ToolHandler);
-
-	return current->capabilities & TOOL_CAP_CIRCLE != 0;
-}
-
-bool ToolHandler::isEnableArrow()
-{
-	XOJ_CHECK_TYPE(ToolHandler);
-
-	return current->capabilities & TOOL_CAP_ARROW != 0;
-}
-
-bool ToolHandler::isEnableShapreRecognizer()
-{
-	XOJ_CHECK_TYPE(ToolHandler);
-
-	return current->capabilities & TOOL_CAP_RECOGNIZER != 0;
+	return (current->capabilities & cap) != 0;
 }
 
 ToolSize ToolHandler::getSize()

src/control/ToolHandler.h

@@ -91,13 +91,7 @@ public:
 	EraserType getEraserType();
 	void eraserTypeChanged();
 
-	bool isEnableColor();
-	bool isEnableSize();
-	bool isEnableRuler();
-	bool isEnableRectangle();
-	bool isEnableCircle();
-	bool isEnableArrow();
-	bool isEnableShapreRecognizer();
+	bool hasCapability(ToolCapabilities cap);
 
 	void saveSettings();
 	void loadSettings();