# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1354269689 -3600
# Node ID ae2367145b49b1a34574275fa251e6d20784ae10
# Parent  f2349bab5fe7544a894ee08bec565c68628f0ba4
renames

diff -r f2349bab5fe7 -r ae2367145b49 OrthancServer/OrthancRestApi.cpp
--- a/OrthancServer/OrthancRestApi.cpp	Fri Nov 30 11:00:40 2012 +0100
+++ b/OrthancServer/OrthancRestApi.cpp	Fri Nov 30 11:01:29 2012 +0100
@@ -30,7 +30,7 @@
  **/
 
 
-#include "OrthancRestApi2.h"
+#include "OrthancRestApi.h"
 
 #include "../Core/HttpServer/FilesystemHttpSender.h"
 #include "../Core/Uuid.h"
@@ -46,13 +46,13 @@
 
 
 #define RETRIEVE_CONTEXT(call)                          \
-  OrthancRestApi2& contextApi =                         \
-    dynamic_cast<OrthancRestApi2&>(call.GetContext());  \
+  OrthancRestApi& contextApi =                          \
+    dynamic_cast<OrthancRestApi&>(call.GetContext());   \
   ServerContext& context = contextApi.GetContext()
 
 #define RETRIEVE_MODALITIES(call)                                       \
-  const OrthancRestApi2::Modalities& modalities =                       \
-    dynamic_cast<OrthancRestApi2&>(call.GetContext()).GetModalities();
+  const OrthancRestApi::Modalities& modalities =                        \
+    dynamic_cast<OrthancRestApi&>(call.GetContext()).GetModalities();
 
 
 
@@ -542,7 +542,7 @@
 
   // DICOM bridge -------------------------------------------------------------
 
-  static bool IsExistingModality(const OrthancRestApi2::Modalities& modalities,
+  static bool IsExistingModality(const OrthancRestApi::Modalities& modalities,
                                  const std::string& id)
   {
     return modalities.find(id) != modalities.end();
@@ -553,7 +553,7 @@
     RETRIEVE_MODALITIES(call);
 
     Json::Value result = Json::arrayValue;
-    for (OrthancRestApi2::Modalities::const_iterator 
+    for (OrthancRestApi::Modalities::const_iterator 
            it = modalities.begin(); it != modalities.end(); it++)
     {
       result.append(*it);
@@ -584,7 +584,7 @@
 
   // Registration of the various REST handlers --------------------------------
 
-  OrthancRestApi2::OrthancRestApi2(ServerContext& context) : 
+  OrthancRestApi::OrthancRestApi(ServerContext& context) : 
     context_(context)
   {
     GetListOfDicomModalities(modalities_);
diff -r f2349bab5fe7 -r ae2367145b49 OrthancServer/OrthancRestApi.h
--- a/OrthancServer/OrthancRestApi.h	Fri Nov 30 11:00:40 2012 +0100
+++ b/OrthancServer/OrthancRestApi.h	Fri Nov 30 11:01:29 2012 +0100
@@ -39,7 +39,7 @@
 
 namespace Orthanc
 {
-  class OrthancRestApi2 : public RestApi
+  class OrthancRestApi : public RestApi
   {
   public:
     typedef std::set<std::string> Modalities;
@@ -49,7 +49,7 @@
     Modalities modalities_;
 
   public:
-    OrthancRestApi2(ServerContext& context);
+    OrthancRestApi(ServerContext& context);
 
     ServerContext& GetContext()
     {