From 5fd158568f93c3c9aab517774a98ec8bb5ca22a7 Mon Sep 17 00:00:00 2001 From: Ben Noordhuis Date: Tue, 28 Jun 2016 21:21:21 +0200 Subject: [PATCH] src: fix readability/inheritance cpplint warnings PR-URL: https://github.com/nodejs/node/pull/7462 Reviewed-By: Trevor Norris --- src/async-wrap.cc | 10 +++++----- src/cares_wrap.cc | 2 +- src/fs_event_wrap.cc | 2 +- src/handle_wrap.h | 2 +- src/inspector_agent.cc | 9 +++------ src/node_stat_watcher.h | 2 +- 6 files changed, 12 insertions(+), 15 deletions(-) diff --git a/src/async-wrap.cc b/src/async-wrap.cc index 405b9d1701..60124e47ad 100644 --- a/src/async-wrap.cc +++ b/src/async-wrap.cc @@ -38,11 +38,11 @@ class RetainedAsyncInfo: public RetainedObjectInfo { public: explicit RetainedAsyncInfo(uint16_t class_id, AsyncWrap* wrap); - virtual void Dispose() override; - virtual bool IsEquivalent(RetainedObjectInfo* other) override; - virtual intptr_t GetHash() override; - virtual const char* GetLabel() override; - virtual intptr_t GetSizeInBytes() override; + void Dispose() override; + bool IsEquivalent(RetainedObjectInfo* other) override; + intptr_t GetHash() override; + const char* GetLabel() override; + intptr_t GetSizeInBytes() override; private: const char* label_; diff --git a/src/cares_wrap.cc b/src/cares_wrap.cc index f78fe52871..bdbbd1a460 100644 --- a/src/cares_wrap.cc +++ b/src/cares_wrap.cc @@ -257,7 +257,7 @@ class QueryWrap : public AsyncWrap { req_wrap_obj->Set(env->domain_string(), env->domain_array()->Get(0)); } - virtual ~QueryWrap() override { + ~QueryWrap() override { CHECK_EQ(false, persistent().IsEmpty()); ClearWrap(object()); persistent().Reset(); diff --git a/src/fs_event_wrap.cc b/src/fs_event_wrap.cc index 3f0df1140c..10af967def 100644 --- a/src/fs_event_wrap.cc +++ b/src/fs_event_wrap.cc @@ -35,7 +35,7 @@ class FSEventWrap: public HandleWrap { private: FSEventWrap(Environment* env, Local object); - virtual ~FSEventWrap() override; + ~FSEventWrap() override; static void OnEvent(uv_fs_event_t* handle, const char* filename, int events, int status); diff --git a/src/handle_wrap.h b/src/handle_wrap.h index eaf0faef20..60f30fbd10 100644 --- a/src/handle_wrap.h +++ b/src/handle_wrap.h @@ -55,7 +55,7 @@ class HandleWrap : public AsyncWrap { uv_handle_t* handle, AsyncWrap::ProviderType provider, AsyncWrap* parent = nullptr); - virtual ~HandleWrap() override; + ~HandleWrap() override; private: friend class Environment; diff --git a/src/inspector_agent.cc b/src/inspector_agent.cc index 7cd7f4e5c9..8ef95305a6 100644 --- a/src/inspector_agent.cc +++ b/src/inspector_agent.cc @@ -240,18 +240,15 @@ class ChannelImpl final : public blink::protocol::FrontendChannel { explicit ChannelImpl(AgentImpl* agent): agent_(agent) {} virtual ~ChannelImpl() {} private: - virtual void sendProtocolResponse(int callId, - const String16& message) - override { + void sendProtocolResponse(int callId, const String16& message) override { sendMessageToFrontend(message); } - virtual void sendProtocolNotification( - const String16& message) override { + void sendProtocolNotification(const String16& message) override { sendMessageToFrontend(message); } - virtual void flushProtocolNotifications() override { } + void flushProtocolNotifications() override { } void sendMessageToFrontend(const String16& message) { agent_->Write(message.utf8()); diff --git a/src/node_stat_watcher.h b/src/node_stat_watcher.h index 6978f602e1..99cae58803 100644 --- a/src/node_stat_watcher.h +++ b/src/node_stat_watcher.h @@ -13,7 +13,7 @@ namespace node { class StatWatcher : public AsyncWrap { public: - virtual ~StatWatcher() override; + ~StatWatcher() override; static void Initialize(Environment* env, v8::Local target);