From 80b010f35770100015801b933947cf9842f8e1f1 Mon Sep 17 00:00:00 2001 From: vsr Date: Thu, 20 Dec 2007 12:19:51 +0000 Subject: [PATCH] *** empty log message *** --- src/LightApp/LightApp_Application.cxx | 13 ++++--- src/LightApp/LightApp_Application.h | 4 +-- src/LightApp/LightApp_DataModel.cxx | 2 +- src/LightApp/LightApp_Module.cxx | 2 +- src/LightApp/LightApp_OBSelector.cxx | 6 ++-- src/LightApp/LightApp_OBSelector.h | 8 ++--- src/LightApp/Makefile.am | 12 ++----- src/SALOME_PYQT/SALOME_PYQT_GUI/Makefile.am | 3 ++ .../SALOME_PYQT_GUI/SALOME_PYQT_Module.cxx | 3 ++ src/SALOME_PYQT/SalomePyQt/Makefile.am | 2 +- src/SalomeApp/SalomeApp_Application.cxx | 34 ++++++++----------- 11 files changed, 42 insertions(+), 47 deletions(-) diff --git a/src/LightApp/LightApp_Application.cxx b/src/LightApp/LightApp_Application.cxx index bfbf063c9..39bcd0008 100644 --- 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 #include +#include #include #include #include @@ -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( dockWindow( WT_ObjectBrowser ) ); + return qobject_cast( 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 6e21b3ce3..f5e249aa1 100644 --- a/src/LightApp/LightApp_Application.h +++ b/src/LightApp/LightApp_Application.h @@ -34,7 +34,6 @@ #include 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 b83c84abe..d78f3b3c1 100644 --- 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 #include /*! diff --git a/src/LightApp/LightApp_Module.cxx b/src/LightApp/LightApp_Module.cxx index de6b79c42..37ba21580 100644 --- 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 #include #include #include diff --git a/src/LightApp/LightApp_OBSelector.cxx b/src/LightApp/LightApp_OBSelector.cxx index c29ddb91d..ea3d3ffa0 100644 --- 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 #include #include #include @@ -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 758cc3e58..efc266715 100644 --- a/src/LightApp/LightApp_OBSelector.h +++ b/src/LightApp/LightApp_OBSelector.h @@ -30,7 +30,7 @@ #include -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& ); private: - LightApp_Browser* myBrowser; + SUIT_DataBrowser* myBrowser; SUIT_DataOwnerPtrList mySelectedList; QMap myEntries; unsigned long myModifiedTime; diff --git a/src/LightApp/Makefile.am b/src/LightApp/Makefile.am index 2cc77feb8..a463e61e7 100755 --- 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 c6584d508..700e4ceaf 100644 --- 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 9460c968a..47a2ac067 100644 --- 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 +#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 c88e5df04..c5870a03b 100644 --- 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 5be5f25b4..d1dda6abc 100644 --- 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 +#include +#include +#include -#include "CAM_Module.h" +#include #include #include #include +#include +#include +#include +#include #include -#include // temporary commented //#include #include -#include -#include -#include - #include #include #include @@ -71,13 +67,13 @@ #include #include -#include "SALOMEDSClient_ClientFactory.hxx" +#include -#include "SALOME_ListIteratorOfListIO.hxx" -#include "SALOME_ListIO.hxx" +#include +#include -#include "ToolsGUI_CatalogGeneratorDlg.h" -#include "ToolsGUI_RegWidget.h" +#include +#include #include @@ -815,7 +811,7 @@ QWidget* SalomeApp_Application::createWindow( const int flag ) if ( flag == WT_ObjectBrowser ) { - LightApp_Browser* ob = qobject_cast( wid ); + SUIT_DataBrowser* ob = qobject_cast( wid ); if ( ob ) { // temporary commented //ob->setUpdater( new SalomeApp_Updater() ); -- 2.39.2