Using files from package LightApp instead of files from package SalomeApp

diff --git a/src/SUPERVGUI/SUPERVGUI.cxx b/src/SUPERVGUI/SUPERVGUI.cxx
index 5aaeb3de09c8229e793e6db8259384bf13b24d43..24e95166441b6cb70130dc611cfbcd57c1a53bb3 100644 (file)
--- a/src/SUPERVGUI/SUPERVGUI.cxx
+++ b/src/SUPERVGUI/SUPERVGUI.cxx
@@ -39,8 +39,8 @@ using namespace boost;
 #include "OB_ListItem.h"
 #include "SalomeApp_Application.h"
 #include "SalomeApp_ImportOperation.h"
-#include "SalomeApp_NameDlg.h"
-#include "SalomeApp_SelectionMgr.h"
+#include "LightApp_NameDlg.h"
+#include "LightApp_SelectionMgr.h"
 #include "SalomeApp_Study.h"
 #include "SUIT_Desktop.h"
 #include "SUIT_FileDlg.h"
@@ -268,7 +268,7 @@ CAM_DataModel* SUPERVGUI::createDataModel()
   return new SUPERVGUI_DataModel( this );
 }
 
-SalomeApp_Selection* SUPERVGUI::createSelection() const
+LightApp_Selection* SUPERVGUI::createSelection() const
 {
   return new SUPERVGUI_Selection();
 }
@@ -509,7 +509,7 @@ void SUPERVGUI::renameDataflow() {
       if ( obj->FindAttribute(anAttr, "AttributeName") ) {
         _PTR(AttributeName) aName ( anAttr );
         QString nm = QString( aName->Value().c_str() );
-        nm = SalomeApp_NameDlg::getName( application()->desktop(), nm );
+        nm = LightApp_NameDlg::getName( application()->desktop(), nm );
         if ( !nm.isEmpty() ) {
           // sak : 24.11.04 : fix for PAL6898 : if rename fails (study locked),
           // a message box is displayed, and cursor is "wait cursor".  We think that "wait cursor"

diff --git a/src/SUPERVGUI/SUPERVGUI.h b/src/SUPERVGUI/SUPERVGUI.h
index d5239a90f03a2c13556e2403d5c60af2016b20e9..470a4d4a4c828ed803703228a0941c3b21c2b1f6 100644 (file)
--- a/src/SUPERVGUI/SUPERVGUI.h
+++ b/src/SUPERVGUI/SUPERVGUI.h
@@ -134,7 +134,7 @@ class SUPERVGUI: public SalomeApp_Module {
       
   protected:
     virtual CAM_DataModel* createDataModel();
-    virtual SalomeApp_Selection* createSelection() const;
+    virtual LightApp_Selection* createSelection() const;
 
   private:
     void loadEngine(SALOME_NamingService* namingService);

diff --git a/src/SUPERVGUI/SUPERVGUI_BrowseNodeDlg.cxx b/src/SUPERVGUI/SUPERVGUI_BrowseNodeDlg.cxx
index 50362a770440d09093b001ac913f7649c3697387..334b7c3413510e01279c7fe68df157f9cabf7bec 100644 (file)
--- a/src/SUPERVGUI/SUPERVGUI_BrowseNodeDlg.cxx
+++ b/src/SUPERVGUI/SUPERVGUI_BrowseNodeDlg.cxx
@@ -17,7 +17,7 @@ using namespace std;
 using namespace boost;
 
 #include "SalomeApp_Application.h"
-#include "SalomeApp_SelectionMgr.h"
+#include "LightApp_SelectionMgr.h"
 #include "SalomeApp_Study.h"
 #include "SUIT_Session.h"
 

diff --git a/src/SUPERVGUI/SUPERVGUI_CanvasNode.cxx b/src/SUPERVGUI/SUPERVGUI_CanvasNode.cxx
index b591cfa4e54fc791fd6958f2ea591fa44b2f468f..88bf2bebb6ea58e51fff9d4e0ca93c2ea6dd8c8a 100644 (file)
--- a/src/SUPERVGUI/SUPERVGUI_CanvasNode.cxx
+++ b/src/SUPERVGUI/SUPERVGUI_CanvasNode.cxx
@@ -18,7 +18,7 @@ using namespace std;
 #include "SUPERVGUI_Information.h"
 #include "SUPERVGUI_Library.h"
 
-#include "SalomeApp_NameDlg.h"
+#include "LightApp_NameDlg.h"
 #include "SUIT_MessageBox.h"
 #include "LogWindow.h"
 #include "SUIT_Session.h"
@@ -349,7 +349,7 @@ bool SUPERVGUI_CanvasNode::setNodeName(QString aName)  {
 }
 
 void SUPERVGUI_CanvasNode::rename()  {
-  QString aName = SalomeApp_NameDlg::getName( SUIT_Session::session()->activeApplication()->desktop(), myNode->Name() );
+  QString aName = LightApp_NameDlg::getName( SUIT_Session::session()->activeApplication()->desktop(), myNode->Name() );
   //mkr : modifications for fixing bug IPAL9972
   if (!aName.isEmpty() && aName.compare( myNode->Name() ) != 0) {
     setNodeName(aName);

diff --git a/src/SUPERVGUI/SUPERVGUI_DataModel.cxx b/src/SUPERVGUI/SUPERVGUI_DataModel.cxx
index 00d4d8e12f571d53850b24bbf1a657f1f8f1fd6d..007463a10b0e928d858475b1a4223ff9e74f9d7a 100644 (file)
--- a/src/SUPERVGUI/SUPERVGUI_DataModel.cxx
+++ b/src/SUPERVGUI/SUPERVGUI_DataModel.cxx
@@ -22,27 +22,27 @@ SUPERVGUI_DataModel::~SUPERVGUI_DataModel()
 // Function : open
 // Purpose  : 
 //================================================================
-bool SUPERVGUI_DataModel::open( const QString& str, CAM_Study* study )
+bool SUPERVGUI_DataModel::open( const QString& str, CAM_Study* study, QStringList list )
 {
-  return SalomeApp_DataModel::open( str, study );
+  return SalomeApp_DataModel::open( str, study, list );
 }
 
 //================================================================
 // Function : save
 // Purpose  : 
 //================================================================
-bool SUPERVGUI_DataModel::save()
+bool SUPERVGUI_DataModel::save(QStringList& list)
 {
-  return SalomeApp_DataModel::save();
+  return SalomeApp_DataModel::save(list);
 }
 
 //================================================================
 // Function : saveAs
 // Purpose  : 
 //================================================================
-bool SUPERVGUI_DataModel::saveAs( const QString& str, CAM_Study* study )
+bool SUPERVGUI_DataModel::saveAs( const QString& str, CAM_Study* study, QStringList& list )
 {
-  return SalomeApp_DataModel::saveAs( str, study );
+  return SalomeApp_DataModel::saveAs( str, study, list );
 }
 
 //================================================================

diff --git a/src/SUPERVGUI/SUPERVGUI_DataModel.h b/src/SUPERVGUI/SUPERVGUI_DataModel.h
index b21a692e07d510fea168d97fe692ceb0fd4a0855..59d707edb5b0c5ddf98675460ad0d56596c429eb 100644 (file)
--- a/src/SUPERVGUI/SUPERVGUI_DataModel.h
+++ b/src/SUPERVGUI/SUPERVGUI_DataModel.h
@@ -14,9 +14,9 @@ public:
                                       SUPERVGUI_DataModel ( CAM_Module* theModule );
   virtual                             ~SUPERVGUI_DataModel();
 
-  virtual bool                        open( const QString&, CAM_Study* );
-  virtual bool                        save();
-  virtual bool                        saveAs( const QString&, CAM_Study* );
+  virtual bool                        open( const QString&, CAM_Study*, QStringList );
+  virtual bool                        save( QStringList& );
+  virtual bool                        saveAs( const QString&, CAM_Study*, QStringList& );
   virtual bool                        close();
 
   virtual bool                        isModified() const ;

diff --git a/src/SUPERVGUI/SUPERVGUI_Selection.cxx b/src/SUPERVGUI/SUPERVGUI_Selection.cxx
index f361615dc062055a0814be9f86e2bbc1eb38e3e3..dc745172cac4e46955a348cc604431057fb1ab60 100644 (file)
--- a/src/SUPERVGUI/SUPERVGUI_Selection.cxx
+++ b/src/SUPERVGUI/SUPERVGUI_Selection.cxx
@@ -1,7 +1,7 @@
 #include "SUPERVGUI_Selection.h"
 #include "SUPERVGUI.h"
 
-#include <SalomeApp_DataOwner.h>
+#include <LightApp_DataOwner.h>
 #include <SalomeApp_Study.h>
 
 #include <SUIT_Session.h>
@@ -29,7 +29,7 @@ SUPERVGUI_Selection::~SUPERVGUI_Selection()
 
 QtxValue SUPERVGUI_Selection::param( const int ind, const QString& p ) const
 {
-  QtxValue val( SalomeApp_Selection::param( ind, p ) );
+  QtxValue val( LightApp_Selection::param( ind, p ) );
   if ( !val.isValid() ) {
     if ( p == "type" )  val = QtxValue( typeName( ind ) );
   }

diff --git a/src/SUPERVGUI/SUPERVGUI_Selection.h b/src/SUPERVGUI/SUPERVGUI_Selection.h
index 6c7c2f3c391c5e7c94471cf59cbdbc6377a84b17..74f97162617e7acca4a1750e38ca2f3c119139d2 100644 (file)
--- a/src/SUPERVGUI/SUPERVGUI_Selection.h
+++ b/src/SUPERVGUI/SUPERVGUI_Selection.h
@@ -28,7 +28,7 @@
 #ifndef SUPERVGUI_SELECTION_HeaderFile
 #define SUPERVGUI_SELECTION_HeaderFile
 
-#include <SalomeApp_Selection.h>
+#include <LightApp_Selection.h>
 
 #include <SALOMEconfig.h>
 
@@ -38,7 +38,7 @@ using namespace boost;
 
 class SALOME_InteractiveObject;
 
-class SUPERVGUI_Selection : public SalomeApp_Selection
+class SUPERVGUI_Selection : public LightApp_Selection
 {
 public:
   SUPERVGUI_Selection();