comparison Applications/IStoneApplication.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 5d1b0d2f4b15 2d8ab34c8c91
comparison
equal deleted inserted replaced
856:a6e17a5a39e7 860:238693c3bc51
20 20
21 21
22 #pragma once 22 #pragma once
23 23
24 #include "StoneApplicationContext.h" 24 #include "StoneApplicationContext.h"
25 #include "../Framework/Deprecated/Viewport/WidgetViewport.h"
26
25 #include <boost/program_options.hpp> 27 #include <boost/program_options.hpp>
26 #include "../Framework/Viewport/WidgetViewport.h" 28 #include <json/json.h>
27 #include "json/json.h"
28 29
29 namespace OrthancStone 30 namespace OrthancStone
30 { 31 {
31 #if ORTHANC_ENABLE_QT==1 32 #if ORTHANC_ENABLE_QT==1
32 class QStoneMainWindow; 33 class QStoneMainWindow;