orthanc: OrthancServer/OrthancRestApi.cpp comparison

comparison OrthancServer/OrthancRestApi.cpp @ 656:08eca5d86aad

fixes to cppcheck

author	Sebastien Jodogne <s.jodogne@gmail.com>
date	Mon, 04 Nov 2013 11:19:31 +0100
parents	3a74026fc1b1
children	95b4c6d89c42

comparison

equal deleted inserted replaced

-:93adc693cc60
+:08eca5d86aad
 context.GetIndex().LogExportedResource(stripped, remote);
 std::list<std::string> tmp;
 context.GetIndex().GetChildInstances(tmp, stripped);
 instances.merge(tmp);
-assert(tmp.size() == 0);
+assert(tmp.empty());
 }
 }
 else
 {
 // Neither a string, nor a list of strings. Bad request.
 DicomUserConnection connection;
 ConnectToModalityUsingSymbolicName(connection, remote);
 for (std::list<std::string>::const_iterator
-it = instances.begin(); it != instances.end(); it++)
+it = instances.begin(); it != instances.end(); ++it)
 {
 LOG(INFO) << "Sending resource " << *it << " to modality \"" << remote << "\"";
 std::string dicom;
 context.ReadFile(dicom, *it, FileContentType_Dicom);
 {
 RETRIEVE_MODALITIES(call);
 Json::Value result = Json::arrayValue;
 for (OrthancRestApi::SetOfStrings::const_iterator
-it = modalities.begin(); it != modalities.end(); it++)
+it = modalities.begin(); it != modalities.end(); ++it)
 {
 result.append(*it);
 }
 call.GetOutput().AnswerJson(result);
 {
 toModify.RemovePrivateTags();
 }
 for (Removals::const_iterator it = removals.begin();
-it != removals.end(); it++)
+it != removals.end(); ++it)
 {
 toModify.Remove(*it);
 }
 for (Replacements::const_iterator it = replacements.begin();
-it != replacements.end(); it++)
+it != replacements.end(); ++it)
 {
 toModify.Replace(it->first, it->second, mode);
 }
 // A new SOP instance UID is automatically generated
 Removals toKeep;
 ParseRemovals(toKeep, keepPart);
 SetupAnonymization(removals, replacements);
-for (Removals::iterator it = toKeep.begin(); it != toKeep.end(); it++)
+for (Removals::iterator it = toKeep.begin(); it != toKeep.end(); ++it)
 {
 if (*it == DICOM_TAG_PATIENT_ID)
 {
 keepPatientId = true;
 }
 Removals additionalRemovals;
 ParseRemovals(additionalRemovals, removalsPart);
 for (Removals::iterator it = additionalRemovals.begin();
-it != additionalRemovals.end(); it++)
+it != additionalRemovals.end(); ++it)
 {
 removals.insert(*it);
 }
 ParseReplacements(replacements, replacementsPart);
 Instances instances;
 std::string id = call.GetUriComponent("id", "");
 context.GetIndex().GetChildInstances(instances, id);
-if (instances.size() == 0)
+if (instances.empty())
 {
 return;
 }
 /**
 * Loop over all the instances of the resource.
 **/
 UidMap uidMap;
 for (Instances::const_iterator it = instances.begin();
-it != instances.end(); it++)
+it != instances.end(); ++it)
 {
 LOG(INFO) << "Modifying instance " << *it;
 ParsedDicomFile& original = context.GetDicomFile(*it);
 DicomInstanceHasher originalHasher = original.GetHasher();
 if (context.GetIndex().ListAvailableMetadata(metadata, publicId))
 {
 Json::Value result = Json::arrayValue;
 for (std::list<MetadataType>::const_iterator
-it = metadata.begin(); it != metadata.end(); it++)
+it = metadata.begin(); it != metadata.end(); ++it)
 {
 result.append(EnumerationToString(*it));
 }
 call.GetOutput().AnswerJson(result);
 {
 RETRIEVE_PEERS(call);
 Json::Value result = Json::arrayValue;
 for (OrthancRestApi::SetOfStrings::const_iterator
-it = peers.begin(); it != peers.end(); it++)
+it = peers.begin(); it != peers.end(); ++it)
 {
 result.append(*it);
 }
 call.GetOutput().AnswerJson(result);
 client.SetUrl(url + "instances");
 client.SetMethod(HttpMethod_Post);
 // Loop over the instances that are to be sent
 for (std::list<std::string>::const_iterator
-it = instances.begin(); it != instances.end(); it++)
+it = instances.begin(); it != instances.end(); ++it)
 {
 LOG(INFO) << "Sending resource " << *it << " to peer \"" << remote << "\"";
 context.ReadFile(client.AccessPostData(), *it, FileContentType_Dicom);

Mercurial > hg > orthanc

comparison OrthancServer/OrthancRestApi.cpp @ 656:08eca5d86aad