Base: Modernise ctors dtors defs etc

This commit is contained in:
berniev
2022-08-01 13:56:03 +10:00
committed by wwmayer
parent ea233be212
commit 15419982d4
60 changed files with 271 additions and 363 deletions

View File

@@ -58,12 +58,12 @@ public:
static Py::PythonClassObject<Vector2dPy> create(const Vector2d&);
static Py::PythonClassObject<Vector2dPy> create(double x, double y);
Vector2dPy(Py::PythonClassInstance *self, Py::Tuple &args, Py::Dict &kwds);
virtual ~Vector2dPy();
~Vector2dPy() override;
static void init_type();
Py::Object getattro(const Py::String &name_);
int setattro(const Py::String &name_, const Py::Object &value);
virtual Py::Object repr();
Py::Object getattro(const Py::String &name_) override;
int setattro(const Py::String &name_, const Py::Object &value) override;
Py::Object repr() override;
inline const Vector2d& value() const {
return v;
}
@@ -77,24 +77,24 @@ public:
/** @name methods for group handling */
//@{
virtual Py::Object number_negative();
virtual Py::Object number_positive();
virtual Py::Object number_absolute();
virtual Py::Object number_invert();
virtual Py::Object number_int();
virtual Py::Object number_float();
virtual Py::Object number_long();
virtual Py::Object number_add( const Py::Object & );
virtual Py::Object number_subtract( const Py::Object & );
virtual Py::Object number_multiply( const Py::Object & );
virtual Py::Object number_remainder( const Py::Object & );
virtual Py::Object number_divmod( const Py::Object & );
virtual Py::Object number_lshift( const Py::Object & );
virtual Py::Object number_rshift( const Py::Object & );
virtual Py::Object number_and( const Py::Object & );
virtual Py::Object number_xor( const Py::Object & );
virtual Py::Object number_or( const Py::Object & );
virtual Py::Object number_power( const Py::Object &, const Py::Object & );
Py::Object number_negative() override;
Py::Object number_positive() override;
Py::Object number_absolute() override;
Py::Object number_invert() override;
Py::Object number_int() override;
Py::Object number_float() override;
Py::Object number_long() override;
Py::Object number_add( const Py::Object & ) override;
Py::Object number_subtract( const Py::Object & ) override;
Py::Object number_multiply( const Py::Object & ) override;
Py::Object number_remainder( const Py::Object & ) override;
Py::Object number_divmod( const Py::Object & ) override;
Py::Object number_lshift( const Py::Object & ) override;
Py::Object number_rshift( const Py::Object & ) override;
Py::Object number_and( const Py::Object & ) override;
Py::Object number_xor( const Py::Object & ) override;
Py::Object number_or( const Py::Object & ) override;
Py::Object number_power( const Py::Object &, const Py::Object & ) override;
//@}
Py::Object isNull(const Py::Tuple&);
@@ -144,7 +144,7 @@ public:
explicit Vector (const Base::Vector3d&);
explicit Vector (const Base::Vector3f&);
virtual bool accepts (PyObject *pyob) const;
bool accepts (PyObject *pyob) const override;
Vector(const Object& other): Object(other.ptr()) {
validate();
@@ -203,7 +203,7 @@ public:
GeometryT(const Object& other): Object(other.ptr()) {
validate();
}
virtual bool accepts (PyObject *pyob) const {
bool accepts (PyObject *pyob) const override {
return pyob && Geometry_TypeCheck (pyob);
}
GeometryT& operator= (const Object& rhs)