Mercurial > hg > orthanc-stone
diff Applications/Samples/SimpleViewerApplicationSingleFile.h @ 334:c34784e5f299 am-2
compatibility fixes
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Thu, 18 Oct 2018 09:02:24 +0200 |
parents | 7a364e44fbb4 |
children | c7fdc8bac581 |
line wrap: on
line diff
--- a/Applications/Samples/SimpleViewerApplicationSingleFile.h Wed Oct 17 19:42:56 2018 +0200 +++ b/Applications/Samples/SimpleViewerApplicationSingleFile.h Thu Oct 18 09:02:24 2018 +0200 @@ -212,22 +212,23 @@ Tools_CircleMeasure }; - Tools currentTool_; - std::unique_ptr<MainWidgetInteractor> mainWidgetInteractor_; - std::unique_ptr<ThumbnailInteractor> thumbnailInteractor_; - LayoutWidget* mainLayout_; - LayoutWidget* thumbnailsLayout_; - std::vector<LayerWidget*> thumbnails_; - std::map<std::string, std::vector<std::string>> instancesIdsPerSeriesId_; + Tools currentTool_; + std::auto_ptr<MainWidgetInteractor> mainWidgetInteractor_; + std::auto_ptr<ThumbnailInteractor> thumbnailInteractor_; + LayoutWidget* mainLayout_; + LayoutWidget* thumbnailsLayout_; + std::vector<LayerWidget*> thumbnails_; + + std::map<std::string, std::vector<std::string> > instancesIdsPerSeriesId_; std::map<std::string, Json::Value> seriesTags_; - unsigned int currentInstanceIndex_; - OrthancStone::WidgetViewport* wasmViewport1_; - OrthancStone::WidgetViewport* wasmViewport2_; + unsigned int currentInstanceIndex_; + OrthancStone::WidgetViewport* wasmViewport1_; + OrthancStone::WidgetViewport* wasmViewport2_; - IStatusBar* statusBar_; - std::unique_ptr<SmartLoader> smartLoader_; - std::unique_ptr<OrthancApiClient> orthancApiClient_; + IStatusBar* statusBar_; + std::auto_ptr<SmartLoader> smartLoader_; + std::auto_ptr<OrthancApiClient> orthancApiClient_; public: SimpleViewerApplication(MessageBroker& broker) :