Gremlinsoft
/
godot
forked from sascha/godot
2
0
Fork 0
Code Pull Requests Activity

Merge pull request #5176 from marcelofg55/master 

Fixed overloaded virtual functions with const vs none warning
2.1
Juan Linietsky 2016-06-13 15:45:13 +07:00 committed by GitHub
parent 137464af87 3787856563
commit 28034190a9
8 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scene/3d/vehicle_body.cpp
Unescape Escape View File

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

2
scene/3d/vehicle_body.h
Unescape Escape View File

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

2
scene/gui/split_container.cpp
Unescape Escape 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)
return Control::get_cursor_shape(p_pos);

2
scene/gui/split_container.h
Unescape Escape View File

@ -75,7 +75,7 @@ public:
void set_dragger_visibility(DraggerVisibility p_visibility);
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;

2
scene/gui/text_edit.cpp
Unescape Escape View File

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

2
scene/gui/text_edit.h
Unescape Escape View File

@ -278,7 +278,7 @@ class TextEdit : public Control {
void _scroll_lines_down();
// 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;

2
scene/resources/room.cpp
Unescape Escape View File

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

2
scene/resources/room.h
Unescape Escape View File

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