Browse Source

Remove default on switch with all enum values covered

Michael Ragazzon 3 years ago
parent
commit
ed9c68966a

+ 0 - 2
Source/Core/ElementStyle.cpp

@@ -432,8 +432,6 @@ float ElementStyle::ResolveLength(const Property* property, RelativeTarget relat
 	case RelativeTarget::LineHeight:
 	case RelativeTarget::LineHeight:
 		base_value = element->GetLineHeight();
 		base_value = element->GetLineHeight();
 		break;
 		break;
-	default:
-		break;
 	}
 	}
 
 
 	float scale_value = 0.0f;
 	float scale_value = 0.0f;

+ 0 - 2
Source/Core/Elements/WidgetTextInput.cpp

@@ -660,8 +660,6 @@ bool WidgetTextInput::MoveCursorHorizontal(CursorMovement movement, bool select)
 	case CursorMovement::End:
 	case CursorMovement::End:
 		absolute_cursor_index = INT_MAX;
 		absolute_cursor_index = INT_MAX;
 		break;
 		break;
-	default:
-		break;
 	}
 	}
 
 
 	absolute_cursor_index = Math::Clamp(absolute_cursor_index, 0, (int)GetValue().size());
 	absolute_cursor_index = Math::Clamp(absolute_cursor_index, 0, (int)GetValue().size());

+ 2 - 8
Source/Core/LayoutInlineBox.cpp

@@ -233,17 +233,11 @@ void LayoutInlineBox::CalculateBaseline(float& ascender, float& descender)
 
 
 		// This box is aligned with the line box, not an inline box, so we can't position it yet.
 		// This box is aligned with the line box, not an inline box, so we can't position it yet.
 		case VerticalAlign::Top:
 		case VerticalAlign::Top:
-		case VerticalAlign::Bottom:
-			break;
+		case VerticalAlign::Bottom: break;
 
 
 		// The baseline of this box is offset by a fixed amount from its parent's baseline.
 		// The baseline of this box is offset by a fixed amount from its parent's baseline.
-		case VerticalAlign::Length:
-		default:
-		{
-			SetVerticalPosition(-1.f * vertical_align_property.value);
+		case VerticalAlign::Length: SetVerticalPosition(-1.f * vertical_align_property.value); break;
 		}
 		}
-		break;
-	}
 
 
 	// Set the ascender and descender relative to this element. If we're an unsized element (span, em, etc) then we
 	// Set the ascender and descender relative to this element. If we're an unsized element (span, em, etc) then we
 	// have no dimensions ourselves.
 	// have no dimensions ourselves.

+ 25 - 23
Source/Core/TransformUtilities.cpp

@@ -189,9 +189,6 @@ struct SetIdentityVisitor
 		case TransformPrimitive::SKEW2D: this->operator()(primitive.skew_2d); break;
 		case TransformPrimitive::SKEW2D: this->operator()(primitive.skew_2d); break;
 		case TransformPrimitive::PERSPECTIVE: this->operator()(primitive.perspective); break;
 		case TransformPrimitive::PERSPECTIVE: this->operator()(primitive.perspective); break;
 		case TransformPrimitive::DECOMPOSEDMATRIX4: this->operator()(primitive.decomposed_matrix_4); break;
 		case TransformPrimitive::DECOMPOSEDMATRIX4: this->operator()(primitive.decomposed_matrix_4); break;
-		default:
-			RMLUI_ASSERT(false);
-			break;
 		}
 		}
 	}
 	}
 };
 };
@@ -471,8 +468,6 @@ struct PrepareVisitor
 		case TransformPrimitive::SKEW2D: return this->operator()(primitive.skew_2d);
 		case TransformPrimitive::SKEW2D: return this->operator()(primitive.skew_2d);
 		case TransformPrimitive::PERSPECTIVE: return this->operator()(primitive.perspective);
 		case TransformPrimitive::PERSPECTIVE: return this->operator()(primitive.perspective);
 		case TransformPrimitive::DECOMPOSEDMATRIX4: return this->operator()(primitive.decomposed_matrix_4);
 		case TransformPrimitive::DECOMPOSEDMATRIX4: return this->operator()(primitive.decomposed_matrix_4);
-		default:
-			break;
 		}
 		}
 		RMLUI_ASSERT(false);
 		RMLUI_ASSERT(false);
 		return false;
 		return false;
@@ -495,24 +490,33 @@ struct GetGenericTypeVisitor
 	{
 	{
 		switch (primitive.type)
 		switch (primitive.type)
 		{
 		{
-		case TransformPrimitive::TRANSLATEX:  return GenericType::Translate3D;
-		case TransformPrimitive::TRANSLATEY:  return GenericType::Translate3D;
-		case TransformPrimitive::TRANSLATEZ:  return GenericType::Translate3D;
-		case TransformPrimitive::TRANSLATE2D: return GenericType::Translate3D;
+		case TransformPrimitive::TRANSLATEX:
+		case TransformPrimitive::TRANSLATEY:
+		case TransformPrimitive::TRANSLATEZ:
+		case TransformPrimitive::TRANSLATE2D:
 		case TransformPrimitive::TRANSLATE3D: return GenericType::Translate3D;
 		case TransformPrimitive::TRANSLATE3D: return GenericType::Translate3D;
-		case TransformPrimitive::SCALEX:      return GenericType::Scale3D;
-		case TransformPrimitive::SCALEY:      return GenericType::Scale3D;
-		case TransformPrimitive::SCALEZ:      return GenericType::Scale3D;
-		case TransformPrimitive::SCALE2D:     return GenericType::Scale3D;
-		case TransformPrimitive::SCALE3D:     return GenericType::Scale3D;
-		case TransformPrimitive::ROTATEX:     return GenericType::Rotate3D;
-		case TransformPrimitive::ROTATEY:     return GenericType::Rotate3D;
-		case TransformPrimitive::ROTATEZ:     return GenericType::Rotate3D;
-		case TransformPrimitive::ROTATE2D:    return GenericType::Rotate3D;
-		case TransformPrimitive::ROTATE3D:    return GenericType::Rotate3D;
-		default:
-			break;
+
+		case TransformPrimitive::SCALEX:
+		case TransformPrimitive::SCALEY:
+		case TransformPrimitive::SCALEZ:
+		case TransformPrimitive::SCALE2D:
+		case TransformPrimitive::SCALE3D: return GenericType::Scale3D;
+
+		case TransformPrimitive::ROTATEX:
+		case TransformPrimitive::ROTATEY:
+		case TransformPrimitive::ROTATEZ:
+		case TransformPrimitive::ROTATE2D:
+		case TransformPrimitive::ROTATE3D: return GenericType::Rotate3D;
+
+		case TransformPrimitive::MATRIX2D:
+		case TransformPrimitive::MATRIX3D:
+		case TransformPrimitive::SKEWX:
+		case TransformPrimitive::SKEWY:
+		case TransformPrimitive::SKEW2D:
+		case TransformPrimitive::PERSPECTIVE:
+		case TransformPrimitive::DECOMPOSEDMATRIX4: return GenericType::None;
 		}
 		}
+		RMLUI_ASSERT(false);
 		return GenericType::None;
 		return GenericType::None;
 	}
 	}
 };
 };
@@ -814,8 +818,6 @@ struct ToStringVisitor
 		case TransformPrimitive::SKEW2D: return ToString(variant.skew_2d);
 		case TransformPrimitive::SKEW2D: return ToString(variant.skew_2d);
 		case TransformPrimitive::PERSPECTIVE: return ToString(variant.perspective);
 		case TransformPrimitive::PERSPECTIVE: return ToString(variant.perspective);
 		case TransformPrimitive::DECOMPOSEDMATRIX4: return ToString(variant.decomposed_matrix_4);
 		case TransformPrimitive::DECOMPOSEDMATRIX4: return ToString(variant.decomposed_matrix_4);
-		default:
-			break;
 		}
 		}
 		RMLUI_ASSERT(false);
 		RMLUI_ASSERT(false);
 		return String();
 		return String();