--- a/OrthancServer/QueryRetrieveHandler.h	Mon Oct 08 11:40:31 2018 +0200
+++ b/OrthancServer/QueryRetrieveHandler.h	Mon Oct 08 16:08:51 2018 +0200
@@ -41,7 +41,7 @@
   {
   private:
     ServerContext&             context_;
-    const std::string&         localAet_;
+    std::string                localAet_;
     bool                       done_;
     RemoteModalityParameters   modality_;
     ResourceType               level_;
@@ -51,20 +51,21 @@
 
     void Invalidate();
 
-    void RetrieveInternal(DicomUserConnection& connection,
-                          const std::string& target,
-                          size_t i);
-
   public:
     QueryRetrieveHandler(ServerContext& context);
 
     void SetModality(const std::string& symbolicName);
 
-    const RemoteModalityParameters& GetModality() const
+    const RemoteModalityParameters& GetRemoteModality() const
     {
       return modality_;
     }
 
+    const std::string& GetLocalAet() const
+    {
+      return localAet_;
+    }
+
     const std::string& GetModalitySymbolicName() const
     {
       return modalityName_;
@@ -87,14 +88,9 @@
 
     void Run();
 
-    size_t GetAnswerCount();
+    size_t GetAnswersCount();
 
     void GetAnswer(DicomMap& target,
                    size_t i);
-
-    void Retrieve(const std::string& target,
-                  size_t i);
-
-    void Retrieve(const std::string& target);
   };
 }