Mercurial > hg > orthanc

diff OrthancFramework/Sources/RestApi/RestApiCall.h @ 4330:a01b1c9cbef4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 bf7b9edf6b81
children 3af1d763763a
line wrap: on
line diff
--- a/OrthancFramework/Sources/RestApi/RestApiCall.h	Wed Nov 25 13:46:49 2020 +0100
+++ b/OrthancFramework/Sources/RestApi/RestApiCall.h	Wed Nov 25 14:39:10 2020 +0100
@@ -22,7 +22,6 @@
 
 #pragma once
 
-#include "../HttpServer/IHttpHandler.h"
 #include "../HttpServer/HttpToolbox.h"
 #include "RestApiPath.h"
 #include "RestApiOutput.h"
@@ -41,8 +40,8 @@
     RequestOrigin origin_;
     const char* remoteIp_;
     const char* username_;
-    const IHttpHandler::Arguments& httpHeaders_;
-    const IHttpHandler::Arguments& uriComponents_;
+    const HttpToolbox::Arguments& httpHeaders_;
+    const HttpToolbox::Arguments& uriComponents_;
     const UriComponents& trailing_;
     const UriComponents& fullUri_;
 
@@ -57,8 +56,8 @@
                 RequestOrigin origin,
                 const char* remoteIp,
                 const char* username,
-                const IHttpHandler::Arguments& httpHeaders,
-                const IHttpHandler::Arguments& uriComponents,
+                const HttpToolbox::Arguments& httpHeaders,
+                const HttpToolbox::Arguments& uriComponents,
                 const UriComponents& trailing,
                 const UriComponents& fullUri) :
       output_(output),
@@ -105,12 +104,12 @@
       return HttpToolbox::GetArgument(httpHeaders_, name, defaultValue);
     }
 
-    const IHttpHandler::Arguments& GetHttpHeaders() const
+    const HttpToolbox::Arguments& GetHttpHeaders() const
     {
       return httpHeaders_;
     }
 
-    void ParseCookies(IHttpHandler::Arguments& result) const
+    void ParseCookies(HttpToolbox::Arguments& result) const
     {
       HttpToolbox::ParseCookies(result, httpHeaders_);
     }