Merge pull request #40253 from madmiraal/add-override-keywords

Add override keywords.

5 files changed, 19 insertions, 35 deletions

diff --git a/modules/websocket/editor_debugger_server_websocket.h b/modules/websocket/editor_debugger_server_websocket.h
index c66db1b72a..861f389aab 100644
--- a/modules/websocket/editor_debugger_server_websocket.h
+++ b/modules/websocket/editor_debugger_server_websocket.h
@@ -48,12 +48,12 @@ public:
 	void _peer_connected(int p_peer, String p_protocol);
 	void _peer_disconnected(int p_peer, bool p_was_clean);
 
-	void poll();
-	Error start();
-	void stop();
-	bool is_active() const;
-	bool is_connection_available() const;
-	Ref<RemoteDebuggerPeer> take_connection();
+	void poll() override;
+	Error start() override;
+	void stop() override;
+	bool is_active() const override;
+	bool is_connection_available() const override;
+	Ref<RemoteDebuggerPeer> take_connection() override;
 
 	EditorDebuggerServerWebSocket();
 	~EditorDebuggerServerWebSocket();
diff --git a/modules/websocket/websocket_client.h b/modules/websocket/websocket_client.h
index ba8e21aed6..1053be22e3 100644
--- a/modules/websocket/websocket_client.h
+++ b/modules/websocket/websocket_client.h
@@ -55,14 +55,12 @@ public:
 	Ref<X509Certificate> get_trusted_ssl_certificate() const;
 	void set_trusted_ssl_certificate(Ref<X509Certificate> p_cert);
 
-	virtual void poll() = 0;
 	virtual Error connect_to_host(String p_host, String p_path, uint16_t p_port, bool p_ssl, const Vector<String> p_protocol = Vector<String>(), const Vector<String> p_custom_headers = Vector<String>()) = 0;
 	virtual void disconnect_from_host(int p_code = 1000, String p_reason = "") = 0;
 	virtual IP_Address get_connected_host() const = 0;
 	virtual uint16_t get_connected_port() const = 0;
 
-	virtual bool is_server() const;
-	virtual ConnectionStatus get_connection_status() const = 0;
+	virtual bool is_server() const override;
 
 	void _on_peer_packet();
 	void _on_connect(String p_protocol);
@@ -70,8 +68,6 @@ public:
 	void _on_disconnect(bool p_was_clean);
 	void _on_error();
 
-	virtual Error set_buffers(int p_in_buffer, int p_in_packets, int p_out_buffer, int p_out_packets) = 0;
-
 	WebSocketClient();
 	~WebSocketClient();
 };
diff --git a/modules/websocket/websocket_multiplayer_peer.h b/modules/websocket/websocket_multiplayer_peer.h
index 3ee26e2c5b..af26aef21e 100644
--- a/modules/websocket/websocket_multiplayer_peer.h
+++ b/modules/websocket/websocket_multiplayer_peer.h
@@ -79,21 +79,18 @@ protected:
 
 public:
 	/* NetworkedMultiplayerPeer */
-	void set_transfer_mode(TransferMode p_mode);
-	TransferMode get_transfer_mode() const;
-	void set_target_peer(int p_target_peer);
-	int get_packet_peer() const;
-	int get_unique_id() const;
-	virtual bool is_server() const = 0;
-	void set_refuse_new_connections(bool p_enable);
-	bool is_refusing_new_connections() const;
-	virtual ConnectionStatus get_connection_status() const = 0;
+	void set_transfer_mode(TransferMode p_mode) override;
+	TransferMode get_transfer_mode() const override;
+	void set_target_peer(int p_target_peer) override;
+	int get_packet_peer() const override;
+	int get_unique_id() const override;
+	void set_refuse_new_connections(bool p_enable) override;
+	bool is_refusing_new_connections() const override;
 
 	/* PacketPeer */
-	virtual int get_available_packet_count() const;
-	virtual int get_max_packet_size() const = 0;
-	virtual Error get_packet(const uint8_t **r_buffer, int &r_buffer_size);
-	virtual Error put_packet(const uint8_t *p_buffer, int p_buffer_size);
+	virtual int get_available_packet_count() const override;
+	virtual Error get_packet(const uint8_t **r_buffer, int &r_buffer_size) override;
+	virtual Error put_packet(const uint8_t *p_buffer, int p_buffer_size) override;
 
 	/* WebSocketPeer */
 	virtual Error set_buffers(int p_in_buffer, int p_in_packets, int p_out_buffer, int p_out_packets) = 0;
diff --git a/modules/websocket/websocket_peer.h b/modules/websocket/websocket_peer.h
index 5f7d1c768b..a61943b615 100644
--- a/modules/websocket/websocket_peer.h
+++ b/modules/websocket/websocket_peer.h
@@ -49,11 +49,6 @@ protected:
 	static void _bind_methods();
 
 public:
-	virtual int get_available_packet_count() const = 0;
-	virtual Error get_packet(const uint8_t **r_buffer, int &r_buffer_size) = 0;
-	virtual Error put_packet(const uint8_t *p_buffer, int p_buffer_size) = 0;
-	virtual int get_max_packet_size() const = 0;
-
 	virtual WriteMode get_write_mode() const = 0;
 	virtual void set_write_mode(WriteMode p_mode) = 0;
 
diff --git a/modules/websocket/websocket_server.h b/modules/websocket/websocket_server.h
index 5df0a37945..064ad4f179 100644
--- a/modules/websocket/websocket_server.h
+++ b/modules/websocket/websocket_server.h
@@ -50,14 +50,12 @@ protected:
 	Ref<X509Certificate> ca_chain;
 
 public:
-	virtual void poll() = 0;
 	virtual Error listen(int p_port, const Vector<String> p_protocols = Vector<String>(), bool gd_mp_api = false) = 0;
 	virtual void stop() = 0;
 	virtual bool is_listening() const = 0;
 	virtual bool has_peer(int p_id) const = 0;
-	virtual Ref<WebSocketPeer> get_peer(int p_id) const = 0;
-	virtual bool is_server() const;
-	ConnectionStatus get_connection_status() const;
+	virtual bool is_server() const override;
+	ConnectionStatus get_connection_status() const override;
 
 	virtual IP_Address get_peer_address(int p_peer_id) const = 0;
 	virtual int get_peer_port(int p_peer_id) const = 0;
@@ -80,8 +78,6 @@ public:
 	Ref<X509Certificate> get_ca_chain() const;
 	void set_ca_chain(Ref<X509Certificate> p_ca_chain);
 
-	virtual Error set_buffers(int p_in_buffer, int p_in_packets, int p_out_buffer, int p_out_packets) = 0;
-
 	WebSocketServer();
 	~WebSocketServer();
 };