Merge branch 'master' into Dev_1.1.0

[modules/shaper.git] / src / SketchPlugin / SketchPlugin_Validators.h

diff --git a/src/SketchPlugin/SketchPlugin_Validators.h b/src/SketchPlugin/SketchPlugin_Validators.h
index 88c8d3a485fbff2b39924377124d68b71d5a8973..6259c2bd682f82bbdb028c69b7bd71c69e4ce3f3 100644 (file)
--- a/src/SketchPlugin/SketchPlugin_Validators.h
+++ b/src/SketchPlugin/SketchPlugin_Validators.h
@@ -8,7 +8,7 @@
 #define SketchPlugin_Validators_H
 
 #include "SketchPlugin.h"
-#include <ModelAPI_RefAttrValidator.h>
+#include <ModelAPI_AttributeValidator.h>
 
 /**\class SketchPlugin_DistanceAttrValidator
  * \ingroup Validators
@@ -16,24 +16,28 @@
  *
  * It just checks that distance is greater than zero.
  */
-class SketchPlugin_DistanceAttrValidator : public ModelAPI_RefAttrValidator
+class SketchPlugin_DistanceAttrValidator : public ModelAPI_AttributeValidator
 {
  public:
   //! returns true if attribute is valid
   //! \param theAttribute the checked attribute
   //! \param theArguments arguments of the attribute
-  virtual bool isValid(const AttributePtr& theAttribute, 
+  virtual bool isValid(const AttributePtr& theAttribute,
                        const std::list<std::string>& theArguments) const;
-
-  //! Returns true if object is good for the feature attribute
-  virtual bool isValid(const FeaturePtr& theFeature, const std::list<std::string>& theArguments,
-                       const ObjectPtr& theObject, const GeomShapePtr& theShape) const;
-
-  //! Returns true if the attribute is good for the feature attribute
-  virtual bool isValid(const FeaturePtr& theFeature, const std::list<std::string>& theArguments,
-                       const AttributePtr& theAttribute) const;
 };
+//  virtual bool isValid(const AttributePtr& theAttribute,
+//                       const std::list<std::string>& theArguments) const;
+//
+//  //! Returns true if object is good for the feature attribute
+//  virtual bool isValid(const FeaturePtr& theFeature, const std::list<std::string>& theArguments,
+//                       const ObjectPtr& theObject, const GeomShapePtr& theShape) const;
+//
+//  //! Returns true if the attribute is good for the feature attribute
+//  virtual bool isValid(const FeaturePtr& theFeature, const std::list<std::string>& theArguments,
+//                       const AttributePtr& theAttribute) const;
+//};
 
+// commented in v1.0.2, master:
 /**\class SketchPlugin_DifferentObjectsValidator
  * \ingroup Validators
  *
@@ -56,5 +60,6 @@ class SketchPlugin_DistanceAttrValidator : public ModelAPI_RefAttrValidator
 //  virtual bool isValid(const FeaturePtr& theFeature, const std::list<std::string>& theArguments,
 //                       const AttributePtr& theAttribute) const;
 //};
+// ======= end of todo
 
 #endif