From 61b00192cd4682cb592d880be1f4d57925ca03c7 Mon Sep 17 00:00:00 2001
From: Jochen Nitschke <j.nitschke+logerrit@ok.de>
Date: Wed, 7 Dec 2016 08:59:42 +0100
Subject: tdf#88206 replace cppu::WeakImplHelper* in cppuhelper

Change-Id: I3130a3fe28c00bd83cade9667a6e3b3abcb719f7
Reviewed-on: https://gerrit.libreoffice.org/31714
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
---
 cppuhelper/qa/ifcontainer/cppu_ifcontainer.cxx     |  4 +-
 .../qa/propertysetmixin/comp_propertysetmixin.cxx  |  4 +-
 .../qa/propertysetmixin/test_propertysetmixin.cxx  |  6 +--
 cppuhelper/qa/weak/test_weak.cxx                   |  4 +-
 cppuhelper/source/component_context.cxx            |  4 +-
 cppuhelper/source/macro_expander.cxx               |  4 +-
 cppuhelper/source/propertysetmixin.cxx             |  4 +-
 cppuhelper/source/propshlp.cxx                     |  4 +-
 cppuhelper/source/servicemanager.cxx               |  9 ++--
 cppuhelper/source/tdmgr.cxx                        |  4 +-
 cppuhelper/source/typemanager.cxx                  | 52 +++++++++++-----------
 cppuhelper/source/typemanager.hxx                  |  4 +-
 12 files changed, 51 insertions(+), 52 deletions(-)

(limited to 'cppuhelper')

diff --git a/cppuhelper/qa/ifcontainer/cppu_ifcontainer.cxx b/cppuhelper/qa/ifcontainer/cppu_ifcontainer.cxx
index b1f7ff7722ed..0484eecbce7d 100644
--- a/cppuhelper/qa/ifcontainer/cppu_ifcontainer.cxx
+++ b/cppuhelper/qa/ifcontainer/cppu_ifcontainer.cxx
@@ -27,7 +27,7 @@
 #include <com/sun/star/lang/XEventListener.hpp>
 #include <cppuhelper/interfacecontainer.hxx>
 #include <cppuhelper/queryinterface.hxx>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <cppuhelper/propshlp.hxx>
 
 using namespace com::sun::star;
@@ -42,7 +42,7 @@ struct ContainerStats {
     ContainerStats() : m_nAlive(0), m_nDisposed(0) {}
 };
 
-class ContainerListener : public ::cppu::WeakImplHelper1< XEventListener >
+class ContainerListener : public ::cppu::WeakImplHelper< XEventListener >
 {
     ContainerStats *m_pStats;
 public:
diff --git a/cppuhelper/qa/propertysetmixin/comp_propertysetmixin.cxx b/cppuhelper/qa/propertysetmixin/comp_propertysetmixin.cxx
index f6b96e26df57..5e8ce06b7ef0 100644
--- a/cppuhelper/qa/propertysetmixin/comp_propertysetmixin.cxx
+++ b/cppuhelper/qa/propertysetmixin/comp_propertysetmixin.cxx
@@ -31,7 +31,7 @@
 #include <com/sun/star/lang/XComponent.hpp>
 #include <cppuhelper/propertysetmixin.hxx>
 #include <cppuhelper/factory.hxx>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <cppuhelper/implementationentry.hxx>
 #include <cppuhelper/queryinterface.hxx>
 #include <cppuhelper/weak.hxx>
@@ -344,7 +344,7 @@ void Full::setFourth(sal_Int32)
 }
 
 class Supplier:
-    public cppu::WeakImplHelper1<
+    public cppu::WeakImplHelper<
     test::cppuhelper::propertysetmixin::XSupplier >
 {
 public:
diff --git a/cppuhelper/qa/propertysetmixin/test_propertysetmixin.cxx b/cppuhelper/qa/propertysetmixin/test_propertysetmixin.cxx
index 9385dcd4e317..ab9412928c07 100644
--- a/cppuhelper/qa/propertysetmixin/test_propertysetmixin.cxx
+++ b/cppuhelper/qa/propertysetmixin/test_propertysetmixin.cxx
@@ -46,7 +46,7 @@
 #include <com/sun/star/uno/Type.hxx>
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <cppuhelper/bootstrap.hxx>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 #include "cppunit/TestAssert.h"
 #include "cppunit/TestFixture.h"
 #include "cppunit/extensions/HelperMacros.h"
@@ -82,7 +82,7 @@ std::ostream & operator <<(std::ostream & out, css::uno::Any const & value) {
 }
 
 class BoundListener:
-    public cppu::WeakImplHelper1< css::beans::XPropertyChangeListener >
+    public cppu::WeakImplHelper< css::beans::XPropertyChangeListener >
 {
 public:
     BoundListener(): m_count(0) {}
@@ -116,7 +116,7 @@ private:
 };
 
 class VetoListener:
-    public cppu::WeakImplHelper1< css::beans::XVetoableChangeListener >
+    public cppu::WeakImplHelper< css::beans::XVetoableChangeListener >
 {
 public:
     VetoListener(): m_count(0) {}
diff --git a/cppuhelper/qa/weak/test_weak.cxx b/cppuhelper/qa/weak/test_weak.cxx
index 84c980efb2b5..2a1d23e1c2a8 100644
--- a/cppuhelper/qa/weak/test_weak.cxx
+++ b/cppuhelper/qa/weak/test_weak.cxx
@@ -27,14 +27,14 @@
 #include <com/sun/star/uno/XAdapter.hpp>
 #include <com/sun/star/uno/XReference.hpp>
 #include <com/sun/star/uno/XWeak.hpp>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <cppuhelper/weak.hxx>
 #include <rtl/ref.hxx>
 #include <sal/types.h>
 
 namespace {
 
-class Reference: public cppu::WeakImplHelper1< css::uno::XReference > {
+class Reference: public cppu::WeakImplHelper< css::uno::XReference > {
 public:
     Reference(): m_disposed(false) {}
 
diff --git a/cppuhelper/source/component_context.cxx b/cppuhelper/source/component_context.cxx
index 5dfb0714e1d7..3fb4b94b6432 100644
--- a/cppuhelper/source/component_context.cxx
+++ b/cppuhelper/source/component_context.cxx
@@ -28,10 +28,10 @@
 #include <uno/lbnames.h>
 #include <uno/mapping.hxx>
 
-#include <cppuhelper/implbase1.hxx>
 #include <cppuhelper/compbase.hxx>
 #include <cppuhelper/component_context.hxx>
 #include <cppuhelper/exc_hlp.hxx>
+#include <cppuhelper/implbase.hxx>
 
 #include <com/sun/star/container/XNameContainer.hpp>
 #include <com/sun/star/lang/WrappedTargetRuntimeException.hpp>
@@ -78,7 +78,7 @@ static inline void try_dispose( Reference< lang::XComponent > const & xComp )
 }
 
 class DisposingForwarder
-    : public WeakImplHelper1< lang::XEventListener >
+    : public WeakImplHelper< lang::XEventListener >
 {
     Reference< lang::XComponent > m_xTarget;
 
diff --git a/cppuhelper/source/macro_expander.cxx b/cppuhelper/source/macro_expander.cxx
index b128e8d24a67..923ee4d67dc8 100644
--- a/cppuhelper/source/macro_expander.cxx
+++ b/cppuhelper/source/macro_expander.cxx
@@ -24,7 +24,7 @@
 #include <uno/mapping.hxx>
 
 #include <cppuhelper/factory.hxx>
-#include <cppuhelper/compbase2.hxx>
+#include <cppuhelper/compbase.hxx>
 #include <cppuhelper/component_context.hxx>
 #include <cppuhelper/supportsservice.hxx>
 
@@ -112,7 +112,7 @@ inline Sequence< OUString > const & s_get_service_names()
     return theImplNames::get().getNames();
 }
 
-typedef ::cppu::WeakComponentImplHelper2<
+typedef cppu::WeakComponentImplHelper<
     util::XMacroExpander, lang::XServiceInfo > t_uno_impl;
 
 struct mutex_holder
diff --git a/cppuhelper/source/propertysetmixin.cxx b/cppuhelper/source/propertysetmixin.cxx
index be101b6167a2..30aa0b90d822 100644
--- a/cppuhelper/source/propertysetmixin.cxx
+++ b/cppuhelper/source/propertysetmixin.cxx
@@ -66,7 +66,7 @@
 #include <com/sun/star/uno/TypeClass.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/uno/XInterface.hpp>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <cppuhelper/propertysetmixin.hxx>
 #include <cppuhelper/weak.hxx>
 #include <osl/mutex.hxx>
@@ -275,7 +275,7 @@ css::uno::Reference< css::reflection::XTypeDescription > Data::resolveTypedefs(
     return t;
 }
 
-class Info: public cppu::WeakImplHelper1< css::beans::XPropertySetInfo > {
+class Info: public cppu::WeakImplHelper< css::beans::XPropertySetInfo > {
 public:
     explicit Info(Data * data): m_data(data) {}
 
diff --git a/cppuhelper/source/propshlp.cxx b/cppuhelper/source/propshlp.cxx
index 11caf4c4b57a..1ada97639738 100644
--- a/cppuhelper/source/propshlp.cxx
+++ b/cppuhelper/source/propshlp.cxx
@@ -19,7 +19,7 @@
 
 
 #include <osl/diagnose.h>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <cppuhelper/queryinterface.hxx>
 #include <cppuhelper/weak.hxx>
 #include <cppuhelper/propshlp.hxx>
@@ -71,7 +71,7 @@ static int compare_OUString_Property_Impl( const void *arg1, const void *arg2 )
  */
 
 class OPropertySetHelperInfo_Impl
-    : public WeakImplHelper1< css::beans::XPropertySetInfo >
+    : public WeakImplHelper< css::beans::XPropertySetInfo >
 {
     Sequence < Property > aInfos;
 
diff --git a/cppuhelper/source/servicemanager.cxx b/cppuhelper/source/servicemanager.cxx
index 22411286a2b7..57925af29bf6 100644
--- a/cppuhelper/source/servicemanager.cxx
+++ b/cppuhelper/source/servicemanager.cxx
@@ -29,8 +29,7 @@
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <cppuhelper/bootstrap.hxx>
 #include <cppuhelper/component_context.hxx>
-#include <cppuhelper/implbase1.hxx>
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <cppuhelper/factory.hxx>
 #include <cppuhelper/shlib.hxx>
@@ -439,7 +438,7 @@ rtl::OUString Parser::getNameAttribute() {
 }
 
 class ContentEnumeration:
-    public cppu::WeakImplHelper1< css::container::XEnumeration >
+    public cppu::WeakImplHelper< css::container::XEnumeration >
 {
 public:
     explicit ContentEnumeration(std::vector< css::uno::Any > const & factories):
@@ -493,7 +492,7 @@ css::beans::Property getDefaultContextProperty() {
 }
 
 class SingletonFactory:
-    public cppu::WeakImplHelper1<css::lang::XSingleComponentFactory>
+    public cppu::WeakImplHelper<css::lang::XSingleComponentFactory>
 {
 public:
     SingletonFactory(
@@ -547,7 +546,7 @@ SingletonFactory::createInstanceWithArgumentsAndContext(
 }
 
 class ImplementationWrapper:
-    public cppu::WeakImplHelper3<
+    public cppu::WeakImplHelper<
         css::lang::XSingleComponentFactory, css::lang::XSingleServiceFactory,
         css::lang::XServiceInfo >
 {
diff --git a/cppuhelper/source/tdmgr.cxx b/cppuhelper/source/tdmgr.cxx
index 789b3f1e7726..5b8ad45234df 100644
--- a/cppuhelper/source/tdmgr.cxx
+++ b/cppuhelper/source/tdmgr.cxx
@@ -32,7 +32,7 @@
 #include <uno/mapping.hxx>
 
 #include <cppuhelper/bootstrap.hxx>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <typelib/typedescription.h>
 
 #include <com/sun/star/lang/XComponent.hpp>
@@ -612,7 +612,7 @@ static void SAL_CALL typelib_callback(
 
 
 class EventListenerImpl
-    : public WeakImplHelper1< lang::XEventListener >
+    : public WeakImplHelper< lang::XEventListener >
 {
     Reference< container::XHierarchicalNameAccess > m_xTDMgr;
 
diff --git a/cppuhelper/source/typemanager.cxx b/cppuhelper/source/typemanager.cxx
index 7faddafee8ce..baa421996e05 100644
--- a/cppuhelper/source/typemanager.cxx
+++ b/cppuhelper/source/typemanager.cxx
@@ -44,7 +44,7 @@
 #include <com/sun/star/uno/Type.hxx>
 #include <com/sun/star/uno/TypeClass.hpp>
 #include <cppu/unotype.hxx>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <osl/file.hxx>
 #include <osl/mutex.hxx>
@@ -80,7 +80,7 @@ css::uno::Any resolveTypedefs(css::uno::Any const & type) {
 }
 
 class SimpleTypeDescription:
-    public cppu::WeakImplHelper1< css::reflection::XTypeDescription >
+    public cppu::WeakImplHelper< css::reflection::XTypeDescription >
 {
 public:
     SimpleTypeDescription(
@@ -103,7 +103,7 @@ private:
 };
 
 class SequenceTypeDescription:
-    public cppu::WeakImplHelper1< css::reflection::XIndirectTypeDescription >
+    public cppu::WeakImplHelper< css::reflection::XIndirectTypeDescription >
 {
 public:
     SequenceTypeDescription(
@@ -132,7 +132,7 @@ private:
 };
 
 class PublishableDescription:
-    public cppu::WeakImplHelper1< css::reflection::XPublished >
+    public cppu::WeakImplHelper< css::reflection::XPublished >
 {
 protected:
     explicit PublishableDescription(bool published): published_(published) {}
@@ -147,7 +147,7 @@ private:
 };
 
 class ModuleDescription:
-    public cppu::WeakImplHelper1< css::reflection::XModuleTypeDescription >
+    public cppu::WeakImplHelper< css::reflection::XModuleTypeDescription >
 {
 public:
     ModuleDescription(
@@ -196,7 +196,7 @@ ModuleDescription::getMembers() throw (css::uno::RuntimeException, std::exceptio
     }
 }
 
-typedef cppu::ImplInheritanceHelper1<
+typedef cppu::ImplInheritanceHelper<
     PublishableDescription, css::reflection::XEnumTypeDescription >
 EnumTypeDescription_Base;
 
@@ -257,7 +257,7 @@ css::uno::Sequence< sal_Int32 > EnumTypeDescription::getEnumValues()
     return s;
 }
 
-typedef cppu::ImplInheritanceHelper1<
+typedef cppu::ImplInheritanceHelper<
     PublishableDescription, css::reflection::XStructTypeDescription >
 PlainStructTypeDescription_Base;
 
@@ -339,7 +339,7 @@ css::uno::Sequence< rtl::OUString > PlainStructTypeDescription::getMemberNames()
 }
 
 class ParameterizedMemberTypeDescription:
-    public cppu::WeakImplHelper1< css::reflection::XTypeDescription >
+    public cppu::WeakImplHelper< css::reflection::XTypeDescription >
 {
 public:
     explicit ParameterizedMemberTypeDescription(
@@ -360,7 +360,7 @@ private:
     rtl::OUString typeParameterName_;
 };
 
-typedef cppu::ImplInheritanceHelper1<
+typedef cppu::ImplInheritanceHelper<
     PublishableDescription, css::reflection::XStructTypeDescription >
 PolymorphicStructTypeTemplateDescription_Base;
 
@@ -459,7 +459,7 @@ PolymorphicStructTypeTemplateDescription::getTypeParameters()
 }
 
 class InstantiatedPolymorphicStructTypeDescription:
-    public cppu::WeakImplHelper1< css::reflection::XStructTypeDescription >
+    public cppu::WeakImplHelper< css::reflection::XStructTypeDescription >
 {
 public:
     InstantiatedPolymorphicStructTypeDescription(
@@ -566,7 +566,7 @@ InstantiatedPolymorphicStructTypeDescription::getTypeArguments()
     return s;
 }
 
-typedef cppu::ImplInheritanceHelper1<
+typedef cppu::ImplInheritanceHelper<
     PublishableDescription, css::reflection::XCompoundTypeDescription >
 ExceptionTypeDescription_Base;
 
@@ -635,7 +635,7 @@ css::uno::Sequence< rtl::OUString > ExceptionTypeDescription::getMemberNames()
 }
 
 class AttributeDescription:
-    public cppu::WeakImplHelper1<
+    public cppu::WeakImplHelper<
         css::reflection::XInterfaceAttributeTypeDescription2 >
 {
 public:
@@ -722,7 +722,7 @@ AttributeDescription::getSetExceptions() throw (css::uno::RuntimeException, std:
 }
 
 class MethodParameter:
-    public cppu::WeakImplHelper1< css::reflection::XMethodParameter >
+    public cppu::WeakImplHelper< css::reflection::XMethodParameter >
 {
 public:
     MethodParameter(
@@ -769,7 +769,7 @@ private:
 };
 
 class MethodDescription:
-    public cppu::WeakImplHelper1<
+    public cppu::WeakImplHelper<
         css::reflection::XInterfaceMethodTypeDescription >
 {
 public:
@@ -901,7 +901,7 @@ void BaseOffset::calculate(
     }
 }
 
-typedef cppu::ImplInheritanceHelper1<
+typedef cppu::ImplInheritanceHelper<
     PublishableDescription, css::reflection::XInterfaceTypeDescription2 >
 InterfaceTypeDescription_Base;
 
@@ -1012,7 +1012,7 @@ InterfaceTypeDescription::getOptionalBaseTypes()
 }
 
 class ConstantDescription:
-    public cppu::WeakImplHelper1< css::reflection::XConstantTypeDescription >
+    public cppu::WeakImplHelper< css::reflection::XConstantTypeDescription >
 {
 public:
     ConstantDescription(
@@ -1078,7 +1078,7 @@ ConstantDescription::ConstantDescription(
     }
 }
 
-typedef cppu::ImplInheritanceHelper1<
+typedef cppu::ImplInheritanceHelper<
     PublishableDescription, css::reflection::XConstantsTypeDescription >
 ConstantGroupDescription_Base;
 
@@ -1123,7 +1123,7 @@ ConstantGroupDescription::getConstants() throw (css::uno::RuntimeException, std:
     return s;
 }
 
-typedef cppu::ImplInheritanceHelper1<
+typedef cppu::ImplInheritanceHelper<
     PublishableDescription, css::reflection::XIndirectTypeDescription >
 TypedefDescription_Base;
 
@@ -1157,7 +1157,7 @@ private:
 };
 
 class ConstructorParameter:
-    public cppu::WeakImplHelper1< css::reflection::XParameter >
+    public cppu::WeakImplHelper< css::reflection::XParameter >
 {
 public:
     ConstructorParameter(
@@ -1198,7 +1198,7 @@ private:
 };
 
 class ConstructorDescription:
-    public cppu::WeakImplHelper1<
+    public cppu::WeakImplHelper<
         css::reflection::XServiceConstructorDescription >
 {
 public:
@@ -1261,7 +1261,7 @@ ConstructorDescription::getExceptions() throw (css::uno::RuntimeException, std::
     return s;
 }
 
-typedef cppu::ImplInheritanceHelper1<
+typedef cppu::ImplInheritanceHelper<
     PublishableDescription, css::reflection::XServiceTypeDescription2 >
 SingleInterfaceBasedServiceDescription_Base;
 
@@ -1372,7 +1372,7 @@ SingleInterfaceBasedServiceDescription::getConstructors()
 }
 
 class PropertyDescription:
-    public cppu::WeakImplHelper1< css::reflection::XPropertyTypeDescription >
+    public cppu::WeakImplHelper< css::reflection::XPropertyTypeDescription >
 {
 public:
     PropertyDescription(
@@ -1403,7 +1403,7 @@ private:
     unoidl::AccumulationBasedServiceEntity::Property property_;
 };
 
-typedef cppu::ImplInheritanceHelper1<
+typedef cppu::ImplInheritanceHelper<
     PublishableDescription, css::reflection::XServiceTypeDescription2 >
 AccumulationBasedServiceDescription_Base;
 
@@ -1574,7 +1574,7 @@ AccumulationBasedServiceDescription::getProperties()
     return s;
 }
 
-typedef cppu::ImplInheritanceHelper1<
+typedef cppu::ImplInheritanceHelper<
     PublishableDescription, css::reflection::XSingletonTypeDescription2 >
 InterfaceBasedSingletonDescription_Base;
 
@@ -1620,7 +1620,7 @@ private:
     rtl::Reference< unoidl::InterfaceBasedSingletonEntity > entity_;
 };
 
-typedef cppu::ImplInheritanceHelper1<
+typedef cppu::ImplInheritanceHelper<
     PublishableDescription, css::reflection::XSingletonTypeDescription2 >
 ServiceBasedSingletonDescription_Base;
 
@@ -1667,7 +1667,7 @@ private:
 };
 
 class Enumeration:
-    public cppu::WeakImplHelper1< css::reflection::XTypeDescriptionEnumeration >
+    public cppu::WeakImplHelper< css::reflection::XTypeDescriptionEnumeration >
 {
 public:
     Enumeration(
diff --git a/cppuhelper/source/typemanager.hxx b/cppuhelper/source/typemanager.hxx
index 16103199be85..3a8f6ad3fd56 100644
--- a/cppuhelper/source/typemanager.hxx
+++ b/cppuhelper/source/typemanager.hxx
@@ -26,7 +26,7 @@
 #include <com/sun/star/uno/RuntimeException.hpp>
 #include <com/sun/star/uno/Sequence.hxx>
 #include <cppuhelper/basemutex.hxx>
-#include <cppuhelper/compbase4.hxx>
+#include <cppuhelper/compbase.hxx>
 #include <rtl/ref.hxx>
 #include <sal/types.h>
 
@@ -44,7 +44,7 @@ namespace unoidl {
 
 namespace cppuhelper {
 
-typedef cppu::WeakComponentImplHelper4<
+typedef cppu::WeakComponentImplHelper<
     css::lang::XServiceInfo, css::container::XHierarchicalNameAccess,
     css::container::XSet, css::reflection::XTypeDescriptionEnumerationAccess >
 TypeManager_Base;
-- 
cgit