From 5aa6cd27f77999bc8af41db522f92525d64b8e88 Mon Sep 17 00:00:00 2001 From: nds Date: Tue, 12 Apr 2016 14:57:20 +0300 Subject: [PATCH] Issue #1383 Preview button: compilation correction on Linux --- src/SHAPERGUI/SHAPERGUI.cpp | 2 +- src/SHAPERGUI/SHAPERGUI.h | 2 +- src/XGUI/XGUI_ActionsMgr.cpp | 2 +- src/XGUI/XGUI_SalomeConnector.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/SHAPERGUI/SHAPERGUI.cpp b/src/SHAPERGUI/SHAPERGUI.cpp index ef44ec327..fecbbb031 100644 --- a/src/SHAPERGUI/SHAPERGUI.cpp +++ b/src/SHAPERGUI/SHAPERGUI.cpp @@ -549,7 +549,7 @@ void SHAPERGUI::setFeatureInfo(const QString& theFeatureId, myFeaturesInfo.insert(theFeatureId, theMessage); } -const std::shared_ptr& SHAPERGUI::featureInfo(const QString& theFeatureId) +std::shared_ptr SHAPERGUI::featureInfo(const QString& theFeatureId) { return myFeaturesInfo.contains(theFeatureId) ? myFeaturesInfo[theFeatureId] : NULL; } diff --git a/src/SHAPERGUI/SHAPERGUI.h b/src/SHAPERGUI/SHAPERGUI.h index ed007ff91..7e1c1435e 100644 --- a/src/SHAPERGUI/SHAPERGUI.h +++ b/src/SHAPERGUI/SHAPERGUI.h @@ -101,7 +101,7 @@ Q_OBJECT //! Returns XML information for the feature kind //! \param theFeatureId a feature kind //! \return theMessage a container of the feature XML properties - virtual const std::shared_ptr& featureInfo(const QString& theFeatureId); + virtual std::shared_ptr featureInfo(const QString& theFeatureId); //! Returns interface to Salome viewer virtual ModuleBase_IViewer* viewer() const diff --git a/src/XGUI/XGUI_ActionsMgr.cpp b/src/XGUI/XGUI_ActionsMgr.cpp index 849175197..619302a9f 100644 --- a/src/XGUI/XGUI_ActionsMgr.cpp +++ b/src/XGUI/XGUI_ActionsMgr.cpp @@ -248,7 +248,7 @@ QAction* XGUI_ActionsMgr::operationStateAction(OperationStateActionId theId, QOb } break; case Preview: { - aResult = new QAction("See the preview", theParent); + aResult = new QAction("See preview", theParent); aResult->setToolTip("Compute preview"); } break; diff --git a/src/XGUI/XGUI_SalomeConnector.h b/src/XGUI/XGUI_SalomeConnector.h index 3000b8350..7596878a1 100644 --- a/src/XGUI/XGUI_SalomeConnector.h +++ b/src/XGUI/XGUI_SalomeConnector.h @@ -109,7 +109,7 @@ class XGUI_EXPORT XGUI_SalomeConnector //! Returns XML information for the feature kind //! \param theFeatureId a feature kind //! \return theMessage a container of the feature XML properties - virtual const std::shared_ptr& featureInfo(const QString& theFeatureId) = 0; + virtual std::shared_ptr featureInfo(const QString& theFeatureId) = 0; //! Returns interface to Salome viewer virtual ModuleBase_IViewer* viewer() const = 0; -- 2.39.2