loplugin:deletedspecial

Change-Id: I28d39fc455560f0ad89390bd463e0fa470dde439

4 files changed, 14 insertions, 16 deletions

diff --git a/include/salhelper/condition.hxx b/include/salhelper/condition.hxx
index 960bdbeae6b1..65983cc32ac2 100644
--- a/include/salhelper/condition.hxx
+++ b/include/salhelper/condition.hxx
@@ -50,8 +50,8 @@ namespace salhelper
 
 
     private:
-        SALHELPER_DLLPRIVATE Condition(Condition &); // not defined
-        SALHELPER_DLLPRIVATE void operator =(Condition &); // not defined
+        Condition(Condition &) SAL_DELETED_FUNCTION;
+        void operator =(Condition &) SAL_DELETED_FUNCTION;
 
         osl::Mutex&  m_aMutex;
         oslCondition m_aCondition;
@@ -69,8 +69,8 @@ namespace salhelper
 
 
     private:
-        SALHELPER_DLLPRIVATE ConditionModifier(ConditionModifier &); // not defined
-        SALHELPER_DLLPRIVATE void operator =(ConditionModifier &); // not defined
+        ConditionModifier(ConditionModifier &) SAL_DELETED_FUNCTION;
+        void operator =(ConditionModifier &) SAL_DELETED_FUNCTION;
 
         Condition& m_aCond;
     };
@@ -103,8 +103,8 @@ namespace salhelper
 
 
     private:
-        SALHELPER_DLLPRIVATE ConditionWaiter(ConditionWaiter &); // not defined
-        SALHELPER_DLLPRIVATE void operator =(ConditionWaiter &); // not defined
+        ConditionWaiter(ConditionWaiter &) SAL_DELETED_FUNCTION;
+        void operator =(ConditionWaiter &) SAL_DELETED_FUNCTION;
 
         Condition& m_aCond;
     };
diff --git a/include/salhelper/refobj.hxx b/include/salhelper/refobj.hxx
index 32ca6e170f70..4a004d2c8eb8 100644
--- a/include/salhelper/refobj.hxx
+++ b/include/salhelper/refobj.hxx
@@ -38,10 +38,8 @@ class ReferenceObject
      */
     oslInterlockedCount m_nReferenceCount;
 
-    /** Not implemented.
-     */
-    ReferenceObject (const ReferenceObject&);
-    ReferenceObject& operator= (const ReferenceObject&);
+    ReferenceObject (const ReferenceObject&) SAL_DELETED_FUNCTION;
+    ReferenceObject& operator= (const ReferenceObject&) SAL_DELETED_FUNCTION;
 
 public:
     /** Allocation.
diff --git a/include/salhelper/simplereferenceobject.hxx b/include/salhelper/simplereferenceobject.hxx
index 67626b156aad..46b00ac332c2 100644
--- a/include/salhelper/simplereferenceobject.hxx
+++ b/include/salhelper/simplereferenceobject.hxx
@@ -96,11 +96,11 @@ private:
 
     /** not implemented
      */
-    SALHELPER_DLLPRIVATE SimpleReferenceObject(SimpleReferenceObject &);
+    SimpleReferenceObject(SimpleReferenceObject &) SAL_DELETED_FUNCTION;
 
     /** not implemented
      */
-    SALHELPER_DLLPRIVATE void operator =(SimpleReferenceObject);
+    void operator =(SimpleReferenceObject) SAL_DELETED_FUNCTION;
 
     /// @cond INTERNAL
 
diff --git a/include/salhelper/timer.hxx b/include/salhelper/timer.hxx
index 1b52522dea99..ac2a523c4b6a 100644
--- a/include/salhelper/timer.hxx
+++ b/include/salhelper/timer.hxx
@@ -212,13 +212,13 @@ protected:
 
 private:
 
-    /** Copy constructor disabled.
+    /** Copy constructor deleted.
      */
-    SALHELPER_DLLPRIVATE Timer( const Timer& rTimer );
+    Timer( const Timer& rTimer ) SAL_DELETED_FUNCTION;
 
-    /** Assignment operator disabled.
+    /** Copy assignment operator deleted.
      */
-    SALHELPER_DLLPRIVATE void SAL_CALL operator=( const Timer& rTimer );
+    void SAL_CALL operator=( const Timer& rTimer ) SAL_DELETED_FUNCTION;
 
     friend class TimerManager;
 };