Porting to Qt4

diff --git a/src/CAM/CAM_Module.cxx b/src/CAM/CAM_Module.cxx
index 85d75df5bfd2128ea7304167409ba033b76dba2e..d753c7f907323cb5cada3957cea95bfe3aaedf58 100755 (executable)
--- a/src/CAM/CAM_Module.cxx
+++ b/src/CAM/CAM_Module.cxx
@@ -858,7 +858,7 @@ QAction* CAM_Module::createAction( const int id, const QString& text, const QIco
                                    const QString& menu, const QString& tip, const int key,
                                    QObject* parent, const bool toggle, QObject* reciever, const char* member )
 {
-  QtxAction* a = new QtxAction( text, icon, menu, key, parent, 0, toggle );
+  QtxAction* a = new QtxAction( text, icon, menu, key, parent, toggle );
   a->setStatusTip( tip );
 
   if ( reciever && member )

diff --git a/src/Qtx/Makefile.am b/src/Qtx/Makefile.am
index 4f1019cb2d0d67d8db97fcc073327e61b081a62c..e611c0f9a694d473bdb076a63327e60f8fceb5d0 100755 (executable)
--- a/src/Qtx/Makefile.am
+++ b/src/Qtx/Makefile.am
@@ -43,6 +43,7 @@ salomeinclude_HEADERS=                \
        QtxMRUAction.h          \
        QtxResourceMgr.h        \
        QtxToolBar.h            \
+       QtxWorkspace.h          \
        QtxWorkstack.h
 
 #VSR: not yet migrated to Qt4 files
@@ -92,6 +93,7 @@ dist_libqtx_la_SOURCES=               \
        QtxMRUAction.cxx        \
        QtxResourceMgr.cxx      \
        QtxToolBar.cxx          \
+       QtxWorkspace.cxx        \
        QtxWorkstack.cxx
 
 #VSR: not yet migrated to Qt4 files
@@ -135,6 +137,7 @@ MOC_FILES=                          \
        QtxMainWindow_moc.cxx           \
        QtxMRUAction_moc.cxx            \
        QtxToolBar_moc.cxx              \
+       QtxWorkspace_moc.cxx            \
        QtxWorkstack_moc.cxx
 
 #VSR: not yet migrated to Qt4 files

diff --git a/src/Qtx/Qtx.pro b/src/Qtx/Qtx.pro
index e2f310233290826d02a7033234615edd1b910c78..4a250e4b9898838c0dc184cbcb156a5f29991061 100644 (file)
--- a/src/Qtx/Qtx.pro
+++ b/src/Qtx/Qtx.pro
@@ -27,6 +27,7 @@ HEADERS += QtxMap.h
 HEADERS += QtxMRUAction.h
 HEADERS += QtxResourceMgr.h
 HEADERS += QtxToolBar.h
+HEADERS += QtxWorkspace.h
 HEADERS += QtxWorkstack.h
 #HEADERS += QtxDblSpinBox.h
 #HEADERS += QtxDblValidator.h
@@ -67,6 +68,7 @@ SOURCES += QtxMainWindow.cxx
 SOURCES += QtxMRUAction.cxx
 SOURCES += QtxResourceMgr.cxx
 SOURCES += QtxToolBar.cxx
+SOURCES += QtxWorkspace.cxx
 SOURCES += QtxWorkstack.cxx
 #SOURCES += QtxDblSpinBox.cxx
 #SOURCES += QtxDblValidator.cxx

diff --git a/src/Qtx/QtxWorkspace.cxx b/src/Qtx/QtxWorkspace.cxx
index 46bd175c90a745c5526a97a31992f2c5b4663c44..42201e47096db84ed0c07ad887bb8b0d47b92051 100644 (file)
--- a/src/Qtx/QtxWorkspace.cxx
+++ b/src/Qtx/QtxWorkspace.cxx
@@ -23,6 +23,15 @@
 
 #include <QWidgetList>
 
+/*!
+  \class QtxWorkspace
+  \brief A workspace widget which can be used in the MDI application
+         as top-level widget in the application main window.
+
+  Provides methods to tile child windows in horizontal or vertical
+  direction.
+*/
+
 /*!
   \brief Constructor.
   \param parent parent widget
@@ -40,7 +49,7 @@ QtxWorkspace::~QtxWorkspace()
 }
 
 /*!
-  \brief Performs tile vertical action
+  \brief Tiles child windows vertically.
 */
 void QtxWorkspace::tileVertical()
 {
@@ -84,7 +93,7 @@ void QtxWorkspace::tileVertical()
 }
 
 /*!
-  \brief Performs tile horizontal action
+  \brief Tiles child windows horizontally.
 */
 void QtxWorkspace::tileHorizontal()
 {