godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-07 12:30:27 +00:00
Code Releases Wiki Activity

Fixed overloaded virtual functions with const vs none warning

Browse Source
This commit is contained in:
marcelofg55
2016-06-12 13:31:22 -03:00
parent 4bb93c976c
commit 3787856563
8 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
scene/3d/vehicle_body.cpp
View File

@@ -990,7 +990,7 @@ float VehicleBody::get_steering() const{
return m_steeringValue; return m_steeringValue;
} }
Vector3 VehicleBody::get_linear_velocity() Vector3 VehicleBody::get_linear_velocity() const
{ {
return linear_velocity; return linear_velocity;
} }

2
scene/3d/vehicle_body.h
View File

@@ -178,7 +178,7 @@ public:
void set_steering(float p_steering); void set_steering(float p_steering);
float get_steering() const; float get_steering() const;
Vector3 get_linear_velocity(); Vector3 get_linear_velocity() const;
VehicleBody(); VehicleBody();
}; };

2
scene/gui/split_container.cpp
View File

@@ -351,7 +351,7 @@ void SplitContainer::_input_event(const InputEvent& p_event) {
} }
Control::CursorShape SplitContainer::get_cursor_shape(const Point2& p_pos) { Control::CursorShape SplitContainer::get_cursor_shape(const Point2& p_pos) const {
if (collapsed) if (collapsed)
return Control::get_cursor_shape(p_pos); return Control::get_cursor_shape(p_pos);

2
scene/gui/split_container.h
View File

@@ -75,7 +75,7 @@ public:
void set_dragger_visibility(DraggerVisibility p_visibility); void set_dragger_visibility(DraggerVisibility p_visibility);
DraggerVisibility get_dragger_visibility() const; DraggerVisibility get_dragger_visibility() const;
virtual CursorShape get_cursor_shape(const Point2& p_pos=Point2i()); virtual CursorShape get_cursor_shape(const Point2& p_pos=Point2i()) const;
virtual Size2 get_minimum_size() const; virtual Size2 get_minimum_size() const;

2
scene/gui/text_edit.cpp
View File

@@ -2892,7 +2892,7 @@ int TextEdit::get_char_count() {
return totalsize; // omit last \n return totalsize; // omit last \n
} }
Size2 TextEdit::get_minimum_size() { Size2 TextEdit::get_minimum_size() const {
return cache.style_normal->get_minimum_size(); return cache.style_normal->get_minimum_size();
} }

2
scene/gui/text_edit.h
View File

@@ -278,7 +278,7 @@ class TextEdit : public Control {
void _scroll_lines_down(); void _scroll_lines_down();
// void mouse_motion(const Point& p_pos, const Point& p_rel, int p_button_mask); // void mouse_motion(const Point& p_pos, const Point& p_rel, int p_button_mask);
Size2 get_minimum_size(); Size2 get_minimum_size() const;
int get_row_height() const; int get_row_height() const;

2
scene/resources/room.cpp
View File

@@ -31,7 +31,7 @@
#include "servers/visual_server.h" #include "servers/visual_server.h"
RID RoomBounds::get_rid() { RID RoomBounds::get_rid() const {
return area; return area;
} }

2
scene/resources/room.h
View File

@@ -50,7 +50,7 @@ protected:
public: public:
virtual RID get_rid(); virtual RID get_rid() const;
void set_bounds( const BSP_Tree& p_bounds ); void set_bounds( const BSP_Tree& p_bounds );
BSP_Tree get_bounds() const; BSP_Tree get_bounds() const;