diff options
| author | Noel Grandin <noel@peralex.com> | 2016-02-08 13:35:00 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2016-02-08 14:00:39 +0200 |
| commit | 898061f9265da374b57d0c799618b12cbe832510 (patch) | |
| tree | 71f53062ba74bbba4ee4888f9df3dade9f8b0fc0 /idl/source/objects | |
| parent | afa1779d27da31ef0d5084306db8dc955689a78f (diff) | |
move isMethod/isVariable down from SvMetaAttribute to SvMetaSlot
Change-Id: Ic13c61d6bd75d12e9dc5c75eaa75573dcb3b3b0b
Diffstat (limited to 'idl/source/objects')
| -rw-r--r-- | idl/source/objects/slot.cxx | 5 | ||||
| -rw-r--r-- | idl/source/objects/types.cxx | 13 |
2 files changed, 3 insertions, 15 deletions
diff --git a/idl/source/objects/slot.cxx b/idl/source/objects/slot.cxx index 6c767edfb57b..cb8ce8229fc7 100644 --- a/idl/source/objects/slot.cxx +++ b/idl/source/objects/slot.cxx @@ -83,12 +83,13 @@ bool SvMetaSlot::GetHidden() const bool SvMetaSlot::IsVariable() const { - return SvMetaAttribute::IsVariable(); + SvMetaType * pType = GetType(); + return pType->GetType() != MetaTypeType::Method; } bool SvMetaSlot::IsMethod() const { - bool b = SvMetaAttribute::IsMethod(); + bool b = GetType()->GetType() == MetaTypeType::Method; b |= nullptr != GetMethod(); return b; } diff --git a/idl/source/objects/types.cxx b/idl/source/objects/types.cxx index 214403161ba0..d4eaf659f234 100644 --- a/idl/source/objects/types.cxx +++ b/idl/source/objects/types.cxx @@ -50,19 +50,6 @@ const SvIdentifier & SvMetaAttribute::GetSlotId() const return static_cast<SvMetaAttribute *>(GetRef())->GetSlotId(); } -bool SvMetaAttribute::IsMethod() const -{ - SvMetaType * pType = GetType(); - DBG_ASSERT( pType, "no type for attribute" ); - return pType->GetType() == MetaTypeType::Method; -} - -bool SvMetaAttribute::IsVariable() const -{ - SvMetaType * pType = GetType(); - return pType->GetType() != MetaTypeType::Method; -} - bool SvMetaAttribute::Test( SvIdlDataBase & rBase, SvTokenStream & rInStm ) { |