Porting to Qt 4

diff --git a/src/LightApp/LightApp_Application.cxx b/src/LightApp/LightApp_Application.cxx
index 9d69ba44d4a64a123daee6b75858a5e32feb1387..f388f2ef6e37dbf759d7480a065ab993302febc3 100644 (file)
--- a/src/LightApp/LightApp_Application.cxx
+++ b/src/LightApp/LightApp_Application.cxx
@@ -199,7 +199,7 @@ LightApp_Preferences* LightApp_Application::_prefs_ = 0;
 /*!Constructor.*/
 LightApp_Application::LightApp_Application()
 : CAM_Application( false ),
-myPrefs( 0 )
+  myPrefs( 0 )
 {
   STD_TabDesktop* desk = new STD_TabDesktop();
 
@@ -209,7 +209,7 @@ myPrefs( 0 )
   QPixmap aLogo = aResMgr->loadPixmap( "LightApp", tr( "APP_DEFAULT_ICO" ), false );
 
   desktop()->setWindowIcon( aLogo );
-  desktop()->setDockableMenuBar( true );
+  desktop()->setDockableMenuBar( false );
   desktop()->setDockableStatusBar( false );
 
   // base logo (salome itself)
@@ -618,11 +618,9 @@ void LightApp_Application::createActions()
   createMenu( PreferencesId, fileMenu, 50, -1 );
   createMenu( separator(), fileMenu, -1, 50, -1 );
 
-  /*
   createMenu( separator(), fileMenu, -1, 100, -1 );
   createMenu( MRUId, fileMenu, 100, -1 );
   createMenu( separator(), fileMenu, -1, 100, -1 );
-  */
 }
 
 /*!On module activation action.*/
@@ -653,7 +651,8 @@ void LightApp_Application::onModuleActivation( const QString& modName )
     case 0:
     default:
       putInfo( tr("INF_CANCELLED") );
-      myModuleAction->setActiveModule( QString() );
+      if ( myModuleAction )
+       myModuleAction->setActiveModule( QString() );
       cancelled = true;
     }
   }
@@ -1125,7 +1124,7 @@ void LightApp_Application::addWindow( QWidget* wid, const int flag, const int st
     connect( newWC, SIGNAL( visibilityChanged ( bool ) ), SLOT( onVisibilityChanged( bool ) ) );
     myWindows.insert( flag, newWC );
     if ( winMap.contains( flag ) ) {
-      desktop()->removeDockWidget( myWindows[flag] );
+      //desktop()->removeDockWidget( myWindows[flag] );
       desktop()->addDockWidget( (DockWidgetArea)winMap[flag], myWindows[flag] );
     }
 
@@ -1768,11 +1767,6 @@ LightApp_Preferences* LightApp_Application::preferences( const bool crt ) const
 
     QStringList modNameList;
     app->modules( modNameList, false );
-    for ( QStringList::const_iterator it = modNameList.begin(); it != modNameList.end(); ++it )
-    {
-      int id = _prefs_->addPreference( *it );
-      _prefs_->setItemProperty( id, "info", tr( "PREFERENCES_NOT_LOADED" ).arg( *it ) );
-    }
 
     ModuleList modList;
     app->modules( modList );
@@ -1793,6 +1787,8 @@ LightApp_Preferences* LightApp_Application::preferences( const bool crt ) const
          mod->createPreferences();
       }
     }
+    int id = _prefs_->addPreference( "Root" );
+    _prefs_->setItemProperty( id, "info", tr( "PREFERENCES_NOT_LOADED" ) );
   }
 
   connect( myPrefs, SIGNAL( preferenceChanged( QString&, QString&, QString& ) ),
@@ -2145,8 +2141,9 @@ void LightApp_Application::updateModuleActions()
   QString modName;
   if ( activeModule() )
     modName = activeModule()->moduleName();
-
-  myModuleAction->setActiveModule( modName );
+  
+  if ( myModuleAction )
+    myModuleAction->setActiveModule( modName );
 }
 
 /*!
@@ -2197,7 +2194,7 @@ void LightApp_Application::updateWindows()
       if ( dock != NoDockWidgetArea
           &&
           dock != (DockWidgetArea)it.value() ) {
-       desktop()->removeDockWidget( myWindows[it.key()] );
+       //desktop()->removeDockWidget( myWindows[it.key()] );
        desktop()->addDockWidget( (DockWidgetArea)it.value(), myWindows[it.key()] );
       }
     }
@@ -2213,7 +2210,8 @@ void LightApp_Application::updateWindows()
         !myWindowsVisible[ itr.key() ] )
       continue;
 
-    setWindowShown( itr.key(), !itr.value()->isEmpty() && winMap.contains( itr.key() ) );
+    if ( itr.value() ) 
+      setWindowShown( itr.key(), !itr.value()->isEmpty() && winMap.contains( itr.key() ) );
   }
 }
 
@@ -2240,7 +2238,7 @@ void LightApp_Application::loadWindowsGeometry()
 
   QString modName;
   if ( activeModule() )
-    modName = activeModule()->objectName();
+    modName = activeModule()->name();
 
   desktop()->restoreState( resourceMgr()->stringValue( "windows_geometry", modName ).toLatin1() );
 }
@@ -2256,7 +2254,7 @@ void LightApp_Application::saveWindowsGeometry()
 
   QString modName;
   if ( activeModule() )
-    modName = activeModule()->objectName();
+    modName = activeModule()->name();
 
   resourceMgr()->setValue( "windows_geometry", modName, desktop()->saveState() );
 }

diff --git a/src/LightApp/LightApp_Dialog.cxx b/src/LightApp/LightApp_Dialog.cxx
index f05267c34f720d0e1b2ac9fb4bca3e3bfffe9aaa..7d62a461a15803f980a2dd0050b27261c7ad0508 100644 (file)
--- a/src/LightApp/LightApp_Dialog.cxx
+++ b/src/LightApp/LightApp_Dialog.cxx
@@ -780,7 +780,7 @@ QString& LightApp_Dialog::typeName( const int type )
   \return const reference to type name
   \param type - integer id of type
 */
-const QString& LightApp_Dialog::typeName( const int type ) const
+const QString LightApp_Dialog::typeName( const int type ) const
 {
   return myTypeNames[ type ];
 }

diff --git a/src/LightApp/LightApp_Dialog.h b/src/LightApp/LightApp_Dialog.h
index f4a3a81d89c00c8c286cfd91f5d6dc84e1136d74..2a0eb5fc995ac8d42582cd430bb4776b1546724a 100644 (file)
--- a/src/LightApp/LightApp_Dialog.h
+++ b/src/LightApp/LightApp_Dialog.h
@@ -224,7 +224,7 @@ protected:
   
   //!Change and get type name for indicating in selection widget
   QString& typeName( const int );
-  const QString& typeName( const int ) const;
+  const QString typeName( const int ) const;
   
   //! Create string contains selection list by list of names, list of types and current name indication state
   virtual QString selectionDescription( const QStringList&, const TypesList&, const NameIndication ) const;

diff --git a/src/LightApp/LightApp_Preferences.cxx b/src/LightApp/LightApp_Preferences.cxx
index beaa1afe4ebaac4f08ca7ffb4f584502fcf3e46a..8be2b36ab7f83197d0863087d722b8c613d6327a 100644 (file)
--- a/src/LightApp/LightApp_Preferences.cxx
+++ b/src/LightApp/LightApp_Preferences.cxx
@@ -25,7 +25,7 @@
   Constructor.Initialize by resource manager and parent QWidget.
 */
 LightApp_Preferences::LightApp_Preferences( QtxResourceMgr* resMgr, QWidget* parent )
-: QtxListResourceEdit( resMgr, parent )
+: SUIT_PreferenceMgr( resMgr, parent )
 {
 }
 
@@ -42,7 +42,7 @@ LightApp_Preferences::~LightApp_Preferences()
 int LightApp_Preferences::addPreference( const QString& label, const int pId, const int type,
                                          const QString& section, const QString& param )
 {
-  return addItem( label, pId, type, section, param );
+  return addItem( label, pId, (SUIT_PreferenceMgr::PrefItemType)type, section, param );
 }
 
 /*!
@@ -51,7 +51,7 @@ int LightApp_Preferences::addPreference( const QString& label, const int pId, co
 int LightApp_Preferences::addPreference( const QString& mod, const QString& label, const int pId,
                                          const int type, const QString& section, const QString& param )
 {
-  int id = addItem( label, pId, type, section, param );
+  int id = addItem( label, pId, (SUIT_PreferenceMgr::PrefItemType)type, section, param );
   if ( id != -1 && !mod.isEmpty() )
     myPrefMod.insert( id, mod );
   return id;
@@ -80,9 +80,10 @@ void LightApp_Preferences::onApply()
 }
 
 /*!Emit preference changed.*/
-void LightApp_Preferences::changedResources( const QMap<Item*, QString>& map )
+void LightApp_Preferences::changedResources( const ResourceMap& map )
 {
-  for ( QMap<Item*, QString>::ConstIterator it = map.begin(); it != map.end(); ++it )
+  for ( ResourceMap::ConstIterator it = map.begin(); 
+       it != map.end(); ++it )
   {
     QString sec, param;
     it.key()->resource( sec, param );

diff --git a/src/LightApp/LightApp_Preferences.h b/src/LightApp/LightApp_Preferences.h
index 6a1b3dc1c50cc4c9c3677e9fdf2e59066e8ce992..624f6e2bec32a39308884fc8ff31b6b7995bf5ab 100644 (file)
--- a/src/LightApp/LightApp_Preferences.h
+++ b/src/LightApp/LightApp_Preferences.h
@@ -23,7 +23,7 @@
 #define LIGHTAPP_PREFERENCES_H
 
 #include <LightApp.h>
-#include <QtxListResourceEdit.h>
+#include <SUIT_PreferenceMgr.h>
 
 #include <QMap>
 
@@ -34,7 +34,7 @@ class QtxResourceMgr;
   Custom preference container. Assign each preference category with module.
   Emits signal on preference changing
 */
-class LIGHTAPP_EXPORT LightApp_Preferences : public QtxListResourceEdit
+class LIGHTAPP_EXPORT LightApp_Preferences : public SUIT_PreferenceMgr
 {
   Q_OBJECT
 
@@ -49,13 +49,15 @@ public:
 
   bool                 hasModule( const QString& ) const;
 
+protected:
+  void                 changedResources( const ResourceMap& );
+
 signals:
   void                 preferenceChanged( QString&, QString&, QString& );
 
 private slots:
   void                 onHelp();
   void                 onApply();
-  virtual void         changedResources( const QMap<Item*, QString>& );
 
 private:
   QString              module( const int ) const;

diff --git a/src/LightApp/LightApp_PreferencesDlg.cxx b/src/LightApp/LightApp_PreferencesDlg.cxx
index efb03ca153e03f3713c87643b112f0a3d69d2440..aecff557ee67785357aa54918f0c79041dff2e1c 100644 (file)
--- a/src/LightApp/LightApp_PreferencesDlg.cxx
+++ b/src/LightApp/LightApp_PreferencesDlg.cxx
@@ -42,19 +42,14 @@ myPrefs( prefs ), mySaved ( false )
   QVBoxLayout* main = new QVBoxLayout( mainFrame() );
   main->setMargin( 5 );
   main->setSpacing( 5 );
+  main->addWidget( myPrefs );
 
-  QWidget* vbox = new QWidget( mainFrame() );
-  main->addWidget( vbox );
-
-  QVBoxLayout *base = new QVBoxLayout( vbox );
-  
-  myPrefs->setParent( vbox );
-  myPrefs->move( QPoint( 0, 0 ) );
-  myPrefs->show();
+  //  myPrefs->setParent( vbox );
+  //  myPrefs->move( QPoint( 0, 0 ) );
+  //  myPrefs->show();
 
   setFocusProxy( myPrefs );
-
-  base->addWidget( myPrefs );
+  myPrefs->setFrameStyle( QFrame::Box | QFrame::Sunken );
 
   setButtonPosition( Right, Close );
 
@@ -79,8 +74,8 @@ LightApp_PreferencesDlg::~LightApp_PreferencesDlg()
   if ( !myPrefs )
     return;
 
+  mainFrame()->layout()->removeWidget( myPrefs );
   myPrefs->setParent( 0 );
-  myPrefs->move( QPoint( 0, 0 ) );
   myPrefs->hide();
   myPrefs = 0;
 }

diff --git a/src/LightApp/LightApp_WidgetContainer.cxx b/src/LightApp/LightApp_WidgetContainer.cxx
index e6ac9401f8fc35272cee2d08d93910ca250ec75b..c7ac53a2e427a46fdd28a62d1474da566c6c3696 100644 (file)
--- a/src/LightApp/LightApp_WidgetContainer.cxx
+++ b/src/LightApp/LightApp_WidgetContainer.cxx
@@ -152,3 +152,17 @@ QWidget* LightApp_WidgetContainer::active() const
 {
   return myStack->currentWidget();
 }
+
+/*!
+  \brief Customize show/hide operations.
+
+  Emits visibilityChanged(bool) signal when the widget is 
+  being shown/hidden.
+  
+  \param visible new visibility state
+*/
+void LightApp_WidgetContainer::setVisible ( bool visible )
+{
+  QDockWidget::setVisible( visible );
+  emit( visibilityChanged( visible ) );
+}

diff --git a/src/LightApp/LightApp_WidgetContainer.h b/src/LightApp/LightApp_WidgetContainer.h
index 8fc496f7e75cf3e9f72c9170e170823d54b25825..23aa342a015c93bf1c3d63e806975e81ef14e6b1 100644 (file)
--- a/src/LightApp/LightApp_WidgetContainer.h
+++ b/src/LightApp/LightApp_WidgetContainer.h
@@ -52,6 +52,12 @@ public:
   QWidget*     active() const;
   QWidget*     widget( const int ) const;
 
+public slots:
+  virtual void setVisible ( bool );
+
+signals:
+  void visibilityChanged ( bool );
+
 private:
   int              myType;
   QStackedWidget*  myStack;

diff --git a/src/LightApp/Makefile.am b/src/LightApp/Makefile.am
index 4776d0dc9ee2e06b46487171a0be09a37245df4a..12e38da06d7d3806d60f90dae8a11707c38421bd 100755 (executable)
--- a/src/LightApp/Makefile.am
+++ b/src/LightApp/Makefile.am
@@ -42,7 +42,6 @@ salomeinclude_HEADERS= \
        LightApp_ModuleAction.h \
        LightApp_ModuleDlg.h \
        LightApp_NameDlg.h \
-       LightApp_OBFilter.h \
        LightApp_OBSelector.h \
        LightApp_Operation.h \
        LightApp_Selection.h \
@@ -56,6 +55,8 @@ salomeinclude_HEADERS= \
        LightApp_UpdateFlags.h \
        LightApp_WidgetContainer.h
 
+#      LightApp_OBFilter.h
+
 if ENABLE_VTKVIEWER
 if ENABLE_SALOMEOBJECT
   salomeinclude_HEADERS+= LightApp_VTKSelector.h
@@ -84,7 +85,6 @@ dist_libLightApp_la_SOURCES= \
        LightApp_ModuleAction.cxx \
        LightApp_ModuleDlg.cxx \
        LightApp_NameDlg.cxx \
-       LightApp_OBFilter.cxx \
        LightApp_OBSelector.cxx \
        LightApp_Operation.cxx \
        LightApp_Selection.cxx \
@@ -96,6 +96,8 @@ dist_libLightApp_la_SOURCES= \
        LightApp_PreferencesDlg.cxx \
        LightApp_WidgetContainer.cxx
 
+#      LightApp_OBFilter.cxx
+
 if ENABLE_VTKVIEWER
 if ENABLE_SALOMEOBJECT
   dist_libLightApp_la_SOURCES+= LightApp_VTKSelector.cxx

diff --git a/src/LightApp/resources/LightApp_msg_en.ts b/src/LightApp/resources/LightApp_msg_en.ts
index 3223c0022616475d20559c837493b9f91874444b..15a17e3e9f29ac567ad22007a7adb0aef68b6685 100644 (file)
--- a/src/LightApp/resources/LightApp_msg_en.ts
+++ b/src/LightApp/resources/LightApp_msg_en.ts
@@ -107,7 +107,7 @@ CEA/DEN, CEDRAT, EDF R&amp;D, LEG, PRINCIPIA R&amp;D, BUREAU VERITAS</translatio
     </message>
     <message>
         <source>PREFERENCES_NOT_LOADED</source>
-        <translation>Preferences for module &quot;&lt;b&gt;%1&lt;/b&gt;&quot; will be available when the module will be loaded</translation>
+        <translation>Preferences for module &quot;&lt;b&gt;%N&lt;/b&gt;&quot; will be available when the module will be loaded</translation>
     </message>
     <message>
         <source>PREF_LINEAR</source>

diff --git a/src/Qtx/Makefile.am b/src/Qtx/Makefile.am
index 5addbdd15808039cbb346e5903e463bce1ce7e98..d6b55351312d9edf24b0c47dc757429279b41c35 100755 (executable)
--- a/src/Qtx/Makefile.am
+++ b/src/Qtx/Makefile.am
@@ -33,6 +33,7 @@ salomeinclude_HEADERS=                \
        QtxActionMgr.h          \
        QtxActionSet.h          \
        QtxActionToolMgr.h      \
+       QtxColorButton.h        \
        QtxColorScale.h         \
        QtxComboBox.h           \
        QtxDialog.h             \
@@ -40,6 +41,7 @@ salomeinclude_HEADERS=                \
        QtxDockWidget.h         \
        QtxDoubleSpinBox.h      \
        QtxEvalExpr.h           \
+       QtxFontEdit.h           \
        QtxGridBox.h            \
        QtxGroupBox.h           \
        QtxIntSpinBox.h         \
@@ -48,8 +50,12 @@ salomeinclude_HEADERS=               \
        QtxMainWindow.h         \
        QtxMap.h                \
        QtxMRUAction.h          \
+       QtxPagePrefMgr.h        \
        QtxPathDialog.h         \
+       QtxPathEdit.h           \
+       QtxPathListEdit.h       \
        QtxPopupMgr.h           \
+       QtxPreferenceMgr.h      \
        QtxResourceMgr.h        \
        QtxSplash.h             \
        QtxToolBar.h            \
@@ -62,12 +68,9 @@ salomeinclude_HEADERS=               \
 
 #VSR: not yet migrated to Qt4 files
 #                              \
-       QtxDirListEditor.h      \
        QtxListBox.h            \
-       QtxListResourceEdit.h   \
        QtxListView.h           \
        QtxPopupMenu.h          \
-       QtxResourceEdit.h       \
        QtxTable.h
 
 # Libraries targets
@@ -82,6 +85,7 @@ dist_libqtx_la_SOURCES=               \
        QtxActionMgr.cxx        \
        QtxActionSet.cxx        \
        QtxActionToolMgr.cxx    \
+       QtxColorButton.cxx      \
        QtxColorScale.cxx       \
        QtxComboBox.cxx         \
        QtxDialog.cxx           \
@@ -89,6 +93,7 @@ dist_libqtx_la_SOURCES=               \
        QtxDockWidget.cxx       \
        QtxDoubleSpinBox.cxx    \
        QtxEvalExpr.cxx         \
+       QtxFontEdit.cxx         \
        QtxGridBox.cxx          \
        QtxGroupBox.cxx         \
        QtxIntSpinBox.cxx       \
@@ -96,8 +101,12 @@ dist_libqtx_la_SOURCES=             \
        QtxLogoMgr.cxx          \
        QtxMainWindow.cxx       \
        QtxMRUAction.cxx        \
+       QtxPagePrefMgr.cxx      \
        QtxPathDialog.cxx       \
+       QtxPathEdit.cxx         \
+       QtxPathListEdit.cxx     \
        QtxPopupMgr.cxx         \
+       QtxPreferenceMgr.cxx    \
        QtxResourceMgr.cxx      \
        QtxSplash.cxx           \
        QtxToolBar.cxx          \
@@ -110,12 +119,9 @@ dist_libqtx_la_SOURCES=            \
 
 #VSR: not yet migrated to Qt4 files
 #                              \
-       QtxDirListEditor.cxx    \
        QtxListBox.cxx          \
-       QtxListResourceEdit.cxx \
        QtxListView.cxx         \
        QtxPopupMenu.cxx        \
-       QtxResourceEdit.cxx     \
        QtxTable.cxx
 
 #VSR: already migrated to Qt4 files
@@ -125,12 +131,14 @@ MOC_FILES=                                \
        QtxActionMgr_moc.cxx            \
        QtxActionSet_moc.cxx            \
        QtxActionToolMgr_moc.cxx        \
+       QtxColorButton_moc.cxx          \
        QtxColorScale_moc.cxx           \
        QtxComboBox_moc.cxx             \
        QtxDialog_moc.cxx               \
        QtxDockAction_moc.cxx           \
        QtxDockWidget_moc.cxx           \
        QtxDoubleSpinBox_moc.cxx        \
+       QtxFontEdit_moc.cxx             \
        QtxGridBox_moc.cxx              \
        QtxGroupBox_moc.cxx             \
        QtxIntSpinBox_moc.cxx           \
@@ -138,7 +146,10 @@ MOC_FILES=                         \
        QtxLogoMgr_moc.cxx              \
        QtxMainWindow_moc.cxx           \
        QtxMRUAction_moc.cxx            \
+       QtxPagePrefMgr_moc.cxx          \
        QtxPathDialog_moc.cxx           \
+       QtxPathEdit_moc.cxx             \
+       QtxPathListEdit_moc.cxx         \
        QtxPopupMgr_moc.cxx             \
        QtxSplash_moc.cxx               \
        QtxToolBar_moc.cxx              \
@@ -151,9 +162,7 @@ MOC_FILES=                          \
 
 #VSR: not yet migrated to Qt4 files
 #                                      \
-       QtxDirListEditor_moc.cxx        \
        QtxListBox_moc.cxx              \
-       QtxListResourceEdit_moc.cxx     \
        QtxListView_moc.cxx             \
        QtxPopupMenu_moc.cxx            \
        QtxTable_moc.cxx

diff --git a/src/Qtx/QtxActionMenuMgr.cxx b/src/Qtx/QtxActionMenuMgr.cxx
index dea19a61373663b1a1f97013c54765c393e7687f..07bbc1100b932f1df44eb04cda5dd6bf72c4f001 100644 (file)
--- a/src/Qtx/QtxActionMenuMgr.cxx
+++ b/src/Qtx/QtxActionMenuMgr.cxx
@@ -17,7 +17,7 @@
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 // File:      QtxActionMenuMgr.cxx
-// Author:    Alexander SOLOVYEV, Sergey TELKOV
+// Author:    Alexander SOLOVYOV, Sergey TELKOV
 
 #include "QtxActionMenuMgr.h"
 

diff --git a/src/Qtx/QtxActionMenuMgr.h b/src/Qtx/QtxActionMenuMgr.h
index 5bc0c800a432801709fb85b2dc001d901f7e17aa..96d15b51b4feea3e8c0897583dfd1cdfb682d84c 100644 (file)
--- a/src/Qtx/QtxActionMenuMgr.h
+++ b/src/Qtx/QtxActionMenuMgr.h
@@ -17,7 +17,7 @@
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 // File:      QtxActionMenuMgr.h
-// Author:    Alexander SOLOVYEV, Sergey TELKOV
+// Author:    Alexander SOLOVYOV, Sergey TELKOV
 
 #ifndef QTXACTIONMENUMGR_H
 #define QTXACTIONMENUMGR_H

diff --git a/src/Qtx/QtxActionMgr.cxx b/src/Qtx/QtxActionMgr.cxx
index 2ae9ebf02d84c27ff38987a3809df1987ef12906..bd023642299f0787d14c6e0dba9bee4ed3dbb2bc 100644 (file)
--- a/src/Qtx/QtxActionMgr.cxx
+++ b/src/Qtx/QtxActionMgr.cxx
@@ -17,7 +17,7 @@
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 // File:      QtxActionMgr.cxx
-// Author:    Alexander SOLOVYEV, Sergey TELKOV
+// Author:    Alexander SOLOVYOV, Sergey TELKOV
 
 #include "Qtx.h"
 #include "QtxActionMgr.h"

diff --git a/src/Qtx/QtxActionMgr.h b/src/Qtx/QtxActionMgr.h
index 0c710386d1945899e6e91a02f0f03d71e93c2bba..2cd2cc9fabfc784f15248a24e4abea16c5370bb4 100644 (file)
--- a/src/Qtx/QtxActionMgr.h
+++ b/src/Qtx/QtxActionMgr.h
@@ -17,7 +17,7 @@
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 // File:      QtxActionMgr.h
-// Author:    Alexander SOLOVYEV, Sergey TELKOV
+// Author:    Alexander SOLOVYOV, Sergey TELKOV
 
 #ifndef QTXACTIONMGR_H
 #define QTXACTIONMGR_H

diff --git a/src/Qtx/QtxActionToolMgr.cxx b/src/Qtx/QtxActionToolMgr.cxx
index e0b7fbd2908ec0c3a5ddd6b631a3d726f3233d00..73ac80a5f520d606c50df4e58dc797adc58b20d5 100644 (file)
--- a/src/Qtx/QtxActionToolMgr.cxx
+++ b/src/Qtx/QtxActionToolMgr.cxx
@@ -17,7 +17,7 @@
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 // File:      QtxActionToolMgr.cxx
-// Author:    Alexander SOLOVYEV, Sergey TELKOV
+// Author:    Alexander SOLOVYOV, Sergey TELKOV
 
 #include "QtxActionToolMgr.h"
 

diff --git a/src/Qtx/QtxActionToolMgr.h b/src/Qtx/QtxActionToolMgr.h
index 56adc04d2f7d911f3ab750b1e406fb833a5a341d..be8bda268f510805071295862cc0a995929a8524 100644 (file)
--- a/src/Qtx/QtxActionToolMgr.h
+++ b/src/Qtx/QtxActionToolMgr.h
@@ -17,7 +17,7 @@
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 // File:      QtxActionToolMgr.h
-// Author:    Alexander SOLOVYEV, Sergey TELKOV
+// Author:    Alexander SOLOVYOV, Sergey TELKOV
 
 #ifndef QTXACTIONTOOLMGR_H
 #define QTXACTIONTOOLMGR_H

diff --git a/src/Qtx/QtxColorButton.cxx b/src/Qtx/QtxColorButton.cxx
index 24c4c5b5dc375f6db1388e3b73e16ce1507d0929..31bf651f19fc25960c0d2ff6f51bf338aae8d4bf 100644 (file)
--- a/src/Qtx/QtxColorButton.cxx
+++ b/src/Qtx/QtxColorButton.cxx
@@ -30,6 +30,21 @@
 #include <QColorDialog>
 #include <QStyleOptionToolButton>
 
+/*!
+  \class QtxColorButton
+  \brief The QtxColorButton class implements a widget for color
+  preference items editing.
+
+  The color preference item is represented as the colored button,
+  clicking on which invokes the standard "Select color" dialog box.
+
+  Initial color value can be set with setColor() method. Currently
+  chosen color can be retrieved with color() method.
+*/
+
+/*!
+  \brief 
+*/
 QtxColorButton::QtxColorButton( QWidget* parent )
 : QToolButton( parent )
 {
@@ -74,15 +89,24 @@ QtxColorButton::QtxColorButton( QWidget* parent )
   connect( this, SIGNAL( clicked( bool ) ), this, SLOT( onClicked( bool ) ) );
 }
 
+/*!
+  \brief 
+*/
 QtxColorButton::~QtxColorButton()
 {
 }
 
+/*!
+  \brief 
+*/
 QColor QtxColorButton::color() const
 {
   return myColors.contains( this ) ? myColors[this] : QColor();
 }
 
+/*!
+  \brief 
+*/
 void QtxColorButton::setColor( const QColor& c )
 {
   myColors.insert( this, c );
@@ -90,11 +114,17 @@ void QtxColorButton::setColor( const QColor& c )
   updateState();
 }
 
+/*!
+  \brief 
+*/
 void QtxColorButton::onClicked( bool )
 {
   emit clicked( color() );
 }
 
+/*!
+  \brief 
+*/
 void QtxColorButton::onToggled( bool on )
 {
   const QToolButton* tb = ::qobject_cast<QToolButton*>( sender() );
@@ -118,6 +148,9 @@ void QtxColorButton::onToggled( bool on )
     emit changed( color() );
 }
 
+/*!
+  \brief 
+*/
 void QtxColorButton::onDialogClicked( bool )
 {
   QColor c = QColorDialog::getColor( color(), this );
@@ -132,6 +165,9 @@ void QtxColorButton::onDialogClicked( bool )
     emit changed( color() );
 }
 
+/*!
+  \brief 
+*/
 void QtxColorButton::paintEvent( QPaintEvent* e )
 {
   QToolButton::paintEvent( e );
@@ -157,6 +193,9 @@ void QtxColorButton::paintEvent( QPaintEvent* e )
   p.end();
 }
 
+/*!
+  \brief 
+*/
 void QtxColorButton::updateState()
 {
   QColor c = color().toRgb();
@@ -175,6 +214,9 @@ void QtxColorButton::updateState()
   }
 }
 
+/*!
+  \brief 
+*/
 void QtxColorButton::updateButton( QToolButton* btn )
 {
   btn->setIcon( buttonIcon( myColors[btn] ) );
@@ -198,6 +240,9 @@ QPixmap QtxColorButton::buttonIcon( const QColor& c ) const
   return pix;
 }
 
+/*!
+  \brief 
+*/
 void QtxColorButton::drawColor( QPaintDevice* pd, const QColor& c, const int m ) const
 {
   if ( !pd )
@@ -210,6 +255,9 @@ void QtxColorButton::drawColor( QPaintDevice* pd, const QColor& c, const int m )
   p.end();
 }
 
+/*!
+  \brief 
+*/
 QList<QColor> QtxColorButton::colorsList() const
 {
   QList<QColor> lst;

diff --git a/src/Qtx/QtxDialog.h b/src/Qtx/QtxDialog.h
index c77d0fa08e5e59172c33f646321369945f8708f1..86006f54753c0796979580d70471dbe036a60fbf 100755 (executable)
--- a/src/Qtx/QtxDialog.h
+++ b/src/Qtx/QtxDialog.h
@@ -16,7 +16,7 @@
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-// File:      QtxDialog.hxx
+// File:      QtxDialog.h
 // Author:    Sergey TELKOV
 
 #ifndef QTXDIALOG_H

diff --git a/src/Qtx/QtxDockAction.h b/src/Qtx/QtxDockAction.h
index f6ee3313fc43a2590076f6a0011b10d39de4e172..293e3351d669aefe9eb957a83d2b3cececec8df5 100755 (executable)
--- a/src/Qtx/QtxDockAction.h
+++ b/src/Qtx/QtxDockAction.h
@@ -19,8 +19,8 @@
 // File:      QtxDockAction.h
 // Author:    Sergey TELKOV
 
-#ifndef QTX_DOCKACTION_H
-#define QTX_DOCKACTION_H
+#ifndef QTXDOCKACTION_H
+#define QTXDOCKACTION_H
 
 #include "QtxAction.h"
 
@@ -81,4 +81,4 @@ private:
 #pragma warning( default:4251 )
 #endif
 
-#endif // QTX_DOCKACTION_H
+#endif // QTXDOCKACTION_H

diff --git a/src/Qtx/QtxDockWidget.h b/src/Qtx/QtxDockWidget.h
index ed7cb25e905ddd98ed2fd3a245ca982dac0a09fb..f94756ebf5f7e4401b68bf4a70391b0fa2afd41a 100644 (file)
--- a/src/Qtx/QtxDockWidget.h
+++ b/src/Qtx/QtxDockWidget.h
@@ -19,6 +19,9 @@
 // File:      QtxDockWidget.h
 // Author:    Sergey TELKOV
 
+#ifndef QTXDOCKWIDGET_H
+#define QTXDOCKWIDGET_H
+
 #include "Qtx.h"
 
 #include <QDockWidget>
@@ -56,3 +59,5 @@ private:
   Watcher*        myWatcher;       //!< watcher object
   Qt::Orientation myOrientation;   //!< dockable window orientation
 };
+
+#endif // QTXDOCKWIDGET_H

diff --git a/src/Qtx/QtxEvalExpr.cxx b/src/Qtx/QtxEvalExpr.cxx
index d16abdc62286cb943598dea38a2b882ef41cac69..f74e17f8a337d56ce7de067c4060e1df2f6135b0 100644 (file)
--- a/src/Qtx/QtxEvalExpr.cxx
+++ b/src/Qtx/QtxEvalExpr.cxx
@@ -16,6 +16,8 @@
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+// File:      QtxEvalExpr.cxx
+// Author:    Alexander SOLOVYOV, Sergey TELKOV
 
 #include "QtxEvalExpr.h"
 

diff --git a/src/Qtx/QtxEvalExpr.h b/src/Qtx/QtxEvalExpr.h
index 70f1ce6c34b25c525d2eeb1793c5093a42ed464d..34acd474789d0f8615d236bbe8865406a82e372a 100644 (file)
--- a/src/Qtx/QtxEvalExpr.h
+++ b/src/Qtx/QtxEvalExpr.h
@@ -17,10 +17,10 @@
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 // File:      QtxEvalExpr.h
-// Author:    Alexander SOLOVYOV
+// Author:    Alexander SOLOVYOV, Sergey TELKOV
 
-#ifndef QTX_EVALEXPR_H
-#define QTX_EVALEXPR_H
+#ifndef QTXEVALEXPR_H
+#define QTXEVALEXPR_H
 
 #include "Qtx.h"
 
@@ -321,4 +321,4 @@ public:
   virtual QtxEvalExpr::Error calculate( const QString&, QVariant&, QVariant& ) const;
 };
 
-#endif
+#endif // QTXEVALEXPR_H

diff --git a/src/Qtx/QtxFontEdit.h b/src/Qtx/QtxFontEdit.h
index b851ce9f1710a9792ed78040851feddb7c14e6c3..7db64f34ff6f8dd584c2c1f0eb4f9ca7b92503c3 100644 (file)
--- a/src/Qtx/QtxFontEdit.h
+++ b/src/Qtx/QtxFontEdit.h
@@ -19,8 +19,8 @@
 // File:      QtxFontEdit.h
 // Author:    Sergey TELKOV
 
-#ifndef QtxFontEdit_H
-#define QtxFontEdit_H
+#ifndef QTXFONTEDIT_H
+#define QTXFONTEDIT_H
 
 #include "Qtx.h"
 
@@ -80,4 +80,4 @@ private:
   QToolButton    *myB, *myI, *myU;
 };
 
-#endif
+#endif // QTXFONTEDIT_H

diff --git a/src/Qtx/QtxListAction.h b/src/Qtx/QtxListAction.h
index 1ec4c31e3bac93ec8dd8a4dcc041a486e44343c2..1826985516ae97802defc8473df34e814a6e1487 100755 (executable)
--- a/src/Qtx/QtxListAction.h
+++ b/src/Qtx/QtxListAction.h
@@ -16,8 +16,8 @@
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-// File:      QtxListAction.hxx
-// Author:    Sergey TELKOV (Based on code by Eugene AKSENOV)
+// File:      QtxListAction.h
+// Author:    Sergey TELKOV
 
 #ifndef QTXLISTACTION_H
 #define QTXLISTACTION_H

diff --git a/src/Qtx/QtxListView.cxx b/src/Qtx/QtxListView.cxx
index 92af7e34cefdc451cdcb0d9ee86205462aaa0e01..9abe0649703c9d43c85528f42313fff3f11953d2 100755 (executable)
--- a/src/Qtx/QtxListView.cxx
+++ b/src/Qtx/QtxListView.cxx
@@ -16,6 +16,8 @@
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+// File:      QtxListView.cxx
+// Author:    Sergey TELKOV
 
 #include "QtxListView.h"
 

diff --git a/src/Qtx/QtxListView.h b/src/Qtx/QtxListView.h
index 76aa63a05e6fb227a3385d1dd21f5f6c352f9b52..f794112497e9b3a966a88a19a6d69f394e3e03c2 100755 (executable)
--- a/src/Qtx/QtxListView.h
+++ b/src/Qtx/QtxListView.h
@@ -16,6 +16,8 @@
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+// File:      QtxListView.h
+// Author:    Sergey TELKOV
 
 #ifndef QTXLISTVIEW_H
 #define QTXLISTVIEW_H

diff --git a/src/Qtx/QtxLogoMgr.cxx b/src/Qtx/QtxLogoMgr.cxx
index b5bd38895e1e06353551153730dab09a86ec90dd..e04d32fdfeb381b26161b8dc92e4f8ee1b8a5e93 100644 (file)
--- a/src/Qtx/QtxLogoMgr.cxx
+++ b/src/Qtx/QtxLogoMgr.cxx
@@ -16,6 +16,9 @@
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+// File:      QtxLogoMgr.cxx
+// Author:    Sergey TELKOV
+
 #include "QtxLogoMgr.h"
 
 #include <QLabel>

diff --git a/src/Qtx/QtxLogoMgr.h b/src/Qtx/QtxLogoMgr.h
index 6e8d521cd9dd6b25f6daaf4f2f39c6ba0431aacf..73b49ee5ad4df75bae5d4b75cdfaad63b5b9361b 100644 (file)
--- a/src/Qtx/QtxLogoMgr.h
+++ b/src/Qtx/QtxLogoMgr.h
@@ -16,8 +16,11 @@
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-#ifndef QTX_LOGOMGR_H
-#define QTX_LOGOMGR_H
+// File:      QtxLogoMgr.h
+// Author:    Sergey TELKOV
+
+#ifndef QTXLOGOMGR_H
+#define QTXLOGOMGR_H
 
 #include "Qtx.h"
 
@@ -74,4 +77,4 @@ private:
 #pragma warning( default : 4251 )
 #endif
 
-#endif
+#endif // QTXLOGOMGR_H

diff --git a/src/Qtx/QtxMap.h b/src/Qtx/QtxMap.h
index 2030b9e9846051fc390dc7a860c8f5f75a0f7fec..403fc3284804237b51864eb2517703b847ef2a13 100644 (file)
--- a/src/Qtx/QtxMap.h
+++ b/src/Qtx/QtxMap.h
@@ -19,8 +19,8 @@
 // File:      QtxMap.h
 // Author:    Vadim SANDLER
 
-#ifndef QTX_MAP_H
-#define QTX_MAP_H
+#ifndef QTXMAP_H
+#define QTXMAP_H
 
 template <class Key, class Value> class IMap;
 template <class Key, class Value> class IMapIterator;
@@ -207,4 +207,4 @@ private:
   friend class IMap<Key,Value>;
 };
 
-#endif // QTX_MAP_H
+#endif // QTXMAP_H

diff --git a/src/Qtx/QtxPagePrefMgr.cxx b/src/Qtx/QtxPagePrefMgr.cxx
index 897ef71f1069ce4645f4ec5a156cfe1834129af5..7ce6dfcfff4c263a35167cc0f9137b84b569c91f 100644 (file)
--- a/src/Qtx/QtxPagePrefMgr.cxx
+++ b/src/Qtx/QtxPagePrefMgr.cxx
@@ -1127,7 +1127,7 @@ int QtxPagePrefEditItem::inputType() const
   return myType;
 }
 
-void QtxPagePrefEditItem::setInputType( const type )
+void QtxPagePrefEditItem::setInputType( const int type )
 {
   if ( myType == type )
     return;
@@ -1190,7 +1190,8 @@ void QtxPagePrefEditItem::updateEditor()
   if ( !myEditor->text().isEmpty() && val )
   {
     int pos = 0;
-    if ( val->validate( myEditor->text(), pos ) == QValidator::Invalid )
+    QString str = myEditor->text();
+    if ( val->validate( str, pos ) == QValidator::Invalid )
       myEditor->clear();
   }
 
@@ -1232,7 +1233,7 @@ int QtxPagePrefSelectItem::inputType() const
   return myType;
 }
 
-void QtxPagePrefSelectItem::setInputType( const type )
+void QtxPagePrefSelectItem::setInputType( const int type )
 {
   if ( myType == type )
     return;
@@ -1398,7 +1399,8 @@ void QtxPagePrefSelectItem::updateSelector()
   if ( mySelector->isEditable() && !mySelector->currentText().isEmpty() && val )
   {
     int pos = 0;
-    if ( val->validate( mySelector->currentText(), pos ) == QValidator::Invalid )
+    QString str = mySelector->currentText();
+    if ( val->validate( str, pos ) == QValidator::Invalid )
       mySelector->clearEditText();
   }
 
@@ -1436,7 +1438,7 @@ int QtxPagePrefSpinItem::inputType() const
   return myType;
 }
 
-void QtxPagePrefSpinItem::setInputType( const type )
+void QtxPagePrefSpinItem::setInputType( const int type )
 {
   if ( myType == type )
     return;

diff --git a/src/Qtx/QtxPagePrefMgr.h b/src/Qtx/QtxPagePrefMgr.h
index aa8c0f95b0d7527b955b1a4085d5bdfdc86041c6..b839980704ce7d2099343406358b2931083b9daf 100644 (file)
--- a/src/Qtx/QtxPagePrefMgr.h
+++ b/src/Qtx/QtxPagePrefMgr.h
@@ -374,7 +374,7 @@ public:
   virtual ~QtxPagePrefEditItem();
 
   int              inputType() const;
-  void             setInputType( const type );
+  void             setInputType( const int );
 
   virtual void     store();
   virtual void     retrieve();
@@ -409,7 +409,7 @@ public:
   virtual ~QtxPagePrefSelectItem();
 
   int              inputType() const;
-  void             setInputType( const type );
+  void             setInputType( const int );
 
   QStringList      strings() const;
   QList<int>       numbers() const;
@@ -467,7 +467,7 @@ public:
   void             setSpecialValueText( const QString& );
 
   int              inputType() const;
-  void             setInputType( const type );
+  void             setInputType( const int );
 
   virtual void     store();
   virtual void     retrieve();

diff --git a/src/Qtx/QtxPathListEdit.cxx b/src/Qtx/QtxPathListEdit.cxx
index 5766eff74c867a1dfa8b4b4f66df17b07af1c3d9..64b35607361945f0220e9b3624e0d050cf000806 100644 (file)
--- a/src/Qtx/QtxPathListEdit.cxx
+++ b/src/Qtx/QtxPathListEdit.cxx
@@ -16,6 +16,9 @@
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+// File:      QtxPathListEdit.cxx
+// Author:    Sergey TELKOV
+
 #include "QtxPathListEdit.h"
 
 #include "QtxPathEdit.h"

diff --git a/src/Qtx/QtxPathListEdit.h b/src/Qtx/QtxPathListEdit.h
index 2cb7f81af19e7ff48491bab100b2eab14a1eefbd..10d4dbe337430bc70bcd18dc11593e4166d19b51 100644 (file)
--- a/src/Qtx/QtxPathListEdit.h
+++ b/src/Qtx/QtxPathListEdit.h
@@ -16,8 +16,11 @@
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-#ifndef QTX_PATHLISTEDIT_H
-#define QTX_PATHLISTEDIT_H
+// File:      QtxPathListEdit.h
+// Author:    Sergey TELKOV
+
+#ifndef QTXPATHLISTEDIT_H
+#define QTXPATHLISTEDIT_H
 
 #include "Qtx.h"
 
@@ -87,4 +90,4 @@ private:
   friend class QtxPathListEdit::Delegate;
 };
 
-#endif
+#endif // QTXPATHLISTEDIT_H

diff --git a/src/Qtx/QtxPopupMenu.cxx b/src/Qtx/QtxPopupMenu.cxx
index 8a1a4e458cac3983fe0c621126f64261a04c54e5..b4141deee7276cf0c376c786a0dab8818fba4d20 100644 (file)
--- a/src/Qtx/QtxPopupMenu.cxx
+++ b/src/Qtx/QtxPopupMenu.cxx
@@ -16,6 +16,9 @@
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+// File:      QtxPopupMenu.cxx
+// Author:    Sergey TELKOV
+
 #include "QtxPopupMenu.h"
 
 #include <qpainter.h>

diff --git a/src/Qtx/QtxPopupMenu.h b/src/Qtx/QtxPopupMenu.h
index 01dd27041d63efff9d197afd0fe065cbac38ce99..235989a73cfc24b8cd8946e7d30e1043b259a771 100644 (file)
--- a/src/Qtx/QtxPopupMenu.h
+++ b/src/Qtx/QtxPopupMenu.h
@@ -16,6 +16,9 @@
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+// File:      QtxPopupMenu.h
+// Author:    Sergey TELKOV
+
 #ifndef QTXPOPUPMENU_H
 #define QTXPOPUPMENU_H
 
@@ -71,4 +74,4 @@ private:
   int                    myPolicy;
 };
 
-#endif
+#endif // QTXPOPUPMENU_H

diff --git a/src/Qtx/QtxPopupMgr.cxx b/src/Qtx/QtxPopupMgr.cxx
index d2f9be088e5061221585b2da255f1a99c58527a3..3efd99ae17e7a3731c75ad80b32c5073a5130915 100644 (file)
--- a/src/Qtx/QtxPopupMgr.cxx
+++ b/src/Qtx/QtxPopupMgr.cxx
@@ -16,6 +16,8 @@
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+// File:      QtxPopupMgr.cxx
+// Author:    Alexander SOLOVYOV, Sergey TELKOV
 
 #include "QtxPopupMgr.h"
 #include "QtxAction.h"

diff --git a/src/Qtx/QtxPopupMgr.h b/src/Qtx/QtxPopupMgr.h
index 388410842d11742425961d6135a383deaab962c8..2dbea128081a4462e058e9c2913dd8c0b064f931 100644 (file)
--- a/src/Qtx/QtxPopupMgr.h
+++ b/src/Qtx/QtxPopupMgr.h
@@ -16,6 +16,8 @@
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+// File:      QtxPopupMgr.h
+// Author:    Alexander SOLOVYOV, Sergey TELKOV
 
 #ifndef QTXPOPUPMGR_H
 #define QTXPOPUPMGR_H
@@ -121,4 +123,4 @@ private:
   OptionsMap         myOptions;
 };
 
-#endif
+#endif // QTXPOPUPMGR_H

diff --git a/src/Qtx/QtxResourceMgr.cxx b/src/Qtx/QtxResourceMgr.cxx
index 70a27527ab872ce0ad84bbf00ee72bec891aa36b..2741e835264c96b1391e34c5763d91a038c33496 100644 (file)
--- a/src/Qtx/QtxResourceMgr.cxx
+++ b/src/Qtx/QtxResourceMgr.cxx
@@ -16,6 +16,9 @@
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+// File:      QtxResourceMgr.cxx
+// Author:    Alexander SOLOVYOV, Sergey TELKOV
+
 #include "QtxResourceMgr.h"
 
 #include <QDir>

diff --git a/src/Qtx/QtxResourceMgr.h b/src/Qtx/QtxResourceMgr.h
index 6508fc95abd910bc9293498bdc9c3edc4159d125..b70caa2c545ac4b3c0fc9f412046ada4cf010bf4 100644 (file)
--- a/src/Qtx/QtxResourceMgr.h
+++ b/src/Qtx/QtxResourceMgr.h
@@ -17,10 +17,10 @@
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 // File:      QtxResourceMgr.h
-// Author:    Alexander SOLOVYEV, Sergey TELKOV
+// Author:    Alexander SOLOVYOV, Sergey TELKOV
 
-#ifndef QTX_RESOURCEMGR_H
-#define QTX_RESOURCEMGR_H
+#ifndef QTXRESOURCEMGR_H
+#define QTXRESOURCEMGR_H
 
 #include "Qtx.h"
 
@@ -201,4 +201,4 @@ private:
   QMap<QString, QString> myOpt;    //!< options map
 };
 
-#endif // QTX_RESOURCEMGR_H
+#endif // QTXRESOURCEMGR_H

diff --git a/src/Qtx/QtxTable.h b/src/Qtx/QtxTable.h
index b7175d08e1e2b8df14c4f932d75ba865383e583d..7af602210f8752d97f7af855ce0953ece3c8d50c 100644 (file)
--- a/src/Qtx/QtxTable.h
+++ b/src/Qtx/QtxTable.h
@@ -19,8 +19,8 @@
 // File:      QtxTable.h
 // Author:    Sergey TELKOV
 
-#ifndef QTX_TABLE_H
-#define QTX_TABLE_H
+#ifndef QTXTABLE_H
+#define QTXTABLE_H
 
 #include "Qtx.h"
 
@@ -85,4 +85,4 @@ private:
 
 #endif
 
-#endif
+#endif // QTXTABLE_H

diff --git a/src/Qtx/QtxToolBar.cxx b/src/Qtx/QtxToolBar.cxx
index af3b3c3c83cde5443c29936b663b27dc2b47aa18..edbf469e0e3d88c5e5f2b208bbec5c08b327d168 100644 (file)
--- a/src/Qtx/QtxToolBar.cxx
+++ b/src/Qtx/QtxToolBar.cxx
@@ -259,6 +259,7 @@ QtxToolBar::QtxToolBar( const bool watch, const QString& label, QWidget* parent
 {
   if ( watch )
     myWatcher = new Watcher( this );
+  setObjectName( label );
 }
 
 /*!
@@ -271,6 +272,7 @@ QtxToolBar::QtxToolBar( const QString& label, QWidget* parent )
   myWatcher( 0 ),
   myStretch( false )
 {
+  setObjectName( label );
 }
 
 /*!

diff --git a/src/Qtx/QtxToolBar.h b/src/Qtx/QtxToolBar.h
index 7d0918fcf85f523aa1d2a2562f55f79b3d21c4e5..8e520d715753851a6be65ae47ba066af229c4dad 100644 (file)
--- a/src/Qtx/QtxToolBar.h
+++ b/src/Qtx/QtxToolBar.h
@@ -19,6 +19,9 @@
 // File:      QtxToolBar.h
 // Author:    Sergey TELKOV
 
+#ifndef QTXTOOLBAR_H
+#define QTXTOOLBAR_H
+
 #include "Qtx.h"
 
 #include <QToolBar>
@@ -48,3 +51,5 @@ private:
   Watcher*      myWatcher;   //!< watcher object
   bool          myStretch;   //!< stretching toolbar flag (not used)
 };
+
+#endif // QTXTOOLBAR_H

diff --git a/src/Qtx/QtxValidator.h b/src/Qtx/QtxValidator.h
index ca5b6121f51759a892d1b631e71d51530f76b3fe..b6a6103a0b152d8ca8e76106578cfe909302c05e 100644 (file)
--- a/src/Qtx/QtxValidator.h
+++ b/src/Qtx/QtxValidator.h
@@ -19,8 +19,8 @@
 // File:      QtxValidator.h
 // Author:    Alexandre SOLOVYOV
 
-#ifndef QTX_VALIDATOR_H
-#define QTX_VALIDATOR_H
+#ifndef QTXVALIDATOR_H
+#define QTXVALIDATOR_H
 
 #include "Qtx.h"
 
@@ -50,4 +50,4 @@ public:
   virtual void fixup( QString& ) const;
 };
 
-#endif
+#endif // QTXVALIDATOR_H

diff --git a/src/SUIT/Makefile.am b/src/SUIT/Makefile.am
index 32ab09def893b59f6643ff697a0af1130a42aa60..55898ef11028265d5cb88adc39715fc7a608c7fe 100755 (executable)
--- a/src/SUIT/Makefile.am
+++ b/src/SUIT/Makefile.am
@@ -42,6 +42,7 @@ salomeinclude_HEADERS=                        \
        SUIT_Operation.h                \
        SUIT_OverrideCursor.h           \
        SUIT_PopupClient.h              \
+       SUIT_PreferenceMgr.h            \
        SUIT_ResourceMgr.h              \
        SUIT_SelectionFilter.h          \
        SUIT_SelectionMgr.h             \
@@ -72,6 +73,7 @@ dist_libsuit_la_SOURCES=              \
        SUIT_Operation.cxx              \
        SUIT_OverrideCursor.cxx         \
        SUIT_PopupClient.cxx            \
+       SUIT_PreferenceMgr.cxx          \
        SUIT_ResourceMgr.cxx            \
        SUIT_SelectionFilter.cxx        \
        SUIT_SelectionMgr.cxx           \
@@ -93,6 +95,7 @@ MOC_FILES=                            \
        SUIT_FileDlg_moc.cxx            \
        SUIT_Operation_moc.cxx          \
        SUIT_PopupClient_moc.cxx        \
+       SUIT_PreferenceMgr_moc.cxx      \
        SUIT_SelectionMgr_moc.cxx       \
        SUIT_Selector_moc.cxx           \
        SUIT_Session_moc.cxx            \

diff --git a/src/SUIT/SUIT_PreferenceMgr.cxx b/src/SUIT/SUIT_PreferenceMgr.cxx
index 1db3fc6a85d51ac06a6ebd6716c6e629fda4abc9..04dbffda2a2b485221bc0311c5d952de242b1296 100644 (file)
--- a/src/SUIT/SUIT_PreferenceMgr.cxx
+++ b/src/SUIT/SUIT_PreferenceMgr.cxx
@@ -62,7 +62,7 @@ int SUIT_PreferenceMgr::addItem( const QString& title, const int pId,
     parent = findItem( pId );
 
   if ( !parent )
-    parent = new QtxPagePrefListItem( QString(), this );
+    parent = new QtxPagePrefListItem( QString( "Root" ), this );
 
   switch( type )
   {