From 29b62ce5d009bfdc57e065e450d7e01c5bd5bd05 Mon Sep 17 00:00:00 2001 From: George Marques Date: Tue, 5 Jul 2016 16:57:17 -0300 Subject: Make sure builtin types' constants remain in order This adds a list of constants for VariantCall to make sure the order of register is kept when showing in the editor help and in the documentation. This also remove the sorting of constants from the doctool, so it keeps the natural order in classes.xml. --- tools/doc/doc_data.cpp | 16 ---------------- 1 file changed, 16 deletions(-) (limited to 'tools') diff --git a/tools/doc/doc_data.cpp b/tools/doc/doc_data.cpp index 470dd078ae..14b937be38 100644 --- a/tools/doc/doc_data.cpp +++ b/tools/doc/doc_data.cpp @@ -36,21 +36,6 @@ #include "io/compression.h" #include "scene/resources/theme.h" -struct _ConstantComparator { - - inline bool operator()(const DocData::ConstantDoc &a, const DocData::ConstantDoc &b) const { - String left_a = a.name.find("_") == -1 ? a.name : a.name.substr(0, a.name.find("_")); - String left_b = b.name.find("_") == -1 ? b.name : b.name.substr(0, b.name.find("_")); - if (left_a == left_b) // If they have the same prefix - if (a.value == b.value) - return a.name < b.name; // Sort by name if the values are the same - else - return a.value < b.value; // Sort by value otherwise - else - return left_a < left_b; // Sort by name if the prefixes aren't the same - } -}; - void DocData::merge_from(const DocData& p_data) { for( Map::Element *E=class_list.front();E;E=E->next()) { @@ -1052,7 +1037,6 @@ Error DocData::save(const String& p_path) { _write_string(f,1,""); - c.constants.sort_custom<_ConstantComparator>(); for(int i=0;i