Mercurial > hg > orthanc
comparison Core/DicomNetworking/DicomUserConnection.cpp @ 3712:2a170a8f1faf
replacing std::auto_ptr by std::unique_ptr
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Mon, 02 Mar 2020 15:32:45 +0100 |
parents | 58f92b1c8061 |
children | 56f2397f027a c38b82bb6fd3 |
comparison
equal
deleted
inserted
replaced
3709:1f4910999fe7 | 3712:2a170a8f1faf |
---|---|
582 switch (manufacturer) | 582 switch (manufacturer) |
583 { | 583 { |
584 case ModalityManufacturer_GenericNoWildcardInDates: | 584 case ModalityManufacturer_GenericNoWildcardInDates: |
585 case ModalityManufacturer_GenericNoUniversalWildcard: | 585 case ModalityManufacturer_GenericNoUniversalWildcard: |
586 { | 586 { |
587 std::auto_ptr<DicomMap> fix(fields.Clone()); | 587 std::unique_ptr<DicomMap> fix(fields.Clone()); |
588 | 588 |
589 std::set<DicomTag> tags; | 589 std::set<DicomTag> tags; |
590 fix->GetTags(tags); | 590 fix->GetTags(tags); |
591 | 591 |
592 for (std::set<DicomTag>::const_iterator it = tags.begin(); it != tags.end(); ++it) | 592 for (std::set<DicomTag>::const_iterator it = tags.begin(); it != tags.end(); ++it) |
697 const DicomMap& originalFields, | 697 const DicomMap& originalFields, |
698 bool normalize) | 698 bool normalize) |
699 { | 699 { |
700 CheckIsOpen(); | 700 CheckIsOpen(); |
701 | 701 |
702 std::auto_ptr<ParsedDicomFile> query; | 702 std::unique_ptr<ParsedDicomFile> query; |
703 | 703 |
704 if (normalize) | 704 if (normalize) |
705 { | 705 { |
706 DicomMap fields; | 706 DicomMap fields; |
707 NormalizeFindQuery(fields, level, originalFields); | 707 NormalizeFindQuery(fields, level, originalFields); |
810 ResourceType level, | 810 ResourceType level, |
811 const DicomMap& fields) | 811 const DicomMap& fields) |
812 { | 812 { |
813 CheckIsOpen(); | 813 CheckIsOpen(); |
814 | 814 |
815 std::auto_ptr<ParsedDicomFile> query(ConvertQueryFields(fields, manufacturer_)); | 815 std::unique_ptr<ParsedDicomFile> query(ConvertQueryFields(fields, manufacturer_)); |
816 DcmDataset* dataset = query->GetDcmtkObject().getDataset(); | 816 DcmDataset* dataset = query->GetDcmtkObject().getDataset(); |
817 | 817 |
818 const char* sopClass = UID_MOVEStudyRootQueryRetrieveInformationModel; | 818 const char* sopClass = UID_MOVEStudyRootQueryRetrieveInformationModel; |
819 switch (level) | 819 switch (level) |
820 { | 820 { |