From: mpv <mpv@opencascade.com>
Date: Mon, 12 Dec 2016 13:17:00 +0000 (+0300)
Subject: Removing of warnings.
X-Git-Tag: before_porting_8.2.0~27
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=0f62ec06972bfb8828f4b0b835c12a565ecf2692;p=modules%2Fshaper.git

Removing of warnings.
---

diff --git a/src/Config/Config_WidgetAPI.h b/src/Config/Config_WidgetAPI.h
index 1801f2de6..361407c65 100644
--- a/src/Config/Config_WidgetAPI.h
+++ b/src/Config/Config_WidgetAPI.h
@@ -32,31 +32,31 @@ struct _xmlDoc;
  * \ingroup Config
  * \brief Provides low-level API for WidgetFactory for reading xml definitions of widgets
  */
-class CONFIG_EXPORT Config_WidgetAPI
+class Config_WidgetAPI
 {
  public:
-  virtual ~Config_WidgetAPI();
+  CONFIG_EXPORT virtual ~Config_WidgetAPI();
 
   //! Returns name of widget's node (attribute)
-  std::string widgetType() const;
+  CONFIG_EXPORT std::string widgetType() const;
   //! Returns true if widget has container type, which means it able to contain other widgets
-  bool isGroupBoxWidget() const;
+  CONFIG_EXPORT bool isGroupBoxWidget() const;
   //! Returns true if widget has page type;
   //! Page is container widget with combo box control to switch between pages
-  bool isPagedWidget() const;
+  CONFIG_EXPORT bool isPagedWidget() const;
 
   //! Returns id of current feature
-  std::string featureId() const;
+  CONFIG_EXPORT std::string featureId() const;
   //! Returns id of current widget
-  std::string widgetId() const;
+  CONFIG_EXPORT std::string widgetId() const;
   //! Returns icon of current widget
-  std::string widgetIcon() const;
+  CONFIG_EXPORT std::string widgetIcon() const;
   //! Returns text for label of current widget
-  std::string widgetLabel() const;
+  CONFIG_EXPORT std::string widgetLabel() const;
   //! Returns text for tooltip of current widget
-  std::string widgetTooltip() const;
+  CONFIG_EXPORT std::string widgetTooltip() const;
   //! Returns a custom property of current widget
-  std::string getProperty(const char* thePropName) const;
+  CONFIG_EXPORT std::string getProperty(const char* thePropName) const;
 
   /*! Checks if the XML representation of widget has given attribute,
    *  if yes - returns it's bool value, if no, or if the value can not
@@ -65,17 +65,17 @@ class CONFIG_EXPORT Config_WidgetAPI
    *  \param theDefault default value on bad data
    *  \return the boolean result
    */
-  bool getBooleanAttribute(const char* theAttributeName, bool theDefault) const;
+  CONFIG_EXPORT bool getBooleanAttribute(const char* theAttributeName, bool theDefault) const;
 
  protected:
   /// These fields are accessible for ModuleBase_WidgetFactory only
-  Config_WidgetAPI(std::string theRawXml);
+  CONFIG_EXPORT Config_WidgetAPI(std::string theRawXml);
   //! Pass to the next (sibling) node of widget's xml definition. If impossible, returns false
-  bool toNextWidget();
+  CONFIG_EXPORT bool toNextWidget();
   //! Pass into the child node of widget's xml definition. If impossible, returns false
-  bool toChildWidget();
+  CONFIG_EXPORT bool toChildWidget();
   //! Pass into the parent node of widget's xml definition. If impossible, returns false
-  bool toParentWidget();
+  CONFIG_EXPORT bool toParentWidget();
 
  private:
   xmlDocPtr myDoc; //!< Pointer to the root of widget's xml definition
diff --git a/src/Model/Model_Document.cpp b/src/Model/Model_Document.cpp
index de77a7472..411f8bac7 100755
--- a/src/Model/Model_Document.cpp
+++ b/src/Model/Model_Document.cpp
@@ -404,7 +404,8 @@ static bool isEqualContent(Handle(TDF_Attribute) theAttr1, Handle(TDF_Attribute)
     if (anArr1->Lower() == anArr2->Lower() && anArr1->Upper() == anArr2->Upper()) {
       for(int a = anArr1->Lower(); a <= anArr1->Upper(); a++) {
         if (a == 1 && // second is for display
-          anArr2->Label().Tag() == 1 && (anArr2->Label().Depth() == 4 || anArr2->Label().Depth() == 6))
+            anArr2->Label().Tag() == 1 && (anArr2->Label().Depth() == 4 ||
+            anArr2->Label().Depth() == 6))
           continue;
         if (anArr1->Value(a) != anArr2->Value(a))
           return false;