diff options
Diffstat (limited to 'scene')
-rw-r--r-- | scene/2d/polygon_2d.cpp | 2 | ||||
-rw-r--r-- | scene/3d/xr_nodes.cpp | 8 | ||||
-rw-r--r-- | scene/3d/xr_nodes.h | 12 | ||||
-rw-r--r-- | scene/gui/tree.h | 2 | ||||
-rw-r--r-- | scene/main/shader_globals_override.cpp | 2 | ||||
-rw-r--r-- | scene/resources/environment.cpp | 2 | ||||
-rw-r--r-- | scene/resources/environment.h | 2 | ||||
-rw-r--r-- | scene/resources/material.cpp | 2 | ||||
-rw-r--r-- | scene/resources/theme.cpp | 2 | ||||
-rw-r--r-- | scene/resources/theme.h | 2 |
10 files changed, 18 insertions, 18 deletions
diff --git a/scene/2d/polygon_2d.cpp b/scene/2d/polygon_2d.cpp index 84c1828b47..cec598774e 100644 --- a/scene/2d/polygon_2d.cpp +++ b/scene/2d/polygon_2d.cpp @@ -723,7 +723,7 @@ void Polygon2D::_bind_methods() { Polygon2D::Polygon2D() { - invert = 0; + invert = false; invert_border = 100; antialiased = false; tex_rot = 0; diff --git a/scene/3d/xr_nodes.cpp b/scene/3d/xr_nodes.cpp index 6f41629bac..1b13b64744 100644 --- a/scene/3d/xr_nodes.cpp +++ b/scene/3d/xr_nodes.cpp @@ -269,11 +269,11 @@ void XRController3D::set_controller_id(int p_controller_id) { update_configuration_warning(); }; -int XRController3D::get_controller_id(void) const { +int XRController3D::get_controller_id() const { return controller_id; }; -String XRController3D::get_controller_name(void) const { +String XRController3D::get_controller_name() const { // get our XRServer XRServer *xr_server = XRServer::get_singleton(); ERR_FAIL_NULL_V(xr_server, String()); @@ -465,7 +465,7 @@ void XRAnchor3D::set_anchor_id(int p_anchor_id) { update_configuration_warning(); }; -int XRAnchor3D::get_anchor_id(void) const { +int XRAnchor3D::get_anchor_id() const { return anchor_id; }; @@ -473,7 +473,7 @@ Vector3 XRAnchor3D::get_size() const { return size; }; -String XRAnchor3D::get_anchor_name(void) const { +String XRAnchor3D::get_anchor_name() const { // get our XRServer XRServer *xr_server = XRServer::get_singleton(); ERR_FAIL_NULL_V(xr_server, String()); diff --git a/scene/3d/xr_nodes.h b/scene/3d/xr_nodes.h index a2f16545d1..55dcfe087e 100644 --- a/scene/3d/xr_nodes.h +++ b/scene/3d/xr_nodes.h @@ -84,8 +84,8 @@ protected: public: void set_controller_id(int p_controller_id); - int get_controller_id(void) const; - String get_controller_name(void) const; + int get_controller_id() const; + String get_controller_name() const; int get_joystick_id() const; bool is_button_pressed(int p_button) const; @@ -97,7 +97,7 @@ public: bool get_is_active() const; XRPositionalTracker::TrackerHand get_hand() const; - Ref<Mesh> get_mesh(void) const; + Ref<Mesh> get_mesh() const; String get_configuration_warning() const; @@ -125,15 +125,15 @@ protected: public: void set_anchor_id(int p_anchor_id); - int get_anchor_id(void) const; - String get_anchor_name(void) const; + int get_anchor_id() const; + String get_anchor_name() const; bool get_is_active() const; Vector3 get_size() const; Plane get_plane() const; - Ref<Mesh> get_mesh(void) const; + Ref<Mesh> get_mesh() const; String get_configuration_warning() const; diff --git a/scene/gui/tree.h b/scene/gui/tree.h index 87c2588a12..3c67a79558 100644 --- a/scene/gui/tree.h +++ b/scene/gui/tree.h @@ -544,7 +544,7 @@ public: void clear(); - TreeItem *create_item(TreeItem *p_parent = 0, int p_idx = -1); + TreeItem *create_item(TreeItem *p_parent = nullptr, int p_idx = -1); TreeItem *get_root(); TreeItem *get_last_item(); diff --git a/scene/main/shader_globals_override.cpp b/scene/main/shader_globals_override.cpp index 823892a86a..272cea8f2b 100644 --- a/scene/main/shader_globals_override.cpp +++ b/scene/main/shader_globals_override.cpp @@ -206,7 +206,7 @@ void ShaderGlobalsOverride::_get_property_list(List<PropertyInfo> *p_list) const Override o; o.in_use = false; Callable::CallError ce; - o.override = Variant::construct(pinfo.type, NULL, 0, ce); + o.override = Variant::construct(pinfo.type, nullptr, 0, ce); overrides[variables[i]] = o; } diff --git a/scene/resources/environment.cpp b/scene/resources/environment.cpp index 4647c38e04..abbe579307 100644 --- a/scene/resources/environment.cpp +++ b/scene/resources/environment.cpp @@ -164,7 +164,7 @@ float Environment::get_ambient_light_sky_contribution() const { return ambient_sky_contribution; } -int Environment::get_camera_feed_id(void) const { +int Environment::get_camera_feed_id() const { return camera_feed_id; } diff --git a/scene/resources/environment.h b/scene/resources/environment.h index 6d00560634..f0ea8489ff 100644 --- a/scene/resources/environment.h +++ b/scene/resources/environment.h @@ -200,7 +200,7 @@ public: Color get_ambient_light_color() const; float get_ambient_light_energy() const; float get_ambient_light_sky_contribution() const; - int get_camera_feed_id(void) const; + int get_camera_feed_id() const; void set_tonemapper(ToneMapper p_tone_mapper); ToneMapper get_tonemapper() const; diff --git a/scene/resources/material.cpp b/scene/resources/material.cpp index e3bed171b0..137657d239 100644 --- a/scene/resources/material.cpp +++ b/scene/resources/material.cpp @@ -2690,7 +2690,7 @@ BaseMaterial3D::BaseMaterial3D(bool p_orm) : depth_draw_mode = DEPTH_DRAW_OPAQUE_ONLY; cull_mode = CULL_BACK; for (int i = 0; i < FLAG_MAX; i++) { - flags[i] = 0; + flags[i] = false; } flags[FLAG_USE_TEXTURE_REPEAT] = true; diff --git a/scene/resources/theme.cpp b/scene/resources/theme.cpp index 98ebf048dc..325ada69ea 100644 --- a/scene/resources/theme.cpp +++ b/scene/resources/theme.cpp @@ -69,7 +69,7 @@ Vector<String> Theme::_get_stylebox_list(const String &p_type) const { return ilret; } -Vector<String> Theme::_get_stylebox_types(void) const { +Vector<String> Theme::_get_stylebox_types() const { Vector<String> ilret; List<StringName> il; diff --git a/scene/resources/theme.h b/scene/resources/theme.h index d6d724e3f7..b5043c35e8 100644 --- a/scene/resources/theme.h +++ b/scene/resources/theme.h @@ -54,7 +54,7 @@ class Theme : public Resource { Vector<String> _get_icon_list(const String &p_type) const; Vector<String> _get_stylebox_list(const String &p_type) const; - Vector<String> _get_stylebox_types(void) const; + Vector<String> _get_stylebox_types() const; Vector<String> _get_font_list(const String &p_type) const; Vector<String> _get_color_list(const String &p_type) const; Vector<String> _get_constant_list(const String &p_type) const; |