From 520bb089a0b41c15273f7387df95b62faa54f13e Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Thu, 4 Feb 2016 11:39:41 +0200 Subject: remove unused in/out/inout from .SDI files Change-Id: Ie8bedbc8bd751752cba4f6018161c773b4bd19d0 --- idl/inc/globals.hxx | 6 ------ idl/inc/types.hxx | 8 -------- idl/source/objects/types.cxx | 16 ---------------- idl/source/prj/database.cxx | 23 ----------------------- idl/source/prj/globals.cxx | 3 --- 5 files changed, 56 deletions(-) (limited to 'idl') diff --git a/idl/inc/globals.hxx b/idl/inc/globals.hxx index 35026a6328ab..cf8a8354b8a8 100644 --- a/idl/inc/globals.hxx +++ b/idl/inc/globals.hxx @@ -29,9 +29,6 @@ struct SvGlobalHashNames SvStringHashEntryRef MM_Name; SvStringHashEntryRef MM_module; SvStringHashEntryRef MM_interface; - SvStringHashEntryRef MM_in; - SvStringHashEntryRef MM_out; - SvStringHashEntryRef MM_inout; SvStringHashEntryRef MM_String; SvStringHashEntryRef MM_UCHAR; SvStringHashEntryRef MM_USHORT; @@ -118,9 +115,6 @@ inline SvStringHashEntry * SvHash_##Name() \ HASH_INLINE(Name) HASH_INLINE(module) HASH_INLINE(interface) -HASH_INLINE(in) -HASH_INLINE(out) -HASH_INLINE(inout) HASH_INLINE(HelpContext) HASH_INLINE(HelpText) HASH_INLINE(shell) diff --git a/idl/inc/types.hxx b/idl/inc/types.hxx index 9de51df4ed96..2dc6c514cc3f 100644 --- a/idl/inc/types.hxx +++ b/idl/inc/types.hxx @@ -79,8 +79,6 @@ enum { TYPE_METHOD, TYPE_STRUCT, TYPE_BASE, TYPE_ENUM, TYPE_UNION, TYPE_CLASS, TYPE_POINTER }; class SvMetaType : public SvMetaExtern { - SvBOOL aIn; // input parameter - SvBOOL aOut; // return parameter Svint aCall0, aCall1; SvIdentifier aCName; SvIdentifier aBasicPostfix; @@ -123,12 +121,6 @@ public: bool IsItem() const { return bIsItem; } bool IsShell() const { return bIsShell; } - void SetIn( bool b ) { aIn = b; } - bool GetIn() const; - - void SetOut( bool b ) { aOut = b; } - bool GetOut() const; - void SetCall0( int e ); int GetCall0() const; diff --git a/idl/source/objects/types.cxx b/idl/source/objects/types.cxx index 61f83ca817bd..fb229a956c2e 100644 --- a/idl/source/objects/types.cxx +++ b/idl/source/objects/types.cxx @@ -268,22 +268,6 @@ const OString& SvMetaType::GetBasicName() const return static_cast(GetRef())->GetBasicName(); } -bool SvMetaType::GetIn() const -{ - if( aIn.IsSet() || !GetRef() ) - return aIn; - else - return static_cast(GetRef())->GetIn(); -} - -bool SvMetaType::GetOut() const -{ - if( aOut.IsSet() || !GetRef() ) - return aOut; - else - return static_cast(GetRef())->GetOut(); -} - void SvMetaType::SetCall0( int e ) { aCall0 = (int)e; diff --git a/idl/source/prj/database.cxx b/idl/source/prj/database.cxx index cfe2b5b1d86b..0cb6e1e7bf84 100644 --- a/idl/source/prj/database.cxx +++ b/idl/source/prj/database.cxx @@ -285,8 +285,6 @@ SvMetaType * SvIdlDataBase::FindType( const OString& rName ) SvMetaType * SvIdlDataBase::ReadKnownType( SvTokenStream & rInStm ) { - bool bIn = false; - bool bOut = false; int nCall0 = CALL_VALUE; int nCall1 = CALL_VALUE; bool bSet = false; // any attribute set @@ -300,25 +298,6 @@ SvMetaType * SvIdlDataBase::ReadKnownType( SvTokenStream & rInStm ) while( nBeginPos != rInStm.Tell() ) { nBeginPos = rInStm.Tell(); - if( pTok->Is( SvHash_in() ) ) - { - bIn = true; - pTok = rInStm.GetToken_Next(); - bSet = true; - } - if( pTok->Is( SvHash_out() ) ) - { - bOut = true; - pTok = rInStm.GetToken_Next(); - bSet = true; - } - if( pTok->Is( SvHash_inout() ) ) - { - bIn = true; - bOut = true; - pTok = rInStm.GetToken_Next(); - bSet = true; - } } } @@ -365,8 +344,6 @@ SvMetaType * SvIdlDataBase::ReadKnownType( SvTokenStream & rInStm ) DBG_ASSERT( aTmpTypeList.front(), "mindestens ein Element" ); SvMetaTypeRef xType = new SvMetaType( pType->GetName().getString(), 'h', "dummy" ); xType->SetRef( pType ); - xType->SetIn( bIn ); - xType->SetOut( bOut ); xType->SetCall0( nCall0 ); xType->SetCall1( nCall1 ); diff --git a/idl/source/prj/globals.cxx b/idl/source/prj/globals.cxx index bcb82b5cee06..fe8ff3a3cf60 100644 --- a/idl/source/prj/globals.cxx +++ b/idl/source/prj/globals.cxx @@ -57,9 +57,6 @@ SvGlobalHashNames::SvGlobalHashNames() : MM_Name( INS( "Name" ) ) , MM_module( INS( "module" ) ) , MM_interface( INS( "interface" ) ) - , MM_in( INS( "in" ) ) - , MM_out( INS( "out" ) ) - , MM_inout( INS( "inout" ) ) , MM_String( INS( "String" ) ) , MM_UCHAR( INS( "UCHAR" ) ) , MM_USHORT( INS( "USHORT" ) ) -- cgit