diff OrthancFramework/Sources/HttpServer/IHttpHandler.cpp @ 4330:a01b1c9cbef4

moving generic type definitions from IHttpHandler to HttpToolbox
author Sebastien Jodogne <s.jodogne@gmail.com>
date Wed, 25 Nov 2020 14:39:10 +0100
parents 9dc0e42f868b
children d9473bd5ed43
line wrap: on
line diff
--- a/OrthancFramework/Sources/HttpServer/IHttpHandler.cpp	Wed Nov 25 13:46:49 2020 +0100
+++ b/OrthancFramework/Sources/HttpServer/IHttpHandler.cpp	Wed Nov 25 14:39:10 2020 +0100
@@ -36,10 +36,10 @@
                                IHttpHandler& handler,
                                RequestOrigin origin,
                                const std::string& uri,
-                               const IHttpHandler::Arguments& httpHeaders)
+                               const HttpToolbox::Arguments& httpHeaders)
   {
     UriComponents curi;
-    IHttpHandler::GetArguments getArguments;
+    HttpToolbox::GetArguments getArguments;
     HttpToolbox::ParseGetQuery(curi, getArguments, uri.c_str());
 
     StringHttpOutput stream;
@@ -65,9 +65,9 @@
                               const std::string& uri,
                               const void* bodyData,
                               size_t bodySize,
-                              const IHttpHandler::Arguments& httpHeaders)
+                              const HttpToolbox::Arguments& httpHeaders)
   {
-    IHttpHandler::GetArguments getArguments;  // No GET argument for POST/PUT
+    HttpToolbox::GetArguments getArguments;  // No GET argument for POST/PUT
 
     UriComponents curi;
     Toolbox::SplitUriComponents(curi, uri);
@@ -94,7 +94,7 @@
                                 const std::string& uri,
                                 const void* bodyData,
                                 size_t bodySize,
-                                const IHttpHandler::Arguments& httpHeaders)
+                                const HttpToolbox::Arguments& httpHeaders)
   {
     return SimplePostOrPut(result, handler, origin, HttpMethod_Post, uri, bodyData, bodySize, httpHeaders);
   }
@@ -106,7 +106,7 @@
                                const std::string& uri,
                                const void* bodyData,
                                size_t bodySize,
-                               const IHttpHandler::Arguments& httpHeaders)
+                               const HttpToolbox::Arguments& httpHeaders)
   {
     return SimplePostOrPut(result, handler, origin, HttpMethod_Put, uri, bodyData, bodySize, httpHeaders);
   }
@@ -115,12 +115,12 @@
   bool IHttpHandler::SimpleDelete(IHttpHandler& handler,
                                   RequestOrigin origin,
                                   const std::string& uri,
-                                  const IHttpHandler::Arguments& httpHeaders)
+                                  const HttpToolbox::Arguments& httpHeaders)
   {
     UriComponents curi;
     Toolbox::SplitUriComponents(curi, uri);
 
-    IHttpHandler::GetArguments getArguments;  // No GET argument for DELETE
+    HttpToolbox::GetArguments getArguments;  // No GET argument for DELETE
 
     StringHttpOutput stream;
     HttpOutput http(stream, false /* no keep alive */);