diff options
| author | Juan Linietsky | 2017-08-21 19:56:08 -0300 |
|---|---|---|
| committer | GitHub | 2017-08-21 19:56:08 -0300 |
| commit | 2cc83092498d3b82fa8a3aba37c32ad887d19c2c (patch) | |
| tree | 4d2def0a62847170a86c3f134f234af8ae45f0b9 /editor | |
| parent | 92410df24cdf296ad63250274d69b2019996423e (diff) | |
| parent | 32dd9a9f668db31e348c5ef5bc181cdb91c07299 (diff) | |
| download | godot-2cc83092498d3b82fa8a3aba37c32ad887d19c2c.tar.gz godot-2cc83092498d3b82fa8a3aba37c32ad887d19c2c.tar.zst godot-2cc83092498d3b82fa8a3aba37c32ad887d19c2c.zip | |
Merge pull request #10351 from neikeq/enums-are-for-the-weak
ClassDB: Provide the enum name of integer constants
Diffstat (limited to 'editor')
| -rw-r--r-- | editor/editor_export.cpp | 26 | ||||
| -rw-r--r-- | editor/editor_file_dialog.cpp | 16 | ||||
| -rw-r--r-- | editor/editor_plugin.cpp | 32 |
3 files changed, 37 insertions, 37 deletions
diff --git a/editor/editor_export.cpp b/editor/editor_export.cpp index d8d355461..14d713bb3 100644 --- a/editor/editor_export.cpp +++ b/editor/editor_export.cpp @@ -3323,22 +3323,22 @@ void EditorImportExport::_bind_methods() { - BIND_CONSTANT( ACTION_NONE ); - BIND_CONSTANT( ACTION_COPY ); - BIND_CONSTANT( ACTION_BUNDLE ); + BIND_ENUM_CONSTANT( ACTION_NONE ); + BIND_ENUM_CONSTANT( ACTION_COPY ); + BIND_ENUM_CONSTANT( ACTION_BUNDLE ); - BIND_CONSTANT( EXPORT_SELECTED ); - BIND_CONSTANT( EXPORT_RESOURCES ); - BIND_CONSTANT( EXPORT_ALL ); + BIND_ENUM_CONSTANT( EXPORT_SELECTED ); + BIND_ENUM_CONSTANT( EXPORT_RESOURCES ); + BIND_ENUM_CONSTANT( EXPORT_ALL ); - BIND_CONSTANT( IMAGE_ACTION_NONE ); - BIND_CONSTANT( IMAGE_ACTION_COMPRESS_DISK ); - BIND_CONSTANT( IMAGE_ACTION_COMPRESS_RAM ); - BIND_CONSTANT( IMAGE_ACTION_KEEP ); + BIND_ENUM_CONSTANT( IMAGE_ACTION_NONE ); + BIND_ENUM_CONSTANT( IMAGE_ACTION_COMPRESS_DISK ); + BIND_ENUM_CONSTANT( IMAGE_ACTION_COMPRESS_RAM ); + BIND_ENUM_CONSTANT( IMAGE_ACTION_KEEP ); - BIND_CONSTANT( SCRIPT_ACTION_NONE ); - BIND_CONSTANT( SCRIPT_ACTION_COMPILE ); - BIND_CONSTANT( SCRIPT_ACTION_ENCRYPT ); + BIND_ENUM_CONSTANT( SCRIPT_ACTION_NONE ); + BIND_ENUM_CONSTANT( SCRIPT_ACTION_COMPILE ); + BIND_ENUM_CONSTANT( SCRIPT_ACTION_ENCRYPT ); }; diff --git a/editor/editor_file_dialog.cpp b/editor/editor_file_dialog.cpp index d572ee872..26dbc2713 100644 --- a/editor/editor_file_dialog.cpp +++ b/editor/editor_file_dialog.cpp @@ -1187,15 +1187,15 @@ void EditorFileDialog::_bind_methods() { ADD_SIGNAL(MethodInfo("files_selected", PropertyInfo(Variant::POOL_STRING_ARRAY, "paths"))); ADD_SIGNAL(MethodInfo("dir_selected", PropertyInfo(Variant::STRING, "dir"))); - BIND_CONSTANT(MODE_OPEN_FILE); - BIND_CONSTANT(MODE_OPEN_FILES); - BIND_CONSTANT(MODE_OPEN_DIR); - BIND_CONSTANT(MODE_OPEN_ANY); - BIND_CONSTANT(MODE_SAVE_FILE); + BIND_ENUM_CONSTANT(MODE_OPEN_FILE); + BIND_ENUM_CONSTANT(MODE_OPEN_FILES); + BIND_ENUM_CONSTANT(MODE_OPEN_DIR); + BIND_ENUM_CONSTANT(MODE_OPEN_ANY); + BIND_ENUM_CONSTANT(MODE_SAVE_FILE); - BIND_CONSTANT(ACCESS_RESOURCES); - BIND_CONSTANT(ACCESS_USERDATA); - BIND_CONSTANT(ACCESS_FILESYSTEM); + BIND_ENUM_CONSTANT(ACCESS_RESOURCES); + BIND_ENUM_CONSTANT(ACCESS_USERDATA); + BIND_ENUM_CONSTANT(ACCESS_FILESYSTEM); } void EditorFileDialog::set_show_hidden_files(bool p_show) { diff --git a/editor/editor_plugin.cpp b/editor/editor_plugin.cpp index d8c8d419b..f8ed18bba 100644 --- a/editor/editor_plugin.cpp +++ b/editor/editor_plugin.cpp @@ -468,23 +468,23 @@ void EditorPlugin::_bind_methods() { ADD_SIGNAL(MethodInfo("scene_closed", PropertyInfo(Variant::STRING, "filepath:String"))); ADD_SIGNAL(MethodInfo("main_screen_changed", PropertyInfo(Variant::STRING, "screen_name:String"))); - BIND_CONSTANT(CONTAINER_TOOLBAR); - BIND_CONSTANT(CONTAINER_SPATIAL_EDITOR_MENU); - BIND_CONSTANT(CONTAINER_SPATIAL_EDITOR_SIDE); - BIND_CONSTANT(CONTAINER_SPATIAL_EDITOR_BOTTOM); - BIND_CONSTANT(CONTAINER_CANVAS_EDITOR_MENU); - BIND_CONSTANT(CONTAINER_CANVAS_EDITOR_SIDE); - BIND_CONSTANT(CONTAINER_PROPERTY_EDITOR_BOTTOM); + BIND_ENUM_CONSTANT(CONTAINER_TOOLBAR); + BIND_ENUM_CONSTANT(CONTAINER_SPATIAL_EDITOR_MENU); + BIND_ENUM_CONSTANT(CONTAINER_SPATIAL_EDITOR_SIDE); + BIND_ENUM_CONSTANT(CONTAINER_SPATIAL_EDITOR_BOTTOM); + BIND_ENUM_CONSTANT(CONTAINER_CANVAS_EDITOR_MENU); + BIND_ENUM_CONSTANT(CONTAINER_CANVAS_EDITOR_SIDE); + BIND_ENUM_CONSTANT(CONTAINER_PROPERTY_EDITOR_BOTTOM); - BIND_CONSTANT(DOCK_SLOT_LEFT_UL); - BIND_CONSTANT(DOCK_SLOT_LEFT_BL); - BIND_CONSTANT(DOCK_SLOT_LEFT_UR); - BIND_CONSTANT(DOCK_SLOT_LEFT_BR); - BIND_CONSTANT(DOCK_SLOT_RIGHT_UL); - BIND_CONSTANT(DOCK_SLOT_RIGHT_BL); - BIND_CONSTANT(DOCK_SLOT_RIGHT_UR); - BIND_CONSTANT(DOCK_SLOT_RIGHT_BR); - BIND_CONSTANT(DOCK_SLOT_MAX); + BIND_ENUM_CONSTANT(DOCK_SLOT_LEFT_UL); + BIND_ENUM_CONSTANT(DOCK_SLOT_LEFT_BL); + BIND_ENUM_CONSTANT(DOCK_SLOT_LEFT_UR); + BIND_ENUM_CONSTANT(DOCK_SLOT_LEFT_BR); + BIND_ENUM_CONSTANT(DOCK_SLOT_RIGHT_UL); + BIND_ENUM_CONSTANT(DOCK_SLOT_RIGHT_BL); + BIND_ENUM_CONSTANT(DOCK_SLOT_RIGHT_UR); + BIND_ENUM_CONSTANT(DOCK_SLOT_RIGHT_BR); + BIND_ENUM_CONSTANT(DOCK_SLOT_MAX); } EditorPlugin::EditorPlugin() { |
