From 2edfd172c59b738cc50e220a625ea587990da697 Mon Sep 17 00:00:00 2001 From: ouv Date: Mon, 4 Dec 2017 18:06:53 +0300 Subject: [PATCH] Compilation on Fedora 24. --- Makefile.am | 3 +-- src/Qtx/QtxPopupMgr.cxx | 2 +- src/Style/Style_Model.cxx | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Makefile.am b/Makefile.am index ada26698f..0665d100a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -25,8 +25,7 @@ include $(top_srcdir)/adm_local/unix/make_common_starter.am -ACLOCAL_AMFLAGS = -I adm_local/unix/config_files \ - -I ${KERNEL_ROOT_DIR}/salome_adm/unix/config_files +ACLOCAL_AMFLAGS = -I adm_local/unix/config_files -I ${KERNEL_ROOT_DIR}/salome_adm/unix/config_files if GUI_ENABLE_CORBA IDLDIR = idl diff --git a/src/Qtx/QtxPopupMgr.cxx b/src/Qtx/QtxPopupMgr.cxx index 970b2676f..e2cb22052 100644 --- a/src/Qtx/QtxPopupMgr.cxx +++ b/src/Qtx/QtxPopupMgr.cxx @@ -367,7 +367,7 @@ int QtxPopupMgr::insertAction( QAction* a, const int pId, const QString& rule, c */ bool QtxPopupMgr::hasRule( QAction* a, const RuleType t ) const { - return a ? expression( a, t, false ) : false; + return a ? ( expression( a, t, false ) != NULL ) : false; } /*! diff --git a/src/Style/Style_Model.cxx b/src/Style/Style_Model.cxx index 64bfa241e..cdc067c45 100644 --- a/src/Style/Style_Model.cxx +++ b/src/Style/Style_Model.cxx @@ -454,7 +454,7 @@ QColor Style_Model::getColorValue( int theId, const bool theIsDef ) const QString Style_Model::getStringValue( int theId, const bool theIsDef ) const { - QString aRes = false; + QString aRes; QVariant aValue; if ( myValues.contains(theId) && myValues[theId].myType == String ) { if ( theIsDef ) -- 2.39.2