From 0e1afc9112d09515b380002645efc21ba3a87122 Mon Sep 17 00:00:00 2001 From: nick Date: Wed, 22 Apr 2015 21:41:54 -0700 Subject: Update {virtual,override} to follow C++11 style in dbus. The Google style guide states that only one of {virtual,override,final} should be used for each declaration, since override implies virtual and final implies both virtual and override. This patch was manually generated using a regex and a text editor. BUG=417463 Review URL: https://codereview.chromium.org/1055053003 Cr-Commit-Position: refs/heads/master@{#326451} --- dbus/mock_object_proxy.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'dbus') diff --git a/dbus/mock_object_proxy.h b/dbus/mock_object_proxy.h index 7c61b47..66f485a 100644 --- a/dbus/mock_object_proxy.h +++ b/dbus/mock_object_proxy.h @@ -29,7 +29,7 @@ class MockObjectProxy : public ObjectProxy { Response*(MethodCall* method_call, int timeout_ms, ScopedDBusError* error)); - virtual scoped_ptr CallMethodAndBlockWithErrorDetails( + scoped_ptr CallMethodAndBlockWithErrorDetails( MethodCall* method_call, int timeout_ms, ScopedDBusError* error) override { @@ -38,8 +38,8 @@ class MockObjectProxy : public ObjectProxy { } MOCK_METHOD2(MockCallMethodAndBlock, Response*(MethodCall* method_call, int timeout_ms)); - virtual scoped_ptr CallMethodAndBlock(MethodCall* method_call, - int timeout_ms) override { + scoped_ptr CallMethodAndBlock(MethodCall* method_call, + int timeout_ms) override { return scoped_ptr(MockCallMethodAndBlock(method_call, timeout_ms)); } @@ -58,7 +58,7 @@ class MockObjectProxy : public ObjectProxy { MOCK_METHOD0(Detach, void()); protected: - virtual ~MockObjectProxy(); + ~MockObjectProxy() override; }; } // namespace dbus -- cgit v1.1