This commit was generated by cvs2git to create tag 'V1_3_0'.

[modules/kernel.git] / src / SALOMEGUI / SALOMEGUI_Application.cxx

diff --git a/src/SALOMEGUI/SALOMEGUI_Application.cxx b/src/SALOMEGUI/SALOMEGUI_Application.cxx
index 17b7f88ecd8f1c563b92e4b8fa69d5960bad3a1a..d9b5ad9b10ce07afd26b67be17690ba12ef94cb8 100644 (file)
--- a/src/SALOMEGUI/SALOMEGUI_Application.cxx
+++ b/src/SALOMEGUI/SALOMEGUI_Application.cxx
@@ -458,37 +458,18 @@ void SALOMEGUI_Application::onDisplay(int id)
     QCString dir;
     QFileInfo fileInfo ;
     bool found = false;
-    if ( getenv("SALOME_SITE_DIR") ) {
+    if ( getenv( QAD_Application::getDesktop()->getComponentName(parentComp) + "_ROOT_DIR")  ) {
       dir.fill('\0');
-      dir.sprintf("%s",getenv("SALOME_SITE_DIR"));
+      dir.sprintf("%s", getenv( QAD_Application::getDesktop()->getComponentName(parentComp) + "_ROOT_DIR"));
       dir = QAD_Tools::addSlash(dir) ;
       dir = dir + "lib" ;
       dir = QAD_Tools::addSlash(dir) ;
-#ifdef WNT
-      dir = dir + "lib" + parentComp.latin1() + "GUI.dll" ;
-#else
-      dir = dir + "lib" + parentComp.latin1() + "GUI.so" ;
-#endif
-      MESSAGE ( " GUI library = " << dir )
-      fileInfo.setFile(dir) ;
-      if (fileInfo.exists()) {
-       ComponentLib = fileInfo.fileName();
-       found = true;
-       MESSAGE ( " found " )
-      } else {
-       MESSAGE ( " Not found " )
-      }
-    }
-    if ( !found && getenv("SALOME_ROOT_DIR")  ) {
-      dir.fill('\0');
-      dir.sprintf("%s", getenv("SALOME_ROOT_DIR"));
-      dir = QAD_Tools::addSlash(dir) ;
-      dir = dir + "lib" ;
+      dir = dir + "salome" ;
       dir = QAD_Tools::addSlash(dir) ;
 #ifdef WNT
-      dir = dir + "lib" + parentComp.latin1() + "GUI.dll" ;
+      dir = dir + "lib" + QAD_Application::getDesktop()->getComponentName(parentComp).latin1() + "GUI.dll" ;
 #else
-      dir = dir + "lib" + parentComp.latin1() + "GUI.so" ;
+      dir = dir + "lib" + QAD_Application::getDesktop()->getComponentName(parentComp).latin1() + "GUI.so" ;
 #endif
       MESSAGE ( " GUI library = " << dir )
       fileInfo.setFile(dir) ;