Mercurial > hg > orthanc-stone

comparison Applications/Samples/SimpleViewer/SimpleViewerApplication.h @ 1298:8a0a62189f46

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
comparison
equal deleted inserted replaced
1296:86400fa16091 1298:8a0a62189f46
79 }; 79 };
80 80
81 private: 81 private:
82 Tool currentTool_; 82 Tool currentTool_;
83 83
84 std::auto_ptr<MainWidgetInteractor> mainWidgetInteractor_; 84 std::unique_ptr<MainWidgetInteractor> mainWidgetInteractor_;
85 std::auto_ptr<ThumbnailInteractor> thumbnailInteractor_; 85 std::unique_ptr<ThumbnailInteractor> thumbnailInteractor_;
86 Deprecated::LayoutWidget* mainLayout_; 86 Deprecated::LayoutWidget* mainLayout_;
87 Deprecated::LayoutWidget* thumbnailsLayout_; 87 Deprecated::LayoutWidget* thumbnailsLayout_;
88 Deprecated::SliceViewerWidget* mainWidget_; 88 Deprecated::SliceViewerWidget* mainWidget_;
89 std::vector<Deprecated::SliceViewerWidget*> thumbnails_; 89 std::vector<Deprecated::SliceViewerWidget*> thumbnails_;
90 std::map<std::string, std::vector<std::string> > instancesIdsPerSeriesId_; 90 std::map<std::string, std::vector<std::string> > instancesIdsPerSeriesId_;
92 unsigned int currentInstanceIndex_; 92 unsigned int currentInstanceIndex_;
93 Deprecated::WidgetViewport* wasmViewport1_; 93 Deprecated::WidgetViewport* wasmViewport1_;
94 Deprecated::WidgetViewport* wasmViewport2_; 94 Deprecated::WidgetViewport* wasmViewport2_;
95 95
96 Deprecated::IStatusBar* statusBar_; 96 Deprecated::IStatusBar* statusBar_;
97 std::auto_ptr<Deprecated::SmartLoader> smartLoader_; 97 std::unique_ptr<Deprecated::SmartLoader> smartLoader_;
98 98
99 Orthanc::Font font_; 99 Orthanc::Font font_;
100 100
101 public: 101 public:
102 SimpleViewerApplication(MessageBroker& broker) : 102 SimpleViewerApplication(MessageBroker& broker) :