Mercurial > hg > orthanc-stone
comparison Applications/Samples/SimpleViewerApplicationSingleFile.h @ 1298:8a0a62189f46
replacing std::auto_ptr by std::unique_ptr
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Mon, 02 Mar 2020 16:31:30 +0100 |
parents | 2d8ab34c8c91 |
children | 257f2c9a02ac |
comparison
equal
deleted
inserted
replaced
1296:86400fa16091 | 1298:8a0a62189f46 |
---|---|
237 Tool_LineMeasure, | 237 Tool_LineMeasure, |
238 Tool_CircleMeasure | 238 Tool_CircleMeasure |
239 }; | 239 }; |
240 | 240 |
241 Tool currentTool_; | 241 Tool currentTool_; |
242 std::auto_ptr<MainWidgetInteractor> mainWidgetInteractor_; | 242 std::unique_ptr<MainWidgetInteractor> mainWidgetInteractor_; |
243 std::auto_ptr<ThumbnailInteractor> thumbnailInteractor_; | 243 std::unique_ptr<ThumbnailInteractor> thumbnailInteractor_; |
244 Deprecated::LayoutWidget* mainLayout_; | 244 Deprecated::LayoutWidget* mainLayout_; |
245 Deprecated::LayoutWidget* thumbnailsLayout_; | 245 Deprecated::LayoutWidget* thumbnailsLayout_; |
246 std::vector<Deprecated::SliceViewerWidget*> thumbnails_; | 246 std::vector<Deprecated::SliceViewerWidget*> thumbnails_; |
247 | 247 |
248 std::map<std::string, std::vector<std::string> > instancesIdsPerSeriesId_; | 248 std::map<std::string, std::vector<std::string> > instancesIdsPerSeriesId_; |
251 unsigned int currentInstanceIndex_; | 251 unsigned int currentInstanceIndex_; |
252 Deprecated::WidgetViewport* wasmViewport1_; | 252 Deprecated::WidgetViewport* wasmViewport1_; |
253 Deprecated::WidgetViewport* wasmViewport2_; | 253 Deprecated::WidgetViewport* wasmViewport2_; |
254 | 254 |
255 Deprecated::IStatusBar* statusBar_; | 255 Deprecated::IStatusBar* statusBar_; |
256 std::auto_ptr<Deprecated::SmartLoader> smartLoader_; | 256 std::unique_ptr<Deprecated::SmartLoader> smartLoader_; |
257 | 257 |
258 Orthanc::Font font_; | 258 Orthanc::Font font_; |
259 | 259 |
260 public: | 260 public: |
261 SimpleViewerApplication(MessageBroker& broker) : | 261 SimpleViewerApplication(MessageBroker& broker) : |