Add 'override' to virtual function overloads.

This commit is contained in:
Michał Słomkowski 2015-11-17 23:09:18 +01:00
parent ae1e71fffc
commit 0aee284974
2 changed files with 20 additions and 20 deletions

View File

@ -159,21 +159,21 @@ namespace mumlib {
uint8_t patch, uint8_t patch,
string release, string release,
string os, string os,
string os_version); string os_version) override;
virtual void audio( virtual void audio(
int target, int target,
int sessionId, int sessionId,
int sequenceNumber, int sequenceNumber,
int16_t *pcm_data, int16_t *pcm_data,
uint32_t pcm_data_size); uint32_t pcm_data_size) override;
virtual void unsupportedAudio( virtual void unsupportedAudio(
int target, int target,
int sessionId, int sessionId,
int sequenceNumber, int sequenceNumber,
uint8_t *encoded_audio_data, uint8_t *encoded_audio_data,
uint32_t encoded_audio_data_size); uint32_t encoded_audio_data_size) override;
virtual void serverSync( virtual void serverSync(
string welcome_text, string welcome_text,
@ -181,7 +181,7 @@ namespace mumlib {
int32_t max_bandwidth, int32_t max_bandwidth,
int64_t permissions); int64_t permissions);
virtual void channelRemove(uint32_t channel_id); virtual void channelRemove(uint32_t channel_id) override;
virtual void channelState( virtual void channelState(
string name, string name,
@ -192,13 +192,13 @@ namespace mumlib {
vector<uint32_t> inks_add, vector<uint32_t> inks_add,
vector<uint32_t> links_remove, vector<uint32_t> links_remove,
bool temporary, bool temporary,
int32_t position); int32_t position) override;
virtual void userRemove( virtual void userRemove(
uint32_t session, uint32_t session,
int32_t actor, int32_t actor,
string reason, string reason,
bool ban); bool ban) override;
virtual void userState( virtual void userState(
int32_t session, int32_t session,
@ -213,7 +213,7 @@ namespace mumlib {
int32_t self_deaf, int32_t self_deaf,
string comment, string comment,
int32_t priority_speaker, int32_t priority_speaker,
int32_t recording); int32_t recording) override;
virtual void banList( virtual void banList(
const uint8_t *ip_data, const uint8_t *ip_data,
@ -223,14 +223,14 @@ namespace mumlib {
string hash, string hash,
string reason, string reason,
string start, string start,
int32_t duration); int32_t duration) override;
virtual void textMessage( virtual void textMessage(
uint32_t actor, uint32_t actor,
std::vector<uint32_t> session, std::vector<uint32_t> session,
std::vector<uint32_t> channel_id, std::vector<uint32_t> channel_id,
std::vector<uint32_t> tree_id, std::vector<uint32_t> tree_id,
string message); string message) override;
virtual void permissionDenied( virtual void permissionDenied(
int32_t permission, int32_t permission,
@ -238,53 +238,53 @@ namespace mumlib {
int32_t session, int32_t session,
string reason, string reason,
int32_t deny_type, int32_t deny_type,
string name); string name) override;
virtual void queryUsers( virtual void queryUsers(
uint32_t n_ids, uint32_t n_ids,
uint32_t *ids, uint32_t *ids,
uint32_t n_names, uint32_t n_names,
string *names); string *names) override;
virtual void contextActionModify( virtual void contextActionModify(
string action, string action,
string text, string text,
uint32_t m_context, uint32_t m_context,
uint32_t operation); uint32_t operation) override;
virtual void contextAction( virtual void contextAction(
int32_t session, int32_t session,
int32_t channel_id, int32_t channel_id,
string action); string action) override;
virtual void userList( virtual void userList(
uint32_t user_id, uint32_t user_id,
string name, string name,
string last_seen, string last_seen,
int32_t last_channel); int32_t last_channel) override;
virtual void permissionQuery( virtual void permissionQuery(
int32_t channel_id, int32_t channel_id,
uint32_t permissions, uint32_t permissions,
int32_t flush); int32_t flush) override;
virtual void codecVersion( virtual void codecVersion(
int32_t alpha, int32_t alpha,
int32_t beta, int32_t beta,
uint32_t prefer_alpha, uint32_t prefer_alpha,
int32_t opus); int32_t opus) override;
virtual void serverConfig( virtual void serverConfig(
uint32_t max_bandwidth, uint32_t max_bandwidth,
string welcome_text, string welcome_text,
uint32_t allow_html, uint32_t allow_html,
uint32_t message_length, uint32_t message_length,
uint32_t image_message_length); uint32_t image_message_length) override;
virtual void suggestConfig( virtual void suggestConfig(
uint32_t version, uint32_t version,
uint32_t positional, uint32_t positional,
uint32_t push_to_talk); uint32_t push_to_talk) override;
private: private:
_BasicCallback_Private *impl; _BasicCallback_Private *impl;

View File

@ -12,7 +12,7 @@ public:
int sessionId, int sessionId,
int sequenceNumber, int sequenceNumber,
int16_t *pcm_data, int16_t *pcm_data,
uint32_t pcm_data_size) { uint32_t pcm_data_size) override {
mum->sendAudioData(pcm_data, pcm_data_size); mum->sendAudioData(pcm_data, pcm_data_size);
} }
@ -21,7 +21,7 @@ public:
std::vector<uint32_t> session, std::vector<uint32_t> session,
std::vector<uint32_t> channel_id, std::vector<uint32_t> channel_id,
std::vector<uint32_t> tree_id, std::vector<uint32_t> tree_id,
std::string message) { std::string message) override {
mumlib::BasicCallback::textMessage(actor, session, channel_id, tree_id, message); mumlib::BasicCallback::textMessage(actor, session, channel_id, tree_id, message);
mum->sendTextMessage("someone said: " + message); mum->sendTextMessage("someone said: " + message);
} }