*** empty log message ***

diff --git a/src/LightApp/LightApp_Application.cxx b/src/LightApp/LightApp_Application.cxx
index bfbf063c952482a816f340f1d3230485696725bb..39bcd000891e514a4c56324c0fbde79bd0f47f15 100644 (file)
--- a/src/LightApp/LightApp_Application.cxx
+++ b/src/LightApp/LightApp_Application.cxx
@@ -27,7 +27,6 @@
 #endif
 
 #include "LightApp_Application.h"
-#include "LightApp_WidgetContainer.h"
 #include "LightApp_Module.h"
 #include "LightApp_DataModel.h"
 #include "LightApp_Study.h"
@@ -36,7 +35,6 @@
 #include "LightApp_ModuleDlg.h"
 #include "LightApp_AboutDlg.h"
 #include "LightApp_ModuleAction.h"
-#include "LightApp_Browser.h"
 // temporary commented
 //#include "LightApp_OBFilter.h"
 #include "LightApp_EventFilter.h"
@@ -54,6 +52,7 @@
 #include <CAM_Study.h>
 #include <STD_TabDesktop.h>
 
+#include <SUIT_DataBrowser.h>
 #include <SUIT_Session.h>
 #include <SUIT_Study.h>
 #include <SUIT_FileDlg.h>
@@ -1187,9 +1186,9 @@ QWidget* LightApp_Application::getWindow( const int flag, const int )
 /*!
   \return Object Browser
 */
-LightApp_Browser* LightApp_Application::objectBrowser()
+SUIT_DataBrowser* LightApp_Application::objectBrowser()
 {
-  return qobject_cast<LightApp_Browser*>( dockWindow( WT_ObjectBrowser ) );
+  return qobject_cast<SUIT_DataBrowser*>( dockWindow( WT_ObjectBrowser ) );
 }
 
 /*!
@@ -1602,7 +1601,7 @@ QWidget* LightApp_Application::createWindow( const int flag )
   QWidget* wid = 0;
   if ( flag == WT_ObjectBrowser )
   {
-    LightApp_Browser* ob = new LightApp_Browser( new LightApp_DataObject(), desktop() );
+    SUIT_DataBrowser* ob = new SUIT_DataBrowser( new LightApp_DataObject(), desktop() );
     ob->setSortMenuEnabled( true );
     ob->setAutoUpdate( true );
     //ob->setAutoOpenLevel( 1 ); // commented by ASV as a fix to bug IPAL10107
@@ -2055,7 +2054,7 @@ void LightApp_Application::preferencesChanged( const QString& sec, const QString
     if( param=="auto_size" || param=="auto_size_first" )
     {
       // temporary commented
-      /*LightApp_Browser* ob = objectBrowser();
+      /*SUIT_DataBrowser* ob = objectBrowser();
       if( !ob )
        return;
 
@@ -2493,7 +2492,7 @@ void LightApp_Application::contextMenuPopup( const QString& type, QMenu* thePopu
 {
   CAM_Application::contextMenuPopup( type, thePopup, title );
 
-  LightApp_Browser* ob = objectBrowser();
+  SUIT_DataBrowser* ob = objectBrowser();
   if ( ob && type == ob->popupClientType() ) {
     thePopup->addSeparator();
     QAction* a = thePopup->addAction( tr( "MEN_REFRESH" ), this, SLOT( onRefresh() ) );

diff --git a/src/LightApp/LightApp_Application.h b/src/LightApp/LightApp_Application.h
index 6e21b3ce35e6ad49e0725524f7923c227963611a..f5e249aa1400766fe2e2695f8566d73a3fba2ab3 100644 (file)
--- a/src/LightApp/LightApp_Application.h
+++ b/src/LightApp/LightApp_Application.h
@@ -34,7 +34,6 @@
 #include <QPointer>
 
 class LogWindow;
-class LightApp_Browser;
 #ifndef DISABLE_PYCONSOLE
 class PyConsole_Console;
 #endif
@@ -42,6 +41,7 @@ class LightApp_WidgetContainer;
 class LightApp_Preferences;
 class LightApp_SelectionMgr;
 class LightApp_DataObject;
+class SUIT_DataBrowser;
 class SUIT_Study;
 class SUIT_Accel;
 class CAM_Module;
@@ -115,7 +115,7 @@ public:
   LightApp_SelectionMgr*              selectionMgr() const;
 
   LogWindow*                          logWindow();
-  LightApp_Browser*                   objectBrowser();
+  SUIT_DataBrowser*                   objectBrowser();
 #ifndef DISABLE_PYCONSOLE
   PyConsole_Console*                  pythonConsole();
 #endif

diff --git a/src/LightApp/LightApp_DataModel.cxx b/src/LightApp/LightApp_DataModel.cxx
index b83c84abea2d5a94118b1fa2f48dcc25a7d84be2..d78f3b3c1bbcb5780847a212b6f81f11d24d9c4e 100644 (file)
--- a/src/LightApp/LightApp_DataModel.cxx
+++ b/src/LightApp/LightApp_DataModel.cxx
@@ -26,8 +26,8 @@
 #include "LightApp_DataObject.h"
 #include "LightApp_Module.h"
 #include "LightApp_Application.h"
-#include "LightApp_Browser.h"
 
+#include <SUIT_DataBrowser.h>
 #include <SUIT_DataObject.h>
 
 /*!

diff --git a/src/LightApp/LightApp_Module.cxx b/src/LightApp/LightApp_Module.cxx
index de6b79c4265e5597bce2a5196aeaee25b7c8883f..37ba21580b585d5ae4ecd8ae7a8b840ae428cb6f 100644 (file)
--- a/src/LightApp/LightApp_Module.cxx
+++ b/src/LightApp/LightApp_Module.cxx
@@ -35,8 +35,8 @@
 #include "LightApp_SwitchOp.h"
 #include "LightApp_UpdateFlags.h"
 #include "LightApp_ShowHideOp.h"
-#include "LightApp_Browser.h"
 
+#include <SUIT_DataBrowser.h>
 #include <SUIT_Study.h>
 #include <SUIT_DataObject.h>
 #include <SUIT_Operation.h>

diff --git a/src/LightApp/LightApp_OBSelector.cxx b/src/LightApp/LightApp_OBSelector.cxx
index c29ddb91d278045272cfea16aff6adbda7b64e62..ea3d3ffa0dfcfbe7217966b8a42c1df5c6360ea1 100644 (file)
--- a/src/LightApp/LightApp_OBSelector.cxx
+++ b/src/LightApp/LightApp_OBSelector.cxx
@@ -25,7 +25,7 @@
 #include "LightApp_DataOwner.h"
 #include "LightApp_DataObject.h"
 #include "LightApp_Application.h"
-#include "LightApp_Browser.h"
+#include <SUIT_DataBrowser.h>
 #include <SUIT_Session.h>
 #include <SUIT_DataObjectIterator.h>
 #include <QTime>
@@ -41,7 +41,7 @@
   \param ob object browser
   \param mgr selection manager
 */
-LightApp_OBSelector::LightApp_OBSelector( LightApp_Browser* ob, SUIT_SelectionMgr* mgr )
+LightApp_OBSelector::LightApp_OBSelector( SUIT_DataBrowser* ob, SUIT_SelectionMgr* mgr )
 : SUIT_Selector( mgr, ob ),
   myBrowser( ob )
 {
@@ -62,7 +62,7 @@ LightApp_OBSelector::~LightApp_OBSelector()
   \brief Get object browser.
   \return a pointer to the object browser
 */
-LightApp_Browser* LightApp_OBSelector::browser() const
+SUIT_DataBrowser* LightApp_OBSelector::browser() const
 {
   return myBrowser;
 }

diff --git a/src/LightApp/LightApp_OBSelector.h b/src/LightApp/LightApp_OBSelector.h
index 758cc3e583605cdb4c17f58796eae5462f46bc52..efc26671589e12b23f5bc6b82c2df782a9115b7f 100644 (file)
--- a/src/LightApp/LightApp_OBSelector.h
+++ b/src/LightApp/LightApp_OBSelector.h
@@ -30,7 +30,7 @@
 
 #include <QObject>
 
-class LightApp_Browser;
+class SUIT_DataBrowser;
 class LightApp_DataObject;
 
 class LIGHTAPP_EXPORT LightApp_OBSelector : public QObject, public SUIT_Selector
@@ -38,10 +38,10 @@ class LIGHTAPP_EXPORT LightApp_OBSelector : public QObject, public SUIT_Selector
   Q_OBJECT
 
 public:
-  LightApp_OBSelector( LightApp_Browser*, SUIT_SelectionMgr* );
+  LightApp_OBSelector( SUIT_DataBrowser*, SUIT_SelectionMgr* );
   virtual ~LightApp_OBSelector();
 
-  LightApp_Browser*  browser() const;
+  SUIT_DataBrowser*  browser() const;
 
   virtual QString    type() const;
 
@@ -59,7 +59,7 @@ private:
   void               fillEntries( QMap<QString, LightApp_DataObject*>& );
 
 private:
-  LightApp_Browser*                   myBrowser;
+  SUIT_DataBrowser*                   myBrowser;
   SUIT_DataOwnerPtrList               mySelectedList;
   QMap<QString, LightApp_DataObject*> myEntries;
   unsigned long                       myModifiedTime;

diff --git a/src/LightApp/Makefile.am b/src/LightApp/Makefile.am
index 2cc77feb820ea734de1c8abe9f55670d8ba1a127..a463e61e7b43c1af4877ec679e8f41c66f4b6b87 100755 (executable)
--- a/src/LightApp/Makefile.am
+++ b/src/LightApp/Makefile.am
@@ -29,7 +29,6 @@ salomeinclude_HEADERS= \
        LightApp.h \
        LightApp_AboutDlg.h \
        LightApp_Application.h \
-       LightApp_Browser.h \
        LightApp_DataModel.h \
        LightApp_DataObject.h \
        LightApp_DataOwner.h \
@@ -52,8 +51,7 @@ salomeinclude_HEADERS= \
        LightApp_SwitchOp.h \
        LightApp_Preferences.h \
        LightApp_PreferencesDlg.h \
-       LightApp_UpdateFlags.h \
-       LightApp_WidgetContainer.h
+       LightApp_UpdateFlags.h
 
 #      LightApp_OBFilter.h
 
@@ -72,7 +70,6 @@ endif
 dist_libLightApp_la_SOURCES= \
        LightApp_AboutDlg.cxx \
        LightApp_Application.cxx \
-       LightApp_Browser.cxx \
        LightApp_DataModel.cxx \
        LightApp_DataObject.cxx \
        LightApp_DataOwner.cxx \
@@ -94,8 +91,7 @@ dist_libLightApp_la_SOURCES= \
        LightApp_Study.cxx \
        LightApp_SwitchOp.cxx \
        LightApp_Preferences.cxx \
-       LightApp_PreferencesDlg.cxx \
-       LightApp_WidgetContainer.cxx
+       LightApp_PreferencesDlg.cxx
 
 #      LightApp_OBFilter.cxx
 
@@ -114,7 +110,6 @@ endif
 MOC_FILES= \
        LightApp_AboutDlg_moc.cxx \
        LightApp_Application_moc.cxx \
-       LightApp_Browser_moc.cxx \
        LightApp_DataModel_moc.cxx \
        LightApp_Dialog_moc.cxx \
        LightApp_OBSelector_moc.cxx \
@@ -128,8 +123,7 @@ MOC_FILES= \
        LightApp_Study_moc.cxx \
        LightApp_SwitchOp_moc.cxx \
        LightApp_Preferences_moc.cxx \
-       LightApp_PreferencesDlg_moc.cxx \
-       LightApp_WidgetContainer_moc.cxx
+       LightApp_PreferencesDlg_moc.cxx
 
 if ENABLE_VTKVIEWER
 if ENABLE_SALOMEOBJECT

diff --git a/src/SALOME_PYQT/SALOME_PYQT_GUI/Makefile.am b/src/SALOME_PYQT/SALOME_PYQT_GUI/Makefile.am
index c6584d50869b62e28bba003cad814890aa9084bc..700e4ceafab5326f2b2a36d3a9e706ea77a8b807 100644 (file)
--- a/src/SALOME_PYQT/SALOME_PYQT_GUI/Makefile.am
+++ b/src/SALOME_PYQT/SALOME_PYQT_GUI/Makefile.am
@@ -67,3 +67,6 @@ $(SIP_SRC): $(SIP_FILES)
 $(dist_libSalomePyQtGUI_la_SOURCES): $(SIP_SRC)
 
 ###################################
+
+mostlyclean-local:
+       rm -f sip*

diff --git a/src/SALOME_PYQT/SALOME_PYQT_GUI/SALOME_PYQT_Module.cxx b/src/SALOME_PYQT/SALOME_PYQT_GUI/SALOME_PYQT_Module.cxx
index 9460c968aa86067286a01acc3e6564a1a184e38f..47a2ac067b0c8815cbc3dcbaa4eec52cead75250 100644 (file)
--- a/src/SALOME_PYQT/SALOME_PYQT_GUI/SALOME_PYQT_Module.cxx
+++ b/src/SALOME_PYQT/SALOME_PYQT_GUI/SALOME_PYQT_Module.cxx
@@ -48,8 +48,11 @@
 
 #include "sipAPISalomePyQtGUI.h"
 
+#include <sip.h>
+#if SIP_VERSION < 0x040700
 #include "sipQtGuiQWidget.h"
 #include "sipQtGuiQMenu.h"
+#endif
 
 /*!
   \brief Default name of the module, replaced at the moment

diff --git a/src/SALOME_PYQT/SalomePyQt/Makefile.am b/src/SALOME_PYQT/SalomePyQt/Makefile.am
index c88e5df045e90021e1d4bc065af95674c824c311..c5870a03b5b4c9066f89560fa12e52cefe003d94 100644 (file)
--- a/src/SALOME_PYQT/SalomePyQt/Makefile.am
+++ b/src/SALOME_PYQT/SalomePyQt/Makefile.am
@@ -71,4 +71,4 @@ $(libdir)/SalomePyQt.so:
        (cd $(libdir); ln -s libSalomePyQt.so SalomePyQt.so;)
 
 mostlyclean-local:
-       rm sip*
+       rm -f sip*

diff --git a/src/SalomeApp/SalomeApp_Application.cxx b/src/SalomeApp/SalomeApp_Application.cxx
index 5be5f25b441bc1fafe1e7ccbc2ea6312048f0e41..d1dda6abcaec4c891a2693fee2835585a9f3132a 100644 (file)
--- a/src/SalomeApp/SalomeApp_Application.cxx
+++ b/src/SalomeApp/SalomeApp_Application.cxx
@@ -22,41 +22,37 @@
 // Copyright (C) CEA 2004
 
 #include "SalomeApp_PyInterp.h" // WARNING! This include must be the first!
-
 #include "SalomeApp_Application.h"
-
 #include "SalomeApp_Study.h"
 #include "SalomeApp_DataModel.h"
 #include "SalomeApp_DataObject.h"
 #include "SalomeApp_EventFilter.h"
 #include "SalomeApp_VisualState.h"
-
 #include "SalomeApp_StudyPropertiesDlg.h"
 #include "SalomeApp_LoadStudiesDlg.h"
 
-#include "LightApp_Application.h"
-#include "LightApp_Preferences.h"
-#include "LightApp_SelectionMgr.h"
-#include "LightApp_NameDlg.h"
+#include <LightApp_Application.h>
+#include <LightApp_Preferences.h>
+#include <LightApp_SelectionMgr.h>
+#include <LightApp_NameDlg.h>
 
-#include "CAM_Module.h"
+#include <CAM_Module.h>
 
 #include <SUIT_Tools.h>
 #include <SUIT_Session.h>
 #include <SUIT_Desktop.h>
+#include <SUIT_DataBrowser.h>
+#include <SUIT_FileDlg.h>
+#include <SUIT_MessageBox.h>
+#include <SUIT_ResourceMgr.h>
 
 #include <QtxMRUAction.h>
 
-#include <LightApp_Browser.h>
 // temporary commented
 //#include <OB_ListItem.h>
 
 #include <PyConsole_Console.h>
 
-#include <SUIT_FileDlg.h>
-#include <SUIT_MessageBox.h>
-#include <SUIT_ResourceMgr.h>
-
 #include <Utils_ORB_INIT.hxx>
 #include <Utils_SINGLETON.hxx>
 #include <SALOME_LifeCycleCORBA.hxx>
@@ -71,13 +67,13 @@
 #include <QGridLayout>
 #include <QMenu>
 
-#include "SALOMEDSClient_ClientFactory.hxx"
+#include <SALOMEDSClient_ClientFactory.hxx>
 
-#include "SALOME_ListIteratorOfListIO.hxx"
-#include "SALOME_ListIO.hxx"
+#include <SALOME_ListIteratorOfListIO.hxx>
+#include <SALOME_ListIO.hxx>
 
-#include "ToolsGUI_CatalogGeneratorDlg.h"
-#include "ToolsGUI_RegWidget.h"
+#include <ToolsGUI_CatalogGeneratorDlg.h>
+#include <ToolsGUI_RegWidget.h>
 
 #include <vector>
 
@@ -815,7 +811,7 @@ QWidget* SalomeApp_Application::createWindow( const int flag )
 
   if ( flag == WT_ObjectBrowser )
   {
-    LightApp_Browser* ob = qobject_cast<LightApp_Browser*>( wid );
+    SUIT_DataBrowser* ob = qobject_cast<SUIT_DataBrowser*>( wid );
     if ( ob ) { 
       // temporary commented
       //ob->setUpdater( new SalomeApp_Updater() );