From: azv Date: Mon, 27 Feb 2017 09:13:12 +0000 (+0300) Subject: Remove 'override' keyword due to non-supported by old version of GCC X-Git-Tag: V_2.7.0~265 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=06c0edf62e2731aa86b4ea0fac9f99a6b685f2ac;p=modules%2Fshaper.git Remove 'override' keyword due to non-supported by old version of GCC --- diff --git a/src/SketchSolver/PlaneGCSSolver/PlaneGCSSolver_AttributeBuilder.h b/src/SketchSolver/PlaneGCSSolver/PlaneGCSSolver_AttributeBuilder.h index cdf586b00..4c8e44ed6 100644 --- a/src/SketchSolver/PlaneGCSSolver/PlaneGCSSolver_AttributeBuilder.h +++ b/src/SketchSolver/PlaneGCSSolver/PlaneGCSSolver_AttributeBuilder.h @@ -23,14 +23,14 @@ public: /// Double attributes and 2D points are supported only. /// \param theAttribute [in] attribute to create /// \return Created wrapper of the attribute applicable for specific solver - virtual EntityWrapperPtr createAttribute(AttributePtr theAttribute) override; + virtual EntityWrapperPtr createAttribute(AttributePtr theAttribute); /// \brief Blank. To be defined in derived class. - virtual EntityWrapperPtr createFeature(FeaturePtr) override + virtual EntityWrapperPtr createFeature(FeaturePtr) { return EntityWrapperPtr(); } /// \brief Blank. To be defined in derived class. - virtual const std::list& constraints() const override; + virtual const std::list& constraints() const; }; #endif diff --git a/src/SketchSolver/PlaneGCSSolver/PlaneGCSSolver_Builder.h b/src/SketchSolver/PlaneGCSSolver/PlaneGCSSolver_Builder.h index 62b9ff327..caf81eb21 100644 --- a/src/SketchSolver/PlaneGCSSolver/PlaneGCSSolver_Builder.h +++ b/src/SketchSolver/PlaneGCSSolver/PlaneGCSSolver_Builder.h @@ -30,9 +30,9 @@ public: static BuilderPtr getInstance(); /// \brief Creates a storage specific for used solver - virtual StoragePtr createStorage(const SolverPtr& theSolver) const override; + virtual StoragePtr createStorage(const SolverPtr& theSolver) const; /// \brief Creates specific solver - virtual SolverPtr createSolver() const override; + virtual SolverPtr createSolver() const; /// \brief Creates new constraint using given parameters /// \param theConstraint [in] original constraint @@ -51,7 +51,7 @@ public: const EntityWrapperPtr& theEntity1, const EntityWrapperPtr& theEntity2 = EntityWrapperPtr(), const EntityWrapperPtr& theEntity3 = EntityWrapperPtr(), - const EntityWrapperPtr& theEntity4 = EntityWrapperPtr()) const override; + const EntityWrapperPtr& theEntity4 = EntityWrapperPtr()) const; /// \brief Creates new multi-translation or multi-rotation constraint /// \param theConstraint [in] original constraint @@ -70,23 +70,23 @@ public: const bool theFullValue, const EntityWrapperPtr& thePoint1, const EntityWrapperPtr& thePoint2, - const std::list& theTrsfEnt) const override; + const std::list& theTrsfEnt) const; /// \brief Convert entity to point /// \return empty pointer if the entity is not a point - virtual std::shared_ptr point(EntityWrapperPtr theEntity) const override; + virtual std::shared_ptr point(EntityWrapperPtr theEntity) const; /// \brief Convert entity to line /// \return empty pointer if the entity is not a line - virtual std::shared_ptr line(EntityWrapperPtr theEntity) const override; + virtual std::shared_ptr line(EntityWrapperPtr theEntity) const; /// \brief Convert entity to line /// \return empty pointer if the entity is not a line - virtual std::shared_ptr line(FeaturePtr theFeature) const override; + virtual std::shared_ptr line(FeaturePtr theFeature) const; /// \brief Check if two connected arcs have centers /// in same direction relatively to connection point virtual bool isArcArcTangencyInternal(EntityWrapperPtr theArc1, - EntityWrapperPtr theArc2) const override; + EntityWrapperPtr theArc2) const; }; #endif diff --git a/src/SketchSolver/PlaneGCSSolver/PlaneGCSSolver_FeatureBuilder.h b/src/SketchSolver/PlaneGCSSolver/PlaneGCSSolver_FeatureBuilder.h index d08d5ab26..af796cda3 100644 --- a/src/SketchSolver/PlaneGCSSolver/PlaneGCSSolver_FeatureBuilder.h +++ b/src/SketchSolver/PlaneGCSSolver/PlaneGCSSolver_FeatureBuilder.h @@ -25,15 +25,15 @@ public: /// Double attributes and 2D points are supported only. /// \param theAttribute [in] attribute to create /// \return Created wrapper of the attribute applicable for specific solver - virtual EntityWrapperPtr createAttribute(AttributePtr theAttribute) override; + virtual EntityWrapperPtr createAttribute(AttributePtr theAttribute); /// \brief Converts SketchPlugin's feature to the solver's entity. /// Result if based on the list of already converted attributes. /// \param theFeature [in] feature to create - virtual EntityWrapperPtr createFeature(FeaturePtr theFeature) override; + virtual EntityWrapperPtr createFeature(FeaturePtr theFeature); /// \brief Return list of constraints necessary to fix feature's extra DoF - virtual const std::list& constraints() const override + virtual const std::list& constraints() const { return myFeatureConstraints; } private: diff --git a/src/SketchSolver/PlaneGCSSolver/PlaneGCSSolver_Solver.h b/src/SketchSolver/PlaneGCSSolver/PlaneGCSSolver_Solver.h index 051f73cad..481cc0826 100644 --- a/src/SketchSolver/PlaneGCSSolver/PlaneGCSSolver_Solver.h +++ b/src/SketchSolver/PlaneGCSSolver/PlaneGCSSolver_Solver.h @@ -35,20 +35,20 @@ public: /// \brief Solve the set of equations /// \return identifier whether solution succeeded - virtual SketchSolver_SolveStatus solve() override; + virtual SketchSolver_SolveStatus solve(); /// \brief Prepare for solving. Store initial values of parameters for undo - virtual void prepare() override + virtual void prepare() { /* do nothing */ } /// \brief Revert solution to initial values - virtual void undo() override; + virtual void undo(); /// \brief Check the constraint is conflicted with others - virtual bool isConflicting(const ConstraintID& theConstraint) const override; + virtual bool isConflicting(const ConstraintID& theConstraint) const; /// \brief Degrees of freedom - virtual int dof() const override; + virtual int dof() const; private: void collectConflicting(); diff --git a/src/SketchSolver/PlaneGCSSolver/PlaneGCSSolver_Storage.h b/src/SketchSolver/PlaneGCSSolver/PlaneGCSSolver_Storage.h index 4af3f4e19..05139cf76 100644 --- a/src/SketchSolver/PlaneGCSSolver/PlaneGCSSolver_Storage.h +++ b/src/SketchSolver/PlaneGCSSolver/PlaneGCSSolver_Storage.h @@ -31,33 +31,33 @@ public: /// \param theConstraint [in] original SketchPlugin constraint /// \param theSolverConstraint [in] solver's constraint virtual void addConstraint(ConstraintPtr theConstraint, - ConstraintWrapperPtr theSolverConstraint) override; + ConstraintWrapperPtr theSolverConstraint); /// \brief Add list of temporary constraints which will be destroyed /// after the next solving of the set of constraints. /// \param theSolverConstraint [in] solver's constraint - virtual void addTemporaryConstraint(const ConstraintWrapperPtr& theSolverConstraint) override; + virtual void addTemporaryConstraint(const ConstraintWrapperPtr& theSolverConstraint); /// \brief Convert feature to the form applicable for specific solver and map it /// \param theFeature [in] feature to convert /// \param theForce [in] forced feature creation /// \return \c true if the feature has been created or updated - virtual bool update(FeaturePtr theFeature, bool theForce = false) override; + virtual bool update(FeaturePtr theFeature, bool theForce = false); /// \brief Convert attribute to the form applicable for specific solver and map it /// \param theAttribute [in] attribute to convert /// \param theForce [in] forced feature creation /// \return \c true if the attribute has been created or updated - virtual bool update(AttributePtr theAttribute, bool theForce = false) override; + virtual bool update(AttributePtr theAttribute, bool theForce = false); /// \brief Removes constraint from the storage /// \return \c true if the constraint and all its parameters are removed successfully - virtual bool removeConstraint(ConstraintPtr theConstraint) override; + virtual bool removeConstraint(ConstraintPtr theConstraint); /// \brief Update SketchPlugin features after resolving constraints - virtual void refresh() const override; + virtual void refresh() const; /// \brief Initialize solver by constraints, entities and parameters virtual void initializeSolver(); @@ -68,7 +68,7 @@ public: void removeParameters(const GCS::SET_pD& theParams); /// \brief Remove all features became invalid - virtual void removeInvalidEntities() override; + virtual void removeInvalidEntities(); private: /// \brief Verifies the constraint should not be added into the solver diff --git a/src/SketchSolver/PlaneGCSSolver/PlaneGCSSolver_UpdateCoincidence.h b/src/SketchSolver/PlaneGCSSolver/PlaneGCSSolver_UpdateCoincidence.h index d6320f65e..44f36c465 100644 --- a/src/SketchSolver/PlaneGCSSolver/PlaneGCSSolver_UpdateCoincidence.h +++ b/src/SketchSolver/PlaneGCSSolver/PlaneGCSSolver_UpdateCoincidence.h @@ -34,10 +34,10 @@ public: /// \param theObserver [in] object which want to receive notifications /// \param theType [in] receive notifications about changing objects /// of theType and their derivatives - virtual void attach(SketchSolver_Constraint* theObserver, const std::string& theType) override; + virtual void attach(SketchSolver_Constraint* theObserver, const std::string& theType); /// \brief Send notification about update of the feature to all interested - virtual void update(const FeaturePtr& theFeature) override; + virtual void update(const FeaturePtr& theFeature); /// \brief Verifies the entities are not coincident yet /// \return \c true if the entities does not coincident diff --git a/src/SketchSolver/PlaneGCSSolver/PlaneGCSSolver_UpdateFeature.h b/src/SketchSolver/PlaneGCSSolver/PlaneGCSSolver_UpdateFeature.h index 9da1a6eea..b8641e66e 100644 --- a/src/SketchSolver/PlaneGCSSolver/PlaneGCSSolver_UpdateFeature.h +++ b/src/SketchSolver/PlaneGCSSolver/PlaneGCSSolver_UpdateFeature.h @@ -31,10 +31,10 @@ public: /// \param theObserver [in] object which want to receive notifications /// \param theType [in] receive notifications about changing objects /// of theType and their derivatives - virtual void attach(SketchSolver_Constraint* theObserver, const std::string& theType) override; + virtual void attach(SketchSolver_Constraint* theObserver, const std::string& theType); /// \brief Send notification about update of the feature to all interested - virtual void update(const FeaturePtr& theFeature) override; + virtual void update(const FeaturePtr& theFeature); }; #endif diff --git a/src/SketchSolver/SketchSolver_ConstraintAngle.h b/src/SketchSolver/SketchSolver_ConstraintAngle.h index 1c6883c06..ffd0dffc8 100644 --- a/src/SketchSolver/SketchSolver_ConstraintAngle.h +++ b/src/SketchSolver/SketchSolver_ConstraintAngle.h @@ -22,14 +22,14 @@ public: {} /// \brief This method is used in derived objects to check consistence of constraint. - virtual void adjustConstraint() override; + virtual void adjustConstraint(); protected: /// \brief Generate list of attributes of constraint in order useful for constraints /// \param[out] theValue numerical characteristic of constraint (e.g. distance) /// \param[out] theAttributes list of attributes to be filled virtual void getAttributes(EntityWrapperPtr& theValue, - std::vector& theAttributes) override; + std::vector& theAttributes); private: int myType; diff --git a/src/SketchSolver/SketchSolver_ConstraintCoincidence.h b/src/SketchSolver/SketchSolver_ConstraintCoincidence.h index 634618ff2..46828e9ed 100644 --- a/src/SketchSolver/SketchSolver_ConstraintCoincidence.h +++ b/src/SketchSolver/SketchSolver_ConstraintCoincidence.h @@ -25,17 +25,17 @@ public: /// \brief Notify this object about the feature is changed somewhere virtual void notify(const FeaturePtr& theFeature, - PlaneGCSSolver_Update* theUpdater) override; + PlaneGCSSolver_Update* theUpdater); protected: /// \brief Converts SketchPlugin constraint to a list of SolveSpace constraints - virtual void process() override; + virtual void process(); /// \brief Generate list of attributes of constraint in order useful for constraints /// \param[out] theValue numerical characteristic of constraint (e.g. distance) /// \param[out] theAttributes list of attributes to be filled virtual void getAttributes(EntityWrapperPtr& theValue, - std::vector& theAttributes) override; + std::vector& theAttributes); protected: bool myInSolver; ///< shows the constraint is added to the solver diff --git a/src/SketchSolver/SketchSolver_ConstraintDistance.h b/src/SketchSolver/SketchSolver_ConstraintDistance.h index 08df9670a..85d540ff7 100644 --- a/src/SketchSolver/SketchSolver_ConstraintDistance.h +++ b/src/SketchSolver/SketchSolver_ConstraintDistance.h @@ -24,18 +24,18 @@ public: {} /// \brief Update constraint - virtual void update() override; + virtual void update(); protected: /// \brief Generate list of attributes of constraint in order useful for constraints /// \param[out] theValue numerical characteristic of constraint (e.g. distance) /// \param[out] theAttributes list of attributes to be filled virtual void getAttributes(EntityWrapperPtr& theValue, - std::vector& theAttributes) override; + std::vector& theAttributes); /// \brief This method is used in derived objects to check consistence of constraint. /// E.g. the distance between line and point may be signed. - virtual void adjustConstraint() override; + virtual void adjustConstraint(); private: double myPrevValue; ///< previous value of distance (for correct calculation of a distance sign) diff --git a/src/SketchSolver/SketchSolver_ConstraintEqual.h b/src/SketchSolver/SketchSolver_ConstraintEqual.h index 88a03aa16..3741f93dd 100644 --- a/src/SketchSolver/SketchSolver_ConstraintEqual.h +++ b/src/SketchSolver/SketchSolver_ConstraintEqual.h @@ -27,7 +27,7 @@ protected: /// \param[out] theValue numerical characteristic of constraint (e.g. distance) /// \param[out] theAttributes list of attributes to be filled virtual void getAttributes(EntityWrapperPtr& theValue, - std::vector& theAttributes) override; + std::vector& theAttributes); }; #endif diff --git a/src/SketchSolver/SketchSolver_ConstraintFixed.h b/src/SketchSolver/SketchSolver_ConstraintFixed.h index bccf4402a..35fc651be 100644 --- a/src/SketchSolver/SketchSolver_ConstraintFixed.h +++ b/src/SketchSolver/SketchSolver_ConstraintFixed.h @@ -26,17 +26,17 @@ public: SketchSolver_ConstraintFixed(FeaturePtr theFeature); /// \brief Block or unblock events from this constraint - virtual void blockEvents(bool isBlocked) override; + virtual void blockEvents(bool isBlocked); protected: /// \brief Converts SketchPlugin constraint to a list of SolveSpace constraints - virtual void process() override; + virtual void process(); /// \brief Generate list of attributes of constraint in order useful for constraints /// \param[out] theValue numerical characteristic of constraint (e.g. distance) /// \param[out] theAttributes list of attributes to be filled virtual void getAttributes(EntityWrapperPtr& theValue, - std::vector& theAttributes) override; + std::vector& theAttributes); /// \brief Fixed feature basing on its type /// \param theFeature [in] feature, converted to solver specific format diff --git a/src/SketchSolver/SketchSolver_ConstraintLength.h b/src/SketchSolver/SketchSolver_ConstraintLength.h index 1626f1c48..3934b59ff 100644 --- a/src/SketchSolver/SketchSolver_ConstraintLength.h +++ b/src/SketchSolver/SketchSolver_ConstraintLength.h @@ -27,7 +27,7 @@ protected: /// \param[out] theValue numerical characteristic of constraint (e.g. distance) /// \param[out] theAttributes list of attributes to be filled virtual void getAttributes(EntityWrapperPtr& theValue, - std::vector& theAttributes) override; + std::vector& theAttributes); }; #endif diff --git a/src/SketchSolver/SketchSolver_ConstraintMiddle.h b/src/SketchSolver/SketchSolver_ConstraintMiddle.h index 4d0805704..21bec5642 100644 --- a/src/SketchSolver/SketchSolver_ConstraintMiddle.h +++ b/src/SketchSolver/SketchSolver_ConstraintMiddle.h @@ -23,14 +23,14 @@ public: /// \brief Notify this object about the feature is changed somewhere virtual void notify(const FeaturePtr& theFeature, - PlaneGCSSolver_Update* theUpdater) override; + PlaneGCSSolver_Update* theUpdater); protected: /// \brief Generate list of attributes of constraint in order useful for constraints /// \param[out] theValue numerical characteristic of constraint (e.g. distance) /// \param[out] theAttributes list of attributes to be filled virtual void getAttributes(EntityWrapperPtr& theValue, - std::vector& theAttributes) override; + std::vector& theAttributes); private: ConstraintWrapperPtr myMiddle; diff --git a/src/SketchSolver/SketchSolver_ConstraintMirror.h b/src/SketchSolver/SketchSolver_ConstraintMirror.h index ead02ee24..fe0ea2e9c 100644 --- a/src/SketchSolver/SketchSolver_ConstraintMirror.h +++ b/src/SketchSolver/SketchSolver_ConstraintMirror.h @@ -24,24 +24,24 @@ public: {} /// \brief Update constraint - virtual void update() override; + virtual void update(); /// \brief Notify this object about the feature is changed somewhere - virtual void notify(const FeaturePtr& theFeature, PlaneGCSSolver_Update*) override; + virtual void notify(const FeaturePtr& theFeature, PlaneGCSSolver_Update*); /// \brief Block or unblock events from this constraint - virtual void blockEvents(bool isBlocked) override; + virtual void blockEvents(bool isBlocked); protected: /// \brief Converts SketchPlugin constraint to a list of SolveSpace constraints - virtual void process() override; + virtual void process(); /// \brief Generate list of entities of mirror constraint - virtual void getAttributes(EntityWrapperPtr&, std::vector&) override; + virtual void getAttributes(EntityWrapperPtr&, std::vector&); /// \brief This method is used in derived objects to check consistence of constraint. /// E.g. the distance between line and point may be signed. - virtual void adjustConstraint() override; + virtual void adjustConstraint(); private: size_t myNumberOfObjects; ///< number of previously mirrored objects diff --git a/src/SketchSolver/SketchSolver_ConstraintMulti.h b/src/SketchSolver/SketchSolver_ConstraintMulti.h index ea311e90d..b317fc1dc 100644 --- a/src/SketchSolver/SketchSolver_ConstraintMulti.h +++ b/src/SketchSolver/SketchSolver_ConstraintMulti.h @@ -30,33 +30,33 @@ public: {} /// \brief Update constraint - virtual void update() override; + virtual void update(); /// \brief Notify this object about the feature is changed somewhere - virtual void notify(const FeaturePtr& theFeature, PlaneGCSSolver_Update*) override; + virtual void notify(const FeaturePtr& theFeature, PlaneGCSSolver_Update*); /// \brief Tries to remove constraint /// \return \c false, if current constraint contains another SketchPlugin /// constraints (like for multiple coincidence) - virtual bool remove() override; + virtual bool remove(); /// \brief Block or unblock events from this constraint - virtual void blockEvents(bool isBlocked) override; + virtual void blockEvents(bool isBlocked); protected: /// \brief Converts SketchPlugin constraint to a list of SolveSpace constraints - virtual void process() override + virtual void process() { /* do nothing here */ } /// \brief Collect entities which are translated or rotated (not their copies) void getEntities(std::list& theEntities); /// \brief Generate list of attributes of constraint in order useful for SolveSpace constraints - virtual void getAttributes(EntityWrapperPtr&, std::vector&) override + virtual void getAttributes(EntityWrapperPtr&, std::vector&) { /* do nothing here */ } /// \brief This method is used in derived objects to check consistence of constraint. - virtual void adjustConstraint() override; + virtual void adjustConstraint(); /// \brief Update parameters of derived classes virtual void updateLocal() = 0; diff --git a/src/SketchSolver/SketchSolver_ConstraintMultiRotation.h b/src/SketchSolver/SketchSolver_ConstraintMultiRotation.h index 7a8daf78d..faffd9380 100644 --- a/src/SketchSolver/SketchSolver_ConstraintMultiRotation.h +++ b/src/SketchSolver/SketchSolver_ConstraintMultiRotation.h @@ -26,7 +26,7 @@ public: protected: /// \brief Converts SketchPlugin constraint to a list of SolveSpace constraints - virtual void process() override; + virtual void process(); /// \brief Generate list of rotated entities /// \param[out] theCenter central point of rotation @@ -39,23 +39,23 @@ protected: std::list& theEntities); /// \brief This method is used in derived objects to check consistence of constraint. - virtual void adjustConstraint() override; + virtual void adjustConstraint(); /// \brief Update parameters (called from base class) - virtual void updateLocal() override; + virtual void updateLocal(); private: /// \brief Convert absolute coordinates to relative coordinates virtual void getRelative(double theAbsX, double theAbsY, - double& theRelX, double& theRelY) override; + double& theRelX, double& theRelY); /// \brief Convert relative coordinates to absolute coordinates virtual void getAbsolute(double theRelX, double theRelY, - double& theAbsX, double& theAbsY) override; + double& theAbsX, double& theAbsY); /// \brief Apply transformation for relative coordinates - virtual void transformRelative(double& theX, double& theY) override; + virtual void transformRelative(double& theX, double& theY); /// \brief Returns name of NUMBER_OF_COPIES parameter for corresponding feature - virtual const std::string& nameNbObjects() override; + virtual const std::string& nameNbObjects(); private: AttributePoint2DPtr myCenterPointAttribute; ///< a center of rotation diff --git a/src/SketchSolver/SketchSolver_ConstraintMultiTranslation.h b/src/SketchSolver/SketchSolver_ConstraintMultiTranslation.h index 60e70f21c..6b71d30db 100644 --- a/src/SketchSolver/SketchSolver_ConstraintMultiTranslation.h +++ b/src/SketchSolver/SketchSolver_ConstraintMultiTranslation.h @@ -26,7 +26,7 @@ public: protected: /// \brief Converts SketchPlugin constraint to a list of SolveSpace constraints - virtual void process() override; + virtual void process(); /// \brief Generate list of translated entities /// \param[out] theStartPoint start point of translation @@ -37,23 +37,23 @@ protected: bool& theFullValue, std::list& theEntities); /// \brief This method is used in derived objects to check consistence of constraint. - virtual void adjustConstraint() override; + virtual void adjustConstraint(); /// \brief Update parameters (called from base class) - virtual void updateLocal() override; + virtual void updateLocal(); private: /// \brief Convert absolute coordinates to relative coordinates virtual void getRelative(double theAbsX, double theAbsY, - double& theRelX, double& theRelY) override; + double& theRelX, double& theRelY); /// \brief Convert relative coordinates to absolute coordinates virtual void getAbsolute(double theRelX, double theRelY, - double& theAbsX, double& theAbsY) override; + double& theAbsX, double& theAbsY); /// \brief Apply transformation for relative coordinates - virtual void transformRelative(double& theX, double& theY) override; + virtual void transformRelative(double& theX, double& theY); /// \brief Returns name of NUMBER_OF_COPIES parameter for corresponding feature - virtual const std::string& nameNbObjects() override; + virtual const std::string& nameNbObjects(); private: AttributePoint2DPtr myStartPointAttribute; diff --git a/src/SketchSolver/SketchSolver_ConstraintTangent.h b/src/SketchSolver/SketchSolver_ConstraintTangent.h index 35e724420..221450083 100644 --- a/src/SketchSolver/SketchSolver_ConstraintTangent.h +++ b/src/SketchSolver/SketchSolver_ConstraintTangent.h @@ -28,11 +28,11 @@ protected: /// \param[out] theValue numerical characteristic of constraint (e.g. distance) /// \param[out] theAttributes list of attributes to be filled virtual void getAttributes(EntityWrapperPtr& theValue, - std::vector& theAttributes) override; + std::vector& theAttributes); /// \brief This method is used in derived objects to check consistency of constraint. /// E.g. the distance between line and point may be signed. - virtual void adjustConstraint() override; + virtual void adjustConstraint(); private: bool isArcArcInternal;