Export definition for compillation on Windows; clear virtual method isValid is moved...

diff --git a/src/ModuleBase/ModuleBase_SelectionValidator.cpp b/src/ModuleBase/ModuleBase_SelectionValidator.cpp
index fa9b27e5e59035cc8f89720d3bc95050b4987ce1..7c92d953d64d4fa30906c6014f4cd5f15ac3bcd3 100644 (file)
--- a/src/ModuleBase/ModuleBase_SelectionValidator.cpp
+++ b/src/ModuleBase/ModuleBase_SelectionValidator.cpp
@@ -6,10 +6,6 @@
 
 #include <ModuleBase_SelectionValidator.h>
 
-ModuleBase_SelectionValidator::~ModuleBase_SelectionValidator()
-{
-}
-
 bool ModuleBase_SelectionValidator::isValid(const ModuleBase_ISelection* theSelection,
                                             const std::list<std::string>& theArguments) const
 {

diff --git a/src/ModuleBase/ModuleBase_SelectionValidator.h b/src/ModuleBase/ModuleBase_SelectionValidator.h
index f3d34617fa90ef1f87dd9f63ed7ff3771869fcea..60d9574001f12752d0e654da7b64755fc7c46c6d 100644 (file)
--- a/src/ModuleBase/ModuleBase_SelectionValidator.h
+++ b/src/ModuleBase/ModuleBase_SelectionValidator.h
@@ -22,17 +22,16 @@
 class ModuleBase_SelectionValidator : public ModelAPI_Validator
 {
  public:
-  virtual ~ModuleBase_SelectionValidator();
-   /// Returns True if selection is valid
-   /// \param theSelection selection instance
-  virtual bool isValid(const ModuleBase_ISelection* theSelection) const = 0;
-
    /// Returns True if selection is valid
    /// \param theSelection selection instance
    /// \param theArguments list of arguments
-  virtual bool isValid(const ModuleBase_ISelection* theSelection,
+  virtual MODULEBASE_EXPORT bool isValid(const ModuleBase_ISelection* theSelection,
                        const std::list<std::string>& theArguments) const;
 
+ protected:
+   /// Returns True if selection is valid
+   /// \param theSelection selection instance
+  virtual bool isValid(const ModuleBase_ISelection* theSelection) const = 0;
 };
 
 #endif

diff --git a/src/PartSet/PartSet_Validators.h b/src/PartSet/PartSet_Validators.h
index 7d78aeb10a7f2e879ef26261605d81ae8dda8f1a..92eb3a71df2bc9413b52c7d926f7f042c4d8c67a 100644 (file)
--- a/src/PartSet/PartSet_Validators.h
+++ b/src/PartSet/PartSet_Validators.h
@@ -21,7 +21,7 @@
 //! A class to validate a selection for Distance constraint operation
 class PartSet_DistanceSelection : public ModuleBase_SelectionValidator
 {
- public:
+ protected:
   PARTSET_EXPORT virtual bool isValid(const ModuleBase_ISelection* theSelection) const;
 };
 
@@ -29,7 +29,7 @@ class PartSet_DistanceSelection : public ModuleBase_SelectionValidator
 //! A class to validate a selection for Length constraint operation
 class PartSet_LengthSelection : public ModuleBase_SelectionValidator
 {
- public:
+ protected:
   PARTSET_EXPORT virtual bool isValid(const ModuleBase_ISelection* theSelection) const;
 };
 
@@ -37,7 +37,7 @@ class PartSet_LengthSelection : public ModuleBase_SelectionValidator
 //! A class to validate a selection for Perpendicular constraint operation
 class PartSet_PerpendicularSelection : public ModuleBase_SelectionValidator
 {
- public:
+ protected:
   PARTSET_EXPORT virtual bool isValid(const ModuleBase_ISelection* theSelection) const;
 };
 
@@ -45,7 +45,7 @@ class PartSet_PerpendicularSelection : public ModuleBase_SelectionValidator
 //! A class to validate a selection for Parallel constraint operation
 class PartSet_ParallelSelection : public ModuleBase_SelectionValidator
 {
- public:
+ protected:
   PARTSET_EXPORT virtual bool isValid(const ModuleBase_ISelection* theSelection) const;
 };
 
@@ -53,7 +53,7 @@ class PartSet_ParallelSelection : public ModuleBase_SelectionValidator
 //! A class to validate a selection for Radius constraint operation
 class PartSet_RadiusSelection : public ModuleBase_SelectionValidator
 {
- public:
+ protected:
   PARTSET_EXPORT virtual bool isValid(const ModuleBase_ISelection* theSelection) const;
 };
 
@@ -61,7 +61,7 @@ class PartSet_RadiusSelection : public ModuleBase_SelectionValidator
 //! A class to validate a selection for Rigid constraint operation
 class PartSet_RigidSelection : public ModuleBase_SelectionValidator
 {
- public:
+ protected:
   PARTSET_EXPORT virtual bool isValid(const ModuleBase_ISelection* theSelection) const;
 };
 
@@ -70,7 +70,7 @@ class PartSet_RigidSelection : public ModuleBase_SelectionValidator
 //! A class to validate a selection for coincedence constraint operation
 class PartSet_CoincidentSelection : public ModuleBase_SelectionValidator
 {
- public:
+ protected:
   PARTSET_EXPORT virtual bool isValid(const ModuleBase_ISelection* theSelection) const;
 };
 
@@ -78,7 +78,7 @@ class PartSet_CoincidentSelection : public ModuleBase_SelectionValidator
 //! A class to validate a selection for Horizontal and Vertical constraints operation
 class PartSet_HVDirSelection : public ModuleBase_SelectionValidator
 {
- public:
+ protected:
   PARTSET_EXPORT virtual bool isValid(const ModuleBase_ISelection* theSelection) const;
 };
 
@@ -86,7 +86,7 @@ class PartSet_HVDirSelection : public ModuleBase_SelectionValidator
 //! A class to validate a selection for Tangential constraints operation
 class PartSet_TangentSelection : public ModuleBase_SelectionValidator
 {
- public:
+ protected:
   PARTSET_EXPORT virtual bool isValid(const ModuleBase_ISelection* theSelection) const;
 };
 
@@ -94,7 +94,7 @@ class PartSet_TangentSelection : public ModuleBase_SelectionValidator
 //! A class to validate a selection for Fillet constraints operation
 class PartSet_FilletSelection : public ModuleBase_SelectionValidator
 {
- public:
+ protected:
   PARTSET_EXPORT virtual bool isValid(const ModuleBase_ISelection* theSelection) const;
 };