comparison Applications/StoneApplicationContext.h @ 860:238693c3bc51 am-dev

merge default -> am-dev
author Alain Mazy <alain@mazy.be>
date Mon, 24 Jun 2019 14:35:00 +0200
parents c35e98d22764
children e146743f6cdc 2d8ab34c8c91
comparison
equal deleted inserted replaced
856:a6e17a5a39e7 860:238693c3bc51
19 **/ 19 **/
20 20
21 21
22 #pragma once 22 #pragma once
23 23
24 #include "../Framework/Toolbox/IWebService.h" 24 #include "../Framework/Deprecated/Toolbox/IWebService.h"
25 #include "../Framework/Toolbox/IDelayedCallExecutor.h" 25 #include "../Framework/Deprecated/Toolbox/IDelayedCallExecutor.h"
26 #include "../Framework/Toolbox/OrthancApiClient.h" 26 #include "../Framework/Deprecated/Toolbox/OrthancApiClient.h"
27 #include "../Framework/Viewport/WidgetViewport.h" 27 #include "../Framework/Deprecated/Viewport/WidgetViewport.h"
28 28
29 29
30 #ifdef _MSC_VER 30 #ifdef _MSC_VER
31 #if _MSC_VER > 1910 31 #if _MSC_VER > 1910
32 #define orthanc_override override 32 #define orthanc_override override