diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2012-08-30 22:58:31 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2012-08-31 09:04:13 +0200 |
commit | e3898d3714390803ca17d4fc310be8e12c6c4e06 (patch) | |
tree | 8bce3e572dc9cd83962b530df11abfb1af62b017 /autodoc/source | |
parent | a267f31842bad2f33b033df72e83aa7aba0f8177 (diff) |
-Werror,-Wunused-private-field (Clang towards 3.2)
Change-Id: If07500e1b7dc0ac127450fbb61e3d569ac3727eb
Diffstat (limited to 'autodoc/source')
26 files changed, 67 insertions, 111 deletions
diff --git a/autodoc/source/ary/idl/i_reposypart.cxx b/autodoc/source/ary/idl/i_reposypart.cxx index cb18d401143e..62a7d51fdee0 100644 --- a/autodoc/source/ary/idl/i_reposypart.cxx +++ b/autodoc/source/ary/idl/i_reposypart.cxx @@ -40,16 +40,15 @@ namespace idl DYN InternalGate & -InternalGate::Create_Partition_(RepositoryCenter & i_center) +InternalGate::Create_Partition_() { - return *new RepositoryPartition(i_center); + return *new RepositoryPartition; } -RepositoryPartition::RepositoryPartition( RepositoryCenter & i_repository ) - : pCenter(&i_repository), - pCes(0), +RepositoryPartition::RepositoryPartition() + : pCes(0), pTypes(0), pNamesDictionary(new NameLookup) { diff --git a/autodoc/source/ary/idl/i_reposypart.hxx b/autodoc/source/ary/idl/i_reposypart.hxx index 8f250fac7757..31c814836872 100644 --- a/autodoc/source/ary/idl/i_reposypart.hxx +++ b/autodoc/source/ary/idl/i_reposypart.hxx @@ -55,8 +55,7 @@ class RepositoryPartition : public InternalGate { public: // LIFECYCLE - RepositoryPartition( - RepositoryCenter & i_repository ); + RepositoryPartition(); ~RepositoryPartition(); // INHERITED // Interface Gate: @@ -73,8 +72,6 @@ class RepositoryPartition : public InternalGate private: // DATA - RepositoryCenter * pCenter; - Dyn<CeAdmin> pCes; Dyn<TypeAdmin> pTypes; Dyn<NameLookup> pNamesDictionary; diff --git a/autodoc/source/ary/inc/idl_internalgate.hxx b/autodoc/source/ary/inc/idl_internalgate.hxx index f89805489db7..23e6dff26640 100644 --- a/autodoc/source/ary/inc/idl_internalgate.hxx +++ b/autodoc/source/ary/inc/idl_internalgate.hxx @@ -25,14 +25,6 @@ namespace ary { - class RepositoryCenter; -} - - - - -namespace ary -{ namespace idl { @@ -46,8 +38,7 @@ class InternalGate : public ::ary::idl::Gate virtual ~InternalGate() {} static DYN InternalGate & - Create_Partition_( - RepositoryCenter & i_center ); + Create_Partition_(); }; diff --git a/autodoc/source/ary/kernel/reposy.cxx b/autodoc/source/ary/kernel/reposy.cxx index 2a96d73e1c18..5436f844883e 100644 --- a/autodoc/source/ary/kernel/reposy.cxx +++ b/autodoc/source/ary/kernel/reposy.cxx @@ -45,7 +45,7 @@ RepositoryCenter::RepositoryCenter() aLocation(), pIdlPartition(0) { - pIdlPartition = & idl::InternalGate::Create_Partition_(*this); + pIdlPartition = & idl::InternalGate::Create_Partition_(); } RepositoryCenter::~RepositoryCenter() diff --git a/autodoc/source/display/idl/hfi_hierarchy.cxx b/autodoc/source/display/idl/hfi_hierarchy.cxx index a243c345fad7..19b18144abed 100644 --- a/autodoc/source/display/idl/hfi_hierarchy.cxx +++ b/autodoc/source/display/idl/hfi_hierarchy.cxx @@ -174,7 +174,7 @@ Write_Bases( csi::xml::Element & o_out, o_out << " "; HF_IdlTypeText - aDisplay( i_env, o_out, true, i_env.CurPageCe()); + aDisplay( i_env, o_out, i_env.CurPageCe()); aDisplay.Produce_byData(nType); o_out << "\n"; diff --git a/autodoc/source/display/idl/hfi_interface.cxx b/autodoc/source/display/idl/hfi_interface.cxx index fa6a1541a12e..1d6f59ece10b 100644 --- a/autodoc/source/display/idl/hfi_interface.cxx +++ b/autodoc/source/display/idl/hfi_interface.cxx @@ -307,7 +307,7 @@ HF_IdlInterface::produce_BaseHierarchy( Xml::Element & o_screen, >> *new Html::TableCell << new Html::ClassAttr(C_sCellStyle_SummaryLeft); HF_IdlTypeText - aTypeDisplay( Env(), rTerm, false, 0); + aTypeDisplay( Env(), rTerm, 0); aTypeDisplay.Produce_byData((*it).Type()); Xml::Element & diff --git a/autodoc/source/display/idl/hfi_method.cxx b/autodoc/source/display/idl/hfi_method.cxx index 2c5c4cdeec01..b351161f6e45 100644 --- a/autodoc/source/display/idl/hfi_method.cxx +++ b/autodoc/source/display/idl/hfi_method.cxx @@ -90,7 +90,7 @@ HF_IdlMethod::write_Declaration( const String & i_sName, if (i_nReturnType.IsValid()) { // Normal function, but not constructors: HF_IdlTypeText - aReturn(Env(), rReturnLine, true); + aReturn(Env(), rReturnLine); aReturn.Produce_byData(i_nReturnType); } @@ -139,7 +139,7 @@ HF_IdlMethod::write_Declaration( const String & i_sName, Xml::Element & rExcOut = aDecl.ExceptionCell(); HF_IdlTypeText - aExc(Env(), rExcOut, true); + aExc(Env(), rExcOut); aExc.Produce_byData(*i_rExceptions); for (++i_rExceptions; i_rExceptions; ++i_rExceptions) @@ -185,7 +185,7 @@ HF_IdlMethod::write_Param( HF_FunctionDeclaration & o_decl, } // end switch HF_IdlTypeText - aTypeWriter(Env(), rTypeCell, true); + aTypeWriter(Env(), rTypeCell); aTypeWriter.Produce_byData( i_param.Type() ); rNameCell diff --git a/autodoc/source/display/idl/hfi_module.cxx b/autodoc/source/display/idl/hfi_module.cxx index d9d26ff44154..fc44003e826a 100644 --- a/autodoc/source/display/idl/hfi_module.cxx +++ b/autodoc/source/display/idl/hfi_module.cxx @@ -242,7 +242,7 @@ HF_IdlModule::produce_Link( Xml::Element & o_row, if ( NOT ary::is_type<ary::idl::Module>(*i_ce) ) { HF_IdlTypeText - aText(Env(), rCell, true); + aText(Env(), rCell); aText.Produce_byData(i_ce->CeId()); } else diff --git a/autodoc/source/display/idl/hfi_navibar.hxx b/autodoc/source/display/idl/hfi_navibar.hxx index 9fd6938958ac..0ca5f4c5bd83 100644 --- a/autodoc/source/display/idl/hfi_navibar.hxx +++ b/autodoc/source/display/idl/hfi_navibar.hxx @@ -27,15 +27,6 @@ #include "hi_factory.hxx" // PARAMETERS -namespace ary -{ -namespace idl -{ -class CodeEntity; -} -} - - class HF_NaviSubRow; /** @resp @@ -62,10 +53,6 @@ class HF_IdlNavigationBar : public HtmlFactory_Idl /** Adds the subrow to the o_rOut argument of the constructor. */ DYN HF_NaviSubRow & Add_SubRow(); - - private: - const ary::idl::CodeEntity * - pCe; }; extern const String diff --git a/autodoc/source/display/idl/hfi_property.cxx b/autodoc/source/display/idl/hfi_property.cxx index de12d3d91e25..8c7cbb5f2907 100644 --- a/autodoc/source/display/idl/hfi_property.cxx +++ b/autodoc/source/display/idl/hfi_property.cxx @@ -139,7 +139,7 @@ HF_IdlProperty::write_Declaration( const client & i_ce ) const } // end if HF_IdlTypeText - aType( Env(), CurOut(), true ); + aType( Env(), CurOut() ); aType.Produce_byData( PropertyAttr::Type(i_ce) ); CurOut() << " " >> *new Html::Bold << i_ce.LocalName(); @@ -169,7 +169,7 @@ HF_IdlAttribute::write_Declaration( const client & i_ce ) const } HF_IdlTypeText - aType( Env(), CurOut(), true ); + aType( Env(), CurOut() ); aType.Produce_byData( AttributeAttr::Type(i_ce) ); CurOut() @@ -194,7 +194,7 @@ HF_IdlAttribute::write_Declaration( const client & i_ce ) const Xml::Element & rGet = aSub.Produce_Definition(); HF_IdlTypeText - aExc(Env(), rGet, true); + aExc(Env(), rGet); type_list & itExc = *pGetExceptions; rGet << "get raises ("; @@ -215,7 +215,7 @@ HF_IdlAttribute::write_Declaration( const client & i_ce ) const Xml::Element & rSet = aSub.Produce_Definition(); HF_IdlTypeText - aExc(Env(), rSet, true); + aExc(Env(), rSet); type_list & itExc = *pSetExceptions; rSet << "set raises ("; @@ -274,7 +274,7 @@ HF_IdlConstant::write_Declaration( const client & i_ce ) const { CurOut() << "const "; HF_IdlTypeText - aType( Env(), CurOut(), true ); + aType( Env(), CurOut() ); aType.Produce_byData(ConstantAttr::Type(i_ce)); CurOut() << " " @@ -298,7 +298,7 @@ void HF_IdlStructElement::write_Declaration( const client & i_ce ) const { HF_IdlTypeText - aType( Env(), CurOut(), true ); + aType( Env(), CurOut() ); aType.Produce_byData(StructElementAttr::Type(i_ce)); CurOut() << " " @@ -425,7 +425,7 @@ HF_IdlCommentedRelationElement::write_Title( const client & /*i_ce*/ ) const << new Html::ClassAttr(C_sMemberTitle); HF_IdlTypeText - aText(Env(), rAnchor, true); + aText(Env(), rAnchor); aText.Produce_byData(m_relation.Type()); } diff --git a/autodoc/source/display/idl/hfi_service.cxx b/autodoc/source/display/idl/hfi_service.cxx index a83966ec5777..97073b691279 100644 --- a/autodoc/source/display/idl/hfi_service.cxx +++ b/autodoc/source/display/idl/hfi_service.cxx @@ -285,7 +285,7 @@ HF_IdlService::produce_SummaryDeclaration( Xml::Element & o_row, } // end if HF_IdlTypeText - aType( Env(), rCell, true ); + aType( Env(), rCell ); aType.Produce_byData( PropertyAttr::Type(i_property) ); StreamLock aLocalLink(100); @@ -325,7 +325,7 @@ HF_IdlService::produce_Link( Xml::Element & o_row, >> *new Html::TableCell << new Html::ClassAttr(C_sCellStyle_SummaryLeft); HF_IdlTypeText - aText(Env(), rCell, true); + aText(Env(), rCell); aText.Produce_byData(i_type); } diff --git a/autodoc/source/display/idl/hfi_singleton.cxx b/autodoc/source/display/idl/hfi_singleton.cxx index 0641d40a92a9..23d17f904348 100644 --- a/autodoc/source/display/idl/hfi_singleton.cxx +++ b/autodoc/source/display/idl/hfi_singleton.cxx @@ -77,7 +77,7 @@ HF_IdlSingleton::Produce_byData_ServiceBased( const client & i_ce ) const aTopList.Produce_Term(C_sAssociatedService); HF_IdlTypeText - aAssociatedService( Env(), aTopList.Produce_Definition(), true ); + aAssociatedService( Env(), aTopList.Produce_Definition() ); aAssociatedService.Produce_byData( SingletonAttr::AssociatedService(i_ce) ); CurOut() << new Html::HorizontalLine; @@ -105,7 +105,7 @@ HF_IdlSingleton::Produce_byData_InterfaceBased( const client & i_ce ) const aTopList.Produce_Term(C_sImplementedInterface); HF_IdlTypeText - aImplementedInterface( Env(), aTopList.Produce_Definition(), true ); + aImplementedInterface( Env(), aTopList.Produce_Definition() ); aImplementedInterface.Produce_byData( SglIfcSingletonAttr::BaseInterface(i_ce) ); CurOut() << new Html::HorizontalLine; diff --git a/autodoc/source/display/idl/hfi_siservice.cxx b/autodoc/source/display/idl/hfi_siservice.cxx index 617a0eff445b..5c221582c7c3 100644 --- a/autodoc/source/display/idl/hfi_siservice.cxx +++ b/autodoc/source/display/idl/hfi_siservice.cxx @@ -95,7 +95,7 @@ HF_IdlSglIfcService::Produce_byData( const client & i_ce ) const aTopList.Produce_Term(C_sImplementedInterface); HF_IdlTypeText - aImplementedInterface( Env(), aTopList.Produce_Definition(), true, &i_ce); + aImplementedInterface( Env(), aTopList.Produce_Definition(), &i_ce); aImplementedInterface.Produce_byData( SglIfcServiceAttr::BaseInterface(i_ce) ); CurOut() << new Html::HorizontalLine; diff --git a/autodoc/source/display/idl/hfi_tag.cxx b/autodoc/source/display/idl/hfi_tag.cxx index b69e4f697efa..3b5500b4b44b 100644 --- a/autodoc/source/display/idl/hfi_tag.cxx +++ b/autodoc/source/display/idl/hfi_tag.cxx @@ -98,7 +98,7 @@ HF_IdlTag::Produce_byData( Xml::Element & o_rTitle, o_rText << ", "; } HF_IdlTypeText - aLinkText(Env(), o_rText, true, &aTextOut.ScopeGivingCe()); + aLinkText(Env(), o_rText, &aTextOut.ScopeGivingCe()); aLinkText.Produce_byData( (*it)->LinkText() ); } } @@ -123,7 +123,7 @@ HF_IdlTag::Display_SeeAlsoAtTag( const csi::dsapi::DT_SeeAlsoAtTag & i_rTag ) csv_assert( pTitleOut != 0 ); *pTitleOut << "See also"; - HF_IdlTypeText aLinkText(Env(),aTextOut.CurOut(),true, &aTextOut.ScopeGivingCe()); + HF_IdlTypeText aLinkText(Env(),aTextOut.CurOut(), &aTextOut.ScopeGivingCe()); aLinkText.Produce_byData( i_rTag.LinkText() ); aTextOut.CurOut() << new Html::LineBreak; @@ -316,7 +316,7 @@ HF_IdlDocuTextDisplay::CreateTypeLink() CurOut() << sLinkToken; return; } - HF_IdlTypeText aLink(Env(), CurOut(), true, &ScopeGivingCe()); + HF_IdlTypeText aLink(Env(), CurOut(), &ScopeGivingCe()); aLink.Produce_LinkInDocu(sScope, sLinkToken, String::Null_()); } @@ -324,7 +324,7 @@ void HF_IdlDocuTextDisplay::CreateMemberLink() { - HF_IdlTypeText aLink(Env(), CurOut(), true, &ScopeGivingCe()); + HF_IdlTypeText aLink(Env(), CurOut(), &ScopeGivingCe()); const char * sSplit = strchr(sLinkToken,':'); diff --git a/autodoc/source/display/idl/hfi_typedef.cxx b/autodoc/source/display/idl/hfi_typedef.cxx index 346ef37142ea..a477fcd05027 100644 --- a/autodoc/source/display/idl/hfi_typedef.cxx +++ b/autodoc/source/display/idl/hfi_typedef.cxx @@ -64,7 +64,7 @@ HF_IdlTypedef::Produce_byData( const client & i_ce ) const aTopList.Produce_Term("Defining Type"); HF_IdlTypeText - aDefinition( Env(), aTopList.Produce_Definition(), true ); + aDefinition( Env(), aTopList.Produce_Definition() ); aDefinition.Produce_byData( TypedefAttr::DefiningType(i_ce) ); CurOut() << new Html::HorizontalLine; diff --git a/autodoc/source/display/idl/hfi_typetext.cxx b/autodoc/source/display/idl/hfi_typetext.cxx index 31e28d5c6992..a100066f3195 100644 --- a/autodoc/source/display/idl/hfi_typetext.cxx +++ b/autodoc/source/display/idl/hfi_typetext.cxx @@ -55,19 +55,16 @@ HF_IdlTypeText::referingCe() const HF_IdlTypeText::HF_IdlTypeText( Environment & io_rEnv, Xml::Element & o_rOut, - bool i_bWithLink, const client * i_pScopeGivingCe ) : HtmlFactory_Idl(io_rEnv, &o_rOut), - pReferingCe( i_pScopeGivingCe ), - bWithLink(i_bWithLink) + pReferingCe( i_pScopeGivingCe ) { } HF_IdlTypeText::HF_IdlTypeText( Environment & io_rEnv, E_Index ) : HtmlFactory_Idl(io_rEnv, 0), - pReferingCe( 0 ), - bWithLink(true) + pReferingCe( 0 ) { } @@ -726,7 +723,7 @@ HF_IdlTypeText::write_TemplateParameterList( return; HF_IdlTypeText - aTemplateParamWriter(Env(), CurOut(), true, pReferingCe); + aTemplateParamWriter(Env(), CurOut(), pReferingCe); CurOut() << "< "; std::vector<ary::idl::Type_id>::const_iterator it = i_templateParameters.begin(); diff --git a/autodoc/source/display/idl/hfi_typetext.hxx b/autodoc/source/display/idl/hfi_typetext.hxx index 4199a7984089..ea9ca0761263 100644 --- a/autodoc/source/display/idl/hfi_typetext.hxx +++ b/autodoc/source/display/idl/hfi_typetext.hxx @@ -44,7 +44,6 @@ class HF_IdlTypeText : public HtmlFactory_Idl HF_IdlTypeText( Environment & io_rEnv, Xml::Element & o_rOut, - bool i_bWithLink, const client * i_pScopeGivingCe = 0 ); HF_IdlTypeText( Environment & io_rEnv, @@ -143,7 +142,6 @@ class HF_IdlTypeText : public HtmlFactory_Idl // DATA mutable const client * pReferingCe; - bool bWithLink; }; diff --git a/autodoc/source/display/idl/hfi_xrefpage.cxx b/autodoc/source/display/idl/hfi_xrefpage.cxx index 015b78dff53d..5abfe32a7fdf 100644 --- a/autodoc/source/display/idl/hfi_xrefpage.cxx +++ b/autodoc/source/display/idl/hfi_xrefpage.cxx @@ -136,7 +136,7 @@ HF_IdlXrefs::Produce_List( const char * i_title, Xml::Element & rOutCell = aList.Add_Row() >>* new Html::TableCell; HF_IdlTypeText - aTypeWriter(Env(), rOutCell, true, pClient); + aTypeWriter(Env(), rOutCell, pClient); for ( ce_list & it = i_iterator; it; ++it ) { aTypeWriter.Produce_byData(*it); @@ -239,7 +239,7 @@ HF_IdlXrefs::recursive_make_ListInTree( Xml::Element & o_rDisplay, const char * sLevelIndentation = " "; HF_IdlTypeText - aTypeWriter(Env(), o_rDisplay, true, &i_ce); + aTypeWriter(Env(), o_rDisplay, &i_ce); for ( ; i_iterator.operator bool(); ++i_iterator ) { for (uintt i = 0; i < i_level; ++i) diff --git a/autodoc/source/display/idl/hi_factory.cxx b/autodoc/source/display/idl/hi_factory.cxx index 0254686b0dad..b9d11ea4ba1e 100644 --- a/autodoc/source/display/idl/hi_factory.cxx +++ b/autodoc/source/display/idl/hi_factory.cxx @@ -280,7 +280,7 @@ HtmlFactory_Idl::recursive_ShowBases( Xml::Element & o_screen, if (pCe == 0) { HF_IdlTypeText - aText( Env(), o_screen, false ); + aText( Env(), o_screen ); aText.Produce_byData( i_baseType ); o_screen << "\n"; @@ -289,7 +289,7 @@ HtmlFactory_Idl::recursive_ShowBases( Xml::Element & o_screen, } HF_IdlTypeText - aBaseLink( Env(), o_screen, true ); + aBaseLink( Env(), o_screen ); aBaseLink.Produce_byData(pCe->CeId()); o_screen << "\n"; diff --git a/autodoc/source/parser_i/idl/cx_idlco.cxx b/autodoc/source/parser_i/idl/cx_idlco.cxx index 6c6090f8fdf2..89ffdf068101 100644 --- a/autodoc/source/parser_i/idl/cx_idlco.cxx +++ b/autodoc/source/parser_i/idl/cx_idlco.cxx @@ -399,32 +399,32 @@ Context_UidlCode::SetupStateMachine() = new StmArrayStatu2( C_nStatusSize, A_nBezeichnerStatus, 0, true); DYN StmBoundsStatu2 * dpBst_finErr - = new StmBoundsStatu2( *this, TkpContext_Null2_(), nF_fin_Error, true ); + = new StmBoundsStatu2( TkpContext_Null2_(), nF_fin_Error, true ); DYN StmBoundsStatu2 * dpBst_finIgn - = new StmBoundsStatu2( *this, *this, nF_fin_Ignore, true ); + = new StmBoundsStatu2( *this, nF_fin_Ignore, true ); DYN StmBoundsStatu2 * dpBst_finBez - = new StmBoundsStatu2( *this, *this, nF_fin_Identifier, true ); + = new StmBoundsStatu2( *this, nF_fin_Identifier, true ); DYN StmBoundsStatu2 * dpBst_finKeyw - = new StmBoundsStatu2( *this, *this, nF_fin_Keyword, false ); + = new StmBoundsStatu2( *this, nF_fin_Keyword, false ); DYN StmBoundsStatu2 * dpBst_finPunct - = new StmBoundsStatu2( *this, *this, nF_fin_Punctuation, false ); + = new StmBoundsStatu2( *this, nF_fin_Punctuation, false ); DYN StmBoundsStatu2 * dpBst_finEOL - = new StmBoundsStatu2( *this, *this, nF_fin_EOL, false ); + = new StmBoundsStatu2( *this, nF_fin_EOL, false ); DYN StmBoundsStatu2 * dpBst_finEOF - = new StmBoundsStatu2( *this, TkpContext_Null2_(), nF_fin_EOF, false ); + = new StmBoundsStatu2( TkpContext_Null2_(), nF_fin_EOF, false ); DYN StmBoundsStatu2 * dpBst_gotoMld - = new StmBoundsStatu2( *this, *pDocuContext, nF_goto_MLDocu, false ); + = new StmBoundsStatu2( *pDocuContext, nF_goto_MLDocu, false ); DYN StmBoundsStatu2 * dpBst_gotoSld - = new StmBoundsStatu2( *this, *pDocuContext, nF_goto_SLDocu, false ); + = new StmBoundsStatu2( *pDocuContext, nF_goto_SLDocu, false ); DYN StmBoundsStatu2 * dpBst_gotoMlc - = new StmBoundsStatu2( *this, *dpContext_MLComment, nF_goto_MLComment, false ); + = new StmBoundsStatu2( *dpContext_MLComment, nF_goto_MLComment, false ); DYN StmBoundsStatu2 * dpBst_gotoSlc - = new StmBoundsStatu2( *this, *dpContext_SLComment, nF_goto_SLComment, false ); + = new StmBoundsStatu2( *dpContext_SLComment, nF_goto_SLComment, false ); DYN StmBoundsStatu2 * dpBst_gotoPrp - = new StmBoundsStatu2( *this, *dpContext_Preprocessor, nF_goto_Praeprocessor, false ); + = new StmBoundsStatu2( *dpContext_Preprocessor, nF_goto_Praeprocessor, false ); DYN StmBoundsStatu2 * dpBst_gotoAsg - = new StmBoundsStatu2( *this, *dpContext_Assignment, nF_goto_Assignment, false ); + = new StmBoundsStatu2( *dpContext_Assignment, nF_goto_Assignment, false ); // construct dpMain: aStateMachine.AddStatus(dpStatusTop); diff --git a/autodoc/source/parser_i/idl/distrib.cxx b/autodoc/source/parser_i/idl/distrib.cxx index 818b3e6ef9b1..cff100993ad2 100644 --- a/autodoc/source/parser_i/idl/distrib.cxx +++ b/autodoc/source/parser_i/idl/distrib.cxx @@ -74,7 +74,6 @@ TokenDistributor::ProcessingData::ProcessingData( // itCurToken // aCurResult nTryCount(0), - bFinished(false), rRepository(io_rRepository), rParserInfo(io_rParserInfo), pDocuProcessor(&i_rDocuProcessor), diff --git a/autodoc/source/parser_i/idl/unoidl.cxx b/autodoc/source/parser_i/idl/unoidl.cxx index be5fc4924ca8..bf213b1cf1d9 100644 --- a/autodoc/source/parser_i/idl/unoidl.cxx +++ b/autodoc/source/parser_i/idl/unoidl.cxx @@ -63,8 +63,6 @@ class FileParsePerformers aDistributor; Dyn<csi::uidl::PE_File> pFileParseEnvironment; - ary::Repository & - rRepository; ParserInfo & rParserInfo; }; @@ -121,7 +119,6 @@ FileParsePerformers::FileParsePerformers( ary::Repository & io_rRepository, ParserInfo & io_rParserInfo ) : pTokens(0), aDistributor(io_rRepository, io_rParserInfo), - rRepository( io_rRepository ), rParserInfo(io_rParserInfo) { DYN csi::dsapi::Context_Docu * diff --git a/autodoc/source/parser_i/idoc/cx_dsapi.cxx b/autodoc/source/parser_i/idoc/cx_dsapi.cxx index 627ef5ce099e..9c43d5febf54 100644 --- a/autodoc/source/parser_i/idoc/cx_dsapi.cxx +++ b/autodoc/source/parser_i/idoc/cx_dsapi.cxx @@ -386,37 +386,37 @@ Context_Docu::SetupStateMachine() = new StmArrayStatu2( C_nStatusSize, A_nWordStatus, 0, true); DYN StmBoundsStatu2 * dpBst_goto_EoHtml - = new StmBoundsStatu2( *this, *pCx_EoHtml, nF_goto_EoHtml, true ); + = new StmBoundsStatu2( *pCx_EoHtml, nF_goto_EoHtml, true ); DYN StmBoundsStatu2 * dpBst_goto_EoXmlConst - = new StmBoundsStatu2( *this, *pCx_EoXmlConst, nF_goto_EoXmlConst, true ); + = new StmBoundsStatu2( *pCx_EoXmlConst, nF_goto_EoXmlConst, true ); DYN StmBoundsStatu2 * dpBst_goto_EoXmlLink_BeginTag - = new StmBoundsStatu2( *this, *pCx_EoXmlLink_BeginTag, nF_goto_EoXmlLink_BeginTag, true ); + = new StmBoundsStatu2( *pCx_EoXmlLink_BeginTag, nF_goto_EoXmlLink_BeginTag, true ); DYN StmBoundsStatu2 * dpBst_goto_EoXmlLink_EndTag - = new StmBoundsStatu2( *this, *pCx_EoXmlLink_EndTag, nF_goto_EoXmlLink_EndTag, true ); + = new StmBoundsStatu2( *pCx_EoXmlLink_EndTag, nF_goto_EoXmlLink_EndTag, true ); DYN StmBoundsStatu2 * dpBst_goto_EoXmlFormat_BeginTag - = new StmBoundsStatu2( *this, *pCx_EoXmlFormat_BeginTag, nF_goto_EoXmlFormat_BeginTag, true ); + = new StmBoundsStatu2( *pCx_EoXmlFormat_BeginTag, nF_goto_EoXmlFormat_BeginTag, true ); DYN StmBoundsStatu2 * dpBst_goto_EoXmlFormat_EndTag - = new StmBoundsStatu2( *this, *pCx_EoXmlFormat_EndTag, nF_goto_EoXmlFormat_EndTag, true ); + = new StmBoundsStatu2( *pCx_EoXmlFormat_EndTag, nF_goto_EoXmlFormat_EndTag, true ); DYN StmBoundsStatu2 * dpBst_goto_CheckStar - = new StmBoundsStatu2( *this, *pCx_CheckStar, nF_goto_CheckStar, true ); + = new StmBoundsStatu2( *pCx_CheckStar, nF_goto_CheckStar, true ); DYN StmBoundsStatu2 * dpBst_finError - = new StmBoundsStatu2( *this, TkpContext_Null2_(), nF_fin_Error, true ); + = new StmBoundsStatu2( TkpContext_Null2_(), nF_fin_Error, true ); DYN StmBoundsStatu2 * dpBst_finIgnore - = new StmBoundsStatu2( *this, *this, nF_fin_Ignore, true); + = new StmBoundsStatu2( *this, nF_fin_Ignore, true); DYN StmBoundsStatu2 * dpBst_finEof - = new StmBoundsStatu2( *this, TkpContext_Null2_(), nF_fin_Eof, false); + = new StmBoundsStatu2( TkpContext_Null2_(), nF_fin_Eof, false); DYN StmBoundsStatu2 * dpBst_finAnyWord - = new StmBoundsStatu2( *this, *this, nF_fin_AnyWord, true); + = new StmBoundsStatu2( *this, nF_fin_AnyWord, true); DYN StmBoundsStatu2 * dpBst_finAtTag - = new StmBoundsStatu2( *this, *this, nF_fin_AtTag, false); + = new StmBoundsStatu2( *this, nF_fin_AtTag, false); DYN StmBoundsStatu2 * dpBst_finEndSign - = new StmBoundsStatu2( *this, *pParentContext, nF_fin_EndSign, false); + = new StmBoundsStatu2( *pParentContext, nF_fin_EndSign, false); DYN StmBoundsStatu2 * dpBst_fin_Comma - = new StmBoundsStatu2( *this, *this, nF_fin_Comma, false ); + = new StmBoundsStatu2( *this, nF_fin_Comma, false ); DYN StmBoundsStatu2 * dpBst_finWhite - = new StmBoundsStatu2( *this, *this, nF_fin_White, false); + = new StmBoundsStatu2( *this, nF_fin_White, false); // construct dpMain: diff --git a/autodoc/source/parser_i/inc/s2_luidl/distrib.hxx b/autodoc/source/parser_i/inc/s2_luidl/distrib.hxx index 266e037ade35..eeceabfa476d 100644 --- a/autodoc/source/parser_i/inc/s2_luidl/distrib.hxx +++ b/autodoc/source/parser_i/inc/s2_luidl/distrib.hxx @@ -161,7 +161,6 @@ class TokenDistributor : private TokenProcessing_Types TokenProcessing_Result aCurResult; uintt nTryCount; - bool bFinished; ary::Repository & rRepository; ParserInfo & rParserInfo; diff --git a/autodoc/source/parser_i/inc/tokens/stmstfi2.hxx b/autodoc/source/parser_i/inc/tokens/stmstfi2.hxx index 818b8107117d..f74eb47acd62 100644 --- a/autodoc/source/parser_i/inc/tokens/stmstfi2.hxx +++ b/autodoc/source/parser_i/inc/tokens/stmstfi2.hxx @@ -28,7 +28,6 @@ class TkpContext; -class StateMachineContext; /** **/ @@ -37,8 +36,6 @@ class StmBoundsStatu2 : public StmStatu2 public: // LIFECYCLE StmBoundsStatu2( - StateMachineContext & - o_rOwner, TkpContext & i_rFollowUpContext, uintt i_nStatusFunctionNr, bool i_bIsDefault ); @@ -52,8 +49,6 @@ class StmBoundsStatu2 : public StmStatu2 AsBounds(); private: - StateMachineContext * - pOwner; TkpContext * pFollowUpContext; uintt nStatusFunctionNr; bool bIsDefault; diff --git a/autodoc/source/parser_i/tokens/stmstfi2.cxx b/autodoc/source/parser_i/tokens/stmstfi2.cxx index 2798cd19f84a..5ebaef98e10a 100644 --- a/autodoc/source/parser_i/tokens/stmstfi2.cxx +++ b/autodoc/source/parser_i/tokens/stmstfi2.cxx @@ -25,13 +25,10 @@ #include <tokens/tkpcont2.hxx> -StmBoundsStatu2::StmBoundsStatu2( StateMachineContext & - o_rOwner, - TkpContext & i_rFollowUpContext, +StmBoundsStatu2::StmBoundsStatu2( TkpContext & i_rFollowUpContext, uintt i_nStatusFunctionNr, bool i_bIsDefault ) - : pOwner(&o_rOwner), - pFollowUpContext(&i_rFollowUpContext), + : pFollowUpContext(&i_rFollowUpContext), nStatusFunctionNr(i_nStatusFunctionNr), bIsDefault(i_bIsDefault) { |