Mercurial > hg > orthanc
changeset 1385:772c8507c68d query-retrieve
integration mainline->query-retrieve
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Fri, 29 May 2015 15:00:45 +0200 |
| parents | 5c11c4e728eb (current diff) d6971e18a324 (diff) |
| children | 72184773c62f |
| files | OrthancServer/OrthancRestApi/OrthancRestResources.cpp |
| diffstat | 4 files changed, 5 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/OrthancServer/DicomFindQuery.cpp Fri May 29 14:46:55 2015 +0200 +++ b/OrthancServer/DicomFindQuery.cpp Fri May 29 15:00:45 2015 +0200 @@ -205,7 +205,7 @@ DicomFindQuery::~DicomFindQuery() { for (Constraints::iterator it = constraints_.begin(); - it != constraints_.end(); it++) + it != constraints_.end(); ++it) { delete it->second; }
--- a/OrthancServer/OrthancRestApi/OrthancRestResources.cpp Fri May 29 14:46:55 2015 +0200 +++ b/OrthancServer/OrthancRestApi/OrthancRestResources.cpp Fri May 29 15:00:45 2015 +0200 @@ -53,7 +53,7 @@ Json::Value answer = Json::arrayValue; for (std::list<std::string>::const_iterator - resource = resources.begin(); resource != resources.end(); resource++) + resource = resources.begin(); resource != resources.end(); ++resource) { if (expand) {
--- a/OrthancServer/ResourceFinder.cpp Fri May 29 14:46:55 2015 +0200 +++ b/OrthancServer/ResourceFinder.cpp Fri May 29 15:00:45 2015 +0200 @@ -204,7 +204,7 @@ filtered_.clear(); for (std::list<std::string>::const_iterator - it = resources.begin(); it != resources.end(); it++) + it = resources.begin(); it != resources.end(); ++it) { DicomMap mainTags; if (index_.GetMainDicomTags(mainTags, *it, level_))
--- a/Plugins/Samples/ServeFolders/Plugin.cpp Fri May 29 14:46:55 2015 +0200 +++ b/Plugins/Samples/ServeFolders/Plugin.cpp Fri May 29 15:00:45 2015 +0200 @@ -222,7 +222,7 @@ std::string s = "<html><body><h1>Additional folders served by Orthanc</h1><ul>\n"; for (std::map<std::string, std::string>::const_iterator - it = folders_.begin(); it != folders_.end(); it++) + it = folders_.begin(); it != folders_.end(); ++it) { s += "<li><a href=\"" + it->first + "/index.html\">" + it->first + "</li>\n"; } @@ -270,7 +270,7 @@ // Register the callback for each base URI for (Json::Value::Members::const_iterator - it = members.begin(); it != members.end(); it++) + it = members.begin(); it != members.end(); ++it) { const std::string& baseUri = *it; const std::string path = configuration["ServeFolders"][*it].asString();