0025812: Replace dynamic loading mechanism of OCAF persistence with dynamic-link one

[occt.git] / src / DPrsStd / DPrsStd.cxx

diff --git a/src/DPrsStd/DPrsStd.cxx b/src/DPrsStd/DPrsStd.cxx
index c32f0ab..9662352 100644 (file)
--- a/src/DPrsStd/DPrsStd.cxx
+++ b/src/DPrsStd/DPrsStd.cxx
@@ -30,13 +30,11 @@
 #include <OSD_Path.hxx>
 #include <TCollection_AsciiString.hxx>
 
-//#include <AppStdL_Application.hxx>
 // avoid warnings on 'extern "C"' functions returning C++ classes
 #ifdef _MSC_VER
 #pragma warning(4:4190)
 #endif
-//static Handle(AppStdL_Application) stdApp;
-static Handle(AppStd_Application) stdApp;
+
 //=======================================================================
 //function : AllComands
 //purpose  : 
@@ -48,82 +46,16 @@ void DPrsStd::AllCommands (Draw_Interpretor& theCommands)
   if (done) return;
   done = Standard_True;
 
-  // APPLICATION  
-  if (stdApp.IsNull()) stdApp = new AppStd_Application ();//new AppStdL_Application ();
-
   DPrsStd::AISPresentationCommands(theCommands); 
   DPrsStd::AISViewerCommands(theCommands);  
   //DPrsStd::BasicCommands(theCommands);  
 }
 
-//==============================================================================
-// Found standard CAF Plugin
-//==============================================================================
-static Standard_Boolean FoundCAFPlugin () {
-
- // Define Environment Variable 
-
-  const char *plugin, *casroot, *standard;
-  plugin   = getenv("CSF_PluginDefaults");
-  standard = getenv("CSF_StandardDefaults");
-  casroot  = getenv("CASROOT");
-  Standard_Boolean hasPlugin = Standard_False; 
-  TCollection_AsciiString PluginName ;
-  if ( !plugin ) { 
-    if ( casroot ) {
-      PluginName = TCollection_AsciiString (casroot);
-      PluginName+="/src/StdResource" ;
-      hasPlugin = Standard_True ;
-    }
-  } else {
-    PluginName = TCollection_AsciiString (plugin);
-    hasPlugin = Standard_True ;
-  }
-  if (  hasPlugin ) {
-    OSD_Path aPath ( PluginName );
-    OSD_Directory aDir(aPath);
-    if ( aDir.Exists () ) {
-      TCollection_AsciiString PluginFileName = PluginName + "/Plugin" ;
-      OSD_File PluginFile ( PluginFileName );
-      if ( PluginFile.Exists() ) {
-       if (!plugin)   {
-         OSD_Environment PluginEnv   ( "CSF_PluginDefaults" , PluginName );
-         PluginEnv.Build();
-         if ( PluginEnv.Failed() ) {
-           cout << " Problem when initialise CSF_PluginDefaults whith " << PluginName.ToCString() << endl;
-         }
-       }
-       if (!standard) { 
-         OSD_Environment StandardEnv ( "CSF_StandardDefaults" , PluginName );
-         StandardEnv .Build();
-         if ( StandardEnv.Failed() ) {
-           cout << " Problem when initialise CSF_StandardDefaults whith " << PluginName.ToCString() << endl;
-         }
-       }
-      } else {
-       hasPlugin = Standard_False; 
-      }
-    } else {
-      hasPlugin = Standard_False; 
-    }
-  } 
-
-  if ( !hasPlugin ) { 
-    cout << " an environement variable named : CSF_PluginDefaults is mandatory to use OCAF " <<endl;
-    Standard_Failure::Raise ( "an environement variable named : CSF_PluginDefaults is mandatory to use OCAF" );
-  }  
-  
-  return hasPlugin ;
-}
-
 //==============================================================================
 // DPrsStd::Factory
 //==============================================================================
 void DPrsStd::Factory(Draw_Interpretor& theDI)
 {
-  if(!FoundCAFPlugin()) 
-    return;
-
   static Standard_Boolean DPrsStdFactoryDone = Standard_False;
   if (DPrsStdFactoryDone) return;
   DPrsStdFactoryDone = Standard_True;