Porting to Qt4

diff --git a/src/CAM/CAM_Application.cxx b/src/CAM/CAM_Application.cxx
index 8474907eb3d37536954cfcdedfcbd3f7b49e8131..3ca915241913567d1a2b7a4d73de4600635e942a 100755 (executable)
--- a/src/CAM/CAM_Application.cxx
+++ b/src/CAM/CAM_Application.cxx
@@ -182,7 +182,7 @@ void CAM_Application::modules( QStringList& lst, const bool loaded ) const
   is already added. 
   
   \param mod module being added
-  \sa initialize()
+  \sa CAM_Module::initialize()
 */
 void CAM_Application::addModule( CAM_Module* mod )
 {
@@ -224,7 +224,8 @@ void CAM_Application::addModule( CAM_Module* mod )
 
 /*!
   \brief Load modules from the modules information list.
-  \warning If some module can not be loaded, an error message is shown.
+  
+  If some module can not be loaded, an error message is shown.
 */
 void CAM_Application::loadModules()
 {

diff --git a/src/CAM/CAM_DataModel.cxx b/src/CAM/CAM_DataModel.cxx
index 6354bf2c7f4a9dcda4ee97521042568bf3db60fa..7af20dbe633605f6d32d3f6e145aac5f955ad28d 100755 (executable)
--- a/src/CAM/CAM_DataModel.cxx
+++ b/src/CAM/CAM_DataModel.cxx
@@ -50,7 +50,7 @@ CAM_DataModel::~CAM_DataModel()
 }
 
 /*!
-  \brief Initizize data model.
+  \brief Initialize data model.
 
   This method should be re-implemented in the successor classes 
   and can be used for creation of root data object.

diff --git a/src/CAM/CAM_Module.cxx b/src/CAM/CAM_Module.cxx
index d921e93a83fbdeae7817e90e8636ecbac7ee9f31..ca9fc7d9e84f752b6beb5daf8e04f08c779cada0 100755 (executable)
--- a/src/CAM/CAM_Module.cxx
+++ b/src/CAM/CAM_Module.cxx
@@ -255,7 +255,7 @@ void CAM_Module::studyClosed( SUIT_Study* study )
   }
 }
 
-/*
+/*!
   \brief Called when study is changed (obsolete).
 
   Default implementation does nothing.
@@ -978,3 +978,16 @@ void CAM_Module::connectToStudy( CAM_Study* camStudy )
     prev = dm;
   }
 }
+
+/*!
+  \fn void CAM_Module::contextMenuPopup( const QString& type, QMenu* menu, QString& title );
+  \brief Create context popup menu.
+  \param type popup menu context
+  \param menu popup menu
+  \param title popup menu title, which can be set by the module if required
+*/
+
+/*!
+  \fn void CAM_Module::updateCommandsStatus();
+  \brief Update menu/toolbar actions.
+*/

diff --git a/src/CAM/CAM_RootObject.cxx b/src/CAM/CAM_RootObject.cxx
index 46b77e49f9eaf017143190138ecd95c584a01ed9..a710a6b7858f42811cdbecd270b28f2657f41028 100755 (executable)
--- a/src/CAM/CAM_RootObject.cxx
+++ b/src/CAM/CAM_RootObject.cxx
@@ -23,7 +23,8 @@
 
 /*!
   \class CAM_RootObject
-
+  \brief CAM data model root object.
+  
   This class is intended for optimized access to CAM_DataModel instance
   from CAM_DataObject instances.
 

diff --git a/src/Makefile.am b/src/Makefile.am
index 16e2b6763d85c04151418ed99165b7034c646bde..eaad1e7db77f8d38bb5cb4c5e197bd9c2997cb49 100755 (executable)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -25,9 +25,9 @@
 # $Header$
 
 # VSR: this is the original packages list
-#SUBDIRS = Qtx Style DDS QDS SUIT STD CAF CAM SUITApp LogWindow ObjBrowser Prs
+#SUBDIRS = Qtx Style DDS QDS SUIT STD CAF SUITApp LogWindow ObjBrowser Prs
 # VSR: already migrated to Qt4 packages
-SUBDIRS = Qtx SUIT STD SUITApp LogWindow
+SUBDIRS = Qtx SUIT SUITApp STD CAM LogWindow
 
 if ENABLE_SALOMEOBJECT
 # VSR: this is the original packages list

diff --git a/src/src.pro b/src/src.pro
index c0bd7a9df55fe73e82469f5a44e997d86b173389..d71f68118932ad89ea311edf3199e7aea2d6a1c6 100644 (file)
--- a/src/src.pro
+++ b/src/src.pro
@@ -1,10 +1,11 @@
 TEMPLATE = subdirs
 CONFIG += ordered
 
-SUBDIRS = Qtx \
-          SUIT \
-          SUITApp \
-          STD \
-          LogWindow \
-          PyInterp \
-          PyConsole
+SUBDIRS  = Qtx
+SUBDIRS += SUIT
+SUBDIRS += SUITApp
+SUBDIRS += STD
+SUBDIRS += CAM
+SUBDIRS += LogWindow
+SUBDIRS += PyInterp
+SUBDIRS += PyConsole