Reorder EditorSettings code for better legibility

No functional change, only moving stuff around.

editor/editor_settings.h

@@ -80,44 +80,37 @@ private:
 		}
 	};
 
+	static Ref<EditorSettings> singleton;
+
 	HashMap<String, PropertyInfo> hints;
-	int last_order;
 	HashMap<String, VariantContainer> props;
-	String resource_path;
-
-	bool _set(const StringName &p_name, const Variant &p_value, bool p_emit_signal = true);
-	bool _get(const StringName &p_name, Variant &r_ret) const;
-	void _get_property_list(List<PropertyInfo> *p_list) const;
-
-	void _initial_set(const StringName &p_name, const Variant &p_value);
+	int last_order;
 
-	static Ref<EditorSettings> singleton;
+	Ref<Resource> clipboard;
+	Vector<Ref<Translation> > translations;
+	Map<String, Ref<ShortCut> > shortcuts;
 
+	String resource_path;
 	String config_file_path;
 	String settings_path;
+	String project_config_path;
 
-	Ref<Resource> clipboard;
+	Vector<String> favorite_dirs;
+	Vector<String> recent_dirs;
 
 	bool save_changed_setting;
-
 	bool optimize_save; //do not save stuff that came from config but was not set from engine
 
+	bool _set(const StringName &p_name, const Variant &p_value, bool p_emit_signal = true);
+	bool _get(const StringName &p_name, Variant &r_ret) const;
+	void _initial_set(const StringName &p_name, const Variant &p_value);
+	void _get_property_list(List<PropertyInfo> *p_list) const;
+	void _add_property_info_bind(const Dictionary &p_info);
+
 	void _load_defaults(Ref<ConfigFile> p_extra_config = NULL);
 	void _load_default_text_editor_theme();
-
 	bool _save_text_editor_theme(String p_file);
 
-	String project_config_path;
-
-	Vector<String> favorite_dirs;
-	Vector<String> recent_dirs;
-
-	Vector<Ref<Translation> > translations;
-
-	Map<String, Ref<ShortCut> > shortcuts;
-
-	void _add_property_info_bind(const Dictionary &p_info);
-
 protected:
 	static void _bind_methods();
 
@@ -126,41 +119,41 @@ public:
 		NOTIFICATION_EDITOR_SETTINGS_CHANGED = 10000
 	};
 
-	void set_manually(const StringName &p_name, const Variant &p_value, bool p_emit_signal = false) {
-		_set(p_name, p_value, p_emit_signal);
-	}
-
-	void set_setting(const String &p_setting, const Variant &p_value);
-	Variant get_setting(const String &p_setting) const;
-
-	bool has_setting(String p_var) const;
 	static EditorSettings *get_singleton();
-	void erase(String p_var);
-	String get_settings_path() const;
-	//String get_global_settings_path() const;
-	String get_project_settings_path() const;
 
+	static void create();
 	void setup_language();
 	void setup_network();
-
-	void raise_order(const String &p_name);
-	static void create();
 	static void save();
 	static void destroy();
+	void set_optimize_save(bool p_optimize);
 
-	void notify_changes();
+	void set_setting(const String &p_setting, const Variant &p_value);
+	Variant get_setting(const String &p_setting) const;
+	bool has_setting(String p_var) const;
+	void erase(String p_var);
+	void raise_order(const String &p_name);
+	void set_initial_value(const StringName &p_name, const Variant &p_value);
+	void set_manually(const StringName &p_name, const Variant &p_value, bool p_emit_signal = false) {
+		_set(p_name, p_value, p_emit_signal);
+	}
+	bool property_can_revert(const String &p_name);
+	Variant property_get_revert(const String &p_name);
+	void add_property_hint(const PropertyInfo &p_hint);
 
 	void set_resource_clipboard(const Ref<Resource> &p_resource) { clipboard = p_resource; }
 	Ref<Resource> get_resource_clipboard() const { return clipboard; }
 
-	void add_property_hint(const PropertyInfo &p_hint);
+	String get_settings_path() const;
+	String get_project_settings_path() const;
+
+	void set_project_metadata(const String &p_section, const String &p_key, Variant p_data);
+	Variant get_project_metadata(const String &p_section, const String &p_key, Variant p_default);
 
 	void set_favorite_dirs(const Vector<String> &p_favorites_dirs);
 	Vector<String> get_favorite_dirs() const;
-
 	void set_recent_dirs(const Vector<String> &p_recent_dirs);
 	Vector<String> get_recent_dirs() const;
-
 	void load_favorites();
 
 	void list_text_editor_themes();
@@ -176,15 +169,7 @@ public:
 	Ref<ShortCut> get_shortcut(const String &p_name) const;
 	void get_shortcut_list(List<String> *r_shortcuts);
 
-	void set_optimize_save(bool p_optimize);
-
-	Variant get_project_metadata(const String &p_section, const String &p_key, Variant p_default);
-	void set_project_metadata(const String &p_section, const String &p_key, Variant p_data);
-
-	bool property_can_revert(const String &p_name);
-	Variant property_get_revert(const String &p_name);
-
-	void set_initial_value(const StringName &p_name, const Variant &p_value);
+	void notify_changes();
 
 	EditorSettings();
 	~EditorSettings();