1 files changed, 25 insertions, 19 deletions
diff --git a/sources/shiboken6/tests/libsample/reference.h b/sources/shiboken6/tests/libsample/reference.h
index d4b7ce2cf..52818d9ea 100644
--- a/sources/shiboken6/tests/libsample/reference.h
+++ b/sources/shiboken6/tests/libsample/reference.h
@@ -9,34 +9,37 @@
 class LIBSAMPLE_API Reference
 {
 public:
-    explicit Reference(int objId = -1)
+    LIBMINIMAL_DEFAULT_COPY_MOVE(Reference)
+
+    explicit Reference(int objId = -1) noexcept
             : m_objId(objId) {}
-    virtual ~Reference() {}
+    virtual ~Reference() = default;
 
-    inline int objId() { return m_objId; }
+    inline int objId() const { return m_objId; }
     inline void setObjId(int objId) { m_objId = objId; }
 
-    inline static int usesReference(Reference& r) { return r.m_objId; }
-    inline static int usesConstReference(const Reference& r) { return r.m_objId; }
+    inline static int usesReference(Reference &r) { return r.m_objId; }
+    inline static int usesConstReference(const Reference &r) { return r.m_objId; }
 
-    virtual int usesReferenceVirtual(Reference& r, int inc);
-    virtual int usesConstReferenceVirtual(const Reference& r, int inc);
+    virtual int usesReferenceVirtual(Reference &r, int inc);
+    virtual int usesConstReferenceVirtual(const Reference &r, int inc);
 
-    int callUsesReferenceVirtual(Reference& r, int inc);
-    int callUsesConstReferenceVirtual(const Reference& r, int inc);
+    int callUsesReferenceVirtual(Reference &r, int inc);
+    int callUsesConstReferenceVirtual(const Reference &r, int inc);
 
-    virtual void alterReferenceIdVirtual(Reference& r);
-    void callAlterReferenceIdVirtual(Reference& r);
+    virtual void alterReferenceIdVirtual(Reference &r);
+    void callAlterReferenceIdVirtual(Reference &r);
 
     void show() const;
 
     inline static int multiplier() { return 10; }
 
-    virtual Reference& returnMyFirstArg(Reference& ref) { return ref; }
-    virtual Reference& returnMySecondArg(int a, Reference& ref) { return ref; }
+    virtual Reference &returnMyFirstArg(Reference &ref) { return ref; }
+    virtual Reference &returnMySecondArg(int a, Reference &ref);
 
     // nonsense operator to test if Shiboken is ignoring dereference operators.
     int operator*() { return m_objId; }
+
 private:
     int m_objId;
 };
@@ -44,13 +47,16 @@ private:
 class LIBSAMPLE_API ObjTypeReference
 {
 public:
-    ObjTypeReference() {}
-    ObjTypeReference(const ObjTypeReference&) {}
+    LIBMINIMAL_DISABLE_MOVE(ObjTypeReference)
+
+    ObjTypeReference() noexcept = default;
+    ObjTypeReference(const ObjTypeReference &) noexcept = default;
+    ObjTypeReference &operator=(const ObjTypeReference &) = delete;
     virtual ~ObjTypeReference();
-    virtual ObjTypeReference& returnMyFirstArg(ObjTypeReference& ref) { return ref; }
-    virtual ObjTypeReference& returnMySecondArg(int a, ObjTypeReference& ref) { return ref; }
-    virtual ObjTypeReference& justAPureVirtualFunc(ObjTypeReference& ref) = 0;
+
+    virtual ObjTypeReference &returnMyFirstArg(ObjTypeReference &ref) { return ref; }
+    virtual ObjTypeReference &returnMySecondArg(int a, ObjTypeReference &ref);
+    virtual ObjTypeReference &justAPureVirtualFunc(ObjTypeReference &ref) = 0;
 };
 
 #endif // REFERENCE_H
-