1 files changed, 83 insertions, 51 deletions

diff --git a/sources/shiboken6/tests/libsample/multiple_derived.h b/sources/shiboken6/tests/libsample/multiple_derived.h
index b91fb34cd..8c2143ed6 100644
--- a/sources/shiboken6/tests/libsample/multiple_derived.h
+++ b/sources/shiboken6/tests/libsample/multiple_derived.h
@@ -5,70 +5,86 @@
 #define MDERIVED_H
 
 #include "libsamplemacros.h"
+
 #include <string>
 
 class Base1
 {
 public:
-    Base1() : m_value(1) {}
-    virtual ~Base1() {}
+    LIBMINIMAL_DISABLE_COPY_MOVE(Base1)
+
+    Base1() noexcept = default;
+    virtual ~Base1() = default;
+
     virtual int base1Method() { return m_value; }
 
     virtual void publicMethod() {};
+
 private:
-    int m_value;
+    int m_value = 1;
 };
 
 class Base2
 {
 public:
-    Base2() : m_value(2) {}
-    virtual ~Base2() {}
+    LIBMINIMAL_DISABLE_COPY_MOVE(Base2)
+
+    Base2() noexcept = default;
+    virtual ~Base2() = default;
     virtual int base2Method() { return m_value; }
+
 private:
-    int m_value;
+    int m_value = 2;
 };
 
 class LIBSAMPLE_API MDerived1 : public Base1, public Base2
 {
 public:
-    MDerived1();
-    ~MDerived1() override {}
+    LIBMINIMAL_DISABLE_COPY_MOVE(MDerived1)
+
+    MDerived1() noexcept;
+    ~MDerived1() override = default;
 
     int mderived1Method() { return m_value; }
     int base1Method () override { return Base1::base1Method() * 10; }
     int base2Method() override { return Base2::base2Method() * 10; }
 
-    inline Base1* castToBase1() { return (Base1*) this; }
-    inline Base2* castToBase2() { return (Base2*) this; }
+    inline Base1 *castToBase1() { return (Base1*) this; }
+    inline Base2 *castToBase2() { return (Base2*) this; }
 
-    static MDerived1* transformFromBase1(Base1 *self);
-    static MDerived1* transformFromBase2(Base2 *self);
+    static MDerived1 *transformFromBase1(Base1 *self);
+    static MDerived1 *transformFromBase2(Base2 *self);
 
 private:
     void publicMethod() override {}
-    int m_value;
+    int m_value = 100;
 };
 
 class SonOfMDerived1 : public MDerived1
 {
 public:
-    SonOfMDerived1() : m_value(0) {}
-    ~SonOfMDerived1() {}
+    LIBMINIMAL_DISABLE_COPY_MOVE(SonOfMDerived1)
+
+    SonOfMDerived1() noexcept = default;
+    ~SonOfMDerived1() = default;
 
-    inline MDerived1* castToMDerived1() { return (MDerived1*) this; }
+    inline MDerived1 *castToMDerived1() { return this; }
 
     int sonOfMDerived1Method() { return m_value; }
+
 private:
-    int m_value;
+    int m_value = 0;
 };
 
 class Base3
 {
 public:
-    explicit Base3(int val = 3) : m_value(val) {}
-    virtual ~Base3() {}
+    LIBMINIMAL_DISABLE_COPY_MOVE(Base3)
+
+    explicit Base3(int val = 3) noexcept : m_value(val) {}
+    virtual ~Base3() = default;
     int base3Method() { return m_value; }
+
 private:
     int m_value;
 };
@@ -76,80 +92,95 @@ private:
 class Base4
 {
 public:
-    Base4() : m_value(4) {}
-    virtual ~Base4() {}
+    LIBMINIMAL_DISABLE_COPY_MOVE(Base4)
+
+    Base4() noexcept = default;
+    virtual ~Base4() = default;
     int base4Method() { return m_value; }
+
 private:
-    int m_value;
+    int m_value = 4;
 };
 
 class Base5
 {
 public:
-    Base5() : m_value(5) {}
-    virtual ~Base5() {}
+    LIBMINIMAL_DISABLE_COPY_MOVE(Base5)
+
+    Base5() noexcept = default;
+    virtual ~Base5() = default;
     virtual int base5Method() { return m_value; }
+
 private:
-    int m_value;
+    int m_value = 5;
 };
 
 class Base6
 {
 public:
-    Base6() : m_value(6) {}
-    virtual ~Base6() {}
+    LIBMINIMAL_DISABLE_COPY_MOVE(Base6)
+
+    Base6() noexcept = default;
+    virtual ~Base6() = default;
     virtual int base6Method() { return m_value; }
+
 private:
-    int m_value;
+    int m_value = 6;
 };
 
-
 class LIBSAMPLE_API MDerived2 : public Base3, public Base4, public Base5, public Base6
 {
 public:
-    MDerived2();
-    virtual ~MDerived2() {}
+    LIBMINIMAL_DISABLE_COPY_MOVE(MDerived2)
+
+    MDerived2() noexcept;
+    virtual ~MDerived2() = default;
 
     inline int base4Method() { return Base3::base3Method() * 10; }
     inline int mderived2Method() { return m_value; }
 
-    inline Base3* castToBase3() { return (Base3*) this; }
-    inline Base4* castToBase4() { return (Base4*) this; }
-    inline Base5* castToBase5() { return (Base5*) this; }
-    inline Base6* castToBase6() { return (Base6*) this; }
+    inline Base3 *castToBase3() { return this; }
+    inline Base4 *castToBase4() { return this; }
+    inline Base5 *castToBase5() { return this; }
+    inline Base6 *castToBase6() { return this; }
 
 private:
-    int m_value;
+    int m_value = 200;
 };
 
 class LIBSAMPLE_API MDerived3 : public MDerived1, public MDerived2
 {
 public:
-    MDerived3();
-    virtual ~MDerived3() {}
+    LIBMINIMAL_DISABLE_COPY_MOVE(MDerived3)
+
+    MDerived3() noexcept;
+    virtual ~MDerived3() = default;
 
     inline virtual int mderived3Method() { return m_value; }
 
-    inline MDerived1* castToMDerived1() { return (MDerived1*) this; }
-    inline MDerived2* castToMDerived2() { return (MDerived2*) this; }
+    inline MDerived1 *castToMDerived1() { return this; }
+    inline MDerived2 *castToMDerived2() { return this; }
 
-    inline Base3* castToBase3() { return (Base3*) this; }
+    inline Base3 *castToBase3() { return (Base3*) this; }
 
 private:
-    int m_value;
+    int m_value = 3000;
 };
 
 class LIBSAMPLE_API MDerived4 : public Base3, public Base4
 {
 public:
-    MDerived4();
-    ~MDerived4() {}
+    LIBMINIMAL_DISABLE_COPY_MOVE(MDerived4)
+
+    MDerived4() noexcept;
+    ~MDerived4() = default;
 
     inline int mderived4Method() { return 0; }
     inline int justDummyMethod() { return m_value; }
 
-    inline Base3* castToBase3() { return (Base3*) this; }
-    inline Base4* castToBase4() { return (Base4*) this; }
+    inline Base3 *castToBase3() { return this; }
+    inline Base4 *castToBase4() { return this; }
+
 private:
     int m_value;
 };
@@ -157,14 +188,15 @@ private:
 class LIBSAMPLE_API MDerived5 : public Base3, public Base4
 {
 public:
-    MDerived5();
-    virtual ~MDerived5() {}
+    LIBMINIMAL_DISABLE_COPY_MOVE(MDerived5)
+
+    MDerived5() noexcept;
+    virtual ~MDerived5() = default;
 
     virtual int mderived5Method() { return 0; }
 
-    inline Base3* castToBase3() { return (Base3*) this; }
-    inline Base4* castToBase4() { return (Base4*) this; }
+    inline Base3 *castToBase3() { return this; }
+    inline Base4 *castToBase4() { return this; }
 };
 
 #endif // MDERIVED_H
-