From 2ddbaeaf8c6d152cfaa44438f7c93832149d3e44 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= Date: Wed, 20 May 2020 14:34:49 +0200 Subject: [PATCH] DocData: Fix sorting of arguments and constants The missing `operator<` definitions caused `Vector::sort()` to fail sorting those alphabetically by name on Windows (not sure why Linux isn't affected, I guess GCC/Clang are cleverer and use the operator from the first struct member). --- editor/doc_data.h | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/editor/doc_data.h b/editor/doc_data.h index 06d0889af65..8c93bfa5970 100644 --- a/editor/doc_data.h +++ b/editor/doc_data.h @@ -42,6 +42,9 @@ public: String type; String enumeration; String default_value; + bool operator<(const ArgumentDoc &p_arg) const { + return name < p_arg.name; + } }; struct MethodDoc { @@ -51,8 +54,8 @@ public: String qualifiers; String description; Vector arguments; - bool operator<(const MethodDoc &p_md) const { - return name < p_md.name; + bool operator<(const MethodDoc &p_method) const { + return name < p_method.name; } }; @@ -61,6 +64,9 @@ public: String value; String enumeration; String description; + bool operator<(const ConstantDoc &p_const) const { + return name < p_const.name; + } }; struct PropertyDoc { @@ -70,13 +76,10 @@ public: String description; String setter, getter; String default_value; - bool overridden; + bool overridden = false; bool operator<(const PropertyDoc &p_prop) const { return name < p_prop.name; } - PropertyDoc() { - overridden = false; - } }; struct ClassDoc { @@ -91,6 +94,9 @@ public: Vector constants; Vector properties; Vector theme_properties; + bool operator<(const ClassDoc &p_class) const { + return name < p_class.name; + } }; String version;