godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #29041 from hbina/add_const

Browse Source 
add const to methods that return literals
This commit is contained in:
Rémi Verschelde 2019-05-21 15:16:41 +02:00 committed by GitHub
commit 26e0cc7aa3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
24 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/os/os.h
View File

@ -273,7 +273,7 @@ public:
virtual String get_environment(const String &p_var) const = 0; virtual String get_environment(const String &p_var) const = 0;
virtual bool set_environment(const String &p_var, const String &p_value) const = 0; virtual bool set_environment(const String &p_var, const String &p_value) const = 0;
virtual String get_name() = 0; virtual String get_name() const = 0;
virtual List<String> get_cmdline_args() const { return _cmdline; } virtual List<String> get_cmdline_args() const { return _cmdline; }
virtual String get_model_name() const; virtual String get_model_name() const;

2
drivers/unix/os_unix.cpp
View File

@ -170,7 +170,7 @@ String OS_Unix::get_stdin_string(bool p_block) {
return ""; return "";
} }
String OS_Unix::get_name() { String OS_Unix::get_name() const {
return "Unix"; return "Unix";
} }

2
drivers/unix/os_unix.h
View File

@ -76,7 +76,7 @@ public:
virtual Error set_cwd(const String &p_cwd); virtual Error set_cwd(const String &p_cwd);
virtual String get_name(); virtual String get_name() const;
virtual Date get_date(bool utc) const; virtual Date get_date(bool utc) const;
virtual Time get_time(bool utc) const; virtual Time get_time(bool utc) const;

2
modules/gdscript/editor/gdscript_highlighter.cpp
View File

@ -330,7 +330,7 @@ Map<int, TextEdit::HighlighterInfo> GDScriptSyntaxHighlighter::_get_line_syntax_
return color_map; return color_map;
} }
String GDScriptSyntaxHighlighter::get_name() { String GDScriptSyntaxHighlighter::get_name() const {
return "GDScript"; return "GDScript";
} }

2
modules/gdscript/editor/gdscript_highlighter.h
View File

@ -65,7 +65,7 @@ public:
virtual void _update_cache(); virtual void _update_cache();
virtual Map<int, TextEdit::HighlighterInfo> _get_line_syntax_highlighting(int p_line); virtual Map<int, TextEdit::HighlighterInfo> _get_line_syntax_highlighting(int p_line);
virtual String get_name(); virtual String get_name() const;
virtual List<String> get_supported_languages(); virtual List<String> get_supported_languages();
}; };

2
platform/android/os_android.cpp
View File

@ -277,7 +277,7 @@ Size2 OS_Android::get_window_size() const {
return Vector2(default_videomode.width, default_videomode.height); return Vector2(default_videomode.width, default_videomode.height);
} }
String OS_Android::get_name() { String OS_Android::get_name() const {
return "Android"; return "Android";
} }

2
platform/android/os_android.h
View File

@ -139,7 +139,7 @@ public:
virtual Size2 get_window_size() const; virtual Size2 get_window_size() const;
virtual String get_name(); virtual String get_name() const;
virtual MainLoop *get_main_loop() const; virtual MainLoop *get_main_loop() const;
virtual bool can_draw() const; virtual bool can_draw() const;

2
platform/haiku/os_haiku.cpp
View File

@ -69,7 +69,7 @@ void OS_Haiku::run() {
main_loop->finish(); main_loop->finish();
} }
String OS_Haiku::get_name() { String OS_Haiku::get_name() const {
return "Haiku"; return "Haiku";
} }

2
platform/haiku/os_haiku.h
View File

@ -74,7 +74,7 @@ public:
OS_Haiku(); OS_Haiku();
void run(); void run();
virtual String get_name(); virtual String get_name() const;
virtual MainLoop *get_main_loop() const; virtual MainLoop *get_main_loop() const;

2
platform/iphone/os_iphone.cpp
View File

@ -495,7 +495,7 @@ String OSIPhone::get_user_data_dir() const {
return data_dir; return data_dir;
}; };
String OSIPhone::get_name() { String OSIPhone::get_name() const {
return "iOS"; return "iOS";
}; };

2
platform/iphone/os_iphone.h
View File

@ -174,7 +174,7 @@ public:
void set_data_dir(String p_dir); void set_data_dir(String p_dir);
virtual String get_name(); virtual String get_name() const;
Error shell_open(String p_uri); Error shell_open(String p_uri);

2
platform/javascript/os_javascript.cpp
View File

@ -1159,7 +1159,7 @@ Error OS_JavaScript::shell_open(String p_uri) {
return OK; return OK;
} }
String OS_JavaScript::get_name() { String OS_JavaScript::get_name() const {
return "HTML5"; return "HTML5";
} }

2
platform/javascript/os_javascript.h
View File

@ -146,7 +146,7 @@ public:
virtual void set_icon(const Ref<Image> &p_icon); virtual void set_icon(const Ref<Image> &p_icon);
String get_executable_path() const; String get_executable_path() const;
virtual Error shell_open(String p_uri); virtual Error shell_open(String p_uri);
virtual String get_name(); virtual String get_name() const;
virtual bool can_draw() const; virtual bool can_draw() const;
virtual String get_resource_dir() const; virtual String get_resource_dir() const;

2
platform/osx/os_osx.h
View File

@ -165,7 +165,7 @@ public:
void wm_minimized(bool p_minimized); void wm_minimized(bool p_minimized);
virtual String get_name(); virtual String get_name() const;
virtual void alert(const String &p_alert, const String &p_title = "ALERT!"); virtual void alert(const String &p_alert, const String &p_title = "ALERT!");

2
platform/osx/os_osx.mm
View File

@ -1551,7 +1551,7 @@ void OS_OSX::delete_main_loop() {
main_loop = NULL; main_loop = NULL;
} }
String OS_OSX::get_name() { String OS_OSX::get_name() const {
return "OSX"; return "OSX";
} }

2
platform/server/os_server.cpp
View File

@ -190,7 +190,7 @@ bool OS_Server::can_draw() const {
return false; //can never draw return false; //can never draw
}; };
String OS_Server::get_name() { String OS_Server::get_name() const {
return "Server"; return "Server";
} }

2
platform/server/os_server.h
View File

@ -93,7 +93,7 @@ protected:
virtual void set_main_loop(MainLoop *p_main_loop); virtual void set_main_loop(MainLoop *p_main_loop);
public: public:
virtual String get_name(); virtual String get_name() const;
virtual void set_mouse_show(bool p_show); virtual void set_mouse_show(bool p_show);
virtual void set_mouse_grab(bool p_grab); virtual void set_mouse_grab(bool p_grab);

2
platform/uwp/os_uwp.cpp
View File

@ -530,7 +530,7 @@ OS::VideoMode OS_UWP::get_video_mode(int p_screen) const {
void OS_UWP::get_fullscreen_mode_list(List<VideoMode> *p_list, int p_screen) const { void OS_UWP::get_fullscreen_mode_list(List<VideoMode> *p_list, int p_screen) const {
} }
String OS_UWP::get_name() { String OS_UWP::get_name() const {
return "UWP"; return "UWP";
} }

2
platform/uwp/os_uwp.h
View File

@ -195,7 +195,7 @@ public:
virtual MainLoop *get_main_loop() const; virtual MainLoop *get_main_loop() const;
virtual String get_name(); virtual String get_name() const;
virtual Date get_date(bool utc) const; virtual Date get_date(bool utc) const;
virtual Time get_time(bool utc) const; virtual Time get_time(bool utc) const;

2
platform/windows/os_windows.cpp
View File

@ -2119,7 +2119,7 @@ void OS_Windows::request_attention() {
FlashWindowEx(&info); FlashWindowEx(&info);
} }
String OS_Windows::get_name() { String OS_Windows::get_name() const {
return "Windows"; return "Windows";
} }

2
platform/windows/os_windows.h
View File

@ -246,7 +246,7 @@ public:
virtual MainLoop *get_main_loop() const; virtual MainLoop *get_main_loop() const;
virtual String get_name(); virtual String get_name() const;
virtual Date get_date(bool utc) const; virtual Date get_date(bool utc) const;
virtual Time get_time(bool utc) const; virtual Time get_time(bool utc) const;

2
platform/x11/os_x11.cpp
View File

@ -2592,7 +2592,7 @@ String OS_X11::get_clipboard() const {
return ret; return ret;
} }
String OS_X11::get_name() { String OS_X11::get_name() const {
return "X11"; return "X11";
} }

2
platform/x11/os_x11.h
View File

@ -216,7 +216,7 @@ protected:
bool is_window_maximize_allowed(); bool is_window_maximize_allowed();
public: public:
virtual String get_name(); virtual String get_name() const;
virtual void set_cursor_shape(CursorShape p_shape); virtual void set_cursor_shape(CursorShape p_shape);
virtual CursorShape get_cursor_shape() const; virtual CursorShape get_cursor_shape() const;

2
scene/gui/text_edit.h
View File

@ -732,7 +732,7 @@ public:
virtual void _update_cache() = 0; virtual void _update_cache() = 0;
virtual Map<int, TextEdit::HighlighterInfo> _get_line_syntax_highlighting(int p_line) = 0; virtual Map<int, TextEdit::HighlighterInfo> _get_line_syntax_highlighting(int p_line) = 0;
virtual String get_name() = 0; virtual String get_name() const = 0;
virtual List<String> get_supported_languages() = 0; virtual List<String> get_supported_languages() = 0;
void set_text_editor(TextEdit *p_text_editor); void set_text_editor(TextEdit *p_text_editor);