First version before plugging.

[modules/kernel.git] / src / NamingService / SALOME_NamingService.hxx

diff --git a/src/NamingService/SALOME_NamingService.hxx b/src/NamingService/SALOME_NamingService.hxx
index bde37e61755d2d59a5eeccc04553b8d7b4edf0cb..07605c6f74e913737d9074589a85fecdcb384b3a 100644 (file)
--- a/src/NamingService/SALOME_NamingService.hxx
+++ b/src/NamingService/SALOME_NamingService.hxx
@@ -35,7 +35,6 @@
 
 #include <vector>
 #include <string>
-#include "utilities.h"
 #include "Utils_Mutex.hxx"
 #include "ServiceUnreachable.hxx"
 
@@ -54,49 +53,30 @@ public:
   virtual ~SALOME_NamingService();
 
   void init_orb(CORBA::ORB_ptr orb=0);
-  void Register(CORBA::Object_ptr ObjRef,
-                const char* Path) 
-    throw(ServiceUnreachable);
-  CORBA::Object_ptr Resolve(const char* Path)
-    throw( ServiceUnreachable); 
-  CORBA::Object_ptr ResolveFirst(const char* Path)
-    throw( ServiceUnreachable); 
+  void Register(CORBA::Object_ptr ObjRef, const char* Path) throw(ServiceUnreachable);
+  CORBA::Object_ptr Resolve(const char* Path) throw( ServiceUnreachable); 
+  CORBA::Object_ptr ResolveFirst(const char* Path) throw( ServiceUnreachable); 
   CORBA::Object_ptr ResolveComponent(const char* hostname,
                                      const char* containerName,
                                      const char* componentName,
-                                     const int nbproc=0)
-    throw(ServiceUnreachable);
+                                     const int nbproc=0) throw(ServiceUnreachable);
   std::string ContainerName(const char *ContainerName);
   std::string ContainerName(const Engines::ContainerParameters& params);
-  std::string BuildContainerNameForNS(const char *ContainerName,
-                                      const char *hostname);
-  std::string 
-  BuildContainerNameForNS(const Engines::ContainerParameters& params,
-                          const char *hostname);
+  std::string BuildContainerNameForNS(const char *ContainerName, const char *hostname);
+  std::string BuildContainerNameForNS(const Engines::ContainerParameters& params, const char *hostname);
 
-  int Find(const char* name)
-    throw(ServiceUnreachable);
-  bool Create_Directory(const char* Path)
-    throw(ServiceUnreachable);
-  bool Change_Directory(const char* Path)
-    throw(ServiceUnreachable);
-  char* Current_Directory()
-    throw(ServiceUnreachable);
-  void list()
-    throw(ServiceUnreachable);
-  std::vector<std::string> list_directory()
-    throw(ServiceUnreachable);
-  std::vector<std::string> list_subdirs()
-    throw(ServiceUnreachable);
-  std::vector<std::string> list_directory_recurs()
-    throw(ServiceUnreachable);
-  void Destroy_Name(const char* Path)
-    throw(ServiceUnreachable);
-  virtual void Destroy_Directory(const char* Path)
-    throw(ServiceUnreachable);
-  virtual void Destroy_FullDirectory(const char* Path)
-    throw(ServiceUnreachable);
-  char* getIORaddr();
+  int Find(const char* name) throw(ServiceUnreachable);
+  bool Create_Directory(const char* Path) throw(ServiceUnreachable);
+  bool Change_Directory(const char* Path) throw(ServiceUnreachable);
+  char* Current_Directory() throw(ServiceUnreachable);
+  void list() throw(ServiceUnreachable);
+  std::vector<std::string> list_directory() throw(ServiceUnreachable);
+  std::vector<std::string> list_subdirs() throw(ServiceUnreachable);
+  std::vector<std::string> list_directory_recurs() throw(ServiceUnreachable);
+  void Destroy_Name(const char* Path) throw(ServiceUnreachable);
+  virtual void Destroy_Directory(const char* Path) throw(ServiceUnreachable);
+  virtual void Destroy_FullDirectory(const char* Path) throw(ServiceUnreachable);
+  char *getIORaddr();
   CORBA::ORB_ptr orb();
 
 protected: