diff options
author | Noel Grandin <noel@peralex.com> | 2016-07-01 09:46:23 +0200 |
---|---|---|
committer | Noel Grandin <noelgrandin@gmail.com> | 2016-07-04 06:49:07 +0000 |
commit | cd71034b26a404c8f9b763865ef6ebdd0adeebb7 (patch) | |
tree | ff2aaa6a6d1849b51d883d48dfdef04b17817fcd /include/comphelper | |
parent | remove deprecated Link functions from Registry (diff) | |
download | core-cd71034b26a404c8f9b763865ef6ebdd0adeebb7.tar.gz core-cd71034b26a404c8f9b763865ef6ebdd0adeebb7.zip |
comphelper::OBaseMutex -> cppu::BaseMutex
convert usage of deprecated class, and remove the old class
Change-Id: I19fb9271090d19e5531622b58492e1a848d306e2
Reviewed-on: https://gerrit.libreoffice.org/26843
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'include/comphelper')
-rw-r--r-- | include/comphelper/accessiblecontexthelper.hxx | 4 | ||||
-rw-r--r-- | include/comphelper/accessiblewrapper.hxx | 4 | ||||
-rw-r--r-- | include/comphelper/broadcasthelper.hxx | 9 | ||||
-rw-r--r-- | include/comphelper/proxyaggregation.hxx | 4 | ||||
-rw-r--r-- | include/comphelper/weakeventlistener.hxx | 4 |
5 files changed, 8 insertions, 17 deletions
diff --git a/include/comphelper/accessiblecontexthelper.hxx b/include/comphelper/accessiblecontexthelper.hxx index 3308c09cc984..69759ee1aade 100644 --- a/include/comphelper/accessiblecontexthelper.hxx +++ b/include/comphelper/accessiblecontexthelper.hxx @@ -21,10 +21,10 @@ #define INCLUDED_COMPHELPER_ACCESSIBLECONTEXTHELPER_HXX #include <cppuhelper/compbase2.hxx> +#include <cppuhelper/basemutex.hxx> #include <com/sun/star/accessibility/XAccessibleContext.hpp> #include <com/sun/star/accessibility/XAccessibleEventBroadcaster.hpp> #include <com/sun/star/lang/DisposedException.hpp> -#include <comphelper/broadcasthelper.hxx> #include <comphelper/comphelperdllapi.h> #include <memory> @@ -83,7 +83,7 @@ namespace comphelper /** helper class for implementing an AccessibleContext */ class COMPHELPER_DLLPUBLIC OAccessibleContextHelper - :public ::comphelper::OBaseMutex + :public ::cppu::BaseMutex ,public OAccessibleContextHelper_Base { private: diff --git a/include/comphelper/accessiblewrapper.hxx b/include/comphelper/accessiblewrapper.hxx index f1efb09c8ca0..84479c023f2a 100644 --- a/include/comphelper/accessiblewrapper.hxx +++ b/include/comphelper/accessiblewrapper.hxx @@ -33,10 +33,10 @@ #include <com/sun/star/lang/XComponent.hpp> #include <cppuhelper/implbase.hxx> #include <cppuhelper/implbase1.hxx> +#include <cppuhelper/basemutex.hxx> #include <comphelper/sequence.hxx> #include <comphelper/uno3.hxx> #include <cppuhelper/interfacecontainer.hxx> -#include <comphelper/broadcasthelper.hxx> #include <comphelper/accessibleeventnotifier.hxx> #include <comphelper/stl_types.hxx> #include <comphelper/comphelperdllapi.h> @@ -238,7 +238,7 @@ namespace comphelper > OAccessibleContextWrapper_CBase; class COMPHELPER_DLLPUBLIC OAccessibleContextWrapper - :public OBaseMutex + :public cppu::BaseMutex ,public OAccessibleContextWrapper_CBase ,public OAccessibleContextWrapperHelper { diff --git a/include/comphelper/broadcasthelper.hxx b/include/comphelper/broadcasthelper.hxx index 61e7244cb3f3..d9586ee5b4f7 100644 --- a/include/comphelper/broadcasthelper.hxx +++ b/include/comphelper/broadcasthelper.hxx @@ -44,15 +44,6 @@ namespace comphelper const ::cppu::OBroadcastHelper& GetBroadcastHelper() const { return m_aBHelper; } }; - - // base class for all classes who are derived from OPropertySet and from OComponent - // @deprecated, you should use cppu::BaseMutex instead (cppuhelper/basemutex.hxx) - - class OBaseMutex - { - protected: - mutable ::osl::Mutex m_aMutex; - }; } #endif // INCLUDED_COMPHELPER_BROADCASTHELPER_HXX diff --git a/include/comphelper/proxyaggregation.hxx b/include/comphelper/proxyaggregation.hxx index 4b82e8b2c687..eadafbf9aefb 100644 --- a/include/comphelper/proxyaggregation.hxx +++ b/include/comphelper/proxyaggregation.hxx @@ -25,8 +25,8 @@ #include <com/sun/star/lang/XComponent.hpp> #include <cppuhelper/implbase1.hxx> #include <cppuhelper/interfacecontainer.hxx> +#include <cppuhelper/basemutex.hxx> #include <comphelper/uno3.hxx> -#include <comphelper/broadcasthelper.hxx> #include <cppuhelper/compbase_ex.hxx> #include <comphelper/comphelperdllapi.h> @@ -176,7 +176,7 @@ namespace comphelper //= OComponentProxyAggregation - class COMPHELPER_DLLPUBLIC OComponentProxyAggregation :public OBaseMutex + class COMPHELPER_DLLPUBLIC OComponentProxyAggregation : public cppu::BaseMutex ,public cppu::WeakComponentImplHelperBase ,public OComponentProxyAggregationHelper { diff --git a/include/comphelper/weakeventlistener.hxx b/include/comphelper/weakeventlistener.hxx index 23952e4e268d..87884637a92f 100644 --- a/include/comphelper/weakeventlistener.hxx +++ b/include/comphelper/weakeventlistener.hxx @@ -21,10 +21,10 @@ #define INCLUDED_COMPHELPER_WEAKEVENTLISTENER_HXX #include <cppuhelper/compbase.hxx> +#include <cppuhelper/basemutex.hxx> #include <com/sun/star/lang/XComponent.hpp> #include <com/sun/star/uno/XWeak.hpp> #include <cppuhelper/weakref.hxx> -#include <comphelper/broadcasthelper.hxx> #include <comphelper/comphelperdllapi.h> @@ -41,7 +41,7 @@ namespace comphelper holds it's listener hard. The adapter itself knows the real listener as weak reference, thus not affecting its life time.</p> */ - class OWeakListenerAdapterBase : public OBaseMutex + class OWeakListenerAdapterBase : public cppu::BaseMutex { private: css::uno::WeakReference< css::uno::XInterface > |