From 42db601320a02457d3db1090f2837e7c9e024f8d Mon Sep 17 00:00:00 2001 From: mpv Date: Mon, 15 Sep 2014 12:35:36 +0400 Subject: [PATCH] Get rid of warnings --- src/ModuleBase/ModuleBase_DoubleSpinBox.cpp | 2 +- src/ModuleBase/ModuleBase_ViewerPrs.h | 4 ++-- src/ModuleBase/ModuleBase_WidgetValueFeature.h | 14 +++++++------- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/ModuleBase/ModuleBase_DoubleSpinBox.cpp b/src/ModuleBase/ModuleBase_DoubleSpinBox.cpp index 171e1e849..8f807737f 100644 --- a/src/ModuleBase/ModuleBase_DoubleSpinBox.cpp +++ b/src/ModuleBase/ModuleBase_DoubleSpinBox.cpp @@ -244,7 +244,7 @@ QValidator::State ModuleBase_DoubleSpinBox::validate(QString& str, int& pos) con if (overhead == 0) state = v.validate(str, pos); else { - if (str.length() >= overhead && str.startsWith(pref) && str.right(suff.length()) == suff) { + if ((uint)(str.length()) >= overhead && str.startsWith(pref) && str.right(suff.length()) == suff) { QString core = str.mid(pref.length(), str.length() - overhead); int corePos = pos - pref.length(); state = v.validate(core, corePos); diff --git a/src/ModuleBase/ModuleBase_ViewerPrs.h b/src/ModuleBase/ModuleBase_ViewerPrs.h index c67c2312b..83c9e3193 100644 --- a/src/ModuleBase/ModuleBase_ViewerPrs.h +++ b/src/ModuleBase/ModuleBase_ViewerPrs.h @@ -99,8 +99,8 @@ class ModuleBase_ViewerPrs { bool aResult = (myResult.get() == thePrs.object().get()); bool aOwner = (myOwner.Access() == thePrs.owner().Access()); - bool aShape = myShape.IsEqual(thePrs.shape()); - bool aIO = (myInteractive == thePrs.interactive()); + bool aShape = myShape.IsEqual(thePrs.shape()) == Standard_True; + bool aIO = (myInteractive == thePrs.interactive()) == Standard_True; return aResult && aOwner && aShape && aIO; } diff --git a/src/ModuleBase/ModuleBase_WidgetValueFeature.h b/src/ModuleBase/ModuleBase_WidgetValueFeature.h index a40cbd06d..53abb591b 100644 --- a/src/ModuleBase/ModuleBase_WidgetValueFeature.h +++ b/src/ModuleBase/ModuleBase_WidgetValueFeature.h @@ -18,29 +18,29 @@ class GeomAPI_Pnt2d; * \ingroup GUI * \brief Custom widget value. The widget contains a feature and 2D point. */ -class MODULEBASE_EXPORT ModuleBase_WidgetValueFeature : public ModuleBase_WidgetValue +class ModuleBase_WidgetValueFeature : public ModuleBase_WidgetValue { public: /// Constructor - ModuleBase_WidgetValueFeature(); + MODULEBASE_EXPORT ModuleBase_WidgetValueFeature(); /// Destructor - virtual ~ModuleBase_WidgetValueFeature(); + MODULEBASE_EXPORT virtual ~ModuleBase_WidgetValueFeature(); /// Fill the widget values by given point /// \param thePoint the point - void setObject(const ObjectPtr& theFeature); + MODULEBASE_EXPORT void setObject(const ObjectPtr& theFeature); /// Returns the widget values by given point /// \return theFeature the current feature - const ObjectPtr& object() const; + MODULEBASE_EXPORT const ObjectPtr& object() const; /// Fill the widget values by given point /// \param thePoint the point - void setPoint(const boost::shared_ptr& thePoint); + MODULEBASE_EXPORT void setPoint(const boost::shared_ptr& thePoint); /// Returns the widget point /// \return the current point - const boost::shared_ptr& point() const; + MODULEBASE_EXPORT const boost::shared_ptr& point() const; private: ObjectPtr myResult; -- 2.39.2