C++/CLI - Replace OVERRIDE with override

OVERRIDE was a CEF macro which has been removed, use standard compliant override Issue #3636
cefsharp · Jul 31, 2021 · b24cd8e · b24cd8e
1 parent 018aefc
commit b24cd8e
Show file tree

Hide file tree

Showing 31 changed files with 160 additions and 160 deletions.
diff --git a/CefSharp.BrowserSubprocess.Core/BindObjectAsyncHandler.h b/CefSharp.BrowserSubprocess.Core/BindObjectAsyncHandler.h
@@ -43,7 +43,7 @@ namespace CefSharp
                 _browserWrapper = nullptr;
             }
 
-            bool Execute(const CefString& name, CefRefPtr<CefV8Value> object, const CefV8ValueList& arguments, CefRefPtr<CefV8Value>& retval, CefString& exception) OVERRIDE
+            bool Execute(const CefString& name, CefRefPtr<CefV8Value> object, const CefV8ValueList& arguments, CefRefPtr<CefV8Value>& retval, CefString& exception) override
             {
                 auto context = CefV8Context::GetCurrentContext();
 

diff --git a/CefSharp.BrowserSubprocess.Core/CefAppUnmanagedWrapper.h b/CefSharp.BrowserSubprocess.Core/CefAppUnmanagedWrapper.h
@@ -74,15 +74,15 @@ namespace CefSharp
             CefBrowserWrapper^ FindBrowserWrapper(int browserId);
             JavascriptRootObjectWrapper^ GetJsRootObjectWrapper(int browserId, int64 frameId);
 
-            virtual DECL CefRefPtr<CefRenderProcessHandler> GetRenderProcessHandler() OVERRIDE;
-            virtual DECL void OnBrowserCreated(CefRefPtr<CefBrowser> browser, CefRefPtr<CefDictionaryValue> extraInfo) OVERRIDE;
-            virtual DECL void OnBrowserDestroyed(CefRefPtr<CefBrowser> browser) OVERRIDE;
-            virtual DECL void OnContextCreated(CefRefPtr<CefBrowser> browser, CefRefPtr<CefFrame> frame, CefRefPtr<CefV8Context> context) OVERRIDE;
-            virtual DECL void OnContextReleased(CefRefPtr<CefBrowser> browser, CefRefPtr<CefFrame> frame, CefRefPtr<CefV8Context> context) OVERRIDE;
-            virtual DECL bool OnProcessMessageReceived(CefRefPtr<CefBrowser> browser, CefRefPtr<CefFrame> frame, CefProcessId sourceProcessId, CefRefPtr<CefProcessMessage> message) OVERRIDE;
-            virtual DECL void OnWebKitInitialized() OVERRIDE;
-            virtual DECL void OnFocusedNodeChanged(CefRefPtr<CefBrowser> browser, CefRefPtr<CefFrame> frame, CefRefPtr<CefDOMNode> node) OVERRIDE;
-            virtual DECL void OnUncaughtException(CefRefPtr<CefBrowser> browser, CefRefPtr<CefFrame> frame, CefRefPtr<CefV8Context> context, CefRefPtr<CefV8Exception> exception, CefRefPtr<CefV8StackTrace> stackTrace) OVERRIDE;
+            virtual DECL CefRefPtr<CefRenderProcessHandler> GetRenderProcessHandler() override;
+            virtual DECL void OnBrowserCreated(CefRefPtr<CefBrowser> browser, CefRefPtr<CefDictionaryValue> extraInfo) override;
+            virtual DECL void OnBrowserDestroyed(CefRefPtr<CefBrowser> browser) override;
+            virtual DECL void OnContextCreated(CefRefPtr<CefBrowser> browser, CefRefPtr<CefFrame> frame, CefRefPtr<CefV8Context> context) override;
+            virtual DECL void OnContextReleased(CefRefPtr<CefBrowser> browser, CefRefPtr<CefFrame> frame, CefRefPtr<CefV8Context> context) override;
+            virtual DECL bool OnProcessMessageReceived(CefRefPtr<CefBrowser> browser, CefRefPtr<CefFrame> frame, CefProcessId sourceProcessId, CefRefPtr<CefProcessMessage> message) override;
+            virtual DECL void OnWebKitInitialized() override;
+            virtual DECL void OnFocusedNodeChanged(CefRefPtr<CefBrowser> browser, CefRefPtr<CefFrame> frame, CefRefPtr<CefDOMNode> node) override;
+            virtual DECL void OnUncaughtException(CefRefPtr<CefBrowser> browser, CefRefPtr<CefFrame> frame, CefRefPtr<CefV8Context> context, CefRefPtr<CefV8Exception> exception, CefRefPtr<CefV8StackTrace> stackTrace) override;
 
             IMPLEMENT_REFCOUNTING(CefAppUnmanagedWrapper);
         };

diff --git a/CefSharp.BrowserSubprocess.Core/JavascriptMethodHandler.h b/CefSharp.BrowserSubprocess.Core/JavascriptMethodHandler.h
@@ -34,7 +34,7 @@ namespace CefSharp
                 _callbackRegistry = nullptr;
             }
 
-            virtual bool Execute(const CefString& name, CefRefPtr<CefV8Value> object, const CefV8ValueList& arguments, CefRefPtr<CefV8Value>& retval, CefString& exception) OVERRIDE;
+            virtual bool Execute(const CefString& name, CefRefPtr<CefV8Value> object, const CefV8ValueList& arguments, CefRefPtr<CefV8Value>& retval, CefString& exception) override;
 
             CefRefPtr<CefV8Value> ConvertToCefObject(Object^ obj);
 

diff --git a/CefSharp.BrowserSubprocess.Core/JavascriptPostMessageHandler.h b/CefSharp.BrowserSubprocess.Core/JavascriptPostMessageHandler.h
@@ -31,7 +31,7 @@ namespace CefSharp
                 _javascriptCallbackRegistry = javascriptCallbackRegistry;
             }
 
-            bool Execute(const CefString& name, CefRefPtr<CefV8Value> object, const CefV8ValueList& arguments, CefRefPtr<CefV8Value>& retval, CefString& exception) OVERRIDE
+            bool Execute(const CefString& name, CefRefPtr<CefV8Value> object, const CefV8ValueList& arguments, CefRefPtr<CefV8Value>& retval, CefString& exception) override
             {
                 if (arguments.size() == 0 || arguments.size() > 1)
                 {

diff --git a/CefSharp.BrowserSubprocess.Core/RegisterBoundObjectHandler.h b/CefSharp.BrowserSubprocess.Core/RegisterBoundObjectHandler.h
@@ -35,7 +35,7 @@ namespace CefSharp
                 _javascriptObjects = javascriptObjects;
             }
 
-            bool Execute(const CefString& name, CefRefPtr<CefV8Value> object, const CefV8ValueList& arguments, CefRefPtr<CefV8Value>& retval, CefString& exception) OVERRIDE
+            bool Execute(const CefString& name, CefRefPtr<CefV8Value> object, const CefV8ValueList& arguments, CefRefPtr<CefV8Value>& retval, CefString& exception) override
             {
                 auto context = CefV8Context::GetCurrentContext();
                 if (context.get())

diff --git a/CefSharp.BrowserSubprocess.Core/SubProcessApp.h b/CefSharp.BrowserSubprocess.Core/SubProcessApp.h
@@ -31,7 +31,7 @@ namespace CefSharp
                 _schemes = nullptr;
             }
 
-            void OnRegisterCustomSchemes(CefRawPtr<CefSchemeRegistrar> registrar) OVERRIDE
+            void OnRegisterCustomSchemes(CefRawPtr<CefSchemeRegistrar> registrar) override
             {
                 for each (CefCustomScheme ^ scheme in _schemes->AsReadOnly())
                 {

diff --git a/CefSharp.Core.Runtime/Internals/CefCompletionCallbackAdapter.h b/CefSharp.Core.Runtime/Internals/CefCompletionCallbackAdapter.h
@@ -28,7 +28,7 @@ namespace CefSharp
                 _handler = nullptr;
             }
 
-            void OnComplete() OVERRIDE
+            void OnComplete() override
             {
                 _handler->OnComplete();
             }

diff --git a/CefSharp.Core.Runtime/Internals/CefCookieAccessFilterAdapter.h b/CefSharp.Core.Runtime/Internals/CefCookieAccessFilterAdapter.h
@@ -39,7 +39,7 @@ namespace CefSharp
             }
 
 
-            bool CanSendCookie(CefRefPtr<CefBrowser> browser, CefRefPtr<CefFrame> frame, CefRefPtr<CefRequest> request, const CefCookie& cookie) OVERRIDE
+            bool CanSendCookie(CefRefPtr<CefBrowser> browser, CefRefPtr<CefFrame> frame, CefRefPtr<CefRequest> request, const CefCookie& cookie) override
             {
                 Request requestWrapper(request);
                 auto managedCookie = TypeConversion::FromNative(cookie);
@@ -57,7 +57,7 @@ namespace CefSharp
                 return _handler->CanSendCookie(_browserControl, nullptr, nullptr, %requestWrapper, managedCookie);
             }
 
-            bool CanSaveCookie(CefRefPtr<CefBrowser> browser, CefRefPtr<CefFrame> frame, CefRefPtr<CefRequest> request, CefRefPtr<CefResponse> response, const CefCookie& cookie) OVERRIDE
+            bool CanSaveCookie(CefRefPtr<CefBrowser> browser, CefRefPtr<CefFrame> frame, CefRefPtr<CefRequest> request, CefRefPtr<CefResponse> response, const CefCookie& cookie) override
             {
                 Request requestWrapper(request);
                 CefResponseWrapper responseWrapper(response);

diff --git a/CefSharp.Core.Runtime/Internals/CefCookieVisitorAdapter.h b/CefSharp.Core.Runtime/Internals/CefCookieVisitorAdapter.h
@@ -30,7 +30,7 @@ namespace CefSharp
                 _visitor = nullptr;
             }
 
-            virtual bool Visit(const CefCookie& cefCookie, int count, int total, bool& deleteCookie) OVERRIDE
+            virtual bool Visit(const CefCookie& cefCookie, int count, int total, bool& deleteCookie) override
             {
                 auto cookie = TypeConversion::FromNative(cefCookie);
 

diff --git a/CefSharp.Core.Runtime/Internals/CefDeleteCookiesCallbackAdapter.h b/CefSharp.Core.Runtime/Internals/CefDeleteCookiesCallbackAdapter.h
@@ -28,7 +28,7 @@ namespace CefSharp
                 _handler = nullptr;
             }
 
-            void OnComplete(int numDeleted) OVERRIDE
+            void OnComplete(int numDeleted) override
             {
                 _handler->OnComplete(numDeleted);
             }

diff --git a/CefSharp.Core.Runtime/Internals/CefDevToolsMessageObserverAdapter.h b/CefSharp.Core.Runtime/Internals/CefDevToolsMessageObserverAdapter.h
@@ -46,30 +46,30 @@ namespace CefSharp
                 int message_id,
                 bool success,
                 const void* result,
-                size_t result_size) OVERRIDE
+                size_t result_size) override
             {
                 CefBrowserWrapper browserWrapper(browser);
                 UnmanagedMemoryStream resultStream((Byte*)result, (Int64)result_size, (Int64)result_size, FileAccess::Read);
 
                 _handler->OnDevToolsMethodResult(%browserWrapper, message_id, success, %resultStream);
             }
 
-            virtual void OnDevToolsEvent(CefRefPtr<CefBrowser> browser, const CefString& method, const void* params, size_t params_size) OVERRIDE
+            virtual void OnDevToolsEvent(CefRefPtr<CefBrowser> browser, const CefString& method, const void* params, size_t params_size) override
             {
                 CefBrowserWrapper browserWrapper(browser);
                 UnmanagedMemoryStream paramsStream((Byte*)params, (Int64)params_size, (Int64)params_size, FileAccess::Read);
 
                 _handler->OnDevToolsEvent(%browserWrapper, StringUtils::ToClr(method), %paramsStream);
             }
 
-            void OnDevToolsAgentAttached(CefRefPtr<CefBrowser> browser)  OVERRIDE
+            void OnDevToolsAgentAttached(CefRefPtr<CefBrowser> browser)  override
             {
                 CefBrowserWrapper browserWrapper(browser);
 
                 _handler->OnDevToolsAgentAttached(%browserWrapper);
             }
 
-            void OnDevToolsAgentDetached(CefRefPtr<CefBrowser> browser) OVERRIDE
+            void OnDevToolsAgentDetached(CefRefPtr<CefBrowser> browser) override
             {
                 CefBrowserWrapper browserWrapper(browser);
 

diff --git a/CefSharp.Core.Runtime/Internals/CefExtensionHandlerAdapter.h b/CefSharp.Core.Runtime/Internals/CefExtensionHandlerAdapter.h
@@ -41,7 +41,7 @@ namespace CefSharp
             // be the error code.
             ///
             /*--cef()--*/
-            void OnExtensionLoadFailed(cef_errorcode_t result) OVERRIDE
+            void OnExtensionLoadFailed(cef_errorcode_t result) override
             {
                 _handler->OnExtensionLoadFailed((CefErrorCode)result);
             }
@@ -51,7 +51,7 @@ namespace CefSharp
             // |extension| is the loaded extension.
             ///
             /*--cef()--*/
-            void OnExtensionLoaded(CefRefPtr<CefExtension> extension) OVERRIDE
+            void OnExtensionLoaded(CefRefPtr<CefExtension> extension) override
             {
                 //TODO: Should this be auto disposed?
                 _handler->OnExtensionLoaded(gcnew CefExtensionWrapper(extension));
@@ -61,7 +61,7 @@ namespace CefSharp
             // Called after the CefExtension::Unload request has completed.
             ///
             /*--cef()--*/
-            void OnExtensionUnloaded(CefRefPtr<CefExtension> extension) OVERRIDE
+            void OnExtensionUnloaded(CefRefPtr<CefExtension> extension) override
             {
                 //TODO: Add comment to interface saying extension is only valid within the scope
                 //of this method as it's auto disposed
@@ -88,7 +88,7 @@ namespace CefSharp
             bool OnBeforeBackgroundBrowser(CefRefPtr<CefExtension> extension,
                 const CefString& url,
                 CefRefPtr<CefClient>& client,
-                CefBrowserSettings& settings) OVERRIDE
+                CefBrowserSettings& settings) override
             {
                 BrowserSettings browserSettingsWrapper(&settings);
 
@@ -120,7 +120,7 @@ namespace CefSharp
                 bool active,
                 CefWindowInfo& windowInfo,
                 CefRefPtr<CefClient>& client,
-                CefBrowserSettings& settings) OVERRIDE
+                CefBrowserSettings& settings) override
             {
                 BrowserSettings browserSettingsWrapper(&settings);
 
@@ -147,7 +147,7 @@ namespace CefSharp
             CefRefPtr<CefBrowser> GetActiveBrowser(
                 CefRefPtr<CefExtension> extension,
                 CefRefPtr<CefBrowser> browser,
-                bool includeIncognito) OVERRIDE
+                bool includeIncognito) override
             {
                 //TODO: Should extension be auto disposed?
                 auto activeBrowser = _handler->GetActiveBrowser(gcnew CefExtensionWrapper(extension),
@@ -177,7 +177,7 @@ namespace CefSharp
             bool CanAccessBrowser(CefRefPtr<CefExtension> extension,
                 CefRefPtr<CefBrowser> browser,
                 bool includeIncognito,
-                CefRefPtr<CefBrowser> target_browser) OVERRIDE
+                CefRefPtr<CefBrowser> target_browser) override
             {
                 return _handler->CanAccessBrowser(gcnew CefExtensionWrapper(extension),
                     gcnew CefBrowserWrapper(browser),
@@ -200,7 +200,7 @@ namespace CefSharp
                 CefRefPtr<CefExtension> extension,
                 CefRefPtr<CefBrowser> browser,
                 const CefString& file,
-                CefRefPtr<CefGetExtensionResourceCallback> callback) OVERRIDE
+                CefRefPtr<CefGetExtensionResourceCallback> callback) override
             {
                 return _handler->GetExtensionResource(gcnew CefExtensionWrapper(extension),
                     gcnew CefBrowserWrapper(browser),

diff --git a/CefSharp.Core.Runtime/Internals/CefNavigationEntryVisitorAdapter.h b/CefSharp.Core.Runtime/Internals/CefNavigationEntryVisitorAdapter.h
@@ -31,7 +31,7 @@ namespace CefSharp
             bool Visit(CefRefPtr<CefNavigationEntry> entry,
                 bool current,
                 int index,
-                int total) OVERRIDE
+                int total) override
             {
                 auto navEntry = TypeConversion::FromNative(entry, current);
 

diff --git a/CefSharp.Core.Runtime/Internals/CefPdfPrintCallbackWrapper.h b/CefSharp.Core.Runtime/Internals/CefPdfPrintCallbackWrapper.h
@@ -29,7 +29,7 @@ namespace CefSharp
                 _callback = nullptr;
             }
 
-            virtual void OnPdfPrintFinished(const CefString& path, bool ok) OVERRIDE
+            virtual void OnPdfPrintFinished(const CefString& path, bool ok) override
             {
                 if (static_cast<IPrintToPdfCallback^>(_callback) != nullptr)
                 {

diff --git a/CefSharp.Core.Runtime/Internals/CefRegisterCdmCallbackAdapter.h b/CefSharp.Core.Runtime/Internals/CefRegisterCdmCallbackAdapter.h
@@ -35,7 +35,7 @@ namespace CefSharp
             /// additional information about why registration failed.
             /// </summary>
             virtual void OnCdmRegistrationComplete(cef_cdm_registration_error_t result,
-                const CefString& error_message) OVERRIDE
+                const CefString& error_message) override
             {
                 auto r = gcnew CdmRegistration((CdmRegistrationErrorCode)result, StringUtils::ToClr(error_message));
 

diff --git a/CefSharp.Core.Runtime/Internals/CefRequestContextHandlerAdapter.h b/CefSharp.Core.Runtime/Internals/CefRequestContextHandlerAdapter.h
@@ -36,9 +36,9 @@ namespace CefSharp
                 bool is_main_frame,
                 const CefString& top_origin_url,
                 CefRefPtr<CefWebPluginInfo> plugin_info,
-                CefRequestContextHandler::PluginPolicy* plugin_policy) OVERRIDE;
+                CefRequestContextHandler::PluginPolicy* plugin_policy) override;
 
-            virtual void OnRequestContextInitialized(CefRefPtr<CefRequestContext> requestContext) OVERRIDE;
+            virtual void OnRequestContextInitialized(CefRefPtr<CefRequestContext> requestContext) override;
 
             virtual CefRefPtr<CefResourceRequestHandler> GetResourceRequestHandler(
                 CefRefPtr<CefBrowser> browser,
@@ -47,7 +47,7 @@ namespace CefSharp
                 bool is_navigation,
                 bool is_download,
                 const CefString& request_initiator,
-                bool& disable_default_handling) OVERRIDE;
+                bool& disable_default_handling) override;
 
             IMPLEMENT_REFCOUNTING(CefRequestContextHandlerAdapter);
         };

diff --git a/CefSharp.Core.Runtime/Internals/CefResolveCallbackAdapter.h b/CefSharp.Core.Runtime/Internals/CefResolveCallbackAdapter.h
@@ -28,7 +28,7 @@ namespace CefSharp
                 _handler = nullptr;
             }
 
-            void OnResolveCompleted(cef_errorcode_t result, const std::vector<CefString>& resolvedIps) OVERRIDE
+            void OnResolveCompleted(cef_errorcode_t result, const std::vector<CefString>& resolvedIps) override
             {
                 _handler->OnResolveCompleted((CefErrorCode)result, StringUtils::ToClr(resolvedIps));
             }

diff --git a/CefSharp.Core.Runtime/Internals/CefResourceHandlerAdapter.h b/CefSharp.Core.Runtime/Internals/CefResourceHandlerAdapter.h
@@ -34,15 +34,15 @@ namespace CefSharp
                 _request = nullptr;
             }
 
-            virtual bool Open(CefRefPtr<CefRequest> request, bool& handle_request, CefRefPtr<CefCallback> callback) OVERRIDE;
-            virtual void GetResponseHeaders(CefRefPtr<CefResponse> response, int64& response_length, CefString& redirectUrl) OVERRIDE;
-            virtual bool Skip(int64 bytesToSkip, int64& bytesSkipped, CefRefPtr<CefResourceSkipCallback> callback) OVERRIDE;
-            virtual bool Read(void* dataOut, int bytesToRead, int& bytesRead, CefRefPtr<CefResourceReadCallback> callback) OVERRIDE;
-            virtual void Cancel() OVERRIDE;
+            virtual bool Open(CefRefPtr<CefRequest> request, bool& handle_request, CefRefPtr<CefCallback> callback) override;
+            virtual void GetResponseHeaders(CefRefPtr<CefResponse> response, int64& response_length, CefString& redirectUrl) override;
+            virtual bool Skip(int64 bytesToSkip, int64& bytesSkipped, CefRefPtr<CefResourceSkipCallback> callback) override;
+            virtual bool Read(void* dataOut, int bytesToRead, int& bytesRead, CefRefPtr<CefResourceReadCallback> callback) override;
+            virtual void Cancel() override;
 
             //Depricated
-            virtual bool ProcessRequest(CefRefPtr<CefRequest> request, CefRefPtr<CefCallback> callback) OVERRIDE;
-            virtual bool ReadResponse(void* data_out, int bytes_to_read, int& bytes_read, CefRefPtr<CefCallback> callback) OVERRIDE;
+            virtual bool ProcessRequest(CefRefPtr<CefRequest> request, CefRefPtr<CefCallback> callback) override;
+            virtual bool ReadResponse(void* data_out, int bytes_to_read, int& bytes_read, CefRefPtr<CefCallback> callback) override;
 
             IMPLEMENT_REFCOUNTING(CefResourceHandlerAdapter);
         };