summaryrefslogtreecommitdiff
path: root/core/os
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/os
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/os')
-rw-r--r--core/os/os.cpp29
-rw-r--r--core/os/os.h2
2 files changed, 4 insertions, 27 deletions
diff --git a/core/os/os.cpp b/core/os/os.cpp
index db7b7cb943..f4c13dabcc 100644
--- a/core/os/os.cpp
+++ b/core/os/os.cpp
@@ -27,13 +27,13 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#include "os.h"
-#include "os/file_access.h"
-#include <stdarg.h>
+
#include "dir_access.h"
#include "globals.h"
#include "input.h"
-// For get_engine_version, could be removed if it's moved to a new Engine singleton
-#include "version.h"
+#include "os/file_access.h"
+
+#include <stdarg.h>
OS* OS::singleton=NULL;
@@ -512,27 +512,6 @@ bool OS::is_vsync_enabled() const{
return true;
}
-Dictionary OS::get_engine_version() const {
-
- Dictionary dict;
- dict["major"] = _MKSTR(VERSION_MAJOR);
- dict["minor"] = _MKSTR(VERSION_MINOR);
-#ifdef VERSION_PATCH
- dict["patch"] = _MKSTR(VERSION_PATCH);
-#else
- dict["patch"] = "";
-#endif
- dict["status"] = _MKSTR(VERSION_STATUS);
- dict["revision"] = _MKSTR(VERSION_REVISION);
-
- String stringver = String(dict["major"]) + "." + String(dict["minor"]);
- if (dict["patch"] != "")
- stringver += "." + String(dict["patch"]);
- stringver += "-" + String(dict["status"]) + " (" + String(dict["revision"]) + ")";
- dict["string"] = stringver;
-
- return dict;
-}
OS::OS() {
last_error=NULL;
diff --git a/core/os/os.h b/core/os/os.h
index 4c34ff92f9..ea03481a92 100644
--- a/core/os/os.h
+++ b/core/os/os.h
@@ -402,8 +402,6 @@ public:
virtual void set_use_vsync(bool p_enable);
virtual bool is_vsync_enabled() const;
- Dictionary get_engine_version() const;
-
bool is_hidpi_allowed() const { return _allow_hidpi; }
OS();
virtual ~OS();