summaryrefslogtreecommitdiff
path: root/cppuhelper/qa
diff options
context:
space:
mode:
authorJochen Nitschke <j.nitschke+logerrit@ok.de>2016-12-07 08:59:42 +0100
committerNoel Grandin <noel.grandin@collabora.co.uk>2016-12-07 13:25:50 +0000
commit61b00192cd4682cb592d880be1f4d57925ca03c7 (patch)
tree6003d3d8d81c7f7564c0bf7b780bc403399ef18c /cppuhelper/qa
parent81f7824a9839d3230b4e58424a64a393e8ee0223 (diff)
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>
Diffstat (limited to 'cppuhelper/qa')
-rw-r--r--cppuhelper/qa/ifcontainer/cppu_ifcontainer.cxx4
-rw-r--r--cppuhelper/qa/propertysetmixin/comp_propertysetmixin.cxx4
-rw-r--r--cppuhelper/qa/propertysetmixin/test_propertysetmixin.cxx6
-rw-r--r--cppuhelper/qa/weak/test_weak.cxx4
4 files changed, 9 insertions, 9 deletions
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) {}