summaryrefslogtreecommitdiff
path: root/core/bind
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2017-01-13 18:25:43 +0100
committerRémi Verschelde <rverschelde@gmail.com>2017-01-13 18:25:49 +0100
commitd2aae675e92cbe99706564e2cffbc34ed7cea639 (patch)
tree50258eae35ba32516ac4b7359fab0b39005d3133 /core/bind
parentde8cc309d66641d52a6832ad65f26ce73378fb88 (diff)
Replace Engine version API by preexisting OS one
It outputs a single Dictionary with all relevant information as keys, that will less bloat the documentation and provide all details in one function call.
Diffstat (limited to 'core/bind')
-rw-r--r--core/bind/core_bind.cpp53
-rw-r--r--core/bind/core_bind.h12
2 files changed, 4 insertions, 61 deletions
diff --git a/core/bind/core_bind.cpp b/core/bind/core_bind.cpp
index 80fe8b7c85..fe2be260d7 100644
--- a/core/bind/core_bind.cpp
+++ b/core/bind/core_bind.cpp
@@ -986,11 +986,6 @@ void _OS::alert(const String& p_alert,const String& p_title) {
OS::get_singleton()->alert(p_alert,p_title);
}
-Dictionary _OS::get_engine_version() const {
-
- return OS::get_singleton()->get_engine_version();
-}
-
_OS *_OS::singleton=NULL;
void _OS::_bind_methods() {
@@ -1134,8 +1129,6 @@ void _OS::_bind_methods() {
ClassDB::bind_method(_MD("set_use_vsync","enable"),&_OS::set_use_vsync);
ClassDB::bind_method(_MD("is_vsync_enabled"),&_OS::is_vsync_enabled);
- ClassDB::bind_method(_MD("get_engine_version"),&_OS::get_engine_version);
-
BIND_CONSTANT( DAY_SUNDAY );
BIND_CONSTANT( DAY_MONDAY );
BIND_CONSTANT( DAY_TUESDAY );
@@ -2596,42 +2589,9 @@ MainLoop *_Engine::get_main_loop() const {
return OS::get_singleton()->get_main_loop();
}
-String _Engine::get_version() const {
-
- return Engine::get_singleton()->get_version();
-}
-String _Engine::get_version_name() const{
-
- return Engine::get_singleton()->get_version_name();
-}
-String _Engine::get_version_short_name() const{
-
- return Engine::get_singleton()->get_version_short_name();
-}
-int _Engine::get_version_major() const{
-
- return Engine::get_singleton()->get_version_major();
-
-}
-int _Engine::get_version_minor() const{
-
- return Engine::get_singleton()->get_version_minor();
-
-}
-String _Engine::get_version_revision() const{
-
- return Engine::get_singleton()->get_version_revision();
-
-}
-String _Engine::get_version_status() const{
-
- return Engine::get_singleton()->get_version_status();
-
-}
-int _Engine::get_version_year() const{
-
- return Engine::get_singleton()->get_version_year();
+Dictionary _Engine::get_version_info() const {
+ return Engine::get_singleton()->get_version_info();
}
@@ -2652,14 +2612,7 @@ void _Engine::_bind_methods() {
ClassDB::bind_method(_MD("get_main_loop:MainLoop"),&_Engine::get_main_loop);
- ClassDB::bind_method(_MD("get_version"),&_Engine::get_version);
- ClassDB::bind_method(_MD("get_version_name"),&_Engine::get_version_name);
- ClassDB::bind_method(_MD("get_version_short_name"),&_Engine::get_version_short_name);
- ClassDB::bind_method(_MD("get_version_major"),&_Engine::get_version_major);
- ClassDB::bind_method(_MD("get_version_minor"),&_Engine::get_version_minor);
- ClassDB::bind_method(_MD("get_version_revision"),&_Engine::get_version_revision);
- ClassDB::bind_method(_MD("get_version_status"),&_Engine::get_version_status);
- ClassDB::bind_method(_MD("get_version_year"),&_Engine::get_version_year);
+ ClassDB::bind_method(_MD("get_version_info"),&_Engine::get_version_info);
}
diff --git a/core/bind/core_bind.h b/core/bind/core_bind.h
index 3401435c68..0774492f66 100644
--- a/core/bind/core_bind.h
+++ b/core/bind/core_bind.h
@@ -309,8 +309,6 @@ public:
void set_use_vsync(bool p_enable);
bool is_vsync_enabled() const;
- Dictionary get_engine_version() const;
-
static _OS *get_singleton() { return singleton; }
_OS();
@@ -647,15 +645,7 @@ public:
MainLoop *get_main_loop() const;
- String get_version() const;
- String get_version_name() const;
- String get_version_short_name() const;
- int get_version_major() const;
- int get_version_minor() const;
- String get_version_revision() const;
- String get_version_status() const;
- int get_version_year() const;
-
+ Dictionary get_version_info() const;
_Engine();
};