From 5125a273dcf5d54ecda36766ef4d8a35cc80d1fa Mon Sep 17 00:00:00 2001 From: kobewi Date: Mon, 28 Apr 2025 21:09:43 +0200 Subject: [PATCH] Remove inline from constexpr variables --- editor/editor_resource_preview.h | 2 +- editor/plugins/editor_context_menu_plugin.h | 4 ++-- scene/gui/color_picker_shape.h | 2 +- scene/resources/animation.h | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/editor/editor_resource_preview.h b/editor/editor_resource_preview.h index 4bbe313134b..5b25b5c6113 100644 --- a/editor/editor_resource_preview.h +++ b/editor/editor_resource_preview.h @@ -73,7 +73,7 @@ public: class EditorResourcePreview : public Node { GDCLASS(EditorResourcePreview, Node); - inline static constexpr int CURRENT_METADATA_VERSION = 1; // Increment this number to invalidate all previews. + static constexpr int CURRENT_METADATA_VERSION = 1; // Increment this number to invalidate all previews. inline static EditorResourcePreview *singleton = nullptr; struct QueueItem { diff --git a/editor/plugins/editor_context_menu_plugin.h b/editor/plugins/editor_context_menu_plugin.h index 822d9de9001..084b822bd0c 100644 --- a/editor/plugins/editor_context_menu_plugin.h +++ b/editor/plugins/editor_context_menu_plugin.h @@ -43,7 +43,7 @@ class EditorContextMenuPlugin : public RefCounted { friend class EditorContextMenuPluginManager; - inline static constexpr int MAX_ITEMS = 100; + static constexpr int MAX_ITEMS = 100; public: enum ContextMenuSlot { @@ -55,7 +55,7 @@ public: CONTEXT_SLOT_SCENE_TABS, CONTEXT_SLOT_2D_EDITOR, }; - inline static constexpr int BASE_ID = 2000; + static constexpr int BASE_ID = 2000; private: int slot = -1; diff --git a/scene/gui/color_picker_shape.h b/scene/gui/color_picker_shape.h index bb87a289921..f1f9be2956f 100644 --- a/scene/gui/color_picker_shape.h +++ b/scene/gui/color_picker_shape.h @@ -107,7 +107,7 @@ public: class ColorPickerShapeWheel : public ColorPickerShape { GDCLASS(ColorPickerShapeWheel, ColorPickerShape); - inline static constexpr float WHEEL_RADIUS = 0.42; + static constexpr float WHEEL_RADIUS = 0.42; MarginContainer *wheel_margin = nullptr; Control *wheel = nullptr; diff --git a/scene/resources/animation.h b/scene/resources/animation.h index 6cf43262790..e1fb91a794d 100644 --- a/scene/resources/animation.h +++ b/scene/resources/animation.h @@ -43,7 +43,7 @@ public: typedef uint32_t TypeHash; static inline String PARAMETERS_BASE_PATH = "parameters/"; - static inline constexpr real_t DEFAULT_STEP = 1.0 / 30; + static constexpr real_t DEFAULT_STEP = 1.0 / 30; enum TrackType : uint8_t { TYPE_VALUE, // Set a value in a property, can be interpolated.