diff options
| author | Noel Grandin <noel@peralex.com> | 2016-02-08 10:46:49 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2016-02-08 14:00:38 +0200 |
| commit | 37458b730b7f193a1a853b06ae68f19e53e1ad58 (patch) | |
| tree | dd4afd8edce61cbbc891b0dc0a18e645128b88bd /idl | |
| parent | 98fa826a51a67d278c7c81f728c35753ffefe1b5 (diff) | |
aBasicPostfix in SvMetaType is unused
Change-Id: Ic0c3fc2bb6664031eec649b36e2423a4d1b0ec6d
Diffstat (limited to 'idl')
| -rw-r--r-- | idl/inc/types.hxx | 4 | ||||
| -rw-r--r-- | idl/source/objects/types.cxx | 8 | ||||
| -rw-r--r-- | idl/source/prj/database.cxx | 22 |
3 files changed, 15 insertions, 19 deletions
diff --git a/idl/inc/types.hxx b/idl/inc/types.hxx index 57d3ecf34fbd..f2c514fdea59 100644 --- a/idl/inc/types.hxx +++ b/idl/inc/types.hxx @@ -69,7 +69,6 @@ enum MetaTypeType { Method, Struct, Base, Enum, Class }; class SvMetaType : public SvMetaReference { - SvIdentifier aBasicPostfix; SvRefMemberList<SvMetaAttribute *>* pAttrList; MetaTypeType nType; bool bIsItem; @@ -86,8 +85,7 @@ protected: public: SvMetaType(); SvMetaType( const OString& rTypeName, - char cParserChar, - const OString& rBasicPostfix ); + char cParserChar ); virtual ~SvMetaType(); diff --git a/idl/source/objects/types.cxx b/idl/source/objects/types.cxx index aea5f1f6c3b0..7a904a530149 100644 --- a/idl/source/objects/types.cxx +++ b/idl/source/objects/types.cxx @@ -191,13 +191,11 @@ SvMetaType::SvMetaType() } SvMetaType::SvMetaType( const OString& rName, - char cPc, - const OString& rBasicPostfix ) + char cPc ) CTOR { SetName( rName ); cParserChar = cPc; - aBasicPostfix.setString(rBasicPostfix); } SvMetaType::~SvMetaType() { @@ -417,7 +415,7 @@ bool SvMetaType::ReadMethodArgs( SvIdlDataBase & rBase, } SvMetaTypeString::SvMetaTypeString() - : SvMetaType( "String", 's', "$" ) + : SvMetaType( "String", 's' ) { } @@ -490,7 +488,7 @@ bool SvMetaTypeEnum::ReadSvIdl( SvIdlDataBase & rBase, } SvMetaTypevoid::SvMetaTypevoid() - : SvMetaType( "void", 'v', "" ) + : SvMetaType( "void", 'v' ) { } diff --git a/idl/source/prj/database.cxx b/idl/source/prj/database.cxx index 58fcc64ca320..3474f5f11a31 100644 --- a/idl/source/prj/database.cxx +++ b/idl/source/prj/database.cxx @@ -45,9 +45,9 @@ SvIdlDataBase::~SvIdlDataBase() delete pIdTable; } -#define ADD_TYPE( Name, ParserChar, BasPost ) \ +#define ADD_TYPE( Name, ParserChar ) \ aTypeList.push_back( new SvMetaType( SvHash_##Name()->GetName(), \ - ParserChar, BasPost ) ); + ParserChar ) ); SvRefMemberList<SvMetaType *>& SvIdlDataBase::GetTypeList() { @@ -57,15 +57,15 @@ SvRefMemberList<SvMetaType *>& SvIdlDataBase::GetTypeList() aTypeList.push_back( new SvMetaTypevoid() ); // MI: IDispatch::Invoke can not unsigned - ADD_TYPE( UINT16, 'h', "&" ); - ADD_TYPE( INT16, 'h', "%" ); - ADD_TYPE( UINT32, 'l', "&" ); - ADD_TYPE( INT32, 'l', "&" ); - ADD_TYPE( BOOL, 'b', "" ); - ADD_TYPE( BYTE, 'c', "%" ); - ADD_TYPE( float, 'f', "!" ); - ADD_TYPE( double, 'F', "#" ); - ADD_TYPE( SbxObject, 'o', "" ); + ADD_TYPE( UINT16, 'h' ); + ADD_TYPE( INT16, 'h' ); + ADD_TYPE( UINT32, 'l' ); + ADD_TYPE( INT32, 'l' ); + ADD_TYPE( BOOL, 'b' ); + ADD_TYPE( BYTE, 'c' ); + ADD_TYPE( float, 'f' ); + ADD_TYPE( double, 'F' ); + ADD_TYPE( SbxObject, 'o' ); // Attention! When adding types all binary data bases get incompatible |