godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-11 13:10:58 +00:00
Code Releases Wiki Activity

Synchronize parameter names in definition and declaration

Browse Source 
Fixes #10244.
This commit is contained in:
TwistedTwigleg
2017-08-11 15:10:05 -04:00
committed by Rémi Verschelde
parent b1ecaaa22b
commit 00f6c85928
134 changed files with 974 additions and 974 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
scene/gui/color_picker.cpp
View File

@@ -314,9 +314,9 @@ void ColorPicker::_hsv_draw(int p_which, Control *c) {
}
}
void ColorPicker::_uv_input(const Ref<InputEvent> &ev) {
void ColorPicker::_uv_input(const Ref<InputEvent> &p_event) {
Ref<InputEventMouseButton> bev = ev;
Ref<InputEventMouseButton> bev = p_event;
if (bev.is_valid()) {
if (bev->is_pressed() && bev->get_button_index() == BUTTON_LEFT) {
@@ -335,7 +335,7 @@ void ColorPicker::_uv_input(const Ref<InputEvent> &ev) {
}
}
Ref<InputEventMouseMotion> mev = ev;
Ref<InputEventMouseMotion> mev = p_event;
if (mev.is_valid()) {
if (!changing_color)
@@ -352,9 +352,9 @@ void ColorPicker::_uv_input(const Ref<InputEvent> &ev) {
}
}
void ColorPicker::_w_input(const Ref<InputEvent> &ev) {
void ColorPicker::_w_input(const Ref<InputEvent> &p_event) {
Ref<InputEventMouseButton> bev = ev;
Ref<InputEventMouseButton> bev = p_event;
if (bev.is_valid()) {
@@ -372,7 +372,7 @@ void ColorPicker::_w_input(const Ref<InputEvent> &ev) {
emit_signal("color_changed", color);
}
Ref<InputEventMouseMotion> mev = ev;
Ref<InputEventMouseMotion> mev = p_event;
if (mev.is_valid()) {
@@ -388,9 +388,9 @@ void ColorPicker::_w_input(const Ref<InputEvent> &ev) {
}
}
void ColorPicker::_preset_input(const Ref<InputEvent> &ev) {
void ColorPicker::_preset_input(const Ref<InputEvent> &p_event) {
Ref<InputEventMouseButton> bev = ev;
Ref<InputEventMouseButton> bev = p_event;
if (bev.is_valid()) {
@@ -407,7 +407,7 @@ void ColorPicker::_preset_input(const Ref<InputEvent> &ev) {
emit_signal("color_changed", color);
}
Ref<InputEventMouseMotion> mev = ev;
Ref<InputEventMouseMotion> mev = p_event;
if (mev.is_valid()) {
@@ -423,9 +423,9 @@ void ColorPicker::_preset_input(const Ref<InputEvent> &ev) {
}
}
void ColorPicker::_screen_input(const Ref<InputEvent> &ev) {
void ColorPicker::_screen_input(const Ref<InputEvent> &p_event) {
Ref<InputEventMouseButton> bev = ev;
Ref<InputEventMouseButton> bev = p_event;
if (bev.is_valid()) {
@@ -435,7 +435,7 @@ void ColorPicker::_screen_input(const Ref<InputEvent> &ev) {
}
}
Ref<InputEventMouseMotion> mev = ev;
Ref<InputEventMouseMotion> mev = p_event;
if (mev.is_valid()) {
Viewport *r = get_tree()->get_root();