diff options
author | Noel Grandin <noel@peralex.com> | 2016-02-08 15:42:29 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2016-02-09 08:16:26 +0200 |
commit | c7b66c1968371e335babfbada8b6bac2f83d9901 (patch) | |
tree | 7b0c85ab689a3222e3a6a1334af016f4ad1dfb77 /idl | |
parent | 7a6c044e97d02f6168d13cd7528d89e3b3a1dd3f (diff) |
remove some more dead code, found by LCOV
Change-Id: I23404778d13b690fa2330f6db1a90d578b23468b
Diffstat (limited to 'idl')
-rw-r--r-- | idl/inc/lex.hxx | 4 | ||||
-rw-r--r-- | idl/source/cmptools/lex.cxx | 27 | ||||
-rw-r--r-- | idl/source/objects/slot.cxx | 11 |
3 files changed, 5 insertions, 37 deletions
diff --git a/idl/inc/lex.hxx b/idl/inc/lex.hxx index c06b605292ee..dc86dfbd64b9 100644 --- a/idl/inc/lex.hxx +++ b/idl/inc/lex.hxx @@ -29,7 +29,7 @@ enum class SVTOKENTYPE { Empty, Comment, Integer, String, Bool, Identifier, - Char, RttiBase, + Char, EndOfFile, HashId }; class SvToken @@ -47,7 +47,7 @@ friend class SvTokenStream; }; public: SvToken(); - SvToken( const SvToken & rObj ); + SvToken( const SvToken & rObj ) = delete; SvToken & operator = ( const SvToken & rObj ); diff --git a/idl/source/cmptools/lex.cxx b/idl/source/cmptools/lex.cxx index a4ef530d6084..67c2cf182176 100644 --- a/idl/source/cmptools/lex.cxx +++ b/idl/source/cmptools/lex.cxx @@ -50,9 +50,6 @@ OString SvToken::GetTokenAsString() const case SVTOKENTYPE::Char: aStr = OString(cChar); break; - case SVTOKENTYPE::RttiBase: - aStr = "RTTIBASE"; - break; case SVTOKENTYPE::EndOfFile: case SVTOKENTYPE::HashId: break; @@ -61,15 +58,6 @@ OString SvToken::GetTokenAsString() const return aStr; } -SvToken::SvToken( const SvToken & rObj ) -{ - nLine = rObj.nLine; - nColumn = rObj.nColumn; - nType = rObj.nType; - aString = rObj.aString; - nLong = rObj.nLong; -} - SvToken & SvToken::operator = ( const SvToken & rObj ) { if( this != &rObj ) @@ -291,20 +279,7 @@ bool SvTokenStream::MakeToken( SvToken & rToken ) if( c == '"' ) { c = GetFastNextChar(); - if( c == '"' ) - { - aStr.append('"'); - aStr.append('"'); - } - else - bDone = true; - } - else if( c == '\\' ) - { - aStr.append('\\'); - c = GetFastNextChar(); - if( c ) - aStr.append(static_cast<char>(c)); + bDone = true; } else aStr.append(static_cast<char>(c)); diff --git a/idl/source/objects/slot.cxx b/idl/source/objects/slot.cxx index d2cddd7e736d..5ed8b11b5d80 100644 --- a/idl/source/objects/slot.cxx +++ b/idl/source/objects/slot.cxx @@ -283,21 +283,14 @@ void SvMetaSlot::ReadAttributesSvIdl( SvIdlDataBase & rBase, SvToken * pTok = rInStm.GetToken_Next(); if( pTok->Is( SvHash_SlotType() ) ) { - bool bBraket = rInStm.Read( '(' ); - if( bBraket || rInStm.Read( '=' ) ) + if( rInStm.Read( '=' ) ) { aSlotType = rBase.ReadKnownType( rInStm ); if( aSlotType.Is() ) { if( aSlotType->IsItem() ) { - if( bBraket ) - { - if( rInStm.Read( ')' ) ) - return; - } - else - return; + return; } rBase.SetError( "the SlotType is not a item", rInStm.GetToken() ); rBase.WriteError( rInStm ); |