loplugin:deletedspecial

Change-Id: I0b91d813d0ec432f15aaf2d31a11dd4c505e2e54

5 files changed, 32 insertions, 24 deletions

diff --git a/include/cppuhelper/component.hxx b/include/cppuhelper/component.hxx
index ffcd50fb51a6..ea140e453e78 100644
--- a/include/cppuhelper/component.hxx
+++ b/include/cppuhelper/component.hxx
@@ -102,8 +102,9 @@ protected:
     /// @endcond
 
 private:
-    inline OComponentHelper( const OComponentHelper & );
-    inline OComponentHelper & operator = ( const OComponentHelper & );
+    OComponentHelper( const OComponentHelper & ) SAL_DELETED_FUNCTION;
+    OComponentHelper & operator = ( const OComponentHelper & )
+        SAL_DELETED_FUNCTION;
 };
 
 }
diff --git a/include/cppuhelper/interfacecontainer.h b/include/cppuhelper/interfacecontainer.h
index 650d455532e0..6ec2e08170d3 100644
--- a/include/cppuhelper/interfacecontainer.h
+++ b/include/cppuhelper/interfacecontainer.h
@@ -106,8 +106,10 @@ private:
 
     sal_Int32                   nRemain;
 
-    OInterfaceIteratorHelper( const OInterfaceIteratorHelper & );
-    OInterfaceIteratorHelper &  operator = ( const OInterfaceIteratorHelper & );
+    OInterfaceIteratorHelper( const OInterfaceIteratorHelper & )
+        SAL_DELETED_FUNCTION;
+    OInterfaceIteratorHelper &  operator = ( const OInterfaceIteratorHelper & )
+        SAL_DELETED_FUNCTION;
 };
 
 
@@ -240,8 +242,10 @@ friend class OInterfaceIteratorHelper;
     /** TRUE -> aData.pAsSequence is of type Sequence< XInterfaceSequence >. */
     sal_Bool                bIsList;
 
-    OInterfaceContainerHelper( const OInterfaceContainerHelper & );
-    OInterfaceContainerHelper & operator = ( const OInterfaceContainerHelper & );
+    OInterfaceContainerHelper( const OInterfaceContainerHelper & )
+        SAL_DELETED_FUNCTION;
+    OInterfaceContainerHelper & operator = ( const OInterfaceContainerHelper & )
+        SAL_DELETED_FUNCTION;
 
     /*
       Dulicate content of the conaitner and release the old one without destroying.
@@ -407,8 +411,8 @@ private:
         return iter;
     }
 
-    inline OMultiTypeInterfaceContainerHelperVar( const OMultiTypeInterfaceContainerHelperVar & );
-    inline OMultiTypeInterfaceContainerHelperVar & operator = ( const OMultiTypeInterfaceContainerHelperVar & );
+    OMultiTypeInterfaceContainerHelperVar( const OMultiTypeInterfaceContainerHelperVar & ) SAL_DELETED_FUNCTION;
+    OMultiTypeInterfaceContainerHelperVar & operator = ( const OMultiTypeInterfaceContainerHelperVar & ) SAL_DELETED_FUNCTION;
 };
 
 
@@ -590,8 +594,8 @@ private:
     void *m_pMap;
     ::osl::Mutex &  rMutex;
 
-    inline OMultiTypeInterfaceContainerHelper( const OMultiTypeInterfaceContainerHelper & );
-    inline OMultiTypeInterfaceContainerHelper & operator = ( const OMultiTypeInterfaceContainerHelper & );
+    OMultiTypeInterfaceContainerHelper( const OMultiTypeInterfaceContainerHelper & ) SAL_DELETED_FUNCTION;
+    OMultiTypeInterfaceContainerHelper & operator = ( const OMultiTypeInterfaceContainerHelper & ) SAL_DELETED_FUNCTION;
 };
 
 typedef OBroadcastHelperVar< OMultiTypeInterfaceContainerHelper , OMultiTypeInterfaceContainerHelper::keyType > OBroadcastHelper;
diff --git a/include/cppuhelper/propertysetmixin.hxx b/include/cppuhelper/propertysetmixin.hxx
index 73df16550951..56a5a17d6eb6 100644
--- a/include/cppuhelper/propertysetmixin.hxx
+++ b/include/cppuhelper/propertysetmixin.hxx
@@ -158,8 +158,8 @@ protected:
         void notify() const;
 
     private:
-        BoundListeners( const BoundListeners&); // not defined
-        void operator=( const BoundListeners&); // not defined
+        BoundListeners( const BoundListeners&) SAL_DELETED_FUNCTION;
+        void operator=( const BoundListeners&) SAL_DELETED_FUNCTION;
 
         class Impl;
         Impl * m_impl;
@@ -382,8 +382,8 @@ protected:
             com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
 private:
-    PropertySetMixinImpl( const PropertySetMixinImpl&); // not defined
-    void operator=( const PropertySetMixinImpl&); // not defined
+    PropertySetMixinImpl( const PropertySetMixinImpl&) SAL_DELETED_FUNCTION;
+    void operator=( const PropertySetMixinImpl&) SAL_DELETED_FUNCTION;
 
     PropertySetMixinImpl(
         com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >
@@ -474,8 +474,8 @@ protected:
     ~PropertySetMixin() {}
 
 private:
-    PropertySetMixin( const PropertySetMixin&); // not defined
-    void operator=( const PropertySetMixin&); // not defined
+    PropertySetMixin( const PropertySetMixin&) SAL_DELETED_FUNCTION;
+    void operator=( const PropertySetMixin&) SAL_DELETED_FUNCTION;
 };
 #if defined __GNUC__ && !defined __clang__
 #pragma GCC diagnostic pop
diff --git a/include/cppuhelper/propshlp.hxx b/include/cppuhelper/propshlp.hxx
index c65282238a54..c6dcfd14d290 100644
--- a/include/cppuhelper/propshlp.hxx
+++ b/include/cppuhelper/propshlp.hxx
@@ -296,8 +296,8 @@ private:
     void *m_pMap;
     ::osl::Mutex &  rMutex;
 
-    inline OMultiTypeInterfaceContainerHelperInt32( const OMultiTypeInterfaceContainerHelperInt32 & );
-    inline OMultiTypeInterfaceContainerHelperInt32 & operator = ( const OMultiTypeInterfaceContainerHelperInt32 & );
+    OMultiTypeInterfaceContainerHelperInt32( const OMultiTypeInterfaceContainerHelperInt32 & ) SAL_DELETED_FUNCTION;
+    OMultiTypeInterfaceContainerHelperInt32 & operator = ( const OMultiTypeInterfaceContainerHelperInt32 & )SAL_DELETED_FUNCTION;
 };
 
 
@@ -651,8 +651,9 @@ protected:
     Impl * const m_pReserved;
 
 private:
-    OPropertySetHelper( const OPropertySetHelper & );
-    OPropertySetHelper &    operator = ( const OPropertySetHelper & );
+    OPropertySetHelper( const OPropertySetHelper & ) SAL_DELETED_FUNCTION;
+    OPropertySetHelper &    operator = ( const OPropertySetHelper & )
+        SAL_DELETED_FUNCTION;
 
     /** notifies the given changes in property's values, <em>plus</em> all property changes collected during recent
         |setDependentFastPropertyValue| calls.
@@ -714,8 +715,9 @@ public:
 
 
 private:
-    OPropertySetHelper2( const OPropertySetHelper2 & );
-    OPropertySetHelper2 &    operator = ( const OPropertySetHelper2 & );
+    OPropertySetHelper2( const OPropertySetHelper2 & ) SAL_DELETED_FUNCTION;
+    OPropertySetHelper2 &    operator = ( const OPropertySetHelper2 & )
+        SAL_DELETED_FUNCTION;
 
 #if defined _MSC_VER // public -> protected changes mangled names there
 public:
diff --git a/include/cppuhelper/weakagg.hxx b/include/cppuhelper/weakagg.hxx
index abc0cade6149..6f2577bc6cde 100644
--- a/include/cppuhelper/weakagg.hxx
+++ b/include/cppuhelper/weakagg.hxx
@@ -94,8 +94,9 @@ protected:
     */
     ::com::sun::star::uno::WeakReferenceHelper xDelegator;
 private:
-    OWeakAggObject( const OWeakAggObject & rObj );
-    OWeakAggObject & operator = ( const OWeakAggObject & rObj );
+    OWeakAggObject( const OWeakAggObject & rObj ) SAL_DELETED_FUNCTION;
+    OWeakAggObject & operator = ( const OWeakAggObject & rObj )
+        SAL_DELETED_FUNCTION;
 };
 
 }