Merge relevant changes from V8_0_0_BR branch

diff --git a/SalomeYACSConfig.cmake.in b/SalomeYACSConfig.cmake.in
index 2243e3c500a8b5da265cbcd57ec239f727c7e4e6..2c4a683c09f387c8f8f16ffcd98b7cdd3758eb28 100644 (file)
--- a/SalomeYACSConfig.cmake.in
+++ b/SalomeYACSConfig.cmake.in
@@ -82,32 +82,34 @@ IF(SALOME_YACS_BUILD_GUI)
   LIST(APPEND YACS_DEFINITIONS "@GUI_DEFINITIONS@")
 ENDIF()
 
-# For all prerequisites, load the corresponding targets if the package was used 
+# For all prerequisites, load the corresponding targets if the package was used
 # in CONFIG mode. This ensures dependent projects link correctly
 # without having to set LD_LIBRARY_PATH:
-SET(_PREREQ @_PREREQ_LIST@)
-SET(_PREREQ_CONFIG_DIR @_PREREQ_DIR_LIST@)
-SET(_PREREQ_COMPONENTS "@_PREREQ_COMPO_LIST@")
-LIST(LENGTH _PREREQ_CONFIG_DIR _list_len)
-IF(NOT _list_len EQUAL 0)
+SET(_PREREQ_@PROJECT_NAME@ @_PREREQ_LIST@)
+SET(_PREREQ_@PROJECT_NAME@_CONFIG_DIR @_PREREQ_DIR_LIST@)
+SET(_PREREQ_@PROJECT_NAME@_COMPONENTS "@_PREREQ_COMPO_LIST@")
+LIST(LENGTH _PREREQ_@PROJECT_NAME@_CONFIG_DIR _list_len_@PROJECT_NAME@)
+IF(NOT _list_len_@PROJECT_NAME@ EQUAL 0)
   # Another CMake stupidity - FOREACH(... RANGE r) generates r+1 numbers ...
-  MATH(EXPR _range "${_list_len}-1")
-  FOREACH(_p RANGE ${_range})  
-    LIST(GET _PREREQ            ${_p} _pkg    )
-    LIST(GET _PREREQ_CONFIG_DIR ${_p} _pkg_dir)
-    LIST(GET _PREREQ_COMPONENTS ${_p} _pkg_compo)
-    MESSAGE(STATUS "===> Reloading targets from ${_pkg} ...")
-    IF(NOT _pkg_compo)
-      FIND_PACKAGE(${_pkg} REQUIRED NO_MODULE 
-          PATHS "${_pkg_dir}" 
-          NO_DEFAULT_PATH)
-    ELSE()
-      STRING(REPLACE "," ";" _compo_lst "${_pkg_compo}")
-      MESSAGE(STATUS "===> (components: ${_pkg_compo})")
-      FIND_PACKAGE(${_pkg} REQUIRED NO_MODULE
-          COMPONENTS ${_compo_lst} 
-          PATHS "${_pkg_dir}"
-          NO_DEFAULT_PATH)
+  MATH(EXPR _range_@PROJECT_NAME@ "${_list_len_@PROJECT_NAME@}-1")
+  FOREACH(_p_@PROJECT_NAME@ RANGE ${_range_@PROJECT_NAME@})
+    LIST(GET _PREREQ_@PROJECT_NAME@            ${_p_@PROJECT_NAME@} _pkg_@PROJECT_NAME@    )
+    LIST(GET _PREREQ_@PROJECT_NAME@_CONFIG_DIR ${_p_@PROJECT_NAME@} _pkg_dir_@PROJECT_NAME@)
+    LIST(GET _PREREQ_@PROJECT_NAME@_COMPONENTS ${_p_@PROJECT_NAME@} _pkg_compo_@PROJECT_NAME@)
+    IF(NOT OMIT_DETECT_PACKAGE_${_pkg_@PROJECT_NAME@})
+      MESSAGE(STATUS "===> Reloading targets from ${_pkg_@PROJECT_NAME@} ...")
+      IF(NOT _pkg_compo_@PROJECT_NAME@)
+        FIND_PACKAGE(${_pkg_@PROJECT_NAME@} REQUIRED NO_MODULE
+            PATHS "${_pkg_dir_@PROJECT_NAME@}"
+            NO_DEFAULT_PATH)
+      ELSE()
+        STRING(REPLACE "," ";" _compo_lst_@PROJECT_NAME@ "${_pkg_compo_@PROJECT_NAME@}")
+        MESSAGE(STATUS "===> (components: ${_pkg_compo_@PROJECT_NAME@})")
+        FIND_PACKAGE(${_pkg_@PROJECT_NAME@} REQUIRED NO_MODULE
+            COMPONENTS ${_compo_lst_@PROJECT_NAME@}
+            PATHS "${_pkg_dir_@PROJECT_NAME@}"
+            NO_DEFAULT_PATH)
+      ENDIF()
     ENDIF()
   ENDFOREACH()
 ENDIF()

diff --git a/adm/cmake/FindSphinx.cmake b/adm/cmake/FindSphinx.cmake
index 1c9c6a8fd8f6fff31b5c46f3edc89a25099b84d8..648d1707b98f485420265ff545969d2488fb56ca 100644 (file)
--- a/adm/cmake/FindSphinx.cmake
+++ b/adm/cmake/FindSphinx.cmake
@@ -38,7 +38,18 @@ IF(WIN32)
 ELSE()
   SET(SPHINX_PYTHONPATH "${_tmp_ROOT_DIR}/lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages")
 ENDIF()
+
 # Handle the standard arguments of the find_package() command:
 INCLUDE(FindPackageHandleStandardArgs)
 FIND_PACKAGE_HANDLE_STANDARD_ARGS(Sphinx REQUIRED_VARS SPHINX_EXECUTABLE SPHINX_APIDOC_EXECUTABLE)
 
+IF(SPHINX_EXECUTABLE)
+  EXECUTE_PROCESS(COMMAND ${SPHINX_EXECUTABLE} "--version" OUTPUT_VARIABLE SPHINX_VERSION OUTPUT_STRIP_TRAILING_WHITESPACE)
+  STRING(REGEX REPLACE ".* ([0-9.]+)$" "\\1" SPHINX_VERSION "${SPHINX_VERSION}" )
+  MESSAGE(STATUS "Sphinx version is ${SPHINX_VERSION}")
+  IF(SPHINX_VERSION VERSION_LESS "1.3")
+    SET(SPHINX_THEME "basic")
+  ELSE()
+    SET(SPHINX_THEME "classic")
+  ENDIF()
+ENDIF(SPHINX_EXECUTABLE)

diff --git a/adm/cmake/SalomeMacros.cmake b/adm/cmake/SalomeMacros.cmake
index 25a22bdf70988080f3b5b93572d375bdedb1826f..34f85786d2d062f94631dfcefe31e824c1774635 100644 (file)
--- a/adm/cmake/SalomeMacros.cmake
+++ b/adm/cmake/SalomeMacros.cmake
@@ -473,6 +473,7 @@ MACRO(SALOME_FIND_PACKAGE_AND_DETECT_CONFLICTS pkg referenceVariable upCount)
   ##
   ## 0. Initialization
   ##
+  PARSE_ARGUMENTS(SALOME_FIND_PACKAGE_AND_DETECT_CONFLICTS "ENVVAR" "" ${ARGN})
   
   # Package name, upper case
   STRING(TOUPPER ${pkg} pkg_UC)
@@ -480,22 +481,25 @@ MACRO(SALOME_FIND_PACKAGE_AND_DETECT_CONFLICTS pkg referenceVariable upCount)
   ##
   ## 1. Load environment or any previously detected root dir for the package
   ##
-  IF(DEFINED ENV{${pkg_UC}_ROOT_DIR})
-    FILE(TO_CMAKE_PATH "$ENV{${pkg_UC}_ROOT_DIR}" _${pkg_UC}_ROOT_DIR_ENV)
+  SET(_envvar ${pkg_UC}_ROOT_DIR)
+  IF(SALOME_FIND_PACKAGE_AND_DETECT_CONFLICTS_ENVVAR)
+    SET(_envvar "${SALOME_FIND_PACKAGE_AND_DETECT_CONFLICTS_ENVVAR}")
+  ENDIF()
+  IF(DEFINED ENV{${_envvar}})
+    FILE(TO_CMAKE_PATH "$ENV{${_envvar}}" _${pkg_UC}_ROOT_DIR_ENV)
     SET(_dflt_value "${_${pkg_UC}_ROOT_DIR_ENV}")
   ELSE()
     # will be blank if no package was previously loaded:
     SET(_dflt_value "${${pkg_UC}_ROOT_DIR_EXP}")
   ENDIF()
-
   # Detect if the variable has been set on the command line or elsewhere:
-  IF(DEFINED ${pkg_UC}_ROOT_DIR)
+  IF(DEFINED ${_envvar})
      SET(_var_already_there TRUE)
   ELSE()
      SET(_var_already_there FALSE)
   ENDIF()
   #   Make cache entry 
-  SET(${pkg_UC}_ROOT_DIR "${_dflt_value}" CACHE PATH "Path to ${pkg_UC} directory")
+  SET(${_envvar} "${_dflt_value}" CACHE PATH "Path to ${pkg_UC} directory")
 
   ##
   ## 2. Find package - try CONFIG mode first (i.e. looking for XYZ-config.cmake)
@@ -503,8 +507,8 @@ MACRO(SALOME_FIND_PACKAGE_AND_DETECT_CONFLICTS pkg referenceVariable upCount)
   
   # Override the variable - don't append to it, as it would give precedence
   # to what was stored there before!  
-  IF(DEFINED ${pkg_UC}_ROOT_DIR)
-    SET(CMAKE_PREFIX_PATH "${${pkg_UC}_ROOT_DIR}")
+  IF(DEFINED ${_envvar})
+    SET(CMAKE_PREFIX_PATH "${${_envvar}}")
   ENDIF()
     
   # Try find_package in config mode. This has the priority, but is 
@@ -531,11 +535,11 @@ MACRO(SALOME_FIND_PACKAGE_AND_DETECT_CONFLICTS pkg referenceVariable upCount)
     IF(NOT Salome${pkg}_FIND_QUIETLY)
       IF(Salome${pkg}_FIND_REQUIRED)
          MESSAGE(FATAL_ERROR "Package ${pkg} couldn't be found - did you set the corresponing root dir correctly? "
-         "It currently contains ${pkg_UC}_ROOT_DIR=${${pkg_UC}_ROOT_DIR}  "
+         "It currently contains ${_envvar}=${${_envvar}}  "
          "Append -DSALOME_CMAKE_DEBUG=ON on the command line if you want to see the original CMake error.")
       ELSE()
          MESSAGE(WARNING "Package ${pkg} couldn't be found - did you set the corresponing root dir correctly? "
-         "It currently contains ${pkg_UC}_ROOT_DIR=${${pkg_UC}_ROOT_DIR}  "
+         "It currently contains ${_envvar}=${${_envvar}}  "
          "Append -DSALOME_CMAKE_DEBUG=ON on the command line if you want to see the original CMake error.")
       ENDIF()
     ENDIF()
@@ -568,19 +572,19 @@ MACRO(SALOME_FIND_PACKAGE_AND_DETECT_CONFLICTS pkg referenceVariable upCount)
     ##
     ## 4. Warn if CMake found something not located under ENV(XYZ_ROOT_DIR)
     ##
-    IF(DEFINED ENV{${pkg_UC}_ROOT_DIR})
+    IF(DEFINED ENV{${_envvar}})
       SALOME_CHECK_EQUAL_PATHS(_res "${_tmp_ROOT_DIR}" "${_${pkg_UC}_ROOT_DIR_ENV}")
       IF(NOT _res)
         MESSAGE(WARNING "${pkg} was found, but not at the path given by the "
-            "environment ${pkg_UC}_ROOT_DIR! Is the variable correctly set? "
+            "environment ${_envvar}! Is the variable correctly set? "
             "The two paths are: ${_tmp_ROOT_DIR} and: ${_${pkg_UC}_ROOT_DIR_ENV}")
         
       ELSE()
-        MESSAGE(STATUS "${pkg} found directory matches what was specified in the ${pkg_UC}_ROOT_DIR variable, all good!")    
+        MESSAGE(STATUS "${pkg} found directory matches what was specified in the ${_envvar} variable, all good!")    
       ENDIF()
     ELSE()
         IF(NOT _var_already_there) 
-          MESSAGE(STATUS "Variable ${pkg_UC}_ROOT_DIR was not explicitly defined. "
+          MESSAGE(STATUS "Variable ${_envvar} was not explicitly defined. "
           "An installation was found anyway: ${_tmp_ROOT_DIR}")
         ENDIF()
     ENDIF()
@@ -602,7 +606,7 @@ MACRO(SALOME_FIND_PACKAGE_AND_DETECT_CONFLICTS pkg referenceVariable upCount)
     ##
     ## 6. Save the detected installation
     ##
-    SET(${pkg_UC}_ROOT_DIR "${_tmp_ROOT_DIR}")
+    SET(${_envvar} "${_tmp_ROOT_DIR}")
      
   ELSE()
     MESSAGE(STATUS "${pkg} was not found.")  

diff --git a/doc/conf.py.in b/doc/conf.py.in
index cd471134a1640033aa2972ac016ca4278e80ff13..dee0b25debbec64911c93ec105aef3ca9e1bf61b 100644 (file)
--- a/doc/conf.py.in
+++ b/doc/conf.py.in
@@ -97,7 +97,7 @@ pygments_style = 'sphinx'
 
 # The theme to use for HTML and HTML Help pages.  Major themes that come with
 # Sphinx are currently 'default' and 'sphinxdoc'.
-html_theme = 'default'
+html_theme = '@SPHINX_THEME@'
 
 # The name for this set of Sphinx documents.  If None, it defaults to
 # "<project> v<release> documentation".

diff --git a/src/genericgui/CatalogWidget.cxx b/src/genericgui/CatalogWidget.cxx
index eec1a0c096bd57e7eb471057fc1d9ac8d0343ffa..793916e238faff40f2d78dec55ee8992f0e577be 100644 (file)
--- a/src/genericgui/CatalogWidget.cxx
+++ b/src/genericgui/CatalogWidget.cxx
@@ -241,7 +241,7 @@ void CatalogWidget::startDrag(Qt::DropActions supportedActions)
           drag = new QDrag(this);
           mime = new ItemMimeData;
           drag->setMimeData(mime);
-          mime->setData(mimeType, mimeInfo.toAscii());
+          mime->setData(mimeType, mimeInfo.toLatin1());
           drag->setPixmap(pixmap);
 
           theMimeInfo = mimeInfo;

diff --git a/src/genericgui/GenericGui.cxx b/src/genericgui/GenericGui.cxx
index 67d02f5811ad1f851ea797b925ed1e22bb139ae0..023a88cfd4ffb38c122947386a9585e7e56a53db 100644 (file)
--- a/src/genericgui/GenericGui.cxx
+++ b/src/genericgui/GenericGui.cxx
@@ -1437,11 +1437,11 @@ void GenericGui::onImportSupervSchema()
       QString aCall = "salomeloader."+ fileExt+ " "+ fn + " " + tmpFileName + " > " + tmpOutput;
       DEBTRACE(aCall.toStdString());
       
-      int ret = system(aCall.toAscii());
+      int ret = system(aCall.toLatin1());
       if(ret != 0)
         {
           // --- read file with logs
-          fstream f(tmpOutput.toAscii());
+          fstream f(tmpOutput.toLatin1());
           stringstream hfile;
           hfile << f.rdbuf();
           f.close();
@@ -1516,8 +1516,8 @@ QString GenericGui::getSaveFileName(const QString& fileName)
   filters << "XML files (*.xml)"
           << "Any files (*)";
   dialog.setFileMode(QFileDialog::AnyFile);
-  dialog.setFilters(filters);
-  dialog.selectFilter("(*.xml)");
+  dialog.setNameFilters(filters);
+  dialog.selectNameFilter("(*.xml)");
   dialog.setDefaultSuffix("xml");
   dialog.setConfirmOverwrite(true);
   //dialog.setConfirmOverwrite(false);  // bug Qt4.3.3

diff --git a/src/genericgui/GuiEditor.cxx b/src/genericgui/GuiEditor.cxx
index ecbe765d4cde91e0689ac59f6352d7820d494bbb..da78dbb9de729622b246972ab5542d99ed4ab209 100644 (file)
--- a/src/genericgui/GuiEditor.cxx
+++ b/src/genericgui/GuiEditor.cxx
@@ -716,7 +716,7 @@ void GuiEditor::showRedo(QWidget *parent)
 QString GuiEditor::asciiFilter(const QString & name)
 {
   DEBTRACE(name.toStdString());
-  string aName = name.toAscii().data();
+  string aName = name.toLatin1().data();
   DEBTRACE(aName);
   for (int i=0; i < aName.size(); i++)
     {

diff --git a/src/genericgui/GuiExecutor.cxx b/src/genericgui/GuiExecutor.cxx
index 4bd977c69451a22148d5ac76b68957558d519ee6..fb4a4e2dff00c0686f4dd438de98b8bbeaa53345 100644 (file)
--- a/src/genericgui/GuiExecutor.cxx
+++ b/src/genericgui/GuiExecutor.cxx
@@ -116,7 +116,7 @@ void GuiExecutor::startResumeDataflow(bool initialize)
   if (CORBA::is_nil(_procRef))
     {
       DEBTRACE("init _procRef");
-      _procRef = _engineRef->LoadProc(_context->getFileName().toAscii());
+      _procRef = _engineRef->LoadProc(_context->getFileName().toUtf8());
       registerStatusObservers();
       DEBTRACE("_procRef init");
     }

diff --git a/src/genericgui/ListJobs_GUI.cxx b/src/genericgui/ListJobs_GUI.cxx
index c5113ed7f374bb17317438d39e5944e2ca3bdb42..e9f8313d51562d232af8fca1cf0ad31e5e0373ef 100644 (file)
--- a/src/genericgui/ListJobs_GUI.cxx
+++ b/src/genericgui/ListJobs_GUI.cxx
@@ -29,6 +29,13 @@
 #include "YacsTrace.hxx"
 #include "LoadState.hxx"
 
+#include <QBoxLayout>
+#include <QFileInfo>
+#include <QMessageBox>
+#include <QPushButton>
+#include <QTableWidget>
+#include <QTimer>
+
 using namespace std;
 using namespace YACS::HMI;
 using namespace YACS::ENGINE;

diff --git a/src/genericgui/ListJobs_GUI.hxx b/src/genericgui/ListJobs_GUI.hxx
index 152748387fde40bfe8fd68b15c09de6b0d22c9e8..65a5e571056fa20ab29307dce75e7ed9d6634ac6 100644 (file)
--- a/src/genericgui/ListJobs_GUI.hxx
+++ b/src/genericgui/ListJobs_GUI.hxx
@@ -20,7 +20,7 @@
 #ifndef LISTJOBS_GUI_H
 #define LISTJOBS_GUI_H
 
-#include <QtGui/QtGui>
+#include <QWidget>
 #include "SALOME_NamingService.hxx"
 #include "SALOME_Launcher.hh"
 
@@ -35,6 +35,10 @@
 // Class for the dialog box
 // ------------------------
 
+class QPushButton;
+class QTableWidget;
+class QTableWidgetItem;
+class QTimer;
 
 namespace YACS
 {

diff --git a/src/genericgui/Scene.cxx b/src/genericgui/Scene.cxx
index a47305288a3f8093b98291cb63729a1d8a9915b8..5af74493c110117ae58e13bc4621a4d20738d850 100644 (file)
--- a/src/genericgui/Scene.cxx
+++ b/src/genericgui/Scene.cxx
@@ -69,7 +69,7 @@ bool Scene::isZooming()
 void Scene::helpEvent(QGraphicsSceneHelpEvent *event)
 {
   DEBTRACE("Scene::helpEvent");
-  QGraphicsItem *qit = itemAt(event->scenePos());
+  QGraphicsItem *qit = itemAt(event->scenePos(), QTransform());
   SceneItem * item = dynamic_cast<SceneItem*>(qit);
   if (item)
     {

diff --git a/src/genericgui/SceneBlocItem.cxx b/src/genericgui/SceneBlocItem.cxx
index 329bd38e8b3ca4cd503a6f2fcdd62a96e477cc72..443cde8d850248a754caa889c6b3a774c7efc5cb 100644 (file)
--- a/src/genericgui/SceneBlocItem.cxx
+++ b/src/genericgui/SceneBlocItem.cxx
@@ -203,8 +203,8 @@ void  SceneBlocItem::getNodesInfo(YACS::ENGINE::ComposedNode *cnode)
       width  = QString(_format.c_str()).arg(lw, 0, 'g', 3);
 
       DEBTRACE(agnameof(aNode) << " (" << nh << "," << nw << ") = (" << height.toStdString()  << " ; " << width.toStdString() <<")");
-      agset(aNode, const_cast<char*>("height"),    height.toAscii().data());
-      agset(aNode, const_cast<char*>("width"),     width.toAscii().data());
+      agset(aNode, const_cast<char*>("height"),    height.toLatin1().data());
+      agset(aNode, const_cast<char*>("width"),     width.toLatin1().data());
       agset(aNode, const_cast<char*>("shape"),     const_cast<char*>("box") );
       agset(aNode, const_cast<char*>("fixedsize"), const_cast<char*>("true") );
     }

diff --git a/src/genericgui/SceneItem.cxx b/src/genericgui/SceneItem.cxx
index 561243f7bdad4d96becfc816201783ec89de89e3..17f31622264495afe23d7922cfb78abc6dceab6c 100644 (file)
--- a/src/genericgui/SceneItem.cxx
+++ b/src/genericgui/SceneItem.cxx
@@ -197,7 +197,7 @@ SceneItem::SceneItem(QGraphicsScene *scene, SceneItem *parent,
   setToolTip(_label);
   DEBTRACE("SceneItem::SceneItem "<<label.toStdString()<<" "<<this<<" "<<_parent<<" "<< _level); 
   setFlag(QGraphicsItem::ItemIsSelectable);
-  setAcceptsHoverEvents(true);
+  setAcceptHoverEvents(true);
 }
 
 SceneItem::~SceneItem()

diff --git a/src/genericgui/SchemaProcItem.cxx b/src/genericgui/SchemaProcItem.cxx
index 7f5ad9ff7df6eedeaf28f40e44dbdacb1722f4cd..be002251bdec0d7a5841a3f1f0c84b5fe3970a36 100644 (file)
--- a/src/genericgui/SchemaProcItem.cxx
+++ b/src/genericgui/SchemaProcItem.cxx
@@ -65,7 +65,7 @@ void SchemaProcItem::setExecState(int execState)
     default:                      sc = YACS::HMI::Resource::UNKNOWN          ; stateDef = "Unknown Status";
    }
   _itemData.replace(YState, stateDef);
-  _itemForeground.replace(YState, Qt::darkBlue);
+  _itemForeground.replace(YState, QColor(Qt::darkBlue));
   _itemBackground.replace(YState, sc);
 }
 

diff --git a/src/salomegui/Yacsgui.cxx b/src/salomegui/Yacsgui.cxx
index 9d040d07cbea2538c3420c70e07a73e4adcedecf..c9625b16de37e36bd8656880306ca55398d89322 100644 (file)
--- a/src/salomegui/Yacsgui.cxx
+++ b/src/salomegui/Yacsgui.cxx
@@ -42,6 +42,7 @@
 #include <SUIT_DataObject.h>
 
 #include <SALOME_LifeCycleCORBA.hxx>
+#include <QDir>
 #include <QInputDialog>
 #include <QIcon>
 #include <cassert>

diff --git a/src/salomegui/Yacsgui_Resource.cxx b/src/salomegui/Yacsgui_Resource.cxx
index 769008cedeb991c062782d25c56c316e85738da7..0d32531774a04b2896389d62d225574049a99997 100644 (file)
--- a/src/salomegui/Yacsgui_Resource.cxx
+++ b/src/salomegui/Yacsgui_Resource.cxx
@@ -50,11 +50,11 @@ bool Yacsgui_Resource::booleanValue(const QString& name, const bool def) const {
   return _resource->booleanValue(RESOURCE_YACS, name, def);
 }
 
-QFont Yacsgui_Resource::fontValue(const QString& name, const QFont def) const {
+QFont Yacsgui_Resource::fontValue(const QString& name, const QFont& def) const {
   return _resource->fontValue(RESOURCE_YACS, name, def);
 }
 
-QColor Yacsgui_Resource::colorValue(const QString& name, const QColor def) const {
+QColor Yacsgui_Resource::colorValue(const QString& name, const QColor& def) const {
   return _resource->colorValue(RESOURCE_YACS, name, def);
 }
 
@@ -69,7 +69,7 @@ QColor Yacsgui_Resource::colorValue(const QString& name, const int h, const int
   return colorValue(name, col);
 }
 
-QString Yacsgui_Resource::stringValue(const QString& name, const QString def) const {
+QString Yacsgui_Resource::stringValue(const QString& name, const QString& def) const {
   return _resource->stringValue(RESOURCE_YACS, name, def);
 }
 
@@ -88,15 +88,15 @@ void Yacsgui_Resource::setValue( const QString& name, const bool val ) {
     _resource->setValue(RESOURCE_YACS, name, val);
 }
 
-void Yacsgui_Resource::setValue( const QString& name, const QFont val ) {
+void Yacsgui_Resource::setValue( const QString& name, const QFont& val ) {
     _resource->setValue(RESOURCE_YACS, name, val);
 }
 
-void Yacsgui_Resource::setValue( const QString& name, const QColor val ) {
+void Yacsgui_Resource::setValue( const QString& name, const QColor& val ) {
     _resource->setValue(RESOURCE_YACS, name, val);
 }
 
-void Yacsgui_Resource::setValue( const QString& name, const QString val ) {
+void Yacsgui_Resource::setValue( const QString& name, const QString& val ) {
     _resource->setValue(RESOURCE_YACS, name, val);
 }
 

diff --git a/src/salomegui/Yacsgui_Resource.hxx b/src/salomegui/Yacsgui_Resource.hxx
index 9a6e5bd64842a0205f41857a0630a32af848866a..e79362965a4237172638eb331fd6d262822fc7c6 100644 (file)
--- a/src/salomegui/Yacsgui_Resource.hxx
+++ b/src/salomegui/Yacsgui_Resource.hxx
@@ -20,13 +20,14 @@
 #ifndef _SALOMEGUI_RESOURCE_HXX_
 #define _SALOMEGUI_RESOURCE_HXX_
 
-#include <QtGui>
+#include <QColor>
+#include <QFont>
+#include <QString>
 
 class Yacsgui;
 class SUIT_ResourceMgr;
 
-
-class Yacsgui_Resource 
+class Yacsgui_Resource
 {
   public:
     Yacsgui_Resource(SUIT_ResourceMgr* r);
@@ -35,21 +36,21 @@ class Yacsgui_Resource
     virtual void preferencesChanged();
 
   protected:
-    int     integerValue( const QString& name, const int    def = 0          ) const;
-    double  doubleValue ( const QString& name, const double def = 0          ) const;
-    bool    booleanValue( const QString& name, const bool   def = false      ) const;
-    QFont   fontValue   ( const QString& name, const QFont  def = QFont()    ) const;
-    QColor  colorValue  ( const QString& name, const QColor def = QColor()   ) const;
-    QColor  colorValue  ( const QString& name, const Qt::GlobalColor c       ) const;
+    int     integerValue( const QString& name, const int     def = 0          ) const;
+    double  doubleValue ( const QString& name, const double  def = 0          ) const;
+    bool    booleanValue( const QString& name, const bool    def = false      ) const;
+    QFont   fontValue   ( const QString& name, const QFont&  def = QFont()    ) const;
+    QColor  colorValue  ( const QString& name, const QColor& def = QColor()   ) const;
+    QColor  colorValue  ( const QString& name, const Qt::GlobalColor c        ) const;
     QColor  colorValue  ( const QString& name, const int h, const int s, const int v) const;
-    QString stringValue ( const QString& name, const QString def = QString() ) const;
+    QString stringValue ( const QString& name, const QString& def = QString() ) const;
 
     void setValue( const QString& name, const int     val );
     void setValue( const QString& name, const double  val );
     void setValue( const QString& name, const bool    val );
-    void setValue( const QString& name, const QFont   val );
-    void setValue( const QString& name, const QColor  val );
-    void setValue( const QString& name, const QString val );
+    void setValue( const QString& name, const QFont&   val );
+    void setValue( const QString& name, const QColor&  val );
+    void setValue( const QString& name, const QString& val );
 
   protected:
     SUIT_ResourceMgr* _resource;