summaryrefslogtreecommitdiff
path: root/idl/inc
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2016-02-09 09:05:07 +0200
committerNoel Grandin <noel@peralex.com>2016-02-09 09:43:53 +0200
commit8bbcbcec91f723a3839bd80aa1d28e0420dfd1e6 (patch)
treef4a8ad644f900ce74e0ae4dc064502b39e21e3ad /idl/inc
parent8d6e4896d9485aec0def2d23b90d02c750ffce01 (diff)
simplify SvSlotElement
Change-Id: I4699dca35c0197944df97005ff032e1d16139e5f
Diffstat (limited to 'idl/inc')
-rw-r--r--idl/inc/basobj.hxx14
-rw-r--r--idl/inc/object.hxx7
-rw-r--r--idl/inc/types.hxx5
3 files changed, 12 insertions, 14 deletions
diff --git a/idl/inc/basobj.hxx b/idl/inc/basobj.hxx
index a2aa82aa373c..dbec6b476b78 100644
--- a/idl/inc/basobj.hxx
+++ b/idl/inc/basobj.hxx
@@ -49,8 +49,8 @@ public:
using typename base_t::reverse_iterator;
using base_t::empty;
- inline ~SvRefMemberList() { clear(); }
- inline void clear()
+ ~SvRefMemberList() { clear(); }
+ void clear()
{
for( typename base_t::const_iterator it = base_t::begin(); it != base_t::end(); ++it )
{
@@ -61,13 +61,19 @@ public:
base_t::clear();
}
- inline void push_back( T p )
+ void push_back( T p )
{
base_t::push_back( p );
p->AddFirstRef();
}
- inline T pop_back()
+ void insert( typename base_t::iterator it, T p )
+ {
+ base_t::insert( it, p );
+ p->AddFirstRef();
+ }
+
+ T pop_back()
{
T p = base_t::back();
base_t::pop_back();
diff --git a/idl/inc/object.hxx b/idl/inc/object.hxx
index 9859a3ac444e..3967fa9e2883 100644
--- a/idl/inc/object.hxx
+++ b/idl/inc/object.hxx
@@ -24,13 +24,6 @@
#include <slot.hxx>
#include <vector>
-struct SvSlotElement
-{
- tools::SvRef<SvMetaSlot> xSlot;
- SvSlotElement( SvMetaSlot * pS ) : xSlot( pS ) {}
-};
-typedef std::vector< SvSlotElement* > SvSlotElementList;
-
class SvMetaClass;
typedef ::std::vector< SvMetaClass* > SvMetaClassList;
diff --git a/idl/inc/types.hxx b/idl/inc/types.hxx
index ae229afd5729..34f12d740db2 100644
--- a/idl/inc/types.hxx
+++ b/idl/inc/types.hxx
@@ -24,10 +24,9 @@
#include <tools/ref.hxx>
#include <basobj.hxx>
-struct SvSlotElement;
-typedef std::vector< SvSlotElement* > SvSlotElementList;
-
class SvMetaType;
+class SvMetaSlot;
+typedef SvRefMemberList< SvMetaSlot* > SvSlotElementList;
class SvMetaAttribute : public SvMetaReference
{