?  search:
summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
blame | history | raw | HEAD
Merge pull request #26220 from 78andyp/blurayfixes
[xbmc.git] / lib / libUPnP / patches / 0044-platinum-Prefer-override-usage.patch
blobb1ff8e391e1c724384b448af0dc6cb605472449f
1 From 0133a1fb26d860df1fcb9b0cb0eea1f9797acb3e Mon Sep 17 00:00:00 2001
2 From: "h.udo" <hudokkow@gmail.com>
3 Date: Tue, 27 Jun 2017 11:41:35 +0100
4 Subject: [PATCH] [modernize][libUPnP] Prefer 'override' usage
5
6 ---
7 .../Neptune/Source/Core/NptAutoreleasePool.h | 2 +-
8 .../Neptune/Source/Core/NptBufferedStreams.h | 12 ++--
9 .../Neptune/Source/Core/NptDynamicLibraries.h | 6 +-
10 lib/libUPnP/Neptune/Source/Core/NptFile.h | 10 +--
11 lib/libUPnP/Neptune/Source/Core/NptHttp.cpp | 16 ++---
12 lib/libUPnP/Neptune/Source/Core/NptHttp.h | 56 ++++++++--------
13 lib/libUPnP/Neptune/Source/Core/NptLogging.cpp | 12 ++--
14 lib/libUPnP/Neptune/Source/Core/NptLogging.h | 8 +--
15 lib/libUPnP/Neptune/Source/Core/NptMessaging.h | 8 +--
16 .../Source/Core/NptSelectableMessageQueue.h | 8 +--
17 lib/libUPnP/Neptune/Source/Core/NptSerialPort.h | 10 +--
18 .../Neptune/Source/Core/NptSimpleMessageQueue.h | 8 +--
19 lib/libUPnP/Neptune/Source/Core/NptSockets.h | 44 ++++++-------
20 lib/libUPnP/Neptune/Source/Core/NptStreams.h | 54 ++++++++--------
21 lib/libUPnP/Neptune/Source/Core/NptThreads.h | 42 ++++++------
22 lib/libUPnP/Neptune/Source/Core/NptTls.cpp | 4 +-
23 lib/libUPnP/Neptune/Source/Core/NptTls.h | 8 +--
24 lib/libUPnP/Neptune/Source/Core/NptXml.h | 12 ++--
25 lib/libUPnP/Neptune/Source/Core/NptZip.h | 28 ++++----
26 .../Neptune/Source/System/Bsd/NptBsdSockets.cpp | 74 +++++++++++-----------
27 .../Neptune/Source/System/Posix/NptPosixQueue.cpp | 8 +--
28 .../Source/System/Posix/NptPosixThreads.cpp | 40 ++++++------
29 lib/libUPnP/Platinum/Source/Core/PltCtrlPoint.h | 14 ++--
30 .../Platinum/Source/Core/PltCtrlPointTask.h | 24 +++----
31 .../Platinum/Source/Core/PltDatagramStream.h | 24 +++----
32 lib/libUPnP/Platinum/Source/Core/PltDeviceHost.h | 10 +--
33 lib/libUPnP/Platinum/Source/Core/PltHttp.h | 4 +-
34 .../Platinum/Source/Core/PltHttpClientTask.h | 10 +--
35 lib/libUPnP/Platinum/Source/Core/PltHttpServer.h | 6 +-
36 .../Platinum/Source/Core/PltHttpServerTask.h | 16 ++---
37 lib/libUPnP/Platinum/Source/Core/PltService.h | 2 +-
38 lib/libUPnP/Platinum/Source/Core/PltSsdp.h | 24 +++----
39 lib/libUPnP/Platinum/Source/Core/PltThreadTask.h | 4 +-
40 .../Source/Devices/MediaConnect/PltMediaConnect.h | 24 +++----
41 .../Source/Devices/MediaConnect/PltXbox360.h | 12 ++--
42 .../Devices/MediaRenderer/PltMediaController.h | 10 +--
43 .../Devices/MediaRenderer/PltMediaRenderer.h | 8 +--
44 .../Devices/MediaServer/PltFileMediaServer.h | 20 +++---
45 .../Source/Devices/MediaServer/PltMediaBrowser.h | 10 +--
46 .../Source/Devices/MediaServer/PltMediaItem.h | 18 +++---
47 .../Source/Devices/MediaServer/PltMediaServer.h | 12 ++--
48 .../Devices/MediaServer/PltSyncMediaBrowser.h | 26 ++++----
49 lib/libUPnP/Platinum/Source/Extras/PltDownloader.h | 8 +--
50 .../Platinum/Source/Extras/PltFrameServer.h | 8 +--
51 .../Platinum/Source/Extras/PltFrameStream.h | 14 ++--
52 .../Platinum/Source/Extras/PltRingBufferStream.h | 20 +++---
53 lib/libUPnP/Platinum/Source/Extras/PltStreamPump.h | 8 +--
54 47 files changed, 403 insertions(+), 403 deletions(-)
55
56 diff --git a/lib/libUPnP/Neptune/Source/Core/NptAutoreleasePool.h b/lib/libUPnP/Neptune/Source/Core/NptAutoreleasePool.h
57 index cc63664cb19c..6f704f72b114 100644
58 --- a/lib/libUPnP/Neptune/Source/Core/NptAutoreleasePool.h
59 +++ b/lib/libUPnP/Neptune/Source/Core/NptAutoreleasePool.h
60 @@ -48,7 +48,7 @@ class NPT_AutoreleasePool : public NPT_AutoreleasePoolInterface
61 {
62 public:
63 NPT_AutoreleasePool();
64 - virtual ~NPT_AutoreleasePool();
65 + ~NPT_AutoreleasePool() override;
66
67 private:
68 NPT_AutoreleasePoolInterface* m_Delegate;
69 diff --git a/lib/libUPnP/Neptune/Source/Core/NptBufferedStreams.h b/lib/libUPnP/Neptune/Source/Core/NptBufferedStreams.h
70 index 1c0e0d6839df..6e3705150ea8 100644
71 --- a/lib/libUPnP/Neptune/Source/Core/NptBufferedStreams.h
72 +++ b/lib/libUPnP/Neptune/Source/Core/NptBufferedStreams.h
73 @@ -55,7 +55,7 @@ class NPT_BufferedInputStream : public NPT_InputStream
74 // constructors and destructor
75 NPT_BufferedInputStream(NPT_InputStreamReference& stream,
76 NPT_Size buffer_size = NPT_BUFFERED_BYTE_STREAM_DEFAULT_SIZE);
77 - virtual ~NPT_BufferedInputStream();
78 + ~NPT_BufferedInputStream() override;
79
80 // methods
81 virtual NPT_Result ReadLine(NPT_String& line,
82 @@ -73,11 +73,11 @@ class NPT_BufferedInputStream : public NPT_InputStream
83 // NPT_InputStream methods
84 NPT_Result Read(void* buffer,
85 NPT_Size bytes_to_read,
86 - NPT_Size* bytes_read = NULL);
87 - NPT_Result Seek(NPT_Position offset);
88 - NPT_Result Tell(NPT_Position& offset);
89 - NPT_Result GetSize(NPT_LargeSize& size);
90 - NPT_Result GetAvailable(NPT_LargeSize& available);
91 + NPT_Size* bytes_read = NULL) override;
92 + NPT_Result Seek(NPT_Position offset) override;
93 + NPT_Result Tell(NPT_Position& offset) override;
94 + NPT_Result GetSize(NPT_LargeSize& size) override;
95 + NPT_Result GetAvailable(NPT_LargeSize& available) override;
96
97 protected:
98 // members
99 diff --git a/lib/libUPnP/Neptune/Source/Core/NptDynamicLibraries.h b/lib/libUPnP/Neptune/Source/Core/NptDynamicLibraries.h
100 index 4a2751ee21c1..50186ccfaac1 100644
101 --- a/lib/libUPnP/Neptune/Source/Core/NptDynamicLibraries.h
102 +++ b/lib/libUPnP/Neptune/Source/Core/NptDynamicLibraries.h
103 @@ -63,13 +63,13 @@ class NPT_DynamicLibrary : public NPT_DynamicLibraryInterface
104 static NPT_Result Load(const char* name, NPT_Flags flags, NPT_DynamicLibrary*& library);
105
106 // destructor
107 - ~NPT_DynamicLibrary() { delete m_Delegate; }
108 + ~NPT_DynamicLibrary() override { delete m_Delegate; }
109
110 // NPT_DynamicLibraryInterface methods
111 - virtual NPT_Result FindSymbol(const char* name, void*& symbol) {
112 + NPT_Result FindSymbol(const char* name, void*& symbol) override {
113 return m_Delegate->FindSymbol(name, symbol);
114 }
115 - virtual NPT_Result Unload() {
116 + NPT_Result Unload() override {
117 return m_Delegate->Unload();
118 }
119
120 diff --git a/lib/libUPnP/Neptune/Source/Core/NptFile.h b/lib/libUPnP/Neptune/Source/Core/NptFile.h
121 index e93bb2b43d81..c6b2db219525 100644
122 --- a/lib/libUPnP/Neptune/Source/Core/NptFile.h
123 +++ b/lib/libUPnP/Neptune/Source/Core/NptFile.h
124 @@ -174,7 +174,7 @@ class NPT_File : public NPT_FileInterface
125
126 // constructors and destructor
127 NPT_File(const char* path);
128 - ~NPT_File() { delete m_Delegate; }
129 + ~NPT_File() override { delete m_Delegate; }
130
131 // methods
132 NPT_Result Load(NPT_DataBuffer& buffer);
133 @@ -186,16 +186,16 @@ class NPT_File : public NPT_FileInterface
134 NPT_Result Rename(const char* path);
135
136 // NPT_FileInterface methods
137 - NPT_Result Open(OpenMode mode) {
138 + NPT_Result Open(OpenMode mode) override {
139 return m_Delegate->Open(mode);
140 }
141 - NPT_Result Close() {
142 + NPT_Result Close() override {
143 return m_Delegate->Close();
144 }
145 - NPT_Result GetInputStream(NPT_InputStreamReference& stream) {
146 + NPT_Result GetInputStream(NPT_InputStreamReference& stream) override {
147 return m_Delegate->GetInputStream(stream);
148 }
149 - NPT_Result GetOutputStream(NPT_OutputStreamReference& stream) {
150 + NPT_Result GetOutputStream(NPT_OutputStreamReference& stream) override {
151 return m_Delegate->GetOutputStream(stream);
152 }
153
154 diff --git a/lib/libUPnP/Neptune/Source/Core/NptHttp.cpp b/lib/libUPnP/Neptune/Source/Core/NptHttp.cpp
155 index 8c5d587ff143..af4f6dc9497a 100644
156 --- a/lib/libUPnP/Neptune/Source/Core/NptHttp.cpp
157 +++ b/lib/libUPnP/Neptune/Source/Core/NptHttp.cpp
158 @@ -332,7 +332,7 @@ class NPT_HttpEntityBodyInputStream : public NPT_InputStream
159 bool chunked,
160 NPT_HttpClient::Connection* connection,
161 bool should_persist);
162 - virtual ~NPT_HttpEntityBodyInputStream();
163 + ~NPT_HttpEntityBodyInputStream() override;
164
165 // methods
166 bool SizeIsKnown() { return m_SizeIsKnown; }
167 @@ -340,19 +340,19 @@ class NPT_HttpEntityBodyInputStream : public NPT_InputStream
168 // NPT_InputStream methods
169 NPT_Result Read(void* buffer,
170 NPT_Size bytes_to_read,
171 - NPT_Size* bytes_read = NULL);
172 - NPT_Result Seek(NPT_Position /*offset*/) {
173 + NPT_Size* bytes_read = NULL) override;
174 + NPT_Result Seek(NPT_Position /*offset*/) override {
175 return NPT_ERROR_NOT_SUPPORTED;
176 }
177 - NPT_Result Tell(NPT_Position& offset) {
178 + NPT_Result Tell(NPT_Position& offset) override {
179 offset = m_Position;
180 return NPT_SUCCESS;
181 }
182 - NPT_Result GetSize(NPT_LargeSize& size) {
183 + NPT_Result GetSize(NPT_LargeSize& size) override {
184 size = m_Size;
185 return NPT_SUCCESS;
186 }
187 - NPT_Result GetAvailable(NPT_LargeSize& available);
188 + NPT_Result GetAvailable(NPT_LargeSize& available) override;
189
190 private:
191 // methods
192 @@ -1012,7 +1012,7 @@ class NPT_HttpEnvProxySelector : public NPT_HttpProxySelector,
193 static NPT_HttpEnvProxySelector* GetInstance();
194
195 // NPT_HttpProxySelector methods
196 - NPT_Result GetProxyForUrl(const NPT_HttpUrl& url, NPT_HttpProxyAddress& proxy);
197 + NPT_Result GetProxyForUrl(const NPT_HttpUrl& url, NPT_HttpProxyAddress& proxy) override;
198
199 private:
200 // class variables
201 @@ -1225,7 +1225,7 @@ class NPT_HttpStaticProxySelector : public NPT_HttpProxySelector
202 NPT_UInt16 htts_proxy_port);
203
204 // NPT_HttpProxySelector methods
205 - NPT_Result GetProxyForUrl(const NPT_HttpUrl& url, NPT_HttpProxyAddress& proxy);
206 + NPT_Result GetProxyForUrl(const NPT_HttpUrl& url, NPT_HttpProxyAddress& proxy) override;
207
208 private:
209 // members
210 diff --git a/lib/libUPnP/Neptune/Source/Core/NptHttp.h b/lib/libUPnP/Neptune/Source/Core/NptHttp.h
211 index 402d515e0e9a..fd5bfd66b733 100644
212 --- a/lib/libUPnP/Neptune/Source/Core/NptHttp.h
213 +++ b/lib/libUPnP/Neptune/Source/Core/NptHttp.h
214 @@ -135,7 +135,7 @@ class NPT_HttpUrl : public NPT_Url {
215 NPT_HttpUrl(const char* url, bool ignore_scheme = false);
216
217 // methods
218 - virtual NPT_String ToString(bool with_fragment = true) const;
219 + NPT_String ToString(bool with_fragment = true) const override;
220 };
221
222 /*----------------------------------------------------------------------
223 @@ -293,7 +293,7 @@ class NPT_HttpRequest : public NPT_HttpMessage {
224 NPT_HttpRequest(const char* url,
225 const char* method,
226 const char* protocol = NPT_HTTP_PROTOCOL_1_0);
227 - virtual ~NPT_HttpRequest();
228 + ~NPT_HttpRequest() override;
229
230 // methods
231 const NPT_HttpUrl& GetUrl() const { return m_Url; }
232 @@ -322,7 +322,7 @@ class NPT_HttpResponse : public NPT_HttpMessage {
233 NPT_HttpResponse(NPT_HttpStatusCode status_code,
234 const char* reason_phrase,
235 const char* protocol = NPT_HTTP_PROTOCOL_1_0);
236 - virtual ~NPT_HttpResponse();
237 + ~NPT_HttpResponse() override;
238
239 // methods
240 NPT_Result SetStatus(NPT_HttpStatusCode status_code,
241 @@ -503,16 +503,16 @@ class NPT_HttpConnectionManager : public NPT_Thread,
242 NPT_SocketReference& socket,
243 NPT_InputStreamReference input_stream,
244 NPT_OutputStreamReference output_stream);
245 - virtual ~Connection();
246 + ~Connection() override;
247
248 // NPT_HttpClient::Connection methods
249 - virtual NPT_InputStreamReference& GetInputStream() { return m_InputStream; }
250 - virtual NPT_OutputStreamReference& GetOutputStream() { return m_OutputStream; }
251 - virtual NPT_Result GetInfo(NPT_SocketInfo& info) { return m_Socket->GetInfo(info); }
252 - virtual bool SupportsPersistence() { return true; }
253 - virtual bool IsRecycled() { return m_IsRecycled; }
254 - virtual NPT_Result Recycle();
255 - virtual NPT_Result Abort() { return m_Socket->Cancel(); }
256 + NPT_InputStreamReference& GetInputStream() override { return m_InputStream; }
257 + NPT_OutputStreamReference& GetOutputStream() override { return m_OutputStream; }
258 + NPT_Result GetInfo(NPT_SocketInfo& info) override { return m_Socket->GetInfo(info); }
259 + bool SupportsPersistence() override { return true; }
260 + bool IsRecycled() override { return m_IsRecycled; }
261 + NPT_Result Recycle() override;
262 + NPT_Result Abort() override { return m_Socket->Cancel(); }
263
264 // members
265 NPT_HttpConnectionManager& m_Manager;
266 @@ -524,7 +524,7 @@ class NPT_HttpConnectionManager : public NPT_Thread,
267 };
268
269 // destructor
270 - ~NPT_HttpConnectionManager();
271 + ~NPT_HttpConnectionManager() override;
272
273 // methods
274 Connection* FindConnection(NPT_SocketAddress& address);
275 @@ -545,7 +545,7 @@ class NPT_HttpConnectionManager : public NPT_Thread,
276 NPT_HttpConnectionManager();
277
278 // NPT_Thread methods
279 - void Run();
280 + void Run() override;
281
282 // methods
283 NPT_Result UntrackConnection(NPT_HttpClient::Connection* connection);
284 @@ -635,9 +635,9 @@ class NPT_HttpStaticRequestHandler : public NPT_HttpRequestHandler
285 bool copy = true);
286
287 // NPT_HttpRequestHandler methods
288 - virtual NPT_Result SetupResponse(NPT_HttpRequest& request,
289 + NPT_Result SetupResponse(NPT_HttpRequest& request,
290 const NPT_HttpRequestContext& context,
291 - NPT_HttpResponse& response);
292 + NPT_HttpResponse& response) override;
293
294 private:
295 NPT_String m_MimeType;
296 @@ -665,9 +665,9 @@ class NPT_HttpFileRequestHandler : public NPT_HttpRequestHandler
297 const char* auto_index = NULL);
298
299 // NPT_HttpRequestHandler methods
300 - virtual NPT_Result SetupResponse(NPT_HttpRequest& request,
301 + NPT_Result SetupResponse(NPT_HttpRequest& request,
302 const NPT_HttpRequestContext& context,
303 - NPT_HttpResponse& response);
304 + NPT_HttpResponse& response) override;
305
306 // class methods
307 static const char* GetDefaultContentType(const char* extension);
308 @@ -821,16 +821,16 @@ class NPT_HttpChunkedInputStream : public NPT_InputStream
309 public:
310 // constructors and destructor
311 NPT_HttpChunkedInputStream(NPT_BufferedInputStreamReference& stream);
312 - virtual ~NPT_HttpChunkedInputStream();
313 + ~NPT_HttpChunkedInputStream() override;
314
315 // NPT_InputStream methods
316 NPT_Result Read(void* buffer,
317 NPT_Size bytes_to_read,
318 - NPT_Size* bytes_read = NULL);
319 - NPT_Result Seek(NPT_Position offset);
320 - NPT_Result Tell(NPT_Position& offset);
321 - NPT_Result GetSize(NPT_LargeSize& size);
322 - NPT_Result GetAvailable(NPT_LargeSize& available);
323 + NPT_Size* bytes_read = NULL) override;
324 + NPT_Result Seek(NPT_Position offset) override;
325 + NPT_Result Tell(NPT_Position& offset) override;
326 + NPT_Result GetSize(NPT_LargeSize& size) override;
327 + NPT_Result GetAvailable(NPT_LargeSize& available) override;
328
329 protected:
330 // members
331 @@ -847,15 +847,15 @@ class NPT_HttpChunkedOutputStream : public NPT_OutputStream
332 public:
333 // constructors and destructor
334 NPT_HttpChunkedOutputStream(NPT_OutputStream& stream);
335 - virtual ~NPT_HttpChunkedOutputStream();
336 + ~NPT_HttpChunkedOutputStream() override;
337
338 // NPT_OutputStream methods
339 NPT_Result Write(const void* buffer,
340 NPT_Size bytes_to_write,
341 - NPT_Size* bytes_written = NULL);
342 - NPT_Result Seek(NPT_Position /*offset*/) { return NPT_ERROR_NOT_SUPPORTED;}
343 - NPT_Result Tell(NPT_Position& offset) { return m_Stream.Tell(offset); }
344 - NPT_Result Flush() { return m_Stream.Flush(); }
345 + NPT_Size* bytes_written = NULL) override;
346 + NPT_Result Seek(NPT_Position /*offset*/) override { return NPT_ERROR_NOT_SUPPORTED;}
347 + NPT_Result Tell(NPT_Position& offset) override { return m_Stream.Tell(offset); }
348 + NPT_Result Flush() override { return m_Stream.Flush(); }
349
350 protected:
351 // members
352 diff --git a/lib/libUPnP/Neptune/Source/Core/NptLogging.cpp b/lib/libUPnP/Neptune/Source/Core/NptLogging.cpp
353 index 08037427ab09..5c75afe908d0 100644
354 --- a/lib/libUPnP/Neptune/Source/Core/NptLogging.cpp
355 +++ b/lib/libUPnP/Neptune/Source/Core/NptLogging.cpp
356 @@ -67,7 +67,7 @@ class NPT_LogConsoleHandler : public NPT_LogHandler {
357 static NPT_Result Create(const char* logger_name, NPT_LogHandler*& handler);
358
359 // methods
360 - void Log(const NPT_LogRecord& record);
361 + void Log(const NPT_LogRecord& record) override;
362
363 private:
364 // members
365 @@ -82,7 +82,7 @@ class NPT_LogFileHandler : public NPT_LogHandler {
366 static NPT_Result Create(const char* logger_name, NPT_LogHandler*& handler);
367
368 // methods
369 - void Log(const NPT_LogRecord& record);
370 + void Log(const NPT_LogRecord& record) override;
371
372 private:
373 NPT_Result Open(bool append = true);
374 @@ -104,7 +104,7 @@ class NPT_LogTcpHandler : public NPT_LogHandler {
375 static NPT_Result Create(const char* logger_name, NPT_LogHandler*& handler);
376
377 // methods
378 - void Log(const NPT_LogRecord& record);
379 + void Log(const NPT_LogRecord& record) override;
380
381 private:
382 // constructor
383 @@ -125,7 +125,7 @@ class NPT_LogUdpHandler : public NPT_LogHandler {
384 static NPT_Result Create(const char* logger_name, NPT_LogHandler*& handler);
385
386 // methods
387 - void Log(const NPT_LogRecord& record);
388 + void Log(const NPT_LogRecord& record) override;
389
390 private:
391 // members
392 @@ -139,7 +139,7 @@ class NPT_LogNullHandler : public NPT_LogHandler {
393 static NPT_Result Create(NPT_LogHandler*& handler);
394
395 // methods
396 - void Log(const NPT_LogRecord& record);
397 + void Log(const NPT_LogRecord& record) override;
398 };
399
400 class NPT_LogCustomHandler : public NPT_LogHandler {
401 @@ -149,7 +149,7 @@ class NPT_LogCustomHandler : public NPT_LogHandler {
402 static NPT_Result Create(NPT_LogHandler*& handler);
403
404 // methods
405 - void Log(const NPT_LogRecord& record);
406 + void Log(const NPT_LogRecord& record) override;
407
408 private:
409 static CustomHandlerExternalFunction s_ExternalFunction;
410 diff --git a/lib/libUPnP/Neptune/Source/Core/NptLogging.h b/lib/libUPnP/Neptune/Source/Core/NptLogging.h
411 index 3168424a3bc8..60966c922e52 100644
412 --- a/lib/libUPnP/Neptune/Source/Core/NptLogging.h
413 +++ b/lib/libUPnP/Neptune/Source/Core/NptLogging.h
414 @@ -194,16 +194,16 @@ class NPT_HttpLoggerConfigurator : NPT_HttpRequestHandler, public NPT_Thread {
415 // constructor and destructor
416 NPT_HttpLoggerConfigurator(NPT_UInt16 port = NPT_HTTP_LOGGER_CONFIGURATOR_DEFAULT_PORT,
417 bool detached = true);
418 - virtual ~NPT_HttpLoggerConfigurator();
419 + ~NPT_HttpLoggerConfigurator() override;
420
421 // NPT_Runnable (NPT_Thread) methods
422 - virtual void Run();
423 + void Run() override;
424
425 private:
426 // NPT_HttpRequestHandler methods
427 - virtual NPT_Result SetupResponse(NPT_HttpRequest& request,
428 + NPT_Result SetupResponse(NPT_HttpRequest& request,
429 const NPT_HttpRequestContext& context,
430 - NPT_HttpResponse& response);
431 + NPT_HttpResponse& response) override;
432
433 // members
434 NPT_HttpServer* m_Server;
435 diff --git a/lib/libUPnP/Neptune/Source/Core/NptMessaging.h b/lib/libUPnP/Neptune/Source/Core/NptMessaging.h
436 index 3e61919f56a8..3da21a0901bb 100644
437 --- a/lib/libUPnP/Neptune/Source/Core/NptMessaging.h
438 +++ b/lib/libUPnP/Neptune/Source/Core/NptMessaging.h
439 @@ -89,11 +89,11 @@ class NPT_MessageHandlerProxy : public NPT_MessageHandler
440 NPT_MessageHandlerProxy(NPT_MessageHandler* handler);
441
442 // destructor
443 - virtual ~NPT_MessageHandlerProxy();
444 + ~NPT_MessageHandlerProxy() override;
445
446 // NPT_MessageHandler methods
447 - virtual void OnMessage(NPT_Message*);
448 - virtual NPT_Result HandleMessage(NPT_Message* message);
449 + void OnMessage(NPT_Message*) override;
450 + NPT_Result HandleMessage(NPT_Message* message) override;
451
452 /**
453 * Detach the proxy from the handler implementation.
454 @@ -153,7 +153,7 @@ class NPT_TerminateMessage : public NPT_Message
455 {
456 public:
457 // methods
458 - NPT_Result Dispatch(NPT_MessageHandler* /*handler*/) {
459 + NPT_Result Dispatch(NPT_MessageHandler* /*handler*/) override {
460 return NPT_ERROR_TERMINATED;
461 }
462 };
463 diff --git a/lib/libUPnP/Neptune/Source/Core/NptSelectableMessageQueue.h b/lib/libUPnP/Neptune/Source/Core/NptSelectableMessageQueue.h
464 index 23dd4991537d..56b55d083a4a 100644
465 --- a/lib/libUPnP/Neptune/Source/Core/NptSelectableMessageQueue.h
466 +++ b/lib/libUPnP/Neptune/Source/Core/NptSelectableMessageQueue.h
467 @@ -46,12 +46,12 @@ class NPT_SelectableMessageQueue : public NPT_SimpleMessageQueue
468 public:
469 // methods
470 NPT_SelectableMessageQueue();
471 - virtual ~NPT_SelectableMessageQueue();
472 + ~NPT_SelectableMessageQueue() override;
473
474 // NPT_MessageQueue methods
475 - virtual NPT_Result PumpMessage(NPT_Timeout timeout = NPT_TIMEOUT_INFINITE);
476 - virtual NPT_Result QueueMessage(NPT_Message* message,
477 - NPT_MessageHandler* handler);
478 + NPT_Result PumpMessage(NPT_Timeout timeout = NPT_TIMEOUT_INFINITE) override;
479 + NPT_Result QueueMessage(NPT_Message* message,
480 + NPT_MessageHandler* handler) override;
481
482 // methods
483 int GetEventFd() { return m_Pipe[0]; }
484 diff --git a/lib/libUPnP/Neptune/Source/Core/NptSerialPort.h b/lib/libUPnP/Neptune/Source/Core/NptSerialPort.h
485 index 1e23a3d37fdc..b543c112c65c 100644
486 --- a/lib/libUPnP/Neptune/Source/Core/NptSerialPort.h
487 +++ b/lib/libUPnP/Neptune/Source/Core/NptSerialPort.h
488 @@ -92,22 +92,22 @@ class NPT_SerialPort : public NPT_SerialPortInterface
489 public:
490 // constructors and destructor
491 NPT_SerialPort(const char* name);
492 - ~NPT_SerialPort() { delete m_Delegate; }
493 + ~NPT_SerialPort() override { delete m_Delegate; }
494
495 // NPT_SerialPortInterface methods
496 NPT_Result Open(unsigned int speed,
497 NPT_SerialPortStopBits stop_bits = NPT_SERIAL_PORT_STOP_BITS_1,
498 NPT_SerialPortFlowControl flow_control = NPT_SERIAL_PORT_FLOW_CONTROL_NONE,
499 - NPT_SerialPortParity parity = NPT_SERIAL_PORT_PARITY_NONE) {
500 + NPT_SerialPortParity parity = NPT_SERIAL_PORT_PARITY_NONE) override {
501 return m_Delegate->Open(speed, stop_bits, flow_control, parity);
502 }
503 - NPT_Result Close() {
504 + NPT_Result Close() override {
505 return m_Delegate->Close();
506 }
507 - NPT_Result GetInputStream(NPT_InputStreamReference& stream) {
508 + NPT_Result GetInputStream(NPT_InputStreamReference& stream) override {
509 return m_Delegate->GetInputStream(stream);
510 }
511 - NPT_Result GetOutputStream(NPT_OutputStreamReference& stream) {
512 + NPT_Result GetOutputStream(NPT_OutputStreamReference& stream) override {
513 return m_Delegate->GetOutputStream(stream);
514 }
515
516 diff --git a/lib/libUPnP/Neptune/Source/Core/NptSimpleMessageQueue.h b/lib/libUPnP/Neptune/Source/Core/NptSimpleMessageQueue.h
517 index 158b6ff0297a..cad3ce124690 100644
518 --- a/lib/libUPnP/Neptune/Source/Core/NptSimpleMessageQueue.h
519 +++ b/lib/libUPnP/Neptune/Source/Core/NptSimpleMessageQueue.h
520 @@ -53,12 +53,12 @@ class NPT_SimpleMessageQueue : public NPT_MessageQueue
521 public:
522 // members
523 NPT_SimpleMessageQueue();
524 - virtual ~NPT_SimpleMessageQueue();
525 + ~NPT_SimpleMessageQueue() override;
526
527 // NPT_MessageQueue methods
528 - virtual NPT_Result QueueMessage(NPT_Message* message,
529 - NPT_MessageHandler* handler);
530 - virtual NPT_Result PumpMessage(NPT_Timeout timeout = NPT_TIMEOUT_INFINITE);
531 + NPT_Result QueueMessage(NPT_Message* message,
532 + NPT_MessageHandler* handler) override;
533 + NPT_Result PumpMessage(NPT_Timeout timeout = NPT_TIMEOUT_INFINITE) override;
534
535 private:
536 // members
537 diff --git a/lib/libUPnP/Neptune/Source/Core/NptSockets.h b/lib/libUPnP/Neptune/Source/Core/NptSockets.h
538 index 789939a5341d..fcd2830715ef 100644
539 --- a/lib/libUPnP/Neptune/Source/Core/NptSockets.h
540 +++ b/lib/libUPnP/Neptune/Source/Core/NptSockets.h
541 @@ -195,35 +195,35 @@ class NPT_Socket : public NPT_SocketInterface
542
543 // constructor and destructor
544 explicit NPT_Socket(NPT_SocketInterface* delegate) : m_SocketDelegate(delegate) {}
545 - virtual ~NPT_Socket();
546 + ~NPT_Socket() override;
547
548 // delegate NPT_SocketInterface methods
549 - NPT_Result Bind(const NPT_SocketAddress& address, bool reuse_address = true) {
550 + NPT_Result Bind(const NPT_SocketAddress& address, bool reuse_address = true) override {
551 return m_SocketDelegate->Bind(address, reuse_address);
552 }
553 NPT_Result Connect(const NPT_SocketAddress& address,
554 - NPT_Timeout timeout = NPT_TIMEOUT_INFINITE) {
555 + NPT_Timeout timeout = NPT_TIMEOUT_INFINITE) override {
556 return m_SocketDelegate->Connect(address, timeout);
557 }
558 - NPT_Result WaitForConnection(NPT_Timeout timeout = NPT_TIMEOUT_INFINITE) {
559 + NPT_Result WaitForConnection(NPT_Timeout timeout = NPT_TIMEOUT_INFINITE) override {
560 return m_SocketDelegate->WaitForConnection(timeout);
561 }
562 - NPT_Result GetInputStream(NPT_InputStreamReference& stream) {
563 + NPT_Result GetInputStream(NPT_InputStreamReference& stream) override {
564 return m_SocketDelegate->GetInputStream(stream);
565 }
566 - NPT_Result GetOutputStream(NPT_OutputStreamReference& stream) {
567 + NPT_Result GetOutputStream(NPT_OutputStreamReference& stream) override {
568 return m_SocketDelegate->GetOutputStream(stream);
569 }
570 - NPT_Result GetInfo(NPT_SocketInfo& info) {
571 + NPT_Result GetInfo(NPT_SocketInfo& info) override {
572 return m_SocketDelegate->GetInfo(info);
573 }
574 - NPT_Result SetReadTimeout(NPT_Timeout timeout) {
575 + NPT_Result SetReadTimeout(NPT_Timeout timeout) override {
576 return m_SocketDelegate->SetReadTimeout(timeout);
577 }
578 - NPT_Result SetWriteTimeout(NPT_Timeout timeout) {
579 + NPT_Result SetWriteTimeout(NPT_Timeout timeout) override {
580 return m_SocketDelegate->SetWriteTimeout(timeout);
581 }
582 - NPT_Result Cancel(bool shutdown=true) {
583 + NPT_Result Cancel(bool shutdown=true) override {
584 return m_SocketDelegate->Cancel(shutdown);
585 }
586
587 @@ -246,15 +246,15 @@ class NPT_UdpSocket : public NPT_Socket,
588 public:
589 // constructor and destructor
590 NPT_UdpSocket(NPT_Flags flags=0);
591 - virtual ~NPT_UdpSocket();
592 + ~NPT_UdpSocket() override;
593
594 // delegate NPT_UdpSocketInterface methods
595 NPT_Result Send(const NPT_DataBuffer& packet,
596 - const NPT_SocketAddress* address = NULL) {
597 + const NPT_SocketAddress* address = NULL) override {
598 return m_UdpSocketDelegate->Send(packet, address);
599 }
600 NPT_Result Receive(NPT_DataBuffer& packet,
601 - NPT_SocketAddress* address = NULL) {
602 + NPT_SocketAddress* address = NULL) override {
603 return m_UdpSocketDelegate->Receive(packet, address);
604 }
605
606 @@ -275,23 +275,23 @@ class NPT_UdpMulticastSocket : public NPT_UdpSocket,
607 public:
608 // constructor and destructor
609 NPT_UdpMulticastSocket(NPT_Flags flags=0);
610 - virtual ~NPT_UdpMulticastSocket();
611 + ~NPT_UdpMulticastSocket() override;
612
613 // delegate NPT_UdpMulticastSocketInterface methods
614 NPT_Result JoinGroup(const NPT_IpAddress& group,
615 const NPT_IpAddress& iface =
616 - NPT_IpAddress::Any) {
617 + NPT_IpAddress::Any) override {
618 return m_UdpMulticastSocketDelegate->JoinGroup(group, iface);
619 }
620 NPT_Result LeaveGroup(const NPT_IpAddress& group,
621 const NPT_IpAddress& iface =
622 - NPT_IpAddress::Any) {
623 + NPT_IpAddress::Any) override {
624 return m_UdpMulticastSocketDelegate->LeaveGroup(group, iface);
625 }
626 - NPT_Result SetTimeToLive(unsigned char ttl) {
627 + NPT_Result SetTimeToLive(unsigned char ttl) override {
628 return m_UdpMulticastSocketDelegate->SetTimeToLive(ttl);
629 }
630 - NPT_Result SetInterface(const NPT_IpAddress& iface) {
631 + NPT_Result SetInterface(const NPT_IpAddress& iface) override {
632 return m_UdpMulticastSocketDelegate->SetInterface(iface);
633 }
634
635 @@ -308,7 +308,7 @@ class NPT_TcpClientSocket : public NPT_Socket
636 public:
637 // constructors and destructor
638 NPT_TcpClientSocket(NPT_Flags flags=0);
639 - virtual ~NPT_TcpClientSocket();
640 + ~NPT_TcpClientSocket() override;
641 };
642
643 /*----------------------------------------------------------------------
644 @@ -320,15 +320,15 @@ class NPT_TcpServerSocket : public NPT_Socket,
645 public:
646 // constructors and destructor
647 NPT_TcpServerSocket(NPT_Flags flags=0);
648 - virtual ~NPT_TcpServerSocket();
649 + ~NPT_TcpServerSocket() override;
650
651 // delegate NPT_TcpServerSocketInterface methods
652 - NPT_Result Listen(unsigned int max_clients) {
653 + NPT_Result Listen(unsigned int max_clients) override {
654 return m_TcpServerSocketDelegate->Listen(max_clients);
655 }
656 NPT_Result WaitForNewClient(NPT_Socket*& client,
657 NPT_Timeout timeout = NPT_TIMEOUT_INFINITE,
658 - NPT_Flags flags = 0) {
659 + NPT_Flags flags = 0) override {
660 return m_TcpServerSocketDelegate->WaitForNewClient(client, timeout, flags);
661 }
662
663 diff --git a/lib/libUPnP/Neptune/Source/Core/NptStreams.h b/lib/libUPnP/Neptune/Source/Core/NptStreams.h
664 index 6cdab10fcb27..bb22903a9137 100644
665 --- a/lib/libUPnP/Neptune/Source/Core/NptStreams.h
666 +++ b/lib/libUPnP/Neptune/Source/Core/NptStreams.h
667 @@ -139,10 +139,10 @@ class NPT_DelegatingInputStream : public NPT_InputStream
668 {
669 public:
670 // NPT_InputStream methods
671 - NPT_Result Seek(NPT_Position offset) {
672 + NPT_Result Seek(NPT_Position offset) override {
673 return InputSeek(offset);
674 }
675 - NPT_Result Tell(NPT_Position& offset) {
676 + NPT_Result Tell(NPT_Position& offset) override {
677 return InputTell(offset);
678 }
679
680 @@ -165,10 +165,10 @@ class NPT_DelegatingOutputStream : public NPT_OutputStream
681 {
682 public:
683 // NPT_OutputStream methods
684 - NPT_Result Seek(NPT_Position offset) {
685 + NPT_Result Seek(NPT_Position offset) override {
686 return OutputSeek(offset);
687 }
688 - NPT_Result Tell(NPT_Position& offset) {
689 + NPT_Result Tell(NPT_Position& offset) override {
690 return OutputTell(offset);
691 }
692
693 @@ -189,7 +189,7 @@ class NPT_MemoryStream :
694 // constructor and destructor
695 NPT_MemoryStream(NPT_Size initial_capacity = 0);
696 NPT_MemoryStream(const void* data, NPT_Size size);
697 - virtual ~NPT_MemoryStream() {}
698 + ~NPT_MemoryStream() override {}
699
700 // accessors
701 const NPT_DataBuffer& GetBuffer() const { return m_Buffer; }
702 @@ -197,12 +197,12 @@ class NPT_MemoryStream :
703 // NPT_InputStream methods
704 NPT_Result Read(void* buffer,
705 NPT_Size bytes_to_read,
706 - NPT_Size* bytes_read = NULL);
707 - NPT_Result GetSize(NPT_LargeSize& size) {
708 + NPT_Size* bytes_read = NULL) override;
709 + NPT_Result GetSize(NPT_LargeSize& size) override {
710 size = m_Buffer.GetDataSize();
711 return NPT_SUCCESS;
712 }
713 - NPT_Result GetAvailable(NPT_LargeSize& available) {
714 + NPT_Result GetAvailable(NPT_LargeSize& available) override {
715 available = (NPT_LargeSize)m_Buffer.GetDataSize()-m_ReadOffset;
716 return NPT_SUCCESS;
717 }
718 @@ -210,7 +210,7 @@ class NPT_MemoryStream :
719 // NPT_OutputStream methods
720 NPT_Result Write(const void* buffer,
721 NPT_Size bytes_to_write,
722 - NPT_Size* bytes_written = NULL);
723 + NPT_Size* bytes_written = NULL) override;
724
725 // methods delegated to m_Buffer
726 const NPT_Byte* GetData() const { return m_Buffer.GetData(); }
727 @@ -223,15 +223,15 @@ class NPT_MemoryStream :
728
729 private:
730 // NPT_DelegatingInputStream methods
731 - NPT_Result InputSeek(NPT_Position offset);
732 - NPT_Result InputTell(NPT_Position& offset) {
733 + NPT_Result InputSeek(NPT_Position offset) override;
734 + NPT_Result InputTell(NPT_Position& offset) override {
735 offset = m_ReadOffset;
736 return NPT_SUCCESS;
737 }
738
739 // NPT_DelegatingOutputStream methods
740 - NPT_Result OutputSeek(NPT_Position offset);
741 - NPT_Result OutputTell(NPT_Position& offset) {
742 + NPT_Result OutputSeek(NPT_Position offset) override;
743 + NPT_Result OutputTell(NPT_Position& offset) override {
744 offset = m_WriteOffset;
745 return NPT_SUCCESS;
746 }
747 @@ -254,16 +254,16 @@ class NPT_StringOutputStream : public NPT_OutputStream
748 // methods
749 NPT_StringOutputStream(NPT_Size size = 4096);
750 NPT_StringOutputStream(NPT_String* storage);
751 - virtual ~NPT_StringOutputStream() ;
752 + ~NPT_StringOutputStream() override ;
753
754 const NPT_String& GetString() const { return *m_String; }
755 NPT_Result Reset() { if (m_String) m_String->SetLength(0); return NPT_SUCCESS; }
756
757 // NPT_OutputStream methods
758 - NPT_Result Write(const void* buffer, NPT_Size bytes_to_write, NPT_Size* bytes_written = NULL);
759 + NPT_Result Write(const void* buffer, NPT_Size bytes_to_write, NPT_Size* bytes_written = NULL) override;
760
761 - NPT_Result Seek(NPT_Position /*offset*/) { return NPT_ERROR_NOT_SUPPORTED; }
762 - NPT_Result Tell(NPT_Position& offset) { offset = m_String->GetLength(); return NPT_SUCCESS; }
763 + NPT_Result Seek(NPT_Position /*offset*/) override { return NPT_ERROR_NOT_SUPPORTED; }
764 + NPT_Result Tell(NPT_Position& offset) override { offset = m_String->GetLength(); return NPT_SUCCESS; }
765
766 protected:
767 NPT_String* m_String;
768 @@ -284,13 +284,13 @@ class NPT_SubInputStream : public NPT_InputStream
769 NPT_LargeSize size);
770
771 // methods
772 - virtual NPT_Result Read(void* buffer,
773 + NPT_Result Read(void* buffer,
774 NPT_Size bytes_to_read,
775 - NPT_Size* bytes_read = NULL);
776 - virtual NPT_Result Seek(NPT_Position offset);
777 - virtual NPT_Result Tell(NPT_Position& offset);
778 - virtual NPT_Result GetSize(NPT_LargeSize& size);
779 - virtual NPT_Result GetAvailable(NPT_LargeSize& available);
780 + NPT_Size* bytes_read = NULL) override;
781 + NPT_Result Seek(NPT_Position offset) override;
782 + NPT_Result Tell(NPT_Position& offset) override;
783 + NPT_Result GetSize(NPT_LargeSize& size) override;
784 + NPT_Result GetAvailable(NPT_LargeSize& available) override;
785
786 private:
787 NPT_InputStreamReference m_Source;
788 @@ -307,13 +307,13 @@ class NPT_NullOutputStream : public NPT_OutputStream
789 public:
790 // methods
791 NPT_NullOutputStream() {}
792 - virtual ~NPT_NullOutputStream() {}
793 + ~NPT_NullOutputStream() override {}
794
795 // NPT_OutputStream methods
796 - NPT_Result Write(const void* buffer, NPT_Size bytes_to_write, NPT_Size* bytes_written = NULL);
797 + NPT_Result Write(const void* buffer, NPT_Size bytes_to_write, NPT_Size* bytes_written = NULL) override;
798
799 - NPT_Result Seek(NPT_Position /*offset*/) { return NPT_ERROR_NOT_SUPPORTED; }
800 - NPT_Result Tell(NPT_Position& /*offset*/) { return NPT_ERROR_NOT_SUPPORTED; }
801 + NPT_Result Seek(NPT_Position /*offset*/) override { return NPT_ERROR_NOT_SUPPORTED; }
802 + NPT_Result Tell(NPT_Position& /*offset*/) override { return NPT_ERROR_NOT_SUPPORTED; }
803 };
804
805 typedef NPT_Reference<NPT_NullOutputStream> NPT_NullOutputStreamReference;
806 diff --git a/lib/libUPnP/Neptune/Source/Core/NptThreads.h b/lib/libUPnP/Neptune/Source/Core/NptThreads.h
807 index 9a7455f44b28..4bf73c8d5c9b 100644
808 --- a/lib/libUPnP/Neptune/Source/Core/NptThreads.h
809 +++ b/lib/libUPnP/Neptune/Source/Core/NptThreads.h
810 @@ -78,9 +78,9 @@ class NPT_Mutex : public NPT_MutexInterface
811 public:
812 // methods
813 NPT_Mutex(bool recursive = false);
814 - ~NPT_Mutex() { delete m_Delegate; }
815 - NPT_Result Lock() { return m_Delegate->Lock(); }
816 - NPT_Result Unlock() { return m_Delegate->Unlock(); }
817 + ~NPT_Mutex() override { delete m_Delegate; }
818 + NPT_Result Lock() override { return m_Delegate->Lock(); }
819 + NPT_Result Unlock() override { return m_Delegate->Unlock(); }
820
821 private:
822 // members
823 @@ -151,17 +151,17 @@ class NPT_SharedVariable : public NPT_SharedVariableInterface
824 public:
825 // methods
826 NPT_SharedVariable(int value = 0);
827 - ~NPT_SharedVariable() { delete m_Delegate; }
828 - void SetValue(int value) {
829 + ~NPT_SharedVariable() override { delete m_Delegate; }
830 + void SetValue(int value) override {
831 m_Delegate->SetValue(value);
832 }
833 - int GetValue() {
834 + int GetValue() override {
835 return m_Delegate->GetValue();
836 }
837 - NPT_Result WaitUntilEquals(int value, NPT_Timeout timeout = NPT_TIMEOUT_INFINITE) {
838 + NPT_Result WaitUntilEquals(int value, NPT_Timeout timeout = NPT_TIMEOUT_INFINITE) override {
839 return m_Delegate->WaitUntilEquals(value, timeout);
840 }
841 - NPT_Result WaitWhileEquals(int value, NPT_Timeout timeout = NPT_TIMEOUT_INFINITE) {
842 + NPT_Result WaitWhileEquals(int value, NPT_Timeout timeout = NPT_TIMEOUT_INFINITE) override {
843 return m_Delegate->WaitWhileEquals(value, timeout);
844 }
845
846 @@ -192,11 +192,11 @@ class NPT_AtomicVariable : public NPT_AtomicVariableInterface
847 public:
848 // methods
849 NPT_AtomicVariable(int value = 0);
850 - ~NPT_AtomicVariable() { delete m_Delegate; }
851 - int Increment() { return m_Delegate->Increment();}
852 - int Decrement() { return m_Delegate->Decrement();}
853 - void SetValue(int value) { m_Delegate->SetValue(value); }
854 - int GetValue() { return m_Delegate->GetValue(); }
855 + ~NPT_AtomicVariable() override { delete m_Delegate; }
856 + int Increment() override { return m_Delegate->Increment();}
857 + int Decrement() override { return m_Delegate->Decrement();}
858 + void SetValue(int value) override { m_Delegate->SetValue(value); }
859 + int GetValue() override { return m_Delegate->GetValue(); }
860
861 private:
862 // members
863 @@ -220,7 +220,7 @@ class NPT_ThreadInterface: public NPT_Runnable, public NPT_Interruptible
864 {
865 public:
866 // methods
867 - virtual ~NPT_ThreadInterface() {}
868 + ~NPT_ThreadInterface() override {}
869 virtual NPT_Result Start() = 0;
870 virtual NPT_Result Wait(NPT_Timeout timeout = NPT_TIMEOUT_INFINITE) = 0;
871 virtual NPT_Result SetPriority(int /*priority*/) { return NPT_SUCCESS; }
872 @@ -245,30 +245,30 @@ class NPT_Thread : public NPT_ThreadInterface
873 // methods
874 explicit NPT_Thread(bool detached = false);
875 explicit NPT_Thread(NPT_Runnable& target, bool detached = false);
876 - ~NPT_Thread() { delete m_Delegate; }
877 + ~NPT_Thread() override { delete m_Delegate; }
878
879 // cancel any socket that this thread may be waiting for
880 - NPT_Result CancelBlockerSocket() { return m_Delegate->CancelBlockerSocket(); }
881 + NPT_Result CancelBlockerSocket() override { return m_Delegate->CancelBlockerSocket(); }
882
883 // NPT_ThreadInterface methods
884 - NPT_Result Start() {
885 + NPT_Result Start() override {
886 return m_Delegate->Start();
887 }
888 - NPT_Result Wait(NPT_Timeout timeout = NPT_TIMEOUT_INFINITE) {
889 + NPT_Result Wait(NPT_Timeout timeout = NPT_TIMEOUT_INFINITE) override {
890 return m_Delegate->Wait(timeout);
891 }
892 - NPT_Result SetPriority(int priority) {
893 + NPT_Result SetPriority(int priority) override {
894 return m_Delegate->SetPriority(priority);
895 }
896 - NPT_Result GetPriority(int& priority) {
897 + NPT_Result GetPriority(int& priority) override {
898 return m_Delegate->GetPriority(priority);
899 }
900
901 // NPT_Runnable methods
902 - virtual void Run() {}
903 + void Run() override {}
904
905 // NPT_Interruptible methods
906 - virtual NPT_Result Interrupt() { return m_Delegate->Interrupt(); }
907 + NPT_Result Interrupt() override { return m_Delegate->Interrupt(); }
908
909 private:
910 // members
911 diff --git a/lib/libUPnP/Neptune/Source/Core/NptTls.cpp b/lib/libUPnP/Neptune/Source/Core/NptTls.cpp
912 index c622bb78aa2d..9118352ed5de 100644
913 --- a/lib/libUPnP/Neptune/Source/Core/NptTls.cpp
914 +++ b/lib/libUPnP/Neptune/Source/Core/NptTls.cpp
915 @@ -1055,10 +1055,10 @@ NPT_HttpTlsConnector::VerifyPeer(NPT_TlsClientSession& session, const char* host
916 class NPT_HttpSimpleTlsConnection : public NPT_HttpClient::Connection
917 {
918 public:
919 - virtual NPT_InputStreamReference& GetInputStream() {
920 + NPT_InputStreamReference& GetInputStream() override {
921 return m_InputStream;
922 }
923 - virtual NPT_OutputStreamReference& GetOutputStream() {
924 + NPT_OutputStreamReference& GetOutputStream() override {
925 return m_OutputStream;
926 }
927
928 diff --git a/lib/libUPnP/Neptune/Source/Core/NptTls.h b/lib/libUPnP/Neptune/Source/Core/NptTls.h
929 index 4a392fdcc7b1..dafe8ef304ba 100644
930 --- a/lib/libUPnP/Neptune/Source/Core/NptTls.h
931 +++ b/lib/libUPnP/Neptune/Source/Core/NptTls.h
932 @@ -131,7 +131,7 @@ class NPT_TlsContext : public NPT_AutomaticCleaner::Singleton
933 OPTION_NO_SESSION_CACHE = 8
934 };
935 NPT_TlsContext(NPT_Flags options=0);
936 - ~NPT_TlsContext();
937 + ~NPT_TlsContext() override;
938
939 // methods
940 NPT_Result LoadKey(NPT_TlsKeyFormat key_format,
941 @@ -279,12 +279,12 @@ class NPT_HttpTlsConnector : public NPT_HttpClient::Connector
942 class NPT_HttpTlsConnector : public NPT_HttpClient::Connector
943 {
944 public:
945 - virtual ~NPT_HttpTlsConnector() {}
946 - virtual NPT_Result Connect(const NPT_HttpUrl& url,
947 + ~NPT_HttpTlsConnector() override {}
948 + NPT_Result Connect(const NPT_HttpUrl& url,
949 NPT_HttpClient& client,
950 const NPT_HttpProxyAddress* proxy,
951 bool reuse,
952 - NPT_HttpClient::Connection*& connection);
953 + NPT_HttpClient::Connection*& connection) override;
954 };
955 #endif
956
957 diff --git a/lib/libUPnP/Neptune/Source/Core/NptXml.h b/lib/libUPnP/Neptune/Source/Core/NptXml.h
958 index b5d18ea38148..f76243bff453 100644
959 --- a/lib/libUPnP/Neptune/Source/Core/NptXml.h
960 +++ b/lib/libUPnP/Neptune/Source/Core/NptXml.h
961 @@ -175,7 +175,7 @@ class NPT_XmlElementNode : public NPT_XmlNode
962 // methods
963 NPT_XmlElementNode(const char* tag);
964 NPT_XmlElementNode(const char* prefix, const char* tag);
965 - virtual ~NPT_XmlElementNode();
966 + ~NPT_XmlElementNode() override;
967 NPT_List<NPT_XmlNode*>& GetChildren() { return m_Children; }
968 const NPT_List<NPT_XmlNode*>&
969 GetChildren() const { return m_Children; }
970 @@ -211,12 +211,12 @@ class NPT_XmlElementNode : public NPT_XmlNode
971 const NPT_String* GetNamespacePrefix(const char* uri) const;
972
973 // type casting
974 - NPT_XmlElementNode* AsElementNode() { return this; }
975 - const NPT_XmlElementNode* AsElementNode() const { return this; }
976 + NPT_XmlElementNode* AsElementNode() override { return this; }
977 + const NPT_XmlElementNode* AsElementNode() const override { return this; }
978
979 protected:
980 // methods
981 - void SetParent(NPT_XmlNode* parent);
982 + void SetParent(NPT_XmlNode* parent) override;
983 void SetNamespaceParent(NPT_XmlElementNode* parent);
984 void RelinkNamespaceMaps();
985
986 @@ -264,8 +264,8 @@ class NPT_XmlTextNode : public NPT_XmlNode
987 TokenType GetTokenType() const { return m_TokenType; }
988
989 // type casting
990 - NPT_XmlTextNode* AsTextNode() { return this; }
991 - const NPT_XmlTextNode* AsTextNode() const { return this; }
992 + NPT_XmlTextNode* AsTextNode() override { return this; }
993 + const NPT_XmlTextNode* AsTextNode() const override { return this; }
994
995 private:
996 // members
997 diff --git a/lib/libUPnP/Neptune/Source/Core/NptZip.h b/lib/libUPnP/Neptune/Source/Core/NptZip.h
998 index 3720451e7079..d8b692acca7c 100644
999 --- a/lib/libUPnP/Neptune/Source/Core/NptZip.h
1000 +++ b/lib/libUPnP/Neptune/Source/Core/NptZip.h
1001 @@ -141,16 +141,16 @@ class NPT_ZipInflatingInputStream : public NPT_InputStream
1002 {
1003 public:
1004 NPT_ZipInflatingInputStream(NPT_InputStreamReference& source, bool raw = false);
1005 - ~NPT_ZipInflatingInputStream();
1006 + ~NPT_ZipInflatingInputStream() override;
1007
1008 // NPT_InputStream methods
1009 - virtual NPT_Result Read(void* buffer,
1010 + NPT_Result Read(void* buffer,
1011 NPT_Size bytes_to_read,
1012 - NPT_Size* bytes_read = NULL);
1013 - virtual NPT_Result Seek(NPT_Position offset);
1014 - virtual NPT_Result Tell(NPT_Position& offset);
1015 - virtual NPT_Result GetSize(NPT_LargeSize& size);
1016 - virtual NPT_Result GetAvailable(NPT_LargeSize& available);
1017 + NPT_Size* bytes_read = NULL) override;
1018 + NPT_Result Seek(NPT_Position offset) override;
1019 + NPT_Result Tell(NPT_Position& offset) override;
1020 + NPT_Result GetSize(NPT_LargeSize& size) override;
1021 + NPT_Result GetAvailable(NPT_LargeSize& available) override;
1022
1023 private:
1024 NPT_InputStreamReference m_Source;
1025 @@ -172,16 +172,16 @@ class NPT_ZipDeflatingInputStream : public NPT_InputStream
1026 NPT_ZipDeflatingInputStream(NPT_InputStreamReference& source,
1027 int compression_level = NPT_ZIP_COMPRESSION_LEVEL_DEFAULT,
1028 NPT_Zip::Format format = NPT_Zip::ZLIB);
1029 - ~NPT_ZipDeflatingInputStream();
1030 + ~NPT_ZipDeflatingInputStream() override;
1031
1032 // NPT_InputStream methods
1033 - virtual NPT_Result Read(void* buffer,
1034 + NPT_Result Read(void* buffer,
1035 NPT_Size bytes_to_read,
1036 - NPT_Size* bytes_read = NULL);
1037 - virtual NPT_Result Seek(NPT_Position offset);
1038 - virtual NPT_Result Tell(NPT_Position& offset);
1039 - virtual NPT_Result GetSize(NPT_LargeSize& size);
1040 - virtual NPT_Result GetAvailable(NPT_LargeSize& available);
1041 + NPT_Size* bytes_read = NULL) override;
1042 + NPT_Result Seek(NPT_Position offset) override;
1043 + NPT_Result Tell(NPT_Position& offset) override;
1044 + NPT_Result GetSize(NPT_LargeSize& size) override;
1045 + NPT_Result GetAvailable(NPT_LargeSize& available) override;
1046
1047 private:
1048 NPT_InputStreamReference m_Source;
1049 diff --git a/lib/libUPnP/Neptune/Source/System/Bsd/NptBsdSockets.cpp b/lib/libUPnP/Neptune/Source/System/Bsd/NptBsdSockets.cpp
1050 index 6174ff96f902..ee86dbf4b092 100644
1051 --- a/lib/libUPnP/Neptune/Source/System/Bsd/NptBsdSockets.cpp
1052 +++ b/lib/libUPnP/Neptune/Source/System/Bsd/NptBsdSockets.cpp
1053 @@ -1063,14 +1063,14 @@ class NPT_BsdSocketInputStream : public NPT_InputStream,
1054 // NPT_InputStream methods
1055 NPT_Result Read(void* buffer,
1056 NPT_Size bytes_to_read,
1057 - NPT_Size* bytes_read);
1058 - NPT_Result Seek(NPT_Position offset) {
1059 + NPT_Size* bytes_read) override;
1060 + NPT_Result Seek(NPT_Position offset) override {
1061 return NPT_BsdSocketStream::Seek(offset); }
1062 - NPT_Result Tell(NPT_Position& where) {
1063 + NPT_Result Tell(NPT_Position& where) override {
1064 return NPT_BsdSocketStream::Tell(where);
1065 }
1066 - NPT_Result GetSize(NPT_LargeSize& size);
1067 - NPT_Result GetAvailable(NPT_LargeSize& available);
1068 + NPT_Result GetSize(NPT_LargeSize& size) override;
1069 + NPT_Result GetAvailable(NPT_LargeSize& available) override;
1070 };
1071
1072 /*----------------------------------------------------------------------
1073 @@ -1176,13 +1176,13 @@ class NPT_BsdSocketOutputStream : public NPT_OutputStream,
1074 // NPT_OutputStream methods
1075 NPT_Result Write(const void* buffer,
1076 NPT_Size bytes_to_write,
1077 - NPT_Size* bytes_written);
1078 - NPT_Result Seek(NPT_Position offset) {
1079 + NPT_Size* bytes_written) override;
1080 + NPT_Result Seek(NPT_Position offset) override {
1081 return NPT_BsdSocketStream::Seek(offset); }
1082 - NPT_Result Tell(NPT_Position& where) {
1083 + NPT_Result Tell(NPT_Position& where) override {
1084 return NPT_BsdSocketStream::Tell(where);
1085 }
1086 - NPT_Result Flush();
1087 + NPT_Result Flush() override;
1088 };
1089
1090 /*----------------------------------------------------------------------
1091 @@ -1320,21 +1320,21 @@ class NPT_BsdSocket : public NPT_SocketInterface
1092 public:
1093 // constructors and destructor
1094 NPT_BsdSocket(SocketFd fd, NPT_Flags flags);
1095 - virtual ~NPT_BsdSocket();
1096 + ~NPT_BsdSocket() override;
1097
1098 // methods
1099 NPT_Result RefreshInfo();
1100
1101 // NPT_SocketInterface methods
1102 - NPT_Result Bind(const NPT_SocketAddress& address, bool reuse_address = true);
1103 - NPT_Result Connect(const NPT_SocketAddress& address, NPT_Timeout timeout);
1104 - NPT_Result WaitForConnection(NPT_Timeout timeout);
1105 - NPT_Result GetInputStream(NPT_InputStreamReference& stream);
1106 - NPT_Result GetOutputStream(NPT_OutputStreamReference& stream);
1107 - NPT_Result GetInfo(NPT_SocketInfo& info);
1108 - NPT_Result SetReadTimeout(NPT_Timeout timeout);
1109 - NPT_Result SetWriteTimeout(NPT_Timeout timeout);
1110 - NPT_Result Cancel(bool shutdown);
1111 + NPT_Result Bind(const NPT_SocketAddress& address, bool reuse_address = true) override;
1112 + NPT_Result Connect(const NPT_SocketAddress& address, NPT_Timeout timeout) override;
1113 + NPT_Result WaitForConnection(NPT_Timeout timeout) override;
1114 + NPT_Result GetInputStream(NPT_InputStreamReference& stream) override;
1115 + NPT_Result GetOutputStream(NPT_OutputStreamReference& stream) override;
1116 + NPT_Result GetInfo(NPT_SocketInfo& info) override;
1117 + NPT_Result SetReadTimeout(NPT_Timeout timeout) override;
1118 + NPT_Result SetWriteTimeout(NPT_Timeout timeout) override;
1119 + NPT_Result Cancel(bool shutdown) override;
1120
1121 protected:
1122 // members
1123 @@ -1564,18 +1564,18 @@ class NPT_BsdUdpSocket : public NPT_UdpSocketInterface,
1124 public:
1125 // constructor and destructor
1126 NPT_BsdUdpSocket(NPT_Flags flags);
1127 - virtual ~NPT_BsdUdpSocket() {}
1128 + ~NPT_BsdUdpSocket() override {}
1129
1130 // NPT_SocketInterface methods
1131 - NPT_Result Bind(const NPT_SocketAddress& address, bool reuse_address = true);
1132 + NPT_Result Bind(const NPT_SocketAddress& address, bool reuse_address = true) override;
1133 NPT_Result Connect(const NPT_SocketAddress& address,
1134 - NPT_Timeout timeout);
1135 + NPT_Timeout timeout) override;
1136
1137 // NPT_UdpSocketInterface methods
1138 NPT_Result Send(const NPT_DataBuffer& packet,
1139 - const NPT_SocketAddress* address);
1140 + const NPT_SocketAddress* address) override;
1141 NPT_Result Receive(NPT_DataBuffer& packet,
1142 - NPT_SocketAddress* address);
1143 + NPT_SocketAddress* address) override;
1144
1145 // friends
1146 friend class NPT_UdpSocket;
1147 @@ -1833,15 +1833,15 @@ class NPT_BsdUdpMulticastSocket : public NPT_UdpMulticastSocketInterface,
1148 public:
1149 // methods
1150 NPT_BsdUdpMulticastSocket(NPT_Flags flags);
1151 - ~NPT_BsdUdpMulticastSocket();
1152 + ~NPT_BsdUdpMulticastSocket() override;
1153
1154 // NPT_UdpMulticastSocketInterface methods
1155 NPT_Result JoinGroup(const NPT_IpAddress& group,
1156 - const NPT_IpAddress& iface);
1157 + const NPT_IpAddress& iface) override;
1158 NPT_Result LeaveGroup(const NPT_IpAddress& group,
1159 - const NPT_IpAddress& iface);
1160 - NPT_Result SetTimeToLive(unsigned char ttl);
1161 - NPT_Result SetInterface(const NPT_IpAddress& iface);
1162 + const NPT_IpAddress& iface) override;
1163 + NPT_Result SetTimeToLive(unsigned char ttl) override;
1164 + NPT_Result SetInterface(const NPT_IpAddress& iface) override;
1165
1166 // friends
1167 friend class NPT_UdpMulticastSocket;
1168 @@ -2129,12 +2129,12 @@ class NPT_BsdTcpClientSocket : protected NPT_BsdSocket
1169 public:
1170 // methods
1171 NPT_BsdTcpClientSocket(NPT_Flags flags);
1172 - ~NPT_BsdTcpClientSocket();
1173 + ~NPT_BsdTcpClientSocket() override;
1174
1175 // NPT_SocketInterface methods
1176 NPT_Result Connect(const NPT_SocketAddress& address,
1177 - NPT_Timeout timeout);
1178 - NPT_Result WaitForConnection(NPT_Timeout timeout);
1179 + NPT_Timeout timeout) override;
1180 + NPT_Result WaitForConnection(NPT_Timeout timeout) override;
1181
1182 protected:
1183 // friends
1184 @@ -2241,25 +2241,25 @@ class NPT_BsdTcpServerSocket : public NPT_TcpServerSocketInterface,
1185 public:
1186 // methods
1187 NPT_BsdTcpServerSocket(NPT_Flags flags);
1188 - ~NPT_BsdTcpServerSocket();
1189 + ~NPT_BsdTcpServerSocket() override;
1190
1191 // NPT_SocketInterface methods
1192 - NPT_Result GetInputStream(NPT_InputStreamReference& stream) {
1193 + NPT_Result GetInputStream(NPT_InputStreamReference& stream) override {
1194 // no stream
1195 stream = NULL;
1196 return NPT_ERROR_NOT_SUPPORTED;
1197 }
1198 - NPT_Result GetOutputStream(NPT_OutputStreamReference& stream) {
1199 + NPT_Result GetOutputStream(NPT_OutputStreamReference& stream) override {
1200 // no stream
1201 stream = NULL;
1202 return NPT_ERROR_NOT_SUPPORTED;
1203 }
1204
1205 // NPT_TcpServerSocket methods
1206 - NPT_Result Listen(unsigned int max_clients);
1207 + NPT_Result Listen(unsigned int max_clients) override;
1208 NPT_Result WaitForNewClient(NPT_Socket*& client,
1209 NPT_Timeout timeout,
1210 - NPT_Flags flags);
1211 + NPT_Flags flags) override;
1212
1213 protected:
1214 // members
1215 diff --git a/lib/libUPnP/Neptune/Source/System/Posix/NptPosixQueue.cpp b/lib/libUPnP/Neptune/Source/System/Posix/NptPosixQueue.cpp
1216 index f32dfe54eef4..553cda38ad67 100644
1217 --- a/lib/libUPnP/Neptune/Source/System/Posix/NptPosixQueue.cpp
1218 +++ b/lib/libUPnP/Neptune/Source/System/Posix/NptPosixQueue.cpp
1219 @@ -38,10 +38,10 @@ class NPT_PosixQueue : public NPT_GenericQueue
1220 public:
1221 // methods
1222 NPT_PosixQueue(NPT_Cardinal max_items);
1223 - ~NPT_PosixQueue();
1224 - NPT_Result Push(NPT_QueueItem* item, NPT_Timeout timeout);
1225 - NPT_Result Pop(NPT_QueueItem*& item, NPT_Timeout timeout);
1226 - NPT_Result Peek(NPT_QueueItem*& item, NPT_Timeout timeout);
1227 + ~NPT_PosixQueue() override;
1228 + NPT_Result Push(NPT_QueueItem* item, NPT_Timeout timeout) override;
1229 + NPT_Result Pop(NPT_QueueItem*& item, NPT_Timeout timeout) override;
1230 + NPT_Result Peek(NPT_QueueItem*& item, NPT_Timeout timeout) override;
1231
1232 private:
1233 void Abort();
1234 diff --git a/lib/libUPnP/Neptune/Source/System/Posix/NptPosixThreads.cpp b/lib/libUPnP/Neptune/Source/System/Posix/NptPosixThreads.cpp
1235 index 36eb9978b085..010ba9be0fe9 100644
1236 --- a/lib/libUPnP/Neptune/Source/System/Posix/NptPosixThreads.cpp
1237 +++ b/lib/libUPnP/Neptune/Source/System/Posix/NptPosixThreads.cpp
1238 @@ -41,11 +41,11 @@ class NPT_PosixMutex : public NPT_MutexInterface
1239 public:
1240 // methods
1241 NPT_PosixMutex(bool recursive = false);
1242 - virtual ~NPT_PosixMutex();
1243 + ~NPT_PosixMutex() override;
1244
1245 // NPT_Mutex methods
1246 - virtual NPT_Result Lock();
1247 - virtual NPT_Result Unlock();
1248 + NPT_Result Lock() override;
1249 + NPT_Result Unlock() override;
1250
1251 private:
1252 // members
1253 @@ -112,11 +112,11 @@ class NPT_PosixSharedVariable : public NPT_SharedVariableInterface
1254 public:
1255 // methods
1256 NPT_PosixSharedVariable(int value);
1257 - ~NPT_PosixSharedVariable();
1258 - void SetValue(int value);
1259 - int GetValue();
1260 - NPT_Result WaitUntilEquals(int value, NPT_Timeout timeout);
1261 - NPT_Result WaitWhileEquals(int value, NPT_Timeout timeout);
1262 + ~NPT_PosixSharedVariable() override;
1263 + void SetValue(int value) override;
1264 + int GetValue() override;
1265 + NPT_Result WaitUntilEquals(int value, NPT_Timeout timeout) override;
1266 + NPT_Result WaitWhileEquals(int value, NPT_Timeout timeout) override;
1267
1268 private:
1269 // members
1270 @@ -270,11 +270,11 @@ class NPT_PosixAtomicVariable : public NPT_AtomicVariableInterface
1271 public:
1272 // methods
1273 NPT_PosixAtomicVariable(int value);
1274 - ~NPT_PosixAtomicVariable();
1275 - int Increment();
1276 - int Decrement();
1277 - int GetValue();
1278 - void SetValue(int value);
1279 + ~NPT_PosixAtomicVariable() override;
1280 + int Increment() override;
1281 + int Decrement() override;
1282 + int GetValue() override;
1283 + void SetValue(int value) override;
1284
1285 private:
1286 // members
1287 @@ -368,12 +368,12 @@ class NPT_PosixThread : public NPT_ThreadInterface
1288 NPT_PosixThread(NPT_Thread* delegator,
1289 NPT_Runnable& target,
1290 bool detached);
1291 - ~NPT_PosixThread();
1292 - NPT_Result Start();
1293 - NPT_Result Wait(NPT_Timeout timeout = NPT_TIMEOUT_INFINITE);
1294 - NPT_Result CancelBlockerSocket();
1295 - NPT_Result SetPriority(int priority);
1296 - NPT_Result GetPriority(int& priority);
1297 + ~NPT_PosixThread() override;
1298 + NPT_Result Start() override;
1299 + NPT_Result Wait(NPT_Timeout timeout = NPT_TIMEOUT_INFINITE) override;
1300 + NPT_Result CancelBlockerSocket() override;
1301 + NPT_Result SetPriority(int priority) override;
1302 + NPT_Result GetPriority(int& priority) override;
1303
1304 // class methods
1305 static NPT_Result GetPriority(NPT_Thread::ThreadId thread_id, int& priority);
1306 @@ -384,10 +384,10 @@ class NPT_PosixThread : public NPT_ThreadInterface
1307 static void* EntryPoint(void* argument);
1308
1309 // NPT_Runnable methods
1310 - void Run();
1311 + void Run() override;
1312
1313 // NPT_Interruptible methods
1314 - NPT_Result Interrupt() { return NPT_ERROR_NOT_IMPLEMENTED; }
1315 + NPT_Result Interrupt() override { return NPT_ERROR_NOT_IMPLEMENTED; }
1316
1317 // members
1318 NPT_Thread* m_Delegator;
1319 diff --git a/lib/libUPnP/Platinum/Source/Core/PltCtrlPoint.h b/lib/libUPnP/Platinum/Source/Core/PltCtrlPoint.h
1320 index 65baa7b10c45..401c863a6a76 100644
1321 --- a/lib/libUPnP/Platinum/Source/Core/PltCtrlPoint.h
1322 +++ b/lib/libUPnP/Platinum/Source/Core/PltCtrlPoint.h
1323 @@ -92,7 +92,7 @@ class PLT_CtrlPoint : public PLT_SsdpPacketListener,
1324 {
1325 public:
1326 PLT_CtrlPoint(const char* search_criteria = "upnp:rootdevice"); // pass NULL to prevent repeated automatic search
1327 - virtual ~PLT_CtrlPoint();
1328 + ~PLT_CtrlPoint() override;
1329
1330 /**
1331 Returns the port used by the internal HTTP server for all incoming event notifications.
1332 @@ -138,17 +138,17 @@ class PLT_CtrlPoint : public PLT_SsdpPacketListener,
1333 void* userdata = NULL);
1334
1335 // NPT_HttpRequestHandler methods
1336 - virtual NPT_Result SetupResponse(NPT_HttpRequest& request,
1337 + NPT_Result SetupResponse(NPT_HttpRequest& request,
1338 const NPT_HttpRequestContext& context,
1339 - NPT_HttpResponse& response);
1340 + NPT_HttpResponse& response) override;
1341
1342 // PLT_SsdpSearchResponseListener methods
1343 - virtual NPT_Result ProcessSsdpSearchResponse(NPT_Result res,
1344 + NPT_Result ProcessSsdpSearchResponse(NPT_Result res,
1345 const NPT_HttpRequestContext& context,
1346 - NPT_HttpResponse* response);
1347 + NPT_HttpResponse* response) override;
1348 // PLT_SsdpPacketListener method
1349 - virtual NPT_Result OnSsdpPacket(const NPT_HttpRequest& request,
1350 - const NPT_HttpRequestContext& context);
1351 + NPT_Result OnSsdpPacket(const NPT_HttpRequest& request,
1352 + const NPT_HttpRequestContext& context) override;
1353
1354 protected:
1355
1356 diff --git a/lib/libUPnP/Platinum/Source/Core/PltCtrlPointTask.h b/lib/libUPnP/Platinum/Source/Core/PltCtrlPointTask.h
1357 index 48e204483665..15ac8870f345 100644
1358 --- a/lib/libUPnP/Platinum/Source/Core/PltCtrlPointTask.h
1359 +++ b/lib/libUPnP/Platinum/Source/Core/PltCtrlPointTask.h
1360 @@ -67,14 +67,14 @@ class PLT_CtrlPointGetDescriptionTask : public PLT_HttpClientSocketTask
1361 PLT_CtrlPoint* ctrl_point,
1362 NPT_TimeInterval leasetime,
1363 NPT_String uuid);
1364 - virtual ~PLT_CtrlPointGetDescriptionTask();
1365 + ~PLT_CtrlPointGetDescriptionTask() override;
1366
1367 protected:
1368 // PLT_HttpClientSocketTask methods
1369 NPT_Result ProcessResponse(NPT_Result res,
1370 const NPT_HttpRequest& request,
1371 const NPT_HttpRequestContext& context,
1372 - NPT_HttpResponse* response);
1373 + NPT_HttpResponse* response) override;
1374
1375 protected:
1376 PLT_CtrlPoint* m_CtrlPoint;
1377 @@ -97,7 +97,7 @@ class PLT_CtrlPointGetSCPDRequest : public NPT_HttpRequest
1378 const char* method = "GET",
1379 const char* protocol = NPT_HTTP_PROTOCOL_1_1) : // 1.1 for pipelining
1380 NPT_HttpRequest(url, method, protocol), m_Device(device) {}
1381 - virtual ~PLT_CtrlPointGetSCPDRequest() {}
1382 + ~PLT_CtrlPointGetSCPDRequest() override {}
1383
1384 // members
1385 PLT_DeviceDataReference m_Device;
1386 @@ -114,14 +114,14 @@ class PLT_CtrlPointGetSCPDsTask : public PLT_HttpClientSocketTask
1387 {
1388 public:
1389 PLT_CtrlPointGetSCPDsTask(PLT_CtrlPoint* ctrl_point, PLT_DeviceDataReference& root_device);
1390 - virtual ~PLT_CtrlPointGetSCPDsTask() {}
1391 + ~PLT_CtrlPointGetSCPDsTask() override {}
1392
1393 NPT_Result AddSCPDRequest(PLT_CtrlPointGetSCPDRequest* request) {
1394 return PLT_HttpClientSocketTask::AddRequest((NPT_HttpRequest*)request);
1395 }
1396
1397 // override to prevent calling this directly
1398 - NPT_Result AddRequest(NPT_HttpRequest*) {
1399 + NPT_Result AddRequest(NPT_HttpRequest*) override {
1400 // only queuing PLT_CtrlPointGetSCPDRequest allowed
1401 return NPT_ERROR_NOT_SUPPORTED;
1402 }
1403 @@ -131,7 +131,7 @@ class PLT_CtrlPointGetSCPDsTask : public PLT_HttpClientSocketTask
1404 NPT_Result ProcessResponse(NPT_Result res,
1405 const NPT_HttpRequest& request,
1406 const NPT_HttpRequestContext& context,
1407 - NPT_HttpResponse* response);
1408 + NPT_HttpResponse* response) override;
1409
1410 protected:
1411 PLT_CtrlPoint* m_CtrlPoint;
1412 @@ -152,14 +152,14 @@ class PLT_CtrlPointInvokeActionTask : public PLT_HttpClientSocketTask
1413 PLT_CtrlPoint* ctrl_point,
1414 PLT_ActionReference& action,
1415 void* userdata);
1416 - virtual ~PLT_CtrlPointInvokeActionTask();
1417 + ~PLT_CtrlPointInvokeActionTask() override;
1418
1419 protected:
1420 // PLT_HttpClientSocketTask methods
1421 NPT_Result ProcessResponse(NPT_Result res,
1422 const NPT_HttpRequest& request,
1423 const NPT_HttpRequestContext& context,
1424 - NPT_HttpResponse* response);
1425 + NPT_HttpResponse* response) override;
1426
1427 protected:
1428 PLT_CtrlPoint* m_CtrlPoint;
1429 @@ -181,10 +181,10 @@ class PLT_CtrlPointHouseKeepingTask : public PLT_ThreadTask
1430 NPT_TimeInterval timer = NPT_TimeInterval(5.));
1431
1432 protected:
1433 - ~PLT_CtrlPointHouseKeepingTask() {}
1434 + ~PLT_CtrlPointHouseKeepingTask() override {}
1435
1436 // PLT_ThreadTask methods
1437 - virtual void DoRun();
1438 + void DoRun() override;
1439
1440 protected:
1441 PLT_CtrlPoint* m_CtrlPoint;
1442 @@ -206,14 +206,14 @@ class PLT_CtrlPointSubscribeEventTask : public PLT_HttpClientSocketTask
1443 PLT_DeviceDataReference& device,
1444 PLT_Service* service,
1445 void* userdata = NULL);
1446 - virtual ~PLT_CtrlPointSubscribeEventTask();
1447 + ~PLT_CtrlPointSubscribeEventTask() override;
1448
1449 protected:
1450 // PLT_HttpClientSocketTask methods
1451 NPT_Result ProcessResponse(NPT_Result res,
1452 const NPT_HttpRequest& request,
1453 const NPT_HttpRequestContext& context,
1454 - NPT_HttpResponse* response);
1455 + NPT_HttpResponse* response) override;
1456
1457 protected:
1458 PLT_CtrlPoint* m_CtrlPoint;
1459 diff --git a/lib/libUPnP/Platinum/Source/Core/PltDatagramStream.h b/lib/libUPnP/Platinum/Source/Core/PltDatagramStream.h
1460 index 0e132b97fed9..86ba105a6b3b 100644
1461 --- a/lib/libUPnP/Platinum/Source/Core/PltDatagramStream.h
1462 +++ b/lib/libUPnP/Platinum/Source/Core/PltDatagramStream.h
1463 @@ -58,20 +58,20 @@ class PLT_InputDatagramStream : public NPT_InputStream
1464 // methods
1465 PLT_InputDatagramStream(NPT_UdpSocket* socket,
1466 NPT_Size buffer_size = 2000);
1467 - virtual ~PLT_InputDatagramStream();
1468 + ~PLT_InputDatagramStream() override;
1469
1470 NPT_Result GetInfo(NPT_SocketInfo& info);
1471
1472 // NPT_InputStream methods
1473 NPT_Result Read(void* buffer,
1474 NPT_Size bytes_to_read,
1475 - NPT_Size* bytes_read = 0);
1476 + NPT_Size* bytes_read = 0) override;
1477
1478 - NPT_Result Seek(NPT_Position offset) { NPT_COMPILER_UNUSED(offset); return NPT_FAILURE; }
1479 - NPT_Result Skip(NPT_Size offset) { NPT_COMPILER_UNUSED(offset); return NPT_FAILURE; }
1480 - NPT_Result Tell(NPT_Position& offset){ NPT_COMPILER_UNUSED(offset); return NPT_FAILURE; }
1481 - NPT_Result GetSize(NPT_LargeSize& size) { NPT_COMPILER_UNUSED(size); return NPT_FAILURE; }
1482 - NPT_Result GetAvailable(NPT_LargeSize& available) { NPT_COMPILER_UNUSED(available); return NPT_FAILURE; }
1483 + NPT_Result Seek(NPT_Position offset) override { NPT_COMPILER_UNUSED(offset); return NPT_FAILURE; }
1484 + NPT_Result Skip(NPT_Size offset) override { NPT_COMPILER_UNUSED(offset); return NPT_FAILURE; }
1485 + NPT_Result Tell(NPT_Position& offset) override{ NPT_COMPILER_UNUSED(offset); return NPT_FAILURE; }
1486 + NPT_Result GetSize(NPT_LargeSize& size) override { NPT_COMPILER_UNUSED(size); return NPT_FAILURE; }
1487 + NPT_Result GetAvailable(NPT_LargeSize& available) override { NPT_COMPILER_UNUSED(available); return NPT_FAILURE; }
1488
1489 protected:
1490 NPT_UdpSocket* m_Socket;
1491 @@ -97,14 +97,14 @@ class PLT_OutputDatagramStream : public NPT_OutputStream
1492 PLT_OutputDatagramStream(NPT_UdpSocket* socket,
1493 NPT_Size size = 4096,
1494 const NPT_SocketAddress* address = NULL);
1495 - virtual ~PLT_OutputDatagramStream();
1496 + ~PLT_OutputDatagramStream() override;
1497
1498 // NPT_OutputStream methods
1499 - NPT_Result Write(const void* buffer, NPT_Size bytes_to_write, NPT_Size* bytes_written = NULL);
1500 - NPT_Result Flush();
1501 + NPT_Result Write(const void* buffer, NPT_Size bytes_to_write, NPT_Size* bytes_written = NULL) override;
1502 + NPT_Result Flush() override;
1503
1504 - NPT_Result Seek(NPT_Position offset) { NPT_COMPILER_UNUSED(offset); return NPT_FAILURE; }
1505 - NPT_Result Tell(NPT_Position& offset) { NPT_COMPILER_UNUSED(offset); return NPT_FAILURE; }
1506 + NPT_Result Seek(NPT_Position offset) override { NPT_COMPILER_UNUSED(offset); return NPT_FAILURE; }
1507 + NPT_Result Tell(NPT_Position& offset) override { NPT_COMPILER_UNUSED(offset); return NPT_FAILURE; }
1508
1509 protected:
1510 NPT_UdpSocket* m_Socket;
1511 diff --git a/lib/libUPnP/Platinum/Source/Core/PltDeviceHost.h b/lib/libUPnP/Platinum/Source/Core/PltDeviceHost.h
1512 index 9c31484d92bb..8cf611866414 100644
1513 --- a/lib/libUPnP/Platinum/Source/Core/PltDeviceHost.h
1514 +++ b/lib/libUPnP/Platinum/Source/Core/PltDeviceHost.h
1515 @@ -90,7 +90,7 @@ class PLT_DeviceHost : public PLT_DeviceData,
1516 bool show_ip = false,
1517 NPT_UInt16 port = 0,
1518 bool port_rebind = false);
1519 - virtual ~PLT_DeviceHost();
1520 + ~PLT_DeviceHost() override;
1521
1522 virtual void SetExtraBroadcast(bool broadcast) { m_ExtraBroascast = broadcast; }
1523
1524 @@ -123,9 +123,9 @@ class PLT_DeviceHost : public PLT_DeviceData,
1525 @param context the context of the request
1526 @param response the response to set up
1527 */
1528 - virtual NPT_Result SetupResponse(NPT_HttpRequest& request,
1529 + NPT_Result SetupResponse(NPT_HttpRequest& request,
1530 const NPT_HttpRequestContext& context,
1531 - NPT_HttpResponse& response);
1532 + NPT_HttpResponse& response) override;
1533
1534 /**
1535 Static method similar to Announce.
1536 @@ -156,8 +156,8 @@ class PLT_DeviceHost : public PLT_DeviceData,
1537 @param request SSDP packet
1538 @param context the context of the request
1539 */
1540 - virtual NPT_Result OnSsdpPacket(const NPT_HttpRequest& request,
1541 - const NPT_HttpRequestContext& context);
1542 + NPT_Result OnSsdpPacket(const NPT_HttpRequest& request,
1543 + const NPT_HttpRequestContext& context) override;
1544
1545 /**
1546 Static method similar to SendSsdpSearchResponse.
1547 diff --git a/lib/libUPnP/Platinum/Source/Core/PltHttp.h b/lib/libUPnP/Platinum/Source/Core/PltHttp.h
1548 index fc3d1b55c0ff..00e2b9f570e3 100644
1549 --- a/lib/libUPnP/Platinum/Source/Core/PltHttp.h
1550 +++ b/lib/libUPnP/Platinum/Source/Core/PltHttp.h
1551 @@ -198,12 +198,12 @@ class PLT_HttpRequestHandler : public NPT_HttpRequestHandler
1552 public:
1553 PLT_HttpRequestHandler(NPT_HttpRequestHandler* delegate) :
1554 m_Delegate(delegate) {}
1555 - virtual ~PLT_HttpRequestHandler() {}
1556 + ~PLT_HttpRequestHandler() override {}
1557
1558 // NPT_HttpRequestHandler methods
1559 NPT_Result SetupResponse(NPT_HttpRequest& request,
1560 const NPT_HttpRequestContext& context,
1561 - NPT_HttpResponse& response) {
1562 + NPT_HttpResponse& response) override {
1563 return m_Delegate->SetupResponse(request, context, response);
1564 }
1565
1566 diff --git a/lib/libUPnP/Platinum/Source/Core/PltHttpClientTask.h b/lib/libUPnP/Platinum/Source/Core/PltHttpClientTask.h
1567 index 293c59207a5f..62ac723cd0d4 100644
1568 --- a/lib/libUPnP/Platinum/Source/Core/PltHttpClientTask.h
1569 +++ b/lib/libUPnP/Platinum/Source/Core/PltHttpClientTask.h
1570 @@ -62,15 +62,15 @@ friend class PLT_ThreadTask;
1571 public:
1572 PLT_HttpClientSocketTask(NPT_HttpRequest* request = NULL,
1573 bool wait_forever = false);
1574 - virtual ~PLT_HttpClientSocketTask();
1575 + ~PLT_HttpClientSocketTask() override;
1576
1577 virtual NPT_Result AddRequest(NPT_HttpRequest* request);
1578 virtual NPT_Result SetHttpClientConfig(const NPT_HttpClient::Config& config);
1579
1580 protected:
1581 // PLT_ThreadTask methods
1582 - virtual void DoAbort();
1583 - virtual void DoRun();
1584 + void DoAbort() override;
1585 + void DoRun() override;
1586
1587 virtual NPT_Result ProcessResponse(NPT_Result res,
1588 const NPT_HttpRequest& request,
1589 @@ -103,14 +103,14 @@ class PLT_HttpClientTask : public PLT_HttpClientSocketTask
1590 NPT_HTTP_PROTOCOL_1_1)),
1591 m_Data(data) {}
1592 protected:
1593 - virtual ~PLT_HttpClientTask<T>() {}
1594 + ~PLT_HttpClientTask<T>() override {}
1595
1596 protected:
1597 // PLT_HttpClientSocketTask method
1598 NPT_Result ProcessResponse(NPT_Result res,
1599 const NPT_HttpRequest& request,
1600 const NPT_HttpRequestContext& context,
1601 - NPT_HttpResponse* response) {
1602 + NPT_HttpResponse* response) override {
1603 return m_Data->ProcessResponse(res, request, context, response);
1604 }
1605
1606 diff --git a/lib/libUPnP/Platinum/Source/Core/PltHttpServer.h b/lib/libUPnP/Platinum/Source/Core/PltHttpServer.h
1607 index 562e141431ff..04c47fce03b5 100644
1608 --- a/lib/libUPnP/Platinum/Source/Core/PltHttpServer.h
1609 +++ b/lib/libUPnP/Platinum/Source/Core/PltHttpServer.h
1610 @@ -61,7 +61,7 @@ class PLT_HttpServer : public NPT_HttpRequestHandler,
1611 bool allow_random_port_on_bind_failure = false,
1612 NPT_Cardinal max_clients = 50,
1613 bool reuse_address = false);
1614 - virtual ~PLT_HttpServer();
1615 + ~PLT_HttpServer() override;
1616
1617 // class methods
1618 static NPT_Result ServeFile(const NPT_HttpRequest& request,
1619 @@ -75,9 +75,9 @@ class PLT_HttpServer : public NPT_HttpRequestHandler,
1620 const char* content_type);
1621
1622 // NPT_HttpRequestHandler methods
1623 - virtual NPT_Result SetupResponse(NPT_HttpRequest& request,
1624 + NPT_Result SetupResponse(NPT_HttpRequest& request,
1625 const NPT_HttpRequestContext& context,
1626 - NPT_HttpResponse& response);
1627 + NPT_HttpResponse& response) override;
1628
1629 // methods
1630 virtual NPT_Result Start();
1631 diff --git a/lib/libUPnP/Platinum/Source/Core/PltHttpServerTask.h b/lib/libUPnP/Platinum/Source/Core/PltHttpServerTask.h
1632 index 58b2a3fb761f..dc5cbd3ad859 100644
1633 --- a/lib/libUPnP/Platinum/Source/Core/PltHttpServerTask.h
1634 +++ b/lib/libUPnP/Platinum/Source/Core/PltHttpServerTask.h
1635 @@ -64,7 +64,7 @@ class PLT_HttpServerSocketTask : public PLT_ThreadTask
1636 PLT_HttpServerSocketTask(NPT_Socket* socket, bool stay_alive_forever = false);
1637
1638 protected:
1639 - virtual ~PLT_HttpServerSocketTask();
1640 + ~PLT_HttpServerSocketTask() override;
1641
1642 protected:
1643 // Request callback handler
1644 @@ -77,8 +77,8 @@ class PLT_HttpServerSocketTask : public PLT_ThreadTask
1645 virtual NPT_Result GetInfo(NPT_SocketInfo& info);
1646
1647 // PLT_ThreadTask methods
1648 - virtual void DoAbort() { if (m_Socket) m_Socket->Cancel(); }
1649 - virtual void DoRun();
1650 + void DoAbort() override { if (m_Socket) m_Socket->Cancel(); }
1651 + void DoRun() override;
1652
1653 private:
1654 virtual NPT_Result Read(NPT_BufferedInputStreamReference& buffered_input_stream,
1655 @@ -117,11 +117,11 @@ class PLT_HttpServerTask : public PLT_HttpServerSocketTask
1656 PLT_HttpServerSocketTask(socket, keep_alive), m_Handler(handler) {}
1657
1658 protected:
1659 - virtual ~PLT_HttpServerTask() {}
1660 + ~PLT_HttpServerTask() override {}
1661
1662 NPT_Result SetupResponse(NPT_HttpRequest& request,
1663 const NPT_HttpRequestContext& context,
1664 - NPT_HttpResponse& response) {
1665 + NPT_HttpResponse& response) override {
1666 return m_Handler->SetupResponse(request, context, response);
1667 }
1668
1669 @@ -145,14 +145,14 @@ class PLT_HttpListenTask : public PLT_ThreadTask
1670 m_Handler(handler), m_Socket(socket), m_OwnsSocket(owns_socket) {}
1671
1672 protected:
1673 - virtual ~PLT_HttpListenTask() {
1674 + ~PLT_HttpListenTask() override {
1675 if (m_OwnsSocket && m_Socket) delete m_Socket;
1676 }
1677
1678 protected:
1679 // PLT_ThreadTask methods
1680 - virtual void DoAbort() { if (m_Socket) m_Socket->Cancel(); }
1681 - virtual void DoRun();
1682 + void DoAbort() override { if (m_Socket) m_Socket->Cancel(); }
1683 + void DoRun() override;
1684
1685 protected:
1686 NPT_HttpRequestHandler* m_Handler;
1687 diff --git a/lib/libUPnP/Platinum/Source/Core/PltService.h b/lib/libUPnP/Platinum/Source/Core/PltService.h
1688 index 0401ea287e00..ebca19542c67 100644
1689 --- a/lib/libUPnP/Platinum/Source/Core/PltService.h
1690 +++ b/lib/libUPnP/Platinum/Source/Core/PltService.h
1691 @@ -293,7 +293,7 @@ class PLT_Service
1692 public:
1693 PLT_ServiceEventTask(PLT_Service* service) : m_Service(service) {}
1694
1695 - void DoRun() {
1696 + void DoRun() override {
1697 while (!IsAborting(100)) m_Service->NotifyChanged();
1698 }
1699
1700 diff --git a/lib/libUPnP/Platinum/Source/Core/PltSsdp.h b/lib/libUPnP/Platinum/Source/Core/PltSsdp.h
1701 index 21015e53b160..0bbbd75952ca 100644
1702 --- a/lib/libUPnP/Platinum/Source/Core/PltSsdp.h
1703 +++ b/lib/libUPnP/Platinum/Source/Core/PltSsdp.h
1704 @@ -162,10 +162,10 @@ class PLT_SsdpDeviceSearchResponseTask : public PLT_ThreadTask
1705 m_Device(device), m_RemoteAddr(remote_addr), m_ST(st) {}
1706
1707 protected:
1708 - virtual ~PLT_SsdpDeviceSearchResponseTask() {}
1709 + ~PLT_SsdpDeviceSearchResponseTask() override {}
1710
1711 // PLT_ThreadTask methods
1712 - virtual void DoRun();
1713 + void DoRun() override;
1714
1715 protected:
1716 PLT_DeviceHost* m_Device;
1717 @@ -240,10 +240,10 @@ class PLT_SsdpDeviceAnnounceTask : public PLT_ThreadTask
1718 m_ExtraBroadcast(extra_broadcast) {}
1719
1720 protected:
1721 - virtual ~PLT_SsdpDeviceAnnounceTask() {}
1722 + ~PLT_SsdpDeviceAnnounceTask() override {}
1723
1724 // PLT_ThreadTask methods
1725 - virtual void DoRun();
1726 + void DoRun() override;
1727
1728 protected:
1729 PLT_DeviceHost* m_Device;
1730 @@ -333,17 +333,17 @@ class PLT_SsdpListenTask : public PLT_HttpServerSocketTask
1731 }
1732
1733 // PLT_Task methods
1734 - void DoAbort();
1735 + void DoAbort() override;
1736
1737 protected:
1738 - virtual ~PLT_SsdpListenTask() {}
1739 + ~PLT_SsdpListenTask() override {}
1740
1741 // PLT_HttpServerSocketTask methods
1742 - NPT_Result GetInputStream(NPT_InputStreamReference& stream);
1743 - NPT_Result GetInfo(NPT_SocketInfo& info);
1744 + NPT_Result GetInputStream(NPT_InputStreamReference& stream) override;
1745 + NPT_Result GetInfo(NPT_SocketInfo& info) override;
1746 NPT_Result SetupResponse(NPT_HttpRequest& request,
1747 const NPT_HttpRequestContext& context,
1748 - NPT_HttpResponse& response);
1749 + NPT_HttpResponse& response) override;
1750
1751 protected:
1752 PLT_InputDatagramStreamReference m_Datagram;
1753 @@ -367,11 +367,11 @@ class PLT_SsdpSearchTask : public PLT_ThreadTask
1754 NPT_TimeInterval frequency = NPT_TimeInterval(0.)); // pass 0 for one time
1755
1756 protected:
1757 - virtual ~PLT_SsdpSearchTask();
1758 + ~PLT_SsdpSearchTask() override;
1759
1760 // PLT_ThreadTask methods
1761 - virtual void DoAbort();
1762 - virtual void DoRun();
1763 + void DoAbort() override;
1764 + void DoRun() override;
1765
1766 virtual NPT_Result ProcessResponse(NPT_Result res,
1767 const NPT_HttpRequest& request,
1768 diff --git a/lib/libUPnP/Platinum/Source/Core/PltThreadTask.h b/lib/libUPnP/Platinum/Source/Core/PltThreadTask.h
1769 index 8315999c8e15..49bda3d24d7b 100644
1770 --- a/lib/libUPnP/Platinum/Source/Core/PltThreadTask.h
1771 +++ b/lib/libUPnP/Platinum/Source/Core/PltThreadTask.h
1772 @@ -116,13 +116,13 @@ class PLT_ThreadTask : public NPT_Runnable
1773 The task manager will destroy the task when finished if m_AutoDestroy is
1774 true otherwise the owner of this task must use the Kill method.
1775 */
1776 - virtual ~PLT_ThreadTask();
1777 + ~PLT_ThreadTask() override;
1778
1779 private:
1780 NPT_Result StartThread();
1781
1782 // NPT_Thread methods
1783 - void Run();
1784 + void Run() override;
1785
1786 protected:
1787 // members
1788 diff --git a/lib/libUPnP/Platinum/Source/Devices/MediaConnect/PltMediaConnect.h b/lib/libUPnP/Platinum/Source/Devices/MediaConnect/PltMediaConnect.h
1789 index c9ada4174175..b628d9b11112 100644
1790 --- a/lib/libUPnP/Platinum/Source/Devices/MediaConnect/PltMediaConnect.h
1791 +++ b/lib/libUPnP/Platinum/Source/Devices/MediaConnect/PltMediaConnect.h
1792 @@ -60,19 +60,19 @@ class PLT_MediaConnect : public PLT_MediaServer
1793 bool port_rebind = false);
1794
1795 protected:
1796 - virtual ~PLT_MediaConnect();
1797 + ~PLT_MediaConnect() override;
1798
1799 // PLT_DeviceHost methods
1800 - virtual NPT_Result SetupServices();
1801 - virtual NPT_Result OnAction(PLT_ActionReference& action,
1802 - const PLT_HttpRequestContext& context);
1803 - virtual NPT_Result ProcessGetDescription(NPT_HttpRequest& request,
1804 + NPT_Result SetupServices() override;
1805 + NPT_Result OnAction(PLT_ActionReference& action,
1806 + const PLT_HttpRequestContext& context) override;
1807 + NPT_Result ProcessGetDescription(NPT_HttpRequest& request,
1808 const NPT_HttpRequestContext& context,
1809 - NPT_HttpResponse& response);
1810 - virtual NPT_Result ProcessGetSCPD(PLT_Service* service,
1811 + NPT_HttpResponse& response) override;
1812 + NPT_Result ProcessGetSCPD(PLT_Service* service,
1813 NPT_HttpRequest& request,
1814 const NPT_HttpRequestContext& context,
1815 - NPT_HttpResponse& response);
1816 + NPT_HttpResponse& response) override;
1817
1818 // X_MS_MediaReceiverRegistrar
1819 virtual NPT_Result OnIsAuthorized(PLT_ActionReference& action);
1820 @@ -93,18 +93,18 @@ class PLT_FileMediaConnectDelegate : public PLT_FileMediaServerDelegate
1821 // constructor & destructor
1822 PLT_FileMediaConnectDelegate(const char* url_root, const char* file_root) :
1823 PLT_FileMediaServerDelegate(url_root, file_root) {}
1824 - virtual ~PLT_FileMediaConnectDelegate() {}
1825 + ~PLT_FileMediaConnectDelegate() override {}
1826
1827 // PLT_FileMediaServerDelegate methods
1828 - virtual NPT_Result GetFilePath(const char* object_id, NPT_String& filepath);
1829 - virtual NPT_Result OnSearchContainer(PLT_ActionReference& action,
1830 + NPT_Result GetFilePath(const char* object_id, NPT_String& filepath) override;
1831 + NPT_Result OnSearchContainer(PLT_ActionReference& action,
1832 const char* object_id,
1833 const char* search_criteria,
1834 const char* filter,
1835 NPT_UInt32 starting_index,
1836 NPT_UInt32 requested_count,
1837 const char* sort_criteria,
1838 - const PLT_HttpRequestContext& context);
1839 + const PLT_HttpRequestContext& context) override;
1840 };
1841
1842 #endif /* _PLT_MEDIA_CONNECT_H_ */
1843 diff --git a/lib/libUPnP/Platinum/Source/Devices/MediaConnect/PltXbox360.h b/lib/libUPnP/Platinum/Source/Devices/MediaConnect/PltXbox360.h
1844 index 6bae726213af..346ce57b40ae 100644
1845 --- a/lib/libUPnP/Platinum/Source/Devices/MediaConnect/PltXbox360.h
1846 +++ b/lib/libUPnP/Platinum/Source/Devices/MediaConnect/PltXbox360.h
1847 @@ -49,8 +49,8 @@ class PLT_Xbox360 : public PLT_MediaRenderer
1848
1849 protected:
1850 // PLT_DeviceHost methods
1851 - virtual NPT_Result SetupServices();
1852 - virtual NPT_Result SetupIcons();
1853 + NPT_Result SetupServices() override;
1854 + NPT_Result SetupIcons() override;
1855 virtual NPT_Result InitServiceURLs(PLT_Service* service, const char* service_name);
1856
1857 virtual NPT_Result Announce(PLT_DeviceData* device,
1858 @@ -59,12 +59,12 @@ class PLT_Xbox360 : public PLT_MediaRenderer
1859 PLT_SsdpAnnounceType type);
1860
1861 // PLT_DeviceData methods
1862 - virtual NPT_Result GetDescription(NPT_String& desc) { return PLT_MediaRenderer::GetDescription(desc); }
1863 - virtual NPT_Result GetDescription(NPT_XmlElementNode* parent,
1864 - NPT_XmlElementNode** device = NULL);
1865 + NPT_Result GetDescription(NPT_String& desc) override { return PLT_MediaRenderer::GetDescription(desc); }
1866 + NPT_Result GetDescription(NPT_XmlElementNode* parent,
1867 + NPT_XmlElementNode** device = NULL) override;
1868
1869 protected:
1870 - virtual ~PLT_Xbox360();
1871 + ~PLT_Xbox360() override;
1872
1873 virtual NPT_Result AnnouncePresence(NPT_UdpSocket& socket,
1874 const char* serial_number);
1875 diff --git a/lib/libUPnP/Platinum/Source/Devices/MediaRenderer/PltMediaController.h b/lib/libUPnP/Platinum/Source/Devices/MediaRenderer/PltMediaController.h
1876 index bfd909ca783f..743c94ff7481 100644
1877 --- a/lib/libUPnP/Platinum/Source/Devices/MediaRenderer/PltMediaController.h
1878 +++ b/lib/libUPnP/Platinum/Source/Devices/MediaRenderer/PltMediaController.h
1879 @@ -245,7 +245,7 @@ class PLT_MediaController : public PLT_CtrlPointListener
1880 public:
1881 PLT_MediaController(PLT_CtrlPointReference& ctrl_point,
1882 PLT_MediaControllerDelegate* delegate = NULL);
1883 - virtual ~PLT_MediaController();
1884 + ~PLT_MediaController() override;
1885
1886 // public methods
1887 virtual void SetDelegate(PLT_MediaControllerDelegate* delegate) {
1888 @@ -253,10 +253,10 @@ class PLT_MediaController : public PLT_CtrlPointListener
1889 }
1890
1891 // PLT_CtrlPointListener methods
1892 - virtual NPT_Result OnDeviceAdded(PLT_DeviceDataReference& device);
1893 - virtual NPT_Result OnDeviceRemoved(PLT_DeviceDataReference& device);
1894 - virtual NPT_Result OnActionResponse(NPT_Result res, PLT_ActionReference& action, void* userdata);
1895 - virtual NPT_Result OnEventNotify(PLT_Service* service, NPT_List<PLT_StateVariable*>* vars);
1896 + NPT_Result OnDeviceAdded(PLT_DeviceDataReference& device) override;
1897 + NPT_Result OnDeviceRemoved(PLT_DeviceDataReference& device) override;
1898 + NPT_Result OnActionResponse(NPT_Result res, PLT_ActionReference& action, void* userdata) override;
1899 + NPT_Result OnEventNotify(PLT_Service* service, NPT_List<PLT_StateVariable*>* vars) override;
1900
1901 // AVTransport
1902 NPT_Result GetCurrentTransportActions(PLT_DeviceDataReference& device, NPT_UInt32 instance_id, void* userdata);
1903 diff --git a/lib/libUPnP/Platinum/Source/Devices/MediaRenderer/PltMediaRenderer.h b/lib/libUPnP/Platinum/Source/Devices/MediaRenderer/PltMediaRenderer.h
1904 index bc0ac327fae0..ec30a36daaf2 100644
1905 --- a/lib/libUPnP/Platinum/Source/Devices/MediaRenderer/PltMediaRenderer.h
1906 +++ b/lib/libUPnP/Platinum/Source/Devices/MediaRenderer/PltMediaRenderer.h
1907 @@ -84,12 +84,12 @@ class PLT_MediaRenderer : public PLT_DeviceHost
1908 virtual void SetDelegate(PLT_MediaRendererDelegate* delegate) { m_Delegate = delegate; }
1909
1910 // PLT_DeviceHost methods
1911 - virtual NPT_Result SetupServices();
1912 - virtual NPT_Result OnAction(PLT_ActionReference& action,
1913 - const PLT_HttpRequestContext& context);
1914 + NPT_Result SetupServices() override;
1915 + NPT_Result OnAction(PLT_ActionReference& action,
1916 + const PLT_HttpRequestContext& context) override;
1917
1918 protected:
1919 - virtual ~PLT_MediaRenderer();
1920 + ~PLT_MediaRenderer() override;
1921
1922 // PLT_MediaRendererInterface methods
1923 // ConnectionManager
1924 diff --git a/lib/libUPnP/Platinum/Source/Devices/MediaServer/PltFileMediaServer.h b/lib/libUPnP/Platinum/Source/Devices/MediaServer/PltFileMediaServer.h
1925 index 49ff9d8ab68c..fa4b5e426a36 100644
1926 --- a/lib/libUPnP/Platinum/Source/Devices/MediaServer/PltFileMediaServer.h
1927 +++ b/lib/libUPnP/Platinum/Source/Devices/MediaServer/PltFileMediaServer.h
1928 @@ -63,35 +63,35 @@ class PLT_FileMediaServerDelegate : public PLT_MediaServerDelegate
1929 const char* file_path);
1930 // constructor & destructor
1931 PLT_FileMediaServerDelegate(const char* url_root, const char* file_root, bool use_cache = false);
1932 - virtual ~PLT_FileMediaServerDelegate();
1933 + ~PLT_FileMediaServerDelegate() override;
1934
1935 protected:
1936 // PLT_MediaServerDelegate methods
1937 - virtual NPT_Result OnBrowseMetadata(PLT_ActionReference& action,
1938 + NPT_Result OnBrowseMetadata(PLT_ActionReference& action,
1939 const char* object_id,
1940 const char* filter,
1941 NPT_UInt32 starting_index,
1942 NPT_UInt32 requested_count,
1943 const char* sort_criteria,
1944 - const PLT_HttpRequestContext& context);
1945 - virtual NPT_Result OnBrowseDirectChildren(PLT_ActionReference& action,
1946 + const PLT_HttpRequestContext& context) override;
1947 + NPT_Result OnBrowseDirectChildren(PLT_ActionReference& action,
1948 const char* object_id,
1949 const char* filter,
1950 NPT_UInt32 starting_index,
1951 NPT_UInt32 requested_count,
1952 const char* sort_criteria,
1953 - const PLT_HttpRequestContext& context);
1954 - virtual NPT_Result OnSearchContainer(PLT_ActionReference& action,
1955 + const PLT_HttpRequestContext& context) override;
1956 + NPT_Result OnSearchContainer(PLT_ActionReference& action,
1957 const char* object_id,
1958 const char* search_criteria,
1959 const char* filter,
1960 NPT_UInt32 starting_index,
1961 NPT_UInt32 requested_count,
1962 const char* sort_criteria,
1963 - const PLT_HttpRequestContext& context);
1964 - virtual NPT_Result ProcessFileRequest(NPT_HttpRequest& request,
1965 + const PLT_HttpRequestContext& context) override;
1966 + NPT_Result ProcessFileRequest(NPT_HttpRequest& request,
1967 const NPT_HttpRequestContext& context,
1968 - NPT_HttpResponse& response);
1969 + NPT_HttpResponse& response) override;
1970
1971 // overridable methods
1972 virtual NPT_Result ExtractResourcePath(const NPT_HttpUrl& url, NPT_String& file_path);
1973 @@ -145,7 +145,7 @@ class PLT_FileMediaServer : public PLT_MediaServer,
1974 PLT_FileMediaServerDelegate("/", file_root) {SetDelegate(this);}
1975
1976 protected:
1977 - virtual ~PLT_FileMediaServer() {}
1978 + ~PLT_FileMediaServer() override {}
1979 };
1980
1981 #endif /* _PLT_FILE_MEDIA_SERVER_H_ */
1982 diff --git a/lib/libUPnP/Platinum/Source/Devices/MediaServer/PltMediaBrowser.h b/lib/libUPnP/Platinum/Source/Devices/MediaServer/PltMediaBrowser.h
1983 index 41ed84ea3af4..2484dcc2b75c 100644
1984 --- a/lib/libUPnP/Platinum/Source/Devices/MediaServer/PltMediaBrowser.h
1985 +++ b/lib/libUPnP/Platinum/Source/Devices/MediaServer/PltMediaBrowser.h
1986 @@ -116,7 +116,7 @@ class PLT_MediaBrowser : public PLT_CtrlPointListener
1987 public:
1988 PLT_MediaBrowser(PLT_CtrlPointReference& ctrl_point,
1989 PLT_MediaBrowserDelegate* delegate = NULL);
1990 - virtual ~PLT_MediaBrowser();
1991 + ~PLT_MediaBrowser() override;
1992
1993 // ContentDirectory service
1994 virtual NPT_Result Browse(PLT_DeviceDataReference& device,
1995 @@ -149,10 +149,10 @@ class PLT_MediaBrowser : public PLT_CtrlPointListener
1996
1997 protected:
1998 // PLT_CtrlPointListener methods
1999 - virtual NPT_Result OnDeviceAdded(PLT_DeviceDataReference& device);
2000 - virtual NPT_Result OnDeviceRemoved(PLT_DeviceDataReference& device);
2001 - virtual NPT_Result OnActionResponse(NPT_Result res, PLT_ActionReference& action, void* userdata);
2002 - virtual NPT_Result OnEventNotify(PLT_Service* service, NPT_List<PLT_StateVariable*>* vars);
2003 + NPT_Result OnDeviceAdded(PLT_DeviceDataReference& device) override;
2004 + NPT_Result OnDeviceRemoved(PLT_DeviceDataReference& device) override;
2005 + NPT_Result OnActionResponse(NPT_Result res, PLT_ActionReference& action, void* userdata) override;
2006 + NPT_Result OnEventNotify(PLT_Service* service, NPT_List<PLT_StateVariable*>* vars) override;
2007
2008 // ContentDirectory service responses
2009 virtual NPT_Result OnBrowseResponse(NPT_Result res,
2010 diff --git a/lib/libUPnP/Platinum/Source/Devices/MediaServer/PltMediaItem.h b/lib/libUPnP/Platinum/Source/Devices/MediaServer/PltMediaItem.h
2011 index 65022976053b..3a13967f5f9b 100644
2012 --- a/lib/libUPnP/Platinum/Source/Devices/MediaServer/PltMediaItem.h
2013 +++ b/lib/libUPnP/Platinum/Source/Devices/MediaServer/PltMediaItem.h
2014 @@ -285,12 +285,12 @@ class PLT_MediaItem : public PLT_MediaObject
2015 NPT_IMPLEMENT_DYNAMIC_CAST_D(PLT_MediaItem, PLT_MediaObject)
2016
2017 PLT_MediaItem();
2018 - virtual ~PLT_MediaItem();
2019 + ~PLT_MediaItem() override;
2020
2021 // PLT_MediaObject methods
2022 - NPT_Result ToDidl(const NPT_String& filter, NPT_String& didl);
2023 - NPT_Result ToDidl(NPT_UInt64 mask, NPT_String& didl);
2024 - NPT_Result FromDidl(NPT_XmlElementNode* entry);
2025 + NPT_Result ToDidl(const NPT_String& filter, NPT_String& didl) override;
2026 + NPT_Result ToDidl(NPT_UInt64 mask, NPT_String& didl) override;
2027 + NPT_Result FromDidl(NPT_XmlElementNode* entry) override;
2028 };
2029
2030 /*----------------------------------------------------------------------
2031 @@ -307,13 +307,13 @@ class PLT_MediaContainer : public PLT_MediaObject
2032 NPT_IMPLEMENT_DYNAMIC_CAST_D(PLT_MediaContainer, PLT_MediaObject)
2033
2034 PLT_MediaContainer();
2035 - virtual ~PLT_MediaContainer();
2036 + ~PLT_MediaContainer() override;
2037
2038 // PLT_MediaObject methods
2039 - NPT_Result Reset();
2040 - NPT_Result ToDidl(const NPT_String& filter, NPT_String& didl);
2041 - NPT_Result ToDidl(NPT_UInt64 mask, NPT_String& didl);
2042 - NPT_Result FromDidl(NPT_XmlElementNode* entry);
2043 + NPT_Result Reset() override;
2044 + NPT_Result ToDidl(const NPT_String& filter, NPT_String& didl) override;
2045 + NPT_Result ToDidl(NPT_UInt64 mask, NPT_String& didl) override;
2046 + NPT_Result FromDidl(NPT_XmlElementNode* entry) override;
2047
2048 public:
2049 NPT_List<PLT_SearchClass> m_SearchClasses;
2050 diff --git a/lib/libUPnP/Platinum/Source/Devices/MediaServer/PltMediaServer.h b/lib/libUPnP/Platinum/Source/Devices/MediaServer/PltMediaServer.h
2051 index 6af8aa183a26..d35d8d894eeb 100644
2052 --- a/lib/libUPnP/Platinum/Source/Devices/MediaServer/PltMediaServer.h
2053 +++ b/lib/libUPnP/Platinum/Source/Devices/MediaServer/PltMediaServer.h
2054 @@ -133,15 +133,15 @@ class PLT_MediaServer : public PLT_DeviceHost
2055 virtual void UpdateContainerUpdateID(const char* id, NPT_UInt32 update);
2056
2057 protected:
2058 - virtual ~PLT_MediaServer();
2059 + ~PLT_MediaServer() override;
2060
2061 // PLT_DeviceHost methods
2062 - virtual NPT_Result SetupServices();
2063 - virtual NPT_Result OnAction(PLT_ActionReference& action,
2064 - const PLT_HttpRequestContext& context);
2065 - virtual NPT_Result ProcessHttpGetRequest(NPT_HttpRequest& request,
2066 + NPT_Result SetupServices() override;
2067 + NPT_Result OnAction(PLT_ActionReference& action,
2068 + const PLT_HttpRequestContext& context) override;
2069 + NPT_Result ProcessHttpGetRequest(NPT_HttpRequest& request,
2070 const NPT_HttpRequestContext& context,
2071 - NPT_HttpResponse& response);
2072 + NPT_HttpResponse& response) override;
2073
2074 // ConnectionManager
2075 virtual NPT_Result OnGetCurrentConnectionIDs(PLT_ActionReference& action,
2076 diff --git a/lib/libUPnP/Platinum/Source/Devices/MediaServer/PltSyncMediaBrowser.h b/lib/libUPnP/Platinum/Source/Devices/MediaServer/PltSyncMediaBrowser.h
2077 index 1493a50fc4a7..6da21cb18a3e 100644
2078 --- a/lib/libUPnP/Platinum/Source/Devices/MediaServer/PltSyncMediaBrowser.h
2079 +++ b/lib/libUPnP/Platinum/Source/Devices/MediaServer/PltSyncMediaBrowser.h
2080 @@ -94,31 +94,31 @@ class PLT_SyncMediaBrowser : public PLT_MediaBrowser,
2081 PLT_SyncMediaBrowser(PLT_CtrlPointReference& ctrlPoint,
2082 bool use_cache = false,
2083 PLT_MediaContainerChangesListener* listener = NULL);
2084 - virtual ~PLT_SyncMediaBrowser();
2085 + ~PLT_SyncMediaBrowser() override;
2086
2087 // PLT_MediaBrowser methods
2088 - virtual NPT_Result OnDeviceAdded(PLT_DeviceDataReference& device);
2089 - virtual NPT_Result OnDeviceRemoved(PLT_DeviceDataReference& device);
2090 + NPT_Result OnDeviceAdded(PLT_DeviceDataReference& device) override;
2091 + NPT_Result OnDeviceRemoved(PLT_DeviceDataReference& device) override;
2092
2093 // PLT_MediaBrowserDelegate methods
2094 - virtual void OnMSStateVariablesChanged(PLT_Service* service,
2095 - NPT_List<PLT_StateVariable*>* vars);
2096 - virtual void OnBrowseResult(NPT_Result res,
2097 + void OnMSStateVariablesChanged(PLT_Service* service,
2098 + NPT_List<PLT_StateVariable*>* vars) override;
2099 + void OnBrowseResult(NPT_Result res,
2100 PLT_DeviceDataReference& device,
2101 PLT_BrowseInfo* info,
2102 - void* userdata);
2103 - virtual void OnSearchResult(NPT_Result res,
2104 + void* userdata) override;
2105 + void OnSearchResult(NPT_Result res,
2106 PLT_DeviceDataReference& device,
2107 PLT_BrowseInfo* info,
2108 - void* userdata);
2109 - virtual void OnGetSearchCapabilitiesResult(NPT_Result res,
2110 + void* userdata) override;
2111 + void OnGetSearchCapabilitiesResult(NPT_Result res,
2112 PLT_DeviceDataReference& device,
2113 NPT_String searchCapabilities,
2114 - void* userdata);
2115 - virtual void OnGetSortCapabilitiesResult(NPT_Result res,
2116 + void* userdata) override;
2117 + void OnGetSortCapabilitiesResult(NPT_Result res,
2118 PLT_DeviceDataReference& device,
2119 NPT_String sortCapabilities,
2120 - void* userdata);
2121 + void* userdata) override;
2122
2123 // methods
2124 void SetContainerListener(PLT_MediaContainerChangesListener* listener) {
2125 diff --git a/lib/libUPnP/Platinum/Source/Extras/PltDownloader.h b/lib/libUPnP/Platinum/Source/Extras/PltDownloader.h
2126 index 9581ec293550..15d9279ba5bf 100644
2127 --- a/lib/libUPnP/Platinum/Source/Extras/PltDownloader.h
2128 +++ b/lib/libUPnP/Platinum/Source/Extras/PltDownloader.h
2129 @@ -65,7 +65,7 @@ class PLT_Downloader : public PLT_HttpClientSocketTask
2130 public:
2131 PLT_Downloader(NPT_HttpUrl& url,
2132 NPT_OutputStreamReference& output);
2133 - virtual ~PLT_Downloader();
2134 + ~PLT_Downloader() override;
2135
2136 Plt_DowloaderState GetState() { return m_State; }
2137
2138 @@ -73,11 +73,11 @@ class PLT_Downloader : public PLT_HttpClientSocketTask
2139 NPT_Result ProcessResponse(NPT_Result res,
2140 const NPT_HttpRequest& request,
2141 const NPT_HttpRequestContext& context,
2142 - NPT_HttpResponse* response);
2143 + NPT_HttpResponse* response) override;
2144
2145 protected:
2146 - virtual void DoRun();
2147 - virtual void DoAbort();
2148 + void DoRun() override;
2149 + void DoAbort() override;
2150
2151 private:
2152 // members
2153 diff --git a/lib/libUPnP/Platinum/Source/Extras/PltFrameServer.h b/lib/libUPnP/Platinum/Source/Extras/PltFrameServer.h
2154 index 62a730a09efa..e5c119258317 100644
2155 --- a/lib/libUPnP/Platinum/Source/Extras/PltFrameServer.h
2156 +++ b/lib/libUPnP/Platinum/Source/Extras/PltFrameServer.h
2157 @@ -71,9 +71,9 @@ class PLT_HttpStreamRequestHandler : public NPT_HttpRequestHandler
2158 m_StreamValidator(stream_validator) {}
2159
2160 // NPT_HttpRequestHandler methods
2161 - virtual NPT_Result SetupResponse(NPT_HttpRequest& request,
2162 + NPT_Result SetupResponse(NPT_HttpRequest& request,
2163 const NPT_HttpRequestContext& context,
2164 - NPT_HttpResponse& response);
2165 + NPT_HttpResponse& response) override;
2166
2167 private:
2168 PLT_StreamValidator& m_StreamValidator;
2169 @@ -90,9 +90,9 @@ class PLT_FrameServer : public PLT_HttpServer
2170 NPT_IpAddress address = NPT_IpAddress::Any,
2171 NPT_UInt16 port = 0,
2172 bool policy_server_enabled = false);
2173 - virtual ~PLT_FrameServer();
2174 + ~PLT_FrameServer() override;
2175
2176 - virtual NPT_Result Start();
2177 + NPT_Result Start() override;
2178
2179 protected:
2180 PLT_SocketPolicyServer* m_PolicyServer;
2181 diff --git a/lib/libUPnP/Platinum/Source/Extras/PltFrameStream.h b/lib/libUPnP/Platinum/Source/Extras/PltFrameStream.h
2182 index 0eda3c3bdae7..6d6deb8681c6 100644
2183 --- a/lib/libUPnP/Platinum/Source/Extras/PltFrameStream.h
2184 +++ b/lib/libUPnP/Platinum/Source/Extras/PltFrameStream.h
2185 @@ -50,18 +50,18 @@ class PLT_InputFrameStream : public NPT_InputStream
2186 // methods
2187 PLT_InputFrameStream(NPT_Reference<PLT_FrameBuffer>& frame_buffer,
2188 const char* boundary);
2189 - virtual ~PLT_InputFrameStream();
2190 + ~PLT_InputFrameStream() override;
2191
2192 // NPT_InputStream methods
2193 NPT_Result Read(void* buffer,
2194 NPT_Size bytes_to_read,
2195 - NPT_Size* bytes_read = 0);
2196 + NPT_Size* bytes_read = 0) override;
2197
2198 - NPT_Result Seek(NPT_Position offset) { NPT_COMPILER_UNUSED(offset); return NPT_FAILURE; }
2199 - NPT_Result Skip(NPT_Size offset) { NPT_COMPILER_UNUSED(offset); return NPT_FAILURE; }
2200 - NPT_Result Tell(NPT_Position& offset) { NPT_COMPILER_UNUSED(offset); return NPT_FAILURE; }
2201 - NPT_Result GetSize(NPT_LargeSize& size) { NPT_COMPILER_UNUSED(size); return NPT_FAILURE; }
2202 - NPT_Result GetAvailable(NPT_LargeSize& available);
2203 + NPT_Result Seek(NPT_Position offset) override { NPT_COMPILER_UNUSED(offset); return NPT_FAILURE; }
2204 + NPT_Result Skip(NPT_Size offset) override { NPT_COMPILER_UNUSED(offset); return NPT_FAILURE; }
2205 + NPT_Result Tell(NPT_Position& offset) override { NPT_COMPILER_UNUSED(offset); return NPT_FAILURE; }
2206 + NPT_Result GetSize(NPT_LargeSize& size) override { NPT_COMPILER_UNUSED(size); return NPT_FAILURE; }
2207 + NPT_Result GetAvailable(NPT_LargeSize& available) override;
2208
2209 private:
2210 NPT_Result FillBuffer();
2211 diff --git a/lib/libUPnP/Platinum/Source/Extras/PltRingBufferStream.h b/lib/libUPnP/Platinum/Source/Extras/PltRingBufferStream.h
2212 index d8ecd11d8eca..e5f98b2f350f 100644
2213 --- a/lib/libUPnP/Platinum/Source/Extras/PltRingBufferStream.h
2214 +++ b/lib/libUPnP/Platinum/Source/Extras/PltRingBufferStream.h
2215 @@ -49,7 +49,7 @@ class PLT_RingBufferStream : public NPT_DelegatingInputStream,
2216 public:
2217 PLT_RingBufferStream(NPT_Size buffer_size = 4096, bool blocking = true);
2218 PLT_RingBufferStream(NPT_RingBufferReference& buffer, bool blocking = true);
2219 - virtual ~PLT_RingBufferStream();
2220 + ~PLT_RingBufferStream() override;
2221
2222 // methods
2223 bool IsAborted() { return m_Aborted; }
2224 @@ -57,8 +57,8 @@ class PLT_RingBufferStream : public NPT_DelegatingInputStream,
2225 // NPT_InputStream methods
2226 NPT_Result Read(void* buffer,
2227 NPT_Size bytes_to_read,
2228 - NPT_Size* bytes_read = NULL);
2229 - NPT_Result GetSize(NPT_LargeSize& size) {
2230 + NPT_Size* bytes_read = NULL) override;
2231 + NPT_Result GetSize(NPT_LargeSize& size) override {
2232 NPT_COMPILER_UNUSED(size);
2233 return NPT_ERROR_NOT_SUPPORTED;
2234 }
2235 @@ -67,7 +67,7 @@ class PLT_RingBufferStream : public NPT_DelegatingInputStream,
2236 space = m_RingBuffer->GetSpace();
2237 return NPT_SUCCESS;
2238 }
2239 - NPT_Result GetAvailable(NPT_LargeSize& available) {
2240 + NPT_Result GetAvailable(NPT_LargeSize& available) override {
2241 NPT_AutoLock autoLock(m_Lock);
2242 available = m_RingBuffer->GetAvailable();
2243 return NPT_SUCCESS;
2244 @@ -76,29 +76,29 @@ class PLT_RingBufferStream : public NPT_DelegatingInputStream,
2245 // NPT_OutputStream methods
2246 NPT_Result Write(const void* buffer,
2247 NPT_Size bytes_to_write,
2248 - NPT_Size* bytes_written = NULL);
2249 - NPT_Result Flush();
2250 + NPT_Size* bytes_written = NULL) override;
2251 + NPT_Result Flush() override;
2252 NPT_Result SetEOS();
2253 NPT_Result Abort();
2254
2255 protected:
2256 // NPT_DelegatingInputStream methods
2257 - NPT_Result InputSeek(NPT_Position offset) {
2258 + NPT_Result InputSeek(NPT_Position offset) override {
2259 NPT_COMPILER_UNUSED(offset);
2260 return NPT_ERROR_NOT_SUPPORTED;
2261 }
2262 - NPT_Result InputTell(NPT_Position& offset) {
2263 + NPT_Result InputTell(NPT_Position& offset) override {
2264 NPT_AutoLock autoLock(m_Lock);
2265 offset = m_TotalBytesRead;
2266 return NPT_SUCCESS;
2267 }
2268
2269 // NPT_DelegatingOutputStream methods
2270 - NPT_Result OutputSeek(NPT_Position offset) {
2271 + NPT_Result OutputSeek(NPT_Position offset) override {
2272 NPT_COMPILER_UNUSED(offset);
2273 return NPT_ERROR_NOT_SUPPORTED;
2274 }
2275 - NPT_Result OutputTell(NPT_Position& offset) {
2276 + NPT_Result OutputTell(NPT_Position& offset) override {
2277 NPT_AutoLock autoLock(m_Lock);
2278 offset = m_TotalBytesWritten;
2279 return NPT_SUCCESS;
2280 diff --git a/lib/libUPnP/Platinum/Source/Extras/PltStreamPump.h b/lib/libUPnP/Platinum/Source/Extras/PltStreamPump.h
2281 index 58ef256581a5..a022b88518e4 100644
2282 --- a/lib/libUPnP/Platinum/Source/Extras/PltStreamPump.h
2283 +++ b/lib/libUPnP/Platinum/Source/Extras/PltStreamPump.h
2284 @@ -98,9 +98,9 @@ class PLT_PipeInputStreamPump : public PLT_StreamPump,
2285 {
2286 public:
2287 PLT_PipeInputStreamPump(NPT_OutputStreamReference& output, NPT_Size size = 65535);
2288 - virtual ~PLT_PipeInputStreamPump();
2289 + ~PLT_PipeInputStreamPump() override;
2290
2291 - NPT_Result Receive(NPT_InputStream& input, NPT_Size max_bytes_to_read, NPT_Size* bytes_read);
2292 + NPT_Result Receive(NPT_InputStream& input, NPT_Size max_bytes_to_read, NPT_Size* bytes_read) override;
2293
2294 protected:
2295 NPT_OutputStreamReference m_Output;
2296 @@ -117,9 +117,9 @@ class PLT_PipeOutputStreamPump : public PLT_StreamPump,
2297 PLT_PipeOutputStreamPump(NPT_InputStreamReference& input,
2298 NPT_Size size = 65535,
2299 NPT_Size max_bytes_to_read = 0);
2300 - virtual ~PLT_PipeOutputStreamPump();
2301 + ~PLT_PipeOutputStreamPump() override;
2302
2303 - NPT_Result Transmit(NPT_OutputStream& output);
2304 + NPT_Result Transmit(NPT_OutputStream& output) override;
2305
2306 protected:
2307 NPT_InputStreamReference m_Input;
XBMC Media Center