summaryrefslogtreecommitdiff
path: root/platform/server
diff options
context:
space:
mode:
authorSergey Pusnei <sergey.pusnei@gmail.com>2017-03-29 11:29:38 -0400
committerRĂ©mi Verschelde <rverschelde@gmail.com>2017-04-10 08:27:34 +0200
commit8589ca390373ae2e84d93b4a75640277e38e9780 (patch)
tree4c66a5b3927649c737b631c05ed88e866455e566 /platform/server
parent1c480698ce0e881cbd28f1f0ddba95cee74ca834 (diff)
Rename [gs]et_pos to [gs]et_position for Controls
Control set_pos -> set_position Control set_global_pos -> set_global_position [gs]et_mouse_pos -> [gs]et_mouse_position [gs]et_global_mouse_pos -> [gs]et_global_mouse_position fixes #8005
Diffstat (limited to 'platform/server')
-rw-r--r--platform/server/os_server.cpp2
-rw-r--r--platform/server/os_server.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/platform/server/os_server.cpp b/platform/server/os_server.cpp
index 5e1034a392..89af785d29 100644
--- a/platform/server/os_server.cpp
+++ b/platform/server/os_server.cpp
@@ -143,7 +143,7 @@ int OS_Server::get_mouse_button_state() const {
return 0;
}
-Point2 OS_Server::get_mouse_pos() const {
+Point2 OS_Server::get_mouse_position() const {
return Point2();
}
diff --git a/platform/server/os_server.h b/platform/server/os_server.h
index b360a1e183..7c29b1e232 100644
--- a/platform/server/os_server.h
+++ b/platform/server/os_server.h
@@ -88,7 +88,7 @@ public:
virtual void set_mouse_show(bool p_show);
virtual void set_mouse_grab(bool p_grab);
virtual bool is_mouse_grab_enabled() const;
- virtual Point2 get_mouse_pos() const;
+ virtual Point2 get_mouse_position() const;
virtual int get_mouse_button_state() const;
virtual void set_window_title(const String &p_title);