Jelajahi Sumber

src: add missing override keywords

Daniele Bartolini 3 tahun lalu
induk
melakukan
b4d246bb64

+ 12 - 12
src/core/filesystem/filesystem_apk.cpp

@@ -31,12 +31,12 @@ struct FileApk : public File
 		close();
 	}
 
-	void open(const char *path, FileOpenMode::Enum /*mode*/)
+	void open(const char *path, FileOpenMode::Enum /*mode*/) override
 	{
 		_asset = AAssetManager_open(_asset_manager, path, AASSET_MODE_RANDOM);
 	}
 
-	void close()
+	void close() override
 	{
 		if (_asset) {
 			AAsset_close(_asset);
@@ -44,30 +44,30 @@ struct FileApk : public File
 		}
 	}
 
-	bool is_open()
+	bool is_open() override
 	{
 		return _asset != NULL;
 	}
 
-	u32 size()
+	u32 size() override
 	{
 		CE_ASSERT(is_open(), "File is not open");
 		return AAsset_getLength(_asset);
 	}
 
-	u32 position()
+	u32 position() override
 	{
 		CE_ASSERT(is_open(), "File is not open");
 		return u32(AAsset_getLength(_asset) - AAsset_getRemainingLength(_asset));
 	}
 
-	bool end_of_file()
+	bool end_of_file() override
 	{
 		CE_ASSERT(is_open(), "File is not open");
 		return AAsset_getRemainingLength(_asset) == 0;
 	}
 
-	void seek(u32 position)
+	void seek(u32 position) override
 	{
 		CE_ASSERT(is_open(), "File is not open");
 		off_t seek_result = AAsset_seek(_asset, (off_t)position, SEEK_SET);
@@ -75,7 +75,7 @@ struct FileApk : public File
 		CE_UNUSED(seek_result);
 	}
 
-	void seek_to_end()
+	void seek_to_end() override
 	{
 		CE_ASSERT(is_open(), "File is not open");
 		off_t seek_result = AAsset_seek(_asset, 0, SEEK_END);
@@ -83,7 +83,7 @@ struct FileApk : public File
 		CE_UNUSED(seek_result);
 	}
 
-	void skip(u32 bytes)
+	void skip(u32 bytes) override
 	{
 		CE_ASSERT(is_open(), "File is not open");
 		off_t seek_result = AAsset_seek(_asset, (off_t)bytes, SEEK_CUR);
@@ -91,21 +91,21 @@ struct FileApk : public File
 		CE_UNUSED(seek_result);
 	}
 
-	u32 read(void *data, u32 size)
+	u32 read(void *data, u32 size) override
 	{
 		CE_ASSERT(is_open(), "File is not open");
 		CE_ENSURE(NULL != data);
 		return (u32)AAsset_read(_asset, data, size);
 	}
 
-	u32 write(const void * /*data*/, u32 /*size*/)
+	u32 write(const void * /*data*/, u32 /*size*/) override
 	{
 		CE_ASSERT(is_open(), "File is not open");
 		CE_FATAL("Apk files are read only!");
 		return 0;
 	}
 
-	void flush()
+	void flush() override
 	{
 		// Not needed
 	}

+ 12 - 12
src/core/filesystem/filesystem_apk.h

@@ -26,40 +26,40 @@ struct FilesystemApk : public Filesystem
 	FilesystemApk(Allocator &a, AAssetManager *asset_manager);
 
 	/// @copydoc Filesystem::open()
-	File *open(const char *path, FileOpenMode::Enum mode);
+	File *open(const char *path, FileOpenMode::Enum mode) override;
 
 	/// @copydoc Filesystem::close()
-	void close(File &file);
+	void close(File &file) override;
 
 	/// @copydoc Filesystem::stat()
-	Stat stat(const char *path);
+	Stat stat(const char *path) override;
 
 	/// @copydoc Filesystem::exists()
-	bool exists(const char *path);
+	bool exists(const char *path) override;
 
 	/// @copydoc Filesystem::is_directory()
-	bool is_directory(const char *path);
+	bool is_directory(const char *path) override;
 
 	/// @copydoc Filesystem::is_file()
-	bool is_file(const char *path);
+	bool is_file(const char *path) override;
 
 	/// @copydoc Filesystem::last_modified_time()
-	u64 last_modified_time(const char *path);
+	u64 last_modified_time(const char *path) override;
 
 	/// @copydoc Filesystem::create_directory()
-	CreateResult create_directory(const char *path);
+	CreateResult create_directory(const char *path) override;
 
 	/// @copydoc Filesystem::delete_directory()
-	DeleteResult delete_directory(const char *path);
+	DeleteResult delete_directory(const char *path) override;
 
 	/// @copydoc Filesystem::delete_file()
-	DeleteResult delete_file(const char *path);
+	DeleteResult delete_file(const char *path) override;
 
 	/// @copydoc Filesystem::list_files()
-	void list_files(const char *path, Vector<DynamicString> &files);
+	void list_files(const char *path, Vector<DynamicString> &files) override;
 
 	/// @copydoc Filesystem::absolute_path()
-	void absolute_path(DynamicString &os_path, const char *path);
+	void absolute_path(DynamicString &os_path, const char *path) override;
 };
 
 } // namespace crown

+ 19 - 19
src/device/main_android.cpp

@@ -215,72 +215,72 @@ struct WindowAndroid : public Window
 	{
 	}
 
-	void open(u16 /*x*/, u16 /*y*/, u16 /*width*/, u16 /*height*/, u32 /*parent*/)
+	void open(u16 /*x*/, u16 /*y*/, u16 /*width*/, u16 /*height*/, u32 /*parent*/) override
 	{
 	}
 
-	void close()
+	void close() override
 	{
 	}
 
-	void bgfx_setup()
+	void bgfx_setup() override
 	{
 	}
 
-	void show()
+	void show() override
 	{
 	}
 
-	void hide()
+	void hide() override
 	{
 	}
 
-	void resize(u16 /*width*/, u16 /*height*/)
+	void resize(u16 /*width*/, u16 /*height*/) override
 	{
 	}
 
-	void move(u16 /*x*/, u16 /*y*/)
+	void move(u16 /*x*/, u16 /*y*/) override
 	{
 	}
 
-	void minimize()
+	void minimize() override
 	{
 	}
 
-	void maximize()
+	void maximize() override
 	{
 	}
 
-	void restore()
+	void restore() override
 	{
 	}
 
-	const char *title()
+	const char *title() override
 	{
 		return NULL;
 	}
 
-	void set_title(const char * /*title*/)
+	void set_title(const char * /*title*/) override
 	{
 	}
 
-	void show_cursor(bool /*show*/)
+	void show_cursor(bool /*show*/) override
 	{
 	}
 
-	void set_fullscreen(bool /*fullscreen*/)
+	void set_fullscreen(bool /*fullscreen*/) override
 	{
 	}
 
-	void set_cursor(MouseCursor::Enum /*cursor*/)
+	void set_cursor(MouseCursor::Enum /*cursor*/) override
 	{
 	}
 
-	void set_cursor_mode(CursorMode::Enum /*mode*/)
+	void set_cursor_mode(CursorMode::Enum /*mode*/) override
 	{
 	}
 
-	void *handle()
+	void *handle() override
 	{
 		return NULL;
 	}
@@ -302,11 +302,11 @@ namespace window
 
 struct DisplayAndroid : public Display
 {
-	void modes(Array<DisplayMode> & /*modes*/)
+	void modes(Array<DisplayMode> & /*modes*/) override
 	{
 	}
 
-	void set_mode(u32 /*id*/)
+	void set_mode(u32 /*id*/) override
 	{
 	}
 };

+ 19 - 19
src/device/main_linux.cpp

@@ -653,7 +653,7 @@ struct WindowX11 : public Window
 	{
 	}
 
-	void open(u16 x, u16 y, u16 width, u16 height, u32 parent)
+	void open(u16 x, u16 y, u16 width, u16 height, u32 parent) override
 	{
 		int screen = DefaultScreen(s_linux_device->_x11_display);
 		int depth = DefaultDepth(s_linux_device->_x11_display, screen);
@@ -705,12 +705,12 @@ struct WindowX11 : public Window
 		XMapRaised(s_linux_device->_x11_display, s_linux_device->_x11_window);
 	}
 
-	void close()
+	void close() override
 	{
 		XDestroyWindow(s_linux_device->_x11_display, s_linux_device->_x11_window);
 	}
 
-	void bgfx_setup()
+	void bgfx_setup() override
 	{
 		bgfx::PlatformData pd;
 		pd.ndt          = s_linux_device->_x11_display;
@@ -721,23 +721,23 @@ struct WindowX11 : public Window
 		bgfx::setPlatformData(pd);
 	}
 
-	void show()
+	void show() override
 	{
 		XMapRaised(s_linux_device->_x11_display, s_linux_device->_x11_window);
 	}
 
-	void hide()
+	void hide() override
 	{
 		XUnmapWindow(s_linux_device->_x11_display, s_linux_device->_x11_window);
 	}
 
-	void resize(u16 width, u16 height)
+	void resize(u16 width, u16 height) override
 	{
 		XResizeWindow(s_linux_device->_x11_display, s_linux_device->_x11_window, width, height);
 		XFlush(s_linux_device->_x11_display);
 	}
 
-	void move(u16 x, u16 y)
+	void move(u16 x, u16 y) override
 	{
 		XMoveWindow(s_linux_device->_x11_display, s_linux_device->_x11_window, x, y);
 	}
@@ -755,22 +755,22 @@ struct WindowX11 : public Window
 		XSendEvent(s_linux_device->_x11_display, DefaultRootWindow(s_linux_device->_x11_display), False, SubstructureNotifyMask | SubstructureRedirectMask, &xev);
 	}
 
-	void minimize()
+	void minimize() override
 	{
 		XIconifyWindow(s_linux_device->_x11_display, s_linux_device->_x11_window, DefaultScreen(s_linux_device->_x11_display));
 	}
 
-	void maximize()
+	void maximize() override
 	{
 		maximize_or_restore(true);
 	}
 
-	void restore()
+	void restore() override
 	{
 		maximize_or_restore(false);
 	}
 
-	const char *title()
+	const char *title() override
 	{
 		static char buf[512];
 		memset(buf, 0, sizeof(buf));
@@ -781,17 +781,17 @@ struct WindowX11 : public Window
 		return buf;
 	}
 
-	void set_title(const char *title)
+	void set_title(const char *title) override
 	{
 		XStoreName(s_linux_device->_x11_display, s_linux_device->_x11_window, title);
 	}
 
-	void *handle()
+	void *handle() override
 	{
 		return (void *)(uintptr_t)s_linux_device->_x11_window;
 	}
 
-	void show_cursor(bool show)
+	void show_cursor(bool show) override
 	{
 		XDefineCursor(s_linux_device->_x11_display
 			, s_linux_device->_x11_window
@@ -799,7 +799,7 @@ struct WindowX11 : public Window
 			);
 	}
 
-	void set_fullscreen(bool full)
+	void set_fullscreen(bool full) override
 	{
 		XEvent xev;
 		xev.xclient.type = ClientMessage;
@@ -811,12 +811,12 @@ struct WindowX11 : public Window
 		XSendEvent(s_linux_device->_x11_display, DefaultRootWindow(s_linux_device->_x11_display), False, SubstructureNotifyMask | SubstructureRedirectMask, &xev);
 	}
 
-	void set_cursor(MouseCursor::Enum cursor)
+	void set_cursor(MouseCursor::Enum cursor) override
 	{
 		XDefineCursor(s_linux_device->_x11_display, s_linux_device->_x11_window, _x11_cursors[cursor]);
 	}
 
-	void set_cursor_mode(CursorMode::Enum mode)
+	void set_cursor_mode(CursorMode::Enum mode) override
 	{
 		if (mode == s_linux_device->_cursor_mode)
 			return;
@@ -875,7 +875,7 @@ namespace window
 
 struct DisplayXRandr : public Display
 {
-	void modes(Array<DisplayMode> &modes)
+	void modes(Array<DisplayMode> &modes) override
 	{
 		int num = 0;
 		XRRScreenSize *sizes = XRRConfigSizes(s_linux_device->_screen_config, &num);
@@ -892,7 +892,7 @@ struct DisplayXRandr : public Display
 		}
 	}
 
-	void set_mode(u32 id)
+	void set_mode(u32 id) override
 	{
 		int num = 0;
 		XRRScreenSize *sizes = XRRConfigSizes(s_linux_device->_screen_config, &num);