From 0aee2849741424cb21b263a9a574460967ecb6d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20S=C5=82omkowski?= Date: Tue, 17 Nov 2015 23:09:18 +0100 Subject: [PATCH] Add 'override' to virtual function overloads. --- include/mumlib/Callback.hpp | 36 ++++++++++++++++++------------------ mumlib_example.cpp | 4 ++-- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/include/mumlib/Callback.hpp b/include/mumlib/Callback.hpp index bc668d9..7ff4aa6 100644 --- a/include/mumlib/Callback.hpp +++ b/include/mumlib/Callback.hpp @@ -159,21 +159,21 @@ namespace mumlib { uint8_t patch, string release, string os, - string os_version); + string os_version) override; virtual void audio( int target, int sessionId, int sequenceNumber, int16_t *pcm_data, - uint32_t pcm_data_size); + uint32_t pcm_data_size) override; virtual void unsupportedAudio( int target, int sessionId, int sequenceNumber, uint8_t *encoded_audio_data, - uint32_t encoded_audio_data_size); + uint32_t encoded_audio_data_size) override; virtual void serverSync( string welcome_text, @@ -181,7 +181,7 @@ namespace mumlib { int32_t max_bandwidth, int64_t permissions); - virtual void channelRemove(uint32_t channel_id); + virtual void channelRemove(uint32_t channel_id) override; virtual void channelState( string name, @@ -192,13 +192,13 @@ namespace mumlib { vector inks_add, vector links_remove, bool temporary, - int32_t position); + int32_t position) override; virtual void userRemove( uint32_t session, int32_t actor, string reason, - bool ban); + bool ban) override; virtual void userState( int32_t session, @@ -213,7 +213,7 @@ namespace mumlib { int32_t self_deaf, string comment, int32_t priority_speaker, - int32_t recording); + int32_t recording) override; virtual void banList( const uint8_t *ip_data, @@ -223,14 +223,14 @@ namespace mumlib { string hash, string reason, string start, - int32_t duration); + int32_t duration) override; virtual void textMessage( uint32_t actor, std::vector session, std::vector channel_id, std::vector tree_id, - string message); + string message) override; virtual void permissionDenied( int32_t permission, @@ -238,53 +238,53 @@ namespace mumlib { int32_t session, string reason, int32_t deny_type, - string name); + string name) override; virtual void queryUsers( uint32_t n_ids, uint32_t *ids, uint32_t n_names, - string *names); + string *names) override; virtual void contextActionModify( string action, string text, uint32_t m_context, - uint32_t operation); + uint32_t operation) override; virtual void contextAction( int32_t session, int32_t channel_id, - string action); + string action) override; virtual void userList( uint32_t user_id, string name, string last_seen, - int32_t last_channel); + int32_t last_channel) override; virtual void permissionQuery( int32_t channel_id, uint32_t permissions, - int32_t flush); + int32_t flush) override; virtual void codecVersion( int32_t alpha, int32_t beta, uint32_t prefer_alpha, - int32_t opus); + int32_t opus) override; virtual void serverConfig( uint32_t max_bandwidth, string welcome_text, uint32_t allow_html, uint32_t message_length, - uint32_t image_message_length); + uint32_t image_message_length) override; virtual void suggestConfig( uint32_t version, uint32_t positional, - uint32_t push_to_talk); + uint32_t push_to_talk) override; private: _BasicCallback_Private *impl; diff --git a/mumlib_example.cpp b/mumlib_example.cpp index 870e792..b4d3a45 100644 --- a/mumlib_example.cpp +++ b/mumlib_example.cpp @@ -12,7 +12,7 @@ public: int sessionId, int sequenceNumber, int16_t *pcm_data, - uint32_t pcm_data_size) { + uint32_t pcm_data_size) override { mum->sendAudioData(pcm_data, pcm_data_size); } @@ -21,7 +21,7 @@ public: std::vector session, std::vector channel_id, std::vector tree_id, - std::string message) { + std::string message) override { mumlib::BasicCallback::textMessage(actor, session, channel_id, tree_id, message); mum->sendTextMessage("someone said: " + message); }