diff options
20 files changed, 6 insertions, 972 deletions
diff --git a/autodoc/inc/ary/idl/ik_interface.hxx b/autodoc/inc/ary/idl/ik_interface.hxx index c6fb059fea48..d86fcba526e3 100644 --- a/autodoc/inc/ary/idl/ik_interface.hxx +++ b/autodoc/inc/ary/idl/ik_interface.hxx @@ -86,18 +86,6 @@ struct xref : public ifc_ce::xref static void Get_AsDataTypes( Dyn_CeIterator & o_result, const CodeEntity & i_ce ); - -#if 0 - static void Get_UsingTypedefs( /// like: typedef sequence<i_ce.LocalName()> newNameSeq; - Dyn_CeIterator & o_result, - const CodeEntity & i_ce ); - static void Get_AsIndirectReturns( - Dyn_CeIterator & o_result, - const CodeEntity & i_ce ); - static void Get_AsIndirectParameters( - Dyn_CeIterator & o_result, - const CodeEntity & i_ce ); -#endif // 0 }; struct doc : public ifc_ce::doc diff --git a/autodoc/source/display/idl/hfi_method.cxx b/autodoc/source/display/idl/hfi_method.cxx index e7adc151dba8..b5d1aa9d3d8c 100644 --- a/autodoc/source/display/idl/hfi_method.cxx +++ b/autodoc/source/display/idl/hfi_method.cxx @@ -80,102 +80,6 @@ HF_IdlMethod::Produce_byData( const String & i_sName, leave_ContentCell(); } -#if 0 // old -void -HF_IdlMethod::write_Declaration( const String & i_sName, - type_id i_nReturnType, - param_list & i_rParams, - type_list & i_rExceptions, - bool i_bOneway, - bool i_bEllipse ) const -{ - HF_FunctionDeclaration - aDecl(CurOut()) ; - Xml::Element & - front = aDecl.Add_ReturnLine(); - - // Front: - if (i_bOneway) - front << "[oneway] "; - if (i_nReturnType.IsValid()) - { // Normal function, but not constructors: - HF_IdlTypeText - aReturn(Env(), front, true); - aReturn.Produce_byData(i_nReturnType); - front - << new Html::LineBreak; - - } - front - >> *new Html::Bold - << i_sName; - - // Main line: - Xml::Element & - types = aDecl.Types(); - Xml::Element & - names = aDecl.Names(); - bool bParams = i_rParams.operator bool(); - if (bParams) - { - front - << "("; - HF_IdlTypeText - aType( Env(), types, true ); - - write_Param( aType, names, (*i_rParams) ); - - for (++i_rParams; i_rParams; ++i_rParams) - { - types - << new Html::LineBreak; - names - << "," - << new Html::LineBreak; - write_Param( aType, names, (*i_rParams) ); - } // end for - - if (i_bEllipse) - { - names - << " ..."; - } - names - << " )"; - } - else - front - << "()"; - - - if ( i_rExceptions.operator bool() ) - { - Xml::Element & - rExcOut = aDecl.Add_RaisesLine("raises", NOT bParams); - HF_IdlTypeText - aExc(Env(), rExcOut, true); - aExc.Produce_byData(*i_rExceptions); - - for (++i_rExceptions; i_rExceptions; ++i_rExceptions) - { - rExcOut - << "," - << new Html::LineBreak; - aExc.Produce_byData(*i_rExceptions); - } // end for - - rExcOut << " );"; - } - else - { - if (bParams) - aDecl.Names() << ";"; - else - aDecl.Front() << ";"; - } -} -#endif // 0 old - void HF_IdlMethod::write_Declaration( const String & i_sName, type_id i_nReturnType, @@ -267,31 +171,6 @@ HF_IdlMethod::write_Declaration( const String & i_sName, } } -#if 0 // old -void -HF_IdlMethod::write_Param( HF_IdlTypeText & o_type, - Xml::Element & o_names, - const ary::idl::Parameter & i_param ) const -{ - switch ( i_param.Direction() ) - { - case ary::idl::param_in: - o_type.CurOut() << "[in] "; - break; - case ary::idl::param_out: - o_type.CurOut() << "[out] "; - break; - case ary::idl::param_inout: - o_type.CurOut() << "[inout] "; - break; - } // end switch - - o_type.Produce_byData( i_param.Type() ); - o_names - << i_param.Name(); -} -#endif // 0 old - Xml::Element * HF_IdlMethod::write_Param( HF_FunctionDeclaration & o_decl, const ary::idl::Parameter & i_param ) const diff --git a/autodoc/source/display/idl/hi_ary.cxx b/autodoc/source/display/idl/hi_ary.cxx index 1dae94bdb139..855b9ede1536 100644 --- a/autodoc/source/display/idl/hi_ary.cxx +++ b/autodoc/source/display/idl/hi_ary.cxx @@ -177,19 +177,6 @@ AryAccess::Search_Ce( StringVector & o_module, if (strchr(o_memberEntity,':') != 0) return false; // This must not happen in IDL -#if 0 -// The following code avoids false links, but is rather expensive -// in runtime time consumation. - - const ary::idl::CodeEntity * - pCe = Find_Ce(nCe); - if (pCe == 0) - return false; - - if ( NOT ary::idl::ifc_ce::attr::Search_Member(*pCe,o_memberEntity) ) - return false; -#endif - return true; } diff --git a/autodoc/source/display/idl/hi_display.cxx b/autodoc/source/display/idl/hi_display.cxx index f4786d6c9a14..b3eaa76279d6 100644 --- a/autodoc/source/display/idl/hi_display.cxx +++ b/autodoc/source/display/idl/hi_display.cxx @@ -162,16 +162,6 @@ HtmlDisplay_Idl::Create_FilesInProjectTree() void HtmlDisplay_Idl::Create_PackageList() { -#if 0 - Cout() << "\nCreate package list ..." << std::flush; - - pCurPageEnv->CurPosition() = pCurPageEnv->OutputTree().Root(); - - // KORR - // ... - - Cout() << " done." << Endl(); -#endif // 0 } void diff --git a/autodoc/source/display/inc/toolkit/hf_funcdecl.hxx b/autodoc/source/display/inc/toolkit/hf_funcdecl.hxx index 1b943dde3e19..0dcfe5fbe88d 100644 --- a/autodoc/source/display/inc/toolkit/hf_funcdecl.hxx +++ b/autodoc/source/display/inc/toolkit/hf_funcdecl.hxx @@ -35,39 +35,6 @@ // COMPONENTS // PARAMETERS - -#if 0 // old -/** @resp - Provides three cells to put in a function declaration. -*/ -class HF_FunctionDeclaration : public HtmlMaker -{ - public: - HF_FunctionDeclaration( - Xml::Element & o_rParent ); - virtual ~HF_FunctionDeclaration(); - - /// Inserts empty line in 2nd and 3rd cell and returns first. - Xml::Element & Add_ReturnLine(); - - /** Inserts empty line in 1st cell, "raises (" in 2nd - and returns 3rd. - */ - Xml::Element & Add_RaisesLine( - const char * i_sRaisesText, - bool i_bSuppressExtraLine = false ); - - Xml::Element & Front() { return *pFront; } - Xml::Element & Types() { return *pTypes; } - Xml::Element & Names() { return *pNames; } - - private: - Xml::Element * pFront; - Xml::Element * pTypes; - Xml::Element * pNames; -}; -#endif // 0 old - class HF_FunctionDeclaration : public HtmlMaker { public: diff --git a/autodoc/source/display/toolkit/hf_funcdecl.cxx b/autodoc/source/display/toolkit/hf_funcdecl.cxx index ee260add569a..4f0c652b1934 100644 --- a/autodoc/source/display/toolkit/hf_funcdecl.cxx +++ b/autodoc/source/display/toolkit/hf_funcdecl.cxx @@ -156,51 +156,4 @@ HF_FunctionDeclaration::ParameterLine() return *pParameterLine; } - -#if 0 // old -HF_FunctionDeclaration::HF_FunctionDeclaration( Xml::Element & o_rParent ) - : HtmlMaker(o_rParent), - pFront(0), - pTypes(0), - pNames(0) -{ - Xml::Element & - rRow = CurOut() - >> *new Html::Table - << new Xml::AnAttribute("border","0") - >> *new Html::TableRow; - pFront = &(rRow >> *new Html::TableCell << new Html::VAlignAttr(C_sValignTop)); - pTypes = &(rRow >> *new Html::TableCell << new Html::VAlignAttr(C_sValignTop)); - pNames = &(rRow >> *new Html::TableCell << new Html::VAlignAttr(C_sValignTop)); -} - -HF_FunctionDeclaration::~HF_FunctionDeclaration() -{ -} - -Xml::Element & -HF_FunctionDeclaration::Add_ReturnLine() -{ - (*pTypes) << new Xml::XmlCode(" <br>\n"); - (*pNames) << new Xml::XmlCode(" <br>\n"); - return *pFront; -} - -Xml::Element & -HF_FunctionDeclaration::Add_RaisesLine( const char * i_sRaisesText, - bool i_bSuppressExtraLine ) -{ - if (NOT i_bSuppressExtraLine) - { - (*pTypes) << new Xml::XmlCode(" <br>"); - (*pNames) << new Xml::XmlCode(" <br>\n"); - } - (*pTypes) - << new Xml::XmlCode("<p class=\"raise\">") - << i_sRaisesText - << new Xml::XmlCode("( </p>\n"); - return *pNames; -} -#endif // 0 old - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/exes/adc_uni/adc_cl.cxx b/autodoc/source/exes/adc_uni/adc_cl.cxx index 23d6db8a9029..45c98b7c7548 100644 --- a/autodoc/source/exes/adc_uni/adc_cl.cxx +++ b/autodoc/source/exes/adc_uni/adc_cl.cxx @@ -86,175 +86,6 @@ const char * const C_sUserGuide = "\n" "\n"; - -#if 0 // FUTURE -"\n\n\n" -" Use of Autodoc\n" -" --------------\n" -"\n" -" Basics:\n" -"\n" -" Autodoc may perform different tasks.\n" -"\n" -" Possible tasks are\n" -" - parsing source code\n" -" - creating HTML-output.\n" -" On the command line each task starts with a specific\n" -" option:\n" -" '-parse' for parsing source code,\n" -" '-html' for creating HTML.\n" -" All command line options, related to one task, have to follow before\n" -" the starting option of the next task.\n" -"\n" -" Within the task '-parse', there may be defined different projects.\n" -" A project definition is started with '-p'.\n" -" All not project specific options within the task '-parse' have to\n" -" appear in front of the first '-p'.\n" -" There can be no project at all. Then all options, available for\n" -" projects, can be used like for one nameless default project, without using\n" -" '-p', but these options still have to appear behind all other\n" -" options of the task '-parse'.\n" -"\n" -"\n" -" Legend:\n" -"\n" -" <SomeText> Describes an argument.\n" -" 'SomeText' Within '...' is the literal value of an argument.\n" -" + There can be multiple arguments.\n" -" | Separator for alternative literal values of an argument.\n" -"\n" -"\n" -" Syntax:\n" -"\n" -" -parse\n" -" -name <RepositoryName>]\n" -" -lg 'c++'|'idl'\n" -" -extg <AdditonalExtensions>+\n" -" -docg 'usehtml'\n" -" -p <ProjectName> <ProjectRootDir>\n" -" -l 'c++'|'idl'\n" -" -ext <AdditonalExtensions>+\n" -" -doc 'usehtml'\n" -" -d <SourceDir_relative2ProjectRootDir_nosubdirs>+\n" -" -t <SourceTree_relative2ProjectRootDir>+\n" -" -f <SourceFile_relative2ProjectRootDir>+\n" -" -html <OutputDir>\n" -" -xlinks <Namespace> <ExternLinksRootDir>\n" -" -i <CommandFilePath>\n" -" -v <VerboseNr>\n" -"\n" -"\n" -" Detailed Options Description:\n" -"\n" -" Option Arguments\n" -" ----------------------------------------------------------\n" -"\n" -" -parse \n\n" -" Starts the task \"Parse source code\".\n" -" May be omitted, if it would be the first option on the\n" -" command line.\n" -"\n" -" -name <RepositoryName>\n\n" -" This name is used for naming the repository in\n" -" human readable output. In future it may be used also for\n" -" identifiing a repository in searches.\n" -"\n" -" -lg 'c++|'idl'\n\n" -" Identifies the programming language to be parsed.\n" -" 'c++': C++\n" -" Files with extensions '.h', '.hxx' are parsed.\n" -" 'idl': UNO-IDL\n" -" Files with extensions '.idl' are parsed.\n" -" Here the language is set globally for all projects.\n" -" A project can override this by using '-l'.\n" -"\n" -" -extg <.AdditionalExtension>+\n\n" -" Has to follow immediately behind '-lg'.\n" -" Specifies additional extensions, that will be recognised as\n" -" source code files of the previously specified programming\n" -" language. Each extension has to start with '.'.\n" -" It is possible to include extensionless files, too,\n" -" by the argument '.'\n" -" Here these extensions are set globally for all projects.\n" -" A project can override this by using '-l' and '-ext'.\n" -"\n" -" -docg 'html'|'nohtml'\n\n" -" Specifies the default for all comments in source code, so \n" -" that HTML-tags are interpreted as such or else treated as\n" -" regular text.\n" -" Without this option, the default is 'nohtml'.\n" -" Here the default is set globally for all projects.\n" -" A project can override this by using '-doc'.\n" -"\n" -" -p <ProjectName> <ProjectRootDirectory>\n\n" -" ProjectName is used in output as human readable identifier\n" -" for the project. ProjectRootDirectory is the path,\n" -" where the arguments of '-d', '-t' and '-f' are relative to.\n" -" This option can be omitted, then there is no project name\n" -" and all paths are relative to the current working directory.\n" -"\n" -" -l 'c++|'idl'\n\n" -" Overrides -lg and -extg for the current project, which is\n" -" specified by the last previous '-p'.\n" -" For details see at option '-lg'.\n" -"\n" -" -ext <.AdditionalExtension>+\n\n" -" Can be used only immediately behind '-l'.\n" -" Overrides -extg for the current project, which is\n" -" specified by the last previous '-p'.\n" -" For details see at option '-extg'.\n" -"\n" -" -doc 'html'|'nohtml'\n\n" -" Overrides -docg for the current project, which is\n" -" specified by the last previous '-p'.\n" -" For details see at option '-docg'.\n" -"\n" -" -d <SourceDir_relative2ProjectRootDir_nosubdirs>+\n\n" -" For the current project all files in the given\n" -" directories are parsed, which have valid extensions.\n" -" Subdirectories are NOT parsed.\n" -"\n" -" -t <SourceTree_relative2ProjectRootDir>+\n\n" -" For the current project all files in the given\n" -" directories AND its subdirectories are parsed, which\n" -" have valid extensions.\n" -"\n" -" -f <SourceFile_relative2ProjectRootDir>+\n\n" -" For the current project and language the given files\n" -" are parsed. It doesn't matter, if their extensions match\n" -" the valid extensions.\n" -"\n" -" -html <OutputRootDir>\n\n" -" Starts the task \"Create HTML output\".\n" -"\n" -" -xlinks <Namespace> <ExternLinksRootDir>\n\n" -" This option allows, to create links to external\n" -" HTML-documents.\n" -" For all source code objects (like classes or functions)\n" -" which belong in the given namespace, the given root\n" -" directory is used as a base for links to them.\n" -" Presently, this works only for C++-mappings of IDL-items.\n" -" The given namespace has to be absolute.\n" -"\n" -" -i <CommandFilePath>\n\n" -" This option is replaced by the contents of the given\n" -" file. The file has to be ASCII and each option\n" -" has to start in the first column of a new line.\n" -" So each valid line starts with a '-'.\n" -" Empty lines are allowed.\n" -" Comment lines have to start with '#'\n" -"\n" -" -v <VerboseNumber>\n\n" -" Show details during parsing:\n" -" 2 shows each parsed letter,\n" -" 4 shows stored objects.\n" -" 1 shows recognised tokens.\n" -" These bit-values can be combined.\n" -" This option suppresses errors, because of\n" -" missing output options (no '-html').\n"; -#endif // 0, FUTURE - - CommandLine::CommandLine() : nDebugStyle(0), pSinceTransformator(new command::SinceTagTransformationData), diff --git a/autodoc/source/exes/adc_uni/cmd_run.cxx b/autodoc/source/exes/adc_uni/cmd_run.cxx index c26b15e30177..5b79de482114 100644 --- a/autodoc/source/exes/adc_uni/cmd_run.cxx +++ b/autodoc/source/exes/adc_uni/cmd_run.cxx @@ -273,340 +273,6 @@ Parser::GatherFiles( FileCollector_Ifc & o_rFiles, } // namespace run } // namespace command - - -#if 0 -inline const ParseToolsFactory_Ifc & -CommandRunner::ParseToolsFactory() - { return ParseToolsFactory_Ifc::GetIt_(); } - - -inline const command::S_LanguageInfo & -CommandRunner::Get_ProjectLanguage( const command::Parse & i_rCommand, - const command::S_ProjectData & i_rProject ) -{ - if ( i_rProject.pLanguage ) - return *i_rProject.pLanguage; - return *i_rCommand.GlobalLanguageInfo(); -} - -inline bool -CommandRunner::HasParsedCpp() const - { return pCppParser; } -inline bool -CommandRunner::HasParsedIdl() const - { return pIdlParser; } - - - - - -CommandRunner::CommandRunner() - : pCommandLine(0), - pReposy(0), - pNewReposy(0), - nResultCode(0) -{ - Cout() << "\nAutodoc version 2.2.1" - << "\n-------------------" - << "\n" << Endl(); -} - -CommandRunner::~CommandRunner() -{ - ary::Repository::Destroy_(); - Cout() << "\n" << Endl(); -} - -void -CommandRunner::Run( const CommandLine & i_rCL ) -{ - ary::Repository::Destroy_(); -// ary::Repository::Destroy_(); - pReposy = 0; - pNewReposy = 0; - nResultCode = 0; - pCommandLine = &i_rCL; - - pCommandLine->Run(); -} - -void -CommandRunner::Parse() -{ - try - { - - csv_assert( pCommandLine->Cmd_Parse() != 0 ); - const command::Parse & - rCmd = *pCommandLine->Cmd_Parse(); - - Cout() << "Parsing the repository " - << rCmd.ReposyName() - << " ..." - << Endl(); - - if ( pReposy == 0 ) - pReposy = & ary::Repository::Create_( rCmd.ReposyName(), 0 ); - if ( pNewReposy == 0 ) - pNewReposy = & ary::Repository::Create_( rCmd.ReposyName() ); - - Dyn< FileCollector_Ifc > pFiles; - pFiles = ParseToolsFactory().Create_FileCollector(6000); - - bool bCpp = false; - bool bIDL = false; - - command::Parse::ProjectIterator itEnd = rCmd.ProjectsEnd(); - for ( command::Parse::ProjectIterator it = rCmd.ProjectsBegin(); - it != itEnd; - ++it ) - { - - uintt nCount = GatherFiles( *pFiles, rCmd, *(*it) ); - Cout() << nCount - << " files found to parse in project " - << (*it)->Name() - << "." - << Endl(); - - - switch ( Get_ProjectLanguage(rCmd, *(*it)).eLanguage ) - { - case command::S_LanguageInfo::cpp: - { - Get_CppParser().Run( (*it)->Name(), - (*it)->RootDirectory(), - *pFiles ); - bCpp = true; - } break; - case command::S_LanguageInfo::idl: - { - Get_IdlParser().Run(*pFiles); - bIDL = true; - } break; - default: - Cerr() << "Project in yet unimplemented language skipped." - << Endl(); - } - } // end for - - if (bCpp) - pReposy->RwGate_Cpp().Connect_AllTypes_2_TheirRelated_CodeEntites(); - if (bIDL) - { - pNewReposy->Gate_Idl().Secondaries().Connect_Types2Ces(); - pNewReposy->Gate_Idl().Secondaries().Gather_CrossReferences(); - } - - } // end try - catch (csv::Exception & xx) - { - xx.GetInfo(Cerr()); - Cerr() << " program will exit." << Endl(); - nResultCode = 1; - } - catch (...) - { - Cerr() << "Unknown exception - program will exit." << Endl(); - nResultCode = 1; - } -} - -void -CommandRunner::Load() -{ - Cout() << "This would load the repository from the directory " - << pCommandLine->Cmd_Load()->ReposyDir() - << "." - << Endl(); -} - - -void -CommandRunner::Save() -{ - Cout() << "This would save the repository into the directory " - << pCommandLine->Cmd_Save()->ReposyDir() - << "." - << Endl(); -} - - -void -CommandRunner::CreateHtml() -{ - Cout() << "Creating HTML-output into the directory " - << pCommandLine->Cmd_CreateHtml()->OutputDir() - << "." - << Endl(); - - if ( HasParsedCpp() ) - CreateHtml_NewStyle(); - if ( HasParsedIdl() ) - CreateHtml_OldIdlStyle(); -} - - - -void -CommandRunner::CreateXml() -{ - Cout() << "This would create the XML-output into the directory " - << pCommandLine->Cmd_CreateXml()->OutputDir() - << "." - << Endl(); -} - -CodeParser_Ifc & -CommandRunner::Get_CppParser() -{ - if ( NOT pCppParser ) - Create_CppParser(); - return *pCppParser; -} - -IdlParser & -CommandRunner::Get_IdlParser() -{ - if ( NOT pIdlParser ) - Create_IdlParser(); - return *pIdlParser; -} - -void -CommandRunner::Create_CppParser() -{ - pCppParser = ParseToolsFactory().Create_Parser_Cplusplus(); - pCppDocuInterpreter = ParseToolsFactory().Create_DocuParser_AutodocStyle(); - - pCppParser->Setup( *pReposy, - *pCppDocuInterpreter ); -} - -void -CommandRunner::Create_IdlParser() -{ - pIdlParser = new IdlParser(*pNewReposy); -} - -uintt -CommandRunner::GatherFiles( FileCollector_Ifc & o_rFiles, - const command::Parse & i_rCommand, - const command::S_ProjectData & i_rProject ) -{ - uintt ret = 0; - o_rFiles.EraseAll(); - - typedef StringVector StrVector; - typedef StrVector::const_iterator StrIterator; - const command::S_Sources & - rSources = i_rProject.aFiles; - const StrVector & - rExtensions = Get_ProjectLanguage(i_rCommand,i_rProject).aExtensions; - - StrIterator it; - StrIterator itDirsEnd = rSources.aDirectories.end(); - StrIterator itTreesEnd = i_rProject.aFiles.aTrees.end(); - StrIterator itFilesEnd = i_rProject.aFiles.aFiles.end(); - StrIterator itExt; - StrIterator itExtEnd = rExtensions.end(); - - csv::StreamStr aDir(500); - i_rProject.aRootDirectory.Get( aDir ); - - uintt nProjectDir_AddPosition = - ( strcmp(aDir.c_str(),".\\") == 0 OR strcmp(aDir.c_str(),"./") == 0 ) - ? 0 - : uintt( aDir.tellp() ); - - for ( it = rSources.aDirectories.begin(); - it != itDirsEnd; - ++it ) - { - aDir.seekp( nProjectDir_AddPosition ); - aDir << *it; - - for ( itExt = rExtensions.begin(); - itExt != itExtEnd; - ++itExt ) - { - ret += o_rFiles.AddFilesFrom( aDir.c_str(), - *itExt, - FileCollector_Ifc::flat ); - } // end for itExt - } // end for it - for ( it = rSources.aTrees.begin(); - it != itTreesEnd; - ++it ) - { - aDir.seekp( nProjectDir_AddPosition ); - aDir << *it; - - for ( itExt = rExtensions.begin(); - itExt != itExtEnd; - ++itExt ) - { - ret += o_rFiles.AddFilesFrom( aDir.c_str(), - *itExt, - FileCollector_Ifc::recursive ); - } // end for itExt - } // end for it - for ( it = rSources.aFiles.begin(); - it != itFilesEnd; - ++it ) - { - aDir.seekp( nProjectDir_AddPosition ); - aDir << *it; - - o_rFiles.AddFile( aDir.c_str() ); - } // end for it - ret += rSources.aFiles.size(); - - return ret; -} - -void -CommandRunner::CreateHtml_NewStyle() -{ - const ary::cpp::DisplayGate & - rGate = pReposy->DisplayGate_Cpp(); - - Dyn< autodoc::HtmlDisplay_UdkStd > pHtmlDisplay; - pHtmlDisplay = DisplayToolsFactory_Ifc::GetIt_() - .Create_HtmlDisplay_UdkStd(); - - pHtmlDisplay->Run( pCommandLine->Cmd_CreateHtml()->OutputDir(), - rGate, - DisplayToolsFactory_Ifc::GetIt_().Create_StdFrame() ); -} - -void -CommandRunner::CreateHtml_OldIdlStyle() -{ - ary::idl::Gate & - rAryGate = pNewReposy->Gate_Idl(); - - // Read DevManualLinkFile: - // KORR_FUTURE - csv::File - aFile("devmanref.txt", csv::CFM_READ); - if ( aFile.open() ) - { - rAryGate.Secondaries().Read_Links2DevManual(aFile); - aFile.close(); - } - - // New Style Output - Dyn<autodoc::HtmlDisplay_Idl_Ifc> pNewDisplay; - pNewDisplay = DisplayToolsFactory_Ifc::GetIt_() - .Create_HtmlDisplay_Idl(); - pNewDisplay->Run( pCommandLine->Cmd_CreateHtml()->OutputDir(), - rAryGate, - DisplayToolsFactory_Ifc::GetIt_().Create_StdFrame() ); -} -#endif // 0 - } // namespace autodoc diff --git a/autodoc/source/parser/adoc/tk_attag.cxx b/autodoc/source/parser/adoc/tk_attag.cxx index 5944f99ca715..6c9b500d4740 100644 --- a/autodoc/source/parser/adoc/tk_attag.cxx +++ b/autodoc/source/parser/adoc/tk_attag.cxx @@ -37,33 +37,6 @@ namespace adoc { -#if 0 -#define EV_AtTagId( val, tex ) ENUM_VALUE(E_AtTagId, eATTAGID_##val, val, tex ) - -EV_AtTagId(atid_ATT, "ATTENTION" ); -EV_AtTagId(atid_author, "Author" ); -EV_AtTagId(atid_change, "Change" ); -EV_AtTagId(atid_collab, "Collaborators" ); -EV_AtTagId(atid_contact, "Contact" ); -EV_AtTagId(atid_copyright, "Copyright (c)" ); -EV_AtTagId(atid_descr, "Description" ); -EV_AtTagId(atid_devstat, "Development State" ); -EV_AtTagId(atid_docdate, "Date of Documentation" ); -EV_AtTagId(atid_derive, "How to Derive from this class" ); -EV_AtTagId(atid_instance, "Instances" ); -EV_AtTagId(atid_life, "Lifecycle" ); -EV_AtTagId(atid_multi, "Multiplicity" ); -EV_AtTagId(atid_onerror, "On Error" ); -EV_AtTagId(atid_persist, "Persistence" ); -EV_AtTagId(atid_postcond, "Postcondition" ); -EV_AtTagId(atid_precond, "Precondition" ); -EV_AtTagId(atid_return, "Return" ); -EV_AtTagId(atid_short, "Summary" ); -EV_AtTagId(atid_since, "Valid Since" ); -EV_AtTagId(atid_todo, "Todo" ); -EV_AtTagId(atid_version, "Version" ); -#endif // 0 - void Tok_at_std::Trigger( TokenInterpreter & io_rInterpreter ) const { diff --git a/autodoc/source/parser/cpp/all_toks.hxx b/autodoc/source/parser/cpp/all_toks.hxx index 485588d5fbc1..aba0aaad55d4 100644 --- a/autodoc/source/parser/cpp/all_toks.hxx +++ b/autodoc/source/parser/cpp/all_toks.hxx @@ -184,7 +184,7 @@ class Tok_UnblockMacro : public ::TextToken -#if 0 // just for viewing: +/* just for viewing: class Tok_TypeKey : public cpp::Token // file-><type-PE> class Tok_Template : public cpp::Token // file class Tok_Namespace : public cpp::Token // file @@ -211,8 +211,7 @@ class Tok_Operator : public cpp::Token // expression class Tok_Ignore : public cpp::Token class Tok_ContextChanger : public cpp::Token -#endif // 0 - +*/ } // namespace cpp diff --git a/autodoc/source/parser/cpp/pe_class.cxx b/autodoc/source/parser/cpp/pe_class.cxx index 0a1d244b8578..1b4910aff9be 100644 --- a/autodoc/source/parser/cpp/pe_class.cxx +++ b/autodoc/source/parser/cpp/pe_class.cxx @@ -213,15 +213,6 @@ PE_Class::Setup_StatusFunctions() SEMPARSE_CREATE_STATUS(PE_Class, inProtection, Hdl_SyntaxError); SEMPARSE_CREATE_STATUS(PE_Class, afterDecl, On_afterDecl_Return2Type); -#if 0 - static F_Tok stateF_inFriend[] = { On_inFriend_class, - On_inFriend_struct, - On_inFriend_union }; - // Default: On_inFriend_Function - static INT16 stateT_inFriend[] = { Tid_class, - Tid_struct, - Tid_union }; -#endif // 0 } void diff --git a/autodoc/source/parser/cpp/pe_class.hxx b/autodoc/source/parser/cpp/pe_class.hxx index 737bb3a4111d..f14d8ce97b80 100644 --- a/autodoc/source/parser/cpp/pe_class.hxx +++ b/autodoc/source/parser/cpp/pe_class.hxx @@ -219,7 +219,7 @@ PE_Class::Result_FirstNameSegment() const } // namespace cpp -#if 0 // Branches +/* // Branches class struct union -> Class @@ -247,10 +247,7 @@ virtual using -> Using Declaration - - -#endif // 0 - +*/ #endif diff --git a/autodoc/source/parser/cpp/pe_expr.cxx b/autodoc/source/parser/cpp/pe_expr.cxx index 1d9b18dacadf..0594e57077c5 100644 --- a/autodoc/source/parser/cpp/pe_expr.cxx +++ b/autodoc/source/parser/cpp/pe_expr.cxx @@ -55,33 +55,6 @@ void PE_Expression::Call_Handler( const cpp::Token & i_rTok ) { pStati->Cur().Call_Handler(i_rTok.TypeId(), i_rTok.Text()); - -#if 0 - switch (i_rTok.TypeId()) - { - case Tid_SwBracket_Left: SetTokenResult(done, stay); - nBracketCounter++; - bBlockOpened = true; - break; - case Tid_SwBracket_Right: SetTokenResult(done, stay); - nBracketCounter--; - break; - case Tid_Semicolon: if (nBracketCounter == 0) - SetTokenResult(done, pop_success); - else - SetTokenResult(done, stay); - break; - default: - if ( bBlockOpened AND nBracketCounter == 0 ) - { - SetTokenResult(not_done, pop_success); - } - else - { - SetTokenResult(done, stay); - } - } // end switch -#endif // 0 } void diff --git a/autodoc/source/parser/cpp/pe_file.hxx b/autodoc/source/parser/cpp/pe_file.hxx index eb88a311e558..86f10e5443e8 100644 --- a/autodoc/source/parser/cpp/pe_file.hxx +++ b/autodoc/source/parser/cpp/pe_file.hxx @@ -51,12 +51,6 @@ namespace cpp { class PE_Defines; class PE_Ignore; -#if 0 -class PE_Template; -class PE_Extern; -#endif - - class PE_File : public Cpp_PE { public: @@ -83,9 +77,6 @@ class PE_File : public Cpp_PE typedef SubPe< PE_File, PE_TemplateTop> SP_Template; typedef SubPe< PE_File, PE_Defines> SP_Defines; typedef SubPe< PE_File, PE_Ignore > SP_Ignore; -#if 0 - typedef SubPe< PE_File, PE_Using> SP_Using; -#endif // 0 typedef SubPeUse< PE_File, PE_Namespace> SPU_Namespace; typedef SubPeUse< PE_File, PE_Typedef> SPU_Typedef; @@ -136,9 +127,6 @@ class PE_File : public Cpp_PE Dyn<SP_Defines> pSpDefs; Dyn<SP_Ignore> pSpIgnore; -#if 0 - SP_Using aSpUsing; -#endif // 0 Dyn<SPU_Namespace> pSpuNamespace; Dyn<SPU_Typedef> pSpuTypedef; @@ -159,7 +147,7 @@ class PE_File : public Cpp_PE -#if 0 // Branches +/* // Branches namespace -> Named Namespace declaration @@ -202,8 +190,7 @@ using -> Using-Declaration -> Using-Directive -#endif // 0 - +*/ #endif diff --git a/autodoc/source/parser/inc/tokens/tkp.hxx b/autodoc/source/parser/inc/tokens/tkp.hxx index 6623230e9603..e3b0939c1f78 100644 --- a/autodoc/source/parser/inc/tokens/tkp.hxx +++ b/autodoc/source/parser/inc/tokens/tkp.hxx @@ -48,12 +48,6 @@ class TkpContext; The algorithms for parsing tokens from the text are an issue of the derived classes. */ -#if 0 -/** - Parsing can be interrupted for a different source by PushSource(). - The parsing before interruption is continued after PopSource(). -*/ -#endif // 0 class TokenParser { diff --git a/autodoc/source/parser/inc/tokens/tokdeal.hxx b/autodoc/source/parser/inc/tokens/tokdeal.hxx index 0ab4155a42e3..3302c09d87ec 100644 --- a/autodoc/source/parser/inc/tokens/tokdeal.hxx +++ b/autodoc/source/parser/inc/tokens/tokdeal.hxx @@ -53,25 +53,5 @@ class TokenDealer AsDistributor() = 0; }; - -#if 0 -class TokenDealer - -{ - public: - virtual void Deal_IdlCode( - idl::Token & let_drToken ); - virtual void Deal_UdkDocu( - udoc::Token & let_drToken ); - virtual void Deal_JavaCode( - java::Token & let_drToken ); - virtual void Deal_SBasicCode( - sbasic::Token & let_drToken ); -}; - -#endif // 0 - - - #endif diff --git a/autodoc/source/parser_i/idl/pe_singl.cxx b/autodoc/source/parser_i/idl/pe_singl.cxx index 6b1d99291118..292d380323ac 100644 --- a/autodoc/source/parser_i/idl/pe_singl.cxx +++ b/autodoc/source/parser_i/idl/pe_singl.cxx @@ -49,31 +49,6 @@ namespace uidl { - -#if 0 -#ifdef DF -#undef DF -#endif -#define DF &PE_Singleton::On_Default - - -PE_Singleton::F_TOK -PE_Singleton::aDispatcher[PE_Singleton::e_STATES_MAX][PE_Singleton::tt_MAX] = - { { DF, DF, DF }, // e_none - { DF, &PE_Singleton::On_need_name_Identifer, - DF }, // need_name - { DF, DF, &PE_Singleton::On_need_curlbr_open_Punctuation, - }, // need_curlbr_open - { &PE_Singleton::On_std_GotoService, - DF, &PE_Singleton::On_std_Punctuation, - }, // e_std - { DF, DF, DF }, // in_service - { DF, DF, &PE_Interface::On_need_finish_Punctuation, - } // need_finish - }; -#endif // 0 - - PE_Singleton::PE_Singleton() : eState(e_none), sData_Name(), diff --git a/autodoc/source/parser_i/inc/s2_luidl/pe_singl.hxx b/autodoc/source/parser_i/inc/s2_luidl/pe_singl.hxx index 5b1507d9e8ca..a2a39967728e 100644 --- a/autodoc/source/parser_i/inc/s2_luidl/pe_singl.hxx +++ b/autodoc/source/parser_i/inc/s2_luidl/pe_singl.hxx @@ -93,31 +93,6 @@ class PE_Singleton : public UnoIDL_PE, e_STATES_MAX }; - -#if 0 - enum E_TokenType /// @ATTENTION Do not change existing values (except of tt_MAX) !!! Else array-indices will break. - { - tt_metatype = 0, - tt_identifier = 1, - tt_punctuation = 2, - tt_startoftype = 3, - tt_MAX - }; - typedef void (PE_Singleton::*F_TOK)(const char *); - - - void On_need_singleton_MetaType(const char * i_sText); - void On_need_name_Identifer(const char * i_sText); - void On_need_curlbr_open_Punctuation(const char * i_sText); - void On_std_GotoService(const char * i_sText); - void On_std_Punctuation(const char * i_sText); - void On_need_finish_Punctuation(const char * i_sText); - - void CallHandler( - const char * i_sTokenText, - E_TokenType i_eTokenType ); -#endif // 0 - void On_Default(); virtual void InitData(); diff --git a/cosv/source/unittest/string_ut.cxx b/cosv/source/unittest/string_ut.cxx index 292005881f18..fe3bbb8aa118 100644 --- a/cosv/source/unittest/string_ut.cxx +++ b/cosv/source/unittest/string_ut.cxx @@ -73,70 +73,4 @@ classtest_String( csv::SimpleString & rSimpleString ) return ret; } - - - -#if 0 -FUT_DECL( SimpleString, Ctor_Def ); -FUT_DECL( SimpleString, Seek ); -FUT_DECL( SimpleString, SeekBack ); -FUT_DECL( SimpleString, SeekRelative ); - - - -FUT_DECL( SimpleString, Read ) -{ - bool ret = true; - - rSimpleString.SeekBack(0); - uintt nSourceSize = rSimpleString.Position(); - rSimpleString.Seek(0); - - char * pBuf = new char[nSourceSize+1]; - uintt nCount = rSimpleString.Read(pBuf,nSourceSize); - - UT_CHECK( Read, nCount == nSourceSize ); - - return ret; -} - -FUT_DECL( SimpleString, Write ) -{ - bool ret = true; - - - - return ret; -} - -FUT_DECL( SimpleString, Seek ) -{ - bool ret = true; - - - - return ret; -} - -FUT_DECL( SimpleString, SeekBack ) -{ - bool ret = true; - - - - return ret; -} - -FUT_DECL( SimpleString, SeekRelative ) -{ - bool ret = true; - - - - return ret; -} - -#endif - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/unodevtools/source/skeletonmaker/javatypemaker.cxx b/unodevtools/source/skeletonmaker/javatypemaker.cxx index 1b6a04a168a5..9f49f66a8785 100644 --- a/unodevtools/source/skeletonmaker/javatypemaker.cxx +++ b/unodevtools/source/skeletonmaker/javatypemaker.cxx @@ -431,11 +431,6 @@ void printMethods(std::ostream & o, << codemaker::convertString(reader.getFieldName(i)).getStr() << "()"; - #if 0 - // DEBUG - sal_uInt16 mc = reader.getMethodCount(); - RTMethodMode mm = reader.getMethodFlags(method); - #endif OUString mn = reader.getMethodName(method); OUString fn = reader.getFieldName(i); |