diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-06-22 18:49:45 +0200 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-06-22 18:49:45 +0200 |
| commit | 25b0e3e84e32b8e9388c2bcf7bab29c58c681910 (patch) | |
| tree | 276c7c0610edcdcf12b7b1086785997c30b1838c | |
| parent | 7498d9b2ae3047b6faab10019f44ce98acbf7a52 (diff) | |
| parent | c71cf20b074e93f01a5093d6ae886eeb14facd23 (diff) | |
Merge branch 'master' into feature/gnumake4
818 files changed, 2434 insertions, 2122 deletions
diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..e9a4130b --- /dev/null +++ b/.gitignore @@ -0,0 +1,17 @@ +# backup and temporary files +*~ +.*.sw[op] +.gitattributes + +# the build directories +/*/unxlng?? +/*/unxlng??.pro +/*/wntmsc??? +/*/wntmsc???.pro +/*/wntgcc? +/*/wntgcc?.pro +/*/unxmac*.pro +/*/unxios? +/*/unxios?.pro +/*/unxand? +/*/unxand?.pro diff --git a/autodoc/inc/ary/actions.hxx b/autodoc/inc/ary/actions.hxx index 78d44232..75b85d5e 100644 --- a/autodoc/inc/ary/actions.hxx +++ b/autodoc/inc/ary/actions.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -101,3 +102,4 @@ Command::Run(n22::RepositoryCenter & io_rReposy) +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/inc/ary/ary.hxx b/autodoc/inc/ary/ary.hxx index 268955ce..0fd9beaa 100644 --- a/autodoc/inc/ary/ary.hxx +++ b/autodoc/inc/ary/ary.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -88,3 +89,5 @@ class Repository } // namespace ary #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/inc/ary/ary_disp.hxx b/autodoc/inc/ary/ary_disp.hxx index cbb36564..89c85489 100644 --- a/autodoc/inc/ary/ary_disp.hxx +++ b/autodoc/inc/ary/ary_disp.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -109,3 +110,5 @@ Display::Get_ReFinder() const } // namespace ary #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/inc/ary/arygroup.hxx b/autodoc/inc/ary/arygroup.hxx index 78ca20e0..4a96b49e 100644 --- a/autodoc/inc/ary/arygroup.hxx +++ b/autodoc/inc/ary/arygroup.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -105,3 +106,5 @@ AryGroup::Create_Slot( SlotAccessId i_nSlot ) const } // namespace ary #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/inc/ary/ceslot.hxx b/autodoc/inc/ary/ceslot.hxx index 8631e308..5557cbb1 100644 --- a/autodoc/inc/ary/ceslot.hxx +++ b/autodoc/inc/ary/ceslot.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -101,3 +102,5 @@ class Slot_AutoPtr } // namespace ary #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/inc/ary/cessentl.hxx b/autodoc/inc/ary/cessentl.hxx index 965f1eff..6e61fc15 100644 --- a/autodoc/inc/ary/cessentl.hxx +++ b/autodoc/inc/ary/cessentl.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -86,3 +87,5 @@ CeEssentials::Location() const } // namespace cpp } // namespace ary #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/inc/ary/cpp/c_builtintype.hxx b/autodoc/inc/ary/cpp/c_builtintype.hxx index 3c00ec79..223aea57 100644 --- a/autodoc/inc/ary/cpp/c_builtintype.hxx +++ b/autodoc/inc/ary/cpp/c_builtintype.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -95,3 +96,5 @@ BuiltInType::SpecializedName() const } // namespace cpp } // namespace ary #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/inc/ary/cpp/c_ce.hxx b/autodoc/inc/ary/cpp/c_ce.hxx index aaa3af48..c351fbfe 100644 --- a/autodoc/inc/ary/cpp/c_ce.hxx +++ b/autodoc/inc/ary/cpp/c_ce.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -101,3 +102,5 @@ CodeEntity::Location() const } // namespace cpp } // namespace ary #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/inc/ary/cpp/c_class.hxx b/autodoc/inc/ary/cpp/c_class.hxx index 638fa262..baf15f1f 100644 --- a/autodoc/inc/ary/cpp/c_class.hxx +++ b/autodoc/inc/ary/cpp/c_class.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -243,3 +244,5 @@ Class::AsNode() } // namespace cpp } // namespace ary #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/inc/ary/cpp/c_cppentity.hxx b/autodoc/inc/ary/cpp/c_cppentity.hxx index 968a7e3d..5f5dc6b6 100644 --- a/autodoc/inc/ary/cpp/c_cppentity.hxx +++ b/autodoc/inc/ary/cpp/c_cppentity.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -89,3 +90,5 @@ CppEntity::Set_Docu(ary::doc::Node & pass_docudata) } // namespace cpp } // namespace ary #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/inc/ary/cpp/c_de.hxx b/autodoc/inc/ary/cpp/c_de.hxx index f6f6cf54..7ae40d72 100644 --- a/autodoc/inc/ary/cpp/c_de.hxx +++ b/autodoc/inc/ary/cpp/c_de.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -102,3 +103,5 @@ DefineEntity::DefinitionText() const } // end namespace cpp } // end namespace ary #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/inc/ary/cpp/c_define.hxx b/autodoc/inc/ary/cpp/c_define.hxx index f6457dc9..28552901 100644 --- a/autodoc/inc/ary/cpp/c_define.hxx +++ b/autodoc/inc/ary/cpp/c_define.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -80,3 +81,5 @@ class Define : public DefineEntity } // namespace cpp } // namespace ary #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/inc/ary/cpp/c_enum.hxx b/autodoc/inc/ary/cpp/c_enum.hxx index d53c7288..22bc9eb1 100644 --- a/autodoc/inc/ary/cpp/c_enum.hxx +++ b/autodoc/inc/ary/cpp/c_enum.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -114,3 +115,5 @@ class Enum : public CodeEntity, } // namespace cpp } // namespace ary #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/inc/ary/cpp/c_enuval.hxx b/autodoc/inc/ary/cpp/c_enuval.hxx index 305fa454..03da4b0c 100644 --- a/autodoc/inc/ary/cpp/c_enuval.hxx +++ b/autodoc/inc/ary/cpp/c_enuval.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -94,3 +95,5 @@ EnumValue::Initialisation() const } // namespace cpp } // namespace ary #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/inc/ary/cpp/c_funct.hxx b/autodoc/inc/ary/cpp/c_funct.hxx index bf24026d..55320a15 100644 --- a/autodoc/inc/ary/cpp/c_funct.hxx +++ b/autodoc/inc/ary/cpp/c_funct.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -147,3 +148,5 @@ Function::ReturnType() const } // namespace cpp } // namespace ary #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/inc/ary/cpp/c_gate.hxx b/autodoc/inc/ary/cpp/c_gate.hxx index c7d8a600..d6b6e593 100644 --- a/autodoc/inc/ary/cpp/c_gate.hxx +++ b/autodoc/inc/ary/cpp/c_gate.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -119,3 +120,5 @@ class Gate } // namespace cpp } // namespace ary #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/inc/ary/cpp/c_macro.hxx b/autodoc/inc/ary/cpp/c_macro.hxx index 34f381b8..73568478 100644 --- a/autodoc/inc/ary/cpp/c_macro.hxx +++ b/autodoc/inc/ary/cpp/c_macro.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -82,3 +83,5 @@ class Macro : public DefineEntity } // namespace cpp } // namespace ary #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/inc/ary/cpp/c_namesp.hxx b/autodoc/inc/ary/cpp/c_namesp.hxx index 352d5583..deade56a 100644 --- a/autodoc/inc/ary/cpp/c_namesp.hxx +++ b/autodoc/inc/ary/cpp/c_namesp.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -192,3 +193,5 @@ Namespace::AsNode() } // namespace cpp } // ary #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/inc/ary/cpp/c_osigna.hxx b/autodoc/inc/ary/cpp/c_osigna.hxx index c429b7aa..717763f2 100644 --- a/autodoc/inc/ary/cpp/c_osigna.hxx +++ b/autodoc/inc/ary/cpp/c_osigna.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -120,3 +121,5 @@ OperationSignature::ConVol() const } // namespace cpp } // namespace ary #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/inc/ary/cpp/c_slntry.hxx b/autodoc/inc/ary/cpp/c_slntry.hxx index a1184f2e..407375bd 100644 --- a/autodoc/inc/ary/cpp/c_slntry.hxx +++ b/autodoc/inc/ary/cpp/c_slntry.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -108,3 +109,5 @@ typedef std::vector< S_TplParam > List_TplParam; } // namespace cpp } // namespace ary #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/inc/ary/cpp/c_traits.hxx b/autodoc/inc/ary/cpp/c_traits.hxx index 2f28391d..80390b15 100644 --- a/autodoc/inc/ary/cpp/c_traits.hxx +++ b/autodoc/inc/ary/cpp/c_traits.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -214,3 +215,5 @@ CeNode_Traits::Search_( const entity_base_type & i_entity, } // namespace cpp } // namespace ary #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/inc/ary/cpp/c_tydef.hxx b/autodoc/inc/ary/cpp/c_tydef.hxx index 5fc5fbac..e9716c62 100644 --- a/autodoc/inc/ary/cpp/c_tydef.hxx +++ b/autodoc/inc/ary/cpp/c_tydef.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -98,3 +99,5 @@ Typedef::DescribingType() const } // namespace cpp } // namespace ary #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/inc/ary/cpp/c_type.hxx b/autodoc/inc/ary/cpp/c_type.hxx index 2df6b642..06f98d79 100644 --- a/autodoc/inc/ary/cpp/c_type.hxx +++ b/autodoc/inc/ary/cpp/c_type.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -131,3 +132,5 @@ Type::Get_Text( StreamStr & o_rPreName, } // namespace cpp } // namespace ary #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/inc/ary/cpp/c_types4cpp.hxx b/autodoc/inc/ary/cpp/c_types4cpp.hxx index 5ea2bdc8..22b14170 100644 --- a/autodoc/inc/ary/cpp/c_types4cpp.hxx +++ b/autodoc/inc/ary/cpp/c_types4cpp.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -132,3 +133,5 @@ typedef Type_id Tid; } // namespace cpp } // namespace ary #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/inc/ary/cpp/c_vari.hxx b/autodoc/inc/ary/cpp/c_vari.hxx index 29fed310..b31f04a1 100644 --- a/autodoc/inc/ary/cpp/c_vari.hxx +++ b/autodoc/inc/ary/cpp/c_vari.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -112,3 +113,5 @@ Variable::Initialisation() const } // namespace cpp } // namespace ary #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/inc/ary/cpp/c_vfflag.hxx b/autodoc/inc/ary/cpp/c_vfflag.hxx index ea8e1d38..b94163d8 100644 --- a/autodoc/inc/ary/cpp/c_vfflag.hxx +++ b/autodoc/inc/ary/cpp/c_vfflag.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -149,3 +150,5 @@ struct S_Parameter } // namespace cpp } // namespace ary #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/inc/ary/cpp/cp_ce.hxx b/autodoc/inc/ary/cpp/cp_ce.hxx index d7432d1d..ce612f0c 100644 --- a/autodoc/inc/ary/cpp/cp_ce.hxx +++ b/autodoc/inc/ary/cpp/cp_ce.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -171,3 +172,5 @@ class CePilot } // namespace cpp } // namespace ary #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/inc/ary/cpp/cp_def.hxx b/autodoc/inc/ary/cpp/cp_def.hxx index ce449a86..64b9b245 100644 --- a/autodoc/inc/ary/cpp/cp_def.hxx +++ b/autodoc/inc/ary/cpp/cp_def.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -97,3 +98,5 @@ class DefPilot } // namespace cpp } // namespace ary #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/inc/ary/cpp/cp_type.hxx b/autodoc/inc/ary/cpp/cp_type.hxx index 61cc87fb..c477b23c 100644 --- a/autodoc/inc/ary/cpp/cp_type.hxx +++ b/autodoc/inc/ary/cpp/cp_type.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -94,3 +95,5 @@ class TypePilot } // namespace cpp } // namespace ary #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/inc/ary/cpp/inpcontx.hxx b/autodoc/inc/ary/cpp/inpcontx.hxx index 05653ec7..7acc88d6 100644 --- a/autodoc/inc/ary/cpp/inpcontx.hxx +++ b/autodoc/inc/ary/cpp/inpcontx.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -214,3 +215,5 @@ InputContext::Owner::CeId() const } // namespace cpp } // namespace ary #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/inc/ary/cpp/namechain.hxx b/autodoc/inc/ary/cpp/namechain.hxx index 493f33e2..d8894bbd 100644 --- a/autodoc/inc/ary/cpp/namechain.hxx +++ b/autodoc/inc/ary/cpp/namechain.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -138,3 +139,5 @@ NameSegment::Name() const } // namespace cpp } // namespace ary #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/inc/ary/cpp/usedtype.hxx b/autodoc/inc/ary/cpp/usedtype.hxx index edc45298..68b1297b 100644 --- a/autodoc/inc/ary/cpp/usedtype.hxx +++ b/autodoc/inc/ary/cpp/usedtype.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -210,3 +211,5 @@ class List_TplParameter } // namespace cpp } // namespace ary #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/inc/ary/doc/d_boolean.hxx b/autodoc/inc/ary/doc/d_boolean.hxx index a2d708c8..00bab2a1 100644 --- a/autodoc/inc/ary/doc/d_boolean.hxx +++ b/autodoc/inc/ary/doc/d_boolean.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -94,3 +95,5 @@ Boolean::Set( bool i_b ) } // namespace doc } // namespace ary #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/inc/ary/doc/d_docu.hxx b/autodoc/inc/ary/doc/d_docu.hxx index 15d69fa3..a5de97b7 100644 --- a/autodoc/inc/ary/doc/d_docu.hxx +++ b/autodoc/inc/ary/doc/d_docu.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -104,3 +105,5 @@ Documentation::Set_Data(ary::doc::Node & i_data) } // namespace doc } // namespace ary #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/inc/ary/doc/d_node.hxx b/autodoc/inc/ary/doc/d_node.hxx index e15f2241..a1d2a28f 100644 --- a/autodoc/inc/ary/doc/d_node.hxx +++ b/autodoc/inc/ary/doc/d_node.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -107,3 +108,5 @@ Node::IsSingle() const } // namespace doc } // namespace ary #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/inc/ary/doc/d_oldcppdocu.hxx b/autodoc/inc/ary/doc/d_oldcppdocu.hxx index b129872c..f3971ede 100644 --- a/autodoc/inc/ary/doc/d_oldcppdocu.hxx +++ b/autodoc/inc/ary/doc/d_oldcppdocu.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -128,3 +129,5 @@ class OldCppDocu : public Node } // namespace doc } // namespace ary #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/inc/ary/doc/d_oldidldocu.hxx b/autodoc/inc/ary/doc/d_oldidldocu.hxx index bfd9e3c3..d99b7612 100644 --- a/autodoc/inc/ary/doc/d_oldidldocu.hxx +++ b/autodoc/inc/ary/doc/d_oldidldocu.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -109,3 +110,5 @@ class OldIdlDocu : public Node } // namespace doc } // namespace ary #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/inc/ary/doc/d_parametrized.hxx b/autodoc/inc/ary/doc/d_parametrized.hxx index 07270766..edb9e004 100644 --- a/autodoc/inc/ary/doc/d_parametrized.hxx +++ b/autodoc/inc/ary/doc/d_parametrized.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -119,3 +120,5 @@ Parametrized<T>::Set_Parameter(const T & i_param) } // namespace doc } // namespace ary #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/inc/ary/doc/d_types4doc.hxx b/autodoc/inc/ary/doc/d_types4doc.hxx index f43818c1..82819717 100644 --- a/autodoc/inc/ary/doc/d_types4doc.hxx +++ b/autodoc/inc/ary/doc/d_types4doc.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -68,3 +69,5 @@ typedef int id; } // namespace doc } // namespace ary #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/inc/ary/doc/ht/dht_interpreter.hxx b/autodoc/inc/ary/doc/ht/dht_interpreter.hxx index 33314eed..bef25888 100644 --- a/autodoc/inc/ary/doc/ht/dht_interpreter.hxx +++ b/autodoc/inc/ary/doc/ht/dht_interpreter.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -74,3 +75,5 @@ Interpreter::Accept( Processor & io_processor, } // namespace doc } // namespace ary #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/inc/ary/entity.hxx b/autodoc/inc/ary/entity.hxx index cae902f9..305704a6 100644 --- a/autodoc/inc/ary/entity.hxx +++ b/autodoc/inc/ary/entity.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -79,3 +80,5 @@ Entity::Set_Id(Rid i_nId) } // namespace ary #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/inc/ary/getncast.hxx b/autodoc/inc/ary/getncast.hxx index 6c6ad22b..bff69469 100644 --- a/autodoc/inc/ary/getncast.hxx +++ b/autodoc/inc/ary/getncast.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -86,3 +87,5 @@ ary_cast( Object * ce) } // namespace ary #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/inc/ary/idl/i_attribute.hxx b/autodoc/inc/ary/idl/i_attribute.hxx index 9776c890..2dd964dc 100644 --- a/autodoc/inc/ary/idl/i_attribute.hxx +++ b/autodoc/inc/ary/idl/i_attribute.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -133,3 +134,5 @@ Attribute::IsBound() const } // namespace idl } // namespace ary #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/inc/ary/idl/i_ce.hxx b/autodoc/inc/ary/idl/i_ce.hxx index fcc8b77d..51d0c02f 100644 --- a/autodoc/inc/ary/idl/i_ce.hxx +++ b/autodoc/inc/ary/idl/i_ce.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -133,3 +134,5 @@ CodeEntity::Set_Docu(DYN ary::doc::Node & pass_data) } // namespace idl } // namespace ary #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/inc/ary/idl/i_ce2s.hxx b/autodoc/inc/ary/idl/i_ce2s.hxx index 3dcc6d3f..efb2711e 100644 --- a/autodoc/inc/ary/idl/i_ce2s.hxx +++ b/autodoc/inc/ary/idl/i_ce2s.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -50,6 +51,7 @@ class Ce_2s { public: // LIFECYCLE + Ce_2s() {} virtual ~Ce_2s(); static DYN Ce_2s * Create_( @@ -93,3 +95,5 @@ class Ce_2s } // namespace idl } // namespace ary #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/inc/ary/idl/i_comrela.hxx b/autodoc/inc/ary/idl/i_comrela.hxx index d6867a0c..47afcc17 100644 --- a/autodoc/inc/ary/idl/i_comrela.hxx +++ b/autodoc/inc/ary/idl/i_comrela.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -78,3 +79,5 @@ class CommentedRelation } // namespace idl } // namespace ary #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/inc/ary/idl/i_constant.hxx b/autodoc/inc/ary/idl/i_constant.hxx index c94a52fe..7622dbf5 100644 --- a/autodoc/inc/ary/idl/i_constant.hxx +++ b/autodoc/inc/ary/idl/i_constant.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -110,3 +111,5 @@ Constant::Value() const } // namespace idl } // namespace ary #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/inc/ary/idl/i_constgroup.hxx b/autodoc/inc/ary/idl/i_constgroup.hxx index 37333950..29c8c821 100644 --- a/autodoc/inc/ary/idl/i_constgroup.hxx +++ b/autodoc/inc/ary/idl/i_constgroup.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -99,3 +100,5 @@ ConstantsGroup::Add_Constant( Ce_id i_nConstant ) } // namespace idl } // namespace ary #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/inc/ary/idl/i_enum.hxx b/autodoc/inc/ary/idl/i_enum.hxx index 64da5772..ce2e5510 100644 --- a/autodoc/inc/ary/idl/i_enum.hxx +++ b/autodoc/inc/ary/idl/i_enum.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -98,3 +99,5 @@ Enum::Add_Value( Ce_id i_nValue ) } // namespace idl } // namespace ary #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/inc/ary/idl/i_enumvalue.hxx b/autodoc/inc/ary/idl/i_enumvalue.hxx index 4dbcb313..5dbdedf4 100644 --- a/autodoc/inc/ary/idl/i_enumvalue.hxx +++ b/autodoc/inc/ary/idl/i_enumvalue.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -101,3 +102,5 @@ EnumValue::Value() const } // namespace idl } // namespace ary #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/inc/ary/idl/i_exception.hxx b/autodoc/inc/ary/idl/i_exception.hxx index d2898028..300d7add 100644 --- a/autodoc/inc/ary/idl/i_exception.hxx +++ b/autodoc/inc/ary/idl/i_exception.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -105,3 +106,5 @@ Exception::Add_Member( Ce_id i_nMember ) } // namespace idl } // namespace ary #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/inc/ary/idl/i_function.hxx b/autodoc/inc/ary/idl/i_function.hxx index acd5a17c..ad5a7474 100644 --- a/autodoc/inc/ary/idl/i_function.hxx +++ b/autodoc/inc/ary/idl/i_function.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -158,3 +159,5 @@ Function::IsOneway() const } // namespace idl } // namespace ary #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/inc/ary/idl/i_gate.hxx b/autodoc/inc/ary/idl/i_gate.hxx index 5ad8cfae..2166de1d 100644 --- a/autodoc/inc/ary/idl/i_gate.hxx +++ b/autodoc/inc/ary/idl/i_gate.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -81,3 +82,5 @@ class Gate } // namespace idl } // namespace ary #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/inc/ary/idl/i_interface.hxx b/autodoc/inc/ary/idl/i_interface.hxx index ccf0ee30..f6f9f064 100644 --- a/autodoc/inc/ary/idl/i_interface.hxx +++ b/autodoc/inc/ary/idl/i_interface.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -125,3 +126,5 @@ Interface::Add_Base( Type_id i_nInterface, } // namespace idl } // namespace ary #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/inc/ary/idl/i_module.hxx b/autodoc/inc/ary/idl/i_module.hxx index 598772ad..47a1d194 100644 --- a/autodoc/inc/ary/idl/i_module.hxx +++ b/autodoc/inc/ary/idl/i_module.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -112,3 +113,5 @@ is_Module( const CodeEntity & i_rCe ) } // namespace idl } // namespace ary #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/inc/ary/idl/i_namelookup.hxx b/autodoc/inc/ary/idl/i_namelookup.hxx index 50b94252..e52b2ba3 100644 --- a/autodoc/inc/ary/idl/i_namelookup.hxx +++ b/autodoc/inc/ary/idl/i_namelookup.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -93,3 +94,5 @@ class NameLookup } // namespace idl } // namespace ary #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/inc/ary/idl/i_param.hxx b/autodoc/inc/ary/idl/i_param.hxx index 71de1f44..3ce69a9c 100644 --- a/autodoc/inc/ary/idl/i_param.hxx +++ b/autodoc/inc/ary/idl/i_param.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -73,3 +74,5 @@ class Parameter } // namespace idl } // namespace ary #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/inc/ary/idl/i_property.hxx b/autodoc/inc/ary/idl/i_property.hxx index 71555423..5767249a 100644 --- a/autodoc/inc/ary/idl/i_property.hxx +++ b/autodoc/inc/ary/idl/i_property.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -141,3 +142,5 @@ Property::Type() const } // namespace idl } // namespace ary #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/inc/ary/idl/i_service.hxx b/autodoc/inc/ary/idl/i_service.hxx index 04ad745e..0e1574e5 100644 --- a/autodoc/inc/ary/idl/i_service.hxx +++ b/autodoc/inc/ary/idl/i_service.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -137,3 +138,5 @@ Service::AddRef_SupportedInterface( Type_id i_nInterface, } // namespace idl } // namespace ary #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/inc/ary/idl/i_singleton.hxx b/autodoc/inc/ary/idl/i_singleton.hxx index c7e6b029..617fb1e7 100644 --- a/autodoc/inc/ary/idl/i_singleton.hxx +++ b/autodoc/inc/ary/idl/i_singleton.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -103,3 +104,5 @@ Singleton::Set_Service( Type_id i_nService ) } // namespace idl } // namespace ary #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/inc/ary/idl/i_siservice.hxx b/autodoc/inc/ary/idl/i_siservice.hxx index 73fdb28e..2729e87a 100644 --- a/autodoc/inc/ary/idl/i_siservice.hxx +++ b/autodoc/inc/ary/idl/i_siservice.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -105,3 +106,5 @@ SglIfcService::Add_Constructor( Ce_id i_nId ) } // namespace idl } // namespace ary #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/inc/ary/idl/i_sisingleton.hxx b/autodoc/inc/ary/idl/i_sisingleton.hxx index 6360aed8..5e1d7ced 100644 --- a/autodoc/inc/ary/idl/i_sisingleton.hxx +++ b/autodoc/inc/ary/idl/i_sisingleton.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -98,3 +99,5 @@ SglIfcSingleton::BaseInterface() const } // namespace idl } // namespace ary #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/inc/ary/idl/i_struct.hxx b/autodoc/inc/ary/idl/i_struct.hxx index d7cd86b3..d713a3c5 100644 --- a/autodoc/inc/ary/idl/i_struct.hxx +++ b/autodoc/inc/ary/idl/i_struct.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -128,3 +129,5 @@ Struct::Add_Member( Ce_id i_nMember ) } // namespace idl } // namespace ary #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/inc/ary/idl/i_structelem.hxx b/autodoc/inc/ary/idl/i_structelem.hxx index cc230f67..d992f6b7 100644 --- a/autodoc/inc/ary/idl/i_structelem.hxx +++ b/autodoc/inc/ary/idl/i_structelem.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -101,3 +102,5 @@ StructElement::Type() const } // namespace idl } // namespace ary #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/inc/ary/idl/i_traits.hxx b/autodoc/inc/ary/idl/i_traits.hxx index 86aaae3c..285fe711 100644 --- a/autodoc/inc/ary/idl/i_traits.hxx +++ b/autodoc/inc/ary/idl/i_traits.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -76,3 +77,5 @@ struct Ce_Compare : public Ce_Traits } // namespace idl } // namespace ary #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/inc/ary/idl/i_type.hxx b/autodoc/inc/ary/idl/i_type.hxx index a1f2ee75..be2e6181 100644 --- a/autodoc/inc/ary/idl/i_type.hxx +++ b/autodoc/inc/ary/idl/i_type.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -57,7 +58,7 @@ class Type_2s /** Base of all IDL types. - Type represents the occurence of a type as base, + Type represents the occurrence of a type as base, parameter, return type or element type in UNO IDL code. Some of them relate to a ->CodeEntity, but the ->Type "MyInterface" is something different than @@ -140,3 +141,5 @@ Type::FirstEnclosedNonSequenceType(const Gate & i_rGate) const } // namespace idl } // namespace ary #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/inc/ary/idl/i_typedef.hxx b/autodoc/inc/ary/idl/i_typedef.hxx index fff5205f..1ebf900e 100644 --- a/autodoc/inc/ary/idl/i_typedef.hxx +++ b/autodoc/inc/ary/idl/i_typedef.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -88,3 +89,5 @@ class Typedef : public CodeEntity } // namespace idl } // namespace ary #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/inc/ary/idl/i_types4idl.hxx b/autodoc/inc/ary/idl/i_types4idl.hxx index 6e6ac824..b77b3154 100644 --- a/autodoc/inc/ary/idl/i_types4idl.hxx +++ b/autodoc/inc/ary/idl/i_types4idl.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -140,3 +141,5 @@ namespace alphabetical_index } // namespace idl } // namespace ary #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/inc/ary/idl/ik_attribute.hxx b/autodoc/inc/ary/idl/ik_attribute.hxx index 86f05850..491217a0 100644 --- a/autodoc/inc/ary/idl/ik_attribute.hxx +++ b/autodoc/inc/ary/idl/ik_attribute.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -83,3 +84,5 @@ struct doc : public ifc_ce::doc #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/inc/ary/idl/ik_ce.hxx b/autodoc/inc/ary/idl/ik_ce.hxx index 5bdd2b07..b89be43a 100644 --- a/autodoc/inc/ary/idl/ik_ce.hxx +++ b/autodoc/inc/ary/idl/ik_ce.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -144,3 +145,4 @@ struct doc #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/inc/ary/idl/ik_constant.hxx b/autodoc/inc/ary/idl/ik_constant.hxx index f0e3306a..c2c101ad 100644 --- a/autodoc/inc/ary/idl/ik_constant.hxx +++ b/autodoc/inc/ary/idl/ik_constant.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -74,3 +75,4 @@ struct doc : public ifc_ce::doc #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/inc/ary/idl/ik_constgroup.hxx b/autodoc/inc/ary/idl/ik_constgroup.hxx index 4d390a89..e8b793da 100644 --- a/autodoc/inc/ary/idl/ik_constgroup.hxx +++ b/autodoc/inc/ary/idl/ik_constgroup.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -71,3 +72,4 @@ struct doc : public ifc_ce::doc #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/inc/ary/idl/ik_enum.hxx b/autodoc/inc/ary/idl/ik_enum.hxx index fac69eec..9396d2a4 100644 --- a/autodoc/inc/ary/idl/ik_enum.hxx +++ b/autodoc/inc/ary/idl/ik_enum.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -83,3 +84,4 @@ struct doc : public ifc_ce::doc #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/inc/ary/idl/ik_enumvalue.hxx b/autodoc/inc/ary/idl/ik_enumvalue.hxx index 13060531..a40f4f62 100644 --- a/autodoc/inc/ary/idl/ik_enumvalue.hxx +++ b/autodoc/inc/ary/idl/ik_enumvalue.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -71,3 +72,5 @@ struct doc : public ifc_ce::doc #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/inc/ary/idl/ik_exception.hxx b/autodoc/inc/ary/idl/ik_exception.hxx index 27c609b6..b4402f4d 100644 --- a/autodoc/inc/ary/idl/ik_exception.hxx +++ b/autodoc/inc/ary/idl/ik_exception.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -80,3 +81,4 @@ struct doc : public ifc_ce::doc #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/inc/ary/idl/ik_function.hxx b/autodoc/inc/ary/idl/ik_function.hxx index 239c4d82..00ab8bd7 100644 --- a/autodoc/inc/ary/idl/ik_function.hxx +++ b/autodoc/inc/ary/idl/ik_function.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -94,3 +95,4 @@ struct doc : public ifc_ce::doc #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/inc/ary/idl/ik_interface.hxx b/autodoc/inc/ary/idl/ik_interface.hxx index 1707be0a..d1bbab97 100644 --- a/autodoc/inc/ary/idl/ik_interface.hxx +++ b/autodoc/inc/ary/idl/ik_interface.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -86,18 +87,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 @@ -110,3 +99,5 @@ struct doc : public ifc_ce::doc } // namespace ary #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/inc/ary/idl/ik_module.hxx b/autodoc/inc/ary/idl/ik_module.hxx index 0eb263ba..172a4e7c 100644 --- a/autodoc/inc/ary/idl/ik_module.hxx +++ b/autodoc/inc/ary/idl/ik_module.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -112,3 +113,5 @@ struct doc : public ifc_ce::doc #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/inc/ary/idl/ik_property.hxx b/autodoc/inc/ary/idl/ik_property.hxx index 941df99c..d8e7a5a8 100644 --- a/autodoc/inc/ary/idl/ik_property.hxx +++ b/autodoc/inc/ary/idl/ik_property.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -87,3 +88,5 @@ struct doc : public ifc_ce::doc #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/inc/ary/idl/ik_service.hxx b/autodoc/inc/ary/idl/ik_service.hxx index 8614e0e6..f5e5264a 100644 --- a/autodoc/inc/ary/idl/ik_service.hxx +++ b/autodoc/inc/ary/idl/ik_service.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -86,3 +87,5 @@ struct doc : public ifc_ce::doc #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/inc/ary/idl/ik_singleton.hxx b/autodoc/inc/ary/idl/ik_singleton.hxx index b0c32e5d..a0c52008 100644 --- a/autodoc/inc/ary/idl/ik_singleton.hxx +++ b/autodoc/inc/ary/idl/ik_singleton.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -71,3 +72,5 @@ struct doc : public ifc_ce::doc #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/inc/ary/idl/ik_siservice.hxx b/autodoc/inc/ary/idl/ik_siservice.hxx index 4b43843a..01412044 100644 --- a/autodoc/inc/ary/idl/ik_siservice.hxx +++ b/autodoc/inc/ary/idl/ik_siservice.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -73,3 +74,5 @@ struct doc : public ifc_ce::doc #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/inc/ary/idl/ik_sisingleton.hxx b/autodoc/inc/ary/idl/ik_sisingleton.hxx index a5c4efdf..dbde2eea 100644 --- a/autodoc/inc/ary/idl/ik_sisingleton.hxx +++ b/autodoc/inc/ary/idl/ik_sisingleton.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -71,3 +72,5 @@ struct doc : public ifc_ce::doc #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/inc/ary/idl/ik_struct.hxx b/autodoc/inc/ary/idl/ik_struct.hxx index fbdeb751..2e42d1f7 100644 --- a/autodoc/inc/ary/idl/ik_struct.hxx +++ b/autodoc/inc/ary/idl/ik_struct.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -89,3 +90,4 @@ struct doc : public ifc_ce::doc #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/inc/ary/idl/ik_structelem.hxx b/autodoc/inc/ary/idl/ik_structelem.hxx index e6f9b974..631d5c6e 100644 --- a/autodoc/inc/ary/idl/ik_structelem.hxx +++ b/autodoc/inc/ary/idl/ik_structelem.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -70,3 +71,5 @@ struct doc : public ifc_ce::doc #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/inc/ary/idl/ik_typedef.hxx b/autodoc/inc/ary/idl/ik_typedef.hxx index 68648651..ddccd46d 100644 --- a/autodoc/inc/ary/idl/ik_typedef.hxx +++ b/autodoc/inc/ary/idl/ik_typedef.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -81,3 +82,5 @@ struct doc : public ifc_ce::doc #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/inc/ary/idl/ip_ce.hxx b/autodoc/inc/ary/idl/ip_ce.hxx index cdaed018..20698ec4 100644 --- a/autodoc/inc/ary/idl/ip_ce.hxx +++ b/autodoc/inc/ary/idl/ip_ce.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -208,3 +209,5 @@ class CePilot } // namespace idl } // namespace ary #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/inc/ary/idl/ip_type.hxx b/autodoc/inc/ary/idl/ip_type.hxx index bfc04fef..b3839b3a 100644 --- a/autodoc/inc/ary/idl/ip_type.hxx +++ b/autodoc/inc/ary/idl/ip_type.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -81,3 +82,5 @@ class TypePilot } // namespace idl } // namespace ary #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/inc/ary/info/all_dts.hxx b/autodoc/inc/ary/info/all_dts.hxx index 7f79dc57..b92e4951 100644 --- a/autodoc/inc/ary/info/all_dts.hxx +++ b/autodoc/inc/ary/info/all_dts.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -158,3 +159,4 @@ DocuToken::IsWhite() const #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/inc/ary/info/all_tags.hxx b/autodoc/inc/ary/info/all_tags.hxx index 0d55d411..5dfd69d9 100644 --- a/autodoc/inc/ary/info/all_tags.hxx +++ b/autodoc/inc/ary/info/all_tags.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -287,3 +288,4 @@ class SinceTag : public AtTag #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/inc/ary/info/ci_attag.hxx b/autodoc/inc/ary/info/ci_attag.hxx index 2dfb0ac6..39d037c2 100644 --- a/autodoc/inc/ary/info/ci_attag.hxx +++ b/autodoc/inc/ary/info/ci_attag.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -99,3 +100,4 @@ AtTag::CText() const #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/inc/ary/info/ci_text.hxx b/autodoc/inc/ary/info/ci_text.hxx index d15b6006..8aae466e 100644 --- a/autodoc/inc/ary/info/ci_text.hxx +++ b/autodoc/inc/ary/info/ci_text.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -83,3 +84,4 @@ class DocuText #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/inc/ary/info/docstore.hxx b/autodoc/inc/ary/info/docstore.hxx index 1b070ec7..92c4c85c 100644 --- a/autodoc/inc/ary/info/docstore.hxx +++ b/autodoc/inc/ary/info/docstore.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -114,3 +115,5 @@ DocuStore::Store2GlobalTexts( DYN doc::Node & let_drDocu, } // namespace info } // namespace ary #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/inc/ary/info/infodisp.hxx b/autodoc/inc/ary/info/infodisp.hxx index 88cdf933..1716928a 100644 --- a/autodoc/inc/ary/info/infodisp.hxx +++ b/autodoc/inc/ary/info/infodisp.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -112,3 +113,5 @@ class DocuDisplay } } #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/inc/ary/info/inftypes.hxx b/autodoc/inc/ary/info/inftypes.hxx index b4a6f8d8..ecbcbc04 100644 --- a/autodoc/inc/ary/info/inftypes.hxx +++ b/autodoc/inc/ary/info/inftypes.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -120,3 +121,4 @@ enum E_AtTagClass #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/inc/ary/itrange.hxx b/autodoc/inc/ary/itrange.hxx index 9907b896..a213f93e 100644 --- a/autodoc/inc/ary/itrange.hxx +++ b/autodoc/inc/ary/itrange.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -78,3 +79,5 @@ class IteratorRange } // namespace ary #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/inc/ary/loc/loc_dir.hxx b/autodoc/inc/ary/loc/loc_dir.hxx index 0f2f85ad..e2446672 100644 --- a/autodoc/inc/ary/loc/loc_dir.hxx +++ b/autodoc/inc/ary/loc/loc_dir.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -143,3 +144,5 @@ Directory::AsNode() } // namespace loc } // namespace ary #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/inc/ary/loc/loc_file.hxx b/autodoc/inc/ary/loc/loc_file.hxx index fa2cff55..99f2f11d 100644 --- a/autodoc/inc/ary/loc/loc_file.hxx +++ b/autodoc/inc/ary/loc/loc_file.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -66,3 +67,5 @@ class File : public FileBase } // namespace loc } // namespace ary #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/inc/ary/loc/loc_filebase.hxx b/autodoc/inc/ary/loc/loc_filebase.hxx index ec7c25bb..fabdc33e 100644 --- a/autodoc/inc/ary/loc/loc_filebase.hxx +++ b/autodoc/inc/ary/loc/loc_filebase.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -70,3 +71,5 @@ class FileBase : public LocationEntity } // namespace loc } // namespace ary #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/inc/ary/loc/loc_le.hxx b/autodoc/inc/ary/loc/loc_le.hxx index 7432a920..b8c7041c 100644 --- a/autodoc/inc/ary/loc/loc_le.hxx +++ b/autodoc/inc/ary/loc/loc_le.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -92,3 +93,5 @@ LocationEntity::ParentDirectory() const } // namespace loc } // namespace ary #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/inc/ary/loc/loc_root.hxx b/autodoc/inc/ary/loc/loc_root.hxx index 9a894298..9dbbb8ec 100644 --- a/autodoc/inc/ary/loc/loc_root.hxx +++ b/autodoc/inc/ary/loc/loc_root.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -108,3 +109,5 @@ Root::MyDir() const } // namespace loc } // namespace ary #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/inc/ary/loc/loc_traits.hxx b/autodoc/inc/ary/loc/loc_traits.hxx index e8b3caa0..2409209a 100644 --- a/autodoc/inc/ary/loc/loc_traits.hxx +++ b/autodoc/inc/ary/loc/loc_traits.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -113,3 +114,5 @@ struct Le_Compare : public Le_Traits } // namespace loc } // namespace ary #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/inc/ary/loc/loc_types4loc.hxx b/autodoc/inc/ary/loc/loc_types4loc.hxx index b8bb89a0..5717049a 100644 --- a/autodoc/inc/ary/loc/loc_types4loc.hxx +++ b/autodoc/inc/ary/loc/loc_types4loc.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -52,3 +53,5 @@ typedef ::ary::TypedId<LocationEntity> Le_id; } // namespace loc } // namespace ary #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/inc/ary/loc/locp_le.hxx b/autodoc/inc/ary/loc/locp_le.hxx index d11cda69..cfdb4f88 100644 --- a/autodoc/inc/ary/loc/locp_le.hxx +++ b/autodoc/inc/ary/loc/locp_le.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -86,3 +87,5 @@ class LocationPilot } // namespace loc } // namespace ary #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/inc/ary/namesort.hxx b/autodoc/inc/ary/namesort.hxx index a5b374fb..06f02693 100644 --- a/autodoc/inc/ary/namesort.hxx +++ b/autodoc/inc/ary/namesort.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -73,3 +74,5 @@ LesserName::operator()( const String & i_s1, } // namespace ary #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/inc/ary/object.hxx b/autodoc/inc/ary/object.hxx index 735c22bf..0e20d63e 100644 --- a/autodoc/inc/ary/object.hxx +++ b/autodoc/inc/ary/object.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -68,3 +69,5 @@ Object::AryClass() const } // namespace ary #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/inc/ary/qualiname.hxx b/autodoc/inc/ary/qualiname.hxx index 182cc52b..9001984c 100644 --- a/autodoc/inc/ary/qualiname.hxx +++ b/autodoc/inc/ary/qualiname.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -101,3 +102,5 @@ class QualifiedName } // namespace ary #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/inc/ary/sequentialids.hxx b/autodoc/inc/ary/sequentialids.hxx index d24627dc..26dbae47 100644 --- a/autodoc/inc/ary/sequentialids.hxx +++ b/autodoc/inc/ary/sequentialids.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -151,3 +152,5 @@ SequentialIds<ID>::Search(IDENTIFY i_find) const } // namespace ary #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/inc/ary/stdconstiter.hxx b/autodoc/inc/ary/stdconstiter.hxx index d6841499..a3883021 100644 --- a/autodoc/inc/ary/stdconstiter.hxx +++ b/autodoc/inc/ary/stdconstiter.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -96,3 +97,5 @@ class Dyn_StdConstIterator } // namespace ary #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/inc/ary/symtreenode.hxx b/autodoc/inc/ary/symtreenode.hxx index 5840706e..8966a8d1 100644 --- a/autodoc/inc/ary/symtreenode.hxx +++ b/autodoc/inc/ary/symtreenode.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -342,3 +343,5 @@ Node<NODE_TRAITS>::InitDepth() } // namespace symtree } // namespace ary #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/inc/ary/types.hxx b/autodoc/inc/ary/types.hxx index f7c79d32..d7a6a2d7 100644 --- a/autodoc/inc/ary/types.hxx +++ b/autodoc/inc/ary/types.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -128,3 +129,5 @@ class TypedId } // namespace ary #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/inc/ary/udmhost.hxx b/autodoc/inc/ary/udmhost.hxx index 04a7d54d..9e179172 100644 --- a/autodoc/inc/ary/udmhost.hxx +++ b/autodoc/inc/ary/udmhost.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -60,3 +61,5 @@ class UdmHost : public Host } // namespace ary #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/inc/ary_i/ci_atag2.hxx b/autodoc/inc/ary_i/ci_atag2.hxx index da0d1fdf..d1e91418 100644 --- a/autodoc/inc/ary_i/ci_atag2.hxx +++ b/autodoc/inc/ary_i/ci_atag2.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -77,3 +78,4 @@ class AtTag2 #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/inc/ary_i/ci_text2.hxx b/autodoc/inc/ary_i/ci_text2.hxx index e4a33fa3..912ce9aa 100644 --- a/autodoc/inc/ary_i/ci_text2.hxx +++ b/autodoc/inc/ary_i/ci_text2.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -90,3 +91,4 @@ class DocuTex2 #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/inc/ary_i/d_token.hxx b/autodoc/inc/ary_i/d_token.hxx index 0ffb60ba..aa0d3fef 100644 --- a/autodoc/inc/ary_i/d_token.hxx +++ b/autodoc/inc/ary_i/d_token.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -280,3 +281,4 @@ class DT_SinceAtTag : public DT_AtTag #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/inc/ary_i/disdocum.hxx b/autodoc/inc/ary_i/disdocum.hxx index 5b8c7a1f..f5ea9625 100644 --- a/autodoc/inc/ary_i/disdocum.hxx +++ b/autodoc/inc/ary_i/disdocum.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -144,3 +145,4 @@ class DocuText_Display : public DocumentationDisplay #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/inc/autodoc/displaying.hxx b/autodoc/inc/autodoc/displaying.hxx index 80cd0bc8..2e629b29 100644 --- a/autodoc/inc/autodoc/displaying.hxx +++ b/autodoc/inc/autodoc/displaying.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -74,3 +75,4 @@ class DisplayToolsFactory_Ifc #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/inc/autodoc/dsp_html_std.hxx b/autodoc/inc/autodoc/dsp_html_std.hxx index 6ce4a42c..76f7f899 100644 --- a/autodoc/inc/autodoc/dsp_html_std.hxx +++ b/autodoc/inc/autodoc/dsp_html_std.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -211,3 +212,5 @@ HtmlDisplay_Idl_Ifc::Run( const char * i_sOutputDirectory, } // namespace autodoc #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/inc/autodoc/dsp_txt_flist.hxx b/autodoc/inc/autodoc/dsp_txt_flist.hxx index 1a751ae4..6563cda9 100644 --- a/autodoc/inc/autodoc/dsp_txt_flist.hxx +++ b/autodoc/inc/autodoc/dsp_txt_flist.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -63,3 +64,4 @@ class TextDisplay_FunctionList_Ifc #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/inc/autodoc/filecoli.hxx b/autodoc/inc/autodoc/filecoli.hxx index c70bbc4f..d9e0f36d 100644 --- a/autodoc/inc/autodoc/filecoli.hxx +++ b/autodoc/inc/autodoc/filecoli.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -70,3 +71,4 @@ class FileCollector_Ifc #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/inc/autodoc/parsing.hxx b/autodoc/inc/autodoc/parsing.hxx index 06aec4ce..ad30c93d 100644 --- a/autodoc/inc/autodoc/parsing.hxx +++ b/autodoc/inc/autodoc/parsing.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -76,3 +77,4 @@ class ParseToolsFactory_Ifc #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/inc/autodoc/prs_code.hxx b/autodoc/inc/autodoc/prs_code.hxx index ff6c59b6..d02ce373 100644 --- a/autodoc/inc/autodoc/prs_code.hxx +++ b/autodoc/inc/autodoc/prs_code.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -74,3 +75,5 @@ class CodeParser_Ifc } // namespace autodoc #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/inc/autodoc/prs_docu.hxx b/autodoc/inc/autodoc/prs_docu.hxx index 6b9205b9..5e60023c 100644 --- a/autodoc/inc/autodoc/prs_docu.hxx +++ b/autodoc/inc/autodoc/prs_docu.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -57,3 +58,4 @@ class DocumentationParser_Ifc #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/inc/autodoc/x_parsing.hxx b/autodoc/inc/autodoc/x_parsing.hxx index 044915f0..f7973095 100644 --- a/autodoc/inc/autodoc/x_parsing.hxx +++ b/autodoc/inc/autodoc/x_parsing.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -71,3 +72,5 @@ std::ostream & operator<<( #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/inc/display/corframe.hxx b/autodoc/inc/display/corframe.hxx index b72de829..9945e2d5 100644 --- a/autodoc/inc/display/corframe.hxx +++ b/autodoc/inc/display/corframe.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -80,3 +81,4 @@ class CorporateFrame #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/inc/parser/parser.hxx b/autodoc/inc/parser/parser.hxx index a6a54fac..a10e79d6 100644 --- a/autodoc/inc/parser/parser.hxx +++ b/autodoc/inc/parser/parser.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -55,3 +56,4 @@ class CodeParser #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/inc/parser/parserinfo.hxx b/autodoc/inc/parser/parserinfo.hxx index d00f9376..44b5941f 100644 --- a/autodoc/inc/parser/parserinfo.hxx +++ b/autodoc/inc/parser/parserinfo.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -62,3 +63,5 @@ class ParserInfo }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/inc/parser/unoidl.hxx b/autodoc/inc/parser/unoidl.hxx index 3ffa23cd..3a5d7fcb 100644 --- a/autodoc/inc/parser/unoidl.hxx +++ b/autodoc/inc/parser/unoidl.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -77,3 +78,4 @@ class IdlParser : public ::CodeParser, #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/prj/d.lst b/autodoc/prj/d.lst index c73e559f..99ad21da 100644 --- a/autodoc/prj/d.lst +++ b/autodoc/prj/d.lst @@ -1,3 +1,3 @@ -..\%__SRC%\bin\autodoc.exe %_DEST%\bin%_EXT%\autodoc.exe -..\%__SRC%\bin\autodoc %_DEST%\bin%_EXT%\autodoc +..\%__SRC%\bin\autodoc.exe %_DEST%\bin\autodoc.exe +..\%__SRC%\bin\autodoc %_DEST%\bin\autodoc diff --git a/autodoc/source/ary/cpp/c_builtintype.cxx b/autodoc/source/ary/cpp/c_builtintype.cxx index 316004fe..54ed015d 100644 --- a/autodoc/source/ary/cpp/c_builtintype.cxx +++ b/autodoc/source/ary/cpp/c_builtintype.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -125,3 +126,5 @@ BuiltInType::inq_Get_Text( StreamStr & , // o_rPreName } // namespace cpp } // namespace ary + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/ary/cpp/c_class.cxx b/autodoc/source/ary/cpp/c_class.cxx index 9466ddfc..78c9cc5c 100644 --- a/autodoc/source/ary/cpp/c_class.cxx +++ b/autodoc/source/ary/cpp/c_class.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -282,3 +283,5 @@ Class::PosOfName( const List_LocalCe & i_rList, } // namespace cpp } // namespace ary + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/ary/cpp/c_de.cxx b/autodoc/source/ary/cpp/c_de.cxx index 8ecf36ca..1d9e9d7b 100644 --- a/autodoc/source/ary/cpp/c_de.cxx +++ b/autodoc/source/ary/cpp/c_de.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -49,3 +50,5 @@ DefineEntity::DefineEntity( const String & i_name, } // end namespace cpp } // end namespace ary + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/ary/cpp/c_define.cxx b/autodoc/source/ary/cpp/c_define.cxx index 7f002eb9..33f3bdbb 100644 --- a/autodoc/source/ary/cpp/c_define.cxx +++ b/autodoc/source/ary/cpp/c_define.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -74,3 +75,5 @@ Define::inq_DefinitionText() const } // namespace cpp } // namespace ary + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/ary/cpp/c_enum.cxx b/autodoc/source/ary/cpp/c_enum.cxx index b4e64c9b..5e2983fe 100644 --- a/autodoc/source/ary/cpp/c_enum.cxx +++ b/autodoc/source/ary/cpp/c_enum.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -132,3 +133,5 @@ Enum::inq_Create_Slot( SlotAccessId i_nSlot ) const } // namespace cpp } // namespace ary + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/ary/cpp/c_enuval.cxx b/autodoc/source/ary/cpp/c_enuval.cxx index 2b74358b..66017f23 100644 --- a/autodoc/source/ary/cpp/c_enuval.cxx +++ b/autodoc/source/ary/cpp/c_enuval.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -85,3 +86,5 @@ EnumValue::get_AryClass() const } // namespace cpp } // namespace ary + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/ary/cpp/c_funct.cxx b/autodoc/source/ary/cpp/c_funct.cxx index 1cffc222..73bb4fc2 100644 --- a/autodoc/source/ary/cpp/c_funct.cxx +++ b/autodoc/source/ary/cpp/c_funct.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -245,3 +246,5 @@ Create_ParameterTypeList( const std::vector<S_Parameter> & i_rParameters ) } // namespace anonymous + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/ary/cpp/c_macro.cxx b/autodoc/source/ary/cpp/c_macro.cxx index fc319920..febe4bd7 100644 --- a/autodoc/source/ary/cpp/c_macro.cxx +++ b/autodoc/source/ary/cpp/c_macro.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -76,3 +77,5 @@ Macro::inq_DefinitionText() const } // namespace cpp } // namespace ary + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/ary/cpp/c_namesp.cxx b/autodoc/source/ary/cpp/c_namesp.cxx index 71868d32..adea5dad 100644 --- a/autodoc/source/ary/cpp/c_namesp.cxx +++ b/autodoc/source/ary/cpp/c_namesp.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -206,8 +207,6 @@ Namespace::Search_LocalOperations( std::vector<Ce_id> & o_result, if ( (*itLower).first != i_sName ) return; - operations_citer - itEnd = aLocalOperations.end(); for ( operations_citer it = itLower; it != aLocalOperations.end() ? (*itLower).first == i_sName : false; ++it ) @@ -292,3 +291,5 @@ Namespace::inq_Create_Slot( SlotAccessId i_nSlot ) const } // namespace cpp } // namespace ary + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/ary/cpp/c_osigna.cxx b/autodoc/source/ary/cpp/c_osigna.cxx index 7fb581ef..ebb5d6a3 100644 --- a/autodoc/source/ary/cpp/c_osigna.cxx +++ b/autodoc/source/ary/cpp/c_osigna.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -74,3 +75,5 @@ OperationSignature::Compare( const OperationSignature & i_rSig ) const } // namespace cpp } // namespace ary + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/ary/cpp/c_reposypart.cxx b/autodoc/source/ary/cpp/c_reposypart.cxx index 1e1406ae..f0e989d7 100644 --- a/autodoc/source/ary/cpp/c_reposypart.cxx +++ b/autodoc/source/ary/cpp/c_reposypart.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -521,3 +522,5 @@ LesserGlobal::NameOf(GlobalId i_id) const } // namespace anonymous + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/ary/cpp/c_reposypart.hxx b/autodoc/source/ary/cpp/c_reposypart.hxx index e231b68b..02d93ccc 100644 --- a/autodoc/source/ary/cpp/c_reposypart.hxx +++ b/autodoc/source/ary/cpp/c_reposypart.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -112,3 +113,5 @@ class RepositoryPartition : public InternalGate } // namespace cpp } // namespace ary #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/ary/cpp/c_slots.cxx b/autodoc/source/ary/cpp/c_slots.cxx index 584e0fe0..2269a56f 100644 --- a/autodoc/source/ary/cpp/c_slots.cxx +++ b/autodoc/source/ary/cpp/c_slots.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -104,3 +105,5 @@ Slot_BaseClass::StoreEntries( ary::Display & o_rDestination ) const } // namespace cpp } // namespace ary + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/ary/cpp/c_slots.hxx b/autodoc/source/ary/cpp/c_slots.hxx index 3f575ec5..5bc13639 100644 --- a/autodoc/source/ary/cpp/c_slots.hxx +++ b/autodoc/source/ary/cpp/c_slots.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -82,3 +83,5 @@ class Slot_BaseClass : public ary::Slot } // namespace cpp } // namespace ary #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/ary/cpp/c_traits.cxx b/autodoc/source/ary/cpp/c_traits.cxx index 36829118..b07a69dd 100644 --- a/autodoc/source/ary/cpp/c_traits.cxx +++ b/autodoc/source/ary/cpp/c_traits.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -221,3 +222,5 @@ UsedType_Compare::Lesser_( const key_type & i_1, } // namespace cpp } // namespace ary + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/ary/cpp/c_tydef.cxx b/autodoc/source/ary/cpp/c_tydef.cxx index adbcd786..f49dcfa9 100644 --- a/autodoc/source/ary/cpp/c_tydef.cxx +++ b/autodoc/source/ary/cpp/c_tydef.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -92,3 +93,5 @@ Typedef::get_AryClass() const } // namespace cpp } // namespace ary + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/ary/cpp/c_vari.cxx b/autodoc/source/ary/cpp/c_vari.cxx index d8b7c699..736baed2 100644 --- a/autodoc/source/ary/cpp/c_vari.cxx +++ b/autodoc/source/ary/cpp/c_vari.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -94,3 +95,5 @@ Variable::get_AryClass() const } // namespace cpp } // namespace ary + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/ary/cpp/ca_ce.cxx b/autodoc/source/ary/cpp/ca_ce.cxx index 6b94dc54..9fdbdd56 100644 --- a/autodoc/source/ary/cpp/ca_ce.cxx +++ b/autodoc/source/ary/cpp/ca_ce.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -620,3 +621,5 @@ Get_NewAnonymousName(char i_cStart) } // namespace anonymous + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/ary/cpp/ca_ce.hxx b/autodoc/source/ary/cpp/ca_ce.hxx index ed5b88c4..dc8b9a08 100644 --- a/autodoc/source/ary/cpp/ca_ce.hxx +++ b/autodoc/source/ary/cpp/ca_ce.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -211,3 +212,5 @@ CeAdmin::Storage() } // namespace cpp } // namespace ary #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/ary/cpp/ca_def.cxx b/autodoc/source/ary/cpp/ca_def.cxx index 6ccf0a32..297a8066 100644 --- a/autodoc/source/ary/cpp/ca_def.cxx +++ b/autodoc/source/ary/cpp/ca_def.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -109,3 +110,5 @@ DefAdmin::AllMacros() const } // namespace cpp } // namespace ary + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/ary/cpp/ca_def.hxx b/autodoc/source/ary/cpp/ca_def.hxx index af2a8812..ba1a1f66 100644 --- a/autodoc/source/ary/cpp/ca_def.hxx +++ b/autodoc/source/ary/cpp/ca_def.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -113,3 +114,5 @@ DefAdmin::Storage() const } // namespace cpp } // namespace ary #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/ary/cpp/ca_type.cxx b/autodoc/source/ary/cpp/ca_type.cxx index 40c556f3..f9efc793 100644 --- a/autodoc/source/ary/cpp/ca_type.cxx +++ b/autodoc/source/ary/cpp/ca_type.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -134,3 +135,5 @@ TypeAdmin::Tid_Ellipse() const } // namespace cpp } // namespace ary + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/ary/cpp/ca_type.hxx b/autodoc/source/ary/cpp/ca_type.hxx index 5432c82e..9758248b 100644 --- a/autodoc/source/ary/cpp/ca_type.hxx +++ b/autodoc/source/ary/cpp/ca_type.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -125,3 +126,5 @@ TypeAdmin::Storage() } // namespace cpp } // namespace ary #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/ary/cpp/cs_ce.cxx b/autodoc/source/ary/cpp/cs_ce.cxx index cf53f408..9375df4d 100644 --- a/autodoc/source/ary/cpp/cs_ce.cxx +++ b/autodoc/source/ary/cpp/cs_ce.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -102,3 +103,5 @@ Ce_Storage::Store_Datum(DYN CodeEntity & pass_ce) } // namespace cpp } // namespace ary + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/ary/cpp/cs_ce.hxx b/autodoc/source/ary/cpp/cs_ce.hxx index b8890521..5b8e15a4 100644 --- a/autodoc/source/ary/cpp/cs_ce.hxx +++ b/autodoc/source/ary/cpp/cs_ce.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -103,3 +104,5 @@ enum E_CodeEntity } // namespace cpp } // namespace ary #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/ary/cpp/cs_def.cxx b/autodoc/source/ary/cpp/cs_def.cxx index dd6b59ec..4a8fa424 100644 --- a/autodoc/source/ary/cpp/cs_def.cxx +++ b/autodoc/source/ary/cpp/cs_def.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -84,3 +85,5 @@ Def_Storage::Store_Macro(DYN DefineEntity & pass_de) } // namespace cpp } // namespace ary + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/ary/cpp/cs_def.hxx b/autodoc/source/ary/cpp/cs_def.hxx index a766cb9a..50cf9d18 100644 --- a/autodoc/source/ary/cpp/cs_def.hxx +++ b/autodoc/source/ary/cpp/cs_def.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -105,3 +106,5 @@ enum E_DefineEntity } // namespace cpp } // namespace ary #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/ary/cpp/cs_type.cxx b/autodoc/source/ary/cpp/cs_type.cxx index fee852fc..6e903a44 100644 --- a/autodoc/source/ary/cpp/cs_type.cxx +++ b/autodoc/source/ary/cpp/cs_type.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -110,3 +111,5 @@ Type_Storage::Set_BuiltInType( Rid i_id, } // namespace cpp } // namespace ary + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/ary/cpp/cs_type.hxx b/autodoc/source/ary/cpp/cs_type.hxx index 85405b0a..c903dca6 100644 --- a/autodoc/source/ary/cpp/cs_type.hxx +++ b/autodoc/source/ary/cpp/cs_type.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -136,3 +137,5 @@ Type_Storage::UsedTypeIndex() } // namespace cpp } // namespace ary #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/ary/cpp/namechain.cxx b/autodoc/source/ary/cpp/namechain.cxx index 0ee006d3..b581be5e 100644 --- a/autodoc/source/ary/cpp/namechain.cxx +++ b/autodoc/source/ary/cpp/namechain.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -194,3 +195,5 @@ NameChain::Get_Text( StreamStr & o_rPreName, } // namespace ut } // namespace cpp } // namespace ary + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/ary/cpp/tplparam.cxx b/autodoc/source/ary/cpp/tplparam.cxx index 0b7d6fc5..82f53b6e 100644 --- a/autodoc/source/ary/cpp/tplparam.cxx +++ b/autodoc/source/ary/cpp/tplparam.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -72,3 +73,5 @@ TplParameter_Type::Get_Text( StreamStr & o_rOut, } // namespace ut } // namespace cpp } // namespace ary + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/ary/cpp/tplparam.hxx b/autodoc/source/ary/cpp/tplparam.hxx index e6132386..701a2ad3 100644 --- a/autodoc/source/ary/cpp/tplparam.hxx +++ b/autodoc/source/ary/cpp/tplparam.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -82,3 +83,5 @@ class TplParameter_Type : public TemplateParameter } // namespace cpp } // namespace ary #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/ary/cpp/usedtype.cxx b/autodoc/source/ary/cpp/usedtype.cxx index 70dceb17..4bc0b0ed 100644 --- a/autodoc/source/ary/cpp/usedtype.cxx +++ b/autodoc/source/ary/cpp/usedtype.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -573,3 +574,5 @@ List_TplParameter::Compare( const List_TplParameter & i_rOther ) const } // namespace ut } // namespace cpp } // namespace ary + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/ary/doc/d_boolean.cxx b/autodoc/source/ary/doc/d_boolean.cxx index 54dba814..c4ed5e32 100644 --- a/autodoc/source/ary/doc/d_boolean.cxx +++ b/autodoc/source/ary/doc/d_boolean.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -53,3 +54,5 @@ Boolean::do_Accept(csv::ProcessorIfc & io_processor ) const } // namespace doc } // namespace ary + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/ary/doc/d_docu.cxx b/autodoc/source/ary/doc/d_docu.cxx index 2c6a9a62..9ec031d1 100644 --- a/autodoc/source/ary/doc/d_docu.cxx +++ b/autodoc/source/ary/doc/d_docu.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -57,3 +58,5 @@ Documentation::do_Accept(csv::ProcessorIfc & io_processor) const } // namespace doc } // namespace ary + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/ary/doc/d_node.cxx b/autodoc/source/ary/doc/d_node.cxx index 3be78f20..0722ead0 100644 --- a/autodoc/source/ary/doc/d_node.cxx +++ b/autodoc/source/ary/doc/d_node.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -67,3 +68,5 @@ Node::ListSize() const } // namespace doc } // namespace ary + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/ary/doc/d_oldcppdocu.cxx b/autodoc/source/ary/doc/d_oldcppdocu.cxx index 960606f0..bcf655df 100644 --- a/autodoc/source/ary/doc/d_oldcppdocu.cxx +++ b/autodoc/source/ary/doc/d_oldcppdocu.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -334,3 +335,5 @@ OldCppDocu::do_Accept(csv::ProcessorIfc & io_processor) const } // namespace doc } // namespace ary + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/ary/doc/d_oldidldocu.cxx b/autodoc/source/ary/doc/d_oldidldocu.cxx index 67f9569f..4fd7086f 100644 --- a/autodoc/source/ary/doc/d_oldidldocu.cxx +++ b/autodoc/source/ary/doc/d_oldidldocu.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -74,3 +75,5 @@ OldIdlDocu::do_Accept(csv::ProcessorIfc & io_processor) const } // namespace info } // namespace ary + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/ary/idl/i2s_calculator.cxx b/autodoc/source/ary/idl/i2s_calculator.cxx index aca2a98b..6b33e5a0 100644 --- a/autodoc/source/ary/idl/i2s_calculator.cxx +++ b/autodoc/source/ary/idl/i2s_calculator.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,13 +29,10 @@ #include <precomp.h> #include "i2s_calculator.hxx" - // NOT FULLY DEFINED SERVICES #include <algorithm> #include <string.h> #include <cosv/file.hxx> -//#include <adc_manager.hxx> -//#include <adc_options.hxx> #include <ary/qualiname.hxx> #include <ary/idl/i_enum.hxx> #include <ary/idl/i_exception.hxx> @@ -66,7 +64,6 @@ #include "it_xnameroom.hxx" - namespace ary { namespace idl @@ -251,23 +248,6 @@ void SecondariesCalculator::Make_Links2DeveloperManual( const String & i_devman_reffilepath ) { -// const autodoc::Options & -// rOptions = TheAutodocManager().TheOptions(); -// -// const String & -// rDeveloperManual_URL -// = rOptions.Get_Extra(autodoc::OPT_developer_guide); -// const String -// rDeveloperManual_ReferenceFile -// = rOptions.Get_Extra(autodoc::OPT_developer_guide_refs_file); - -// if ( rDeveloperManual_URL.length() == 0 -// OR -// rDeveloperManual_ReferenceFile.length() == 0 ) -// { -// return; -// } - csv::File aFile(i_devman_reffilepath, csv::CFM_READ); csv::OpenCloseGuard @@ -990,3 +970,5 @@ SecondariesCalculator::Read_Links2DevManual( csv::bstream & i_file ) } // namespace idl } // namespace ary + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/ary/idl/i2s_calculator.hxx b/autodoc/source/ary/idl/i2s_calculator.hxx index 0ad4672a..04c5c215 100644 --- a/autodoc/source/ary/idl/i2s_calculator.hxx +++ b/autodoc/source/ary/idl/i2s_calculator.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -293,3 +294,5 @@ class SecondariesCalculator : public SPInst_asHost } // namespace idl } // namespace ary #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/ary/idl/i_attribute.cxx b/autodoc/source/ary/idl/i_attribute.cxx index 17a36ae6..56370cbf 100644 --- a/autodoc/source/ary/idl/i_attribute.cxx +++ b/autodoc/source/ary/idl/i_attribute.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -157,3 +158,5 @@ attr::Get_SetExceptions( Dyn_TypeIterator & o_result, } // namespace idl } // namespace ary + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/ary/idl/i_ce.cxx b/autodoc/source/ary/idl/i_ce.cxx index 3f79a8bf..497d7c79 100644 --- a/autodoc/source/ary/idl/i_ce.cxx +++ b/autodoc/source/ary/idl/i_ce.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -39,13 +40,6 @@ namespace ary namespace idl { -namespace -{ - const Ce_2s aConstCe2sDummy; -} - - - CodeEntity::CodeEntity() : aDocu(), p2s(0) @@ -59,9 +53,7 @@ CodeEntity::~CodeEntity() const Ce_2s & CodeEntity::Secondaries() const { - if (p2s) - return *p2s; - return aConstCe2sDummy; + return const_cast<CodeEntity*>(this)->Secondaries(); } Ce_2s & @@ -73,8 +65,7 @@ CodeEntity::Secondaries() return *p2s; } - - - } // namespace idl } // namespace ary + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/ary/idl/i_ce2s.cxx b/autodoc/source/ary/idl/i_ce2s.cxx index 3793496a..89a1bd10 100644 --- a/autodoc/source/ary/idl/i_ce2s.cxx +++ b/autodoc/source/ary/idl/i_ce2s.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -82,3 +83,5 @@ Ce_2s::List( int i_indexOfList ) const } // namespace idl } // namespace ary + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/ary/idl/i_comrela.cxx b/autodoc/source/ary/idl/i_comrela.cxx index aefd589d..3e3d8bea 100644 --- a/autodoc/source/ary/idl/i_comrela.cxx +++ b/autodoc/source/ary/idl/i_comrela.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -45,3 +46,5 @@ namespace idl } // namespace idl } // namespace ary + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/ary/idl/i_constant.cxx b/autodoc/source/ary/idl/i_constant.cxx index a0cc3658..e03d829e 100644 --- a/autodoc/source/ary/idl/i_constant.cxx +++ b/autodoc/source/ary/idl/i_constant.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -121,3 +122,5 @@ attr::Value( const CodeEntity & i_ce ) } // namespace idl } // namespace ary + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/ary/idl/i_constgroup.cxx b/autodoc/source/ary/idl/i_constgroup.cxx index 7e6e12a5..7008f94d 100644 --- a/autodoc/source/ary/idl/i_constgroup.cxx +++ b/autodoc/source/ary/idl/i_constgroup.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -112,3 +113,5 @@ attr::Get_Constants( Dyn_CeIterator & o_result, } // namespace idl } // namespace ary + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/ary/idl/i_enum.cxx b/autodoc/source/ary/idl/i_enum.cxx index f20a515c..6f0e3920 100644 --- a/autodoc/source/ary/idl/i_enum.cxx +++ b/autodoc/source/ary/idl/i_enum.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -141,3 +142,5 @@ xref::Get_AsDataTypes( Dyn_CeIterator & o_result, } // namespace idl } // namespace ary + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/ary/idl/i_enumvalue.cxx b/autodoc/source/ary/idl/i_enumvalue.cxx index 4cefe3eb..5a851271 100644 --- a/autodoc/source/ary/idl/i_enumvalue.cxx +++ b/autodoc/source/ary/idl/i_enumvalue.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -114,3 +115,5 @@ attr::Value( const CodeEntity & i_ce ) } // namespace idl } // namespace ary + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/ary/idl/i_exception.cxx b/autodoc/source/ary/idl/i_exception.cxx index 4be910af..57b60386 100644 --- a/autodoc/source/ary/idl/i_exception.cxx +++ b/autodoc/source/ary/idl/i_exception.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -137,3 +138,5 @@ xref::Get_RaisingFunctions( Dyn_CeIterator & o_result, } // namespace idl } // namespace ary + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/ary/idl/i_function.cxx b/autodoc/source/ary/idl/i_function.cxx index 13a48079..f9c00f2b 100644 --- a/autodoc/source/ary/idl/i_function.cxx +++ b/autodoc/source/ary/idl/i_function.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -163,3 +164,5 @@ attr::Get_Exceptions( Dyn_TypeIterator & o_result, } // namespace idl } // namespace ary + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/ary/idl/i_interface.cxx b/autodoc/source/ary/idl/i_interface.cxx index e7c5249b..08c80c5e 100644 --- a/autodoc/source/ary/idl/i_interface.cxx +++ b/autodoc/source/ary/idl/i_interface.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -194,3 +195,5 @@ xref::Get_AsDataTypes( Dyn_CeIterator & o_result, } // namespace idl } // namespace ary + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/ary/idl/i_module.cxx b/autodoc/source/ary/idl/i_module.cxx index dd527596..fa671f23 100644 --- a/autodoc/source/ary/idl/i_module.cxx +++ b/autodoc/source/ary/idl/i_module.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -202,3 +203,5 @@ attr::Get_AllChildrenSeparated( std::vector< const CodeEntity* > & o_nestedModul } // namespace idl } // namespace ary + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/ary/idl/i_namelookup.cxx b/autodoc/source/ary/idl/i_namelookup.cxx index b9779210..d71884ad 100644 --- a/autodoc/source/ary/idl/i_namelookup.cxx +++ b/autodoc/source/ary/idl/i_namelookup.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -60,3 +61,5 @@ NameLookup::Add_Name( const String & i_name, } // namespace idl } // namespace ary + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/ary/idl/i_nnfinder.hxx b/autodoc/source/ary/idl/i_nnfinder.hxx index 4f7e95b9..58ed77a4 100644 --- a/autodoc/source/ary/idl/i_nnfinder.hxx +++ b/autodoc/source/ary/idl/i_nnfinder.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -116,3 +117,5 @@ class Types_forSetCe_Id } // namespace idl } // namespace ary #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/ary/idl/i_param.cxx b/autodoc/source/ary/idl/i_param.cxx index a0c1854e..38a48f02 100644 --- a/autodoc/source/ary/idl/i_param.cxx +++ b/autodoc/source/ary/idl/i_param.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -55,3 +56,5 @@ Parameter::~Parameter() } // namespace idl } // namespace ary + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/ary/idl/i_property.cxx b/autodoc/source/ary/idl/i_property.cxx index 603214d7..dacc596b 100644 --- a/autodoc/source/ary/idl/i_property.cxx +++ b/autodoc/source/ary/idl/i_property.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -169,3 +170,5 @@ attr::Type( const CodeEntity & i_ce ) } // namespace idl } // namespace ary + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/ary/idl/i_reposypart.cxx b/autodoc/source/ary/idl/i_reposypart.cxx index ccc6899b..d0a3b136 100644 --- a/autodoc/source/ary/idl/i_reposypart.cxx +++ b/autodoc/source/ary/idl/i_reposypart.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -117,3 +118,5 @@ RepositoryPartition::Types() } // namespace idl } // namespace ary + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/ary/idl/i_reposypart.hxx b/autodoc/source/ary/idl/i_reposypart.hxx index 503cc25e..65aa243f 100644 --- a/autodoc/source/ary/idl/i_reposypart.hxx +++ b/autodoc/source/ary/idl/i_reposypart.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -94,3 +95,5 @@ class RepositoryPartition : public InternalGate } // namespace idl } // namespace ary #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/ary/idl/i_service.cxx b/autodoc/source/ary/idl/i_service.cxx index caa8d17b..dde1c861 100644 --- a/autodoc/source/ary/idl/i_service.cxx +++ b/autodoc/source/ary/idl/i_service.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -169,3 +170,5 @@ xref::Get_InstantiatingSingletons( Dyn_CeIterator & o_result, } // namespace idl } // namespace ary + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/ary/idl/i_singleton.cxx b/autodoc/source/ary/idl/i_singleton.cxx index 8fa4fed8..10dfb59f 100644 --- a/autodoc/source/ary/idl/i_singleton.cxx +++ b/autodoc/source/ary/idl/i_singleton.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -110,3 +111,5 @@ attr::AssociatedService( const CodeEntity & i_ce ) } // namespace idl } // namespace ary + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/ary/idl/i_siservice.cxx b/autodoc/source/ary/idl/i_siservice.cxx index 64837652..320d04ea 100644 --- a/autodoc/source/ary/idl/i_siservice.cxx +++ b/autodoc/source/ary/idl/i_siservice.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -119,3 +120,5 @@ attr::Get_Constructors( Dyn_CeIterator & o_result, } // namespace idl } // namespace ary + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/ary/idl/i_sisingleton.cxx b/autodoc/source/ary/idl/i_sisingleton.cxx index 1f1ae9de..0872a641 100644 --- a/autodoc/source/ary/idl/i_sisingleton.cxx +++ b/autodoc/source/ary/idl/i_sisingleton.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -111,3 +112,5 @@ attr::BaseInterface( const CodeEntity & i_ce ) } // namespace idl } // namespace ary + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/ary/idl/i_struct.cxx b/autodoc/source/ary/idl/i_struct.cxx index 4172c956..0f602637 100644 --- a/autodoc/source/ary/idl/i_struct.cxx +++ b/autodoc/source/ary/idl/i_struct.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -161,3 +162,5 @@ xref::Get_AsDataTypes( Dyn_CeIterator & o_result, } // namespace idl } // namespace ary + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/ary/idl/i_structelem.cxx b/autodoc/source/ary/idl/i_structelem.cxx index dbb8d0bb..1b5a89c8 100644 --- a/autodoc/source/ary/idl/i_structelem.cxx +++ b/autodoc/source/ary/idl/i_structelem.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -115,3 +116,5 @@ attr::Type( const CodeEntity & i_ce ) } // namespace idl } // namespace ary + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/ary/idl/i_traits.cxx b/autodoc/source/ary/idl/i_traits.cxx index 8f91ba31..610028e0 100644 --- a/autodoc/source/ary/idl/i_traits.cxx +++ b/autodoc/source/ary/idl/i_traits.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -70,3 +71,5 @@ Ce_Compare::Lesser_( const key_type & i_1, } // namespace idl } // namespace ary + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/ary/idl/i_typedef.cxx b/autodoc/source/ary/idl/i_typedef.cxx index 51f8fac9..89d20af5 100644 --- a/autodoc/source/ary/idl/i_typedef.cxx +++ b/autodoc/source/ary/idl/i_typedef.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -143,3 +144,5 @@ xref::Get_AsDataTypes( Dyn_CeIterator & o_result, } // namespace idl } // namespace ary + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/ary/idl/ia_ce.cxx b/autodoc/source/ary/idl/ia_ce.cxx index a4886c2c..7335df37 100644 --- a/autodoc/source/ary/idl/ia_ce.cxx +++ b/autodoc/source/ary/idl/ia_ce.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -579,3 +580,5 @@ CeAdmin::lhf_Store_TplStruct( Ce_id i_nOwner, } // namespace idl } // namespace ary + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/ary/idl/ia_ce.hxx b/autodoc/source/ary/idl/ia_ce.hxx index 787e181d..ad31188d 100644 --- a/autodoc/source/ary/idl/ia_ce.hxx +++ b/autodoc/source/ary/idl/ia_ce.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -251,3 +252,5 @@ CeAdmin::Storage() } // namespace idl } // namespace ary #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/ary/idl/ia_type.cxx b/autodoc/source/ary/idl/ia_type.cxx index fad4f9d7..57c853a9 100644 --- a/autodoc/source/ary/idl/ia_type.cxx +++ b/autodoc/source/ary/idl/ia_type.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -126,7 +127,7 @@ TypeAdmin::lhf_CheckIn_TypeName( const String & i_sLocalName, { String sSearchLocalName( i_sLocalName ); if ( i_templateParameters != 0 - ? i_templateParameters->size() > 0 + ? (!i_templateParameters->empty()) : false ) { sSearchLocalName = MakeTemplateName( @@ -362,3 +363,5 @@ MakeTemplateName( const String & i_localName, } // namespace idl } // namespace ary + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/ary/idl/ia_type.hxx b/autodoc/source/ary/idl/ia_type.hxx index ce3b0fde..88cd1836 100644 --- a/autodoc/source/ary/idl/ia_type.hxx +++ b/autodoc/source/ary/idl/ia_type.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -168,3 +169,5 @@ TypeAdmin::Assign_CePilot( CeAdmin & io_rCes ) } // namespace idl } // namespace ary #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/ary/idl/is_ce.cxx b/autodoc/source/ary/idl/is_ce.cxx index a4e990ec..998b4c72 100644 --- a/autodoc/source/ary/idl/is_ce.cxx +++ b/autodoc/source/ary/idl/is_ce.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -63,3 +64,5 @@ Ce_Storage::~Ce_Storage() } // namespace idl } // namespace ary + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/ary/idl/is_ce.hxx b/autodoc/source/ary/idl/is_ce.hxx index c15d8582..46c24659 100644 --- a/autodoc/source/ary/idl/is_ce.hxx +++ b/autodoc/source/ary/idl/is_ce.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -77,3 +78,5 @@ enum E_CodeEntity } // namespace idl } // namespace ary #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/ary/idl/is_type.cxx b/autodoc/source/ary/idl/is_type.cxx index 2cd8b9c5..099360c1 100644 --- a/autodoc/source/ary/idl/is_type.cxx +++ b/autodoc/source/ary/idl/is_type.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -81,3 +82,5 @@ Type_Storage::Search_SequenceOf( Type_id i_nRelatedType ) } // namespace idl } // namespace ary + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/ary/idl/is_type.hxx b/autodoc/source/ary/idl/is_type.hxx index 8cca8224..540de196 100644 --- a/autodoc/source/ary/idl/is_type.hxx +++ b/autodoc/source/ary/idl/is_type.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -120,3 +121,5 @@ Type_Storage::Instance_() } // namespace idl } // namespace ary #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/ary/idl/it_builtin.cxx b/autodoc/source/ary/idl/it_builtin.cxx index 947da0d6..30a0ce91 100644 --- a/autodoc/source/ary/idl/it_builtin.cxx +++ b/autodoc/source/ary/idl/it_builtin.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -77,3 +78,5 @@ BuiltInType::inq_Get_Text( StringVector & , // o_module } // namespace idl } // namespace ary + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/ary/idl/it_builtin.hxx b/autodoc/source/ary/idl/it_builtin.hxx index 5e0b9236..a5447bf1 100644 --- a/autodoc/source/ary/idl/it_builtin.hxx +++ b/autodoc/source/ary/idl/it_builtin.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -74,3 +75,5 @@ class BuiltInType : public Named_Type } // namespace idl } // namespace ary #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/ary/idl/it_ce.cxx b/autodoc/source/ary/idl/it_ce.cxx index b103da48..5975028a 100644 --- a/autodoc/source/ary/idl/it_ce.cxx +++ b/autodoc/source/ary/idl/it_ce.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -98,3 +99,5 @@ Ce_Type::inq_TemplateParameters() const } // namespace idl } // namespace ary + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/ary/idl/it_ce.hxx b/autodoc/source/ary/idl/it_ce.hxx index 19f3878f..876ae2ca 100644 --- a/autodoc/source/ary/idl/it_ce.hxx +++ b/autodoc/source/ary/idl/it_ce.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -86,3 +87,5 @@ class Ce_Type : public Type } // namespace idl } // namespace ary #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/ary/idl/it_explicit.cxx b/autodoc/source/ary/idl/it_explicit.cxx index 31b1cc74..ce65208a 100644 --- a/autodoc/source/ary/idl/it_explicit.cxx +++ b/autodoc/source/ary/idl/it_explicit.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -98,3 +99,5 @@ ExplicitType::inq_TemplateParameters() const } // namespace idl } // namespace ary + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/ary/idl/it_explicit.hxx b/autodoc/source/ary/idl/it_explicit.hxx index d9dc6a53..091cfafb 100644 --- a/autodoc/source/ary/idl/it_explicit.hxx +++ b/autodoc/source/ary/idl/it_explicit.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -91,3 +92,5 @@ class ExplicitType : public Named_Type } // namespace idl } // namespace ary #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/ary/idl/it_named.hxx b/autodoc/source/ary/idl/it_named.hxx index 65eead08..cece6c1c 100644 --- a/autodoc/source/ary/idl/it_named.hxx +++ b/autodoc/source/ary/idl/it_named.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -74,3 +75,4 @@ class Named_Type : public Type #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/ary/idl/it_sequence.cxx b/autodoc/source/ary/idl/it_sequence.cxx index e407f189..e82087dd 100644 --- a/autodoc/source/ary/idl/it_sequence.cxx +++ b/autodoc/source/ary/idl/it_sequence.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -89,3 +90,5 @@ Sequence::inq_FirstEnclosedNonSequenceType(const Gate & i_rGate) const } // namespace idl } // namespace ary + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/ary/idl/it_sequence.hxx b/autodoc/source/ary/idl/it_sequence.hxx index f653ff50..0947eb68 100644 --- a/autodoc/source/ary/idl/it_sequence.hxx +++ b/autodoc/source/ary/idl/it_sequence.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -82,3 +83,5 @@ class Sequence : public Type } // namespace idl } // namespace ary #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/ary/idl/it_tplparam.cxx b/autodoc/source/ary/idl/it_tplparam.cxx index 771dce61..1ff4c052 100644 --- a/autodoc/source/ary/idl/it_tplparam.cxx +++ b/autodoc/source/ary/idl/it_tplparam.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -90,3 +91,5 @@ Type::inq_FirstEnclosedNonSequenceType(const Gate & ) const } // namespace idl } // namespace ary + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/ary/idl/it_tplparam.hxx b/autodoc/source/ary/idl/it_tplparam.hxx index 229a6119..8aa116e4 100644 --- a/autodoc/source/ary/idl/it_tplparam.hxx +++ b/autodoc/source/ary/idl/it_tplparam.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -96,3 +97,5 @@ TemplateParamType::Set_StructId( Ce_id i_nStruct ) } // namespace idl } // namespace ary #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/ary/idl/it_xnameroom.cxx b/autodoc/source/ary/idl/it_xnameroom.cxx index 040e8657..0a9b06e9 100644 --- a/autodoc/source/ary/idl/it_xnameroom.cxx +++ b/autodoc/source/ary/idl/it_xnameroom.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -98,3 +99,5 @@ ExplicitNameRoom::inq_Get_Text( StringVector & o_module, } // namespace idl } // namespace ary + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/ary/idl/it_xnameroom.hxx b/autodoc/source/ary/idl/it_xnameroom.hxx index 747657b8..ec403045 100644 --- a/autodoc/source/ary/idl/it_xnameroom.hxx +++ b/autodoc/source/ary/idl/it_xnameroom.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -121,3 +122,5 @@ class ExplicitNameRoom : public Type } // namespace idl } // namespace ary #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/ary/inc/cpp_internalgate.hxx b/autodoc/source/ary/inc/cpp_internalgate.hxx index abcb81dc..a81d9f11 100644 --- a/autodoc/source/ary/inc/cpp_internalgate.hxx +++ b/autodoc/source/ary/inc/cpp_internalgate.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -64,3 +65,5 @@ class InternalGate : public ::ary::cpp::Gate } // namespace cpp } // namespace ary #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/ary/inc/cross_refs.hxx b/autodoc/source/ary/inc/cross_refs.hxx index d84f4cec..7e7cbe5f 100644 --- a/autodoc/source/ary/inc/cross_refs.hxx +++ b/autodoc/source/ary/inc/cross_refs.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -43,7 +44,7 @@ class CrossReferences public: typedef TYPES::element_type element; - /// Checks for double occurences + /// Checks for double occurrences void Add( VALUE_LIST::index_type i_nPosition @@ -97,3 +98,4 @@ class SortedIdSet #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/ary/inc/idl_internalgate.hxx b/autodoc/source/ary/inc/idl_internalgate.hxx index 96b60681..41ba4da7 100644 --- a/autodoc/source/ary/inc/idl_internalgate.hxx +++ b/autodoc/source/ary/inc/idl_internalgate.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -64,3 +65,5 @@ class InternalGate : public ::ary::idl::Gate } // namespace idl } // namespace ary #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/ary/inc/idsort.hxx b/autodoc/source/ary/inc/idsort.hxx index c32487b1..b87572d5 100644 --- a/autodoc/source/ary/inc/idsort.hxx +++ b/autodoc/source/ary/inc/idsort.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -50,3 +51,5 @@ struct IdSorter #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/ary/inc/loc_internalgate.hxx b/autodoc/source/ary/inc/loc_internalgate.hxx index c355caa2..a2dc9510 100644 --- a/autodoc/source/ary/inc/loc_internalgate.hxx +++ b/autodoc/source/ary/inc/loc_internalgate.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -61,3 +62,5 @@ class InternalGate } // namespace loc } // namespace ary #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/ary/inc/nametreenode.hxx b/autodoc/source/ary/inc/nametreenode.hxx index 7fa9f66e..7cf73813 100644 --- a/autodoc/source/ary/inc/nametreenode.hxx +++ b/autodoc/source/ary/inc/nametreenode.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -208,3 +209,5 @@ Search_SubTree_UpTillRoot( const ary::idl::Module & i_rStart, } // namespace ary #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/ary/inc/reposy.hxx b/autodoc/source/ary/inc/reposy.hxx index 8c6a726c..0d89b504 100644 --- a/autodoc/source/ary/inc/reposy.hxx +++ b/autodoc/source/ary/inc/reposy.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -89,3 +90,5 @@ class RepositoryCenter : public ::ary::Repository } // namespace ary #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/ary/inc/sci_impl.hxx b/autodoc/source/ary/inc/sci_impl.hxx index b0cac57c..92aa1512 100644 --- a/autodoc/source/ary/inc/sci_impl.hxx +++ b/autodoc/source/ary/inc/sci_impl.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -411,3 +412,5 @@ SCI_DataInMap<KEY,VALUE>::inq_IsSorted() const #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/ary/inc/slots.hxx b/autodoc/source/ary/inc/slots.hxx index e572c014..94958ce4 100644 --- a/autodoc/source/ary/inc/slots.hxx +++ b/autodoc/source/ary/inc/slots.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -161,3 +162,5 @@ Slot_SequentialIds<ID>::StoreEntries( Display & o_rDestination ) const } // namespace ary #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/ary/inc/sorted_idset.hxx b/autodoc/source/ary/inc/sorted_idset.hxx index 3df8d4fa..6373b157 100644 --- a/autodoc/source/ary/inc/sorted_idset.hxx +++ b/autodoc/source/ary/inc/sorted_idset.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -43,7 +44,7 @@ template <class XY> class SortedIdSet; class Interface_2s { public: - /// Checks for double occurences + /// Checks for double occurrences void Add_ExportingService( Ce_id i_nId ); void Get_ExportingServices( @@ -95,3 +96,4 @@ class SortedIdSet #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/ary/inc/sortedids.hxx b/autodoc/source/ary/inc/sortedids.hxx index 8ce9188e..a830937a 100644 --- a/autodoc/source/ary/inc/sortedids.hxx +++ b/autodoc/source/ary/inc/sortedids.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -235,3 +236,5 @@ SortedIds<COMPARE>::impl_LowerBound_( ITER i_begin, } // namespace ary #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/ary/inc/store/s_base.hxx b/autodoc/source/ary/inc/store/s_base.hxx index 04e525b1..671b2b6f 100644 --- a/autodoc/source/ary/inc/store/s_base.hxx +++ b/autodoc/source/ary/inc/store/s_base.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -178,3 +179,5 @@ Base<ENTITY>::End() const } // namespace stg } // namespace ary #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/ary/inc/store/s_iterator.hxx b/autodoc/source/ary/inc/store/s_iterator.hxx index 1669a80d..717c0951 100644 --- a/autodoc/source/ary/inc/store/s_iterator.hxx +++ b/autodoc/source/ary/inc/store/s_iterator.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -235,3 +236,5 @@ class const_filter_iterator : } // namespace stg } // namespace ary #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/ary/inc/store/s_storage.hxx b/autodoc/source/ary/inc/store/s_storage.hxx index a360ad2a..6085089d 100644 --- a/autodoc/source/ary/inc/store/s_storage.hxx +++ b/autodoc/source/ary/inc/store/s_storage.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -292,3 +293,5 @@ SearchAccess( const Storage<ENTITY> & i_storage, } // namespace stg } // namespace ary #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/ary/inc/traits_impl.hxx b/autodoc/source/ary/inc/traits_impl.hxx index 2505a13c..d1a11941 100644 --- a/autodoc/source/ary/inc/traits_impl.hxx +++ b/autodoc/source/ary/inc/traits_impl.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -117,3 +118,5 @@ Search_Child( const typename NODE::traits_t::entity_base_type & i_node, } // namespace traits } // namespace ary #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/ary/info/all_dts.cxx b/autodoc/source/ary/info/all_dts.cxx index 440871b4..0022e6a4 100644 --- a/autodoc/source/ary/info/all_dts.cxx +++ b/autodoc/source/ary/info/all_dts.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -103,3 +104,4 @@ DT_Xml::inq_IsWhite() const } // namespace info } // namespace ary +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/ary/info/all_tags.cxx b/autodoc/source/ary/info/all_tags.cxx index 740c31b1..d6b6ee00 100644 --- a/autodoc/source/ary/info/all_tags.cxx +++ b/autodoc/source/ary/info/all_tags.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -567,3 +568,4 @@ SinceTag::Text() } // namespace info } // namespace ary +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/ary/info/ci_attag.cxx b/autodoc/source/ary/info/ci_attag.cxx index a18fec7a..218ea5fb 100644 --- a/autodoc/source/ary/info/ci_attag.cxx +++ b/autodoc/source/ary/info/ci_attag.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -91,3 +92,4 @@ AtTag::do_StoreAt( DocuDisplay & ) const } // namespace ary +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/ary/info/ci_text.cxx b/autodoc/source/ary/info/ci_text.cxx index 70dac477..dee50d27 100644 --- a/autodoc/source/ary/info/ci_text.cxx +++ b/autodoc/source/ary/info/ci_text.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -69,3 +70,4 @@ DocuText::StoreAt( DocuDisplay & o_rDisplay ) const } // namespace ary +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/ary/kernel/ary_disp.cxx b/autodoc/source/ary/kernel/ary_disp.cxx index 769bc4ae..eed6d17e 100644 --- a/autodoc/source/ary/kernel/ary_disp.cxx +++ b/autodoc/source/ary/kernel/ary_disp.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -106,3 +107,5 @@ Display::do_DisplaySlot_LocalCe( ary::cpp::Ce_id , } // namespace ary + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/ary/kernel/cessentl.cxx b/autodoc/source/ary/kernel/cessentl.cxx index af62916d..e8e29bf8 100644 --- a/autodoc/source/ary/kernel/cessentl.cxx +++ b/autodoc/source/ary/kernel/cessentl.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -84,3 +85,5 @@ CodeEntity::IsVisible() const } // namespace cpp } // namespace ary + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/ary/kernel/namesort.cxx b/autodoc/source/ary/kernel/namesort.cxx index a20fe6b9..0a64b976 100644 --- a/autodoc/source/ary/kernel/namesort.cxx +++ b/autodoc/source/ary/kernel/namesort.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -98,3 +99,5 @@ LesserName::aOrdering2_(C_cAutodocNameOrdering2); } // namespace ary + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/ary/kernel/qualiname.cxx b/autodoc/source/ary/kernel/qualiname.cxx index 9ef9331a..0451485c 100644 --- a/autodoc/source/ary/kernel/qualiname.cxx +++ b/autodoc/source/ary/kernel/qualiname.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -103,3 +104,5 @@ QualifiedName::AssignText( const char * i_sText, } // namespace ary + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/ary/kernel/reposy.cxx b/autodoc/source/ary/kernel/reposy.cxx index c533e7c4..99bfcf90 100644 --- a/autodoc/source/ary/kernel/reposy.cxx +++ b/autodoc/source/ary/kernel/reposy.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -216,3 +217,5 @@ RepositoryCenter::Set_Title(const String & i_sName) } // namespace ary + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/ary/kernel/slots.cxx b/autodoc/source/ary/kernel/slots.cxx index 2e75fe78..1e7e4b49 100644 --- a/autodoc/source/ary/kernel/slots.cxx +++ b/autodoc/source/ary/kernel/slots.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -162,3 +163,5 @@ Slot_ListLocalCe::StoreEntries( Display & o_rDestination ) const } // namespace ary + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/ary/loc/loc_dir.cxx b/autodoc/source/ary/loc/loc_dir.cxx index db4e8159..0a3fcf3e 100644 --- a/autodoc/source/ary/loc/loc_dir.cxx +++ b/autodoc/source/ary/loc/loc_dir.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -132,3 +133,5 @@ Directory::inq_ParentDirectory() const } // namespace loc } // namespace ary + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/ary/loc/loc_file.cxx b/autodoc/source/ary/loc/loc_file.cxx index 658e5730..dc05de03 100644 --- a/autodoc/source/ary/loc/loc_file.cxx +++ b/autodoc/source/ary/loc/loc_file.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -64,3 +65,5 @@ File::get_AryClass() const } // namespace loc } // namespace ary + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/ary/loc/loc_filebase.cxx b/autodoc/source/ary/loc/loc_filebase.cxx index fb45a749..0daaee2c 100644 --- a/autodoc/source/ary/loc/loc_filebase.cxx +++ b/autodoc/source/ary/loc/loc_filebase.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -61,3 +62,5 @@ FileBase::inq_ParentDirectory() const } // namespace loc } // namespace ary + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/ary/loc/loc_root.cxx b/autodoc/source/ary/loc/loc_root.cxx index 72cd3a0f..dca36206 100644 --- a/autodoc/source/ary/loc/loc_root.cxx +++ b/autodoc/source/ary/loc/loc_root.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -81,3 +82,5 @@ Root::inq_ParentDirectory() const } // namespace loc } // namespace ary + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/ary/loc/loc_traits.cxx b/autodoc/source/ary/loc/loc_traits.cxx index bc303b9b..eb314d11 100644 --- a/autodoc/source/ary/loc/loc_traits.cxx +++ b/autodoc/source/ary/loc/loc_traits.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -89,3 +90,5 @@ Le_Compare::Lesser_( const key_type & i_1, } // namespace loc } // namespace ary + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/ary/loc/loca_le.cxx b/autodoc/source/ary/loc/loca_le.cxx index cbed1bf0..e16d304a 100644 --- a/autodoc/source/ary/loc/loca_le.cxx +++ b/autodoc/source/ary/loc/loca_le.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -179,3 +180,5 @@ LocationAdmin::CheckIn_Directories( } // namespace loc } // namespace ary + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/ary/loc/loca_le.hxx b/autodoc/source/ary/loc/loca_le.hxx index 3e879c5d..112343b6 100644 --- a/autodoc/source/ary/loc/loca_le.hxx +++ b/autodoc/source/ary/loc/loca_le.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -96,3 +97,5 @@ class LocationAdmin : public LocationPilot } // namespace loc } // namespace ary #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/ary/loc/locs_le.cxx b/autodoc/source/ary/loc/locs_le.cxx index 68abef7f..76babbf1 100644 --- a/autodoc/source/ary/loc/locs_le.cxx +++ b/autodoc/source/ary/loc/locs_le.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -65,3 +66,5 @@ Le_Storage::~Le_Storage() } // namespace loc } // namespace ary + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/ary/loc/locs_le.hxx b/autodoc/source/ary/loc/locs_le.hxx index 66d60437..88639d6c 100644 --- a/autodoc/source/ary/loc/locs_le.hxx +++ b/autodoc/source/ary/loc/locs_le.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -86,3 +87,5 @@ enum E_LocationEntity } // namespace cpp } // namespace ary #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/ary_i/kernel/ci_atag2.cxx b/autodoc/source/ary_i/kernel/ci_atag2.cxx index 5a4ccfca..21c01f7a 100644 --- a/autodoc/source/ary_i/kernel/ci_atag2.cxx +++ b/autodoc/source/ary_i/kernel/ci_atag2.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -55,3 +56,4 @@ void DocuTag_Display::Display_EOL() {} } // namespace inf } // namespace ary +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/ary_i/kernel/ci_text2.cxx b/autodoc/source/ary_i/kernel/ci_text2.cxx index ddc11e06..36458489 100644 --- a/autodoc/source/ary_i/kernel/ci_text2.cxx +++ b/autodoc/source/ary_i/kernel/ci_text2.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -137,3 +138,4 @@ void DocuText_Display::Display_SinceAtTag( } // namespace inf } // namespace ary +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/ary_i/kernel/d_token.cxx b/autodoc/source/ary_i/kernel/d_token.cxx index 99274c05..c2099724 100644 --- a/autodoc/source/ary_i/kernel/d_token.cxx +++ b/autodoc/source/ary_i/kernel/d_token.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -59,9 +60,8 @@ DT_TextToken::DisplayAt( DocumentationDisplay & o_rDisplay ) const bool DT_TextToken::IsWhiteOnly() const { - for ( const char * it = sText.c_str(); - static_cast<UINT8>(*it) > 32; - ++it ) + const char *it = sText.c_str(); + while (static_cast<UINT8>(*it++) > 32) { return false; } @@ -185,3 +185,5 @@ DT_SinceAtTag::DisplayAt( DocumentationDisplay & o_rDisplay ) const } // namespace dsapi } // namespace csi + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/display/html/aryattrs.cxx b/autodoc/source/display/html/aryattrs.cxx index 1652b405..106ff4b7 100644 --- a/autodoc/source/display/html/aryattrs.cxx +++ b/autodoc/source/display/html/aryattrs.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -246,3 +247,5 @@ FunctionParam_Iterator::Assign( const ary::cpp::Function & i_rFunction ) eConVol = rSigna.ConVol(); } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/display/html/aryattrs.hxx b/autodoc/source/display/html/aryattrs.hxx index ac281e7c..92de1774 100644 --- a/autodoc/source/display/html/aryattrs.hxx +++ b/autodoc/source/display/html/aryattrs.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -152,3 +153,5 @@ FunctionParam_Iterator::IsFunctionVolatile() const #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/display/html/cfrstd.cxx b/autodoc/source/display/html/cfrstd.cxx index 0027413f..7cf1263a 100644 --- a/autodoc/source/display/html/cfrstd.cxx +++ b/autodoc/source/display/html/cfrstd.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -342,3 +343,5 @@ MakeCopyRight() return String(cr.c_str()); } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/display/html/chd_udk2.cxx b/autodoc/source/display/html/chd_udk2.cxx index 71f9de0f..5d2a3f27 100644 --- a/autodoc/source/display/html/chd_udk2.cxx +++ b/autodoc/source/display/html/chd_udk2.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -199,3 +200,5 @@ CppHtmlDisplay_Udk2::Gate() const { return pCurPageEnv->Gate(); } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/display/html/cre_link.cxx b/autodoc/source/display/html/cre_link.cxx index 08e4a5a9..2635ece8 100644 --- a/autodoc/source/display/html/cre_link.cxx +++ b/autodoc/source/display/html/cre_link.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -267,3 +268,5 @@ LinkCreator::Create_PrePath( const ary::cpp::CodeEntity & i_rData ) NameScope_const_iterator it( i_rData.Owner(), pEnv->Gate() ); Recursive_CreatePath( pOut, it ); } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/display/html/cre_link.hxx b/autodoc/source/display/html/cre_link.hxx index b7b31720..ff0c5753 100644 --- a/autodoc/source/display/html/cre_link.hxx +++ b/autodoc/source/display/html/cre_link.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -131,3 +132,5 @@ LinkCreator::SetEnv( const OuputPage_Environment & i_rEnv ) #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/display/html/dsply_cl.cxx b/autodoc/source/display/html/dsply_cl.cxx index deb4db4c..8a570ae3 100644 --- a/autodoc/source/display/html/dsply_cl.cxx +++ b/autodoc/source/display/html/dsply_cl.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -106,3 +107,5 @@ ClassDisplayer::inq_Get_ReFinder() const { return & pEnv->Gate(); } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/display/html/dsply_cl.hxx b/autodoc/source/display/html/dsply_cl.hxx index 63fcadae..9ba6d76e 100644 --- a/autodoc/source/display/html/dsply_cl.hxx +++ b/autodoc/source/display/html/dsply_cl.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -85,3 +86,5 @@ class ClassDisplayer : public ary::Display, #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/display/html/dsply_da.cxx b/autodoc/source/display/html/dsply_da.cxx index 7ea3042d..17614c7d 100644 --- a/autodoc/source/display/html/dsply_da.cxx +++ b/autodoc/source/display/html/dsply_da.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -197,3 +198,5 @@ DataDisplay::Display_SglDatum( csi::xml::Element & rOut, rOut << new html::HorizontalLine; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/display/html/dsply_da.hxx b/autodoc/source/display/html/dsply_da.hxx index 2fc84174..a8d29fc2 100644 --- a/autodoc/source/display/html/dsply_da.hxx +++ b/autodoc/source/display/html/dsply_da.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -105,3 +106,5 @@ class DataDisplay : public ary::Display, #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/display/html/dsply_op.cxx b/autodoc/source/display/html/dsply_op.cxx index 6588f32f..dbbd1ac7 100644 --- a/autodoc/source/display/html/dsply_op.cxx +++ b/autodoc/source/display/html/dsply_op.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -205,3 +206,5 @@ OperationsDisplay::Display_SglOperation( csi::xml::Element & rOut, rOut << new html::HorizontalLine; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/display/html/dsply_op.hxx b/autodoc/source/display/html/dsply_op.hxx index a3a7bd9d..9367489f 100644 --- a/autodoc/source/display/html/dsply_op.hxx +++ b/autodoc/source/display/html/dsply_op.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -102,3 +103,5 @@ class OperationsDisplay : public ary::Display, #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/display/html/easywri.cxx b/autodoc/source/display/html/easywri.cxx index 059b83f4..79ff4273 100644 --- a/autodoc/source/display/html/easywri.cxx +++ b/autodoc/source/display/html/easywri.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -63,3 +64,4 @@ EasyWriter::Out() return *aCurDestination.top(); } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/display/html/easywri.hxx b/autodoc/source/display/html/easywri.hxx index cca92e1f..53e56e3f 100644 --- a/autodoc/source/display/html/easywri.hxx +++ b/autodoc/source/display/html/easywri.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -78,3 +79,4 @@ EasyWriter::Out() #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/display/html/hd_chlst.cxx b/autodoc/source/display/html/hd_chlst.cxx index 84b06ff3..c537ac58 100644 --- a/autodoc/source/display/html/hd_chlst.cxx +++ b/autodoc/source/display/html/hd_chlst.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -587,3 +588,5 @@ S_AreaCo::PerformResult() } } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/display/html/hd_chlst.hxx b/autodoc/source/display/html/hd_chlst.hxx index c714f678..5cb38875 100644 --- a/autodoc/source/display/html/hd_chlst.hxx +++ b/autodoc/source/display/html/hd_chlst.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -204,3 +205,5 @@ class ChildList_Display : public ary::Display, #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/display/html/hd_docu.cxx b/autodoc/source/display/html/hd_docu.cxx index 6ce61ff7..29265734 100644 --- a/autodoc/source/display/html/hd_docu.cxx +++ b/autodoc/source/display/html/hd_docu.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -181,8 +182,6 @@ Docu_Display::do_Process(const ary::doc::Documentation & i_rData) void Docu_Display::Display_StdTag( const StdTag & i_rData ) { - csv_assert( uintt(i_rData.Std_Id()) < uintt(ary::info::C_eAtTag_NrOfClasses) ); - const ary::info::DocuText::TokenList & rText = i_rData.CText().Tokens(); typedef ary::info::DocuText::TokenList::const_iterator TokenIterator; @@ -484,3 +483,4 @@ Docu_Display::Write_QualifiedName( const ary::QualifiedName & i_sQuName ) CurOut() << "()"; } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/display/html/hd_docu.hxx b/autodoc/source/display/html/hd_docu.hxx index b63b0ea5..3ea2c93a 100644 --- a/autodoc/source/display/html/hd_docu.hxx +++ b/autodoc/source/display/html/hd_docu.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -194,3 +195,5 @@ class Docu_Display : public ary::Display, #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/display/html/hdimpl.cxx b/autodoc/source/display/html/hdimpl.cxx index eb8ace94..dd5a787d 100644 --- a/autodoc/source/display/html/hdimpl.cxx +++ b/autodoc/source/display/html/hdimpl.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -544,3 +545,5 @@ WriteOut_LinkedFunctionText( csi::xml::Element & o_rTitleOut, } // namespace dshelp + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/display/html/hdimpl.hxx b/autodoc/source/display/html/hdimpl.hxx index 69a4b825..b6f8390d 100644 --- a/autodoc/source/display/html/hdimpl.hxx +++ b/autodoc/source/display/html/hdimpl.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -245,3 +246,5 @@ void WriteOut_LinkedFunctionText( using namespace dshelp; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/display/html/html_kit.cxx b/autodoc/source/display/html/html_kit.cxx index 1ff606c2..f6c07907 100644 --- a/autodoc/source/display/html/html_kit.cxx +++ b/autodoc/source/display/html/html_kit.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -303,3 +304,4 @@ IndexList::AddEntry() +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/display/html/html_kit.hxx b/autodoc/source/display/html/html_kit.hxx index fd09d9e2..5df8b0b9 100644 --- a/autodoc/source/display/html/html_kit.hxx +++ b/autodoc/source/display/html/html_kit.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -196,3 +197,5 @@ class IndexList } // namespace adcdisp #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/display/html/nav_main.cxx b/autodoc/source/display/html/nav_main.cxx index e02e53c6..2ebbe0e1 100644 --- a/autodoc/source/display/html/nav_main.cxx +++ b/autodoc/source/display/html/nav_main.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -375,3 +376,4 @@ MainRow::Add_Item( E_Style i_eStyle, +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/display/html/nav_main.hxx b/autodoc/source/display/html/nav_main.hxx index 8463b3d7..233a1748 100644 --- a/autodoc/source/display/html/nav_main.hxx +++ b/autodoc/source/display/html/nav_main.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -116,3 +117,5 @@ class MainRow #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/display/html/navibar.cxx b/autodoc/source/display/html/navibar.cxx index 5376bd6c..ede7e432 100644 --- a/autodoc/source/display/html/navibar.cxx +++ b/autodoc/source/display/html/navibar.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -313,3 +314,5 @@ NavigationBar::Write_SubRows() const (*it)->Write2( *pSubRowsTable ); } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/display/html/navibar.hxx b/autodoc/source/display/html/navibar.hxx index b3e77203..49f83b53 100644 --- a/autodoc/source/display/html/navibar.hxx +++ b/autodoc/source/display/html/navibar.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -116,3 +117,5 @@ class NavigationBar #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/display/html/opageenv.cxx b/autodoc/source/display/html/opageenv.cxx index baa6879e..d7fd5076 100644 --- a/autodoc/source/display/html/opageenv.cxx +++ b/autodoc/source/display/html/opageenv.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -356,7 +357,7 @@ OuputPage_Environment::SetFile_AllDefs() void OuputPage_Environment::SetFile_Index( char i_cLetter ) { - csv_assert( 'A' <= i_cLetter AND i_cLetter <= 'Z' OR i_cLetter == '_' ); + csv_assert( ( 'A' <= i_cLetter AND i_cLetter <= 'Z' ) OR i_cLetter == '_' ); static StreamStr sIndexFileName(40); sIndexFileName.seekp(0); @@ -487,3 +488,5 @@ OuputPage_Environment::RepositoryTitle() const { return Gate().RepositoryTitle(); } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/display/html/opageenv.hxx b/autodoc/source/display/html/opageenv.hxx index af8c5a98..23e4aeb9 100644 --- a/autodoc/source/display/html/opageenv.hxx +++ b/autodoc/source/display/html/opageenv.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -126,3 +127,5 @@ class OuputPage_Environment #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/display/html/outfile.cxx b/autodoc/source/display/html/outfile.cxx index c9174ab7..bf290e67 100644 --- a/autodoc/source/display/html/outfile.cxx +++ b/autodoc/source/display/html/outfile.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -390,3 +391,5 @@ HtmlDocuFile::WriteBody( csv::File & io_aFile ) aBodyData.WriteOut(aBuffer); io_aFile.write(aBuffer.c_str(), aBuffer.size()); } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/display/html/outfile.hxx b/autodoc/source/display/html/outfile.hxx index a7e8d266..f4d14c12 100644 --- a/autodoc/source/display/html/outfile.hxx +++ b/autodoc/source/display/html/outfile.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -84,3 +85,5 @@ class HtmlDocuFile #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/display/html/pagemake.cxx b/autodoc/source/display/html/pagemake.cxx index f645037a..436ab40f 100644 --- a/autodoc/source/display/html/pagemake.cxx +++ b/autodoc/source/display/html/pagemake.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -574,3 +575,4 @@ PageDisplay::Create_IndexFile( int i_nLetter ) Create_File(); } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/display/html/pagemake.hxx b/autodoc/source/display/html/pagemake.hxx index adaafb7b..62fc7d4d 100644 --- a/autodoc/source/display/html/pagemake.hxx +++ b/autodoc/source/display/html/pagemake.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -162,3 +163,5 @@ class PageDisplay : public ary::Display, #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/display/html/pm_aldef.cxx b/autodoc/source/display/html/pm_aldef.cxx index 527ab215..1ca8743d 100644 --- a/autodoc/source/display/html/pm_aldef.cxx +++ b/autodoc/source/display/html/pm_aldef.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -243,3 +244,5 @@ PageMaker_AllDefs::Write_DefsDocu( csi::xml::Element & o_rOut, ShowDocu_On( o_rOut, *pDocuDisplay, i_rTextReplacement ); } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/display/html/pm_aldef.hxx b/autodoc/source/display/html/pm_aldef.hxx index 689d2d91..14700e97 100644 --- a/autodoc/source/display/html/pm_aldef.hxx +++ b/autodoc/source/display/html/pm_aldef.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -86,3 +87,5 @@ class PageMaker_AllDefs : public SpecializedPageMaker #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/display/html/pm_base.cxx b/autodoc/source/display/html/pm_base.cxx index c40f38da..5e762d35 100644 --- a/autodoc/source/display/html/pm_base.cxx +++ b/autodoc/source/display/html/pm_base.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -75,3 +76,4 @@ SpecializedPageMaker::CurOut() return Page().CurOut(); } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/display/html/pm_base.hxx b/autodoc/source/display/html/pm_base.hxx index 0dc14a31..45ef09dc 100644 --- a/autodoc/source/display/html/pm_base.hxx +++ b/autodoc/source/display/html/pm_base.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -86,3 +87,4 @@ class SpecializedPageMaker #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/display/html/pm_class.cxx b/autodoc/source/display/html/pm_class.cxx index 1efd1170..8c22be5c 100644 --- a/autodoc/source/display/html/pm_class.cxx +++ b/autodoc/source/display/html/pm_class.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -809,3 +810,4 @@ Node::IncrBaseCount() } // anonymous namespace +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/display/html/pm_class.hxx b/autodoc/source/display/html/pm_class.hxx index 4c85593c..b3c59005 100644 --- a/autodoc/source/display/html/pm_class.hxx +++ b/autodoc/source/display/html/pm_class.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -129,3 +130,4 @@ class PageMaker_Class : public SpecializedPageMaker #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/display/html/pm_help.cxx b/autodoc/source/display/html/pm_help.cxx index 0cb8d84c..44c5eb8f 100644 --- a/autodoc/source/display/html/pm_help.cxx +++ b/autodoc/source/display/html/pm_help.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -230,3 +231,4 @@ PageMaker_Help::Write_DocuArea() +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/display/html/pm_help.hxx b/autodoc/source/display/html/pm_help.hxx index aca17ec2..fb9c1f56 100644 --- a/autodoc/source/display/html/pm_help.hxx +++ b/autodoc/source/display/html/pm_help.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -61,3 +62,4 @@ class PageMaker_Help : public SpecializedPageMaker #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/display/html/pm_index.cxx b/autodoc/source/display/html/pm_index.cxx index 81c31b56..e70b7f19 100644 --- a/autodoc/source/display/html/pm_index.cxx +++ b/autodoc/source/display/html/pm_index.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -315,3 +316,5 @@ PageMaker_Index::Write_CeIndexEntry( const ary::cpp::CodeEntity & pCurIndex->Def() << " "; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/display/html/pm_index.hxx b/autodoc/source/display/html/pm_index.hxx index 73673bdd..8224f372 100644 --- a/autodoc/source/display/html/pm_index.hxx +++ b/autodoc/source/display/html/pm_index.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -133,3 +134,5 @@ class PageMaker_Index : public SpecializedPageMaker, #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/display/html/pm_namsp.cxx b/autodoc/source/display/html/pm_namsp.cxx index 8b46639e..e2f88026 100644 --- a/autodoc/source/display/html/pm_namsp.cxx +++ b/autodoc/source/display/html/pm_namsp.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -171,3 +172,5 @@ PageMaker_Namespace::Write_ChildLists_forClasses( const char * i_sListTi if ( bChildrenExist ) CurOut() << new HorizontalLine; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/display/html/pm_namsp.hxx b/autodoc/source/display/html/pm_namsp.hxx index 71f04501..5c1322c8 100644 --- a/autodoc/source/display/html/pm_namsp.hxx +++ b/autodoc/source/display/html/pm_namsp.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -76,3 +77,4 @@ class PageMaker_Namespace : public SpecializedPageMaker #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/display/html/pm_start.cxx b/autodoc/source/display/html/pm_start.cxx index e7e0ac55..9efb3595 100644 --- a/autodoc/source/display/html/pm_start.cxx +++ b/autodoc/source/display/html/pm_start.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -135,3 +136,4 @@ PageMaker_Overview::Write_DocuArea() +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/display/html/pm_start.hxx b/autodoc/source/display/html/pm_start.hxx index e8d4f495..1085e1e5 100644 --- a/autodoc/source/display/html/pm_start.hxx +++ b/autodoc/source/display/html/pm_start.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -61,3 +62,4 @@ class PageMaker_Overview : public SpecializedPageMaker #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/display/html/protarea.cxx b/autodoc/source/display/html/protarea.cxx index 03413801..6b50ad8d 100644 --- a/autodoc/source/display/html/protarea.cxx +++ b/autodoc/source/display/html/protarea.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -136,3 +137,4 @@ S_Slot_Table::GetTable() +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/display/html/protarea.hxx b/autodoc/source/display/html/protarea.hxx index b1d62524..007b5161 100644 --- a/autodoc/source/display/html/protarea.hxx +++ b/autodoc/source/display/html/protarea.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -92,3 +93,4 @@ class ProtectionArea #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/display/html/strconst.hxx b/autodoc/source/display/html/strconst.hxx index 31a90e6a..cbc131cd 100644 --- a/autodoc/source/display/html/strconst.hxx +++ b/autodoc/source/display/html/strconst.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -76,3 +77,4 @@ const char * const C_sHFTypeTitle_Typedef = "typedef"; #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/display/idl/hfi_constgroup.cxx b/autodoc/source/display/idl/hfi_constgroup.cxx index 14cc7ca7..d61584e5 100644 --- a/autodoc/source/display/idl/hfi_constgroup.cxx +++ b/autodoc/source/display/idl/hfi_constgroup.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -136,3 +137,4 @@ HF_IdlConstGroup::produce_MemberDetails( HF_SubTitleTable & o_table, aElement.Produce_byData(i_ce); } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/display/idl/hfi_constgroup.hxx b/autodoc/source/display/idl/hfi_constgroup.hxx index 50d06496..4e5dd8f6 100644 --- a/autodoc/source/display/idl/hfi_constgroup.hxx +++ b/autodoc/source/display/idl/hfi_constgroup.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -64,3 +65,4 @@ extern const String #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/display/idl/hfi_doc.cxx b/autodoc/source/display/idl/hfi_doc.cxx index a02ac51d..017e022b 100644 --- a/autodoc/source/display/idl/hfi_doc.cxx +++ b/autodoc/source/display/idl/hfi_doc.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -164,7 +165,7 @@ HF_IdlDocu::Produce_byDocuAndScope( const ce_info & i_rDocu, } } // end for - if (aSeeAlsosWithoutText.size() > 0) + if (!aSeeAlsosWithoutText.empty()) { HF_IdlTag aSeeAlsoTag(Env(), i_rScopeGivingCe); @@ -189,3 +190,5 @@ HF_IdlDocu::Produce_byDocuAndScope( const ce_info & i_rDocu, *(*itSee2) ); } // end for } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/display/idl/hfi_doc.hxx b/autodoc/source/display/idl/hfi_doc.hxx index 342d7fe5..a9f28305 100644 --- a/autodoc/source/display/idl/hfi_doc.hxx +++ b/autodoc/source/display/idl/hfi_doc.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -83,3 +84,5 @@ class HF_IdlDocu : public HtmlFactory_Idl #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/display/idl/hfi_enum.cxx b/autodoc/source/display/idl/hfi_enum.cxx index a7039528..44188191 100644 --- a/autodoc/source/display/idl/hfi_enum.cxx +++ b/autodoc/source/display/idl/hfi_enum.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -131,3 +132,5 @@ HF_IdlEnum::produce_MemberDetails( HF_SubTitleTable & o_table, aElement( Env(), o_table ); aElement.Produce_byData(i_ce); } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/display/idl/hfi_enum.hxx b/autodoc/source/display/idl/hfi_enum.hxx index cf3c5593..0ceafdf2 100644 --- a/autodoc/source/display/idl/hfi_enum.hxx +++ b/autodoc/source/display/idl/hfi_enum.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -66,3 +67,4 @@ extern const String #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/display/idl/hfi_globalindex.cxx b/autodoc/source/display/idl/hfi_globalindex.cxx index 117a8141..e76a411c 100644 --- a/autodoc/source/display/idl/hfi_globalindex.cxx +++ b/autodoc/source/display/idl/hfi_globalindex.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -273,3 +274,5 @@ HF_IdlGlobalIndex::write_EntrySecondTime( Xml::Element & o_destin << " "; i_typeLinkWriter.Produce_IndexSecondEntryLink(o_destination, i_ce); } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/display/idl/hfi_globalindex.hxx b/autodoc/source/display/idl/hfi_globalindex.hxx index c730b905..eaf4c7d4 100644 --- a/autodoc/source/display/idl/hfi_globalindex.hxx +++ b/autodoc/source/display/idl/hfi_globalindex.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -87,3 +88,4 @@ class HF_IdlGlobalIndex : public HtmlFactory_Idl #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/display/idl/hfi_hierarchy.cxx b/autodoc/source/display/idl/hfi_hierarchy.cxx index 4582897c..6b2f8b8f 100644 --- a/autodoc/source/display/idl/hfi_hierarchy.cxx +++ b/autodoc/source/display/idl/hfi_hierarchy.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -200,3 +201,5 @@ Write_Bases( csi::xml::Element & o_out, } } // end for } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/display/idl/hfi_hierarchy.hxx b/autodoc/source/display/idl/hfi_hierarchy.hxx index ec80a598..d0a8c763 100644 --- a/autodoc/source/display/idl/hfi_hierarchy.hxx +++ b/autodoc/source/display/idl/hfi_hierarchy.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -122,3 +123,5 @@ void Write_Bases( io_setColumns ); #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/display/idl/hfi_interface.cxx b/autodoc/source/display/idl/hfi_interface.cxx index c22a063e..2f60a36d 100644 --- a/autodoc/source/display/idl/hfi_interface.cxx +++ b/autodoc/source/display/idl/hfi_interface.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -355,3 +356,5 @@ HF_IdlInterface::produce_BaseHierarchy( Xml::Element & o_screen, } // endif ( (*i_commentedRef).Info() != 0 ) else } // end for } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/display/idl/hfi_interface.hxx b/autodoc/source/display/idl/hfi_interface.hxx index 301f733f..74af1eab 100644 --- a/autodoc/source/display/idl/hfi_interface.hxx +++ b/autodoc/source/display/idl/hfi_interface.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -88,3 +89,5 @@ extern const String #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/display/idl/hfi_linklist.cxx b/autodoc/source/display/idl/hfi_linklist.cxx index 6e2e3161..12810b8e 100644 --- a/autodoc/source/display/idl/hfi_linklist.cxx +++ b/autodoc/source/display/idl/hfi_linklist.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -376,3 +377,4 @@ HF_IdlLinkList::Get_EntryDocu(ce_id i_nMemberId) const } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/display/idl/hfi_linklist.hxx b/autodoc/source/display/idl/hfi_linklist.hxx index 0ea6bbf8..4cfe3d8d 100644 --- a/autodoc/source/display/idl/hfi_linklist.hxx +++ b/autodoc/source/display/idl/hfi_linklist.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -143,3 +144,4 @@ class HF_IdlLinkList : public HtmlFactory_Idl #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/display/idl/hfi_method.cxx b/autodoc/source/display/idl/hfi_method.cxx index 5b6fe5d5..288f1dea 100644 --- a/autodoc/source/display/idl/hfi_method.cxx +++ b/autodoc/source/display/idl/hfi_method.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -79,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, @@ -266,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 @@ -355,3 +235,4 @@ HF_IdlMethod::leave_ContentCell() const Out().Leave(); } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/display/idl/hfi_method.hxx b/autodoc/source/display/idl/hfi_method.hxx index bd2afea1..eea58978 100644 --- a/autodoc/source/display/idl/hfi_method.hxx +++ b/autodoc/source/display/idl/hfi_method.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -102,3 +103,4 @@ class HF_IdlMethod : public HtmlFactory_Idl #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/display/idl/hfi_module.cxx b/autodoc/source/display/idl/hfi_module.cxx index 3cc5f84f..e2923c91 100644 --- a/autodoc/source/display/idl/hfi_module.cxx +++ b/autodoc/source/display/idl/hfi_module.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -297,3 +298,5 @@ HF_IdlModule::produce_LinkDoc( Xml::Element & o_row, aShortDisplay(Env(), &rCell, *i_ce); pShort->Short().DisplayAt(aShortDisplay); } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/display/idl/hfi_module.hxx b/autodoc/source/display/idl/hfi_module.hxx index c4393d17..4af2f334 100644 --- a/autodoc/source/display/idl/hfi_module.hxx +++ b/autodoc/source/display/idl/hfi_module.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -81,3 +82,4 @@ extern const String #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/display/idl/hfi_navibar.cxx b/autodoc/source/display/idl/hfi_navibar.cxx index 65c026a6..098361fe 100644 --- a/autodoc/source/display/idl/hfi_navibar.cxx +++ b/autodoc/source/display/idl/hfi_navibar.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -223,3 +224,4 @@ HF_IdlNavigationBar::Add_SubRow() return *new HF_NaviSubRow( CurOut() ); } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/display/idl/hfi_navibar.hxx b/autodoc/source/display/idl/hfi_navibar.hxx index c99f22f3..70edf205 100644 --- a/autodoc/source/display/idl/hfi_navibar.hxx +++ b/autodoc/source/display/idl/hfi_navibar.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -80,3 +81,5 @@ extern const String C_sLocalManualLinks; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/display/idl/hfi_property.cxx b/autodoc/source/display/idl/hfi_property.cxx index cc292f0a..22c132e7 100644 --- a/autodoc/source/display/idl/hfi_property.cxx +++ b/autodoc/source/display/idl/hfi_property.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -328,7 +329,6 @@ HF_IdlCommentedRelationElement::produce_Summary( Environment & io_env, { csv_assert( i_commentedRef.Info() ); - const ary::idl::Type_id aType = i_commentedRef.Type(); const ce_info & rDocu = *i_commentedRef.Info(); bool bShort = NOT rDocu.Short().IsEmpty(); @@ -449,3 +449,5 @@ HF_IdlCommentedRelationElement::write_Description( const client & i_ce ) const { produce_LinkDoc( Env(), i_ce, CurOut(), m_relation, doctype_complete ); } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/display/idl/hfi_property.hxx b/autodoc/source/display/idl/hfi_property.hxx index 2fe567ad..7c6a2400 100644 --- a/autodoc/source/display/idl/hfi_property.hxx +++ b/autodoc/source/display/idl/hfi_property.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -180,3 +181,5 @@ class HF_IdlCommentedRelationElement : public HF_IdlDataMember }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/display/idl/hfi_service.cxx b/autodoc/source/display/idl/hfi_service.cxx index 6e62e524..f7887402 100644 --- a/autodoc/source/display/idl/hfi_service.cxx +++ b/autodoc/source/display/idl/hfi_service.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -361,3 +362,4 @@ HF_IdlService::produce_MemberDetails( HF_SubTitleTable & o_table, +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/display/idl/hfi_service.hxx b/autodoc/source/display/idl/hfi_service.hxx index 12d68631..9ca4530e 100644 --- a/autodoc/source/display/idl/hfi_service.hxx +++ b/autodoc/source/display/idl/hfi_service.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -97,3 +98,4 @@ extern const String #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/display/idl/hfi_singleton.cxx b/autodoc/source/display/idl/hfi_singleton.cxx index f7694526..04f87e78 100644 --- a/autodoc/source/display/idl/hfi_singleton.cxx +++ b/autodoc/source/display/idl/hfi_singleton.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -131,3 +132,5 @@ HF_IdlSingleton::make_Navibar( const client & i_ce ) const CurOut() << new Html::HorizontalLine(); } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/display/idl/hfi_singleton.hxx b/autodoc/source/display/idl/hfi_singleton.hxx index f3b1f88a..2b1c28e6 100644 --- a/autodoc/source/display/idl/hfi_singleton.hxx +++ b/autodoc/source/display/idl/hfi_singleton.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -67,3 +68,4 @@ extern const String #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/display/idl/hfi_siservice.cxx b/autodoc/source/display/idl/hfi_siservice.cxx index 25d50939..1a2c9fa7 100644 --- a/autodoc/source/display/idl/hfi_siservice.cxx +++ b/autodoc/source/display/idl/hfi_siservice.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -173,3 +174,5 @@ HF_IdlSglIfcService::produce_MemberDetails( HF_SubTitleTable & o_table, funcAttr::HasEllipse(i_ce), i_ce ); } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/display/idl/hfi_siservice.hxx b/autodoc/source/display/idl/hfi_siservice.hxx index cee3c68f..03fef81d 100644 --- a/autodoc/source/display/idl/hfi_siservice.hxx +++ b/autodoc/source/display/idl/hfi_siservice.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -70,3 +71,4 @@ extern const String #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/display/idl/hfi_struct.cxx b/autodoc/source/display/idl/hfi_struct.cxx index bc63652f..37fab0fa 100644 --- a/autodoc/source/display/idl/hfi_struct.cxx +++ b/autodoc/source/display/idl/hfi_struct.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -201,3 +202,5 @@ HF_IdlStruct::produce_MemberDetails( HF_SubTitleTable & o_table, aElement( Env(), o_table ); aElement.Produce_byData(i_ce); } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/display/idl/hfi_struct.hxx b/autodoc/source/display/idl/hfi_struct.hxx index 047db1ae..c56439fc 100644 --- a/autodoc/source/display/idl/hfi_struct.hxx +++ b/autodoc/source/display/idl/hfi_struct.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -76,3 +77,5 @@ extern const String #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/display/idl/hfi_tag.cxx b/autodoc/source/display/idl/hfi_tag.cxx index de7dafab..b75e8683 100644 --- a/autodoc/source/display/idl/hfi_tag.cxx +++ b/autodoc/source/display/idl/hfi_tag.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -352,3 +353,5 @@ HF_IdlDocuTextDisplay::CreateMemberLink() aLink.Produce_LocalLinkInDocu(sLinkToken); } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/display/idl/hfi_tag.hxx b/autodoc/source/display/idl/hfi_tag.hxx index 325465a6..cde541ee 100644 --- a/autodoc/source/display/idl/hfi_tag.hxx +++ b/autodoc/source/display/idl/hfi_tag.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -175,3 +176,5 @@ class HF_IdlTag : public HtmlFactory_Idl, #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/display/idl/hfi_typedef.cxx b/autodoc/source/display/idl/hfi_typedef.cxx index a2da36fa..67bb685a 100644 --- a/autodoc/source/display/idl/hfi_typedef.cxx +++ b/autodoc/source/display/idl/hfi_typedef.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -90,3 +91,5 @@ HF_IdlTypedef::make_Navibar( const client & i_ce ) const CurOut() << new Html::HorizontalLine(); } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/display/idl/hfi_typedef.hxx b/autodoc/source/display/idl/hfi_typedef.hxx index 203ea44f..d1fcbb9d 100644 --- a/autodoc/source/display/idl/hfi_typedef.hxx +++ b/autodoc/source/display/idl/hfi_typedef.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -63,3 +64,4 @@ const String #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/display/idl/hfi_typetext.cxx b/autodoc/source/display/idl/hfi_typetext.cxx index 65b5876d..e8171445 100644 --- a/autodoc/source/display/idl/hfi_typetext.cxx +++ b/autodoc/source/display/idl/hfi_typetext.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -739,7 +740,7 @@ void HF_IdlTypeText::write_TemplateParameterList( const std::vector<ary::idl::Type_id> & i_templateParameters ) const { - if (i_templateParameters.size() == 0) + if (i_templateParameters.empty()) return; HF_IdlTypeText @@ -755,3 +756,5 @@ HF_IdlTypeText::write_TemplateParameterList( } CurOut() << " >"; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/display/idl/hfi_typetext.hxx b/autodoc/source/display/idl/hfi_typetext.hxx index 5b14e994..e7ec21d6 100644 --- a/autodoc/source/display/idl/hfi_typetext.hxx +++ b/autodoc/source/display/idl/hfi_typetext.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -156,3 +157,4 @@ class HF_IdlTypeText : public HtmlFactory_Idl #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/display/idl/hfi_xrefpage.cxx b/autodoc/source/display/idl/hfi_xrefpage.cxx index b85a0c7f..4afea859 100644 --- a/autodoc/source/display/idl/hfi_xrefpage.cxx +++ b/autodoc/source/display/idl/hfi_xrefpage.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -271,3 +272,5 @@ HF_IdlXrefs::recursive_make_ListInTree( Xml::Element & o_rDisplay, } } // end for } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/display/idl/hfi_xrefpage.hxx b/autodoc/source/display/idl/hfi_xrefpage.hxx index 85db5840..0f0ca26c 100644 --- a/autodoc/source/display/idl/hfi_xrefpage.hxx +++ b/autodoc/source/display/idl/hfi_xrefpage.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -102,3 +103,5 @@ class HF_IdlXrefs : public HtmlFactory_Idl // IMPLEMENTATION #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/display/idl/hi_ary.cxx b/autodoc/source/display/idl/hi_ary.cxx index 0fb858b3..fa789cac 100644 --- a/autodoc/source/display/idl/hi_ary.cxx +++ b/autodoc/source/display/idl/hi_ary.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -176,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; } @@ -281,3 +269,5 @@ AryAccess::Ces() const { return rGate.Ces(); } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/display/idl/hi_ary.hxx b/autodoc/source/display/idl/hi_ary.hxx index 01225bf4..99ae6372 100644 --- a/autodoc/source/display/idl/hi_ary.hxx +++ b/autodoc/source/display/idl/hi_ary.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -160,3 +161,4 @@ class AryAccess #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/display/idl/hi_display.cxx b/autodoc/source/display/idl/hi_display.cxx index d339f776..170450e9 100644 --- a/autodoc/source/display/idl/hi_display.cxx +++ b/autodoc/source/display/idl/hi_display.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -161,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 @@ -205,3 +196,5 @@ HtmlDisplay_Idl::Create_CssFile() aCssFile.write("\n\n\n"); aCssFile.write(pCurPageEnv->Layout().CssStylesExplanation()); } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/display/idl/hi_env.cxx b/autodoc/source/display/idl/hi_env.cxx index 7166984c..668e8532 100644 --- a/autodoc/source/display/idl/hi_env.cxx +++ b/autodoc/source/display/idl/hi_env.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -197,3 +198,5 @@ HtmlEnvironment_Idl::CurPageCe_AsFile(const char * i_sEnding) const slCe() << "/" << sCe << i_sEnding; return String(slCe().c_str()); } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/display/idl/hi_env.hxx b/autodoc/source/display/idl/hi_env.hxx index b8bd9f32..a081e07f 100644 --- a/autodoc/source/display/idl/hi_env.hxx +++ b/autodoc/source/display/idl/hi_env.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -159,3 +160,4 @@ class HtmlEnvironment_Idl #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/display/idl/hi_factory.cxx b/autodoc/source/display/idl/hi_factory.cxx index b15f3ce5..1e9c091b 100644 --- a/autodoc/source/display/idl/hi_factory.cxx +++ b/autodoc/source/display/idl/hi_factory.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -319,3 +320,4 @@ HtmlFactory_Idl::inq_BaseOf( const client & ) const return type_id(0); } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/display/idl/hi_factory.hxx b/autodoc/source/display/idl/hi_factory.hxx index dfe3e8c7..2ff41228 100644 --- a/autodoc/source/display/idl/hi_factory.hxx +++ b/autodoc/source/display/idl/hi_factory.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -167,3 +168,5 @@ extern const String #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/display/idl/hi_linkhelper.cxx b/autodoc/source/display/idl/hi_linkhelper.cxx index bd556eaa..4d5f5d9d 100644 --- a/autodoc/source/display/idl/hi_linkhelper.cxx +++ b/autodoc/source/display/idl/hi_linkhelper.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -94,3 +95,5 @@ nameChainLinker( const char * ) sModuleFileName_( output::ModuleFileName() ); return sModuleFileName_; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/display/idl/hi_linkhelper.hxx b/autodoc/source/display/idl/hi_linkhelper.hxx index 3f2c961e..1cdfaa7d 100644 --- a/autodoc/source/display/idl/hi_linkhelper.hxx +++ b/autodoc/source/display/idl/hi_linkhelper.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -84,9 +85,7 @@ class LinkHelper const String & XrefsSuffix() const; private: - // DATA - mutable HtmlEnvironment_Idl & - rEnv; + HtmlEnvironment_Idl & rEnv; }; inline const ary::idl::CodeEntity * @@ -105,3 +104,5 @@ String nameChainLinker( #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/display/idl/hi_main.cxx b/autodoc/source/display/idl/hi_main.cxx index 8c9f30ad..4217c93b 100644 --- a/autodoc/source/display/idl/hi_main.cxx +++ b/autodoc/source/display/idl/hi_main.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -762,3 +763,4 @@ MainDisplay_Idl::do_Typedef2s( const ary::idl::CodeEntity & i_ce ) aUses.Write_ManualLinks(i_ce); } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/display/idl/hi_main.hxx b/autodoc/source/display/idl/hi_main.hxx index 10a35d6d..2e52def8 100644 --- a/autodoc/source/display/idl/hi_main.hxx +++ b/autodoc/source/display/idl/hi_main.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -176,3 +177,5 @@ class MainDisplay_Idl : public csv::ProcessorIfc, #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/display/inc/cfrstd.hxx b/autodoc/source/display/inc/cfrstd.hxx index 7d1b6abc..e2e0cd87 100644 --- a/autodoc/source/display/inc/cfrstd.hxx +++ b/autodoc/source/display/inc/cfrstd.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -78,3 +79,4 @@ class StdFrame : public display::CorporateFrame #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/display/inc/html/chd_udk2.hxx b/autodoc/source/display/inc/html/chd_udk2.hxx index 52d6a7f7..c7f0e50f 100644 --- a/autodoc/source/display/inc/html/chd_udk2.hxx +++ b/autodoc/source/display/inc/html/chd_udk2.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -93,3 +94,5 @@ class CppHtmlDisplay_Udk2 : public autodoc::HtmlDisplay_UdkStd #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/display/inc/idl/hi_display.hxx b/autodoc/source/display/inc/idl/hi_display.hxx index eef6a09d..aec860f7 100644 --- a/autodoc/source/display/inc/idl/hi_display.hxx +++ b/autodoc/source/display/inc/idl/hi_display.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -109,3 +110,4 @@ class HtmlDisplay_Idl : public autodoc::HtmlDisplay_Idl_Ifc #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/display/inc/toolkit/hf_docentry.hxx b/autodoc/source/display/inc/toolkit/hf_docentry.hxx index 2023c83d..174c71c8 100644 --- a/autodoc/source/display/inc/toolkit/hf_docentry.hxx +++ b/autodoc/source/display/inc/toolkit/hf_docentry.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -57,3 +58,5 @@ class HF_DocEntryList : public HtmlMaker #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/display/inc/toolkit/hf_funcdecl.hxx b/autodoc/source/display/inc/toolkit/hf_funcdecl.hxx index a1da3c2b..0ae73d75 100644 --- a/autodoc/source/display/inc/toolkit/hf_funcdecl.hxx +++ b/autodoc/source/display/inc/toolkit/hf_funcdecl.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -35,39 +36,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: @@ -102,3 +70,5 @@ class HF_FunctionDeclaration : public HtmlMaker #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/display/inc/toolkit/hf_linachain.hxx b/autodoc/source/display/inc/toolkit/hf_linachain.hxx index edb68d6b..08055f99 100644 --- a/autodoc/source/display/inc/toolkit/hf_linachain.hxx +++ b/autodoc/source/display/inc/toolkit/hf_linachain.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -70,3 +71,5 @@ class HF_LinkedNameChain : public HtmlMaker #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/display/inc/toolkit/hf_navi_main.hxx b/autodoc/source/display/inc/toolkit/hf_navi_main.hxx index e956450d..357031b5 100644 --- a/autodoc/source/display/inc/toolkit/hf_navi_main.hxx +++ b/autodoc/source/display/inc/toolkit/hf_navi_main.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -90,3 +91,4 @@ class HF_NaviMainRow : public HtmlMaker #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/display/inc/toolkit/hf_navi_sub.hxx b/autodoc/source/display/inc/toolkit/hf_navi_sub.hxx index fe0770a5..d24bfeb3 100644 --- a/autodoc/source/display/inc/toolkit/hf_navi_sub.hxx +++ b/autodoc/source/display/inc/toolkit/hf_navi_sub.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -79,3 +80,4 @@ class HF_NaviSubRow : public HtmlMaker #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/display/inc/toolkit/hf_title.hxx b/autodoc/source/display/inc/toolkit/hf_title.hxx index d61c2cea..36b51c91 100644 --- a/autodoc/source/display/inc/toolkit/hf_title.hxx +++ b/autodoc/source/display/inc/toolkit/hf_title.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -89,3 +90,5 @@ class HF_SubTitleTable : public HtmlMaker #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/display/inc/toolkit/htmlfactory.hxx b/autodoc/source/display/inc/toolkit/htmlfactory.hxx index 6a26f539..1ded9847 100644 --- a/autodoc/source/display/inc/toolkit/htmlfactory.hxx +++ b/autodoc/source/display/inc/toolkit/htmlfactory.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -100,3 +101,4 @@ class HtmlMaker #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/display/inc/toolkit/htmlfile.hxx b/autodoc/source/display/inc/toolkit/htmlfile.hxx index b2f81f5a..5c096473 100644 --- a/autodoc/source/display/inc/toolkit/htmlfile.hxx +++ b/autodoc/source/display/inc/toolkit/htmlfile.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -84,3 +85,4 @@ class DocuFile_Html #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/display/inc/toolkit/out_node.hxx b/autodoc/source/display/inc/toolkit/out_node.hxx index b1cc90f9..558ab742 100644 --- a/autodoc/source/display/inc/toolkit/out_node.hxx +++ b/autodoc/source/display/inc/toolkit/out_node.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -127,3 +128,5 @@ class Node } // namespace output #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/display/inc/toolkit/out_position.hxx b/autodoc/source/display/inc/toolkit/out_position.hxx index d451647f..aefce423 100644 --- a/autodoc/source/display/inc/toolkit/out_position.hxx +++ b/autodoc/source/display/inc/toolkit/out_position.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -115,3 +116,5 @@ Position::Set_File( const String & i_file ) } // namespace output #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/display/inc/toolkit/out_tree.hxx b/autodoc/source/display/inc/toolkit/out_tree.hxx index c2cb7616..1fc60374 100644 --- a/autodoc/source/display/inc/toolkit/out_tree.hxx +++ b/autodoc/source/display/inc/toolkit/out_tree.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -134,3 +135,5 @@ Tree::Set_ProjectsRoot( const StringVector & i_path ) #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/display/inc/toolkit/outputstack.hxx b/autodoc/source/display/inc/toolkit/outputstack.hxx index 770e8081..d71cba3b 100644 --- a/autodoc/source/display/inc/toolkit/outputstack.hxx +++ b/autodoc/source/display/inc/toolkit/outputstack.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -71,3 +72,4 @@ OutputStack::Out() const #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/display/kernel/displfct.cxx b/autodoc/source/display/kernel/displfct.cxx index 53cccc68..81ea5566 100644 --- a/autodoc/source/display/kernel/displfct.cxx +++ b/autodoc/source/display/kernel/displfct.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -87,3 +88,4 @@ DisplayToolsFactory::Create_StdFrame() const } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/display/kernel/displfct.hxx b/autodoc/source/display/kernel/displfct.hxx index 7e156fd8..b0854912 100644 --- a/autodoc/source/display/kernel/displfct.hxx +++ b/autodoc/source/display/kernel/displfct.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -61,3 +62,4 @@ class DisplayToolsFactory : public autodoc::DisplayToolsFactory_Ifc #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/display/toolkit/hf_docentry.cxx b/autodoc/source/display/toolkit/hf_docentry.cxx index 0140c157..7e5ae458 100644 --- a/autodoc/source/display/toolkit/hf_docentry.cxx +++ b/autodoc/source/display/toolkit/hf_docentry.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -72,3 +73,5 @@ HF_DocEntryList::Produce_Definition() return CurOut() >> *new Html::DefListDefinition; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/display/toolkit/hf_funcdecl.cxx b/autodoc/source/display/toolkit/hf_funcdecl.cxx index 6e941bb7..4ef1d545 100644 --- a/autodoc/source/display/toolkit/hf_funcdecl.cxx +++ b/autodoc/source/display/toolkit/hf_funcdecl.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -155,49 +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/display/toolkit/hf_linachain.cxx b/autodoc/source/display/toolkit/hf_linachain.cxx index f176ea5f..c4bba8e4 100644 --- a/autodoc/source/display/toolkit/hf_linachain.cxx +++ b/autodoc/source/display/toolkit/hf_linachain.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -108,3 +109,5 @@ HF_LinkedNameChain::produce_Level( output::Node & i_levelNode, CurOut() << " "; } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/display/toolkit/hf_navi_main.cxx b/autodoc/source/display/toolkit/hf_navi_main.cxx index cae2600f..de5fca30 100644 --- a/autodoc/source/display/toolkit/hf_navi_main.cxx +++ b/autodoc/source/display/toolkit/hf_navi_main.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -236,3 +237,4 @@ NoneItem::do_ProduceItem() const } // anonymous namespace +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/display/toolkit/hf_navi_sub.cxx b/autodoc/source/display/toolkit/hf_navi_sub.cxx index fe52d599..2b9758f1 100644 --- a/autodoc/source/display/toolkit/hf_navi_sub.cxx +++ b/autodoc/source/display/toolkit/hf_navi_sub.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -101,3 +102,4 @@ HF_NaviSubRow::Produce_Row() } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/display/toolkit/hf_title.cxx b/autodoc/source/display/toolkit/hf_title.cxx index 0ae57bc1..4341595f 100644 --- a/autodoc/source/display/toolkit/hf_title.cxx +++ b/autodoc/source/display/toolkit/hf_title.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -167,3 +168,5 @@ HF_SubTitleTable::Add_Row() { return CurOut() >> *new Html::TableRow; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/display/toolkit/htmlfile.cxx b/autodoc/source/display/toolkit/htmlfile.cxx index e53e19a3..6d91f9d0 100644 --- a/autodoc/source/display/toolkit/htmlfile.cxx +++ b/autodoc/source/display/toolkit/htmlfile.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -209,3 +210,4 @@ DocuFile_Html::WriteBody( csv::File & io_aFile ) +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/display/toolkit/out_node.cxx b/autodoc/source/display/toolkit/out_node.cxx index fec10433..ad6a7f07 100644 --- a/autodoc/source/display/toolkit/out_node.cxx +++ b/autodoc/source/display/toolkit/out_node.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -187,3 +188,5 @@ Node::Null_() } // namespace output + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/display/toolkit/out_position.cxx b/autodoc/source/display/toolkit/out_position.cxx index c4c7b198..6753976e 100644 --- a/autodoc/source/display/toolkit/out_position.cxx +++ b/autodoc/source/display/toolkit/out_position.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -237,3 +238,5 @@ get_UpLink(uintt i_depth) } // namespace output + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/display/toolkit/out_tree.cxx b/autodoc/source/display/toolkit/out_tree.cxx index 758a6dcd..ebe1228b 100644 --- a/autodoc/source/display/toolkit/out_tree.cxx +++ b/autodoc/source/display/toolkit/out_tree.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -51,3 +52,5 @@ Tree::~Tree() } // namespace output + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/display/toolkit/outputstack.cxx b/autodoc/source/display/toolkit/outputstack.cxx index c5ff7433..074c385d 100644 --- a/autodoc/source/display/toolkit/outputstack.cxx +++ b/autodoc/source/display/toolkit/outputstack.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -56,3 +57,4 @@ OutputStack::Leave() +/* 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 ee119bad..9c6aa56e 100644 --- a/autodoc/source/exes/adc_uni/adc_cl.cxx +++ b/autodoc/source/exes/adc_uni/adc_cl.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -85,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), @@ -566,3 +398,5 @@ CommandLine::sort_Commands() } } // namespace autodoc + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/exes/adc_uni/adc_cmd.hxx b/autodoc/source/exes/adc_uni/adc_cmd.hxx index 3d718585..72e75ff8 100644 --- a/autodoc/source/exes/adc_uni/adc_cmd.hxx +++ b/autodoc/source/exes/adc_uni/adc_cmd.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -129,3 +130,5 @@ class X_CommandLine } // namespace command } // namespace autodoc #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/exes/adc_uni/adc_cmd_parse.cxx b/autodoc/source/exes/adc_uni/adc_cmd_parse.cxx index 6f19e85c..1077c9cb 100644 --- a/autodoc/source/exes/adc_uni/adc_cmd_parse.cxx +++ b/autodoc/source/exes/adc_uni/adc_cmd_parse.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -219,7 +220,7 @@ void Parse::do_clDefaultProject( opt_iter & it, opt_iter itEnd ) { - if ( aProjects.size() > 0 ) + if ( !aProjects.empty() ) { throw X_CommandLine( "Both, named projects and a default project, cannot be used together." ); } @@ -341,3 +342,4 @@ S_ProjectData::do_Init( opt_iter & it, +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/exes/adc_uni/adc_cmd_parse.hxx b/autodoc/source/exes/adc_uni/adc_cmd_parse.hxx index f6c27b61..0f15f49a 100644 --- a/autodoc/source/exes/adc_uni/adc_cmd_parse.hxx +++ b/autodoc/source/exes/adc_uni/adc_cmd_parse.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -206,3 +207,5 @@ class S_ProjectData : public Context #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/exes/adc_uni/adc_cmds.cxx b/autodoc/source/exes/adc_uni/adc_cmds.cxx index 5b87d036..c54adea0 100644 --- a/autodoc/source/exes/adc_uni/adc_cmds.cxx +++ b/autodoc/source/exes/adc_uni/adc_cmds.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -175,3 +176,5 @@ CreateHtml::run_Cpp() const } // namespace command } // namespace autodoc + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/exes/adc_uni/adc_cmds.hxx b/autodoc/source/exes/adc_uni/adc_cmds.hxx index 26d23208..784a5040 100644 --- a/autodoc/source/exes/adc_uni/adc_cmds.hxx +++ b/autodoc/source/exes/adc_uni/adc_cmds.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -123,3 +124,5 @@ CHECKOPT( bool b, const char * miss, const String & opt ) #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/exes/adc_uni/adc_msg.cxx b/autodoc/source/exes/adc_uni/adc_msg.cxx index d355f297..15f8377f 100644 --- a/autodoc/source/exes/adc_uni/adc_msg.cxx +++ b/autodoc/source/exes/adc_uni/adc_msg.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -206,3 +207,5 @@ Messages::WriteParagraph( csv::File & o_out, } } // namespace autodoc + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/exes/adc_uni/cmd_run.cxx b/autodoc/source/exes/adc_uni/cmd_run.cxx index 411946ee..24eb9f40 100644 --- a/autodoc/source/exes/adc_uni/cmd_run.cxx +++ b/autodoc/source/exes/adc_uni/cmd_run.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -272,342 +273,9 @@ 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 +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/exes/adc_uni/cmd_run.hxx b/autodoc/source/exes/adc_uni/cmd_run.hxx index 1b7c2cca..c316037a 100644 --- a/autodoc/source/exes/adc_uni/cmd_run.hxx +++ b/autodoc/source/exes/adc_uni/cmd_run.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -102,3 +103,5 @@ class Parser } // namespace autodoc #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/exes/adc_uni/cmd_sincedata.cxx b/autodoc/source/exes/adc_uni/cmd_sincedata.cxx index aef80781..bb21028e 100644 --- a/autodoc/source/exes/adc_uni/cmd_sincedata.cxx +++ b/autodoc/source/exes/adc_uni/cmd_sincedata.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -127,3 +128,5 @@ SinceTagTransformationData::do_Init( opt_iter & it, } // namespace command } // namespace autodoc + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/exes/adc_uni/cmd_sincedata.hxx b/autodoc/source/exes/adc_uni/cmd_sincedata.hxx index 999e2c0a..f6bb5cac 100644 --- a/autodoc/source/exes/adc_uni/cmd_sincedata.hxx +++ b/autodoc/source/exes/adc_uni/cmd_sincedata.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -89,3 +90,5 @@ class SinceTagTransformationData : public Context #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/exes/adc_uni/main.cxx b/autodoc/source/exes/adc_uni/main.cxx index e7b7eafd..f0f0b89d 100644 --- a/autodoc/source/exes/adc_uni/main.cxx +++ b/autodoc/source/exes/adc_uni/main.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -52,3 +53,4 @@ main( int argc, +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/exes/adc_uni/makefile.mk b/autodoc/source/exes/adc_uni/makefile.mk index 8baea083..bf959e72 100644 --- a/autodoc/source/exes/adc_uni/makefile.mk +++ b/autodoc/source/exes/adc_uni/makefile.mk @@ -76,11 +76,11 @@ APP1OBJS= $(OBJ)$/main.obj APP1RPATH=SDK .IF "$(GUI)"=="WNT" -APP1STDLIBS= $(LIBSTLPORT) $(COSVLIB) $(UDMLIB) +APP1STDLIBS= $(COSVLIB) $(UDMLIB) .ELSE .IF "$(OS)"=="MACOSX" # See <http://porting.openoffice.org/servlets/ReadMsg?list=mac&msgNo=6911>: -APP1STDLIBS= $(LIBSTLPORT) -Wl,-all_load -ludm -lcosv +APP1STDLIBS= -Wl,-all_load -ludm -lcosv .ELSE APP1STDLIBS= -lcosv -ludm .ENDIF diff --git a/autodoc/source/inc/adc_cl.hxx b/autodoc/source/inc/adc_cl.hxx index 73c009d3..b7820eae 100644 --- a/autodoc/source/inc/adc_cl.hxx +++ b/autodoc/source/inc/adc_cl.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -191,3 +192,4 @@ DEBUG_ShowTokens() #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/inc/adc_msg.hxx b/autodoc/source/inc/adc_msg.hxx index 06e295fd..8562056e 100644 --- a/autodoc/source/inc/adc_msg.hxx +++ b/autodoc/source/inc/adc_msg.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -139,3 +140,5 @@ TheMessages() } #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/inc/docu_node_ids.hxx b/autodoc/source/inc/docu_node_ids.hxx index e5baa098..474a9aa6 100644 --- a/autodoc/source/inc/docu_node_ids.hxx +++ b/autodoc/source/inc/docu_node_ids.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -62,3 +63,5 @@ namespace docnt = ::ary::doc::nodetype; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/inc/estack.hxx b/autodoc/source/inc/estack.hxx index fbc70242..bd926d3b 100644 --- a/autodoc/source/inc/estack.hxx +++ b/autodoc/source/inc/estack.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -32,23 +33,23 @@ // USED SERVICES // BASE CLASSES -#include <slist> +#include <list> // COMPONENTS // PARAMETERS template <class ELEM> -class EStack : private std::slist<ELEM> +class EStack : private std::list<ELEM> { private: - typedef std::slist<ELEM> base; + typedef std::list<ELEM> base; const base & Base() const { return *this; } base & Base() { return *this; } public: typedef ELEM value_type; - typedef typename std::slist<ELEM>::size_type size_type; + typedef typename std::list<ELEM>::size_type size_type; // LIFECYCLE EStack() {} @@ -92,3 +93,4 @@ class EStack : private std::slist<ELEM> #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/inc/luxenum.hxx b/autodoc/source/inc/luxenum.hxx index beefb484..e75d6a3f 100644 --- a/autodoc/source/inc/luxenum.hxx +++ b/autodoc/source/inc/luxenum.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -101,3 +102,4 @@ class Enum // : public Template_Base } // namespace lux #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/inc/manip.hxx b/autodoc/source/inc/manip.hxx index 64a71763..b74bdbf7 100644 --- a/autodoc/source/inc/manip.hxx +++ b/autodoc/source/inc/manip.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -59,3 +60,4 @@ class Const_Manipulator #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/inc/precomp.h b/autodoc/source/inc/precomp.h index 6f05a707..c7cdb20a 100644 --- a/autodoc/source/inc/precomp.h +++ b/autodoc/source/inc/precomp.h @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -64,3 +65,5 @@ Flush() { return csv::Flush; } #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/inc/prprpr.hxx b/autodoc/source/inc/prprpr.hxx index 1f40483d..ba1c1fdb 100644 --- a/autodoc/source/inc/prprpr.hxx +++ b/autodoc/source/inc/prprpr.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -56,3 +57,5 @@ bool HandleOperatorsBeforeTextItem( /// @return true, if text it #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/inc/tools/filecoll.hxx b/autodoc/source/inc/tools/filecoll.hxx index 1a6dd4e5..89756c52 100644 --- a/autodoc/source/inc/tools/filecoll.hxx +++ b/autodoc/source/inc/tools/filecoll.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -67,3 +68,4 @@ class FileCollector : public autodoc::FileCollector_Ifc #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/inc/tools/tkpchars.hxx b/autodoc/source/inc/tools/tkpchars.hxx index 1000b362..a1aa7970 100644 --- a/autodoc/source/inc/tools/tkpchars.hxx +++ b/autodoc/source/inc/tools/tkpchars.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -168,3 +169,4 @@ CharacterSource::CurPos() const #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/mkinc/fullcpp.mk b/autodoc/source/mkinc/fullcpp.mk index 75b25164..c7519d81 100644 --- a/autodoc/source/mkinc/fullcpp.mk +++ b/autodoc/source/mkinc/fullcpp.mk @@ -35,7 +35,8 @@ .IF "$(GUI)"=="WNT" CFLAGS+= -GR .ENDIF -.IF "$(OS)"=="LINUX" || "$(OS)"=="FREEBSD" || "$(OS)"=="NETBSD" || $(COM) == "GCC" +.IF "$(OS)"=="LINUX" || "$(OS)"=="FREEBSD" || "$(OS)"=="NETBSD" || \ + "$(OS)"=="DRAGONFLY" || $(COM) == "GCC" CFLAGSCXX+= -frtti .ENDIF diff --git a/autodoc/source/parser/adoc/a_rdocu.cxx b/autodoc/source/parser/adoc/a_rdocu.cxx index a1e17b2f..016de553 100644 --- a/autodoc/source/parser/adoc/a_rdocu.cxx +++ b/autodoc/source/parser/adoc/a_rdocu.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -88,3 +89,4 @@ DocuExplorer::Process_Token( DYN adoc::Token & let_drToken ) } // namespace adoc +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser/adoc/adoc_tok.cxx b/autodoc/source/parser/adoc/adoc_tok.cxx index 9b2a516a..e2cca6e6 100644 --- a/autodoc/source/parser/adoc/adoc_tok.cxx +++ b/autodoc/source/parser/adoc/adoc_tok.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -45,3 +46,4 @@ Token::DealOut( ::TokenDealer & o_rDealer ) } // namespace adoc +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser/adoc/cx_a_std.cxx b/autodoc/source/parser/adoc/cx_a_std.cxx index 60e4a8e0..974218d9 100644 --- a/autodoc/source/parser/adoc/cx_a_std.cxx +++ b/autodoc/source/parser/adoc/cx_a_std.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -514,3 +515,4 @@ TCF_Whitespace(const char * i_sText) */ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser/adoc/cx_a_sub.cxx b/autodoc/source/parser/adoc/cx_a_sub.cxx index 47f278fe..03c6b8a4 100644 --- a/autodoc/source/parser/adoc/cx_a_sub.cxx +++ b/autodoc/source/parser/adoc/cx_a_sub.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -180,3 +181,4 @@ Cx_AtTagCompletion::FollowUpContext() } // namespace adoc +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser/adoc/docu_pe.cxx b/autodoc/source/parser/adoc/docu_pe.cxx index c82f7451..78b0ab86 100644 --- a/autodoc/source/parser/adoc/docu_pe.cxx +++ b/autodoc/source/parser/adoc/docu_pe.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -401,3 +402,4 @@ Adoc_PE::FinishCurShortTag() +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser/adoc/prs_adoc.cxx b/autodoc/source/parser/adoc/prs_adoc.cxx index 9ab5d205..5767b422 100644 --- a/autodoc/source/parser/adoc/prs_adoc.cxx +++ b/autodoc/source/parser/adoc/prs_adoc.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -55,3 +56,4 @@ DocuParser_AutodocStyle::Create_DocuContext() const +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser/adoc/tk_attag.cxx b/autodoc/source/parser/adoc/tk_attag.cxx index cb501010..2d7a9b5f 100644 --- a/autodoc/source/parser/adoc/tk_attag.cxx +++ b/autodoc/source/parser/adoc/tk_attag.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -36,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 { @@ -109,3 +83,4 @@ DEFINE_TOKEN_CLASS(at_since, "Since"); } // namespace adoc +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser/adoc/tk_docw.cxx b/autodoc/source/parser/adoc/tk_docw.cxx index c08211a5..7141d320 100644 --- a/autodoc/source/parser/adoc/tk_docw.cxx +++ b/autodoc/source/parser/adoc/tk_docw.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -126,3 +127,4 @@ Tok_EoDocu::Text() const } // namespace adoc +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser/cpp/all_toks.cxx b/autodoc/source/parser/cpp/all_toks.cxx index 1115756e..8934e2e8 100644 --- a/autodoc/source/parser/cpp/all_toks.cxx +++ b/autodoc/source/parser/cpp/all_toks.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -149,3 +150,5 @@ Tok_UnblockMacro::DealOut( ::TokenDealer & o_rDealer ) } } // namespace cpp + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser/cpp/all_toks.hxx b/autodoc/source/parser/cpp/all_toks.hxx index 946fd220..e2b7a7f4 100644 --- a/autodoc/source/parser/cpp/all_toks.hxx +++ b/autodoc/source/parser/cpp/all_toks.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -184,7 +185,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,9 +212,10 @@ class Tok_Operator : public cpp::Token // expression class Tok_Ignore : public cpp::Token class Tok_ContextChanger : public cpp::Token -#endif // 0 - +*/ } // namespace cpp #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser/cpp/c_dealer.cxx b/autodoc/source/parser/cpp/c_dealer.cxx index c3731993..a3abd15b 100644 --- a/autodoc/source/parser/cpp/c_dealer.cxx +++ b/autodoc/source/parser/cpp/c_dealer.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,13 +29,11 @@ #include <precomp.h> #include "c_dealer.hxx" - // NOT FULLY DECLARED SERVICES #include <ary/cpp/c_gate.hxx> #include <ary/loc/locp_le.hxx> #include <ary/loc/loc_root.hxx> #include <ary/loc/loc_file.hxx> -//#include <ary/docu.hxx> #include <adoc/a_rdocu.hxx> #include "all_toks.hxx" #include "c_rcode.hxx" @@ -147,3 +146,4 @@ Distributor::AsDistributor() } // namespace cpp +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser/cpp/c_dealer.hxx b/autodoc/source/parser/cpp/c_dealer.hxx index d1ed3f88..040bcdab 100644 --- a/autodoc/source/parser/cpp/c_dealer.hxx +++ b/autodoc/source/parser/cpp/c_dealer.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -106,3 +107,4 @@ class Distributor : public cpp::TokenDealer, /// Handle C++ code tokens. } // namespace cpp #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser/cpp/c_rcode.cxx b/autodoc/source/parser/cpp/c_rcode.cxx index fffb5943..4979e2a4 100644 --- a/autodoc/source/parser/cpp/c_rcode.cxx +++ b/autodoc/source/parser/cpp/c_rcode.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,11 +29,9 @@ #include <precomp.h> #include "c_rcode.hxx" - // NOT FULLY DECLARED SERVICES #include <ary/cpp/c_gate.hxx> #include <ary/cpp/c_namesp.hxx> -// #include <ary/cpp/c_groups.hxx> #include <ary/loc/locp_le.hxx> #include "cpp_pe.hxx" #include <adc_cl.hxx> @@ -140,7 +139,7 @@ CodeExplorer::CurToken() const Cpp_PE & CodeExplorer::CurEnv() const { - csv_assert(aEnvironments.size() > 0); + csv_assert(!aEnvironments.empty()); csv_assert(aEnvironments.back() != 0); return *aEnvironments.back(); @@ -159,3 +158,4 @@ CodeExplorer::PushEnv() const } // namespace cpp +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser/cpp/c_rcode.hxx b/autodoc/source/parser/cpp/c_rcode.hxx index 125191e1..ddc60b2d 100644 --- a/autodoc/source/parser/cpp/c_rcode.hxx +++ b/autodoc/source/parser/cpp/c_rcode.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -102,3 +103,4 @@ class CodeExplorer : private TokenProcessing_Types #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser/cpp/cpp_pe.cxx b/autodoc/source/parser/cpp/cpp_pe.cxx index dc70dbb6..45c4e84a 100644 --- a/autodoc/source/parser/cpp/cpp_pe.cxx +++ b/autodoc/source/parser/cpp/cpp_pe.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -76,3 +77,4 @@ Cpp_PE::Handle_ChildFailure() } // namespace cpp +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser/cpp/cpp_pe.hxx b/autodoc/source/parser/cpp/cpp_pe.hxx index 584bc242..c1b0b558 100644 --- a/autodoc/source/parser/cpp/cpp_pe.hxx +++ b/autodoc/source/parser/cpp/cpp_pe.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -79,3 +80,4 @@ Cpp_PE::Env() const #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser/cpp/cpp_tok.hxx b/autodoc/source/parser/cpp/cpp_tok.hxx index e74b8de4..960ad0dc 100644 --- a/autodoc/source/parser/cpp/cpp_tok.hxx +++ b/autodoc/source/parser/cpp/cpp_tok.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -61,3 +62,4 @@ class Token : public TextToken #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser/cpp/cx_base.cxx b/autodoc/source/parser/cpp/cx_base.cxx index 2cbb89b5..2493a700 100644 --- a/autodoc/source/parser/cpp/cx_base.cxx +++ b/autodoc/source/parser/cpp/cx_base.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -75,3 +76,4 @@ Cx_Base::AssignDealer( Distributor & o_rDealer ) +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser/cpp/cx_base.hxx b/autodoc/source/parser/cpp/cx_base.hxx index 3ab5be96..0bdbb6e5 100644 --- a/autodoc/source/parser/cpp/cx_base.hxx +++ b/autodoc/source/parser/cpp/cx_base.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -94,3 +95,4 @@ Cx_Base::Dealer() const #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser/cpp/cx_c_pp.cxx b/autodoc/source/parser/cpp/cx_c_pp.cxx index 9ef2571e..6e494e9f 100644 --- a/autodoc/source/parser/cpp/cx_c_pp.cxx +++ b/autodoc/source/parser/cpp/cx_c_pp.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -178,3 +179,4 @@ Context_PP_Definition::ReadCharChain( CharacterSource & io_rText ) +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser/cpp/cx_c_pp.hxx b/autodoc/source/parser/cpp/cx_c_pp.hxx index 47679bcf..a2320fe6 100644 --- a/autodoc/source/parser/cpp/cx_c_pp.hxx +++ b/autodoc/source/parser/cpp/cx_c_pp.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -93,3 +94,4 @@ class Context_PP_Definition : public Cx_Base #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser/cpp/cx_c_std.cxx b/autodoc/source/parser/cpp/cx_c_std.cxx index 108d1712..74133628 100644 --- a/autodoc/source/parser/cpp/cx_c_std.cxx +++ b/autodoc/source/parser/cpp/cx_c_std.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -527,3 +528,4 @@ Context_CppStd::SetupStateMachine() } // namespace cpp +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser/cpp/cx_c_std.hxx b/autodoc/source/parser/cpp/cx_c_std.hxx index 7f2fc706..fadbde3c 100644 --- a/autodoc/source/parser/cpp/cx_c_std.hxx +++ b/autodoc/source/parser/cpp/cx_c_std.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -90,3 +91,4 @@ class Context_CppStd : public Cx_Base, #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser/cpp/cx_c_sub.cxx b/autodoc/source/parser/cpp/cx_c_sub.cxx index 55581dca..9031342e 100644 --- a/autodoc/source/parser/cpp/cx_c_sub.cxx +++ b/autodoc/source/parser/cpp/cx_c_sub.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -155,3 +156,5 @@ Context_UnblockMacro::ReadCharChain(CharacterSource & io_rText) } } // namespace cpp + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser/cpp/cx_c_sub.hxx b/autodoc/source/parser/cpp/cx_c_sub.hxx index c2b5f574..8f7c12f6 100644 --- a/autodoc/source/parser/cpp/cx_c_sub.hxx +++ b/autodoc/source/parser/cpp/cx_c_sub.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -101,3 +102,4 @@ class Context_UnblockMacro : public Cx_Base #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser/cpp/cxt2ary.cxx b/autodoc/source/parser/cpp/cxt2ary.cxx index 85bf004b..8a1deaef 100644 --- a/autodoc/source/parser/cpp/cxt2ary.cxx +++ b/autodoc/source/parser/cpp/cxt2ary.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -355,3 +356,5 @@ ContextForAry::do_Event_Semicolon() } // namespace cpp + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser/cpp/cxt2ary.hxx b/autodoc/source/parser/cpp/cxt2ary.hxx index ae74a136..1e3b1428 100644 --- a/autodoc/source/parser/cpp/cxt2ary.hxx +++ b/autodoc/source/parser/cpp/cxt2ary.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -196,3 +197,5 @@ class ContextForAry : public ary::cpp::InputContext, } // namespace cpp #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser/cpp/defdescr.cxx b/autodoc/source/parser/cpp/defdescr.cxx index 6e3e841d..e4751427 100644 --- a/autodoc/source/parser/cpp/defdescr.cxx +++ b/autodoc/source/parser/cpp/defdescr.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -223,3 +224,4 @@ HandleOperatorsBeforeTextItem( csv::StreamStr & o_rText, +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser/cpp/defdescr.hxx b/autodoc/source/parser/cpp/defdescr.hxx index 7912d4e6..feb78a7c 100644 --- a/autodoc/source/parser/cpp/defdescr.hxx +++ b/autodoc/source/parser/cpp/defdescr.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -95,3 +96,5 @@ DefineDescription::DefineType() const } // end namespace cpp #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser/cpp/fevnthdl.hxx b/autodoc/source/parser/cpp/fevnthdl.hxx index 8b65c4d7..1068448e 100644 --- a/autodoc/source/parser/cpp/fevnthdl.hxx +++ b/autodoc/source/parser/cpp/fevnthdl.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -103,3 +104,4 @@ FileScope_EventHandler::Event_Semicolon() } // namespace cpp #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser/cpp/icprivow.cxx b/autodoc/source/parser/cpp/icprivow.cxx index 256dcc22..526236f5 100644 --- a/autodoc/source/parser/cpp/icprivow.cxx +++ b/autodoc/source/parser/cpp/icprivow.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -190,3 +191,5 @@ Owner_Class::inq_CeId() const } // namespace cpp + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser/cpp/icprivow.hxx b/autodoc/source/parser/cpp/icprivow.hxx index 6ce47061..bf688a7c 100644 --- a/autodoc/source/parser/cpp/icprivow.hxx +++ b/autodoc/source/parser/cpp/icprivow.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -121,3 +122,5 @@ class Owner_Class : public ary::cpp::InputContext::Owner } // namespace cpp #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser/cpp/pe_base.cxx b/autodoc/source/parser/cpp/pe_base.cxx index 7227b8f1..a4ff9857 100644 --- a/autodoc/source/parser/cpp/pe_base.cxx +++ b/autodoc/source/parser/cpp/pe_base.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -222,3 +223,4 @@ PE_Base::On_inName_SwBracket_Left(const char *) +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser/cpp/pe_base.hxx b/autodoc/source/parser/cpp/pe_base.hxx index 108f028d..933d596b 100644 --- a/autodoc/source/parser/cpp/pe_base.hxx +++ b/autodoc/source/parser/cpp/pe_base.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -121,3 +122,5 @@ PE_Base::CurObject() } // namespace cpp #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser/cpp/pe_class.cxx b/autodoc/source/parser/cpp/pe_class.cxx index a74539f9..5a4d2465 100644 --- a/autodoc/source/parser/cpp/pe_class.cxx +++ b/autodoc/source/parser/cpp/pe_class.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -212,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 @@ -501,3 +493,4 @@ PE_Class::On_afterDecl_Return2Type( const char * ) +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser/cpp/pe_class.hxx b/autodoc/source/parser/cpp/pe_class.hxx index fa88151f..518594ed 100644 --- a/autodoc/source/parser/cpp/pe_class.hxx +++ b/autodoc/source/parser/cpp/pe_class.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -219,7 +220,7 @@ PE_Class::Result_FirstNameSegment() const } // namespace cpp -#if 0 // Branches +/* // Branches class struct union -> Class @@ -247,10 +248,8 @@ virtual using -> Using Declaration - - -#endif // 0 - +*/ #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser/cpp/pe_defs.cxx b/autodoc/source/parser/cpp/pe_defs.cxx index 0c3a760a..fc251533 100644 --- a/autodoc/source/parser/cpp/pe_defs.cxx +++ b/autodoc/source/parser/cpp/pe_defs.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -178,3 +179,4 @@ PE_Defines::On_expectMacroParameters_PreProDefinition( const char * i_sText ) } // namespace cpp +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser/cpp/pe_defs.hxx b/autodoc/source/parser/cpp/pe_defs.hxx index 765cf881..b179dda8 100644 --- a/autodoc/source/parser/cpp/pe_defs.hxx +++ b/autodoc/source/parser/cpp/pe_defs.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -92,3 +93,4 @@ class PE_Defines : public cpp::Cpp_PE } //namespace cpp #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser/cpp/pe_enum.cxx b/autodoc/source/parser/cpp/pe_enum.cxx index 22c5a664..abed323d 100644 --- a/autodoc/source/parser/cpp/pe_enum.cxx +++ b/autodoc/source/parser/cpp/pe_enum.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -187,3 +188,4 @@ PE_Enum::On_afterBlock_Return2Type( const char * ) +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser/cpp/pe_enum.hxx b/autodoc/source/parser/cpp/pe_enum.hxx index 5e04419c..98de9793 100644 --- a/autodoc/source/parser/cpp/pe_enum.hxx +++ b/autodoc/source/parser/cpp/pe_enum.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,18 +29,12 @@ #ifndef ADC_CPP_PE_ENUM_HXX #define ADC_CPP_PE_ENUM_HXX - - - // USED SERVICES // BASE CLASSES #include "cpp_pe.hxx" // COMPONENTS #include <semantic/callf.hxx> #include <semantic/sub_peu.hxx> - // PARAMETERS -// #include "all_toks.hxx" - namespace cpp { @@ -136,3 +131,4 @@ PE_Enum::Result_FirstNameSegment() const #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser/cpp/pe_enval.cxx b/autodoc/source/parser/cpp/pe_enval.cxx index e076612b..88b09779 100644 --- a/autodoc/source/parser/cpp/pe_enval.cxx +++ b/autodoc/source/parser/cpp/pe_enval.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -166,3 +167,4 @@ PE_EnumValue::On_expectFinish_Comma(const char * ) +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser/cpp/pe_enval.hxx b/autodoc/source/parser/cpp/pe_enval.hxx index f9a91294..dde11b13 100644 --- a/autodoc/source/parser/cpp/pe_enval.hxx +++ b/autodoc/source/parser/cpp/pe_enval.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -97,3 +98,4 @@ class PE_EnumValue : public Cpp_PE } // namespace cpp #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser/cpp/pe_expr.cxx b/autodoc/source/parser/cpp/pe_expr.cxx index 00335d9f..9a34a86b 100644 --- a/autodoc/source/parser/cpp/pe_expr.cxx +++ b/autodoc/source/parser/cpp/pe_expr.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -54,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 @@ -202,3 +176,4 @@ PE_Expression::On_std_Comma( const char *) +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser/cpp/pe_expr.hxx b/autodoc/source/parser/cpp/pe_expr.hxx index 19360db8..29365183 100644 --- a/autodoc/source/parser/cpp/pe_expr.hxx +++ b/autodoc/source/parser/cpp/pe_expr.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -103,3 +104,4 @@ PE_Expression::Result_Text() const #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser/cpp/pe_file.cxx b/autodoc/source/parser/cpp/pe_file.cxx index 580b443e..78e9898d 100644 --- a/autodoc/source/parser/cpp/pe_file.cxx +++ b/autodoc/source/parser/cpp/pe_file.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -315,3 +316,5 @@ PE_File::On_in_externC_NoBlock(const char * ) } // namespace cpp + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser/cpp/pe_file.hxx b/autodoc/source/parser/cpp/pe_file.hxx index 6ce8a427..b8d15abe 100644 --- a/autodoc/source/parser/cpp/pe_file.hxx +++ b/autodoc/source/parser/cpp/pe_file.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -51,12 +52,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 +78,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 +128,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 +148,7 @@ class PE_File : public Cpp_PE -#if 0 // Branches +/* // Branches namespace -> Named Namespace declaration @@ -202,8 +191,8 @@ using -> Using-Declaration -> Using-Directive -#endif // 0 - +*/ #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser/cpp/pe_funct.cxx b/autodoc/source/parser/cpp/pe_funct.cxx index 67158b03..c5e1ff8b 100644 --- a/autodoc/source/parser/cpp/pe_funct.cxx +++ b/autodoc/source/parser/cpp/pe_funct.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -608,3 +609,4 @@ PE_Function::EnterImplementation( intt i_nBracketCountStart ) +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser/cpp/pe_funct.hxx b/autodoc/source/parser/cpp/pe_funct.hxx index 51524e24..647180ca 100644 --- a/autodoc/source/parser/cpp/pe_funct.hxx +++ b/autodoc/source/parser/cpp/pe_funct.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -279,3 +280,5 @@ expectNextVarName // anders als bei expectName kann hier auch * oder & kommen */ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser/cpp/pe_ignor.cxx b/autodoc/source/parser/cpp/pe_ignor.cxx index 736c1dfe..8453c8d6 100644 --- a/autodoc/source/parser/cpp/pe_ignor.cxx +++ b/autodoc/source/parser/cpp/pe_ignor.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -114,3 +115,4 @@ PE_Ignore::TransferData() +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser/cpp/pe_ignor.hxx b/autodoc/source/parser/cpp/pe_ignor.hxx index 5b6c020d..b9a1cec2 100644 --- a/autodoc/source/parser/cpp/pe_ignor.hxx +++ b/autodoc/source/parser/cpp/pe_ignor.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -73,3 +74,4 @@ class PE_Ignore : public Cpp_PE #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser/cpp/pe_namsp.cxx b/autodoc/source/parser/cpp/pe_namsp.cxx index 5bbb1443..741699a2 100644 --- a/autodoc/source/parser/cpp/pe_namsp.cxx +++ b/autodoc/source/parser/cpp/pe_namsp.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -161,3 +162,4 @@ PE_Namespace::On_expectSemicolon_Semicolon(const char * ) +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser/cpp/pe_namsp.hxx b/autodoc/source/parser/cpp/pe_namsp.hxx index 17e2712f..386aded5 100644 --- a/autodoc/source/parser/cpp/pe_namsp.hxx +++ b/autodoc/source/parser/cpp/pe_namsp.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -97,3 +98,4 @@ class PE_Namespace : public Cpp_PE } // namespace cpp #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser/cpp/pe_param.cxx b/autodoc/source/parser/cpp/pe_param.cxx index 7d3d2845..c00f81db 100644 --- a/autodoc/source/parser/cpp/pe_param.cxx +++ b/autodoc/source/parser/cpp/pe_param.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -278,3 +279,4 @@ PE_Parameter::On_finished_Comma(const char *) +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser/cpp/pe_param.hxx b/autodoc/source/parser/cpp/pe_param.hxx index ecc61a85..a4312b41 100644 --- a/autodoc/source/parser/cpp/pe_param.hxx +++ b/autodoc/source/parser/cpp/pe_param.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -136,3 +137,5 @@ PE_Parameter::Result_ParamInfo() const } // namespace cpp #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser/cpp/pe_tpltp.cxx b/autodoc/source/parser/cpp/pe_tpltp.cxx index 79220d18..9c6986f0 100644 --- a/autodoc/source/parser/cpp/pe_tpltp.cxx +++ b/autodoc/source/parser/cpp/pe_tpltp.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -173,3 +174,5 @@ PE_TemplateTop::On_expect_separator_Greater( const char *) } // namespace cpp + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser/cpp/pe_tpltp.hxx b/autodoc/source/parser/cpp/pe_tpltp.hxx index c70a4abc..99c6545b 100644 --- a/autodoc/source/parser/cpp/pe_tpltp.hxx +++ b/autodoc/source/parser/cpp/pe_tpltp.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -104,3 +105,4 @@ PE_TemplateTop::Result_Parameters() const #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser/cpp/pe_tydef.cxx b/autodoc/source/parser/cpp/pe_tydef.cxx index ada73c97..01c49816 100644 --- a/autodoc/source/parser/cpp/pe_tydef.cxx +++ b/autodoc/source/parser/cpp/pe_tydef.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -141,3 +142,4 @@ PE_Typedef::On_afterName_Semicolon( const char * ) +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser/cpp/pe_tydef.hxx b/autodoc/source/parser/cpp/pe_tydef.hxx index b969cb40..12b4749b 100644 --- a/autodoc/source/parser/cpp/pe_tydef.hxx +++ b/autodoc/source/parser/cpp/pe_tydef.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -88,3 +89,5 @@ class PE_Typedef : public cpp::Cpp_PE } // namespace cpp #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser/cpp/pe_type.cxx b/autodoc/source/parser/cpp/pe_type.cxx index 907b34c9..69f84859 100644 --- a/autodoc/source/parser/cpp/pe_type.cxx +++ b/autodoc/source/parser/cpp/pe_type.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -552,3 +553,4 @@ PE_Type::On_within_indirection_AmpersAnd(const char *) +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser/cpp/pe_type.hxx b/autodoc/source/parser/cpp/pe_type.hxx index 2f93633d..33afdaa8 100644 --- a/autodoc/source/parser/cpp/pe_type.hxx +++ b/autodoc/source/parser/cpp/pe_type.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -183,3 +184,4 @@ PE_Type::Result_KindOf() const +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser/cpp/pe_vafu.cxx b/autodoc/source/parser/cpp/pe_vafu.cxx index bdedaa7f..be771157 100644 --- a/autodoc/source/parser/cpp/pe_vafu.cxx +++ b/autodoc/source/parser/cpp/pe_vafu.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -647,3 +648,4 @@ PE_VarFunc::CreateFunctionFlags() +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser/cpp/pe_vafu.hxx b/autodoc/source/parser/cpp/pe_vafu.hxx index 859bd7ee..1f3f4ff1 100644 --- a/autodoc/source/parser/cpp/pe_vafu.hxx +++ b/autodoc/source/parser/cpp/pe_vafu.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -287,3 +288,5 @@ expectNextVarName // anders als bei expectName kann hier auch * oder & kommen */ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser/cpp/pe_vari.cxx b/autodoc/source/parser/cpp/pe_vari.cxx index d1f7621c..25753721 100644 --- a/autodoc/source/parser/cpp/pe_vari.cxx +++ b/autodoc/source/parser/cpp/pe_vari.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -185,3 +186,4 @@ PE_Variable::On_expectFinish_Bracket_Right(const char *) +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser/cpp/pe_vari.hxx b/autodoc/source/parser/cpp/pe_vari.hxx index 82bcd8ed..8f3ce687 100644 --- a/autodoc/source/parser/cpp/pe_vari.hxx +++ b/autodoc/source/parser/cpp/pe_vari.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -128,3 +129,4 @@ PE_Variable::Result_InitExpression() const #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser/cpp/pev.hxx b/autodoc/source/parser/cpp/pev.hxx index 8ecf0c23..eb10ecbd 100644 --- a/autodoc/source/parser/cpp/pev.hxx +++ b/autodoc/source/parser/cpp/pev.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -302,3 +303,4 @@ PeEnvironment::IsExternC() const #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser/cpp/preproc.cxx b/autodoc/source/parser/cpp/preproc.cxx index 27006e64..5955f037 100644 --- a/autodoc/source/parser/cpp/preproc.cxx +++ b/autodoc/source/parser/cpp/preproc.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -229,3 +230,4 @@ PreProcessor::InterpretMacro() } // end namespace cpp +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser/cpp/preproc.hxx b/autodoc/source/parser/cpp/preproc.hxx index 1baa35f0..dc4e9934 100644 --- a/autodoc/source/parser/cpp/preproc.hxx +++ b/autodoc/source/parser/cpp/preproc.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -114,3 +115,4 @@ class PreProcessor #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser/cpp/prs_cpp.cxx b/autodoc/source/parser/cpp/prs_cpp.cxx index d2db9a9d..f4781e67 100644 --- a/autodoc/source/parser/cpp/prs_cpp.cxx +++ b/autodoc/source/parser/cpp/prs_cpp.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -246,3 +247,4 @@ Local_LoadFile( CharacterSource & o_rTextBuffer, +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser/cpp/sdocdist.hxx b/autodoc/source/parser/cpp/sdocdist.hxx index 0e6d2bf2..e7fe9198 100644 --- a/autodoc/source/parser/cpp/sdocdist.hxx +++ b/autodoc/source/parser/cpp/sdocdist.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -156,3 +157,5 @@ S_DocuDistributor::do_Store2GlobalTexts( DYN ary::doc::Node & let_drDocu, } // namespace cpp #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser/cpp/sfscope.hxx b/autodoc/source/parser/cpp/sfscope.hxx index 72687ade..ec27790a 100644 --- a/autodoc/source/parser/cpp/sfscope.hxx +++ b/autodoc/source/parser/cpp/sfscope.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -67,3 +68,5 @@ S_FileScopeInfo::S_FileScopeInfo() } // namespace cpp #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser/cpp/sownstck.hxx b/autodoc/source/parser/cpp/sownstck.hxx index 3b504dae..8f4a2d7b 100644 --- a/autodoc/source/parser/cpp/sownstck.hxx +++ b/autodoc/source/parser/cpp/sownstck.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -323,3 +324,4 @@ S_OwnerStack::CloseEnum() #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser/cpp/srecover.hxx b/autodoc/source/parser/cpp/srecover.hxx index 6859af53..35bc3d7e 100644 --- a/autodoc/source/parser/cpp/srecover.hxx +++ b/autodoc/source/parser/cpp/srecover.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -130,3 +131,4 @@ S_RecoveryGuard::IsWithinRecovery() const #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser/cpp/tkp_cpp.cxx b/autodoc/source/parser/cpp/tkp_cpp.cxx index 518e011e..609bdb58 100644 --- a/autodoc/source/parser/cpp/tkp_cpp.cxx +++ b/autodoc/source/parser/cpp/tkp_cpp.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -90,3 +91,4 @@ TokenParser_Cpp::CurrentContext() } // namespace cpp +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser/cpp/tkp_cpp.hxx b/autodoc/source/parser/cpp/tkp_cpp.hxx index 3bfc6af5..ac84a76b 100644 --- a/autodoc/source/parser/cpp/tkp_cpp.hxx +++ b/autodoc/source/parser/cpp/tkp_cpp.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -97,3 +98,4 @@ class TokenParser_Cpp : public TokenParser #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser/cpp/tokintpr.hxx b/autodoc/source/parser/cpp/tokintpr.hxx index c980f1b5..2420555d 100644 --- a/autodoc/source/parser/cpp/tokintpr.hxx +++ b/autodoc/source/parser/cpp/tokintpr.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -115,3 +116,5 @@ class TokenInterpreter #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser/inc/adoc/a_rdocu.hxx b/autodoc/source/parser/inc/adoc/a_rdocu.hxx index 7eb0f91e..8a5c56fc 100644 --- a/autodoc/source/parser/inc/adoc/a_rdocu.hxx +++ b/autodoc/source/parser/inc/adoc/a_rdocu.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -69,3 +70,4 @@ class DocuExplorer #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser/inc/adoc/adoc_tok.hxx b/autodoc/source/parser/inc/adoc/adoc_tok.hxx index 8c39beca..c7022039 100644 --- a/autodoc/source/parser/inc/adoc/adoc_tok.hxx +++ b/autodoc/source/parser/inc/adoc/adoc_tok.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -60,3 +61,4 @@ class Token : public TextToken #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser/inc/adoc/atokdeal.hxx b/autodoc/source/parser/inc/adoc/atokdeal.hxx index f33ab95d..7e514698 100644 --- a/autodoc/source/parser/inc/adoc/atokdeal.hxx +++ b/autodoc/source/parser/inc/adoc/atokdeal.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -58,3 +59,4 @@ class TokenDealer : virtual public ::TokenDealer #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser/inc/adoc/cx_a_std.hxx b/autodoc/source/parser/inc/adoc/cx_a_std.hxx index c27e1f5b..b7479f5b 100644 --- a/autodoc/source/parser/inc/adoc/cx_a_std.hxx +++ b/autodoc/source/parser/inc/adoc/cx_a_std.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -103,3 +104,4 @@ class Context_AdocStd : public autodoc::TkpDocuContext, #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser/inc/adoc/cx_a_sub.hxx b/autodoc/source/parser/inc/adoc/cx_a_sub.hxx index 88ed2ecd..5e649c42 100644 --- a/autodoc/source/parser/inc/adoc/cx_a_sub.hxx +++ b/autodoc/source/parser/inc/adoc/cx_a_sub.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -144,3 +145,4 @@ class Cx_AtTagCompletion : public TkpContext #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser/inc/adoc/docu_pe.hxx b/autodoc/source/parser/inc/adoc/docu_pe.hxx index 08b19078..c4487e69 100644 --- a/autodoc/source/parser/inc/adoc/docu_pe.hxx +++ b/autodoc/source/parser/inc/adoc/docu_pe.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -190,3 +191,5 @@ Adoc_PE::IsComplete() const } // namespace adoc #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser/inc/adoc/prs_adoc.hxx b/autodoc/source/parser/inc/adoc/prs_adoc.hxx index 82701536..35d601b2 100644 --- a/autodoc/source/parser/inc/adoc/prs_adoc.hxx +++ b/autodoc/source/parser/inc/adoc/prs_adoc.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -53,3 +54,4 @@ class DocuParser_AutodocStyle : public autodoc::DocumentationParser_Ifc #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser/inc/adoc/tk_attag.hxx b/autodoc/source/parser/inc/adoc/tk_attag.hxx index 6143de54..923c4018 100644 --- a/autodoc/source/parser/inc/adoc/tk_attag.hxx +++ b/autodoc/source/parser/inc/adoc/tk_attag.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -96,3 +97,4 @@ DECL_TOKEN_CLASS(at_since); #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser/inc/adoc/tk_docw.hxx b/autodoc/source/parser/inc/adoc/tk_docw.hxx index 9b28e7b5..f8c8f2bc 100644 --- a/autodoc/source/parser/inc/adoc/tk_docw.hxx +++ b/autodoc/source/parser/inc/adoc/tk_docw.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -115,3 +116,4 @@ class Tok_EoDocu : public Token #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser/inc/adoc/tokintpr.hxx b/autodoc/source/parser/inc/adoc/tokintpr.hxx index df74c43a..5fc0ca8a 100644 --- a/autodoc/source/parser/inc/adoc/tokintpr.hxx +++ b/autodoc/source/parser/inc/adoc/tokintpr.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -115,3 +116,4 @@ class TokenInterpreter #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser/inc/cpp/ctokdeal.hxx b/autodoc/source/parser/inc/cpp/ctokdeal.hxx index bc9cf3d3..9b1e8940 100644 --- a/autodoc/source/parser/inc/cpp/ctokdeal.hxx +++ b/autodoc/source/parser/inc/cpp/ctokdeal.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -72,3 +73,4 @@ class TokenDealer : virtual public ::TokenDealer #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser/inc/cpp/prs_cpp.hxx b/autodoc/source/parser/inc/cpp/prs_cpp.hxx index 287d3e1e..fe2525cf 100644 --- a/autodoc/source/parser/inc/cpp/prs_cpp.hxx +++ b/autodoc/source/parser/inc/cpp/prs_cpp.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -65,3 +66,5 @@ class Cpluplus_Parser : public autodoc::CodeParser_Ifc } // namespace cpp #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser/inc/doc_deal.hxx b/autodoc/source/parser/inc/doc_deal.hxx index 2ce64209..4f94016f 100644 --- a/autodoc/source/parser/inc/doc_deal.hxx +++ b/autodoc/source/parser/inc/doc_deal.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -87,3 +88,5 @@ DocuDealer::TakeDocu( DYN ary::doc::OldCppDocu & let_drInfo ) #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser/inc/semantic/callf.hxx b/autodoc/source/parser/inc/semantic/callf.hxx index d09723a1..6f06d36a 100644 --- a/autodoc/source/parser/inc/semantic/callf.hxx +++ b/autodoc/source/parser/inc/semantic/callf.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -285,3 +286,4 @@ PeStatusArray<PE>::Cur() const #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser/inc/semantic/parseenv.hxx b/autodoc/source/parser/inc/semantic/parseenv.hxx index 4247911c..7f03e1d5 100644 --- a/autodoc/source/parser/inc/semantic/parseenv.hxx +++ b/autodoc/source/parser/inc/semantic/parseenv.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -108,3 +109,4 @@ ParseEnvironment::CurSubPeUse() const #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser/inc/semantic/sub_pe.hxx b/autodoc/source/parser/inc/semantic/sub_pe.hxx index 4dc6bbfd..4885a5fa 100644 --- a/autodoc/source/parser/inc/semantic/sub_pe.hxx +++ b/autodoc/source/parser/inc/semantic/sub_pe.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -110,3 +111,4 @@ SubPe<PE,SUB>::CreateChild() const #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser/inc/semantic/sub_peu.hxx b/autodoc/source/parser/inc/semantic/sub_peu.hxx index 126aca40..ac641ac6 100644 --- a/autodoc/source/parser/inc/semantic/sub_peu.hxx +++ b/autodoc/source/parser/inc/semantic/sub_peu.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -129,3 +130,4 @@ SubPeUse<PE,SUB>::Child() const #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser/inc/tokens/parseinc.hxx b/autodoc/source/parser/inc/tokens/parseinc.hxx index 3bdcffcb..73c6c056 100644 --- a/autodoc/source/parser/inc/tokens/parseinc.hxx +++ b/autodoc/source/parser/inc/tokens/parseinc.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -201,3 +202,4 @@ jumpToMatchingBracket( CharacterSource & io_rText, #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser/inc/tokens/stmstarr.hxx b/autodoc/source/parser/inc/tokens/stmstarr.hxx index c0136549..e4433661 100644 --- a/autodoc/source/parser/inc/tokens/stmstarr.hxx +++ b/autodoc/source/parser/inc/tokens/stmstarr.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -83,3 +84,4 @@ StmArrayStatus::SetTokenCreateFunction( F_CRTOK i_fTokenCreateFunction ) #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser/inc/tokens/stmstate.hxx b/autodoc/source/parser/inc/tokens/stmstate.hxx index 851dd05a..f9ce54a5 100644 --- a/autodoc/source/parser/inc/tokens/stmstate.hxx +++ b/autodoc/source/parser/inc/tokens/stmstate.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -66,3 +67,4 @@ class StmStatus // := "State machine status" #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser/inc/tokens/stmstfin.hxx b/autodoc/source/parser/inc/tokens/stmstfin.hxx index a7b8debe..846fdf2e 100644 --- a/autodoc/source/parser/inc/tokens/stmstfin.hxx +++ b/autodoc/source/parser/inc/tokens/stmstfin.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -78,3 +79,4 @@ StmBoundsStatus::StatusFunctionNr() const #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser/inc/tokens/tkp.hxx b/autodoc/source/parser/inc/tokens/tkp.hxx index f387dc96..eb361e04 100644 --- a/autodoc/source/parser/inc/tokens/tkp.hxx +++ b/autodoc/source/parser/inc/tokens/tkp.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -48,12 +49,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 { @@ -97,3 +92,4 @@ class TokenParser #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser/inc/tokens/tkpcontx.hxx b/autodoc/source/parser/inc/tokens/tkpcontx.hxx index 36c1380b..d838cbe2 100644 --- a/autodoc/source/parser/inc/tokens/tkpcontx.hxx +++ b/autodoc/source/parser/inc/tokens/tkpcontx.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -138,3 +139,4 @@ class TkpDocuContext : public TkpContext #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser/inc/tokens/tkpstama.hxx b/autodoc/source/parser/inc/tokens/tkpstama.hxx index d3484d42..10d36f38 100644 --- a/autodoc/source/parser/inc/tokens/tkpstama.hxx +++ b/autodoc/source/parser/inc/tokens/tkpstama.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -121,3 +122,4 @@ class StateMachine #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser/inc/tokens/tokdeal.hxx b/autodoc/source/parser/inc/tokens/tokdeal.hxx index 97454406..7b6a27e5 100644 --- a/autodoc/source/parser/inc/tokens/tokdeal.hxx +++ b/autodoc/source/parser/inc/tokens/tokdeal.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -53,25 +54,6 @@ 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 +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser/inc/tokens/token.hxx b/autodoc/source/parser/inc/tokens/token.hxx index 16eb7ad8..26d4976a 100644 --- a/autodoc/source/parser/inc/tokens/token.hxx +++ b/autodoc/source/parser/inc/tokens/token.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -64,3 +65,4 @@ class Tok_Eof : public TextToken #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser/inc/tokens/tokproct.hxx b/autodoc/source/parser/inc/tokens/tokproct.hxx index bc6e118f..19d8c770 100644 --- a/autodoc/source/parser/inc/tokens/tokproct.hxx +++ b/autodoc/source/parser/inc/tokens/tokproct.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -55,7 +56,7 @@ class TokenProcessing_Types stay, // same parse environment push, // push sub environment pop_success, // return to parent environment, parsing was successful - pop_failure // return to parent environment, but an error occured. + pop_failure // return to parent environment, but an error occurred. }; struct TokenProcessing_Result @@ -81,3 +82,4 @@ class TokenProcessing_Types #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser/inc/x_docu.hxx b/autodoc/source/parser/inc/x_docu.hxx index 92fc81c6..5967c766 100644 --- a/autodoc/source/parser/inc/x_docu.hxx +++ b/autodoc/source/parser/inc/x_docu.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -56,3 +57,5 @@ class X_Docu : public autodoc::X_Parser_Ifc #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser/inc/x_parse.hxx b/autodoc/source/parser/inc/x_parse.hxx index 71320078..57be17cf 100644 --- a/autodoc/source/parser/inc/x_parse.hxx +++ b/autodoc/source/parser/inc/x_parse.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -61,3 +62,5 @@ class X_Parser : public autodoc::X_Parser_Ifc #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser/kernel/parsefct.cxx b/autodoc/source/parser/kernel/parsefct.cxx index 431e1cc5..da6d9e57 100644 --- a/autodoc/source/parser/kernel/parsefct.cxx +++ b/autodoc/source/parser/kernel/parsefct.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -79,3 +80,4 @@ ParseToolsFactory::Create_FileCollector( uintt i_nEstimatedNrOfFiles ) const } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser/kernel/parsefct.hxx b/autodoc/source/parser/kernel/parsefct.hxx index 3f94ab0f..0978d562 100644 --- a/autodoc/source/parser/kernel/parsefct.hxx +++ b/autodoc/source/parser/kernel/parsefct.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -58,3 +59,4 @@ class ParseToolsFactory : public autodoc::ParseToolsFactory_Ifc #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser/kernel/x_docu.cxx b/autodoc/source/parser/kernel/x_docu.cxx index d9bb2ed3..4484eb8e 100644 --- a/autodoc/source/parser/kernel/x_docu.cxx +++ b/autodoc/source/parser/kernel/x_docu.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -59,3 +60,5 @@ X_Docu::GetInfo( std::ostream & o_rOutputMedium ) const << sExplanation << Endl(); } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser/kernel/x_parse.cxx b/autodoc/source/parser/kernel/x_parse.cxx index e9a77752..26ee3e5d 100644 --- a/autodoc/source/parser/kernel/x_parse.cxx +++ b/autodoc/source/parser/kernel/x_parse.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -96,3 +97,5 @@ operator<<( std::ostream & o_rOut, i_rException.GetInfo(o_rOut); return o_rOut; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser/semantic/parseenv.cxx b/autodoc/source/parser/semantic/parseenv.cxx index fefae510..d73f8cc5 100644 --- a/autodoc/source/parser/semantic/parseenv.cxx +++ b/autodoc/source/parser/semantic/parseenv.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -84,3 +85,5 @@ ParseEnvironment::ParseEnvironment( ParseEnvironment * i_pParent ) pCurSubPe(0) { } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser/tokens/stmstarr.cxx b/autodoc/source/parser/tokens/stmstarr.cxx index fc9a5270..1d86c0ef 100644 --- a/autodoc/source/parser/tokens/stmstarr.cxx +++ b/autodoc/source/parser/tokens/stmstarr.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -97,3 +98,4 @@ StmArrayStatus::AsArray() return this; } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser/tokens/stmstate.cxx b/autodoc/source/parser/tokens/stmstate.cxx index fb734d11..2752a79a 100644 --- a/autodoc/source/parser/tokens/stmstate.cxx +++ b/autodoc/source/parser/tokens/stmstate.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -44,3 +45,4 @@ StmStatus::AsBounds() } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser/tokens/stmstfin.cxx b/autodoc/source/parser/tokens/stmstfin.cxx index e47faceb..f84d7849 100644 --- a/autodoc/source/parser/tokens/stmstfin.cxx +++ b/autodoc/source/parser/tokens/stmstfin.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -59,3 +60,4 @@ StmBoundsStatus::AsBounds() +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser/tokens/tkp.cxx b/autodoc/source/parser/tokens/tkp.cxx index c894109f..64922f0c 100644 --- a/autodoc/source/parser/tokens/tkp.cxx +++ b/autodoc/source/parser/tokens/tkp.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -70,3 +71,4 @@ TokenParser::InitSource( CharacterSource & i_rSource ) } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser/tokens/tkpcontx.cxx b/autodoc/source/parser/tokens/tkpcontx.cxx index 7567d59f..8c129ea4 100644 --- a/autodoc/source/parser/tokens/tkpcontx.cxx +++ b/autodoc/source/parser/tokens/tkpcontx.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -66,3 +67,4 @@ TkpNullContext::FollowUpContext() +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser/tokens/tkpstama.cxx b/autodoc/source/parser/tokens/tkpstama.cxx index 62980bb1..e647a828 100644 --- a/autodoc/source/parser/tokens/tkpstama.cxx +++ b/autodoc/source/parser/tokens/tkpstama.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -29,12 +30,9 @@ #include <tokens/tkpstama.hxx> // NOT FULLY DECLARED SERVICES -// #include <srcfind.hxx> #include <tokens/stmstarr.hxx> -//#include <parseinc.hxx> #include <tools/tkpchars.hxx> - const intt C_nStatuslistResizeValue = 32; const intt C_nTopStatus = 0; @@ -158,8 +156,6 @@ StateMachine::CurrentStatus() const StmArrayStatus * pCurSt = Status(nCurrentStatus).AsArray(); csv_assert(pCurSt != 0); -// if(pCurSt == 0) -// csv_assert(false); return *pCurSt; } @@ -175,3 +171,5 @@ StateMachine::Peek(intt in_nBranch) StmArrayStatus & rSt = CurrentStatus(); nPeekedStatus = rSt.NextBy(in_nBranch); } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser/tokens/tokdeal.cxx b/autodoc/source/parser/tokens/tokdeal.cxx index 7500b06b..6486b46b 100644 --- a/autodoc/source/parser/tokens/tokdeal.cxx +++ b/autodoc/source/parser/tokens/tokdeal.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -48,3 +49,4 @@ Tok_Eof::Text() const +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser_i/idl/cx_idlco.cxx b/autodoc/source/parser_i/idl/cx_idlco.cxx index 5db7db68..877b7fe4 100644 --- a/autodoc/source/parser_i/idl/cx_idlco.cxx +++ b/autodoc/source/parser_i/idl/cx_idlco.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -543,3 +544,4 @@ Context_UidlCode::SetupStateMachine() } // namespace uidl } // namespace csi +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser_i/idl/cx_sub.cxx b/autodoc/source/parser_i/idl/cx_sub.cxx index 121d7e45..facf23f6 100644 --- a/autodoc/source/parser_i/idl/cx_sub.cxx +++ b/autodoc/source/parser_i/idl/cx_sub.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -144,3 +145,5 @@ Context_Assignment::ReadCharChain( CharacterSource & io_rText ) } // namespace uidl } // namespace csi + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser_i/idl/distrib.cxx b/autodoc/source/parser_i/idl/distrib.cxx index bb1d8333..3c8cb6a2 100644 --- a/autodoc/source/parser_i/idl/distrib.cxx +++ b/autodoc/source/parser_i/idl/distrib.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -262,3 +263,4 @@ Documentation::Increment_CurLine() } // namespace uidl } // namespace csi +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser_i/idl/parsenv2.cxx b/autodoc/source/parser_i/idl/parsenv2.cxx index 5e3202e8..cd8d6d7f 100644 --- a/autodoc/source/parser_i/idl/parsenv2.cxx +++ b/autodoc/source/parser_i/idl/parsenv2.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -210,3 +211,5 @@ UnoIDL_PE::UnoIDL_PE() } // namespace uidl } // namespace csi + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser_i/idl/pe_attri.cxx b/autodoc/source/parser_i/idl/pe_attri.cxx index 15aa396d..fe362c42 100644 --- a/autodoc/source/parser_i/idl/pe_attri.cxx +++ b/autodoc/source/parser_i/idl/pe_attri.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -292,3 +293,5 @@ PE_Attribute::MyPE() } // namespace uidl } // namespace csi + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser_i/idl/pe_const.cxx b/autodoc/source/parser_i/idl/pe_const.cxx index cad9deba..7b07b8d8 100644 --- a/autodoc/source/parser_i/idl/pe_const.cxx +++ b/autodoc/source/parser_i/idl/pe_const.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -278,3 +279,4 @@ PE_Constant::MyPE() } // namespace uidl } // namespace csi +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser_i/idl/pe_enum2.cxx b/autodoc/source/parser_i/idl/pe_enum2.cxx index d038c290..e6e96cfd 100644 --- a/autodoc/source/parser_i/idl/pe_enum2.cxx +++ b/autodoc/source/parser_i/idl/pe_enum2.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -249,3 +250,4 @@ PE_Enum::MyPE() } // namespace uidl } // namespace csi +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser_i/idl/pe_evalu.cxx b/autodoc/source/parser_i/idl/pe_evalu.cxx index c0d6f8c3..2d754e8d 100644 --- a/autodoc/source/parser_i/idl/pe_evalu.cxx +++ b/autodoc/source/parser_i/idl/pe_evalu.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -180,3 +181,4 @@ PE_Value::MyPE() } // namespace uidl } // namespace csi +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser_i/idl/pe_excp.cxx b/autodoc/source/parser_i/idl/pe_excp.cxx index cfdf2679..76ee2d4f 100644 --- a/autodoc/source/parser_i/idl/pe_excp.cxx +++ b/autodoc/source/parser_i/idl/pe_excp.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -296,3 +297,5 @@ PE_Exception::store_Exception() } // namespace uidl } // namespace csi + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser_i/idl/pe_file2.cxx b/autodoc/source/parser_i/idl/pe_file2.cxx index 3e177f64..f6caa5e8 100644 --- a/autodoc/source/parser_i/idl/pe_file2.cxx +++ b/autodoc/source/parser_i/idl/pe_file2.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -316,3 +317,4 @@ PE_File::MyPE() } // namespace csi +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser_i/idl/pe_func2.cxx b/autodoc/source/parser_i/idl/pe_func2.cxx index 31d0494c..1e8a487c 100644 --- a/autodoc/source/parser_i/idl/pe_func2.cxx +++ b/autodoc/source/parser_i/idl/pe_func2.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -443,3 +444,4 @@ PE_Function::MyPE() } // namespace uidl } // namespace csi +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser_i/idl/pe_iface.cxx b/autodoc/source/parser_i/idl/pe_iface.cxx index 7159c08c..0853dc95 100644 --- a/autodoc/source/parser_i/idl/pe_iface.cxx +++ b/autodoc/source/parser_i/idl/pe_iface.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -465,3 +466,5 @@ PE_Interface::store_Interface() } // namespace uidl } // namespace csi + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser_i/idl/pe_property.cxx b/autodoc/source/parser_i/idl/pe_property.cxx index d50b46a0..e3176c23 100644 --- a/autodoc/source/parser_i/idl/pe_property.cxx +++ b/autodoc/source/parser_i/idl/pe_property.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -236,3 +237,4 @@ PE_Property::MyPE() } // namespace uidl } // namespace csi +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser_i/idl/pe_selem.cxx b/autodoc/source/parser_i/idl/pe_selem.cxx index f656301c..94f4e97b 100644 --- a/autodoc/source/parser_i/idl/pe_selem.cxx +++ b/autodoc/source/parser_i/idl/pe_selem.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -203,3 +204,5 @@ PE_StructElement::lhf_FindTemplateParamType() const } // namespace uidl } // namespace csi + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser_i/idl/pe_servi.cxx b/autodoc/source/parser_i/idl/pe_servi.cxx index e3546bdc..083fdd18 100644 --- a/autodoc/source/parser_i/idl/pe_servi.cxx +++ b/autodoc/source/parser_i/idl/pe_servi.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -391,3 +392,4 @@ PE_Service::StartProperty() } // namespace uidl } // namespace csi +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser_i/idl/pe_singl.cxx b/autodoc/source/parser_i/idl/pe_singl.cxx index 37e7ae13..323ce23b 100644 --- a/autodoc/source/parser_i/idl/pe_singl.cxx +++ b/autodoc/source/parser_i/idl/pe_singl.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -48,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(), @@ -270,3 +246,5 @@ PE_Singleton::MyPE() } // namespace uidl } // namespace csi + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser_i/idl/pe_struc.cxx b/autodoc/source/parser_i/idl/pe_struc.cxx index 508c1d95..766597f0 100644 --- a/autodoc/source/parser_i/idl/pe_struc.cxx +++ b/autodoc/source/parser_i/idl/pe_struc.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -325,3 +326,5 @@ PE_Struct::store_Struct() } // namespace uidl } // namespace csi + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser_i/idl/pe_tydf2.cxx b/autodoc/source/parser_i/idl/pe_tydf2.cxx index 3f94a16f..c7051f30 100644 --- a/autodoc/source/parser_i/idl/pe_tydf2.cxx +++ b/autodoc/source/parser_i/idl/pe_tydf2.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -182,3 +183,4 @@ PE_Typedef::MyPE() } // namespace uidl } // namespace csi +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser_i/idl/pe_type2.cxx b/autodoc/source/parser_i/idl/pe_type2.cxx index 37dc7a38..d21d0179 100644 --- a/autodoc/source/parser_i/idl/pe_type2.cxx +++ b/autodoc/source/parser_i/idl/pe_type2.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -312,3 +313,5 @@ PE_Type::MyPE() } // namespace uidl } // namespace csi + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser_i/idl/pe_vari2.cxx b/autodoc/source/parser_i/idl/pe_vari2.cxx index 90eb38c1..c3714a21 100644 --- a/autodoc/source/parser_i/idl/pe_vari2.cxx +++ b/autodoc/source/parser_i/idl/pe_vari2.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -171,3 +172,4 @@ PE_Variable::MyPE() } // namespace uidl } // namespace csi +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser_i/idl/pestate.cxx b/autodoc/source/parser_i/idl/pestate.cxx index 5051cc7d..214be8e9 100644 --- a/autodoc/source/parser_i/idl/pestate.cxx +++ b/autodoc/source/parser_i/idl/pestate.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -138,3 +139,4 @@ ParseEnvState::Process_Default() } // namespace uidl } // namespace csi +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser_i/idl/semnode.cxx b/autodoc/source/parser_i/idl/semnode.cxx index 3bb0afbd..4ff1e3f1 100644 --- a/autodoc/source/parser_i/idl/semnode.cxx +++ b/autodoc/source/parser_i/idl/semnode.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -80,3 +81,5 @@ SemanticNode::SetTokenResult( E_TokenDone i_eDone, } // namespace uidl } // namespace csi + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser_i/idl/tk_const.cxx b/autodoc/source/parser_i/idl/tk_const.cxx index 44be4b51..69027f73 100644 --- a/autodoc/source/parser_i/idl/tk_const.cxx +++ b/autodoc/source/parser_i/idl/tk_const.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -55,3 +56,4 @@ TokAssignment::Text() const } // namespace uidl } // namespace csi +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser_i/idl/tk_ident.cxx b/autodoc/source/parser_i/idl/tk_ident.cxx index e68195cb..bda977da 100644 --- a/autodoc/source/parser_i/idl/tk_ident.cxx +++ b/autodoc/source/parser_i/idl/tk_ident.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -66,3 +67,4 @@ TokNameSeparator::Text() const } // namespace uidl } // namespace csi +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser_i/idl/tk_keyw.cxx b/autodoc/source/parser_i/idl/tk_keyw.cxx index b9393e6b..7b333270 100644 --- a/autodoc/source/parser_i/idl/tk_keyw.cxx +++ b/autodoc/source/parser_i/idl/tk_keyw.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -223,3 +224,4 @@ TokObserves::Text() const } // namespace uidl } // namespace csi +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser_i/idl/tk_punct.cxx b/autodoc/source/parser_i/idl/tk_punct.cxx index 87baf349..970fc2eb 100644 --- a/autodoc/source/parser_i/idl/tk_punct.cxx +++ b/autodoc/source/parser_i/idl/tk_punct.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -111,3 +112,5 @@ Tok_EOF::Text() const } // namespace uidl } // namespace csi + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser_i/idl/tkp_uidl.cxx b/autodoc/source/parser_i/idl/tkp_uidl.cxx index 13d72f0d..2f6d944e 100644 --- a/autodoc/source/parser_i/idl/tkp_uidl.cxx +++ b/autodoc/source/parser_i/idl/tkp_uidl.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -72,3 +73,4 @@ TokenParser_Uidl::CurrentContext() } // namespace uidl } // namespace csi +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser_i/idl/unoidl.cxx b/autodoc/source/parser_i/idl/unoidl.cxx index 25497da8..047716a6 100644 --- a/autodoc/source/parser_i/idl/unoidl.cxx +++ b/autodoc/source/parser_i/idl/unoidl.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -63,8 +64,6 @@ class FileParsePerformers void ParseFile( const char * i_sFullPath ); - void ConnectLinks(); - private: CharacterSource aFileLoader; Dyn<csi::uidl::TokenParser_Uidl> @@ -125,8 +124,6 @@ IdlParser::Run( const autodoc::FileCollector_Ifc & i_rFiles ) // pFileParsePerformers = new FileParsePerformers( *pRepository ); } } - - pFileParsePerformers->ConnectLinks(); } FileParsePerformers::FileParsePerformers( ary::Repository & io_rRepository, @@ -166,11 +163,6 @@ FileParsePerformers::ParseFile( const char * i_sFullPath ) } while ( NOT aFileLoader.IsFinished() ); } -void -FileParsePerformers::ConnectLinks() -{ - // KORR_FUTURE ? -// rRepository.RwGate_Idl().ConnectAdditionalLinks(); -} - } // namespace autodoc + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser_i/idoc/cx_docu2.cxx b/autodoc/source/parser_i/idoc/cx_docu2.cxx index 6ce1d815..a0418cba 100644 --- a/autodoc/source/parser_i/idoc/cx_docu2.cxx +++ b/autodoc/source/parser_i/idoc/cx_docu2.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -265,3 +266,4 @@ Cx_CheckStar::FollowUpContext() } // namespace dsapi } // namespace csi +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser_i/idoc/cx_dsapi.cxx b/autodoc/source/parser_i/idoc/cx_dsapi.cxx index d940f1ff..ade06fd4 100644 --- a/autodoc/source/parser_i/idoc/cx_dsapi.cxx +++ b/autodoc/source/parser_i/idoc/cx_dsapi.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -531,3 +532,4 @@ Context_Docu::SetMode_IsMultiLine( bool i_bTrue ) } // namespace dsapi } // namespace csi +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser_i/idoc/docu_pe2.cxx b/autodoc/source/parser_i/idoc/docu_pe2.cxx index f19bcddd..45adb295 100644 --- a/autodoc/source/parser_i/idoc/docu_pe2.cxx +++ b/autodoc/source/parser_i/idoc/docu_pe2.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -690,3 +691,4 @@ AtTagTitle( const Tok_AtTag & i_rToken ) } // namespace dsapi } // namespace csi +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser_i/idoc/tk_atag2.cxx b/autodoc/source/parser_i/idoc/tk_atag2.cxx index b93b1e32..1b4badda 100644 --- a/autodoc/source/parser_i/idoc/tk_atag2.cxx +++ b/autodoc/source/parser_i/idoc/tk_atag2.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -81,3 +82,4 @@ Tok_AtTag::Text() const } // namespace dsapi } // namespace csi +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser_i/idoc/tk_docw2.cxx b/autodoc/source/parser_i/idoc/tk_docw2.cxx index a22b1006..1243ae8c 100644 --- a/autodoc/source/parser_i/idoc/tk_docw2.cxx +++ b/autodoc/source/parser_i/idoc/tk_docw2.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -117,3 +118,4 @@ Tok_White::Text() const } // namespace dsapi } // namespace csi +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser_i/idoc/tk_html.cxx b/autodoc/source/parser_i/idoc/tk_html.cxx index 479a4753..a1b719a4 100644 --- a/autodoc/source/parser_i/idoc/tk_html.cxx +++ b/autodoc/source/parser_i/idoc/tk_html.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -56,3 +57,4 @@ Tok_HtmlTag::Text() const } // namespace csi +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser_i/idoc/tk_xml.cxx b/autodoc/source/parser_i/idoc/tk_xml.cxx index 3a7b50d4..6d4e51aa 100644 --- a/autodoc/source/parser_i/idoc/tk_xml.cxx +++ b/autodoc/source/parser_i/idoc/tk_xml.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -172,3 +173,4 @@ Tok_XmlFormat_EndTag::Text() const } // namespace csi +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser_i/inc/s2_dsapi/cx_docu2.hxx b/autodoc/source/parser_i/inc/s2_dsapi/cx_docu2.hxx index fa267d2f..44269613 100644 --- a/autodoc/source/parser_i/inc/s2_dsapi/cx_docu2.hxx +++ b/autodoc/source/parser_i/inc/s2_dsapi/cx_docu2.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -231,3 +232,4 @@ class Cx_CheckStar : public Cx_Base #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser_i/inc/s2_dsapi/cx_dsapi.hxx b/autodoc/source/parser_i/inc/s2_dsapi/cx_dsapi.hxx index cdc4eca4..7cf99190 100644 --- a/autodoc/source/parser_i/inc/s2_dsapi/cx_dsapi.hxx +++ b/autodoc/source/parser_i/inc/s2_dsapi/cx_dsapi.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -121,3 +122,4 @@ class Context_Docu : public TkpDocuContext, #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser_i/inc/s2_dsapi/docu_pe2.hxx b/autodoc/source/parser_i/inc/s2_dsapi/docu_pe2.hxx index 515bddb3..9eace236 100644 --- a/autodoc/source/parser_i/inc/s2_dsapi/docu_pe2.hxx +++ b/autodoc/source/parser_i/inc/s2_dsapi/docu_pe2.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -179,3 +180,4 @@ class SapiDocu_PE : public TokenInterpreter #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser_i/inc/s2_dsapi/dsapitok.hxx b/autodoc/source/parser_i/inc/s2_dsapi/dsapitok.hxx index 322c4b41..8d8d418b 100644 --- a/autodoc/source/parser_i/inc/s2_dsapi/dsapitok.hxx +++ b/autodoc/source/parser_i/inc/s2_dsapi/dsapitok.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -63,3 +64,4 @@ class Token : public TextToken #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser_i/inc/s2_dsapi/tk_atag2.hxx b/autodoc/source/parser_i/inc/s2_dsapi/tk_atag2.hxx index 0d38b812..dd2e0976 100644 --- a/autodoc/source/parser_i/inc/s2_dsapi/tk_atag2.hxx +++ b/autodoc/source/parser_i/inc/s2_dsapi/tk_atag2.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -86,3 +87,4 @@ class Tok_AtTag : public Token #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser_i/inc/s2_dsapi/tk_docw2.hxx b/autodoc/source/parser_i/inc/s2_dsapi/tk_docw2.hxx index 49d08a4d..25ebd547 100644 --- a/autodoc/source/parser_i/inc/s2_dsapi/tk_docw2.hxx +++ b/autodoc/source/parser_i/inc/s2_dsapi/tk_docw2.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -119,3 +120,4 @@ class Tok_White : public Token #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser_i/inc/s2_dsapi/tk_html.hxx b/autodoc/source/parser_i/inc/s2_dsapi/tk_html.hxx index 82cde43d..7bb8a26a 100644 --- a/autodoc/source/parser_i/inc/s2_dsapi/tk_html.hxx +++ b/autodoc/source/parser_i/inc/s2_dsapi/tk_html.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -71,3 +72,4 @@ class Tok_HtmlTag : public Token #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser_i/inc/s2_dsapi/tk_xml.hxx b/autodoc/source/parser_i/inc/s2_dsapi/tk_xml.hxx index e8b4c694..50d85212 100644 --- a/autodoc/source/parser_i/inc/s2_dsapi/tk_xml.hxx +++ b/autodoc/source/parser_i/inc/s2_dsapi/tk_xml.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -199,3 +200,4 @@ class Tok_XmlFormat_EndTag : public Tok_XmlFormat_Tag #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser_i/inc/s2_dsapi/tokintpr.hxx b/autodoc/source/parser_i/inc/s2_dsapi/tokintpr.hxx index 2da57ded..8437f4f2 100644 --- a/autodoc/source/parser_i/inc/s2_dsapi/tokintpr.hxx +++ b/autodoc/source/parser_i/inc/s2_dsapi/tokintpr.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -92,3 +93,4 @@ class TokenInterpreter #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser_i/inc/s2_dsapi/tokrecv.hxx b/autodoc/source/parser_i/inc/s2_dsapi/tokrecv.hxx index 71f4b780..be7d7726 100644 --- a/autodoc/source/parser_i/inc/s2_dsapi/tokrecv.hxx +++ b/autodoc/source/parser_i/inc/s2_dsapi/tokrecv.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -58,3 +59,4 @@ class Token_Receiver #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser_i/inc/s2_luidl/cx_idlco.hxx b/autodoc/source/parser_i/inc/s2_luidl/cx_idlco.hxx index 5f703b60..db10741e 100644 --- a/autodoc/source/parser_i/inc/s2_luidl/cx_idlco.hxx +++ b/autodoc/source/parser_i/inc/s2_luidl/cx_idlco.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -96,3 +97,5 @@ class Context_UidlCode : public TkpContext, } // namespace csi #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser_i/inc/s2_luidl/cx_sub.hxx b/autodoc/source/parser_i/inc/s2_luidl/cx_sub.hxx index 6cda5266..b1e96671 100644 --- a/autodoc/source/parser_i/inc/s2_luidl/cx_sub.hxx +++ b/autodoc/source/parser_i/inc/s2_luidl/cx_sub.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -129,3 +130,4 @@ class Context_Assignment : public Cx_Base #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser_i/inc/s2_luidl/distrib.hxx b/autodoc/source/parser_i/inc/s2_luidl/distrib.hxx index ac9fc160..eec22017 100644 --- a/autodoc/source/parser_i/inc/s2_luidl/distrib.hxx +++ b/autodoc/source/parser_i/inc/s2_luidl/distrib.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -270,3 +271,4 @@ TokenDistributor::ProcessingData::CurEnv_TriedTokenPosition() const #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser_i/inc/s2_luidl/parsenv2.hxx b/autodoc/source/parser_i/inc/s2_luidl/parsenv2.hxx index 8717fcb4..a6278f0d 100644 --- a/autodoc/source/parser_i/inc/s2_luidl/parsenv2.hxx +++ b/autodoc/source/parser_i/inc/s2_luidl/parsenv2.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -140,3 +141,5 @@ class UnoIDL_PE : virtual protected TokenProcessing_Types } // namespace uidl } // namespace csi #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser_i/inc/s2_luidl/pe_attri.hxx b/autodoc/source/parser_i/inc/s2_luidl/pe_attri.hxx index aa4b721c..5a6dffc7 100644 --- a/autodoc/source/parser_i/inc/s2_luidl/pe_attri.hxx +++ b/autodoc/source/parser_i/inc/s2_luidl/pe_attri.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -133,3 +134,4 @@ class PE_Attribute : public UnoIDL_PE, #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser_i/inc/s2_luidl/pe_const.hxx b/autodoc/source/parser_i/inc/s2_luidl/pe_const.hxx index b9b1ba9e..74d93021 100644 --- a/autodoc/source/parser_i/inc/s2_luidl/pe_const.hxx +++ b/autodoc/source/parser_i/inc/s2_luidl/pe_const.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -143,3 +144,4 @@ class PE_Constant : public UnoIDL_PE, #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser_i/inc/s2_luidl/pe_enum2.hxx b/autodoc/source/parser_i/inc/s2_luidl/pe_enum2.hxx index f9ccb4a2..4d97c58a 100644 --- a/autodoc/source/parser_i/inc/s2_luidl/pe_enum2.hxx +++ b/autodoc/source/parser_i/inc/s2_luidl/pe_enum2.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -129,3 +130,4 @@ class PE_Enum : public UnoIDL_PE, #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser_i/inc/s2_luidl/pe_evalu.hxx b/autodoc/source/parser_i/inc/s2_luidl/pe_evalu.hxx index 20fe3311..dbd27957 100644 --- a/autodoc/source/parser_i/inc/s2_luidl/pe_evalu.hxx +++ b/autodoc/source/parser_i/inc/s2_luidl/pe_evalu.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -125,3 +126,4 @@ class PE_Value : public UnoIDL_PE, #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser_i/inc/s2_luidl/pe_excp.hxx b/autodoc/source/parser_i/inc/s2_luidl/pe_excp.hxx index ff73311e..6fe3b211 100644 --- a/autodoc/source/parser_i/inc/s2_luidl/pe_excp.hxx +++ b/autodoc/source/parser_i/inc/s2_luidl/pe_excp.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -257,3 +258,4 @@ PE_Exception::PE_StructState::MoveState( #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser_i/inc/s2_luidl/pe_file2.hxx b/autodoc/source/parser_i/inc/s2_luidl/pe_file2.hxx index 2ba242a0..80baf27b 100644 --- a/autodoc/source/parser_i/inc/s2_luidl/pe_file2.hxx +++ b/autodoc/source/parser_i/inc/s2_luidl/pe_file2.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -138,3 +139,4 @@ class PE_File : public UnoIDL_PE, #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser_i/inc/s2_luidl/pe_func2.hxx b/autodoc/source/parser_i/inc/s2_luidl/pe_func2.hxx index 43c18097..030a9494 100644 --- a/autodoc/source/parser_i/inc/s2_luidl/pe_func2.hxx +++ b/autodoc/source/parser_i/inc/s2_luidl/pe_func2.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,12 +29,8 @@ #ifndef ADC_UIDL_PE_FUNC2_HXX #define ADC_UIDL_PE_FUNC2_HXX - - // USED SERVICES // BASE CLASSES -// #include <ary/idl/i_gate.hxx> -// #include <ary/idl/ip_ce.hxx> #include <s2_luidl/parsenv2.hxx> #include <s2_luidl/pestate.hxx> // COMPONENTS @@ -165,3 +162,4 @@ class PE_Function : public UnoIDL_PE, #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser_i/inc/s2_luidl/pe_iface.hxx b/autodoc/source/parser_i/inc/s2_luidl/pe_iface.hxx index c3c1072a..cf0b40a2 100644 --- a/autodoc/source/parser_i/inc/s2_luidl/pe_iface.hxx +++ b/autodoc/source/parser_i/inc/s2_luidl/pe_iface.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -182,3 +183,4 @@ class PE_Interface : public UnoIDL_PE, #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser_i/inc/s2_luidl/pe_modul.hxx b/autodoc/source/parser_i/inc/s2_luidl/pe_modul.hxx index 1b9e5846..88e10156 100644 --- a/autodoc/source/parser_i/inc/s2_luidl/pe_modul.hxx +++ b/autodoc/source/parser_i/inc/s2_luidl/pe_modul.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -61,3 +62,4 @@ class PE_Module : public ::ParseEnvironment } // namespace csi +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser_i/inc/s2_luidl/pe_property.hxx b/autodoc/source/parser_i/inc/s2_luidl/pe_property.hxx index be4c8dc1..7c301630 100644 --- a/autodoc/source/parser_i/inc/s2_luidl/pe_property.hxx +++ b/autodoc/source/parser_i/inc/s2_luidl/pe_property.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -121,3 +122,4 @@ class PE_Property : public UnoIDL_PE, #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser_i/inc/s2_luidl/pe_selem.hxx b/autodoc/source/parser_i/inc/s2_luidl/pe_selem.hxx index b07150f5..ddb060c2 100644 --- a/autodoc/source/parser_i/inc/s2_luidl/pe_selem.hxx +++ b/autodoc/source/parser_i/inc/s2_luidl/pe_selem.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -119,3 +120,5 @@ class PE_StructElement : public UnoIDL_PE, #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser_i/inc/s2_luidl/pe_servi.hxx b/autodoc/source/parser_i/inc/s2_luidl/pe_servi.hxx index c5d71d3a..c889e882 100644 --- a/autodoc/source/parser_i/inc/s2_luidl/pe_servi.hxx +++ b/autodoc/source/parser_i/inc/s2_luidl/pe_servi.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -147,3 +148,4 @@ class PE_Service : public UnoIDL_PE, #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ 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 c48ffd6a..9c38a8ed 100644 --- a/autodoc/source/parser_i/inc/s2_luidl/pe_singl.hxx +++ b/autodoc/source/parser_i/inc/s2_luidl/pe_singl.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -93,31 +94,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(); @@ -148,3 +124,4 @@ class PE_Singleton : public UnoIDL_PE, #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser_i/inc/s2_luidl/pe_struc.hxx b/autodoc/source/parser_i/inc/s2_luidl/pe_struc.hxx index 8cf20ea2..6b7a5e16 100644 --- a/autodoc/source/parser_i/inc/s2_luidl/pe_struc.hxx +++ b/autodoc/source/parser_i/inc/s2_luidl/pe_struc.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -283,3 +284,4 @@ PE_Struct::PE_StructState::MoveState( #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser_i/inc/s2_luidl/pe_tydf2.hxx b/autodoc/source/parser_i/inc/s2_luidl/pe_tydf2.hxx index f0532df0..26171523 100644 --- a/autodoc/source/parser_i/inc/s2_luidl/pe_tydf2.hxx +++ b/autodoc/source/parser_i/inc/s2_luidl/pe_tydf2.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -122,3 +123,4 @@ class PE_Typedef : public UnoIDL_PE, #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser_i/inc/s2_luidl/pe_type2.hxx b/autodoc/source/parser_i/inc/s2_luidl/pe_type2.hxx index 63c48975..020c846f 100644 --- a/autodoc/source/parser_i/inc/s2_luidl/pe_type2.hxx +++ b/autodoc/source/parser_i/inc/s2_luidl/pe_type2.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -114,3 +115,5 @@ class PE_Type : public UnoIDL_PE, } // namespace csi #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser_i/inc/s2_luidl/pe_vari2.hxx b/autodoc/source/parser_i/inc/s2_luidl/pe_vari2.hxx index cc87b379..58a7bc22 100644 --- a/autodoc/source/parser_i/inc/s2_luidl/pe_vari2.hxx +++ b/autodoc/source/parser_i/inc/s2_luidl/pe_vari2.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -105,3 +106,4 @@ class PE_Variable : public UnoIDL_PE, #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser_i/inc/s2_luidl/pestate.hxx b/autodoc/source/parser_i/inc/s2_luidl/pestate.hxx index 7eb8d644..26d03df6 100644 --- a/autodoc/source/parser_i/inc/s2_luidl/pestate.hxx +++ b/autodoc/source/parser_i/inc/s2_luidl/pestate.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -104,3 +105,4 @@ class ParseEnvState : public TokenInterpreter, #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser_i/inc/s2_luidl/semnode.hxx b/autodoc/source/parser_i/inc/s2_luidl/semnode.hxx index 29752354..4d386770 100644 --- a/autodoc/source/parser_i/inc/s2_luidl/semnode.hxx +++ b/autodoc/source/parser_i/inc/s2_luidl/semnode.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,15 +29,12 @@ #ifndef ADC_SEMNODE_HXX #define ADC_SEMNODE_HXX - - // USED SERVICES // BASE CLASSES #include <s2_luidl/tokproct.hxx> // COMPONENTS // PARAMETERS #include <ary/qualiname.hxx> -// #include <udm/ref.hxx> namespace ary @@ -93,40 +91,9 @@ class SemanticNode : private TokenProcessing_Types }; -/* -class Trying_PE -{ - public: - virtual ~Trying_PE() {} - - protected: - Trying_PE(); - - virtual void ProcessToken( - const Token & i_rToken ); - - void StartTry( - UnoIDL_PE & i_rFirstTry ); - void Add2Try( - UnoIDL_PE & i_rTry ); - bool AmITrying() const; - UnoIDL_PE * NextTry() const; - void FinishTry(); - - private: - std::vector<UnoIDL_PE*> - aTryableSubEnvironments; - uintt nTryCounter; -}; - -*/ - - -// IMPLEMENTATION - - } // namespace uidl } // namespace csi #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser_i/inc/s2_luidl/smp_uidl.hxx b/autodoc/source/parser_i/inc/s2_luidl/smp_uidl.hxx index e365fd51..ebdd7326 100644 --- a/autodoc/source/parser_i/inc/s2_luidl/smp_uidl.hxx +++ b/autodoc/source/parser_i/inc/s2_luidl/smp_uidl.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -80,3 +81,4 @@ class SemanticParser : public csi::uidl::Token_Receiver, #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser_i/inc/s2_luidl/tk_const.hxx b/autodoc/source/parser_i/inc/s2_luidl/tk_const.hxx index a8753a0e..36e03a1e 100644 --- a/autodoc/source/parser_i/inc/s2_luidl/tk_const.hxx +++ b/autodoc/source/parser_i/inc/s2_luidl/tk_const.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -62,3 +63,4 @@ class TokAssignment : public Token #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser_i/inc/s2_luidl/tk_ident.hxx b/autodoc/source/parser_i/inc/s2_luidl/tk_ident.hxx index 5354c753..c7345c24 100644 --- a/autodoc/source/parser_i/inc/s2_luidl/tk_ident.hxx +++ b/autodoc/source/parser_i/inc/s2_luidl/tk_ident.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -73,3 +74,4 @@ class TokNameSeparator : public Token #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser_i/inc/s2_luidl/tk_keyw.hxx b/autodoc/source/parser_i/inc/s2_luidl/tk_keyw.hxx index 491ae789..a250a5dd 100644 --- a/autodoc/source/parser_i/inc/s2_luidl/tk_keyw.hxx +++ b/autodoc/source/parser_i/inc/s2_luidl/tk_keyw.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -249,3 +250,4 @@ class TokObserves : public TokKeyword #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser_i/inc/s2_luidl/tk_punct.hxx b/autodoc/source/parser_i/inc/s2_luidl/tk_punct.hxx index 58ae239d..9bb2d48b 100644 --- a/autodoc/source/parser_i/inc/s2_luidl/tk_punct.hxx +++ b/autodoc/source/parser_i/inc/s2_luidl/tk_punct.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -111,3 +112,4 @@ class Tok_EOF : public Token #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser_i/inc/s2_luidl/tkp_uidl.hxx b/autodoc/source/parser_i/inc/s2_luidl/tkp_uidl.hxx index 196a1d2d..50d2b4f5 100644 --- a/autodoc/source/parser_i/inc/s2_luidl/tkp_uidl.hxx +++ b/autodoc/source/parser_i/inc/s2_luidl/tkp_uidl.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -82,3 +83,4 @@ class TokenParser_Uidl : public TokenParse2 #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser_i/inc/s2_luidl/tokintpr.hxx b/autodoc/source/parser_i/inc/s2_luidl/tokintpr.hxx index 6344b98b..340ee0b7 100644 --- a/autodoc/source/parser_i/inc/s2_luidl/tokintpr.hxx +++ b/autodoc/source/parser_i/inc/s2_luidl/tokintpr.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -96,3 +97,5 @@ class TokenInterpreter } // namespace csi #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser_i/inc/s2_luidl/tokproct.hxx b/autodoc/source/parser_i/inc/s2_luidl/tokproct.hxx index 46d2eeb6..f4567c7e 100644 --- a/autodoc/source/parser_i/inc/s2_luidl/tokproct.hxx +++ b/autodoc/source/parser_i/inc/s2_luidl/tokproct.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -63,7 +64,7 @@ class TokenProcessing_Types push_sure, // push sub environment, which must be the correct one push_try, // push sub environment, which is tried, if it may be the right one pop_success, // return to parent environment, parsing was successful - pop_failure // return to parent environment, but an error occured. + pop_failure // return to parent environment, but an error occurred. }; struct TokenProcessing_Result @@ -91,3 +92,4 @@ class TokenProcessing_Types #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser_i/inc/s2_luidl/tokrecv.hxx b/autodoc/source/parser_i/inc/s2_luidl/tokrecv.hxx index 0ccb68dc..033ff8da 100644 --- a/autodoc/source/parser_i/inc/s2_luidl/tokrecv.hxx +++ b/autodoc/source/parser_i/inc/s2_luidl/tokrecv.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -58,3 +59,4 @@ class Token_Receiver #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser_i/inc/s2_luidl/uidl_tok.hxx b/autodoc/source/parser_i/inc/s2_luidl/uidl_tok.hxx index 2578302e..82f2b4b9 100644 --- a/autodoc/source/parser_i/inc/s2_luidl/uidl_tok.hxx +++ b/autodoc/source/parser_i/inc/s2_luidl/uidl_tok.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -62,3 +63,4 @@ class Token : public TextToken #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser_i/inc/semantic/parsenv2.hxx b/autodoc/source/parser_i/inc/semantic/parsenv2.hxx index 747b3c36..16b4af22 100644 --- a/autodoc/source/parser_i/inc/semantic/parsenv2.hxx +++ b/autodoc/source/parser_i/inc/semantic/parsenv2.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -49,3 +50,4 @@ class ParseEnvironment #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser_i/inc/tokens/stmstar2.hxx b/autodoc/source/parser_i/inc/tokens/stmstar2.hxx index 09066e39..e16e4fbd 100644 --- a/autodoc/source/parser_i/inc/tokens/stmstar2.hxx +++ b/autodoc/source/parser_i/inc/tokens/stmstar2.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -81,3 +82,4 @@ StmArrayStatu2::SetTokenId( UINT16 in_nTokenId ) #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser_i/inc/tokens/stmstat2.hxx b/autodoc/source/parser_i/inc/tokens/stmstat2.hxx index fd15d46f..4602da49 100644 --- a/autodoc/source/parser_i/inc/tokens/stmstat2.hxx +++ b/autodoc/source/parser_i/inc/tokens/stmstat2.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -66,3 +67,4 @@ class StmStatu2 // := "State machine status" #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser_i/inc/tokens/stmstfi2.hxx b/autodoc/source/parser_i/inc/tokens/stmstfi2.hxx index 5361b9d1..b7b38d60 100644 --- a/autodoc/source/parser_i/inc/tokens/stmstfi2.hxx +++ b/autodoc/source/parser_i/inc/tokens/stmstfi2.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -78,3 +79,4 @@ StmBoundsStatu2::StatusFunctionNr() const #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser_i/inc/tokens/tkp2.hxx b/autodoc/source/parser_i/inc/tokens/tkp2.hxx index 93ba86b2..ae65eef7 100644 --- a/autodoc/source/parser_i/inc/tokens/tkp2.hxx +++ b/autodoc/source/parser_i/inc/tokens/tkp2.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -64,7 +65,7 @@ class TokenParse2 source code. @return true, if there was passed a valid token. false, if the parsed stream is finished or - an error occured. + an error occurred. */ bool GetNextToken(); @@ -82,3 +83,4 @@ class TokenParse2 #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser_i/inc/tokens/tkpcont2.hxx b/autodoc/source/parser_i/inc/tokens/tkpcont2.hxx index 719d54b0..2246385b 100644 --- a/autodoc/source/parser_i/inc/tokens/tkpcont2.hxx +++ b/autodoc/source/parser_i/inc/tokens/tkpcont2.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -121,3 +122,4 @@ class TkpDocuContext : public TkpContext #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser_i/inc/tokens/tkpstam2.hxx b/autodoc/source/parser_i/inc/tokens/tkpstam2.hxx index 1fb6c22c..635f696b 100644 --- a/autodoc/source/parser_i/inc/tokens/tkpstam2.hxx +++ b/autodoc/source/parser_i/inc/tokens/tkpstam2.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -119,3 +120,4 @@ class StateMachin2 #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser_i/inc/tokens/token2.hxx b/autodoc/source/parser_i/inc/tokens/token2.hxx index d54482ec..1e6750c4 100644 --- a/autodoc/source/parser_i/inc/tokens/token2.hxx +++ b/autodoc/source/parser_i/inc/tokens/token2.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -61,3 +62,4 @@ class TextToken #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser_i/inc/x_parse2.hxx b/autodoc/source/parser_i/inc/x_parse2.hxx index 4ef28585..bbc69bb9 100644 --- a/autodoc/source/parser_i/inc/x_parse2.hxx +++ b/autodoc/source/parser_i/inc/x_parse2.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -65,3 +66,5 @@ class X_AutodocParser : public csv::Exception #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser_i/tokens/stmstar2.cxx b/autodoc/source/parser_i/tokens/stmstar2.cxx index cc30d6b8..f8894451 100644 --- a/autodoc/source/parser_i/tokens/stmstar2.cxx +++ b/autodoc/source/parser_i/tokens/stmstar2.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -100,3 +101,4 @@ StmArrayStatu2::AsArray() return this; } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser_i/tokens/stmstat2.cxx b/autodoc/source/parser_i/tokens/stmstat2.cxx index 73ca9fc6..701bfa33 100644 --- a/autodoc/source/parser_i/tokens/stmstat2.cxx +++ b/autodoc/source/parser_i/tokens/stmstat2.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -44,3 +45,4 @@ StmStatu2::AsBounds() } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser_i/tokens/stmstfi2.cxx b/autodoc/source/parser_i/tokens/stmstfi2.cxx index 2442a175..52801190 100644 --- a/autodoc/source/parser_i/tokens/stmstfi2.cxx +++ b/autodoc/source/parser_i/tokens/stmstfi2.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -59,3 +60,4 @@ StmBoundsStatu2::AsBounds() +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser_i/tokens/tkp2.cxx b/autodoc/source/parser_i/tokens/tkp2.cxx index e7f1a239..95021501 100644 --- a/autodoc/source/parser_i/tokens/tkp2.cxx +++ b/autodoc/source/parser_i/tokens/tkp2.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -60,3 +61,4 @@ TokenParse2::GetNextToken() } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser_i/tokens/tkpcont2.cxx b/autodoc/source/parser_i/tokens/tkpcont2.cxx index 73e5b705..73c93c5e 100644 --- a/autodoc/source/parser_i/tokens/tkpcont2.cxx +++ b/autodoc/source/parser_i/tokens/tkpcont2.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -63,3 +64,4 @@ TkpNullContex2::FollowUpContext() +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser_i/tokens/tkpstam2.cxx b/autodoc/source/parser_i/tokens/tkpstam2.cxx index db58cf41..39cf31e1 100644 --- a/autodoc/source/parser_i/tokens/tkpstam2.cxx +++ b/autodoc/source/parser_i/tokens/tkpstam2.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -172,3 +173,5 @@ StateMachin2::Peek(intt in_nBranch) StmArrayStatu2 & rSt = CurrentStatus(); nPeekedStatus = rSt.NextBy(in_nBranch); } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser_i/tokens/x_parse2.cxx b/autodoc/source/parser_i/tokens/x_parse2.cxx index 09be5326..8824d2cc 100644 --- a/autodoc/source/parser_i/tokens/x_parse2.cxx +++ b/autodoc/source/parser_i/tokens/x_parse2.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -59,3 +60,4 @@ X_AutodocParser::GetInfo( std::ostream & o_rOutputMedium ) const } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/tools/filecoll.cxx b/autodoc/source/tools/filecoll.cxx index 47f783b7..30dccae0 100644 --- a/autodoc/source/tools/filecoll.cxx +++ b/autodoc/source/tools/filecoll.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -130,3 +131,4 @@ FileCollector::Size() const return aFoundFiles.size(); } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/tools/tkpchars.cxx b/autodoc/source/tools/tkpchars.cxx index 1f18dea7..78b88eb8 100644 --- a/autodoc/source/tools/tkpchars.cxx +++ b/autodoc/source/tools/tkpchars.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -76,7 +77,7 @@ CharacterSource::LoadText(csv::bstream & io_rSource) void CharacterSource::InsertTextAtCurPos( const char * i_sText2Insert ) { - if ( i_sText2Insert == 0 ? true : strlen(i_sText2Insert) == 0 ) + if ( !i_sText2Insert || !i_sText2Insert[0] ) return; aSourcesStack.push( S_SourceState( @@ -157,3 +158,4 @@ S_SourceState::S_SourceState( DYN char * dpSource_, { } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cosv/inc/cosv/bstream.hxx b/cosv/inc/cosv/bstream.hxx index 4b58553d..6aa08eb7 100644 --- a/cosv/inc/cosv/bstream.hxx +++ b/cosv/inc/cosv/bstream.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -148,3 +149,4 @@ bstream::position() const #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cosv/inc/cosv/comdline.hxx b/cosv/inc/cosv/comdline.hxx index 3f0952e2..8aa190e2 100644 --- a/cosv/inc/cosv/comdline.hxx +++ b/cosv/inc/cosv/comdline.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -68,3 +69,4 @@ CommandLine_Ifc::PrintUse() const #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cosv/inc/cosv/comfunc.hxx b/cosv/inc/cosv/comfunc.hxx index 096579a6..8b7bb1c0 100644 --- a/cosv/inc/cosv/comfunc.hxx +++ b/cosv/inc/cosv/comfunc.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -123,3 +124,5 @@ switch_endian( NUMTYPE & o_rNumber, #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cosv/inc/cosv/commandline.hxx b/cosv/inc/cosv/commandline.hxx index ad8d0754..e0585acb 100644 --- a/cosv/inc/cosv/commandline.hxx +++ b/cosv/inc/cosv/commandline.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -178,3 +179,5 @@ CommandLine::Set_Error() } // namespace csv #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cosv/inc/cosv/csv_env.hxx b/cosv/inc/cosv/csv_env.hxx index 7916f205..28b21263 100644 --- a/cosv/inc/cosv/csv_env.hxx +++ b/cosv/inc/cosv/csv_env.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -152,3 +153,5 @@ void PerformAssertion( #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cosv/inc/cosv/csv_ostream.hxx b/cosv/inc/cosv/csv_ostream.hxx index 1ef438a5..7cf8561d 100644 --- a/cosv/inc/cosv/csv_ostream.hxx +++ b/cosv/inc/cosv/csv_ostream.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -132,3 +133,4 @@ ostream::Data() const #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cosv/inc/cosv/csv_precomp.h b/cosv/inc/cosv/csv_precomp.h index 0f03b389..48323a67 100644 --- a/cosv/inc/cosv/csv_precomp.h +++ b/cosv/inc/cosv/csv_precomp.h @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -44,3 +45,5 @@ #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cosv/inc/cosv/datetime.hxx b/cosv/inc/cosv/datetime.hxx index e0197687..e68be1d6 100644 --- a/cosv/inc/cosv/datetime.hxx +++ b/cosv/inc/cosv/datetime.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -82,3 +83,4 @@ class Time #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cosv/inc/cosv/dirchain.hxx b/cosv/inc/cosv/dirchain.hxx index 5f2f6d52..d4954975 100644 --- a/cosv/inc/cosv/dirchain.hxx +++ b/cosv/inc/cosv/dirchain.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -178,3 +179,4 @@ operator<<( csv::bostream & o_rOut, +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cosv/inc/cosv/file.hxx b/cosv/inc/cosv/file.hxx index 5e693c56..a6dc4050 100644 --- a/cosv/inc/cosv/file.hxx +++ b/cosv/inc/cosv/file.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -135,3 +136,4 @@ File::Mode() const #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cosv/inc/cosv/mbstream.hxx b/cosv/inc/cosv/mbstream.hxx index 6c367ae5..e04ad6a7 100644 --- a/cosv/inc/cosv/mbstream.hxx +++ b/cosv/inc/cosv/mbstream.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -91,3 +92,4 @@ mbstream::data() const #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cosv/inc/cosv/openclose.hxx b/cosv/inc/cosv/openclose.hxx index 152ac9b4..ad1e9063 100644 --- a/cosv/inc/cosv/openclose.hxx +++ b/cosv/inc/cosv/openclose.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -142,3 +143,4 @@ OpenCloseGuard::operator bool() const #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cosv/inc/cosv/persist.hxx b/cosv/inc/cosv/persist.hxx index 39a7a817..6e7b2b22 100644 --- a/cosv/inc/cosv/persist.hxx +++ b/cosv/inc/cosv/persist.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -103,3 +104,4 @@ Persistent::InvalidatePath() +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cosv/inc/cosv/ploc.hxx b/cosv/inc/cosv/ploc.hxx index 42657f00..e7514c8d 100644 --- a/cosv/inc/cosv/ploc.hxx +++ b/cosv/inc/cosv/ploc.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -127,3 +128,5 @@ operator<<( csv::bostream & o_rOut, #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cosv/inc/cosv/ploc_dir.hxx b/cosv/inc/cosv/ploc_dir.hxx index 9f7cbb1a..9b12b45c 100644 --- a/cosv/inc/cosv/ploc_dir.hxx +++ b/cosv/inc/cosv/ploc_dir.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -116,3 +117,4 @@ class Directory : public Persistent #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cosv/inc/cosv/plocroot.hxx b/cosv/inc/cosv/plocroot.hxx index ce79381d..02899160 100644 --- a/cosv/inc/cosv/plocroot.hxx +++ b/cosv/inc/cosv/plocroot.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -78,3 +79,4 @@ class Root +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cosv/inc/cosv/std_outp.hxx b/cosv/inc/cosv/std_outp.hxx index bf08b55f..9decc3f4 100644 --- a/cosv/inc/cosv/std_outp.hxx +++ b/cosv/inc/cosv/std_outp.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -134,3 +135,4 @@ operator<<( csv::ostream & io_rStream, #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cosv/inc/cosv/str_types.hxx b/cosv/inc/cosv/str_types.hxx index 77dabe27..dd875383 100644 --- a/cosv/inc/cosv/str_types.hxx +++ b/cosv/inc/cosv/str_types.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -92,3 +93,5 @@ CharOrder_Table::operator()( char i_c ) const } // namespace csv #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cosv/inc/cosv/streamstr.hxx b/cosv/inc/cosv/streamstr.hxx index b255a8d7..56765720 100644 --- a/cosv/inc/cosv/streamstr.hxx +++ b/cosv/inc/cosv/streamstr.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -389,3 +390,5 @@ Join( StreamStr & o_text, } // namespace csv #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cosv/inc/cosv/string.hxx b/cosv/inc/cosv/string.hxx index 000f1d39..096b9828 100644 --- a/cosv/inc/cosv/string.hxx +++ b/cosv/inc/cosv/string.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -577,3 +578,5 @@ typedef std::vector<String> StringVector; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cosv/inc/cosv/stringdata.hxx b/cosv/inc/cosv/stringdata.hxx index 0c1b4a55..0471d82e 100644 --- a/cosv/inc/cosv/stringdata.hxx +++ b/cosv/inc/cosv/stringdata.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -133,3 +134,4 @@ StringData<CHAR>::Size() const #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cosv/inc/cosv/tpl/dyn.hxx b/cosv/inc/cosv/tpl/dyn.hxx index 8b859fc2..f59495a2 100644 --- a/cosv/inc/cosv/tpl/dyn.hxx +++ b/cosv/inc/cosv/tpl/dyn.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -236,3 +237,5 @@ Dyn<DX>::MutablePtr() const #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cosv/inc/cosv/tpl/funcall.hxx b/cosv/inc/cosv/tpl/funcall.hxx index 00d242cf..f76e014c 100644 --- a/cosv/inc/cosv/tpl/funcall.hxx +++ b/cosv/inc/cosv/tpl/funcall.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -305,3 +306,5 @@ for_each_in(C & i_container, F io_functionToBeCalled) } // namespace csv #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cosv/inc/cosv/tpl/processor.hxx b/cosv/inc/cosv/tpl/processor.hxx index a2a5af33..a6dba37b 100644 --- a/cosv/inc/cosv/tpl/processor.hxx +++ b/cosv/inc/cosv/tpl/processor.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -181,3 +182,5 @@ AssertedCall( ProcessorIfc & io_processor, } // namespace csv #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cosv/inc/cosv/tpl/range.hxx b/cosv/inc/cosv/tpl/range.hxx index 665aea1b..295d7cf6 100644 --- a/cosv/inc/cosv/tpl/range.hxx +++ b/cosv/inc/cosv/tpl/range.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -189,3 +190,5 @@ range<T>::distance_to(const self & i_other) const } // namespace csv #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cosv/inc/cosv/tpl/swelist.hxx b/cosv/inc/cosv/tpl/swelist.hxx index bc6edc5b..c0f06f3a 100644 --- a/cosv/inc/cosv/tpl/swelist.hxx +++ b/cosv/inc/cosv/tpl/swelist.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -367,3 +368,4 @@ SweList_dyn<XX>::size() const #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cosv/inc/cosv/tpl/tpltools.hxx b/cosv/inc/cosv/tpl/tpltools.hxx index 42cfa3be..5f69a95b 100644 --- a/cosv/inc/cosv/tpl/tpltools.hxx +++ b/cosv/inc/cosv/tpl/tpltools.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -226,3 +227,5 @@ call_for_each( const COLLECTION & i_rList, } // namespace csv #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cosv/inc/cosv/tpl/vvector.hxx b/cosv/inc/cosv/tpl/vvector.hxx index 9a360afc..1903dce7 100644 --- a/cosv/inc/cosv/tpl/vvector.hxx +++ b/cosv/inc/cosv/tpl/vvector.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -131,7 +132,7 @@ class VirtualVector typedef VirtualVector<XX,PTRDEL> self; typedef std::vector< DYN XX* > impl_type; typedef typename impl_type::size_type size_type; - typedef ptrdiff_t difference_type; + typedef std::ptrdiff_t difference_type; class const_iterator; class iterator; @@ -537,3 +538,5 @@ VirtualVector<XX,PTRDEL>::back() } // namespace csv #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cosv/inc/cosv/x.hxx b/cosv/inc/cosv/x.hxx index 56552f0f..e5002d36 100644 --- a/cosv/inc/cosv/x.hxx +++ b/cosv/inc/cosv/x.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -69,3 +70,4 @@ class X_Default : public Exception +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cosv/prj/build.lst b/cosv/prj/build.lst index f75303c0..2ffd4588 100644 --- a/cosv/prj/build.lst +++ b/cosv/prj/build.lst @@ -1,5 +1,5 @@ #==================================================================================== -cs cosv : soltools stlport NULL +cs cosv : soltools NULL cs cosv usr1 - all cs_mkout NULL cs cosv\prj get - all cs_prj NULL cs cosv\inc get - all cs_inc NULL diff --git a/cosv/prj/d.lst b/cosv/prj/d.lst index 229161c1..496506b8 100644 --- a/cosv/prj/d.lst +++ b/cosv/prj/d.lst @@ -1,8 +1,8 @@ -mkdir: %_DEST%\inc%_EXT%\cosv -mkdir: %_DEST%\inc%_EXT%\cosv\tpl +mkdir: %_DEST%\inc\cosv +mkdir: %_DEST%\inc\cosv\tpl -..\%__SRC%\lib\cosv.lib %_DEST%\lib%_EXT%\cosv.lib -..\%__SRC%\lib\libcosv.a %_DEST%\lib%_EXT%\libcosv.a -..\inc\cosv\*.hxx %_DEST%\inc%_EXT%\cosv\*.hxx -..\inc\cosv\*.h %_DEST%\inc%_EXT%\cosv\*.h -..\inc\cosv\tpl\*.hxx %_DEST%\inc%_EXT%\cosv\tpl\*.hxx +..\%__SRC%\lib\cosv.lib %_DEST%\lib\cosv.lib +..\%__SRC%\lib\libcosv.a %_DEST%\lib\libcosv.a +..\inc\cosv\*.hxx %_DEST%\inc\cosv\*.hxx +..\inc\cosv\*.h %_DEST%\inc\cosv\*.h +..\inc\cosv\tpl\*.hxx %_DEST%\inc\cosv\tpl\*.hxx diff --git a/cosv/source/comphelp/badcast.cxx b/cosv/source/comphelp/badcast.cxx index 2ebeea33..429671e3 100644 --- a/cosv/source/comphelp/badcast.cxx +++ b/cosv/source/comphelp/badcast.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -43,3 +44,4 @@ _STD_END +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cosv/source/fullcpp.mk b/cosv/source/fullcpp.mk index ffbcb980..3103f635 100644 --- a/cosv/source/fullcpp.mk +++ b/cosv/source/fullcpp.mk @@ -31,7 +31,7 @@ # Has to be inlcuded AFTER settings.mk ! -.IF "$(GUI)"=="WNT" +.IF "$(COM)"=="MSC" # RTTI CFLAGS+= -GR @@ -50,8 +50,7 @@ CFLAGS+= -YX"precomp.h" /Fp$(PRJ)$/$(INPATH)$/misc$/$(PCH_NAME).pcd -DNP_LOCALBU .ENDIF -.IF "$(OS)"=="LINUX" +.IF "$(COM)"=="GCC" # RTTI CFLAGSCXX+= -frtti .ENDIF - diff --git a/cosv/source/inc/precomp.h b/cosv/source/inc/precomp.h index dcb4e97e..e1c5e0d4 100644 --- a/cosv/source/inc/precomp.h +++ b/cosv/source/inc/precomp.h @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -34,3 +35,4 @@ #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cosv/source/service/comdline.cxx b/cosv/source/service/comdline.cxx index 7ad733ec..00393c46 100644 --- a/cosv/source/service/comdline.cxx +++ b/cosv/source/service/comdline.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -55,3 +56,4 @@ CommandLine_Ifc::CheckParameters() const +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cosv/source/service/comfunc.cxx b/cosv/source/service/comfunc.cxx index 093af8c9..82d0ae83 100644 --- a/cosv/source/service/comfunc.cxx +++ b/cosv/source/service/comfunc.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -153,3 +154,4 @@ time2str(String & out_Str, int hour, int min, int sec) +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cosv/source/service/commandline.cxx b/cosv/source/service/commandline.cxx index d0a22e41..c3983e6e 100644 --- a/cosv/source/service/commandline.cxx +++ b/cosv/source/service/commandline.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -340,3 +341,5 @@ OptionDescription::OptionDescription( intt i_id, } // namespace csv + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cosv/source/service/csv_ostream.cxx b/cosv/source/service/csv_ostream.cxx index 4a4be4f2..27fd4904 100644 --- a/cosv/source/service/csv_ostream.cxx +++ b/cosv/source/service/csv_ostream.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -90,3 +91,4 @@ ostream::ostream( uintt i_nStartSize ) +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cosv/source/service/datetime.cxx b/cosv/source/service/datetime.cxx index 4fb7eb6c..6738f55a 100644 --- a/cosv/source/service/datetime.cxx +++ b/cosv/source/service/datetime.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -82,3 +83,4 @@ Time::Null_() } // namespace csv +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cosv/source/service/std_outp.cxx b/cosv/source/service/std_outp.cxx index 9116f10c..18bc34bc 100644 --- a/cosv/source/service/std_outp.cxx +++ b/cosv/source/service/std_outp.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -79,3 +80,4 @@ PerformAssertion(const char * condition, const char * file, unsigned line) } // namespace csv +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cosv/source/storage/dirchain.cxx b/cosv/source/storage/dirchain.cxx index 111f036d..52683c25 100644 --- a/cosv/source/storage/dirchain.cxx +++ b/cosv/source/storage/dirchain.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -153,3 +154,5 @@ DirectoryChain::Get( bostream & o_rPath, } // namespace ploc } // namespace csv + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cosv/source/storage/file.cxx b/cosv/source/storage/file.cxx index 6371c131..7227476f 100644 --- a/cosv/source/storage/file.cxx +++ b/cosv/source/storage/file.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -240,3 +241,4 @@ File::inq_MyPath() const } // namespace csv +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cosv/source/storage/makefile.mk b/cosv/source/storage/makefile.mk index 84e396c4..902e8c74 100644 --- a/cosv/source/storage/makefile.mk +++ b/cosv/source/storage/makefile.mk @@ -32,17 +32,11 @@ TARGET=cosv_storage ENABLE_EXCEPTIONS=true - - # --- Settings ----------------------------------------------------- .INCLUDE : settings.mk - .INCLUDE : $(PRJ)$/source$/fullcpp.mk - - - # --- Files -------------------------------------------------------- OBJFILES= \ @@ -54,16 +48,6 @@ OBJFILES= \ $(OBJ)$/ploc_dir.obj \ $(OBJ)$/plocroot.obj -#SLOFILES= \ -# $(SLO)$/file.obj \ -# $(SLO)$/csfileim.obj \ -# $(SLO)$/memstorg.obj - - - # --- Targets ------------------------------------------------------ .INCLUDE : target.mk - - - diff --git a/cosv/source/storage/mbstream.cxx b/cosv/source/storage/mbstream.cxx index f6adf183..c1bea8b5 100644 --- a/cosv/source/storage/mbstream.cxx +++ b/cosv/source/storage/mbstream.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -117,3 +118,4 @@ mbstream::inq_position() const } // namespace csv +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cosv/source/storage/persist.cxx b/cosv/source/storage/persist.cxx index 2e94104c..9fcbfa8c 100644 --- a/cosv/source/storage/persist.cxx +++ b/cosv/source/storage/persist.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -111,3 +112,4 @@ Persistent::StrPath() const +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cosv/source/storage/ploc.cxx b/cosv/source/storage/ploc.cxx index a46f8a27..000eafd7 100644 --- a/cosv/source/storage/ploc.cxx +++ b/cosv/source/storage/ploc.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -155,3 +156,5 @@ Path::Get( bostream & o_rPath ) const } // namespace ploc } // namespace csv + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cosv/source/storage/ploc_dir.cxx b/cosv/source/storage/ploc_dir.cxx index 753aeab9..7770502f 100644 --- a/cosv/source/storage/ploc_dir.cxx +++ b/cosv/source/storage/ploc_dir.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -362,3 +363,4 @@ Directory::inq_MyPath() const +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cosv/source/storage/plocroot.cxx b/cosv/source/storage/plocroot.cxx index d59d858b..c2ae0a6f 100644 --- a/cosv/source/storage/plocroot.cxx +++ b/cosv/source/storage/plocroot.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -523,3 +524,4 @@ InvalidRoot::OwnDelimiter() const +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cosv/source/strings/str_types.cxx b/cosv/source/strings/str_types.cxx index 44d691de..386dac63 100644 --- a/cosv/source/strings/str_types.cxx +++ b/cosv/source/strings/str_types.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -42,3 +43,4 @@ CharOrder_Table::CharOrder_Table( const int * i_pCharWeightsArray ) } // namespace csv +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cosv/source/strings/streamstr.cxx b/cosv/source/strings/streamstr.cxx index 09d956e2..0ae9dfd8 100644 --- a/cosv/source/strings/streamstr.cxx +++ b/cosv/source/strings/streamstr.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -979,3 +980,5 @@ Split( std::vector<String> & o_list, } // namespace csv + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cosv/source/strings/string.cxx b/cosv/source/strings/string.cxx index 70a7f8d8..7a7429ec 100644 --- a/cosv/source/strings/string.cxx +++ b/cosv/source/strings/string.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -412,3 +413,5 @@ compare( const CharOrder_Table & i_rOrder, } // namespace csv + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cosv/source/unittest/file_ut.cxx b/cosv/source/unittest/file_ut.cxx index c4489dc1..0a8c6e17 100644 --- a/cosv/source/unittest/file_ut.cxx +++ b/cosv/source/unittest/file_ut.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -119,3 +120,4 @@ FUT_DECL( File, SeekRelative ) +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cosv/source/unittest/makefile.mk b/cosv/source/unittest/makefile.mk index 173ce8c9..c7367613 100644 --- a/cosv/source/unittest/makefile.mk +++ b/cosv/source/unittest/makefile.mk @@ -57,14 +57,6 @@ APP1TARGET= $(TARGET) APP1STACK= 1000000 APP1OBJS= $(OBJ)$/ut_main.obj -.IF "$(GUI)"=="WNT" -APP1STDLIBS= $(LIBSTLPORT) -.ELSE -.IF "$(OS)"=="MACOSX" -APP1STDLIBS= $(LIBSTLPORT) -.ENDIF -.ENDIF - APP1LIBS= $(LB)$/$(TARGET).lib $(LB)$/cosv.lib diff --git a/cosv/source/unittest/string_ut.cxx b/cosv/source/unittest/string_ut.cxx index 2eae2138..d00e6067 100644 --- a/cosv/source/unittest/string_ut.cxx +++ b/cosv/source/unittest/string_ut.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -72,69 +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/cosv/source/unittest/ut.hxx b/cosv/source/unittest/ut.hxx index 41c434a3..45982af8 100644 --- a/cosv/source/unittest/ut.hxx +++ b/cosv/source/unittest/ut.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -51,3 +52,4 @@ CUT_DECL( csv, String ); +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cosv/source/unittest/ut_main.cxx b/cosv/source/unittest/ut_main.cxx index 4acf303f..a448708f 100644 --- a/cosv/source/unittest/ut_main.cxx +++ b/cosv/source/unittest/ut_main.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -45,3 +46,4 @@ main(int argc, char * argv[]) } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/odk/cfgWin.js b/odk/cfgWin.js index 0dc23d22..398599dd 100644 --- a/odk/cfgWin.js +++ b/odk/cfgWin.js @@ -2,8 +2,8 @@ // examples of the Office Development Kit. The script duplicates the template // script and inserts the variables into the copied script. // The Script was developed for the operating systems Microsoft Windows. -var regKeyOfficeCurrentUser = "HKEY_CURRENT_USER\\Software\\OpenOffice.org\\UNO\\InstallPath\\"; -var regKeyOfficeLocaleMachine = "HKEY_LOCAL_MACHINE\\Software\\OpenOffice.org\\UNO\\InstallPath\\"; +var regKeyOfficeCurrentUser = "HKEY_CURRENT_USER\\Software\\LibreOffice\\UNO\\InstallPath\\"; +var regKeyOfficeLocaleMachine = "HKEY_LOCAL_MACHINE\\Software\\LibreOffice\\UNO\\InstallPath\\"; var regKeyDotNetInstallRoot = "HKEY_LOCAL_MACHINE\\Software\\Microsoft\\.NETFramework\\InstallRoot"; var regKeyDotNet1_1 = "HKLM\\Software\\Microsoft\\.NETFramework\\policy\\v1.1\\4322"; var sDirDotNet1_1 = "v1.1.4322"; @@ -31,7 +31,6 @@ stdout.WriteLine("\n" + " NOTE: This script is working only for Windows 2000, Windows XP or newer versions!\n"); var oo_sdk_name=WshSysEnv("OO_SDK_NAME"); -var stldebug=""; var oo_sdk_home=getSdkHome(); var oo_user_sdk_dir=WshSysEnv("APPDATA") + "\\" + oo_sdk_name; var oo_user_sdk_env_script=oo_user_sdk_dir + "\\setsdkenv_windows.bat"; @@ -121,10 +120,6 @@ function getSdkHome() continue; } - if (aFileSystemObject.FileExists(sHome + "\\lib\\stlport_vc71_stldebug.lib")) { - stldebug="_stldebug"; - } - return sHome; } } @@ -793,22 +788,22 @@ function writeBatFile(fdir, file) "REM are necessary for building the examples of the Office Development Kit.\n" + "REM The Script was developed for the operating systems Windows.\n" + "REM The SDK name\n" + - "REM Example: set OO_SDK_NAME=openoffice3.0_sdk\n" + + "REM Example: set OO_SDK_NAME=libreoffice3.4_sdk\n" + "set OO_SDK_NAME=" + oo_sdk_name + "\n\n" + "REM Installation directory of the Software Development Kit.\n" + - "REM Example: set OO_SDK_HOME=C:\\Program Files\\OpenOffice.org\\Basic 3.0\\sdk\n" + + "REM Example: set OO_SDK_HOME=C:\\Program Files\\LibreOffice 3\\Basis\\sdk\n" + "set OO_SDK_HOME=" + oo_sdk_home + "\n\n" + "REM Office installation directory.\n" + - "REM Example: set OFFICE_HOME=C:\\Program Files\\OpenOffice.org 3\n" + + "REM Example: set OFFICE_HOME=C:\\Program Files\\LibreOffice 3\n" + "set OFFICE_HOME=" + office_home + "\n\n" + - "REM Example: set OFFICE_HOME=C:\\Program Files\\OpenOffice.org\\Basis 3.0\n" + + "REM Example: set OFFICE_HOME=C:\\Program Files\\LibreOffice 3\\Basis\n" + "set OFFICE_BASE_HOME=" + office_base_home + "\n\n" + "REM URE installation directory.\n" + - "REM Example: set OO_SDK_URE_HOME=C:\\Program Files\\OpenOffice.org\\URE\n" + + "REM Example: set OO_SDK_URE_HOME=C:\\Program Files\\LibreOffice 3\\URE\n" + "set OO_SDK_URE_HOME=" + oo_sdk_ure_home + "\n\n" + "REM Directory of the make command.\n" + @@ -841,11 +836,6 @@ function writeBatFile(fdir, file) "REM Example: set SDK_AUTO_DEPLOYMENT=YES\n" + "set SDK_AUTO_DEPLOYMENT=" + sdk_auto_deployment + "\n\n" + - "set STLDEBUG=" + stldebug + "\n" + - "REM check stlport lib in 4NT shell\n" + - "REM if exist \"%OO_SDK_HOME%\\windows\\lib\\stlport_vc71_stldebug.lib\". (\n" + - "REM set STLDEBUG=_stldebug\n" + - "REM )\n\n" + "REM Check installation path for the Office Development Kit.\n" + "if not defined OO_SDK_HOME (\n" + " echo Error: the variable OO_SDK_HOME is missing!\n" + diff --git a/odk/configure.pl b/odk/configure.pl index a437ac0a..d102e6f0 100755 --- a/odk/configure.pl +++ b/odk/configure.pl @@ -32,12 +32,7 @@ $main::OFFICE_HOME = ""; $main::OFFICE_BASE_HOME = substr($main::sdkpath, 0, rindex($main::sdkpath, "/sdk")); -if ( $main::operatingSystem =~ m/darwin/ ) -{ -# $main::OO_SDK_URE_HOME = `cd $main::sdkpath/../ure-link && pwd`; -} else { - $main::OO_SDK_URE_HOME = `cd $main::sdkpath/../ure-link && pwd`; -} +$main::OO_SDK_URE_HOME = `cd $main::sdkpath/../ure-link && pwd`; chomp($main::OO_SDK_URE_HOME); $main::OO_SDK_MAKE_HOME = ""; @@ -654,9 +649,9 @@ sub searchMacOffice sub searchoffice { - my $offset = rindex($main::sdkpath, "/openoffice.org"); + my $offset = rindex($main::sdkpath, "/libreoffice"); my $tmpOffice = substr($main::sdkpath, 0, $offset); - my $officepath = "$tmpOffice/openoffice.org$main::OO_MAJORVERSION"; + my $officepath = "$tmpOffice/libreoffice"; # if ( $main::OO_MINORVERSION > 0) { # $officepath = "$officepath$main::OO_MINORVERSION"; diff --git a/odk/docs/install.html b/odk/docs/install.html index baf9b5f1..87a07ca2 100644 --- a/odk/docs/install.html +++ b/odk/docs/install.html @@ -1,6 +1,6 @@ <html> <head> - <title>OpenOffice.org %PRODUCT_RELEASE% SDK - Installation Guide</title> + <title>LibreOffice %PRODUCT_RELEASE% SDK - Installation Guide</title> <link rel="stylesheet" type="text/css" href="sdk_styles.css"> <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> <meta name="author" content="Jürgen Schmidt"> @@ -36,16 +36,16 @@ <table class="table3"> <tr> <td colspan="2"> - <p>The OpenOffice.org %PRODUCT_RELEASE% SDK comes with a set of development tools, base + <p>The LibreOffice %PRODUCT_RELEASE% SDK comes with a set of development tools, base libraries, header files and helper class files that can be used to - develop Java/C++ components, to embed the OpenOffice.org %PRODUCT_RELEASE% application in + develop Java/C++ components, to embed the LibreOffice %PRODUCT_RELEASE% application in your own programs, or to use the API (scripting or remote control the office). For a complete working environment, we have some additional requirements:</p> </td> </tr> <tr valign="top"> - <td><b>OpenOffice.org %PRODUCT_RELEASE% installation</td> + <td><b>LibreOffice %PRODUCT_RELEASE% installation</td> <td class="content80">The SDK works on top of an existing office installation and uses the same libraries as the office installation.</td> </tr> @@ -134,7 +134,7 @@ <li><b>C:\Documents and Settings\<username>\Application Data\%OO_SDK_NAME%\setsdkenv_windows.bat</b></a> -> for Windows2000/XP or later </ul> <p>The automatically started configure script (Unix and Windows2000/XP) - requests relevant information and directories (SDK, StarOffice, GNU make, + requests relevant information and directories (SDK, LibreOffice, GNU make, Java, C++), in order to prepare a working SDK environment. After completing the configure script once, the newly created script is always used to set the necessary environment variables for using the SDK and the required @@ -154,8 +154,8 @@ <table class="table4"> <tr valign="top"> <td class="cell20"><b>OFFICE_HOME</b></td> - <td class="cell80">Path to an existing StarOffice™ or OpenOffice.org - base installation, e.g. "/opt/staroffice8". Be sure + <td class="cell80">Path to an existing LibreOffice + base installation, e.g. "/opt/libreoffice8". Be sure that it is not a user installation only. Exactly one of OFFICE_HOME and OO_SDK_URE_HOME must be set. The other should be either unset or set to an empty value.</td> @@ -172,14 +172,14 @@ <tr> <td class="cell20"><b>OO_SDK_URE_HOME</b></td> <td class="cell80">Path to an existing UNO Runtime Environment - installation, e.g. "/opt/openoffice.org/ure". Exactly one of + installation, e.g. "/opt/libreoffice/ure". Exactly one of OFFICE_HOME and OO_SDK_URE_HOME must be set. The other should be either unset or set to an empty value.</td> </tr> <tr> <td class="cell20"><b>OO_SDK_HOME</b></td> <td class="cell80">Path to the SDK root directory, e.g. - "/usr/local/StarOffice8_SDK"</td> + "/opt/libreoffice/sdk"</td> </tr> <tr> <td class="cell20"><b>OO_SDK_JAVA_HOME</b></td> @@ -218,7 +218,7 @@ the output is generated in the SDK directory itself. If an output directory is specified, the output is generated in a SDK dependent subdirectory in this directory (e.g. <OO_SDK_OUTPUT_DIR> - /OpenOffice.org %PRODUCT_RELEASE%/LINUXExample.out)</td> + /LibreOffice %PRODUCT_RELEASE%/LINUXExample.out)</td> </tr> <tr> <td class="cell20"><b>SDK_AUTO_DEPLOYMENT</b></td> diff --git a/odk/examples/CLI/CSharp/Spreadsheet/Makefile b/odk/examples/CLI/CSharp/Spreadsheet/Makefile index bae593f3..a8dba1cf 100644 --- a/odk/examples/CLI/CSharp/Spreadsheet/Makefile +++ b/odk/examples/CLI/CSharp/Spreadsheet/Makefile @@ -1,13 +1,18 @@ # Builds the SpreadSheet examples of the Developers Guide. +# This Makefile is supposed to be run by a GNU Make built for native +# Windows Not the Cygwin GNU Make, not dmake, not Microsoft's NMAKE. +# But yeah, that is what the setsdkenv_windows.bat file in +# ../../../.. presumably tries to set up. + PRJ = ../../../.. SETTINGS = $(PRJ)/settings include $(SETTINGS)/settings.mk include $(SETTINGS)/std.mk -include $(SETTINGS)/dk.mk +#include $(SETTINGS)/dk.mk -CSC_FLAGS = -warnaserror+ -noconfig +CSC_FLAGS = -warnaserror+ -noconfig -platform:x86 VBC_FLAGS = -warnaserror+ ifeq "$(DEBUG)" "yes" CC_FLAGS+=-Zi -MT @@ -21,7 +26,14 @@ endif THIS_OUT_MISC = $(OUT_MISC)/csharp_SpreadsheetExamples SPREADSHEET_OUT:= $(OUT_BIN)/CSharp_SpreadsheetExamples + +ifneq "$(OUTDIR)" "" +# We are running in a LO build environment, good +CLI_LIB_LOCATION = $(OUTDIR)\bin +else +# Bad guess, but hey, this is how it was CLI_LIB_LOCATION = $(PRJ)\cli +endif # Targets .PHONY : ALL @@ -54,7 +66,7 @@ ViewSample : $(SPREADSHEET_OUT)/ViewSample.exe .PHONY : Info ifeq "$(OS)" "WIN" -Info : SpreadsheetSample GenerateTableSample ViewSample +Info : SpreadsheetSample GeneralTableSample ViewSample @echo ------------------------------------------------------------------------------- @echo Please use one of the following commands to execute the examples! @echo - diff --git a/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/Makefile b/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/Makefile index 98bbab16..a6bc6835 100644 --- a/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/Makefile +++ b/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/Makefile @@ -84,14 +84,14 @@ $(SHAREDLIB_OUT)/%.$(SHAREDLIB_EXT) : $(SLOFILES) -$(MKDIR) $(subst /,$(PS),$(OUT_COMP_GEN)) $(LINK) $(COMP_LINK_FLAGS) /OUT:$@ \ /MAP:$(OUT_COMP_GEN)/$(subst $(SHAREDLIB_EXT),map,$(@F)) $(SLOFILES) \ - $(CPPUHELPERLIB) $(CPPULIB) $(SALLIB) $(STLPORTLIB) msvcrt.lib kernel32.lib + $(CPPUHELPERLIB) $(CPPULIB) $(SALLIB) msvcprt.lib msvcrt.lib kernel32.lib $(LINK_MANIFEST) else #$(SHAREDLIB_OUT)/%.$(SHAREDLIB_EXT) : $(SLOFILES) $(COMP_MAPFILE) $(SHAREDLIB_OUT)/%.$(SHAREDLIB_EXT) : $(SLOFILES) -$(MKDIR) $(subst /,$(PS),$(@D)) $(LINK) $(COMP_LINK_FLAGS) $(LINK_LIBS) -o $@ $(SLOFILES) \ - $(CPPUHELPERLIB) $(CPPULIB) $(SALLIB) $(STLPORTLIB) $(STC++LIB) $(CPPUHELPERDYLIB) $(CPPUDYLIB) $(SALDYLIB) + $(CPPUHELPERLIB) $(CPPULIB) $(SALLIB) $(STC++LIB) $(CPPUHELPERDYLIB) $(CPPUDYLIB) $(SALDYLIB) ifeq "$(OS)" "MACOSX" $(INSTALL_NAME_URELIBS) $@ endif diff --git a/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/addon.cxx b/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/addon.cxx index 02871445..de478e67 100644 --- a/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/addon.cxx +++ b/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/addon.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * The Contents of this file are made available subject to the terms of @@ -248,3 +249,5 @@ Sequence< ::rtl::OUString > SAL_CALL Addon::getSupportedServiceNames( ) { return Addon_getSupportedServiceNames(); } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/addon.hxx b/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/addon.hxx index 9c6fc868..63f90f23 100644 --- a/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/addon.hxx +++ b/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/addon.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * The Contents of this file are made available subject to the terms of @@ -123,3 +124,5 @@ SAL_CALL Addon_createInstance( const ::com::sun::star::uno::Reference< ::com::su throw ( ::com::sun::star::uno::Exception ); #endif // _Addon_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/component.cxx b/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/component.cxx index b210aeb8..6c4c8078 100644 --- a/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/component.cxx +++ b/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/component.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * The Contents of this file are made available subject to the terms of @@ -133,3 +134,5 @@ extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(const sal_C return pRet; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/odk/examples/DevelopersGuide/Components/CppComponent/Makefile b/odk/examples/DevelopersGuide/Components/CppComponent/Makefile index b89d58bd..84195a8f 100644 --- a/odk/examples/DevelopersGuide/Components/CppComponent/Makefile +++ b/odk/examples/DevelopersGuide/Components/CppComponent/Makefile @@ -117,14 +117,14 @@ $(SHAREDLIB_OUT)/%.$(SHAREDLIB_EXT) : $(SLOFILES) -$(MKDIR) $(subst /,$(PS),$(SAMPLE_GEN_OUT)) $(LINK) $(COMP_LINK_FLAGS) /OUT:$@ \ /MAP:$(SAMPLE_GEN_OUT)/$(subst $(SHAREDLIB_EXT),map,$(@F)) $(SLOFILES) \ - $(CPPUHELPERLIB) $(CPPULIB) $(SALLIB) $(STLPORTLIB) msvcrt.lib kernel32.lib + $(CPPUHELPERLIB) $(CPPULIB) $(SALLIB) msvcprt.lib msvcrt.lib kernel32.lib $(LINK_MANIFEST) else #$(SHAREDLIB_OUT)/%.$(SHAREDLIB_EXT) : $(SLOFILES) $(COMP_MAPFILE) $(SHAREDLIB_OUT)/%.$(SHAREDLIB_EXT) : $(SLOFILES) -$(MKDIR) $(subst /,$(PS),$(@D)) && $(DEL) $(subst \\,\,$(subst /,$(PS),$@)) $(LINK) $(COMP_LINK_FLAGS) $(LINK_LIBS) -o $@ $(SLOFILES) \ - $(CPPUHELPERLIB) $(CPPULIB) $(SALLIB) $(STLPORTLIB) $(STC++LIB) $(CPPUHELPERDYLIB) $(CPPUDYLIB) $(SALDYLIB) + $(CPPUHELPERLIB) $(CPPULIB) $(SALLIB) $(STC++LIB) $(CPPUHELPERDYLIB) $(CPPUDYLIB) $(SALDYLIB) ifeq "$(OS)" "MACOSX" $(INSTALL_NAME_URELIBS) $@ endif @@ -189,10 +189,10 @@ $(OUT_BIN)/_$(APP1_NAME)$(EXE_EXT) : $(SAMPLE_OBJ_OUT)/$(APP1_NAME).$(OBJ_EXT) -$(MKDIR) $(subst /,$(PS),$(SAMPLE_GEN_OUT)) ifeq "$(OS)" "WIN" $(LINK) $(EXE_LINK_FLAGS) /OUT:$@ /MAP:$(SAMPLE_GEN_OUT)/$(basename $(@F)).map \ - $< $(CPPUHELPERLIB) $(CPPULIB) $(SALHELPERLIB) $(SALLIB) $(STLPORTLIB) + $< $(CPPUHELPERLIB) $(CPPULIB) $(SALHELPERLIB) $(SALLIB) else $(LINK) $(EXE_LINK_FLAGS) $(LINK_LIBS) -o $@ $< \ - $(CPPUHELPERLIB) $(CPPULIB) $(SALHELPERLIB) $(SALLIB) $(STLPORTLIB) $(STDC++LIB) $(CPPUHELPERDYLIB) $(CPPUDYLIB) $(SALHELPERDYLIB) $(SALDYLIB) + $(CPPUHELPERLIB) $(CPPULIB) $(SALHELPERLIB) $(SALLIB) $(STDC++LIB) $(CPPUHELPERDYLIB) $(CPPUDYLIB) $(SALHELPERDYLIB) $(SALDYLIB) ifeq "$(OS)" "MACOSX" $(INSTALL_NAME_URELIBS_BIN) $@ endif diff --git a/odk/examples/DevelopersGuide/Components/CppComponent/TestCppComponent.cxx b/odk/examples/DevelopersGuide/Components/CppComponent/TestCppComponent.cxx index 0a35fa89..024c9f50 100644 --- a/odk/examples/DevelopersGuide/Components/CppComponent/TestCppComponent.cxx +++ b/odk/examples/DevelopersGuide/Components/CppComponent/TestCppComponent.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * The Contents of this file are made available subject to the terms of @@ -40,12 +41,13 @@ #include <my_module/MyService1.hpp> #include <my_module/MyService2.hpp> -using namespace rtl; using namespace com::sun::star::uno; -//namespace cssuno = ::com::sun::star::uno; using namespace com::sun::star::lang; using namespace com::sun::star::frame; +using ::rtl::OUString; +using ::rtl::OUStringToOString; + SAL_IMPLEMENT_MAIN() { try @@ -87,3 +89,5 @@ SAL_IMPLEMENT_MAIN() return 0; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/odk/examples/DevelopersGuide/Components/CppComponent/service1_impl.cxx b/odk/examples/DevelopersGuide/Components/CppComponent/service1_impl.cxx index c4e2bcd4..80be3361 100644 --- a/odk/examples/DevelopersGuide/Components/CppComponent/service1_impl.cxx +++ b/odk/examples/DevelopersGuide/Components/CppComponent/service1_impl.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * The Contents of this file are made available subject to the terms of @@ -35,6 +36,7 @@ #include <osl/interlck.h> #include <osl/mutex.hxx> #include <rtl/uuid.h> +#include <rtl/instance.hpp> #include <cppuhelper/factory.hxx> #include <com/sun/star/lang/XServiceInfo.hpp> @@ -171,24 +173,34 @@ Sequence< Type > MyService1Impl::getTypes() seq[ 2 ] = ::cppu::UnoType< Reference< ::my_module::XSomething > >::get(); return seq; } -Sequence< sal_Int8 > MyService1Impl::getImplementationId() - throw (RuntimeException) +namespace { - static Sequence< sal_Int8 > * s_pId = 0; - if (! s_pId) + // class to create an unique id + class UniqueIdInit { - // create unique id - Sequence< sal_Int8 > id( 16 ); - ::rtl_createUuid( (sal_uInt8 *)id.getArray(), 0, sal_True ); - // guard initialization with some mutex - ::osl::MutexGuard guard( ::osl::Mutex::getGlobalMutex() ); - if (! s_pId) + private: + ::com::sun::star::uno::Sequence< sal_Int8 > m_aSeq; + public: + UniqueIdInitIdInit() : m_aSeq(16) { - static Sequence< sal_Int8 > s_id( id ); - s_pId = &s_id; + rtl_createUuid( (sal_uInt8*)m_aSeq.getArray(), 0, sal_True ); } - } - return *s_pId; + const ::com::sun::star::uno::Sequence< sal_Int8 >& getSeq() const { return m_aSeq; } + }; + //A multi-thread safe UniqueIdInitIdInit singleton wrapper + class theService1ImplImplementationId + : public rtl::Static< UniqueIdInitIdInit, + theService1ImplImplementationId > + { + }; +} +Sequence< sal_Int8 > MyService1Impl::getImplementationId() + throw (RuntimeException) +{ + //create a singleton that generates a unique id on + //first initialization and returns the same one + //on subsequent calls. + return theService1ImplImplementationId::get().getSeq(); } // XSomething implementation @@ -243,72 +255,4 @@ Reference< XInterface > SAL_CALL create_MyService2Impl( } -/* -extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( - sal_Char const ** ppEnvTypeName, uno_Environment ** ) -{ - *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; -} - -// This method not longer necessary since OOo 3.4 where the component registration was -// was changed to passive component registration. For more details see -// http://wiki.services.openoffice.org/wiki/Passive_Component_Registration -// -// extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo( -// lang::XMultiServiceFactory * xMgr, registry::XRegistryKey * xRegistry ) -// { -// if (xRegistry) -// { -// try -// { -// // implementation of MyService1A -// Reference< registry::XRegistryKey > xKey( -// xRegistry->createKey( OUString( RTL_CONSTASCII_USTRINGPARAM( -// "my_module.my_sc_implementation.MyService1/UNO/SERVICES") ) ) ); -// // subkeys denote implemented services of implementation -// xKey->createKey( OUString( RTL_CONSTASCII_USTRINGPARAM( -// "my_module.MyService1") ) ); -// // implementation of MyService1B -// xKey = xRegistry->createKey( OUString( RTL_CONSTASCII_USTRINGPARAM( -// "my_module.my_sc_implementation.MyService2/UNO/SERVICES") ) ); -// // subkeys denote implemented services of implementation -// xKey->createKey( OUString( RTL_CONSTASCII_USTRINGPARAM( -// "my_module.MyService2") ) ); -// return sal_True; // success -// } -// catch (registry::InvalidRegistryException &) -// { -// // function fails if exception caught -// } -// } -// return sal_False; -// } - -extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( - sal_Char const * implName, lang::XMultiServiceFactory * xMgr, void * ) -{ - Reference< lang::XSingleComponentFactory > xFactory; - if (0 == ::rtl_str_compare( implName, "my_module.my_sc_implementation.MyService1" )) - { - // create component factory for MyService1 implementation - OUString serviceName( RTL_CONSTASCII_USTRINGPARAM("my_module.MyService1") ); - xFactory = ::cppu::createSingleComponentFactory( - ::my_sc_impl::create_MyService1Impl, - OUString( RTL_CONSTASCII_USTRINGPARAM("my_module.my_sc_implementation.MyService1") ), - Sequence< OUString >( &serviceName, 1 ) ); - } - else if (0 == ::rtl_str_compare( implName, "my_module.my_sc_implementation.MyService2" )) - { - // create component factory for MyService12 implementation - OUString serviceName( RTL_CONSTASCII_USTRINGPARAM("my_module.MyService2") ); - xFactory = ::cppu::createSingleComponentFactory( - ::my_sc_impl::create_MyService2Impl, - OUString( RTL_CONSTASCII_USTRINGPARAM("my_module.my_sc_implementation.MyService2") ), - Sequence< OUString >( &serviceName, 1 ) ); - } - if (xFactory.is()) - xFactory->acquire(); - return xFactory.get(); // return acquired interface pointer or null -} -*/ - +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/odk/examples/DevelopersGuide/Components/CppComponent/service2_impl.cxx b/odk/examples/DevelopersGuide/Components/CppComponent/service2_impl.cxx index 749c3b30..c1d2fdfe 100644 --- a/odk/examples/DevelopersGuide/Components/CppComponent/service2_impl.cxx +++ b/odk/examples/DevelopersGuide/Components/CppComponent/service2_impl.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * The Contents of this file are made available subject to the terms of @@ -228,3 +229,4 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/odk/examples/DevelopersGuide/Components/JavaComponent/TestServiceProvider.java b/odk/examples/DevelopersGuide/Components/JavaComponent/TestServiceProvider.java index a9ada93c..5f78eb47 100644 --- a/odk/examples/DevelopersGuide/Components/JavaComponent/TestServiceProvider.java +++ b/odk/examples/DevelopersGuide/Components/JavaComponent/TestServiceProvider.java @@ -69,7 +69,7 @@ public class TestServiceProvider // TestComponentB.class.getName(), // TestComponentB.__serviceName, regKey); // return bregA && bregB; -// } +// } } diff --git a/odk/examples/DevelopersGuide/Database/DriverSkeleton/How_to_write_my_own_driver.txt b/odk/examples/DevelopersGuide/Database/DriverSkeleton/How_to_write_my_own_driver.txt index 910137ac..c2b54711 100644 --- a/odk/examples/DevelopersGuide/Database/DriverSkeleton/How_to_write_my_own_driver.txt +++ b/odk/examples/DevelopersGuide/Database/DriverSkeleton/How_to_write_my_own_driver.txt @@ -1,7 +1,7 @@ How to write my own sdbc driver Pre implementation steps -- search all occurances of skeleton and replace them to a name which you prefer +- search all occurrences of skeleton and replace them to a name which you prefer 1. Implement a class called driver or modify the existing skeleton -> have a look at SDriver.?xx 2. Implement a class called connection -> have a look at SConnection.?xx diff --git a/odk/examples/DevelopersGuide/Database/DriverSkeleton/Makefile b/odk/examples/DevelopersGuide/Database/DriverSkeleton/Makefile index f1451d3d..7f77f1ff 100644 --- a/odk/examples/DevelopersGuide/Database/DriverSkeleton/Makefile +++ b/odk/examples/DevelopersGuide/Database/DriverSkeleton/Makefile @@ -92,13 +92,13 @@ $(SHAREDLIB_OUT)/%.$(SHAREDLIB_EXT) : $(SLOFILES) -$(MKDIR) $(subst /,$(PS),$(OUT_COMP_MISC)) $(LINK) $(COMP_LINK_FLAGS) /OUT:$@ \ /MAP:$(OUT_COMP_MISC)/$(COMP_NAME).map $(SLOFILES) \ - $(CPPUHELPERLIB) $(CPPULIB) $(SALLIB) $(STLPORTLIB) msvcrt.lib kernel32.lib + $(CPPUHELPERLIB) $(CPPULIB) $(SALLIB) msvcprt.lib msvcrt.lib kernel32.lib $(LINK_MANIFEST) else $(SHAREDLIB_OUT)/%.$(SHAREDLIB_EXT) : $(SLOFILES) -$(MKDIR) $(subst /,$(PS),$(@D)) $(LINK) $(COMP_LINK_FLAGS) $(LINK_LIBS) -o $@ $(SLOFILES) \ - $(CPPUHELPERLIB) $(CPPULIB) $(SALLIB) $(STLPORTLIB) $(STC++LIB) $(CPPUHELPERDYLIB) $(CPPUDYLIB) $(SALDYLIB) + $(CPPUHELPERLIB) $(CPPULIB) $(SALLIB) $(STC++LIB) $(CPPUHELPERDYLIB) $(CPPUDYLIB) $(SALDYLIB) ifeq "$(OS)" "MACOSX" $(INSTALL_NAME_URELIBS) $@ endif diff --git a/odk/examples/DevelopersGuide/Database/DriverSkeleton/OSubComponent.hxx b/odk/examples/DevelopersGuide/Database/DriverSkeleton/OSubComponent.hxx index 33a0d0ed..4d728611 100644 --- a/odk/examples/DevelopersGuide/Database/DriverSkeleton/OSubComponent.hxx +++ b/odk/examples/DevelopersGuide/Database/DriverSkeleton/OSubComponent.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * The Contents of this file are made available subject to the terms of @@ -250,3 +251,4 @@ namespace connectivity } #endif // _CONNECTIVITY_OSUBCOMPONENT_HXX_ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/odk/examples/DevelopersGuide/Database/DriverSkeleton/OTypeInfo.hxx b/odk/examples/DevelopersGuide/Database/DriverSkeleton/OTypeInfo.hxx index 501ba55d..4a28333a 100644 --- a/odk/examples/DevelopersGuide/Database/DriverSkeleton/OTypeInfo.hxx +++ b/odk/examples/DevelopersGuide/Database/DriverSkeleton/OTypeInfo.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * The Contents of this file are made available subject to the terms of @@ -96,3 +97,4 @@ namespace connectivity #endif // _CONNECTIVITY_OTYPEINFO_HXX_ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SConnection.cxx b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SConnection.cxx index 2373a31d..d9cfb337 100644 --- a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SConnection.cxx +++ b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SConnection.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * The Contents of this file are made available subject to the terms of @@ -108,12 +109,12 @@ void OConnection::construct(const ::rtl::OUString& url,const Sequence< PropertyV else if(!pBegin->Name.compareToAscii(pUser)) { pBegin->Value >>= aUID; - aDSN = aDSN + ::rtl::OUString::createFromAscii(";UID=") + aUID; + aDSN = aDSN + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(";UID=")) + aUID; } else if(!pBegin->Name.compareToAscii(pPwd)) { pBegin->Value >>= aPWD; - aDSN = aDSN + ::rtl::OUString::createFromAscii(";PWD=") + aPWD; + aDSN = aDSN + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(";PWD=")) + aPWD; } else if(!pBegin->Name.compareToAscii(pUseCatalog)) { @@ -122,7 +123,7 @@ void OConnection::construct(const ::rtl::OUString& url,const Sequence< PropertyV else if(!pBegin->Name.compareToAscii(pSysDrv)) { pBegin->Value >>= aSysDrvSettings; - aDSN += ::rtl::OUString::createFromAscii(";"); + aDSN += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(";")); aDSN += aSysDrvSettings; } } @@ -400,3 +401,4 @@ void OConnection::disposing() +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SConnection.hxx b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SConnection.hxx index d160c3bd..8961cf49 100644 --- a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SConnection.hxx +++ b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SConnection.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * The Contents of this file are made available subject to the terms of @@ -153,3 +154,4 @@ namespace connectivity } #endif // CONNECTIVITY_SCONNECTION_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SDatabaseMetaData.cxx b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SDatabaseMetaData.cxx index 71202030..20543d50 100644 --- a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SDatabaseMetaData.cxx +++ b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SDatabaseMetaData.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * The Contents of this file are made available subject to the terms of @@ -212,7 +213,7 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsNonNullableColumns( ) throw(SQLExc ::rtl::OUString SAL_CALL ODatabaseMetaData::getIdentifierQuoteString( ) throw(SQLException, RuntimeException) { // normally this is " - ::rtl::OUString aVal = ::rtl::OUString::createFromAscii("\""); + ::rtl::OUString aVal(RTL_CONSTASCII_USTRINGPARAM("\"")); return aVal; } // ------------------------------------------------------------------------- @@ -556,7 +557,7 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsANSI92IntermediateSQL( ) throw(SQL // ------------------------------------------------------------------------- ::rtl::OUString SAL_CALL ODatabaseMetaData::getURL( ) throw(SQLException, RuntimeException) { - ::rtl::OUString aValue = ::rtl::OUString::createFromAscii("sdbc:skeleton:"); + ::rtl::OUString aValue(RTL_CONSTASCII_USTRINGPARAM("sdbc:skeleton:")); return aValue; } // ------------------------------------------------------------------------- @@ -877,7 +878,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getCrossReference( // ------------------------------------------------------------------------- Reference< XResultSet > SAL_CALL ODatabaseMetaData::getUDTs( const Any& catalog, const ::rtl::OUString& schemaPattern, const ::rtl::OUString& typeNamePattern, const Sequence< sal_Int32 >& types ) throw(SQLException, RuntimeException) { - OSL_ENSURE(0,"Not implemented yet!"); + OSL_FAIL("Not implemented yet!"); throw SQLException(); return NULL; } @@ -885,3 +886,4 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getUDTs( const Any& catalog, +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SDatabaseMetaData.hxx b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SDatabaseMetaData.hxx index 842dd952..4e62def3 100644 --- a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SDatabaseMetaData.hxx +++ b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SDatabaseMetaData.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * The Contents of this file are made available subject to the terms of @@ -216,3 +217,5 @@ namespace connectivity } #endif // CONNECTIVITY_SDATABASEMETADATA_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SDriver.cxx b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SDriver.cxx index 12e75fac..39d006d5 100644 --- a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SDriver.cxx +++ b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SDriver.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * The Contents of this file are made available subject to the terms of @@ -78,7 +79,7 @@ void SkeletonDriver::disposing() //------------------------------------------------------------------------------ rtl::OUString SkeletonDriver::getImplementationName_Static( ) throw(RuntimeException) { - return rtl::OUString::createFromAscii("com.sun.star.comp.sdbc.SkeletonDriver"); + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.sdbc.SkeletonDriver")); // this name is referenced in the configuration and in the skeleton.xml // Please take care when changing it. } @@ -88,7 +89,7 @@ Sequence< ::rtl::OUString > SkeletonDriver::getSupportedServiceNames_Static( ) // which service is supported // for more information @see com.sun.star.sdbc.Driver Sequence< ::rtl::OUString > aSNS( 1 ); - aSNS[0] = ::rtl::OUString::createFromAscii("com.sun.star.sdbc.Driver"); + aSNS[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbc.Driver")); return aSNS; } @@ -133,7 +134,7 @@ sal_Bool SAL_CALL SkeletonDriver::acceptsURL( const ::rtl::OUString& url ) { // here we have to look if we support this url format // change the URL format to your needs, but please aware that the first on who accepts the URl wins. - return (!url.compareTo(::rtl::OUString::createFromAscii("sdbc:skeleton:"),14)); + return (!url.compareTo(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("sdbc:skeleton:")),14)); } // -------------------------------------------------------------------------------- Sequence< DriverPropertyInfo > SAL_CALL SkeletonDriver::getPropertyInfo( const ::rtl::OUString& url, const Sequence< PropertyValue >& info ) throw(SQLException, RuntimeException) @@ -208,3 +209,4 @@ void checkDisposed(sal_Bool _bThrow) throw ( DisposedException ) } //......................................................................... +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SDriver.hxx b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SDriver.hxx index 93d80959..2c1cb2cc 100644 --- a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SDriver.hxx +++ b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SDriver.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * The Contents of this file are made available subject to the terms of @@ -83,3 +84,5 @@ namespace connectivity } #endif // CONNECTIVITY_SDRIVER_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SPreparedStatement.cxx b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SPreparedStatement.cxx index 39ecf24e..f896abb1 100644 --- a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SPreparedStatement.cxx +++ b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SPreparedStatement.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * The Contents of this file are made available subject to the terms of @@ -386,3 +387,4 @@ void OPreparedStatement::checkParameterIndex(sal_Int32 _parameterIndex) // ----------------------------------------------------------------------------- +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SPreparedStatement.hxx b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SPreparedStatement.hxx index a87537de..709d676d 100644 --- a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SPreparedStatement.hxx +++ b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SPreparedStatement.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * The Contents of this file are made available subject to the terms of @@ -144,3 +145,5 @@ namespace connectivity } } #endif // CONNECTIVITY_SPREPAREDSTATEMENT_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SResultSet.cxx b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SResultSet.cxx index 11982931..aea4dc60 100644 --- a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SResultSet.cxx +++ b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SResultSet.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * The Contents of this file are made available subject to the terms of @@ -56,14 +57,14 @@ using namespace com::sun::star::util; // IMPLEMENT_SERVICE_INFO(OResultSet,"com.sun.star.sdbcx.OResultSet","com.sun.star.sdbc.ResultSet"); ::rtl::OUString SAL_CALL OResultSet::getImplementationName( ) throw ( RuntimeException) \ { - return ::rtl::OUString::createFromAscii("com.sun.star.sdbcx.skeleton.ResultSet"); + return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbcx.skeleton.ResultSet")); } // ------------------------------------------------------------------------- Sequence< ::rtl::OUString > SAL_CALL OResultSet::getSupportedServiceNames( ) throw( RuntimeException) { Sequence< ::rtl::OUString > aSupported(2); - aSupported[0] = ::rtl::OUString::createFromAscii("com.sun.star.sdbc.ResultSet"); - aSupported[1] = ::rtl::OUString::createFromAscii("com.sun.star.sdbcx.ResultSet"); + aSupported[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbc.ResultSet")); + aSupported[1] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbcx.ResultSet")); return aSupported; } // ------------------------------------------------------------------------- @@ -871,3 +872,4 @@ void SAL_CALL OResultSet::release() throw() +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SResultSet.hxx b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SResultSet.hxx index 1258822f..b626a56a 100644 --- a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SResultSet.hxx +++ b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SResultSet.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * The Contents of this file are made available subject to the terms of @@ -216,3 +217,5 @@ namespace connectivity } } #endif // CONNECTIVITY_SRESULTSET_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SResultSetMetaData.cxx b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SResultSetMetaData.cxx index b8e63128..53423d53 100644 --- a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SResultSetMetaData.cxx +++ b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SResultSetMetaData.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * The Contents of this file are made available subject to the terms of @@ -79,7 +80,7 @@ sal_Bool SAL_CALL OResultSetMetaData::isCaseSensitive( sal_Int32 column ) throw( ::rtl::OUString SAL_CALL OResultSetMetaData::getColumnName( sal_Int32 column ) throw(SQLException, RuntimeException) { - return ::rtl::OUString::createFromAscii("Column") + ::rtl::OUString::valueOf(column); + return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Column")) + ::rtl::OUString::valueOf(column); } // ------------------------------------------------------------------------- ::rtl::OUString SAL_CALL OResultSetMetaData::getTableName( sal_Int32 column ) throw(SQLException, RuntimeException) @@ -167,3 +168,4 @@ sal_Bool SAL_CALL OResultSetMetaData::isWritable( sal_Int32 column ) throw(SQLEx } // ------------------------------------------------------------------------- +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SResultSetMetaData.hxx b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SResultSetMetaData.hxx index ff8cedd6..92418de6 100644 --- a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SResultSetMetaData.hxx +++ b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SResultSetMetaData.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * The Contents of this file are made available subject to the terms of @@ -88,3 +89,5 @@ namespace connectivity } #endif // CONNECTIVITY_SRESULSETMETADATA_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SServices.cxx b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SServices.cxx index 8893869c..919b8521 100644 --- a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SServices.cxx +++ b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SServices.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * The Contents of this file are made available subject to the terms of @@ -66,10 +67,9 @@ void REGISTER_PROVIDER( const Sequence< OUString>& Services, const Reference< ::com::sun::star::registry::XRegistryKey > & xKey) { - OUString aMainKeyName; - aMainKeyName = OUString::createFromAscii("/"); + OUString aMainKeyName(RTL_CONSTASCII_USTRINGPARAM("/")); aMainKeyName += aServiceImplName; - aMainKeyName += OUString::createFromAscii("/UNO/SERVICES"); + aMainKeyName += OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES")); Reference< ::com::sun::star::registry::XRegistryKey > xNewKey( xKey->createKey(aMainKeyName) ); OSL_ENSURE(xNewKey.is(), "SKELETON::component_writeInfo : could not create a registry key !"); @@ -127,33 +127,6 @@ extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnviron *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } -// This method not longer necessary since OOo 3.4 where the component registration was -// was changed to passive component registration. For more details see -// http://wiki.services.openoffice.org/wiki/Passive_Component_Registration -//--------------------------------------------------------------------------------------- -// extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo( -// void* pServiceManager, -// void* pRegistryKey -// ) -// { -// if (pRegistryKey) -// try -// { -// Reference< ::com::sun::star::registry::XRegistryKey > xKey(reinterpret_cast< ::com::sun::star::registry::XRegistryKey*>(pRegistryKey)); - -// REGISTER_PROVIDER( -// SkeletonDriver::getImplementationName_Static(), -// SkeletonDriver::getSupportedServiceNames_Static(), xKey); - -// return sal_True; -// } -// catch (::com::sun::star::registry::InvalidRegistryException& ) -// { -// OSL_ENSURE(sal_False, "SKELETON::component_writeInfo : could not create a registry key ! ## InvalidRegistryException !"); -// } - -// return sal_False; -// } //--------------------------------------------------------------------------------------- extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( @@ -182,3 +155,4 @@ extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( }; +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SStatement.cxx b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SStatement.cxx index 96c8f4ef..5e1bee3d 100644 --- a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SStatement.cxx +++ b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SStatement.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * The Contents of this file are made available subject to the terms of @@ -366,3 +367,4 @@ Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL OStatement_Base: } // ----------------------------------------------------------------------------- +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SStatement.hxx b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SStatement.hxx index 645bc5ea..d8d32a4a 100644 --- a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SStatement.hxx +++ b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SStatement.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * The Contents of this file are made available subject to the terms of @@ -173,3 +174,5 @@ namespace connectivity } } #endif // CONNECTIVITY_SSTATEMENT_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/odk/examples/DevelopersGuide/Database/DriverSkeleton/propertyids.cxx b/odk/examples/DevelopersGuide/Database/DriverSkeleton/propertyids.cxx index a172a2ab..9cd66a47 100644 --- a/odk/examples/DevelopersGuide/Database/DriverSkeleton/propertyids.cxx +++ b/odk/examples/DevelopersGuide/Database/DriverSkeleton/propertyids.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * The Contents of this file are made available subject to the terms of @@ -180,3 +181,5 @@ namespace skeleton } } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/odk/examples/DevelopersGuide/Database/DriverSkeleton/propertyids.hxx b/odk/examples/DevelopersGuide/Database/DriverSkeleton/propertyids.hxx index c0a451b8..ca0d5bf2 100644 --- a/odk/examples/DevelopersGuide/Database/DriverSkeleton/propertyids.hxx +++ b/odk/examples/DevelopersGuide/Database/DriverSkeleton/propertyids.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * The Contents of this file are made available subject to the terms of @@ -159,3 +160,4 @@ pProperties[nPos++] = ::com::sun::star::beans::Property(OPropertyMap::getPropMap #endif // _CONNECTIVITY_PROPERTYIDS_HXX_ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/odk/examples/DevelopersGuide/Drawing/GraphicExportDemo.java b/odk/examples/DevelopersGuide/Drawing/GraphicExportDemo.java index 63901b90..a6ca8d38 100644 --- a/odk/examples/DevelopersGuide/Drawing/GraphicExportDemo.java +++ b/odk/examples/DevelopersGuide/Drawing/GraphicExportDemo.java @@ -100,7 +100,7 @@ public class GraphicExportDemo aProps[0].Value = "WMF"; */ java.io.File destFile = new java.io.File(args[1]); - java.net.URL destUrl = destFile.toURL(); + java.net.URL destUrl = destFile.toURI().toURL(); aProps[1] = new PropertyValue(); aProps[1].Name = "URL"; diff --git a/odk/examples/DevelopersGuide/Extensions/DialogWithHelp/META-INF/manifest.xml b/odk/examples/DevelopersGuide/Extensions/DialogWithHelp/META-INF/manifest.xml index a7b501ba..2334c089 100644 --- a/odk/examples/DevelopersGuide/Extensions/DialogWithHelp/META-INF/manifest.xml +++ b/odk/examples/DevelopersGuide/Extensions/DialogWithHelp/META-INF/manifest.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<manifest:manifest> +<manifest:manifest xmlns:manifest="http://openoffice.org/2001/manifest"> <manifest:file-entry manifest:full-path="DialogWithHelp/" manifest:media-type="application/vnd.sun.star.basic-library"/> <manifest:file-entry manifest:media-type="application/vnd.sun.star.help" manifest:full-path="help"/> <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-data" manifest:full-path="Addons.xcu"/> diff --git a/odk/examples/DevelopersGuide/Forms/DataAwareness.java b/odk/examples/DevelopersGuide/Forms/DataAwareness.java index bedf0b49..4395e99d 100644 --- a/odk/examples/DevelopersGuide/Forms/DataAwareness.java +++ b/odk/examples/DevelopersGuide/Forms/DataAwareness.java @@ -219,7 +219,7 @@ public class DataAwareness extends DocumentBasedExample implements XPropertyChan /* ------------------------------------------------------------------ */ public void resetted( EventObject aEvent ) throws com.sun.star.uno.RuntimeException { - // check if this reset occured becase we're on a new record + // check if this reset occurred becase we're on a new record XPropertySet xFormProps = UNO.queryPropertySet( aEvent.Source ); try { diff --git a/odk/examples/DevelopersGuide/Forms/KeyGenerator.java b/odk/examples/DevelopersGuide/Forms/KeyGenerator.java index 324090ef..87a5d11b 100644 --- a/odk/examples/DevelopersGuide/Forms/KeyGenerator.java +++ b/odk/examples/DevelopersGuide/Forms/KeyGenerator.java @@ -249,7 +249,7 @@ class KeyGeneratorForReset extends UniqueColumnValue implements XResetListener /* ------------------------------------------------------------------ */ public void resetted( com.sun.star.lang.EventObject aEvent ) throws com.sun.star.uno.RuntimeException { - // check if this reset occured becase we're on a new record + // check if this reset occurred becase we're on a new record XPropertySet xFormProps = UNO.queryPropertySet( aEvent.Source ); try { diff --git a/odk/examples/DevelopersGuide/Forms/URLHelper.java b/odk/examples/DevelopersGuide/Forms/URLHelper.java index 7099dd96..71140957 100644 --- a/odk/examples/DevelopersGuide/Forms/URLHelper.java +++ b/odk/examples/DevelopersGuide/Forms/URLHelper.java @@ -47,7 +47,7 @@ public class URLHelper String sFileURL = null; try { - sFileURL = aSystemPath.toURL().toString(); + sFileURL = aSystemPath.toURI().toURL().toString(); } catch( MalformedURLException exWrong ) { diff --git a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/FunctionHelper.java b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/FunctionHelper.java index 9e04ddcc..29b11256 100644 --- a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/FunctionHelper.java +++ b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/FunctionHelper.java @@ -410,7 +410,7 @@ public class FunctionHelper catch(com.sun.star.uno.Exception exUno) { // "createInstance()" method of used service manager can throw it. - // If it occured during creation of desktop service the frame already was created. + // If it occurred during creation of desktop service the frame already was created. // Free it by decresing his refcount. Changes on the desktop tree couldn't exist. // Without the desktop service that wasn't possible. So no further rollbacks must follow. if(xFrame!=null) @@ -1025,7 +1025,7 @@ public class FunctionHelper // get file URL from the dialog try { - sFileURL = aChooser.getSelectedFile().toURL().toExternalForm(); + sFileURL = aChooser.getSelectedFile().toURI().toURL().toExternalForm(); } catch( MalformedURLException ex ) { diff --git a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/nativelib/unix/Makefile b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/nativelib/unix/Makefile index 4eb8d30b..d2d4e934 100644 --- a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/nativelib/unix/Makefile +++ b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/nativelib/unix/Makefile @@ -65,7 +65,7 @@ $(OUT_SHL_SLO)/%.$(OBJ_EXT) : %.c $(SHAREDLIB_OUT)/$(SHAREDLIB_PRE)$(SHL_NAME).$(SHAREDLIB_EXT) : $(SLOFILES) -$(MKDIR) $(subst /,$(PS),$(@D)) $(LINK) $(LIBRARY_LINK_FLAGS) $(LINK_LIBS) $(LINK_JAVA_LIBS) -o $@ $< \ - -ljawt $(CPPUHELPERLIB) $(CPPULIB) $(SALLIB) $(STLPORTLIB) $(STDC++LIB) + -ljawt $(CPPUHELPERLIB) $(CPPULIB) $(SALLIB) $(STDC++LIB) .PHONY: clean clean : diff --git a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/nativelib/unix/nativeview.c b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/nativelib/unix/nativeview.c index 1459b004..68be1382 100644 --- a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/nativelib/unix/nativeview.c +++ b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/nativelib/unix/nativeview.c @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * The Contents of this file are made available subject to the terms of @@ -77,7 +78,6 @@ JNIEXPORT jlong JNICALL Java_NativeView_getNativeWindow JAWT_DrawingSurfaceInfo* dsi ; JAWT_X11DrawingSurfaceInfo* dsi_x11 ; Drawable drawable; - Display* display ; /* Get the AWT */ awt.version = JAWT_VERSION_1_3; @@ -98,7 +98,6 @@ JNIEXPORT jlong JNICALL Java_NativeView_getNativeWindow /* Get the platform-specific drawing info */ dsi_x11 = (JAWT_X11DrawingSurfaceInfo*)dsi->platformInfo; drawable = dsi_x11->drawable; - display = dsi_x11->display; /* Free the drawing surface info */ ds->FreeDrawingSurfaceInfo(dsi); @@ -109,3 +108,5 @@ JNIEXPORT jlong JNICALL Java_NativeView_getNativeWindow return ((jlong)drawable); } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/nativelib/unix/nativeview.h b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/nativelib/unix/nativeview.h index 6e979553..51642e94 100644 --- a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/nativelib/unix/nativeview.h +++ b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/nativelib/unix/nativeview.h @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * The Contents of this file are made available subject to the terms of @@ -61,3 +62,5 @@ JNIEXPORT jlong JNICALL Java_NativeView_getNativeWindow } #endif #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/nativelib/windows/nativeview.c b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/nativelib/windows/nativeview.c index 673d6a6a..28da7c11 100644 --- a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/nativelib/windows/nativeview.c +++ b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/nativelib/windows/nativeview.c @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * The Contents of this file are made available subject to the terms of @@ -176,3 +177,5 @@ static LRESULT APIENTRY NativeViewWndProc( MY_ASSERT(hFuncPtr,"lost original window proc handler"); return CallWindowProc( hFuncPtr, hWnd, uMsg, wParam, lParam); } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/nativelib/windows/nativeview.h b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/nativelib/windows/nativeview.h index 6e979553..51642e94 100644 --- a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/nativelib/windows/nativeview.h +++ b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/nativelib/windows/nativeview.h @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * The Contents of this file are made available subject to the terms of @@ -61,3 +62,5 @@ JNIEXPORT jlong JNICALL Java_NativeView_getNativeWindow } #endif #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection/Makefile b/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection/Makefile index 8a458d9d..d9f70b2c 100644 --- a/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection/Makefile +++ b/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection/Makefile @@ -86,13 +86,13 @@ $(SHAREDLIB_OUT)/%.$(SHAREDLIB_EXT) : $(SLOFILES) -$(MKDIR) $(subst /,$(PS),$(OUT_COMP_GEN)) $(LINK) $(COMP_LINK_FLAGS) /OUT:$@ \ /MAP:$(OUT_COMP_GEN)/$(subst $(SHAREDLIB_EXT),map,$(@F)) $(SLOFILES) \ - $(CPPUHELPERLIB) $(CPPULIB) $(SALLIB) $(STLPORTLIB) msvcrt.lib kernel32.lib + $(CPPUHELPERLIB) $(CPPULIB) $(SALLIB) msvcprt.lib msvcrt.lib kernel32.lib $(LINK_MANIFEST) else $(SHAREDLIB_OUT)/%.$(SHAREDLIB_EXT) : $(SLOFILES) -$(MKDIR) $(subst /,$(PS),$(@D)) $(LINK) $(COMP_LINK_FLAGS) $(LINK_LIBS) -o $@ $(SLOFILES) \ - $(CPPUHELPERLIB) $(CPPULIB) $(SALLIB) $(STLPORTLIB) $(STC++LIB) $(CPPUHELPERDYLIB) $(CPPUDYLIB) $(SALDYLIB) + $(CPPUHELPERLIB) $(CPPULIB) $(SALLIB) $(STC++LIB) $(CPPUHELPERDYLIB) $(CPPUDYLIB) $(SALDYLIB) ifeq "$(OS)" "MACOSX" $(INSTALL_NAME_URELIBS) $@ endif diff --git a/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection/fdcomp.cxx b/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection/fdcomp.cxx index 3d279d66..3925eef3 100644 --- a/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection/fdcomp.cxx +++ b/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection/fdcomp.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * The Contents of this file are made available subject to the terms of @@ -56,35 +57,6 @@ SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } -// This method not longer necessary since OOo 3.4 where the component registration was -// was changed to passive component registration. For more details see -// http://wiki.services.openoffice.org/wiki/Passive_Component_Registration -//================================================================================================== -// SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo( -// void * pServiceManager, void * pRegistryKey ) -// { -// if (pRegistryKey) -// { -// try -// { -// Reference< XRegistryKey > xNewKey( -// reinterpret_cast< XRegistryKey * >( pRegistryKey )->createKey( FilterDetect_getImplementationName() ) ); -// xNewKey = xNewKey->createKey( OUString::createFromAscii( "/UNO/SERVICES" ) ); - -// const Sequence< OUString > & rSNL = FilterDetect_getSupportedServiceNames(); -// const OUString * pArray = rSNL.getConstArray(); -// for ( sal_Int32 nPos = rSNL.getLength(); nPos--; ) -// xNewKey->createKey( pArray[nPos] ); - -// return sal_True; -// } -// catch (InvalidRegistryException &) -// { -// OSL_ENSURE( sal_False, "### InvalidRegistryException!" ); -// } -// } -// return sal_False; -// } //================================================================================================== SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( @@ -110,3 +82,5 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection/filterdetect.cxx b/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection/filterdetect.cxx index 71e05337..12195ae0 100644 --- a/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection/filterdetect.cxx +++ b/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection/filterdetect.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * The Contents of this file are made available subject to the terms of @@ -57,7 +58,6 @@ #include <com/sun/star/beans/XPropertySet.hpp> -using namespace rtl; using namespace com::sun::star::uno; using namespace com::sun::star::document; using namespace com::sun::star::lang; @@ -70,6 +70,9 @@ using namespace com::sun::star::frame; using namespace com::sun::star::container; using namespace com::sun::star::ucb; +using ::rtl::OUString; +using ::rtl::OString; + OUString SAL_CALL FilterDetect::detect(Sequence< PropertyValue >& aArguments ) throw( RuntimeException ) @@ -83,11 +86,11 @@ OUString SAL_CALL FilterDetect::detect(Sequence< PropertyValue >& aArguments ) for ( sal_Int32 i = 0 ; i < aArguments.getLength(); i++) { OUString aName = aArguments[i].Name; - if (aName.equalsAscii("TypeName" ) ) + if (aName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("TypeName" ) ) ) aArguments[i].Value >>= sOriginalTypeName; - if (aName.equalsAscii("URL" ) ) + if (aName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("URL" ) ) ) aArguments[i].Value >>= sURL; - if (aName.equalsAscii("InputStream" ) ) + if (aName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("InputStream" ) ) ) aArguments[i].Value >>= xInStream; } @@ -95,7 +98,7 @@ OUString SAL_CALL FilterDetect::detect(Sequence< PropertyValue >& aArguments ) { // open the stream if it was not suplied by the framework Reference< XSimpleFileAccess > xSFI(mxMSF->createInstance( - OUString::createFromAscii("com.sun.star.ucb.SimpleFileAccess" )), UNO_QUERY); + OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ucb.SimpleFileAccess"))), UNO_QUERY); if (sURL.getLength() > 0 && xSFI.is()) { try @@ -150,25 +153,25 @@ OUString SAL_CALL FilterDetect::detect(Sequence< PropertyValue >& aArguments ) // return type for class found if (aMimeType.equals("application/x-vnd.oasis.opendocument.text") || aMimeType.equals("application/vnd.oasis.opendocument.text")) - sTypeName = OUString::createFromAscii("devguide_FlatXMLType_Cpp_writer"); + sTypeName = OUString(RTL_CONSTASCII_USTRINGPARAM("devguide_FlatXMLType_Cpp_writer")); else if (aMimeType.equals("application/x-vnd.oasis.opendocument.text-master") || aMimeType.equals("application/vnd.oasis.opendocument.text-master")) - sTypeName = OUString::createFromAscii("devguide_FlatXMLType_Cpp_master"); + sTypeName = OUString(RTL_CONSTASCII_USTRINGPARAM("devguide_FlatXMLType_Cpp_master")); else if (aMimeType.equals("application/x-vnd.oasis.openoffice.text-global") || aMimeType.equals("application/vnd.oasis.openoffice.text-global")) - sTypeName = OUString::createFromAscii("devguide_FlatXMLType_Cpp_master"); + sTypeName = OUString(RTL_CONSTASCII_USTRINGPARAM("devguide_FlatXMLType_Cpp_master")); else if (aMimeType.equals("application/x-vnd.oasis.opendocument.spreadsheet") || aMimeType.equals("application/vnd.oasis.opendocument.spreadsheet")) - sTypeName = OUString::createFromAscii("devguide_FlatXMLType_Cpp_calc"); + sTypeName = OUString(RTL_CONSTASCII_USTRINGPARAM("devguide_FlatXMLType_Cpp_calc")); else if (aMimeType.equals("application/x-vnd.oasis.opendocument.drawing") || aMimeType.equals("application/vnd.oasis.opendocument.drawing")) - sTypeName = OUString::createFromAscii("devguide_FlatXMLType_Cpp_draw"); + sTypeName = OUString(RTL_CONSTASCII_USTRINGPARAM("devguide_FlatXMLType_Cpp_draw")); else if (aMimeType.equals("application/x-vnd.oasis.opendocument.presentation") || aMimeType.equals("application/vnd.oasis.opendocument.presentation")) - sTypeName = OUString::createFromAscii("devguide_FlatXMLType_Cpp_impress"); + sTypeName = OUString(RTL_CONSTASCII_USTRINGPARAM("devguide_FlatXMLType_Cpp_impress")); else if (aMimeType.equals("application/x-vnd.oasis.opendocument.presentation") || aMimeType.equals("application/vnd.oasis.opendocument.presentation")) - sTypeName = OUString::createFromAscii("devguide_FlatXMLType_Cpp_impress"); + sTypeName = OUString(RTL_CONSTASCII_USTRINGPARAM("devguide_FlatXMLType_Cpp_impress")); } } return sTypeName; @@ -252,3 +255,5 @@ Sequence< OUString > SAL_CALL FilterDetect::getSupportedServiceNames( ) { return FilterDetect_getSupportedServiceNames(); } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection/filterdetect.hxx b/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection/filterdetect.hxx index 604ddac5..e3da3d5c 100644 --- a/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection/filterdetect.hxx +++ b/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection/filterdetect.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * The Contents of this file are made available subject to the terms of @@ -44,9 +45,7 @@ #include <com/sun/star/lang/XServiceInfo.hpp> #include <cppuhelper/implbase5.hxx> -#ifndef _CPPUHELPER_IMPLBASE4_HXX_ #include <cppuhelper/implbase3.hxx> -#endif enum FilterType { @@ -116,3 +115,4 @@ SAL_CALL FilterDetect_createInstance( const ::com::sun::star::uno::Reference< :: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_cpp/FlatXml.cxx b/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_cpp/FlatXml.cxx index b57f4c7d..112a181c 100644 --- a/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_cpp/FlatXml.cxx +++ b/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_cpp/FlatXml.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * The Contents of this file are made available subject to the terms of @@ -140,11 +141,11 @@ sal_Bool XFlatXml::importer( for ( sal_Int32 i = 0 ; i < nLength; i++) { aName = aSourceData[i].Name; - if (aName.equalsAscii("InputStream")) + if (aName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("InputStream"))) aSourceData[i].Value >>= xInputStream; - else if ( aName.equalsAscii("FileName")) + else if ( aName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("FileName"))) aSourceData[i].Value >>= aFileName; - else if ( aName.equalsAscii("URL")) + else if ( aName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("URL"))) aSourceData[i].Value >>= aURL; } @@ -161,7 +162,7 @@ sal_Bool XFlatXml::importer( // create SAX parser that will read the document file // and provide events to xHandler passed to this call Reference < XParser > xSaxParser( m_rServiceFactory->createInstance( - OUString::createFromAscii("com.sun.star.xml.sax.Parser")), UNO_QUERY ); + OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.sax.Parser"))), UNO_QUERY ); OSL_ASSERT(xSaxParser.is()); if(!xSaxParser.is())return sal_False; @@ -178,7 +179,7 @@ sal_Bool XFlatXml::importer( catch( Exception &exc) { // something went wrong - OSL_ENSURE(0, exc.Message); + OSL_FAIL(exc.Message); return sal_False; } @@ -202,9 +203,9 @@ sal_Bool XFlatXml::exporter( for ( sal_Int32 i = 0 ; i < nLength; i++) { aName = aSourceData[i].Name; - if ( aName.equalsAscii("OutputStream")) + if ( aName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("OutputStream"))) aSourceData[i].Value >>= rOutputStream; - else if ( aName.equalsAscii("URL" )) + else if ( aName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("URL" ) )) aSourceData[i].Value >>= sURL; } @@ -212,7 +213,7 @@ sal_Bool XFlatXml::exporter( // get the document writer m_rDocumentHandler = Reference<XExtendedDocumentHandler>( m_rServiceFactory->createInstance( - OUString::createFromAscii("com.sun.star.xml.sax.Writer")), + OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.sax.Writer"))), UNO_QUERY); OSL_ASSERT(m_rDocumentHandler.is()); if (!m_rDocumentHandler.is()) return sal_False; @@ -302,8 +303,8 @@ Sequence< OUString > getSupportedServiceNames() if( !pNames ) { static Sequence< OUString > seqNames(1); - seqNames.getArray()[0] = OUString::createFromAscii( - "devguide.officedev.samples.filter.FlatXmlCpp"); + seqNames.getArray()[0] = OUString(RTL_CONSTASCII_USTRINGPARAM( + "devguide.officedev.samples.filter.FlatXmlCpp")); pNames = &seqNames; } } @@ -324,34 +325,6 @@ SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } -// This method not longer necessary since OOo 3.4 where the component registration was -// was changed to passive component registration. For more details see -// http://wiki.services.openoffice.org/wiki/Passive_Component_Registration -// -// SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo(void * pServiceManager, void * pRegistryKey ) -// { -// if (pRegistryKey) -// { -// try -// { -// Reference< XRegistryKey > xNewKey( -// reinterpret_cast< XRegistryKey * >( pRegistryKey )->createKey( -// OUString::createFromAscii( "/" IMPLEMENTATION_NAME "/UNO/SERVICES" ) ) ); - -// const Sequence< OUString > & rSNL = getSupportedServiceNames(); -// const OUString * pArray = rSNL.getConstArray(); -// for ( sal_Int32 nPos = rSNL.getLength(); nPos--; ) -// xNewKey->createKey( pArray[nPos] ); - -// return sal_True; -// } -// catch (InvalidRegistryException &) -// { -// OSL_ENSURE( sal_False, "### InvalidRegistryException!" ); -// } -// } -// return sal_False; -// } SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ) @@ -375,3 +348,5 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( } } // extern "C" + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_cpp/Makefile b/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_cpp/Makefile index a9e98777..1a968082 100644 --- a/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_cpp/Makefile +++ b/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_cpp/Makefile @@ -83,13 +83,13 @@ $(SHAREDLIB_OUT)/%.$(SHAREDLIB_EXT) : $(SLOFILES) -$(MKDIR) $(subst /,$(PS),$(OUT_COMP_GEN)) $(LINK) $(COMP_LINK_FLAGS) /OUT:$@ \ /MAP:$(OUT_COMP_GEN)/$(subst $(SHAREDLIB_EXT),map,$(@F)) $(SLOFILES) \ - $(CPPUHELPERLIB) $(CPPULIB) $(SALLIB) $(STLPORTLIB) msvcrt.lib kernel32.lib + $(CPPUHELPERLIB) $(CPPULIB) $(SALLIB) msvcprt.lib msvcrt.lib kernel32.lib $(LINK_MANIFEST) else $(SHAREDLIB_OUT)/%.$(SHAREDLIB_EXT) : $(SLOFILES) -$(MKDIR) $(subst /,$(PS),$(@D)) $(LINK) $(COMP_LINK_FLAGS) $(LINK_LIBS) -o $@ $(SLOFILES) \ - $(CPPUHELPERLIB) $(CPPULIB) $(SALLIB) $(STLPORTLIB) $(STC++LIB) $(CPPUHELPERDYLIB) $(CPPUDYLIB) $(SALDYLIB) + $(CPPUHELPERLIB) $(CPPULIB) $(SALLIB) $(STC++LIB) $(CPPUHELPERDYLIB) $(CPPUDYLIB) $(SALDYLIB) ifeq "$(OS)" "MACOSX" $(INSTALL_NAME_URELIBS) $@ endif diff --git a/odk/examples/DevelopersGuide/ProfUNO/CppBinding/Makefile b/odk/examples/DevelopersGuide/ProfUNO/CppBinding/Makefile index 09d8246b..23c86e57 100644 --- a/odk/examples/DevelopersGuide/ProfUNO/CppBinding/Makefile +++ b/odk/examples/DevelopersGuide/ProfUNO/CppBinding/Makefile @@ -75,10 +75,10 @@ $(OUT_BIN)/%$(EXE_EXT) : $(SAMPLE_OBJ_OUT)/%.$(OBJ_EXT) -$(MKDIR) $(subst /,$(PS),$(SAMPLE_GEN_OUT)) ifeq "$(OS)" "WIN" $(LINK) $(EXE_LINK_FLAGS) /OUT:$@ /MAP:$(SAMPLE_GEN_OUT)/$(subst $(EXE_EXT),.map,$(@F)) \ - $< $(CPPUHELPERLIB) $(CPPULIB) $(SALHELPERLIB) $(SALLIB) $(STLPORTLIB) + $< $(CPPUHELPERLIB) $(CPPULIB) $(SALHELPERLIB) $(SALLIB) else $(LINK) $(EXE_LINK_FLAGS) $(LINK_LIBS) -o $@ $< \ - $(CPPUHELPERLIB) $(CPPULIB) $(SALHELPERLIB) $(SALLIB) $(STLPORTLIB) $(STDC++LIB) $(CPPUHELPERDYLIB) $(CPPUDYLIB) $(SALHELPERDYLIB) $(SALDYLIB) + $(CPPUHELPERLIB) $(CPPULIB) $(SALHELPERLIB) $(SALLIB) $(STDC++LIB) $(CPPUHELPERDYLIB) $(CPPUDYLIB) $(SALHELPERDYLIB) $(SALDYLIB) ifeq "$(OS)" "MACOSX" $(INSTALL_NAME_URELIBS_BIN) $@ endif diff --git a/odk/examples/DevelopersGuide/ProfUNO/CppBinding/office_connect.cxx b/odk/examples/DevelopersGuide/ProfUNO/CppBinding/office_connect.cxx index 6a3df808..336aa4e5 100644 --- a/odk/examples/DevelopersGuide/ProfUNO/CppBinding/office_connect.cxx +++ b/odk/examples/DevelopersGuide/ProfUNO/CppBinding/office_connect.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * The Contents of this file are made available subject to the terms of @@ -44,9 +45,11 @@ using namespace com::sun::star::uno; using namespace com::sun::star::lang; using namespace com::sun::star::bridge; -using namespace rtl; using namespace cppu; +using ::rtl::OUString; +using ::rtl::OUStringToOString; + SAL_IMPLEMENT_MAIN() { // create the initial component context @@ -60,7 +63,7 @@ SAL_IMPLEMENT_MAIN() // instantiate a sample service with the servicemanager. Reference< XInterface > rInstance = rServiceManager->createInstanceWithContext( - OUString::createFromAscii("com.sun.star.bridge.UnoUrlResolver" ), + OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.bridge.UnoUrlResolver")), rComponentContext ); // Query for the XUnoUrlResolver interface @@ -74,8 +77,8 @@ SAL_IMPLEMENT_MAIN() try { // resolve the uno-url - rInstance = rResolver->resolve( OUString::createFromAscii( - "uno:socket,host=localhost,port=2083;urp;StarOffice.ServiceManager" ) ); + rInstance = rResolver->resolve( OUString(RTL_CONSTASCII_USTRINGPARAM( + "uno:socket,host=localhost,port=2083;urp;StarOffice.ServiceManager" )) ); if( ! rInstance.is() ) { @@ -102,3 +105,5 @@ SAL_IMPLEMENT_MAIN() } return 0; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/odk/examples/DevelopersGuide/ProfUNO/CppBinding/string_samples.cxx b/odk/examples/DevelopersGuide/ProfUNO/CppBinding/string_samples.cxx index e0b97266..47689edb 100644 --- a/odk/examples/DevelopersGuide/ProfUNO/CppBinding/string_samples.cxx +++ b/odk/examples/DevelopersGuide/ProfUNO/CppBinding/string_samples.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * The Contents of this file are made available subject to the terms of @@ -82,3 +83,5 @@ SAL_IMPLEMENT_MAIN() return 0; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/odk/examples/DevelopersGuide/ProfUNO/Lifetime/Makefile b/odk/examples/DevelopersGuide/ProfUNO/Lifetime/Makefile index ca4ff846..504f229c 100644 --- a/odk/examples/DevelopersGuide/ProfUNO/Lifetime/Makefile +++ b/odk/examples/DevelopersGuide/ProfUNO/Lifetime/Makefile @@ -81,10 +81,10 @@ $(OUT_BIN)/$(COMPONENT_NAME)$(EXE_EXT) : $(OBJFILES) -$(MKDIR) $(subst /,$(PS),$(OUT_COMP_GEN)) ifeq "$(OS)" "WIN" $(LINK) $(EXE_LINK_FLAGS) /OUT:$@ /MAP:$(OUT_COMP_GEN)/$(subst $(EXE_EXT),.map,$(@F)) \ - $(OBJFILES) $(CPPUHELPERLIB) $(CPPULIB) $(SALHELPERLIB) $(SALLIB) $(STLPORTLIB) + $(OBJFILES) $(CPPUHELPERLIB) $(CPPULIB) $(SALHELPERLIB) $(SALLIB) else $(LINK) $(EXE_LINK_FLAGS) $(LINK_LIBS) -o $@ $(OBJFILES) \ - $(CPPUHELPERLIB) $(CPPULIB) $(SALHELPERLIB) $(SALLIB) $(STLPORTLIB) $(STDC++LIB) $(CPPUHELPERDYLIB) $(CPPUDYLIB) $(SALHELPERDYLIB) $(SALDYLIB) + $(CPPUHELPERLIB) $(CPPULIB) $(SALHELPERLIB) $(SALLIB) $(STDC++LIB) $(CPPUHELPERDYLIB) $(CPPUDYLIB) $(SALHELPERDYLIB) $(SALDYLIB) ifeq "$(OS)" "MACOSX" $(INSTALL_NAME_URELIBS_BIN) $@ endif diff --git a/odk/examples/DevelopersGuide/ProfUNO/Lifetime/object_lifetime.cxx b/odk/examples/DevelopersGuide/ProfUNO/Lifetime/object_lifetime.cxx index baef8c89..63056a92 100644 --- a/odk/examples/DevelopersGuide/ProfUNO/Lifetime/object_lifetime.cxx +++ b/odk/examples/DevelopersGuide/ProfUNO/Lifetime/object_lifetime.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * The Contents of this file are made available subject to the terms of @@ -66,3 +67,5 @@ int main( char * argv[] ) simple_object_creation_and_destruction(); return 0; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/odk/examples/DevelopersGuide/ProfUNO/SimpleBootstrap_cpp/Makefile b/odk/examples/DevelopersGuide/ProfUNO/SimpleBootstrap_cpp/Makefile index 5f2a577c..33f4c2df 100644 --- a/odk/examples/DevelopersGuide/ProfUNO/SimpleBootstrap_cpp/Makefile +++ b/odk/examples/DevelopersGuide/ProfUNO/SimpleBootstrap_cpp/Makefile @@ -68,10 +68,10 @@ $(OUT_BIN)/_$(APP_NAME)$(EXE_EXT) : $(OUT_APP_OBJ)/$(APP_NAME).$(OBJ_EXT) -$(MKDIR) $(subst /,$(PS),$(OUT_APP_GEN)) ifeq "$(OS)" "WIN" $(LINK) $(EXE_LINK_FLAGS) /OUT:$@ /MAP:$(OUT_APP_GEN)/$(basename $(@F)).map \ - $< $(CPPUHELPERLIB) $(CPPULIB) $(SALHELPERLIB) $(SALLIB) $(STLPORTLIB) + $< $(CPPUHELPERLIB) $(CPPULIB) $(SALHELPERLIB) $(SALLIB) else $(LINK) $(EXE_LINK_FLAGS) $(LINK_LIBS) -o $@ $< \ - $(CPPUHELPERLIB) $(CPPULIB) $(SALHELPERLIB) $(SALLIB) $(STLPORTLIB) $(STDC++LIB) $(CPPUHELPERDYLIB) $(CPPUDYLIB) $(SALHELPERDYLIB) $(SALDYLIB) + $(CPPUHELPERLIB) $(CPPULIB) $(SALHELPERLIB) $(SALLIB) $(STDC++LIB) $(CPPUHELPERDYLIB) $(CPPUDYLIB) $(SALHELPERDYLIB) $(SALDYLIB) ifeq "$(OS)" "MACOSX" $(INSTALL_NAME_URELIBS_BIN) $@ endif diff --git a/odk/examples/DevelopersGuide/ProfUNO/SimpleBootstrap_cpp/SimpleBootstrap_cpp.cxx b/odk/examples/DevelopersGuide/ProfUNO/SimpleBootstrap_cpp/SimpleBootstrap_cpp.cxx index 2967f9fc..99f9da64 100644 --- a/odk/examples/DevelopersGuide/ProfUNO/SimpleBootstrap_cpp/SimpleBootstrap_cpp.cxx +++ b/odk/examples/DevelopersGuide/ProfUNO/SimpleBootstrap_cpp/SimpleBootstrap_cpp.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * The Contents of this file are made available subject to the terms of @@ -40,11 +41,12 @@ #include <com/sun/star/frame/XComponentLoader.hpp> #include <com/sun/star/lang/XMultiComponentFactory.hpp> -using namespace rtl; using namespace com::sun::star::uno; using namespace com::sun::star::lang; using namespace com::sun::star::frame; +using ::rtl::OUString; +using ::rtl::OUStringToOString; SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) { @@ -100,3 +102,5 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) return 0; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/odk/examples/DevelopersGuide/Text/TextDocuments.java b/odk/examples/DevelopersGuide/Text/TextDocuments.java index fad1be9c..d226be41 100644 --- a/odk/examples/DevelopersGuide/Text/TextDocuments.java +++ b/odk/examples/DevelopersGuide/Text/TextDocuments.java @@ -425,7 +425,7 @@ public class TextDocuments { if ( xDoc != null ) { sourceFile = new java.io.File(sOutputDir); StringBuffer sStoreFileUrl = new StringBuffer(); - sStoreFileUrl.append(sourceFile.toURL().toString()); + sStoreFileUrl.append(sourceFile.toURI().toURL().toString()); sStoreFileUrl.append("somepopularfileformat.doc"); storeDocComponent(xDoc, sStoreFileUrl.toString() ); diff --git a/odk/examples/DevelopersGuide/UCB/Helper.java b/odk/examples/DevelopersGuide/UCB/Helper.java index dbba9156..791302b7 100644 --- a/odk/examples/DevelopersGuide/UCB/Helper.java +++ b/odk/examples/DevelopersGuide/UCB/Helper.java @@ -179,7 +179,7 @@ public class Helper { try { File file = new File( systemPath ); - String url = file.toURL().toString(); + String url = file.toURI().toURL().toString(); if ( url.charAt( 6 ) != '/' ) { // file:/xxx vs. file:///xxxx StringBuffer buf1 = new StringBuffer( "file:///" ); buf1.append( url.substring( 6 ) ); @@ -217,7 +217,7 @@ public class Helper { buf.append( "resource-" ); buf.append( System.currentTimeMillis() ); File file = new File( buf.toString() ); - String url = file.toURL().toString(); + String url = file.toURI().toURL().toString(); if ( url.charAt( 6 ) != '/' ) { // file:/xxx vs. file:///xxxx StringBuffer buf1 = new StringBuffer( "file:///" ); buf1.append( url.substring( 6 ) ); diff --git a/odk/examples/OLE/activex/SOActiveX.cpp b/odk/examples/OLE/activex/SOActiveX.cpp index 8111e7c4..cfadfca1 100644 --- a/odk/examples/OLE/activex/SOActiveX.cpp +++ b/odk/examples/OLE/activex/SOActiveX.cpp @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * The Contents of this file are made available subject to the terms of @@ -48,14 +49,12 @@ OLECHAR* pSlotUrl[BARS_NUMBER] = {L"slot:5910" // SID_TOGGLEFUNCTIONBAR ,L"slot:5920" // SID_TOGGLESTATUSBAR ,L"slot:6661" // SID_TOGGLE_MENUBAR -// ,L"slot:10603" // SID_HYPERLINK_INSERT }; OLECHAR* pSlotName[BARS_NUMBER] = {L"FunctionBarVisible" // SID_TOGGLEFUNCTIONBAR ,L"StatusBarVisible" // SID_TOGGLESTATUSBAR ,L"MenuBarVisible" // SID_TOGGLE_MENUBAR -// ,L"InsertHyperlink" // SID_HYPERLINK_INSERT }; @@ -643,3 +642,4 @@ STDMETHODIMP CSOActiveX::Invoke(DISPID dispidMember, // --------------------------------------------------------------------------- +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/odk/examples/OLE/activex/SOActiveX.h b/odk/examples/OLE/activex/SOActiveX.h index a47624ba..f115d49e 100644 --- a/odk/examples/OLE/activex/SOActiveX.h +++ b/odk/examples/OLE/activex/SOActiveX.h @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * The Contents of this file are made available subject to the terms of @@ -164,3 +165,4 @@ public: #endif //__SOACTIVEX_H_ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/odk/examples/OLE/activex/SOComWindowPeer.cpp b/odk/examples/OLE/activex/SOComWindowPeer.cpp index 86704ffa..1065a1be 100644 --- a/odk/examples/OLE/activex/SOComWindowPeer.cpp +++ b/odk/examples/OLE/activex/SOComWindowPeer.cpp @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * The Contents of this file are made available subject to the terms of @@ -37,6 +38,7 @@ #include "stdafx2.h" #include "so_activex.h" #include "SOComWindowPeer.h" +#include <sal/macros.h> ///////////////////////////////////////////////////////////////////////////// // @@ -48,7 +50,7 @@ STDMETHODIMP SOComWindowPeer::InterfaceSupportsErrorInfo(REFIID riid) &IID_ISOComWindowPeer, }; - for (int i=0;i<sizeof(arr)/sizeof(arr[0]);i++) + for (int i=0;i<SAL_N_ELEMENTS(arr);i++) { if (InlineIsEqualGUID(*arr[i],riid)) return S_OK; @@ -56,3 +58,4 @@ STDMETHODIMP SOComWindowPeer::InterfaceSupportsErrorInfo(REFIID riid) return S_FALSE; } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/odk/examples/OLE/activex/SOComWindowPeer.h b/odk/examples/OLE/activex/SOComWindowPeer.h index af3dae01..e843aa70 100644 --- a/odk/examples/OLE/activex/SOComWindowPeer.h +++ b/odk/examples/OLE/activex/SOComWindowPeer.h @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * The Contents of this file are made available subject to the terms of @@ -160,3 +161,5 @@ DECLARE_REGISTRY_RESOURCEID(IDR_SOCOMWINDOWPEER) }; #endif // __SOCOMWINDOWPEER_H_ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/odk/examples/OLE/activex/StdAfx2.cpp b/odk/examples/OLE/activex/StdAfx2.cpp index 4e8d8b29..12ffbc18 100644 --- a/odk/examples/OLE/activex/StdAfx2.cpp +++ b/odk/examples/OLE/activex/StdAfx2.cpp @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * The Contents of this file are made available subject to the terms of @@ -44,3 +45,5 @@ #endif #include <atlimpl.cpp> + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/odk/examples/OLE/activex/StdAfx2.h b/odk/examples/OLE/activex/StdAfx2.h index ee015601..548e334f 100644 --- a/odk/examples/OLE/activex/StdAfx2.h +++ b/odk/examples/OLE/activex/StdAfx2.h @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * The Contents of this file are made available subject to the terms of @@ -63,3 +64,5 @@ extern CComModule _Module; // Microsoft Visual C++ will insert additional declarations immediately before the previous line. #endif // !defined(AFX_STDAFX_H__C1799EA0_62CC_44DE_A2DD_C9F0410FF7F1__INCLUDED) + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/odk/examples/OLE/activex/resource.h b/odk/examples/OLE/activex/resource.h index 471f8b84..7587e0c1 100644 --- a/odk/examples/OLE/activex/resource.h +++ b/odk/examples/OLE/activex/resource.h @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * The Contents of this file are made available subject to the terms of @@ -53,3 +54,4 @@ #endif #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/odk/examples/OLE/activex/so_activex.cpp b/odk/examples/OLE/activex/so_activex.cpp index 218f0b78..9581c214 100644 --- a/odk/examples/OLE/activex/so_activex.cpp +++ b/odk/examples/OLE/activex/so_activex.cpp @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * The Contents of this file are made available subject to the terms of @@ -106,3 +107,4 @@ STDAPI DllUnregisterServer(void) return aResult; } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/odk/examples/cpp/DocumentLoader/DocumentLoader.cxx b/odk/examples/cpp/DocumentLoader/DocumentLoader.cxx index 0ef6c115..6401f73e 100644 --- a/odk/examples/cpp/DocumentLoader/DocumentLoader.cxx +++ b/odk/examples/cpp/DocumentLoader/DocumentLoader.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * The Contents of this file are made available subject to the terms of @@ -58,7 +59,6 @@ #include <string.h> -using namespace rtl; using namespace com::sun::star::uno; using namespace com::sun::star::lang; using namespace com::sun::star::beans; @@ -66,7 +66,8 @@ using namespace com::sun::star::bridge; using namespace com::sun::star::frame; using namespace com::sun::star::registry; - +using ::rtl::OUString; +using ::rtl::OUStringToOString; //============================================================================ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) @@ -100,7 +101,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) */ Reference< XInterface > xInterface = xMultiComponentFactoryClient->createInstanceWithContext( - OUString::createFromAscii( "com.sun.star.bridge.UnoUrlResolver" ), + OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.bridge.UnoUrlResolver")), xComponentContext ); Reference< XUnoUrlResolver > resolver( xInterface, UNO_QUERY ); @@ -121,7 +122,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) // gets the server component context as property of the office component factory Reference< XPropertySet > xPropSet( xInterface, UNO_QUERY ); - xPropSet->getPropertyValue( OUString::createFromAscii("DefaultContext") ) >>= xComponentContext; + xPropSet->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultContext")) ) >>= xComponentContext; // gets the service manager from the office Reference< XMultiComponentFactory > xMultiComponentFactoryServer( @@ -154,3 +155,5 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) return 0; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/odk/examples/cpp/DocumentLoader/Makefile b/odk/examples/cpp/DocumentLoader/Makefile index 6cbd8bdd..02a872a4 100644 --- a/odk/examples/cpp/DocumentLoader/Makefile +++ b/odk/examples/cpp/DocumentLoader/Makefile @@ -70,10 +70,10 @@ $(OUT_BIN)/DocumentLoader$(EXE_EXT) : $(OUT_COMP_OBJ)/DocumentLoader.$(OBJ_EXT) -$(MKDIR) $(subst /,$(PS),$(OUT_COMP_GEN)) ifeq "$(OS)" "WIN" $(LINK) $(EXE_LINK_FLAGS) /OUT:$@ /MAP:$(OUT_COMP_GEN)/$(basename $(@F)).map \ - $< $(CPPUHELPERLIB) $(CPPULIB) $(SALHELPERLIB) $(SALLIB) $(STLPORTLIB) + $< $(CPPUHELPERLIB) $(CPPULIB) $(SALHELPERLIB) $(SALLIB) else $(LINK) $(EXE_LINK_FLAGS) $(LINK_LIBS) -o $@ $< \ - $(CPPUHELPERLIB) $(CPPULIB) $(SALHELPERLIB) $(SALLIB) $(STLPORTLIB) $(STDC++LIB) $(CPPUHELPERDYLIB) $(CPPUDYLIB) $(SALHELPERDYLIB) $(SALDYLIB) + $(CPPUHELPERLIB) $(CPPULIB) $(SALHELPERLIB) $(SALLIB) $(STDC++LIB) $(CPPUHELPERDYLIB) $(CPPUDYLIB) $(SALHELPERDYLIB) $(SALDYLIB) ifeq "$(OS)" "MACOSX" $(INSTALL_NAME_URELIBS_BIN) $@ endif diff --git a/odk/examples/cpp/complextoolbarcontrols/CalcListener.cxx b/odk/examples/cpp/complextoolbarcontrols/CalcListener.cxx index 8e40e3b0..fd344840 100644 --- a/odk/examples/cpp/complextoolbarcontrols/CalcListener.cxx +++ b/odk/examples/cpp/complextoolbarcontrols/CalcListener.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -37,3 +38,4 @@ void SAL_CALL CalcListener::disposing( const com::sun::star::lang::EventObject& { } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/odk/examples/cpp/complextoolbarcontrols/ListenerHelper.cxx b/odk/examples/cpp/complextoolbarcontrols/ListenerHelper.cxx index f13393d1..5270c44a 100644 --- a/odk/examples/cpp/complextoolbarcontrols/ListenerHelper.cxx +++ b/odk/examples/cpp/complextoolbarcontrols/ListenerHelper.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -74,7 +75,7 @@ void ListenerHelper::RemoveListener( break; } - aIter++; + ++aIter; } } } @@ -96,7 +97,7 @@ void ListenerHelper::Notify( while ( aIter != aL.end() ) { (*aIter)->statusChanged( rEvent ); - aIter++; + ++aIter; } } } @@ -139,6 +140,8 @@ void SAL_CALL ListenerItemEventListener::disposing( const EventObject& aEvent) t break; } - aIter++; + ++aIter; } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/odk/examples/cpp/complextoolbarcontrols/ListenerHelper.h b/odk/examples/cpp/complextoolbarcontrols/ListenerHelper.h index a0da2ab9..15cb7f21 100644 --- a/odk/examples/cpp/complextoolbarcontrols/ListenerHelper.h +++ b/odk/examples/cpp/complextoolbarcontrols/ListenerHelper.h @@ -1,5 +1,6 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ #include <vector> -#include <hash_map> +#include <boost/unordered_map.hpp> #include <com/sun/star/frame/XFrame.hpp> #include <com/sun/star/frame/XStatusListener.hpp> #include <com/sun/star/frame/FeatureStateEvent.hpp> @@ -26,7 +27,7 @@ struct eqObjectName_Impl typedef std::vector < com::sun::star::uno::Reference < com::sun::star::frame::XStatusListener > > StatusListeners; -typedef std::hash_map +typedef boost::unordered_map < ::rtl::OUString, StatusListeners, @@ -37,7 +38,7 @@ ListenerMap; // For every frame there is *one* Dispatch object for all possible commands // this struct contains an array of listeners for every supported command -// these arrays are accessed by a hash_map (with the command string as index) +// these arrays are accessed by a boost::unordered_map (with the command string as index) struct ListenerItem { ListenerMap aContainer; @@ -80,3 +81,5 @@ public: {} virtual void SAL_CALL disposing( const com::sun::star::lang::EventObject& aEvent ) throw (com::sun::star::uno::RuntimeException); }; + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/odk/examples/cpp/complextoolbarcontrols/Makefile b/odk/examples/cpp/complextoolbarcontrols/Makefile index 8e622330..06af1afa 100644 --- a/odk/examples/cpp/complextoolbarcontrols/Makefile +++ b/odk/examples/cpp/complextoolbarcontrols/Makefile @@ -92,14 +92,14 @@ $(SHAREDLIB_OUT)/%.$(SHAREDLIB_EXT) : $(SLOFILES) -$(MKDIR) $(subst /,$(PS),$(OUT_COMP_GEN)) $(LINK) $(COMP_LINK_FLAGS) /OUT:$@ \ /MAP:$(OUT_COMP_GEN)/$(subst $(SHAREDLIB_EXT),map,$(@F)) $(SLOFILES) \ - $(CPPUHELPERLIB) $(CPPULIB) $(SALLIB) $(STLPORTLIB) msvcrt.lib kernel32.lib + $(CPPUHELPERLIB) $(CPPULIB) $(SALLIB) msvcprt.lib msvcrt.lib kernel32.lib $(LINK_MANIFEST) else #$(SHAREDLIB_OUT)/%.$(SHAREDLIB_EXT) : $(SLOFILES) $(COMP_MAPFILE) $(SHAREDLIB_OUT)/%.$(SHAREDLIB_EXT) : $(SLOFILES) -$(MKDIR) $(subst /,$(PS),$(@D)) $(LINK) $(COMP_LINK_FLAGS) $(LINK_LIBS) -o $@ $(SLOFILES) \ - $(CPPUHELPERLIB) $(CPPULIB) $(SALLIB) $(STLPORTLIB) $(STC++LIB) $(CPPUHELPERDYLIB) $(CPPUDYLIB) $(SALDYLIB) + $(CPPUHELPERLIB) $(CPPULIB) $(SALLIB) $(STC++LIB) $(CPPUHELPERDYLIB) $(CPPUDYLIB) $(SALDYLIB) ifeq "$(OS)" "MACOSX" $(INSTALL_NAME_URELIBS) $@ endif diff --git a/odk/examples/cpp/complextoolbarcontrols/MyJob.cxx b/odk/examples/cpp/complextoolbarcontrols/MyJob.cxx index 746aad74..d07d67d8 100644 --- a/odk/examples/cpp/complextoolbarcontrols/MyJob.cxx +++ b/odk/examples/cpp/complextoolbarcontrols/MyJob.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -26,9 +27,7 @@ ************************************************************************/ -#ifndef _MyJob_HXX #include "MyJob.h" -#endif #include <osl/diagnose.h> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/beans/NamedValue.hpp> @@ -50,9 +49,9 @@ using com::sun::star::document::XEventBroadcaster; Any SAL_CALL MyJob::execute( const Sequence< NamedValue >& aArguments ) throw ( IllegalArgumentException, Exception, RuntimeException ) { - Reference < XEventBroadcaster > xBrd( mxMSF->createInstance(::rtl::OUString::createFromAscii("com.sun.star.frame.GlobalEventBroadcaster") ), UNO_QUERY ); + Reference < XEventBroadcaster > xBrd( mxMSF->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.GlobalEventBroadcaster")) ), UNO_QUERY ); Reference < com::sun::star::document::XEventListener > xLstner( mxMSF->createInstance( - ::rtl::OUString::createFromAscii("com.sun.star.comp.Office.MyListener" ) ), UNO_QUERY ); + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.Office.MyListener")) ), UNO_QUERY ); if ( xBrd.is() ) xBrd->addEventListener( xLstner ); return Any(); @@ -107,3 +106,5 @@ Sequence< OUString > SAL_CALL MyJob::getSupportedServiceNames( ) { return MyJob_getSupportedServiceNames(); } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/odk/examples/cpp/complextoolbarcontrols/MyJob.h b/odk/examples/cpp/complextoolbarcontrols/MyJob.h index 3832b13a..3f2989f7 100644 --- a/odk/examples/cpp/complextoolbarcontrols/MyJob.h +++ b/odk/examples/cpp/complextoolbarcontrols/MyJob.h @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ #ifndef _MyJob_HXX #define _MyJob_HXX @@ -148,3 +149,4 @@ SAL_CALL MyJob_createInstance( const ::com::sun::star::uno::Reference< ::com::su #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/odk/examples/cpp/complextoolbarcontrols/MyListener.cxx b/odk/examples/cpp/complextoolbarcontrols/MyListener.cxx index 910440f5..da9fce33 100644 --- a/odk/examples/cpp/complextoolbarcontrols/MyListener.cxx +++ b/odk/examples/cpp/complextoolbarcontrols/MyListener.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -34,22 +35,16 @@ namespace css = ::com::sun::star; -/*----------------------------------------------------- - 20.11.2003 11:31 ------------------------------------------------------*/ + MyListener::MyListener(const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR) : m_xSMGR(xSMGR) {} -/*----------------------------------------------------- - 20.11.2003 11:32 ------------------------------------------------------*/ + MyListener::~MyListener() {} -/*----------------------------------------------------- - 20.11.2003 12:04 ------------------------------------------------------*/ + css::uno::Any SAL_CALL MyListener::execute(const css::uno::Sequence< css::beans::NamedValue >& lArguments) throw (css::lang::IllegalArgumentException, css::uno::Exception, @@ -62,7 +57,7 @@ css::uno::Any SAL_CALL MyListener::execute(const css::uno::Sequence< css::beans: const css::beans::NamedValue* p = lArguments.getConstArray(); for (i=0; i<c; ++i) { - if (p[i].Name.equalsAscii("Environment")) + if (p[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Environment"))) { p[i].Value >>= lEnv; break; @@ -75,12 +70,12 @@ css::uno::Any SAL_CALL MyListener::execute(const css::uno::Sequence< css::beans: p = lEnv.getConstArray(); for (i=0; i<c; ++i) { - if (p[i].Name.equalsAscii("Model")) + if (p[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Model"))) { p[i].Value >>= xModel; break; } - if (p[i].Name.equalsAscii("Frame")) + if (p[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Frame"))) { css::uno::Reference< css::frame::XController > xController; css::uno::Reference< css::frame::XFrame > xFrame; @@ -97,11 +92,11 @@ css::uno::Any SAL_CALL MyListener::execute(const css::uno::Sequence< css::beans: return css::uno::Any(); css::uno::Reference< css::lang::XServiceInfo > xInfo(xModel, css::uno::UNO_QUERY); - sal_Bool bCalc = xInfo->supportsService(::rtl::OUString::createFromAscii("com.sun.star.sheet.SpreadsheetDocument")); + sal_Bool bCalc = xInfo->supportsService(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sheet.SpreadsheetDocument"))); sal_Bool bWriter = ( - xInfo->supportsService(::rtl::OUString::createFromAscii("com.sun.star.text.TextDocument" )) && - !xInfo->supportsService(::rtl::OUString::createFromAscii("com.sun.star.text.WebDocument" )) && - !xInfo->supportsService(::rtl::OUString::createFromAscii("com.sun.star.text.GlobalDocument")) + xInfo->supportsService(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.TextDocument"))) && + !xInfo->supportsService(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.WebDocument"))) && + !xInfo->supportsService(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.GlobalDocument"))) ); // Wir interessieren uns nur für Writer und Calc. Werden hier aber für @@ -124,44 +119,38 @@ css::uno::Any SAL_CALL MyListener::execute(const css::uno::Sequence< css::beans: return css::uno::Any(); } -/*----------------------------------------------------- - 20.11.2003 12:13 ------------------------------------------------------*/ + ::rtl::OUString SAL_CALL MyListener::getImplementationName() throw (css::uno::RuntimeException) { - return ::rtl::OUString::createFromAscii(MYLISTENER_IMPLEMENTATIONNAME); + return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(MYLISTENER_IMPLEMENTATIONNAME)); } -/*----------------------------------------------------- - 20.11.2003 12:13 ------------------------------------------------------*/ + css::uno::Sequence< ::rtl::OUString > SAL_CALL MyListener::getSupportedServiceNames() throw (css::uno::RuntimeException) { css::uno::Sequence< ::rtl::OUString > lNames(1); - lNames[0] = ::rtl::OUString::createFromAscii(MYLISTENER_SERVICENAME); + lNames[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(MYLISTENER_SERVICENAME)); return lNames; } -/*----------------------------------------------------- - 20.11.2003 12:14 ------------------------------------------------------*/ + sal_Bool SAL_CALL MyListener::supportsService(const ::rtl::OUString& sServiceName) throw (css::uno::RuntimeException) { return ( - sServiceName.equalsAscii(MYLISTENER_SERVICENAME) || - sServiceName.equalsAscii("com.sun.star.task.Job" ) + sServiceName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(MYLISTENER_SERVICENAME)) || + sServiceName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.task.Job")) ); } -/*----------------------------------------------------- - 20.11.2003 11:31 ------------------------------------------------------*/ + css::uno::Reference< css::uno::XInterface > MyListener::st_createInstance(const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR) { MyListener* pListener = new MyListener(xSMGR); css::uno::Reference< css::uno::XInterface > xListener(static_cast< css::task::XJob* >(pListener), css::uno::UNO_QUERY); return xListener; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/odk/examples/cpp/complextoolbarcontrols/MyListener.h b/odk/examples/cpp/complextoolbarcontrols/MyListener.h index d1a9c22c..24caa9d3 100644 --- a/odk/examples/cpp/complextoolbarcontrols/MyListener.h +++ b/odk/examples/cpp/complextoolbarcontrols/MyListener.h @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ #ifndef _MyListener_HXX #define _MyListener_HXX @@ -94,3 +95,5 @@ class WriterListener : public cppu::WeakImplHelper1< css::document::XEventListen }; #endif // _MyListener_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/odk/examples/cpp/complextoolbarcontrols/MyProtocolHandler.cxx b/odk/examples/cpp/complextoolbarcontrols/MyProtocolHandler.cxx index 828d6dde..17bea5d1 100644 --- a/odk/examples/cpp/complextoolbarcontrols/MyProtocolHandler.cxx +++ b/odk/examples/cpp/complextoolbarcontrols/MyProtocolHandler.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -169,13 +170,13 @@ Reference< XDispatch > SAL_CALL MyProtocolHandler::queryDispatch( const URL& aUR // ohne ein entsprechendes Dokument funktioniert der Handler nicht return xRet; - if ( aURL.Path.equalsAscii("Command1" ) || - aURL.Path.equalsAscii("Command2" ) || - aURL.Path.equalsAscii("Command3" ) || - aURL.Path.equalsAscii("Command4" ) || - aURL.Path.equalsAscii("Command5" ) || - aURL.Path.equalsAscii("Command6" ) || - aURL.Path.equalsAscii("Command7" ) ) + if ( aURL.Path.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("Command1" ) ) || + aURL.Path.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("Command2" ) ) || + aURL.Path.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("Command3" ) ) || + aURL.Path.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("Command4" ) ) || + aURL.Path.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("Command5" ) ) || + aURL.Path.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("Command6" ) ) || + aURL.Path.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("Command7" ) ) ) { xRet = aListenerHelper.GetDispatch( mxFrame, aURL.Path ); if ( !xRet.is() ) @@ -205,7 +206,7 @@ Sequence < Reference< XDispatch > > SAL_CALL MyProtocolHandler::queryDispatches( ::rtl::OUString MyProtocolHandler_getImplementationName () throw (RuntimeException) { - return ::rtl::OUString::createFromAscii(MYPROTOCOLHANDLER_IMPLEMENTATIONNAME); + return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(MYPROTOCOLHANDLER_IMPLEMENTATIONNAME)); } sal_Bool SAL_CALL MyProtocolHandler_supportsService( const ::rtl::OUString& ServiceName ) @@ -213,7 +214,7 @@ sal_Bool SAL_CALL MyProtocolHandler_supportsService( const ::rtl::OUString& Serv { return ( ServiceName.equalsAscii(MYPROTOCOLHANDLER_SERVICENAME ) || - ServiceName.equalsAscii("com.sun.star.frame.ProtocolHandler") + ServiceName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.frame.ProtocolHandler")) ); } @@ -221,7 +222,7 @@ Sequence< ::rtl::OUString > SAL_CALL MyProtocolHandler_getSupportedServiceNames( throw (RuntimeException) { Sequence < ::rtl::OUString > aRet(1); - aRet[0] = ::rtl::OUString::createFromAscii(MYPROTOCOLHANDLER_SERVICENAME); + aRet[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(MYPROTOCOLHANDLER_SERVICENAME)); return aRet; } @@ -268,9 +269,9 @@ void SAL_CALL BaseDispatch::dispatch( const URL& aURL, const Sequence < Property if ( !aURL.Path.compareToAscii("Command1" ) ) { // open the OpenOffice.org web page - ::rtl::OUString sURL(::rtl::OUString::createFromAscii("http://www.openoffice.org")); + ::rtl::OUString sURL(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("http://www.openoffice.org"))); Reference< XSystemShellExecute > xSystemShellExecute( mxMSF->createInstance( - ::rtl::OUString::createFromAscii( "com.sun.star.system.SystemShellExecute" )), UNO_QUERY ); + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.system.SystemShellExecute"))), UNO_QUERY ); if ( xSystemShellExecute.is() ) { try @@ -290,7 +291,7 @@ void SAL_CALL BaseDispatch::dispatch( const URL& aURL, const Sequence < Property Sequence< NamedValue > aRemoveArgs( 1 ); aRemoveArgs[0].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Text" )); aRemoveArgs[0].Value <<= maComboBoxText; - SendCommand( aURL, ::rtl::OUString::createFromAscii( "RemoveEntryText" ), aRemoveArgs, sal_True ); + SendCommand( aURL, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("RemoveEntryText")), aRemoveArgs, sal_True ); // add the new text to the start of the list Sequence< NamedValue > aInsertArgs( 2 ); @@ -298,7 +299,7 @@ void SAL_CALL BaseDispatch::dispatch( const URL& aURL, const Sequence < Property aInsertArgs[0].Value <<= sal_Int32( 0 ); aInsertArgs[1].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Text" )); aInsertArgs[1].Value <<= maComboBoxText; - SendCommand( aURL, ::rtl::OUString::createFromAscii( "InsertEntry" ), aInsertArgs, sal_True ); + SendCommand( aURL, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("InsertEntry")), aInsertArgs, sal_True ); } else if ( !aURL.Path.compareToAscii("Command3" ) ) { @@ -315,15 +316,15 @@ void SAL_CALL BaseDispatch::dispatch( const URL& aURL, const Sequence < Property // create new URL to address the combox box URL aCmdURL; - aCmdURL.Path = rtl::OUString::createFromAscii( "Command2" ); - aCmdURL.Protocol = rtl::OUString::createFromAscii( "vnd.demo.complextoolbarcontrols.demoaddon:" ); + aCmdURL.Path = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Command2")); + aCmdURL.Protocol = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("vnd.demo.complextoolbarcontrols.demoaddon:")); aCmdURL.Complete = aCmdURL.Path + aCmdURL.Protocol; // set the selected item as text into the combobox Sequence< NamedValue > aArgs( 1 ); - aArgs[0].Name = rtl::OUString::createFromAscii( "Text" ); + aArgs[0].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Text")); aArgs[0].Value <<= aText; - SendCommand( aCmdURL, ::rtl::OUString::createFromAscii( "SetText" ), aArgs, sal_True ); + SendCommand( aCmdURL, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SetText")), aArgs, sal_True ); } else if ( !aURL.Path.compareToAscii("Command4" ) ) { @@ -341,15 +342,15 @@ void SAL_CALL BaseDispatch::dispatch( const URL& aURL, const Sequence < Property // just enable this command // set enable flag according to selection - if ( aText.equalsAscii( "Button Disabled" )) + if ( aText.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Button Disabled" ) )) mbButtonEnabled = sal_False; else mbButtonEnabled = sal_True; // create new URL to address the image button URL aCmdURL; - aCmdURL.Path = rtl::OUString::createFromAscii( "Command1" ); - aCmdURL.Protocol = rtl::OUString::createFromAscii( "vnd.demo.complextoolbarcontrols.demoaddon:" ); + aCmdURL.Path = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Command1")); + aCmdURL.Protocol = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("vnd.demo.complextoolbarcontrols.demoaddon:")); aCmdURL.Complete = aCmdURL.Path + aCmdURL.Protocol; // create and initialize FeatureStateEvent with IsEnabled @@ -372,9 +373,9 @@ void SAL_CALL BaseDispatch::dispatch( const URL& aURL, const Sequence < Property void SAL_CALL BaseDispatch::addStatusListener( const Reference< XStatusListener >& xControl, const URL& aURL ) throw (RuntimeException) { - if ( aURL.Protocol.equalsAscii("vnd.demo.complextoolbarcontrols.demoaddon:") ) + if ( aURL.Protocol.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("vnd.demo.complextoolbarcontrols.demoaddon:")) ) { - if ( aURL.Path.equalsAscii("Command1" ) ) + if ( aURL.Path.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("Command1" ) ) ) { // just enable this command ::com::sun::star::frame::FeatureStateEvent aEvent; @@ -385,7 +386,7 @@ void SAL_CALL BaseDispatch::addStatusListener( const Reference< XStatusListener aEvent.State <<= Any(); xControl->statusChanged( aEvent ); } - else if ( aURL.Path.equalsAscii("Command2" ) ) + else if ( aURL.Path.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("Command2" ) ) ) { // just enable this command ::com::sun::star::frame::FeatureStateEvent aEvent; @@ -396,7 +397,7 @@ void SAL_CALL BaseDispatch::addStatusListener( const Reference< XStatusListener aEvent.State <<= Any(); xControl->statusChanged( aEvent ); } - else if ( aURL.Path.equalsAscii("Command3" ) ) + else if ( aURL.Path.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("Command3" ) ) ) { // A toggle dropdown box is normally used for a group of commands // where the user can select the last issued command easily. @@ -405,20 +406,20 @@ void SAL_CALL BaseDispatch::addStatusListener( const Reference< XStatusListener // send command to set context menu content Sequence< rtl::OUString > aContextMenu( 3 ); - aContextMenu[0] = rtl::OUString::createFromAscii( "Command 1" ); - aContextMenu[1] = rtl::OUString::createFromAscii( "Command 2" ); - aContextMenu[2] = rtl::OUString::createFromAscii( "Command 3" ); + aContextMenu[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Command 1")); + aContextMenu[1] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Command 2")); + aContextMenu[2] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Command 3")); - aArgs[0].Name = rtl::OUString::createFromAscii( "List" ); + aArgs[0].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("List")); aArgs[0].Value <<= aContextMenu; - SendCommandTo( xControl, aURL, rtl::OUString::createFromAscii( "SetList" ), aArgs, sal_True ); + SendCommandTo( xControl, aURL, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SetList")), aArgs, sal_True ); // send command to check item on pos=0 aArgs[0].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Pos" )); aArgs[0].Value <<= sal_Int32( 0 ); - SendCommandTo( xControl, aURL, ::rtl::OUString::createFromAscii( "CheckItemPos" ), aArgs, sal_True ); + SendCommandTo( xControl, aURL, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CheckItemPos")), aArgs, sal_True ); } - else if ( aURL.Path.equalsAscii("Command4" ) ) + else if ( aURL.Path.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("Command4" ) ) ) { // A dropdown box is normally used for a group of dependent modes, where // the user can only select one. The modes cannot be combined. @@ -427,12 +428,12 @@ void SAL_CALL BaseDispatch::addStatusListener( const Reference< XStatusListener // send command to set context menu content Sequence< rtl::OUString > aContextMenu( 2 ); - aContextMenu[0] = rtl::OUString::createFromAscii( "Button Enabled" ); - aContextMenu[1] = rtl::OUString::createFromAscii( "Button Disabled" ); + aContextMenu[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Button Enabled")); + aContextMenu[1] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Button Disabled")); - aArgs[0].Name = rtl::OUString::createFromAscii( "List" ); + aArgs[0].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("List")); aArgs[0].Value <<= aContextMenu; - SendCommandTo( xControl, aURL, rtl::OUString::createFromAscii( "SetList" ), aArgs, sal_True ); + SendCommandTo( xControl, aURL, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SetList")), aArgs, sal_True ); // set position according to enable/disable state of button sal_Int32 nPos( mbButtonEnabled ? 0 : 1 ); @@ -440,28 +441,28 @@ void SAL_CALL BaseDispatch::addStatusListener( const Reference< XStatusListener // send command to check item on pos=0 aArgs[0].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Pos" )); aArgs[0].Value <<= nPos; - SendCommandTo( xControl, aURL, ::rtl::OUString::createFromAscii( "CheckItemPos" ), aArgs, sal_True ); + SendCommandTo( xControl, aURL, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CheckItemPos")), aArgs, sal_True ); } - else if ( aURL.Path.equalsAscii("Command5" ) ) + else if ( aURL.Path.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("Command5" ) ) ) { // A spin button Sequence< NamedValue > aArgs( 5 ); // send command to initialize spin button - aArgs[0].Name = rtl::OUString::createFromAscii( "Value" ); + aArgs[0].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Value")); aArgs[0].Value <<= double( 0.0 ); - aArgs[1].Name = rtl::OUString::createFromAscii( "UpperLimit" ); + aArgs[1].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("UpperLimit")); aArgs[1].Value <<= double( 10.0 ); - aArgs[2].Name = rtl::OUString::createFromAscii( "LowerLimit" ); + aArgs[2].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("LowerLimit")); aArgs[2].Value <<= double( 0.0 ); - aArgs[3].Name = rtl::OUString::createFromAscii( "Step" ); + aArgs[3].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Step")); aArgs[3].Value <<= double( 0.1 ); - aArgs[4].Name = rtl::OUString::createFromAscii( "OutputFormat" ); - aArgs[4].Value <<= rtl::OUString::createFromAscii( "%.2f cm" ); + aArgs[4].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("OutputFormat")); + aArgs[4].Value <<= rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("%.2f cm")); - SendCommandTo( xControl, aURL, rtl::OUString::createFromAscii( "SetValues" ), aArgs, sal_True ); + SendCommandTo( xControl, aURL, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SetValues")), aArgs, sal_True ); } - else if ( aURL.Path.equalsAscii("Command7" ) ) + else if ( aURL.Path.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("Command7" ) ) ) { // A dropdown box is normally used for a group of commands // where the user can select one of a defined set. @@ -469,20 +470,20 @@ void SAL_CALL BaseDispatch::addStatusListener( const Reference< XStatusListener // send command to set context menu content Sequence< rtl::OUString > aList( 10 ); - aList[0] = rtl::OUString::createFromAscii( "White" ); - aList[1] = rtl::OUString::createFromAscii( "Black" ); - aList[2] = rtl::OUString::createFromAscii( "Red" ); - aList[3] = rtl::OUString::createFromAscii( "Blue" ); - aList[4] = rtl::OUString::createFromAscii( "Green" ); - aList[5] = rtl::OUString::createFromAscii( "Grey" ); - aList[6] = rtl::OUString::createFromAscii( "Yellow" ); - aList[7] = rtl::OUString::createFromAscii( "Orange" ); - aList[8] = rtl::OUString::createFromAscii( "Brown" ); - aList[9] = rtl::OUString::createFromAscii( "Pink" ); + aList[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("White")); + aList[1] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Black")); + aList[2] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Red")); + aList[3] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Blue")); + aList[4] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Green")); + aList[5] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Grey")); + aList[6] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Yellow")); + aList[7] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Orange")); + aList[8] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Brown")); + aList[9] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Pink")); - aArgs[0].Name = rtl::OUString::createFromAscii( "List" ); + aArgs[0].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("List")); aArgs[0].Value <<= aList; - SendCommandTo( xControl, aURL, rtl::OUString::createFromAscii( "SetList" ), aArgs, sal_True ); + SendCommandTo( xControl, aURL, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SetList")), aArgs, sal_True ); } aListenerHelper.AddListener( mxFrame, xControl, aURL.Path ); @@ -496,13 +497,13 @@ void SAL_CALL BaseDispatch::removeStatusListener( const Reference< XStatusListen void SAL_CALL BaseDispatch::controlEvent( const ControlEvent& Event ) throw (RuntimeException) { - if ( Event.aURL.Protocol.equalsAscii("vnd.demo.complextoolbarcontrols.demoaddon:" )) + if ( Event.aURL.Protocol.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("vnd.demo.complextoolbarcontrols.demoaddon:" ) )) { - if ( Event.aURL.Path.equalsAscii( "Command2" )) + if ( Event.aURL.Path.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Command2" ) )) { // We get notifications whenever the text inside the combobox has been changed. // We store the new text into a member. - if ( Event.Event.equalsAscii( "TextChanged" )) + if ( Event.Event.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "TextChanged" ) )) { rtl::OUString aNewText; sal_Bool bHasText( sal_False ); @@ -537,3 +538,5 @@ BaseDispatch::~BaseDispatch() mxFrame.clear(); mxMSF.clear(); } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/odk/examples/cpp/complextoolbarcontrols/MyProtocolHandler.h b/odk/examples/cpp/complextoolbarcontrols/MyProtocolHandler.h index 4df0ecd3..3ffae431 100644 --- a/odk/examples/cpp/complextoolbarcontrols/MyProtocolHandler.h +++ b/odk/examples/cpp/complextoolbarcontrols/MyProtocolHandler.h @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ #ifndef _MyProtocolHandler_HXX #define _MyProtocolHandler_HXX @@ -139,3 +140,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/odk/examples/cpp/complextoolbarcontrols/WriterListener.cxx b/odk/examples/cpp/complextoolbarcontrols/WriterListener.cxx index e049170e..2d41f12d 100644 --- a/odk/examples/cpp/complextoolbarcontrols/WriterListener.cxx +++ b/odk/examples/cpp/complextoolbarcontrols/WriterListener.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -45,3 +46,4 @@ WriterListener::WriterListener( const ::com::sun::star::uno::Reference< ::com::s } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/odk/examples/cpp/complextoolbarcontrols/exports.cxx b/odk/examples/cpp/complextoolbarcontrols/exports.cxx index c75471a6..769ce984 100644 --- a/odk/examples/cpp/complextoolbarcontrols/exports.cxx +++ b/odk/examples/cpp/complextoolbarcontrols/exports.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -62,30 +63,7 @@ SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(const *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } -// This method not longer necessary since OOo 3.4 where the component registration was -// was changed to passive component registration. For more details see -// http://wiki.services.openoffice.org/wiki/Passive_Component_Registration -//================================================================================================== -// SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo(void* pServiceManager, -// void* pRegistryKey ) -// { -// if (!pRegistryKey) -// return sal_False; - -// try -// { -// css::uno::Reference< css::registry::XRegistryKey > xKey(reinterpret_cast< css::registry::XRegistryKey* >(pRegistryKey), css::uno::UNO_QUERY); - -// writeInfo( xKey, MYLISTENER_IMPLEMENTATIONNAME , MYLISTENER_SERVICENAME ); -// writeInfo( xKey, MYPROTOCOLHANDLER_IMPLEMENTATIONNAME, MYPROTOCOLHANDLER_SERVICENAME ); -// return sal_True; -// } -// catch(const css::registry::InvalidRegistryException&) -// { OSL_ENSURE( sal_False, "### InvalidRegistryException!" ); } - -// return sal_False; -// } //================================================================================================== SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(const sal_Char* pImplName , @@ -102,14 +80,14 @@ SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(const sal_Char* pImplNa if (sImplName.equalsAscii(MYLISTENER_IMPLEMENTATIONNAME)) { css::uno::Sequence< ::rtl::OUString > lNames(1); - lNames[0] = ::rtl::OUString::createFromAscii(MYLISTENER_IMPLEMENTATIONNAME); + lNames[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(MYLISTENER_IMPLEMENTATIONNAME)); xFactory = ::cppu::createSingleFactory(xSMGR, sImplName, MyListener::st_createInstance, lNames); } else if (sImplName.equalsAscii(MYPROTOCOLHANDLER_IMPLEMENTATIONNAME)) { css::uno::Sequence< ::rtl::OUString > lNames(1); - lNames[0] = ::rtl::OUString::createFromAscii(MYPROTOCOLHANDLER_SERVICENAME); + lNames[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(MYPROTOCOLHANDLER_SERVICENAME)); xFactory = ::cppu::createSingleFactory(xSMGR, sImplName, MyProtocolHandler_createInstance, lNames); } @@ -121,3 +99,5 @@ SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(const sal_Char* pImplNa } } // extern C + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/odk/examples/cpp/counter/Makefile b/odk/examples/cpp/counter/Makefile index 161145f7..e74b4722 100644 --- a/odk/examples/cpp/counter/Makefile +++ b/odk/examples/cpp/counter/Makefile @@ -111,13 +111,13 @@ $(SHAREDLIB_OUT)/%.$(SHAREDLIB_EXT) : $(SLOFILES) -$(MKDIR) $(subst /,$(PS),$(OUT_COMP_GEN)) $(LINK) $(COMP_LINK_FLAGS) /OUT:$@ \ /MAP:$(OUT_COMP_GEN)/$(subst $(SHAREDLIB_EXT),map,$(@F)) $(SLOFILES) \ - $(CPPUHELPERLIB) $(CPPULIB) $(SALLIB) $(STLPORTLIB) msvcrt.lib kernel32.lib + $(CPPUHELPERLIB) $(CPPULIB) $(SALLIB) msvcprt.lib msvcrt.lib kernel32.lib $(LINK_MANIFEST) else $(SHAREDLIB_OUT)/%.$(SHAREDLIB_EXT) : $(SLOFILES) -$(MKDIR) $(subst /,$(PS),$(@D)) $(LINK) $(COMP_LINK_FLAGS) $(LINK_LIBS) -o $@ $(SLOFILES) \ - $(CPPUHELPERLIB) $(CPPULIB) $(SALLIB) $(STLPORTLIB) $(STC++LIB) $(CPPUHELPERDYLIB) $(CPPUDYLIB) $(SALDYLIB) + $(CPPUHELPERLIB) $(CPPULIB) $(SALLIB) $(STC++LIB) $(CPPUHELPERDYLIB) $(CPPUDYLIB) $(SALDYLIB) ifeq "$(OS)" "MACOSX" $(INSTALL_NAME_URELIBS) $@ endif @@ -127,11 +127,11 @@ $(OUT_BIN)/countermain$(EXE_EXT) : $(OUT_COMP_OBJ)/countermain.$(OBJ_EXT) $(SHAR ifeq "$(OS)" "WIN" -$(MKDIR) $(subst /,$(PS),$(@D)) $(LINK) $(EXE_LINK_FLAGS) /OUT:$@ /MAP:$(OUT_COMP_GEN)/$(basename $(@F)).map \ - $< $(CPPUHELPERLIB) $(CPPULIB) $(SALHELPERLIB) $(SALLIB) $(STLPORTLIB) + $< $(CPPUHELPERLIB) $(CPPULIB) $(SALHELPERLIB) $(SALLIB) else -$(MKDIR) $(subst /,$(PS),$(@D)) $(LINK) $(EXE_LINK_FLAGS) $(LINK_LIBS) -o $@ $< \ - $(CPPUHELPERLIB) $(CPPULIB) $(SALHELPERLIB) $(SALLIB) $(STLPORTLIB) $(STDC++LIB) + $(CPPUHELPERLIB) $(CPPULIB) $(SALHELPERLIB) $(SALLIB) $(STDC++LIB) endif $(COMP_SERVICES) : diff --git a/odk/examples/cpp/counter/counter.cxx b/odk/examples/cpp/counter/counter.cxx index f13ee41f..752ad11c 100644 --- a/odk/examples/cpp/counter/counter.cxx +++ b/odk/examples/cpp/counter/counter.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * The Contents of this file are made available subject to the terms of @@ -236,3 +237,5 @@ extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(const sal_C return pRet; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/odk/examples/cpp/counter/countermain.cxx b/odk/examples/cpp/counter/countermain.cxx index fce1715f..8eb9f942 100644 --- a/odk/examples/cpp/counter/countermain.cxx +++ b/odk/examples/cpp/counter/countermain.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * The Contents of this file are made available subject to the terms of @@ -100,5 +101,4 @@ SAL_IMPLEMENT_MAIN() exit(1); } - return 0; -} +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/odk/examples/cpp/remoteclient/Makefile b/odk/examples/cpp/remoteclient/Makefile index 96b2ef9b..97b0c3f9 100644 --- a/odk/examples/cpp/remoteclient/Makefile +++ b/odk/examples/cpp/remoteclient/Makefile @@ -84,13 +84,13 @@ $(SHAREDLIB_OUT)/%.$(SHAREDLIB_EXT) : $(SLOFILES) -$(MKDIR) $(subst /,$(PS),$(OUT_COMP_GEN)) $(LINK) $(COMP_LINK_FLAGS) /OUT:$@ \ /MAP:$(OUT_COMP_GEN)/$(subst $(SHAREDLIB_EXT),map,$(@F)) $(SLOFILES) \ - $(CPPUHELPERLIB) $(CPPULIB) $(SALLIB) $(STLPORTLIB) msvcrt.lib kernel32.lib + $(CPPUHELPERLIB) $(CPPULIB) $(SALLIB) msvcprt.lib msvcrt.lib kernel32.lib $(LINK_MANIFEST) else $(SHAREDLIB_OUT)/%.$(SHAREDLIB_EXT) : $(SLOFILES) -$(MKDIR) $(subst /,$(PS),$(@D)) $(LINK) $(COMP_LINK_FLAGS) $(LINK_LIBS) -o $@ $(SLOFILES) \ - $(CPPUHELPERLIB) $(CPPULIB) $(SALLIB) $(STLPORTLIB) $(STC++LIB) $(CPPUHELPERDYLIB) $(CPPUDYLIB) $(SALDYLIB) + $(CPPUHELPERLIB) $(CPPULIB) $(SALLIB) $(STC++LIB) $(CPPUHELPERDYLIB) $(CPPUDYLIB) $(SALDYLIB) ifeq "$(OS)" "MACOSX" $(INSTALL_NAME_URELIBS) $@ endif diff --git a/odk/examples/cpp/remoteclient/remoteclient.cxx b/odk/examples/cpp/remoteclient/remoteclient.cxx index 867c1092..2db24c76 100644 --- a/odk/examples/cpp/remoteclient/remoteclient.cxx +++ b/odk/examples/cpp/remoteclient/remoteclient.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * The Contents of this file are made available subject to the terms of @@ -147,7 +148,7 @@ sal_Int32 PipeClientMain::run( const Sequence< OUString > & aArguments ) throw ( { try { Reference < XInterface > r = - m_xSMgr->createInstance( OUString::createFromAscii( "com.sun.star.bridge.UnoUrlResolver" ) ); + m_xSMgr->createInstance( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.bridge.UnoUrlResolver")) ); Reference < XUnoUrlResolver > rResolver( r , UNO_QUERY ); // connect to the remote process and retrieve the initial object @@ -211,7 +212,7 @@ Sequence< OUString > getSupportedServiceNames() if( !pNames ) { static Sequence< OUString > seqNames(1); - seqNames.getArray()[0] = OUString::createFromAscii( "com.sun.star.bridge.example.RemoteClientSample" ); + seqNames.getArray()[0] = OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.bridge.example.RemoteClientSample")); pNames = &seqNames; } } @@ -234,33 +235,6 @@ SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( } //================================================================================================== -// SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo( -// void * pServiceManager, void * pRegistryKey ) -// { -// if (pRegistryKey) -// { -// try -// { -// Reference< XRegistryKey > xNewKey( -// reinterpret_cast< XRegistryKey * >( pRegistryKey )->createKey( -// OUString::createFromAscii( "/" IMPLEMENTATION_NAME "/UNO/SERVICES" ) ) ); - -// const Sequence< OUString > & rSNL = getSupportedServiceNames(); -// const OUString * pArray = rSNL.getConstArray(); -// for ( sal_Int32 nPos = rSNL.getLength(); nPos--; ) -// xNewKey->createKey( pArray[nPos] ); - -// return sal_True; -// } -// catch (InvalidRegistryException &) -// { -// OSL_ENSURE( sal_False, "### InvalidRegistryException!" ); -// } -// } -// return sal_False; -// } - -//================================================================================================== SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ) { @@ -283,3 +257,5 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( return pRet; } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/odk/examples/java/EmbedDocument/EmbeddedObject/EmbeddedObject.xcu b/odk/examples/java/EmbedDocument/EmbeddedObject/EmbeddedObject.xcu index fd6f7674..fd6f7674 100755..100644 --- a/odk/examples/java/EmbedDocument/EmbeddedObject/EmbeddedObject.xcu +++ b/odk/examples/java/EmbedDocument/EmbeddedObject/EmbeddedObject.xcu diff --git a/odk/examples/java/Inspector/Addon.xcu b/odk/examples/java/Inspector/Addon.xcu index 7989e35d..7989e35d 100755..100644 --- a/odk/examples/java/Inspector/Addon.xcu +++ b/odk/examples/java/Inspector/Addon.xcu diff --git a/odk/examples/java/Inspector/Addons.xcu b/odk/examples/java/Inspector/Addons.xcu index ee44a8d6..ee44a8d6 100755..100644 --- a/odk/examples/java/Inspector/Addons.xcu +++ b/odk/examples/java/Inspector/Addons.xcu diff --git a/odk/examples/java/Inspector/ObjectInspector.xcs b/odk/examples/java/Inspector/ObjectInspector.xcs index 01a35ca1..01a35ca1 100755..100644 --- a/odk/examples/java/Inspector/ObjectInspector.xcs +++ b/odk/examples/java/Inspector/ObjectInspector.xcs diff --git a/odk/examples/java/Inspector/ObjectInspector.xcu b/odk/examples/java/Inspector/ObjectInspector.xcu index 93c2711f..93c2711f 100755..100644 --- a/odk/examples/java/Inspector/ObjectInspector.xcu +++ b/odk/examples/java/Inspector/ObjectInspector.xcu diff --git a/odk/examples/java/Inspector/ProtocolHandler.xcu b/odk/examples/java/Inspector/ProtocolHandler.xcu index 932c0f20..932c0f20 100755..100644 --- a/odk/examples/java/Inspector/ProtocolHandler.xcu +++ b/odk/examples/java/Inspector/ProtocolHandler.xcu diff --git a/odk/examples/java/Inspector/SourceCodeGenerator.java b/odk/examples/java/Inspector/SourceCodeGenerator.java index 932854cd..e8aa20c6 100644 --- a/odk/examples/java/Inspector/SourceCodeGenerator.java +++ b/odk/examples/java/Inspector/SourceCodeGenerator.java @@ -1470,7 +1470,7 @@ class UnoObjectDefinition{ public String getFinalHeaderStatements(){ String sReturn = ""; sReturn += "\nnamespace " + getCSSNameSpaceString() + " = com::sun::star;\n"; - sReturn += "using namespace rtl;\n"; + sReturn += "using ::rtl::OUString;\n"; return sReturn; } diff --git a/odk/examples/java/Inspector/images/containers_16.png b/odk/examples/java/Inspector/images/containers_16.png Binary files differindex 0b4c62f1..0b4c62f1 100755..100644 --- a/odk/examples/java/Inspector/images/containers_16.png +++ b/odk/examples/java/Inspector/images/containers_16.png diff --git a/odk/examples/java/Inspector/images/content_16.png b/odk/examples/java/Inspector/images/content_16.png Binary files differindex 75816926..75816926 100755..100644 --- a/odk/examples/java/Inspector/images/content_16.png +++ b/odk/examples/java/Inspector/images/content_16.png diff --git a/odk/examples/java/Inspector/images/interfaces_16.png b/odk/examples/java/Inspector/images/interfaces_16.png Binary files differindex cf633ac9..cf633ac9 100755..100644 --- a/odk/examples/java/Inspector/images/interfaces_16.png +++ b/odk/examples/java/Inspector/images/interfaces_16.png diff --git a/odk/examples/java/Inspector/images/methods_16.png b/odk/examples/java/Inspector/images/methods_16.png Binary files differindex 25cd8b45..25cd8b45 100755..100644 --- a/odk/examples/java/Inspector/images/methods_16.png +++ b/odk/examples/java/Inspector/images/methods_16.png diff --git a/odk/examples/java/Inspector/images/properties_16.png b/odk/examples/java/Inspector/images/properties_16.png Binary files differindex 4e22dd1d..4e22dd1d 100755..100644 --- a/odk/examples/java/Inspector/images/properties_16.png +++ b/odk/examples/java/Inspector/images/properties_16.png diff --git a/odk/examples/java/Inspector/images/services_16.png b/odk/examples/java/Inspector/images/services_16.png Binary files differindex 024a16ed..024a16ed 100755..100644 --- a/odk/examples/java/Inspector/images/services_16.png +++ b/odk/examples/java/Inspector/images/services_16.png diff --git a/odk/examples/java/ToDo/ToDo.java b/odk/examples/java/ToDo/ToDo.java index 2fee074e..3649dcac 100644 --- a/odk/examples/java/ToDo/ToDo.java +++ b/odk/examples/java/ToDo/ToDo.java @@ -916,7 +916,7 @@ public class ToDo { /** Writing the stack trace from an exception to a string and calling * the method showMessage() with this string. - * @param exception The occured exception. + * @param exception The occurred exception. * @see showMessage */ public void showExceptionMessage( Exception exception ) { diff --git a/odk/inc/pch/precompiled_odk.cxx b/odk/inc/pch/precompiled_odk.cxx index e6e7d31b..1002adaa 100644 --- a/odk/inc/pch/precompiled_odk.cxx +++ b/odk/inc/pch/precompiled_odk.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -27,3 +28,4 @@ #include "precompiled_odk.hxx" +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/odk/inc/pch/precompiled_odk.hxx b/odk/inc/pch/precompiled_odk.hxx index 43e04a61..82f2d4a9 100644 --- a/odk/inc/pch/precompiled_odk.hxx +++ b/odk/inc/pch/precompiled_odk.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -30,3 +31,4 @@ #ifdef PRECOMPILED_HEADERS #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/odk/pack/checkinc/makefile.mk b/odk/pack/checkinc/makefile.mk index 0f7e7c6a..f8c092da 100644 --- a/odk/pack/checkinc/makefile.mk +++ b/odk/pack/checkinc/makefile.mk @@ -43,9 +43,7 @@ $(ODKCHECKFILE) : $(SDK_CONTENT_CHECK_FILES) -diff -br $(DESTDIRINC)$/osl $(SOLARINCDIR)$/osl $(PIPEERROR) $(PERL) $(PRJ)$/util$/checkdiff.pl $(ODKCHECKFILE) -diff -br $(DESTDIRINC)$/rtl $(SOLARINCDIR)$/rtl $(PIPEERROR) $(PERL) $(PRJ)$/util$/checkdiff.pl $(ODKCHECKFILE) -diff -br $(DESTDIRINC)$/sal $(SOLARINCDIR)$/sal $(PIPEERROR) $(PERL) $(PRJ)$/util$/checkdiff.pl $(ODKCHECKFILE) - -diff -br $(DESTDIRINC)$/stl $(SOLARINCDIR)$/stl $(PIPEERROR) $(PERL) $(PRJ)$/util$/checkdiff.pl $(ODKCHECKFILE) -diff -br $(DESTDIRINC)$/store $(SOLARINCDIR)$/store $(PIPEERROR) $(PERL) $(PRJ)$/util$/checkdiff.pl $(ODKCHECKFILE) - -diff -br $(DESTDIRINC)$/vos $(SOLARINCDIR)$/vos $(PIPEERROR) $(PERL) $(PRJ)$/util$/checkdiff.pl $(ODKCHECKFILE) # RAISE AN ERROR WHEN TAG FILE IS NOT THERE ANYMORE cat $(ODKCHECKFILE) .ELSE diff --git a/odk/pack/copying/makefile.mk b/odk/pack/copying/makefile.mk index 02471bd5..0feafee7 100644 --- a/odk/pack/copying/makefile.mk +++ b/odk/pack/copying/makefile.mk @@ -82,14 +82,6 @@ LIBLIST = \ $(DESTDIRLIB)/icppuhelper.lib \ $(DESTDIRLIB)/irmcxt.lib \ $(DESTDIRLIB)/ipurpenvhelper3MSC.lib - -.IF "$(COMEX)"=="8" - LIBLIST += $(DESTDIRLIB)/stlport_vc7.lib -.ELIF "$(COMEX)"=="10" || "$(COMEX)"=="11" || "$(COMEX)"=="12" - LIBLIST += $(DESTDIRLIB)/stlport_vc71.lib -.ELSE - LIBLIST += $(DESTDIRLIB)/stlport_vc6.lib -.ENDIF .ENDIF .IF "$(OS)"=="LINUX" @@ -240,10 +232,6 @@ $(DESTDIRSETTINGS)/dk.mk : dk.mk -$(MKDIRHIER) $(@:d) tr -d "\015" < dk.mk | sed -e 's/@@RELEASE@@/$(PRODUCT_RELEASE)/' -e 's/@@BUILDID@@/$(RSCREVISION)/'> $@ -$(CONVERTTAGFLAG) : $(DOCUHTMLFILES) -# $(PERL) $(CONVERTTAGSCRIPT) 1 "$(TITLE)" "$(OFFICEPRODUCTNAME)" $(DOCUHTMLFILES) - @echo "tags converted" > $@ - $(IDL_DOCU_CLEANUP_FLAG) : $(IDL_CHAPTER_REFS) $(PRJ)/docs/common/ref/idl.css $(DESTIDLLIST) @@-$(MY_DELETE_RECURSIVE) $(DESTDIRGENIDLREF) $(TOUCH) $@ diff --git a/odk/prj/d.lst b/odk/prj/d.lst index 0af13f2f..a9337ad2 100644 --- a/odk/prj/d.lst +++ b/odk/prj/d.lst @@ -1,5 +1,5 @@ -..\%__SRC%\bin\odkcommon.zip %_DEST%\bin%_EXT%\odkcommon.zip +..\%__SRC%\bin\odkcommon.zip %_DEST%\bin\odkcommon.zip -..\%__SRC%\bin\uno_loader_classes.zip %_DEST%\bin%_EXT%\uno_loader_classes.zip +..\%__SRC%\bin\uno_loader_classes.zip %_DEST%\bin\uno_loader_classes.zip -..\%__SRC%\bin\odkexamples.zip %COMMON_DEST%\bin%_EXT%\odkexamples.zip +..\%__SRC%\bin\odkexamples.zip %COMMON_DEST%\bin\odkexamples.zip diff --git a/odk/setsdkenv_unix b/odk/setsdkenv_unix index 31e0200e..6b0dd7c1 100644 --- a/odk/setsdkenv_unix +++ b/odk/setsdkenv_unix @@ -10,7 +10,7 @@ if [ "$OSTYPE" = "Darwin" ] then OO_SDK_NAME=`basename $OO_SDK_HOME` else - OO_SDK_NAME=openoffice.org${OOVERSION}_sdk + OO_SDK_NAME=libreoffice${OOVERSION}_sdk fi export OO_SDK_HOME diff --git a/odk/setsdkenv_unix.csh.in b/odk/setsdkenv_unix.csh.in index ef513d4e..cb2b0f5d 100644 --- a/odk/setsdkenv_unix.csh.in +++ b/odk/setsdkenv_unix.csh.in @@ -8,16 +8,16 @@ setenv OO_SDK_NAME @OO_SDK_NAME@ # Installation directory of the Software Development Kit. -# Example: setenv OO_SDK_HOME /opt/openoffice.org/basis3.0/sdk +# Example: setenv OO_SDK_HOME /opt/libreoffice/basis3.4/sdk setenv OO_SDK_HOME '@OO_SDK_HOME@' # Office installation directory. -# Example: set OFFICE_HOME=/opt/openoffice.org3 +# Example: set OFFICE_HOME=/opt/libreoffice set OFFICE_HOME='@OFFICE_HOME@' OFFICE_BASE_HOME='@OFFICE_BASE_HOME@' # URE installation directory. -# Example: setenv OO_SDK_URE_HOME /opt/openoffice.org/ure +# Example: setenv OO_SDK_URE_HOME /opt/libreoffice/ure setenv OO_SDK_URE_HOME '@OO_SDK_URE_HOME@' # Directory of the make command. @@ -108,7 +108,6 @@ switch (`${OO_SDK_HOME}/config.guess | cut -d"-" -f3,4`) set pltfrm=sunpro set soext=so set exampleout=SOLARISexample.out - set stldebug=_debug # set LD_LIBRARY_PATH if ( $?LD_LIBARY_PATH == 0) then @@ -130,7 +129,6 @@ switch (`${OO_SDK_HOME}/config.guess | cut -d"-" -f3,4`) set soext=so set exampleout=LINUXexample.out set platform=Linux - set stldebug=_stldebug # set LD_LIBRARY_PATH if ( $?LD_LIBARY_PATH == 0) then @@ -152,7 +150,6 @@ switch (`${OO_SDK_HOME}/config.guess | cut -d"-" -f3,4`) set soext=dylib set exampleout=MACOSXexample.out set platform=MacOSX - set stldebug=_stldebug # set DYLD_LIBRARY_PATH if ( $?DYLD_LIBRARY_PATH == 0) then @@ -174,7 +171,6 @@ switch (`${OO_SDK_HOME}/config.guess | cut -d"-" -f3,4`) set soext=so set exampleout=FREEBSDexample.out set platform=FreeBSD - set stldebug=_stldebug # set LD_LIBRARY_PATH if ( $?LD_LIBARY_PATH == 0) then @@ -230,12 +226,6 @@ if ( $?OO_SDK_JAVA_HOME == 0) then setenv PATH ${OO_SDK_JAVA_HOME}:${PATH} endif -if ( -r "${OO_SDK_URE_LIB_DIR}/libstlport_${pltfrm}${stldebug}.${soext}" ) then - setenv STLDEBUG ${stldebug} -else - setenv STLDEBUG "" -endif - if [ "${platform}" == "MacOSX" ] then # For URE, prepare symbolic links for libraries: @@ -249,10 +239,6 @@ if [ "${platform}" == "MacOSX" ] then "${OO_SDK_OUT}/${directoryname}/lib/libuno_salhelper${comid}.${soext}" \ "${OO_SDK_OUT}/${directoryname}/lib/libuno_purpenvhelper${comid}.${soext}" - if ( -e "${OO_SDK_OUT}/${directoryname}/lib/libstlport_${pltfrm}${STLDEBUG}.${soext}" ) then - rm -rf "${OO_SDK_OUT}/${directoryname}/lib/libstlport_${pltfrm}${STLDEBUG}.${soext}" - endif - if ( "${OO_SDK_URE_HOME}" != "" ) then mkdir -p "${OO_SDK_OUT}/${directoryname}/lib" ln -s "${OO_SDK_URE_LIB_DIR}/libuno_cppu.${soext}.3" \ @@ -265,11 +251,6 @@ if [ "${platform}" == "MacOSX" ] then "${OO_SDK_OUT}/${directoryname}/lib/libuno_salhelper${comid}.${soext}" ln -s "${OO_SDK_URE_LIB_DIR}/libuno_purpenvhelper${comid}.${soext}.3" \ "${OO_SDK_OUT}/${directoryname}/lib/libuno_purpenvhelper${comid}.${soext}" - - if ( -r "${OO_SDK_URE_LIB_DIR}/libstlport_${pltfrm}${STLDEBUG}.${soext}" ) then - ln -s "${OO_SDK_URE_LIB_DIR}/libstlport_${pltfrm}${STLDEBUG}.${soext}" \ - "${OO_SDK_OUT}/${directoryname}/lib/libstlport_${pltfrm}${STLDEBUG}.${soext}" - endif endif endif diff --git a/odk/setsdkenv_unix.sh.in b/odk/setsdkenv_unix.sh.in index 96365481..91bf164b 100644 --- a/odk/setsdkenv_unix.sh.in +++ b/odk/setsdkenv_unix.sh.in @@ -9,16 +9,16 @@ OO_SDK_NAME=@OO_SDK_NAME@ export OO_SDK_NAME # Installation directory of the Software Development Kit. -# Example: OO_SDK_HOME=/opt/openoffice.org/basis3.0/sdk +# Example: OO_SDK_HOME=/opt/libreoffice/basis3.4/sdk OO_SDK_HOME='@OO_SDK_HOME@' # Office installation directory. -# Example: OFFICE_HOME=/opt/openoffice.org3 +# Example: OFFICE_HOME=/opt/libreoffice OFFICE_HOME='@OFFICE_HOME@' OFFICE_BASE_HOME='@OFFICE_BASE_HOME@' # URE installation directory. -# Example: OO_SDK_URE_HOME=/opt/openoffice.org/ure +# Example: OO_SDK_URE_HOME=/opt/libreoffice/ure OO_SDK_URE_HOME='@OO_SDK_URE_HOME@' export OO_SDK_URE_HOME @@ -142,7 +142,6 @@ case ${sdk_platform} in pltfrm=sunpro soext=so exampleout=SOLARISexample.out - stldebug=_debug LD_LIBRARY_PATH=${OO_SDK_HOME}/lib:${OO_SDK_OUT}/${exampleout}/lib:${OO_SDK_URE_LIB_DIR}:.:${LD_LIBRARY_PATH} export LD_LIBRARY_PATH ;; @@ -160,7 +159,6 @@ case ${sdk_platform} in soext=dylib exampleout=MACOSXexample.out platform=MacOSX - stldebug=_stldebug DYLD_LIBRARY_PATH=${OO_SDK_OUT}/${directoryname}/lib:${OO_SDK_OUT}/${exampleout}/lib:${OO_SDK_URE_LIB_DIR}:.:${DYLD_LIBRARY_PATH} export DYLD_LIBRARY_PATH ;; @@ -178,7 +176,6 @@ case ${sdk_platform} in soext=so exampleout=LINUXexample.out platform=Linux - stldebug=_stldebug LD_LIBRARY_PATH=${OO_SDK_HOME}/lib:${OO_SDK_OUT}/${exampleout}/lib:${OO_SDK_URE_LIB_DIR}:.:${LD_LIBRARY_PATH} export LD_LIBRARY_PATH ;; @@ -196,7 +193,6 @@ case ${sdk_platform} in soext=so exampleout=FREEBSDexample.out platform=FreeBSD - stldebug=_stldebug LD_LIBRARY_PATH=${OO_SDK_HOME}/lib:${OO_SDK_OUT}/${exampleout}/lib:${OO_SDK_URE_LIB_DIR}:.:${LD_LIBRARY_PATH} export LD_LIBRARY_PATH @@ -272,12 +268,6 @@ fi export PATH -if [ -r "${OO_SDK_URE_LIB_DIR}/libstlport_${pltfrm}${stldebug}.${soext}" ] -then - STLDEBUG=${stldebug} - export STLDEBUG -fi - if [ "${platform}" = "MacOSX" ] then # For URE, prepare symbolic links for libraries: @@ -291,11 +281,6 @@ then "${OO_SDK_OUT}/${directoryname}/lib/libuno_salhelper${comid}.${soext}" \ "${OO_SDK_OUT}/${directoryname}/lib/libuno_purpenvhelper${comid}.${soext}" - if [ -L "${OO_SDK_OUT}/${directoryname}/lib/libstlport_${pltfrm}${STLDEBUG}.${soext}" ] - then - rm -rf "${OO_SDK_OUT}/${directoryname}/lib/libstlport_${pltfrm}${STLDEBUG}.${soext}" - fi - # prepare links if [ "${OO_SDK_URE_HOME}" ] then @@ -310,12 +295,6 @@ then "${OO_SDK_OUT}/${directoryname}/lib/libuno_salhelper${comid}.${soext}" ln -s "${OO_SDK_URE_LIB_DIR}/libuno_purpenvhelper${comid}.${soext}.3" \ "${OO_SDK_OUT}/${directoryname}/lib/libuno_purpenvhelper${comid}.${soext}" - - if [ -r "${OO_SDK_URE_LIB_DIR}/libstlport_${pltfrm}${STLDEBUG}.${soext}" ] - then - ln -s "${OO_SDK_URE_LIB_DIR}/libstlport_${pltfrm}${STLDEBUG}.${soext}" \ - "${OO_SDK_OUT}/${directoryname}/lib/libstlport_${pltfrm}${STLDEBUG}.${soext}" - fi fi fi diff --git a/odk/setsdkenv_windows.template b/odk/setsdkenv_windows.template index 41effdfc..fbe09f91 100755 --- a/odk/setsdkenv_windows.template +++ b/odk/setsdkenv_windows.template @@ -3,22 +3,22 @@ REM This script sets all enviroment variables, which REM are necessary for building the examples of the Office Development Kit. REM The Script was developed for the operating systems Windows. REM The SDK name -REM Example: set OO_SDK_NAME=openoffice3.0_sdk -set OO_SDK_NAME=openoffice.org3.0_sdk +REM Example: set OO_SDK_NAME=libreoffice3.4_sdk +set OO_SDK_NAME=libreoffice3.4_sdk REM Installation directory of the Software Development Kit. -REM Example: set OO_SDK_HOME=C:\Program Files\OpenOffice.org\Basic 3.0\sdk +REM Example: set OO_SDK_HOME=C:\Program Files\LibreOffice 3\Basis\sdk set OO_SDK_HOME= REM Office installation directory. -REM Example: set OFFICE_HOME=C:\Program Files\OpenOffice.org 3 +REM Example: set OFFICE_HOME=C:\Program Files\LibreOffice 3 set OFFICE_HOME= -REM Example: set OFFICE_HOME=C:\Program Files\OpenOffice.org\Basis 3.0 +REM Example: set OFFICE_HOME=C:\Program Files\LibreOffice 3\Basis set OFFICE_BASE_HOME= REM URE installation directory. -REM Example: set OO_SDK_URE_HOME=C:\Program Files\OpenOffice.org\URE +REM Example: set OO_SDK_URE_HOME=C:\Program Files\LibreOffice 3\URE set OO_SDK_URE_HOME= REM Directory of the make command. @@ -45,19 +45,13 @@ REM Example: set OO_SDK_JAVA_HOME=C:\Program Files\Java\jdk1.6.0_05 set OO_SDK_JAVA_HOME= REM Special output directory -REM Example: set OO_SDK_OUT=C:\openoffice.org3.0_sdk +REM Example: set OO_SDK_OUT=C:\Program Files\Libreoffice 3\Basis\sdk set OO_SDK_OUT= REM Automatic deployment REM Example: set SDK_AUTO_DEPLOYMENT=YES set SDK_AUTO_DEPLOYMENT=YES -set STLDEBUG= -REM check stlport lib in 4NT shell -REM if exist "%OO_SDK_HOME%\windows\lib\stlport_vc71_stldebug.lib". ( -REM set STLDEBUG=_stldebug -REM ) - REM Check installation path for the StarOffice Development Kit. if not defined OO_SDK_HOME ( echo Error: the variable OO_SDK_HOME is missing! diff --git a/odk/settings/settings.mk b/odk/settings/settings.mk index 748800b2..bbd18eee 100644 --- a/odk/settings/settings.mk +++ b/odk/settings/settings.mk @@ -72,7 +72,6 @@ CPPUHELPERLIB=icppuhelper.lib SALHELPERLIB=isalhelper.lib REGLIB=ireg.lib STORELIB=istore.lib -STLPORTLIB=stlport_vc71$(STLDEBUG).lib BLANK= EMPTYSTRING= @@ -82,10 +81,8 @@ PATH_SEPARATOR=; CC_FLAGS_JNI=-c -MT -Zm500 -Zc:forScope,wchar_t- -wd4251 -wd4275 -wd4290 -wd4675 -wd4786 -wd4800 -Zc:forScope -GR -EHa CC_FLAGS=-c -MT -Zm500 -Zc:forScope,wchar_t- -wd4251 -wd4275 -wd4290 -wd4675 -wd4786 -wd4800 -Zc:forScope -GR -EHa ifeq "$(CPP_MANIFEST)" "true" -#CC_FLAGS+=-EHa -Zc:wchar_t- LINK_MANIFEST=mt -manifest $@.manifest "-outputresource:$@;2" else -#CC_FLAGS+= LINK_MANIFEST= endif ifeq "$(DEBUG)" "yes" @@ -94,7 +91,6 @@ CC_FLAGS+=-Zi endif CC_INCLUDES=-I. -I$(OUT)/inc -I$(OUT)/inc/examples -I$(PRJ)/include -STL_INCLUDES=-I"$(OO_SDK_HOME)/include/stl" SDK_JAVA_INCLUDES = -I"$(OO_SDK_JAVA_HOME)/include" -I"$(OO_SDK_JAVA_HOME)/include/win32" # define for used compiler necessary for UNO @@ -104,9 +100,9 @@ CC_DEFINES_JNI=-DWIN32 -DWNT -D_DLL -DCPPU_ENV=msci CC_DEFINES=-DWIN32 -DWNT -D_DLL -DCPPU_ENV=msci CC_OUTPUT_SWITCH=-Fo -LIBRARY_LINK_FLAGS=/NODEFAULTLIB /DLL /DEBUGTYPE:cv +LIBRARY_LINK_FLAGS=/MD /DLL /DEBUGTYPE:cv COMP_LINK_FLAGS=$(LIBRARY_LINK_FLAGS) /DEF:$(PRJ)/settings/component.uno.def -EXE_LINK_FLAGS=/MAP /OPT:NOREF /SUBSYSTEM:CONSOLE /BASE:0x1b000000 /DEBUGTYPE:cv /NODEFAULTLIB msvcrt.lib kernel32.lib +EXE_LINK_FLAGS=/MAP /OPT:NOREF /SUBSYSTEM:CONSOLE /BASE:0x1b000000 /DEBUGTYPE:cv /MD msvcrt.lib kernel32.lib ifeq "$(DEBUG)" "yes" LIBRARY_LINK_FLAGS+=/DEBUG EXE_LINK_FLAGS+=/DEBUG @@ -120,7 +116,7 @@ endif # use this for release version #EXE_LINK_FLAGS=/MAP /OPT:NOREF /SUBSYSTEM:CONSOLE /BASE:0x1100000 -#LIBRARY_LINK_FLAGS=/NODEFAULTLIB /DLL +#LIBRARY_LINK_FLAGS=/MD /DLL endif @@ -190,11 +186,6 @@ CPPUHELPERLIB=-luno_cppuhelperC52 SALHELPERLIB=-luno_salhelperC52 REGLIB=-lreg STORELIB=-lstore -ifeq "$(PROCTYPE)" "sparc64" -STLPORTLIB=-library=stlport4 -else -STLPORTLIB=-lstlport_sunpro$(STLDEBUG) -endif EMPTYSTRING= PATH_SEPARATOR=: @@ -206,7 +197,6 @@ CC_FLAGS_JNI+=-g CC_FLAGS+=-g endif CC_INCLUDES=-I. -I$(OUT)/inc -I$(OUT)/inc/examples -I$(PRJ)/include -STL_INCLUDES=-I"$(OO_SDK_HOME)/include/stl" SDK_JAVA_INCLUDES = -I"$(OO_SDK_JAVA_HOME)/include" -I"$(OO_SDK_JAVA_HOME)/include/solaris" # define for used compiler necessary for UNO @@ -256,27 +246,23 @@ PLATFORM=linux PACKAGE_LIB_DIR=linux_$(PROCTYPE).plt UNOPKG_PLATFORM=Linux_$(PROCTYPE) JAVA_PROC_TYPE=$(PROCTYPE) -STLPORT=no ifeq "$(PROCTYPE)" "i386" PACKAGE_LIB_DIR=linux_x86.plt UNOPKG_PLATFORM=Linux_x86 JAVA_PROC_TYPE=i386 -STLPORT=yes endif ifeq "$(PROCTYPE)" "powerpc" PACKAGE_LIB_DIR=linux_powerpc.plt UNOPKG_PLATFORM=Linux_PowerPC JAVA_PROC_TYPE=ppc -STLPORT=yes endif ifeq "$(PROCTYPE)" "sparc" PACKAGE_LIB_DIR=linux_sparc.plt UNOPKG_PLATFORM=Linux_SPARC JAVA_PROC_TYPE=sparc -STLPORT=yes endif ifeq "$(PROCTYPE)" "x86_64" @@ -328,15 +314,6 @@ CPPUHELPERLIB=-luno_cppuhelper$(COMID) SALHELPERLIB=-luno_salhelper$(COMID) REGLIB=-lreg STORELIB=-lstore -ifeq "$(STLPORT)" "yes" -ifeq "$(STLPORT_VER)" "500" -STLPORTLIB=-lstlport -else -STLPORTLIB=-lstlport_gcc$(STLDEBUG) -endif -else -STLPORTLIB= -endif EMPTYSTRING= PATH_SEPARATOR=: @@ -358,7 +335,6 @@ endif SDK_JAVA_INCLUDES = -I"$(OO_SDK_JAVA_HOME)/include" -I"$(OO_SDK_JAVA_HOME)/include/linux" CC_INCLUDES=-I. -I$(OUT)/inc -I$(OUT)/inc/examples -I$(PRJ)/include -STL_INCLUDES=-I"$(OO_SDK_HOME)/include/stl" CC_DEFINES_JNI=-DUNX -DGCC -DLINUX -DCPPU_ENV=$(CPPU_ENV) -DGXX_INCLUDE_PATH=$(SDK_GXX_INCLUDE_PATH) CC_DEFINES=-DUNX -DGCC -DLINUX -DCPPU_ENV=$(CPPU_ENV) -DGXX_INCLUDE_PATH=$(SDK_GXX_INCLUDE_PATH) -DHAVE_GCC_VISIBILITY_FEATURE @@ -376,7 +352,6 @@ endif #COMP_LINK_FLAGS=$(LIBRARY_LINK_FLAGS) -Wl,--version-script,$(PRJ)/settings/component.uno.map COMP_LINK_FLAGS=$(LIBRARY_LINK_FLAGS) -#EXE_LINK_FLAGS=-Wl,--allow-shlib-undefined -Wl,-export-dynamic -Wl,-z,defs -Wl,--whole-archive -lsalcpprt -Wl,--no-whole-archive EXE_LINK_FLAGS=-Wl,--allow-shlib-undefined -Wl,-export-dynamic -Wl,-z,defs -Wl,--no-whole-archive LINK_LIBS=-L"$(OUT)/lib" -L"$(OO_SDK_HOME)/lib" -L"$(OO_SDK_URE_LIB_DIR)" LINK_JAVA_LIBS=-L"$(OO_SDK_JAVA_HOME)/jre/lib/$(JAVA_PROC_TYPE)" @@ -489,7 +464,6 @@ endif SDK_JAVA_INCLUDES = -I/System/Library/Frameworks/JavaVM.framework/Versions/Current/Headers -I/System/Library/Frameworks/JavaVM.framework/Headers CC_INCLUDES=-I. -I$(OUT)/inc -I$(OUT)/inc/examples -I$(PRJ)/include -STL_INCLUDES=-I"$(OO_SDK_HOME)/include/stl" CC_DEFINES_JNI=-DUNX -DGCC -DMACOSX -DCPPU_ENV=$(CPPU_ENV) -DGXX_INCLUDE_PATH=$(SDK_GXX_INCLUDE_PATH) CC_DEFINES=-DUNX -DGCC -DMACOSX -DCPPU_ENV=$(CPPU_ENV) -DGXX_INCLUDE_PATH=$(SDK_GXX_INCLUDE_PATH) -DHAVE_GCC_VISIBILITY_FEATURE @@ -528,9 +502,11 @@ PLATFORM=kfreebsd ifeq "$(PROCTYPE)" "x86_64" PACKAGE_LIB_DIR=kfreebsd_x86_64.plt UNOPKG_PLATFORM=kFreeBSD_x86_64 +STLPORT=no else PACKAGE_LIB_DIR=kfreebsd_x86.plt UNOPKG_PLATFORM=kFreeBSD_x86 +STLPORT=no endif else PLATFORM=freebsd @@ -594,11 +570,10 @@ CPPUHELPERLIB=-luno_cppuhelper$(COMID) SALHELPERLIB=-luno_salhelper$(COMID) REGLIB=-lreg STORELIB=-lstore -ifeq "$(STLPORT_VER)" "500" -STLPORTLIB=-lstlport -else -STLPORTLIB=-lstlport_gcc$(STLDEBUG) +ifeq "$(STLPORT)" "yes" endif +else +STLPORTLIB= EMPTYSTRING= PATH_SEPARATOR=: @@ -616,7 +591,6 @@ endif SDK_JAVA_INCLUDES = -I"$(OO_SDK_JAVA_HOME)/include" -I"$(OO_SDK_JAVA_HOME)/include/freebsd" CC_INCLUDES=-I. -I$(OUT)/inc -I$(OUT)/inc/examples -I$(PRJ)/include -STL_INCLUDES=-I"$(OO_SDK_HOME)/include/stl" CC_DEFINES_JNI=-DUNX -DGCC -DFREEBSD -DCPPU_ENV=$(CPPU_ENV) -DGXX_INCLUDE_PATH=$(SDK_GXX_INCLUDE_PATH) CC_DEFINES=-DUNX -DGCC -DFREEBSD -DCPPU_ENV=$(CPPU_ENV) -DGXX_INCLUDE_PATH=$(SDK_GXX_INCLUDE_PATH) -DHAVE_GCC_VISIBILITY_FEATURE @@ -627,7 +601,6 @@ LIBRARY_LINK_FLAGS=-shared '-Wl,-rpath,$$ORIGIN' COMP_LINK_FLAGS=$(LIBRARY_LINK_FLAGS) EXE_LINK_FLAGS=-Wl,--allow-shlib-undefined -#EXE_LINK_FLAGS+=-Wl,-export-dynamic -Wl,-z,defs LINK_LIBS=-L"$(OUT)/lib" -L"$(OO_SDK_HOME)/lib" -L"$(OO_SDK_URE_LIB_DIR)" $(PTHREAD_LIBS) LINK_JAVA_LIBS=-L"$(OO_SDK_JAVA_HOME)/jre/lib/$(JAVA_PROC_TYPE)" diff --git a/odk/settings/stdtarget.mk b/odk/settings/stdtarget.mk index ba99722d..938ab342 100644 --- a/odk/settings/stdtarget.mk +++ b/odk/settings/stdtarget.mk @@ -10,7 +10,8 @@ endif install: $(REGISTERFLAG) $(SDKTYPEFLAG): #$(URE_TYPES) $(OFFICE_TYPES) - -$(MKDIR) $(subst /,$(PS),$(@D)) - -$(DEL) $(subst \\,\,$(subst /,$(PS),$(SDKTYPEFLAG))) - $(CPPUMAKER) -Gc -BUCR -O$(OUT_INC) $(URE_TYPES) $(OFFICE_TYPES) - echo flagged > $@ +# This is a makefile for a standard Make, so must be TABs below + -$(MKDIR) $(subst /,$(PS),$(@D)) + -$(DEL) $(subst \\,\,$(subst /,$(PS),$(SDKTYPEFLAG))) + $(CPPUMAKER) -Gc -BUCR -O$(OUT_INC) $(URE_TYPES) $(OFFICE_TYPES) + echo flagged > $@ diff --git a/odk/source/com/sun/star/lib/loader/InstallationFinder.java b/odk/source/com/sun/star/lib/loader/InstallationFinder.java index 5f14d8cc..b0903f35 100644 --- a/odk/source/com/sun/star/lib/loader/InstallationFinder.java +++ b/odk/source/com/sun/star/lib/loader/InstallationFinder.java @@ -71,7 +71,7 @@ final class InstallationFinder { private static final String SYSPROP_NAME = "com.sun.star.lib.loader.unopath"; private static final String ENVVAR_NAME = "UNO_PATH"; - private static final String SOFFICE = "soffice"; // Unix/Linux only + private static final String SOFFICE = "libreoffice"; // Unix/Linux only private InstallationFinder() {} // do not instantiate @@ -79,7 +79,7 @@ final class InstallationFinder { * Gets the path of a UNO installation. * * @return the installation path or <code>null</code>, if no installation - * was specified or found, or if an error occured + * was specified or found, or if an error occurred */ public static String getPath() { @@ -140,7 +140,7 @@ final class InstallationFinder { * java -D<property name>=<installation path> -jar application.jar.</p> * * @return the installation path or <code>null</code>, if no installation - * was specified in the Java system property or if an error occured + * was specified in the Java system property or if an error occurred */ private static String getPathFromProperty( String prop ) { @@ -164,7 +164,7 @@ final class InstallationFinder { * Java versions.</p> * * @return the installation path or <code>null</code>, if no installation - * was specified in the environment variable or if an error occured + * was specified in the environment variable or if an error occurred */ private static String getPathFromEnvVar( String var ) { @@ -188,11 +188,11 @@ final class InstallationFinder { * <p>This method is called on the Windows platform only.</p> * * @return the installation path or <code>null</code>, if no installation - * was found or if an error occured + * was found or if an error occurred */ private static String getPathFromWindowsRegistry() { - final String SUBKEYNAME = "Software\\OpenOffice.org\\UNO\\InstallPath"; + final String SUBKEYNAME = "Software\\LibreOffice\\UNO\\InstallPath"; String path = null; @@ -227,7 +227,7 @@ final class InstallationFinder { * Java versions.</p> * * @return the installation path or <code>null</code>, if no installation - * was found or if an error occured + * was found or if an error occurred */ private static String getPathFromPathEnvVar() { @@ -286,7 +286,7 @@ final class InstallationFinder { * is in one of the directories listed in the PATH environment variable.</p> * * @return the installation path or <code>null</code>, if no installation - * was found or if an error occured + * was found or if an error occurred */ private static String getPathFromWhich() { @@ -382,7 +382,7 @@ final class InstallationFinder { * OOo 2.0.</p> * * @return the installation path or <code>null</code>, if no installation - * was found or if an error occured + * was found or if an error occurred */ private static String getPathFromSVersionFile() { diff --git a/odk/source/com/sun/star/lib/loader/Loader.java b/odk/source/com/sun/star/lib/loader/Loader.java index c9589e2e..64bc7819 100644 --- a/odk/source/com/sun/star/lib/loader/Loader.java +++ b/odk/source/com/sun/star/lib/loader/Loader.java @@ -178,7 +178,7 @@ public final class Loader { if ( fJuh.exists() ) { URL[] clurls = new URL[1]; try { - clurls[0] = fJuh.toURL(); + clurls[0] = fJuh.toURI().toURL(); ClassLoader cl = new CustomURLClassLoader( clurls ); Class c = cl.loadClass( "com.sun.star.comp.helper.UnoInfo" ); @@ -237,7 +237,7 @@ public final class Loader { StringTokenizer tokens = new StringTokenizer( data, delimiter ); while ( tokens.hasMoreTokens() ) { try { - urls.add( new File( tokens.nextToken() ).toURL() ); + urls.add( new File( tokens.nextToken() ).toURI().toURL() ); } catch ( MalformedURLException e ) { // don't add this class path entry to the list of class loader // URLs diff --git a/odk/source/unoapploader/unx/makefile.mk b/odk/source/unoapploader/unx/makefile.mk index 56a5024d..4ba98b13 100644 --- a/odk/source/unoapploader/unx/makefile.mk +++ b/odk/source/unoapploader/unx/makefile.mk @@ -43,7 +43,7 @@ LIBSALCPPRT= LINK=$(CC) .ENDIF -.IF "$(OS)"!="FREEBSD" +.IF "$(OS)"!="FREEBSD" && "$(OS)"!="NETBSD" && "$(OS)"!="DRAGONFLY" STDLIB= -ldl .ENDIF diff --git a/odk/source/unoapploader/unx/unoapploader.c b/odk/source/unoapploader/unx/unoapploader.c index 4001e72a..72c6665e 100644 --- a/odk/source/unoapploader/unx/unoapploader.c +++ b/odk/source/unoapploader/unx/unoapploader.c @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -81,8 +82,10 @@ int main( int argc, char *argv[] ) if ( path != NULL ) { -#ifdef MACOSX +#if defined(MACOSX) static const char* ENVVARNAME = "DYLD_LIBRARY_PATH"; +#elif defined(AIX) + static const char* ENVVARNAME = "LIBPATH"; #else static const char* ENVVARNAME = "LD_LIBRARY_PATH"; #endif @@ -143,13 +146,15 @@ int main( int argc, char *argv[] ) libpath = NULL; for (;;) { size_t m; - libpath = realloc(libpath, n); - if (libpath == NULL) { + char * test = realloc(libpath, n); + if (test == NULL) { fprintf( stderr, "Error: out of memory reading unoinfo output!\n"); + free(libpath); exit(EXIT_FAILURE); } + libpath = test; m = fread(libpath + old, 1, n - old - 1, f); if (m != n - old - 1) { if (ferror(f)) { @@ -226,7 +231,7 @@ int main( int argc, char *argv[] ) * Gets the path of a UNO installation. * * @return the installation path or NULL, if no installation was specified or - * found, or if an error occured + * found, or if an error occurred */ char const* getPath() { @@ -250,7 +255,7 @@ char const* getPath() * * @param argv0 specifies the argv[0] parameter of the main function * - * @return the application's executable file name or NULL, if an error occured + * @return the application's executable file name or NULL, if an error occurred */ char* createCommandName( char* argv0 ) { @@ -259,12 +264,14 @@ char* createCommandName( char* argv0 ) char* cmdname = NULL; char* sep = NULL; +#ifndef AIX Dl_info dl_info; - int pos; +#endif /* get the executable file name from argv0 */ prgname = argv0; +#ifndef AIX /* * if argv0 doesn't contain an absolute path name, try to get the absolute * path name from dladdr; note that this only works for Solaris, not for @@ -276,6 +283,7 @@ char* createCommandName( char* argv0 ) { prgname = dl_info.dli_fname; } +#endif /* prefix the executable file name by '_' */ if ( prgname != NULL ) @@ -284,7 +292,7 @@ char* createCommandName( char* argv0 ) sep = strrchr( prgname, SEPARATOR ); if ( sep != NULL ) { - pos = ++sep - prgname; + int pos = ++sep - prgname; strncpy( cmdname, prgname, pos ); cmdname[ pos ] = '\0'; strcat( cmdname, CMDPREFIX ); @@ -299,3 +307,5 @@ char* createCommandName( char* argv0 ) return cmdname; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/odk/source/unoapploader/win/unoapploader.c b/odk/source/unoapploader/win/unoapploader.c index 1a9a31fd..95228a90 100644 --- a/odk/source/unoapploader/win/unoapploader.c +++ b/odk/source/unoapploader/win/unoapploader.c @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -151,13 +152,15 @@ int WINAPI WinMain( HINSTANCE hInstance, HINSTANCE hPrevInstance, CloseHandle(procinfo.hThread); for (;;) { DWORD m; - buf = realloc(buf, n); - if (buf == NULL) { + char * test = realloc(buf, n); + if (test == NULL) { writeError( "Error: out of memory reading unoinfo output!\n"); closeErrorFile(); + free(buf); return 1; } + buf = test; if (!ReadFile(stdoutRead, buf + k, n - k, &m, NULL)) { DWORD err = GetLastError(); @@ -279,7 +282,7 @@ int WINAPI WinMain( HINSTANCE hInstance, HINSTANCE hPrevInstance, * Gets the path of a UNO installation. * * @return the installation path or NULL, if no installation was specified or - * found, or if an error occured + * found, or if an error occurred */ char const* getPath() { @@ -302,7 +305,7 @@ char const* getPath() * the executable name * * @return the command line for the application process or NULL, if an error - * occured + * occurred */ char* createCommandLine( char* appendix ) { @@ -421,3 +424,5 @@ void closeErrorFile() if ( ferr != NULL ) fclose( ferr ); } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/odk/source/unowinreg/win/makefile.mk b/odk/source/unowinreg/win/makefile.mk index 077d8aa6..605848b3 100644 --- a/odk/source/unowinreg/win/makefile.mk +++ b/odk/source/unowinreg/win/makefile.mk @@ -69,7 +69,7 @@ $(BIN)$/unowinreg.dll : unowinreg.cxx .ELSE -$(BIN)$/unowinreg.dll : $(SOLARVERSION)$/$(INPATH)$/bin$(UPDMINOREXT)$/unowinreg.dll +$(BIN)$/unowinreg.dll : $(TARFILE_LOCATION)/185d60944ea767075d27247c3162b3bc-unowinreg.dll @@-rm -f $@ $(GNUCOPY) $< $@ diff --git a/odk/source/unowinreg/win/unowinreg.cxx b/odk/source/unowinreg/win/unowinreg.cxx index 6ac58488..bab1a3f9 100644 --- a/odk/source/unowinreg/win/unowinreg.cxx +++ b/odk/source/unowinreg/win/unowinreg.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -183,3 +184,5 @@ extern "C" JNIEXPORT jboolean JNICALL env->ReleaseLongArrayElements(secDescriptor, (jlong*)psecDescriptor, 0); return ret; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/odk/util/makefile.pmk b/odk/util/makefile.pmk index 39fea488..6e9f2013 100644 --- a/odk/util/makefile.pmk +++ b/odk/util/makefile.pmk @@ -27,8 +27,8 @@ # used for sdk common files PRODUCT_RELEASE=3.4 -OFFICENAME=OpenOffice.org -SDKDIRNAME=openoffice.org$(PRODUCT_RELEASE)_sdk +OFFICENAME=LibreOffice +SDKDIRNAME=libreoffice$(PRODUCT_RELEASE)_sdk OFFICEPRODUCTNAME=$(OFFICENAME) $(PRODUCT_RELEASE) TITLE=$(OFFICENAME) $(PRODUCT_RELEASE) SDK IDLDOCREFNAME="$(OFFICENAME) $(PRODUCT_RELEASE) API" @@ -64,24 +64,16 @@ IDLOUT=$(SOLARIDLDIR) XMLOUT=$(SOLARXMLDIR) LIBOUT=$(SOLARLIBDIR) -CONVERTTAGSCRIPT=$(SOLARENV)/bin/converttags.pl -CONVERTTAGFLAGNAME=converttags_html_files.flag -CONVERTTAGFLAG = $(MISC)/$(CONVERTTAGFLAGNAME) - MY_AUTODOC=$(AUGMENT_LIBRARY_PATH) $(WRAPCMD) $(SOLARBINDIR)/autodoc -.IF "$(OS)"=="FREEBSD" || "$(OS)"=="NETBSD" -MY_COPY=$(GNUCOPY) -MY_COPY_RECURSIVE=$(GNUCOPY) -r -.ELSE -.IF "$(OS)"=="MACOSX" +.IF "$(OS)"=="FREEBSD" || "$(OS)"=="NETBSD" || "$(OS)"=="MACOSX" || \ + "$(OS)"=="AIX" || "$(OS)"=="DRAGONFLY" MY_COPY=$(GNUCOPY) MY_COPY_RECURSIVE=$(GNUCOPY) -r .ELSE MY_COPY=$(GNUCOPY) -u MY_COPY_RECURSIVE=$(GNUCOPY) -urf .ENDIF -.ENDIF MY_DELETE_RECURSIVE=rm -rf MY_TEXTCOPY=@cp @@ -90,8 +82,6 @@ MY_TEXTCOPY=@cp #-------------------- # WNT ONLY #-------------------- -#MY_DELETE_RECURSIVE=+del /sxyf -#MY_TEXTCOPY=cat MY_DLLPREFIX= MY_DLLPOSTFIX=.dll @@ -110,11 +100,6 @@ DESTDIRCLI=$(DESTDIR)/cli .ELSE #-------------------- -# UNX ONLYDESTDIRCPPEXAMPLES=$(DESTDIR)/examples/cpp - -#-------------------- -#MY_DELETE_RECURSIVE=rm -rf -#MY_TEXTCOPY= tr -d "\015" MY_DLLPREFIX=lib .IF "$(OS)"=="MACOSX" @@ -126,56 +111,43 @@ MY_DLLOUT=$(OUT)/lib DLLOUT=$(SOLARLIBDIR) .IF "$(OS)$(CPU)"=="SOLARISS" -############## # SOLARIS SPARC -############## DESTPLATFROM=solsparc .ELIF "$(OS)$(CPU)"=="SOLARISU" -############## # SOLARIS SPARC 64 -############## DESTPLATFROM=solsparc64 .ELIF "$(OS)$(CPU)"=="SOLARISI" -########## # SOLARIS INTEL -########## DESTPLATFROM=solintel .ELIF "$(OS)"=="LINUX" -########### # LINUX -########### DESTPLATFROM=linux .ELIF "$(OS)"=="NETBSD" -########### # NETBSD -########### DESTPLATFROM=netbsd .ELIF "$(OS)"=="FREEBSD" -########### # FREEBSD -########### DESTPLATFROM=freebsd +.ELIF "$(OS)"=="DRAGONFLY" +DESTPLATFROM=dragonfly + .ELIF "$(OS)"=="MACOSX" -########### # MACOSX -########### DESTPLATFROM=macosx -.ENDIF -#DESTDIRBIN=$(DESTDIR)/$(DESTPLATFROM)/bin -#DESTDIRLIB=$(DESTDIR)/$(DESTPLATFROM)/lib -#DESTDIRDLL=$(DESTDIRLIB) +.ELIF "$(OS)"=="AIX" +# MACOSX +DESTPLATFROM=aix .ENDIF -#MY_TEXTCOPY_SOURCEPRE=< -#MY_TEXTCOPY_TARGETPRE=> +.ENDIF INCLUDETOPDIRLIST= \ @@ -188,8 +160,7 @@ INCLUDETOPDIRLIST= \ $(INCOUT)/uno \ $(INCOUT)/cppu \ $(INCOUT)/cppuhelper \ - $(INCOUT)/registry \ - $(INCOUT)/stl + $(INCOUT)/registry .IF "$(GUI)"=="WNT" INCLUDETOPDIRLIST += $(INCOUT)/systools diff --git a/odk/util/odk_rules.pmk b/odk/util/odk_rules.pmk index bb626640..b28e28c6 100644 --- a/odk/util/odk_rules.pmk +++ b/odk/util/odk_rules.pmk @@ -88,11 +88,7 @@ $(DESTDIR)/cfgWin.js : $(PRJ)/cfgWin.js $(DESTDIRSETTINGS)/%.mk : $(PRJ)/settings/%.mk @@-rm -f $@ -.IF "$(COMEX)"=="7" - $(MY_TEXTCOPY) $< | $(SED) -e 's/stlport_vc7/stlport_vc6/' $@ -.ELSE $(MY_TEXTCOPY) $< $@ -.ENDIF $(DESTDIRXML)/module-description.dtd : $(XMLOUT)/module-description.dtd @@-rm -f $@ @@ -141,7 +137,6 @@ $(DESTDIRJAR)/com/sun/star/lib/loader/%.class : $(CLASSDIR)/com/sun/star/lib/loa $(DESTDIRIDL)/% : $(IDLOUT)/% $(MY_TEXTCOPY) $< $@ -# @touch $(IDL_DOCU_CLEANUP_FLAG) $(DESTDIRINC)/udkversion.mk : @@-rm -f $@ diff --git a/udm/inc/udm/html/htmlitem.hxx b/udm/inc/udm/html/htmlitem.hxx index 43f85d53..932e11ef 100644 --- a/udm/inc/udm/html/htmlitem.hxx +++ b/udm/inc/udm/html/htmlitem.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -406,3 +407,4 @@ namespace Html = csi::html; #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/udm/inc/udm/xml/xmlitem.hxx b/udm/inc/udm/xml/xmlitem.hxx index 69d4ce97..fbb76189 100644 --- a/udm/inc/udm/xml/xmlitem.hxx +++ b/udm/inc/udm/xml/xmlitem.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -385,3 +386,5 @@ Element::SetContent( DYN Item * let_dpItem ) } // namespace csi #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/udm/prj/d.lst b/udm/prj/d.lst index 150256da..5dfe7a13 100644 --- a/udm/prj/d.lst +++ b/udm/prj/d.lst @@ -1,9 +1,9 @@ -mkdir: %_DEST%\inc%_EXT%\udm -mkdir: %_DEST%\inc%_EXT%\udm\html -mkdir: %_DEST%\inc%_EXT%\udm\xml +mkdir: %_DEST%\inc\udm +mkdir: %_DEST%\inc\udm\html +mkdir: %_DEST%\inc\udm\xml -..\%__SRC%\lib\udm.lib %_DEST%\lib%_EXT%\udm.lib -..\%__SRC%\lib\libudm.a %_DEST%\lib%_EXT%\libudm.a -..\inc\udm\html\*.hxx %_DEST%\inc%_EXT%\udm\html\*.hxx -..\inc\udm\xml\*.hxx %_DEST%\inc%_EXT%\udm\xml\*.hxx +..\%__SRC%\lib\udm.lib %_DEST%\lib\udm.lib +..\%__SRC%\lib\libudm.a %_DEST%\lib\libudm.a +..\inc\udm\html\*.hxx %_DEST%\inc\udm\html\*.hxx +..\inc\udm\xml\*.hxx %_DEST%\inc\udm\xml\*.hxx diff --git a/udm/source/html/htmlitem.cxx b/udm/source/html/htmlitem.cxx index f090aa3b..057b50f9 100644 --- a/udm/source/html/htmlitem.cxx +++ b/udm/source/html/htmlitem.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -241,3 +242,5 @@ SimpleList::LineBreakAfterBeginTag() const } // namespace html } // namespace csi + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/udm/source/inc/precomp.h b/udm/source/inc/precomp.h index 6d086b69..98288a71 100644 --- a/udm/source/inc/precomp.h +++ b/udm/source/inc/precomp.h @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -64,3 +65,5 @@ Flush() { return csv::Flush; } #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/udm/source/unittest/makefile.mk b/udm/source/unittest/makefile.mk deleted file mode 100644 index deba241f..00000000 --- a/udm/source/unittest/makefile.mk +++ /dev/null @@ -1,77 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/.. - -PRJNAME=cosv -TARGET=udm_unittest -TARGETTYPE=CUI - -# --- Settings ----------------------------------------------------- - -ENABLE_EXCEPTIONS=true -PRJINC=$(PRJ)$/source - -.INCLUDE : settings.mk -.INCLUDE : static.mk - -.INCLUDE : $(PRJ)$/source$/mkinc$/fullcpp.mk - - - - -# --- Files -------------------------------------------------------- - -OBJFILES= \ - $(OBJ)$/test.obj - - - - -APP1TARGET= $(TARGET) -APP1STACK= 1000000 -APP1OBJS= $(OBJ)$/test.obj - -.IF "$(COMEX)"=="10" -APP1STDLIBS= $(STATIC_LIBS) cosv.lib -.ELSE -APP1STDLIBS= $(STATIC_LIBS) msvcirt.lib cosv.lib -.ENDIF - - -APP1LIBS= $(LB)$/$(TARGET).lib - - -APP1DEPN= $(LB)$/$(TARGET).lib $(L)$/cosv.lib - - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk - - - diff --git a/udm/source/unittest/test.cxx b/udm/source/unittest/test.cxx deleted file mode 100644 index d6092137..00000000 --- a/udm/source/unittest/test.cxx +++ /dev/null @@ -1,112 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#include <precomp.h> - - -// NOT FULLY DEFINED SERVICES -#include <udm/integer_i.hxx> -#include <udm/string_i.hxx> - -using namespace udm; - -// TypeSystem aTypeSys; - - -class Function -{ - public: - - intt nId; -}; - -class Ctor : public Function -{ - public: - - csv::String sClassName; -}; - -class Method : public Function -{ - public: - - csv::String sFunctionName; - std::vector< std::pair< intt, String > > - aParameters; -}; - - -class PrObj -{ - public: - intt nId; - csv::String sName; - std::vector< PrObj* > - aMethods; - std::vector< PrObj* > - aData; -}; - - - - -void fx() -{ - intt n = 5; - Dyn<Integer_i> px = new Integer_i(n); - Integer & x = *px; - - csv::String s; - Dyn<String_i> ps = new String_i(s); - String & xs = *ps; - - xs = "Hallo"; - - int dev01 = 2; - - xs = csv::String("Haha"); - - dev01 = 2; - - csv::String s2 = xs; - - - dev01 = 2; - -// const char * pc = xs; - - - intt a = x; - x = 15; - - Cout() << a << " " << x << Endl(); // Must be: 5 15 -} - - - - diff --git a/udm/source/xml/xmlitem.cxx b/udm/source/xml/xmlitem.cxx index 419c14c9..78143a79 100644 --- a/udm/source/xml/xmlitem.cxx +++ b/udm/source/xml/xmlitem.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -612,3 +613,5 @@ StreamOut( Dyn< Item > & o_rContent, } // namespace xml } // namespace csi + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/unodevtools/inc/unodevtools/options.hxx b/unodevtools/inc/unodevtools/options.hxx index 5207ae35..6457d3bb 100644 --- a/unodevtools/inc/unodevtools/options.hxx +++ b/unodevtools/inc/unodevtools/options.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -48,3 +49,5 @@ sal_Bool readOption( sal_Bool * pbOpt, const sal_Char * pOpt, } // end of namespace unodevtools #endif // INCLUDED_UNODEVTOOLS_OPTIONS_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/unodevtools/inc/unodevtools/typemanager.hxx b/unodevtools/inc/unodevtools/typemanager.hxx index c8e14cb5..d2f019e6 100644 --- a/unodevtools/inc/unodevtools/typemanager.hxx +++ b/unodevtools/inc/unodevtools/typemanager.hxx @@ -1,7 +1,8 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -31,31 +32,20 @@ #include <codemaker/typemanager.hxx> #include <com/sun/star/container/XHierarchicalNameAccess.hpp> -#include <hash_map> +#include <boost/unordered_map.hpp> #include <vector> class RegistryKey; namespace typereg { class Reader; } -#if defined( _MSC_VER ) && ( _MSC_VER < 1200 ) -typedef ::std::__hash_map__ -< - ::rtl::OString, // Typename - RTTypeClass, // TypeClass - HashString, - EqualString, - NewAlloc -> T2TypeClassMap; -#else -typedef ::std::hash_map -< +typedef boost::unordered_map +< ::rtl::OString, // Typename RTTypeClass, // TypeClass - HashString, + HashString, EqualString -> T2TypeClassMap; -#endif +> T2TypeClassMap; namespace unodevtools { @@ -66,7 +56,7 @@ struct UnoTypeManagerImpl T2TypeClassMap m_t2TypeClass; ::com::sun::star::uno::Reference< ::com::sun::star::container::XHierarchicalNameAccess> m_tdmgr; -}; +}; class UnoTypeManager : public TypeManager { @@ -98,3 +88,5 @@ protected: } #endif // _UNODEVTOOLS_TYPEMANAGER_HXX_ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/unodevtools/prj/d.lst b/unodevtools/prj/d.lst index 0060b6b9..f4be609e 100644 --- a/unodevtools/prj/d.lst +++ b/unodevtools/prj/d.lst @@ -1,5 +1,5 @@ -..\%__SRC%\bin\uno-skeletonmaker.exe %_DEST%\bin%_EXT%\uno-skeletonmaker.exe -..\%__SRC%\bin\uno-skeletonmaker.pdb %_DEST%\bin%_EXT%\uno-skeletonmaker.pdb +..\%__SRC%\bin\uno-skeletonmaker.exe %_DEST%\bin\uno-skeletonmaker.exe +..\%__SRC%\bin\uno-skeletonmaker.pdb %_DEST%\bin\uno-skeletonmaker.pdb -..\%__SRC%\bin\uno-skeletonmaker %_DEST%\bin%_EXT%\uno-skeletonmaker +..\%__SRC%\bin\uno-skeletonmaker %_DEST%\bin\uno-skeletonmaker diff --git a/unodevtools/source/skeletonmaker/cppcompskeleton.cxx b/unodevtools/source/skeletonmaker/cppcompskeleton.cxx index 4577c887..f20fa495 100644 --- a/unodevtools/source/skeletonmaker/cppcompskeleton.cxx +++ b/unodevtools/source/skeletonmaker/cppcompskeleton.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -38,7 +39,7 @@ using namespace ::codemaker::cpp; namespace skeletonmaker { namespace cpp { void generateIncludes(std::ostream & o, - const std::hash_set< OString, OStringHash >& interfaces, + const boost::unordered_set< OString, OStringHash >& interfaces, const AttributeInfo& /*properties*/, OString propertyhelper, bool serviceobject, bool supportxcomponent) @@ -64,13 +65,13 @@ void generateIncludes(std::ostream & o, o << "#include \"cppuhelper/propertysetmixin.hxx\"\n"; } - std::hash_set< OString, OStringHash >::const_iterator iter = interfaces.begin(); + boost::unordered_set< OString, OStringHash >::const_iterator iter = interfaces.begin(); while (iter != interfaces.end()) { o << "#include \"" << ((*iter).replace('.', '/').getStr()) << ".hpp\"\n"; - iter++; + ++iter; } } @@ -147,7 +148,7 @@ OString generateCompHelperDeclaration(std::ostream & o, void generateCompHelperDefinition(std::ostream & o, const OString & implname, const OString & classname, - const std::hash_set< OString, OStringHash >& services) + const boost::unordered_set< OString, OStringHash >& services) { OString nm; short nbrackets = generateNamespace(o, implname, true, nm); @@ -160,14 +161,14 @@ void generateCompHelperDefinition(std::ostream & o, "_getSupportedServiceNames()\n{\n css::uno::Sequence< " << "::rtl::OUString >" << " s(" << services.size() << ");\n"; - std::hash_set< OString, OStringHash >::const_iterator iter = services.begin(); + boost::unordered_set< OString, OStringHash >::const_iterator iter = services.begin(); short i=0; while (iter != services.end()) { o << " s[" << i++ << "] = ::rtl::OUString(" << "RTL_CONSTASCII_USTRINGPARAM(\n \"" << (*iter).replace('/','.') << "\"));\n"; - iter++; + ++iter; } o << " return s;\n}\n\n"; @@ -193,11 +194,11 @@ void generateCompFunctions(std::ostream & o, const OString & nmspace) << " &::cppu::createSingleComponentFactory, 0, 0 },\n" << " { 0, 0, 0, 0, 0, 0 }\n};\n\n"; - o << "extern \"C\" void SAL_CALL component_getImplementationEnvironment(\n" + o << "extern \"C\" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(\n" << " const char ** envTypeName, uno_Environment **)\n{\n" << " *envTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;\n}\n\n"; - o << "extern \"C\" void * SAL_CALL component_getFactory(\n" + o << "extern \"C\" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(\n" << " const char * implName, void * serviceManager, void * registryKey)\n{\n" << " return ::cppu::component_getFactoryHelper(\n" << " implName, serviceManager, registryKey, entries);\n}\n\n"; @@ -448,7 +449,7 @@ void generateXDispatch(std::ostream& o, } o << " }\n"; - iter++; + ++iter; } o << "}\n\n"; @@ -492,7 +493,7 @@ void generateXDispatchProvider(std::ostream& o, } o << " }\n"; - iter++; + ++iter; } o << " return xRet;\n}\n\n"; @@ -514,7 +515,7 @@ void generateXDispatchProvider(std::ostream& o, void generateAddinConstructorAndHelper(std::ostream& o, ProgramOptions const & options, TypeManager const & manager, const OString & classname, - const std::hash_set< OString, OStringHash >& interfaces) + const boost::unordered_set< OString, OStringHash >& interfaces) { o << classname << "::" << classname << "(css::uno::Reference< css::uno::XComponentContext > const & context) :\n" @@ -535,13 +536,13 @@ void generateAddinConstructorAndHelper(std::ostream& o, " RTL_CONSTASCII_USTRINGPARAM(\n" " \"com.sun.star.configuration.ConfigurationAccess\"));\n\n"; - o << " ::rtl::OUStringBuffer sPath(::rtl::OUString::createFromAscii(\n" - " \"/org.openoffice.Office.CalcAddIns/AddInInfo/\"));\n" + o << " ::rtl::OUStringBuffer sPath(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(\n" + " \"/org.openoffice.Office.CalcAddIns/AddInInfo/\")));\n" " sPath.appendAscii(sADDIN_SERVICENAME);\n" " sPath.appendAscii(\"/AddInFunctions\");\n\n" " // create arguments: nodepath\n" " css::beans::PropertyValue aArgument;\n" - " aArgument.Name = ::rtl::OUString::createFromAscii(\"nodepath\");\n" + " aArgument.Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(\"nodepath\"));\n" " aArgument.Value <<= sPath.makeStringAndClear();\n\n" " css::uno::Sequence< css::uno::Any > aArguments(1);\n" " aArguments[0] <<= aArgument;\n\n"; @@ -556,8 +557,8 @@ void generateAddinConstructorAndHelper(std::ostream& o, o << " // extend arguments to create a view for all locales to get " "simple\n // access to the compatibilityname property\n" - " aArgument.Name = ::rtl::OUString::createFromAscii(\"locale\");\n" - " aArgument.Value <<= ::rtl::OUString::createFromAscii(\"*\");\n" + " aArgument.Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(\"locale\"));\n" + " aArgument.Value <<= ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(\"*\"));\n" " aArguments.realloc(2);\n" " aArguments[1] <<= aArgument;\n\n" " // create view for all locales\n" @@ -581,7 +582,7 @@ void generateAddinConstructorAndHelper(std::ostream& o, " m_xHAccess->getByHierarchicalName(\n" " buf.makeStringAndClear()), css::uno::UNO_QUERY);\n" " xPropSet->getPropertyValue(\n " - "::rtl::OUString::createFromAscii(propName)) >>= ret;\n }\n" + "::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(propName))) >>= ret;\n }\n" " catch ( css::uno::RuntimeException & e ) {\n throw e;\n }\n" " catch ( css::uno::Exception & ) {\n }\n return ret;\n"; } @@ -634,10 +635,10 @@ OString generateClassDefinition(std::ostream& o, ProgramOptions const & options, TypeManager const & manager, OString const & classname, - std::hash_set< OString, OStringHash > const & interfaces, + boost::unordered_set< OString, OStringHash > const & interfaces, AttributeInfo const & properties, AttributeInfo const & attributes, - std::hash_set< OString, OStringHash > const & propinterfaces, + boost::unordered_set< OString, OStringHash > const & propinterfaces, OString const & propertyhelper, bool supportxcomponent) { OStringBuffer parentname(64); @@ -656,12 +657,12 @@ OString generateClassDefinition(std::ostream& o, o << " public ::cppu::WeakImplHelper" << interfaces.size() << "<"; } - std::hash_set< OString, OStringHash >::const_iterator iter = + boost::unordered_set< OString, OStringHash >::const_iterator iter = interfaces.begin(); while (iter != interfaces.end()) { o << "\n " << scopedCppName(*iter, false, true); - iter++; + ++iter; if (iter != interfaces.end()) o << ","; else @@ -697,12 +698,12 @@ OString generateClassDefinition(std::ostream& o, OStringBuffer buffer(256); buffer.append(parentname); buffer.append("< "); - std::hash_set< OString, OStringHash >::const_iterator iter = + boost::unordered_set< OString, OStringHash >::const_iterator iter = interfaces.begin(); while (iter != interfaces.end()) { buffer.append(scopedCppName(*iter, false, true)); - iter++; + ++iter; if (iter != interfaces.end()) buffer.append(", "); else @@ -715,7 +716,7 @@ OString generateClassDefinition(std::ostream& o, << parent << "::release(); }\n\n"; } - std::hash_set< OString, OStringHash >::const_iterator it = + boost::unordered_set< OString, OStringHash >::const_iterator it = interfaces.begin(); codemaker::GeneratedTypeSet generated; while (it != interfaces.end()) @@ -723,7 +724,7 @@ OString generateClassDefinition(std::ostream& o, typereg::Reader reader(manager.getTypeReader((*it).replace('.','/'))); printMethods(o, options, manager, reader, generated, "", "", " ", true, propertyhelper); - it++; + ++it; } o << "private:\n " << classname << "(const " << classname << " &); // not defined\n" @@ -732,9 +733,9 @@ OString generateClassDefinition(std::ostream& o, << " virtual ~" << classname << "() {}\n\n"; if (options.componenttype == 2) { - o << " typedef std::hash_map< ::sal_Int32, rtl::OUString, " - "std::hash<::sal_Int32> > ParamMap;\n" - " typedef std::hash_map< rtl::OUString, ParamMap, " + o << " typedef boost::unordered_map< ::sal_Int32, rtl::OUString, " + "boost::hash<::sal_Int32> > ParamMap;\n" + " typedef boost::unordered_map< rtl::OUString, ParamMap, " "rtl::OUStringHash > FunctionMap;\n\n" " ::rtl::OUString SAL_CALL getAddinProperty(const ::rtl::OUString & " "funcName, const ::rtl::OUString & paramName, const char * propName) " @@ -809,11 +810,11 @@ OString generateClassDefinition(std::ostream& o, << "(css::uno::Reference< css::uno::XComponentContext > const & context) :\n"; if (supportxcomponent) { o << " ::cppu::WeakComponentImplHelper" << interfaces.size() << "<"; - std::hash_set< OString, OStringHash >::const_iterator iter = + boost::unordered_set< OString, OStringHash >::const_iterator iter = interfaces.begin(); while (iter != interfaces.end()) { o << "\n " << scopedCppName(*iter, false, true); - iter++; + ++iter; if (iter != interfaces.end()) o << ","; else @@ -896,13 +897,13 @@ void generateXServiceInfoBodies(std::ostream& o, void generateMethodBodies(std::ostream& o, ProgramOptions const & options, TypeManager const & manager, - std::hash_set< OString, OStringHash > const & interfaces, + boost::unordered_set< OString, OStringHash > const & interfaces, OString const & classname, OString const & comphelpernamespace, OString const & propertyhelper) { OString name(classname.concat("::")); - std::hash_set< OString, OStringHash >::const_iterator iter = + boost::unordered_set< OString, OStringHash >::const_iterator iter = interfaces.begin(); codemaker::GeneratedTypeSet generated; while (iter != interfaces.end()) { @@ -914,14 +915,14 @@ void generateMethodBodies(std::ostream& o, printMethods(o, options, manager, reader, generated, "_", name, "", true, propertyhelper); } - iter++; + ++iter; } } void generateQueryInterface(std::ostream& o, ProgramOptions const & options, TypeManager const & manager, - const std::hash_set< OString, OStringHash >& interfaces, + const boost::unordered_set< OString, OStringHash >& interfaces, OString const & parentname, OString const & classname, OString const & propertyhelper) @@ -939,12 +940,12 @@ void generateQueryInterface(std::ostream& o, o << "css::uno::Any a("; o << parentname << "<"; - std::hash_set< OString, OStringHash >::const_iterator iter = + boost::unordered_set< OString, OStringHash >::const_iterator iter = interfaces.begin(); while (iter != interfaces.end()) { o << "\n " << scopedCppName(*iter, false, true); - iter++; + ++iter; if (iter != interfaces.end()) o << ","; else @@ -979,18 +980,18 @@ void generateSkeleton(ProgramOptions const & options, return; } - std::hash_set< OString, OStringHash > interfaces; - std::hash_set< OString, OStringHash > services; + boost::unordered_set< OString, OStringHash > interfaces; + boost::unordered_set< OString, OStringHash > services; AttributeInfo properties; AttributeInfo attributes; - std::hash_set< OString, OStringHash > propinterfaces; + boost::unordered_set< OString, OStringHash > propinterfaces; bool serviceobject = false; bool supportxcomponent = false; std::vector< OString >::const_iterator iter = types.begin(); while (iter != types.end()) { checkType(manager, *iter, interfaces, services, properties); - iter++; + ++iter; } if (options.componenttype == 3) { @@ -1112,11 +1113,11 @@ void generateCalcAddin(ProgramOptions const & options, TypeManager const & manager, std::vector< OString > const & types) { - std::hash_set< OString, OStringHash > interfaces; - std::hash_set< OString, OStringHash > services; + boost::unordered_set< OString, OStringHash > interfaces; + boost::unordered_set< OString, OStringHash > services; AttributeInfo properties; AttributeInfo attributes; - std::hash_set< OString, OStringHash > propinterfaces; + boost::unordered_set< OString, OStringHash > propinterfaces; bool serviceobject = false; bool supportxcomponent = false; @@ -1124,7 +1125,7 @@ void generateCalcAddin(ProgramOptions const & options, std::vector< OString >::const_iterator iter = types.begin(); while (iter != types.end()) { checkType(manager, *iter, interfaces, services, properties); - iter++; + ++iter; } OString sAddinService; @@ -1136,7 +1137,7 @@ void generateCalcAddin(ProgramOptions const & options, // get the one and only add-in service for later use - std::hash_set< OString, OStringHash >::const_iterator iter2 = services.begin(); + boost::unordered_set< OString, OStringHash >::const_iterator iter2 = services.begin(); sAddinService = (*iter2).replace('/', '.'); if (sAddinService.equals("com.sun.star.sheet.AddIn")) { sAddinService = (*(++iter2)).replace('/', '.'); @@ -1203,7 +1204,7 @@ void generateCalcAddin(ProgramOptions const & options, "#include \"com/sun/star/container/XNameAccess.hpp\"\n" "#include \"com/sun/star/container/XHierarchicalNameAccess.hpp\"\n\n" "#include \"rtl/ustrbuf.hxx\"\n\n" - "#include <hash_map>\n" + "#include <boost/unordered_map.hpp>\n" "#include <set>\n"; // namespace @@ -1275,3 +1276,4 @@ void generateCalcAddin(ProgramOptions const & options, } } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/unodevtools/source/skeletonmaker/cpptypemaker.cxx b/unodevtools/source/skeletonmaker/cpptypemaker.cxx index 4a958564..08e4e657 100644 --- a/unodevtools/source/skeletonmaker/cpptypemaker.cxx +++ b/unodevtools/source/skeletonmaker/cpptypemaker.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -419,8 +420,8 @@ void printMethods(std::ostream & o, o << "// ::com::sun::star::lang::XServiceName:\n" "::rtl::OUString SAL_CALL " << classname << "getServiceName() " "throw (css::uno::RuntimeException)\n{\n " - "return ::rtl::OUString::createFromAscii(" - "sADDIN_SERVICENAME);\n}\n"; + "return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" + "sADDIN_SERVICENAME));\n}\n"; generated.add(type); return; } else if (type.equals("com/sun/star/sheet/XAddIn")) { @@ -969,3 +970,4 @@ void generateDocumentation(std::ostream & o, } } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/unodevtools/source/skeletonmaker/javacompskeleton.cxx b/unodevtools/source/skeletonmaker/javacompskeleton.cxx index 79eb6cf9..4a08a612 100644 --- a/unodevtools/source/skeletonmaker/javacompskeleton.cxx +++ b/unodevtools/source/skeletonmaker/javacompskeleton.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -45,7 +46,7 @@ void generatePackage(std::ostream & o, const OString & implname) } void generateImports(std::ostream & o, ProgramOptions const & options, - const std::hash_set< OString, OStringHash >& /*interfaces*/, + const boost::unordered_set< OString, OStringHash >& /*interfaces*/, const OString & propertyhelper, bool serviceobject, bool supportxcomponent) { @@ -79,7 +80,7 @@ void generateImports(std::ostream & o, ProgramOptions const & options, } -// std::hash_set< OString, OStringHash >::const_iterator iter = +// boost::unordered_set< OString, OStringHash >::const_iterator iter = // interfaces.begin(); // while (iter != interfaces.end()) // { @@ -466,7 +467,7 @@ void generateXDispatchBodies(std::ostream& o, ProgramOptions const & options) } o << " }\n"; - iter++; + ++iter; } o << " }\n\n"; @@ -502,7 +503,7 @@ void generateXDispatchProviderBodies(std::ostream& o, ProgramOptions const & opt } o << " }\n"; - iter++; + ++iter; } o << " return null;\n }\n\n"; @@ -523,15 +524,15 @@ void generateXDispatchProviderBodies(std::ostream& o, ProgramOptions const & opt void generateMethodBodies(std::ostream& o, ProgramOptions const & options, TypeManager const & manager, - const std::hash_set< OString, OStringHash >& interfaces, + const boost::unordered_set< OString, OStringHash >& interfaces, const OString& indentation, bool usepropertymixin) { - std::hash_set< OString, OStringHash >::const_iterator iter = + boost::unordered_set< OString, OStringHash >::const_iterator iter = interfaces.begin(); codemaker::GeneratedTypeSet generated; while (iter != interfaces.end()) { OString type(*iter); - iter++; + ++iter; if (type.equals("com.sun.star.lang.XServiceInfo")) { generateXServiceInfoBodies(o); generated.add(type); @@ -595,8 +596,8 @@ static const char* propcomment= void generateAddinConstructorAndHelper(std::ostream& o, ProgramOptions const & options, TypeManager const & manager, const OString & classname, - const std::hash_set< OString, OStringHash >& services, - const std::hash_set< OString, OStringHash >& interfaces) + const boost::unordered_set< OString, OStringHash >& services, + const boost::unordered_set< OString, OStringHash >& interfaces) { o << " private com.sun.star.lang.Locale m_locale = " "new com.sun.star.lang.Locale();\n"; @@ -610,7 +611,7 @@ void generateAddinConstructorAndHelper(std::ostream& o, // get the one and only add-in service for later use - std::hash_set< OString, OStringHash >::const_iterator iter = services.begin(); + boost::unordered_set< OString, OStringHash >::const_iterator iter = services.begin(); OString sAddinService = (*iter).replace('/', '.'); if (sAddinService.equals("com.sun.star.sheet.AddIn")) { sAddinService = (*(++iter)).replace('/', '.'); @@ -741,8 +742,8 @@ void generateClassDefinition(std::ostream& o, ProgramOptions const & options, TypeManager const & manager, const OString & classname, - const std::hash_set< OString, OStringHash >& services, - const std::hash_set< OString, OStringHash >& interfaces, + const boost::unordered_set< OString, OStringHash >& services, + const boost::unordered_set< OString, OStringHash >& interfaces, const AttributeInfo& properties, const AttributeInfo& attributes, const OString& propertyhelper, bool supportxcomponent) @@ -759,11 +760,11 @@ void generateClassDefinition(std::ostream& o, o << "WeakBase\n"; } o << " implements "; - std::hash_set< OString, OStringHash >::const_iterator iter = + boost::unordered_set< OString, OStringHash >::const_iterator iter = interfaces.begin(); while (iter != interfaces.end()) { o << (*iter); - iter++; + ++iter; if (iter != interfaces.end()) o << ",\n "; } @@ -786,11 +787,11 @@ void generateClassDefinition(std::ostream& o, if (!services.empty()) { o << " private static final String[] m_serviceNames = {\n"; - std::hash_set< OString, OStringHash >::const_iterator iter = + boost::unordered_set< OString, OStringHash >::const_iterator iter = services.begin(); while (iter != services.end()) { o << " \"" << (*iter).replace('/','.') << "\""; - iter++; + ++iter; if (iter != services.end()) o << ",\n"; else @@ -808,7 +809,7 @@ void generateClassDefinition(std::ostream& o, printType(o, options, manager, iter->second.first.replace('.','/'), false, false); o << " m_" << iter->first << ";\n"; - iter++; + ++iter; } } else if (!attributes.empty()) { AttributeInfo::const_iterator iter = @@ -822,7 +823,7 @@ void generateClassDefinition(std::ostream& o, printType(o, options, manager, iter->second.first.replace('.','/'), false, true); o <<";\n"; - iter++; + ++iter; } } @@ -863,18 +864,18 @@ void generateSkeleton(ProgramOptions const & options, std::vector< OString > const & types, OString const & /*delegate*/) { - std::hash_set< OString, OStringHash > interfaces; - std::hash_set< OString, OStringHash > services; + boost::unordered_set< OString, OStringHash > interfaces; + boost::unordered_set< OString, OStringHash > services; AttributeInfo properties; AttributeInfo attributes; - std::hash_set< OString, OStringHash > propinterfaces; + boost::unordered_set< OString, OStringHash > propinterfaces; bool serviceobject = false; bool supportxcomponent = false; std::vector< OString >::const_iterator iter = types.begin(); while (iter != types.end()) { checkType(manager, *iter, interfaces, services, properties); - iter++; + ++iter; } if (options.componenttype == 3) { @@ -995,3 +996,4 @@ void generateSkeleton(ProgramOptions const & options, } } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/unodevtools/source/skeletonmaker/javatypemaker.cxx b/unodevtools/source/skeletonmaker/javatypemaker.cxx index fe49bade..f69e474f 100644 --- a/unodevtools/source/skeletonmaker/javatypemaker.cxx +++ b/unodevtools/source/skeletonmaker/javatypemaker.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -430,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); @@ -874,3 +870,4 @@ void generateDocumentation(std::ostream & o, } } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/unodevtools/source/skeletonmaker/makefile.mk b/unodevtools/source/skeletonmaker/makefile.mk index 72ac80ec..ec0a3821 100644 --- a/unodevtools/source/skeletonmaker/makefile.mk +++ b/unodevtools/source/skeletonmaker/makefile.mk @@ -35,6 +35,12 @@ LIBTARGET := NO ENABLE_EXCEPTIONS := TRUE .INCLUDE: settings.mk + +.IF "$(OS)" == "IOS" +all: + @echo No point in build-time executables for this platform +.ENDIF + .INCLUDE : $(PRJ)$/unodevtools.pmk APP1TARGET = $(TARGET) @@ -49,8 +55,8 @@ APP1OBJS = $(OBJ)$/skeletonmaker.obj \ APP1DEPN= $(OUT)$/lib$/$(UNODEVTOOLSLIBDEPN) $(SOLARLIBDIR)$/$(CODEMAKERLIBDEPN) \ $(SOLARLIBDIR)$/$(COMMONCPPLIBDEPN) $(SOLARLIBDIR)$/$(COMMONJAVALIBDEPN) -APP1STDLIBS = $(REGLIB) $(SALLIB) $(SALHELPERLIB) $(CPPULIB) $(CPPUHELPERLIB) \ - $(UNODEVTOOLSLIBST) $(CODEMAKERLIBST) $(COMMONCPPLIBST) $(COMMONJAVALIBST) +APP1STDLIBS = $(UNODEVTOOLSLIBST) $(REGLIB) $(SALLIB) $(SALHELPERLIB) $(CPPULIB) $(CPPUHELPERLIB) \ + $(CODEMAKERLIBST) $(COMMONCPPLIBST) $(COMMONJAVALIBST) OBJFILES = $(APP1OBJS) diff --git a/unodevtools/source/skeletonmaker/skeletoncommon.cxx b/unodevtools/source/skeletonmaker/skeletoncommon.cxx index 1a016cad..ee17c557 100644 --- a/unodevtools/source/skeletonmaker/skeletoncommon.cxx +++ b/unodevtools/source/skeletonmaker/skeletoncommon.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -154,7 +155,7 @@ bool containsAttribute(AttributeInfo& attributes, OString const & attrname) void checkAttributes(TypeManager const & manager, const typereg::Reader& reader, AttributeInfo& attributes, - std::hash_set< OString, OStringHash >& propinterfaces) + boost::unordered_set< OString, OStringHash >& propinterfaces) { OString typeName = codemaker::convertString(reader.getTypeName()); if ( typeName.equals("com/sun/star/beans/XPropertySet") || @@ -195,8 +196,8 @@ void checkAttributes(TypeManager const & manager, void checkType(TypeManager const & manager, OString const & type, - std::hash_set< OString, OStringHash >& interfaceTypes, - std::hash_set< OString, OStringHash >& serviceTypes, + boost::unordered_set< OString, OStringHash >& interfaceTypes, + boost::unordered_set< OString, OStringHash >& serviceTypes, AttributeInfo& properties) { @@ -289,8 +290,8 @@ void checkType(TypeManager const & manager, } void checkDefaultInterfaces( - std::hash_set< OString, OStringHash >& interfaces, - const std::hash_set< OString, OStringHash >& services, + boost::unordered_set< OString, OStringHash >& interfaces, + const boost::unordered_set< OString, OStringHash >& services, const OString & propertyhelper) { if ( services.empty() ) { @@ -339,13 +340,13 @@ bool checkServiceProperties(TypeManager const & manager, OString checkPropertyHelper( ProgramOptions const & options, TypeManager const & manager, - const std::hash_set< OString, OStringHash >& services, - const std::hash_set< OString, OStringHash >& interfaces, + const boost::unordered_set< OString, OStringHash >& services, + const boost::unordered_set< OString, OStringHash >& interfaces, AttributeInfo& attributes, - std::hash_set< OString, OStringHash >& propinterfaces) + boost::unordered_set< OString, OStringHash >& propinterfaces) { - std::hash_set< OString, OStringHash >::const_iterator iter; - std::hash_set< OString, OStringHash >::const_iterator end; + boost::unordered_set< OString, OStringHash >::const_iterator iter; + boost::unordered_set< OString, OStringHash >::const_iterator end; if ( !services.empty() ) { iter = services.begin(); @@ -391,7 +392,7 @@ OString checkPropertyHelper( osl_getThreadTextEncoding()); } } - iter++; + ++iter; } return (oldStyleWithProperties ? "_" : ""); @@ -427,12 +428,12 @@ bool checkXComponentSupport(TypeManager const & manager, // if XComponent is directly specified, return true and remove it from the // supported interfaces list bool checkXComponentSupport(TypeManager const & manager, - std::hash_set< OString, OStringHash >& interfaces) + boost::unordered_set< OString, OStringHash >& interfaces) { if ( interfaces.empty() ) return false; - std::hash_set< OString, OStringHash >::const_iterator iter = + boost::unordered_set< OString, OStringHash >::const_iterator iter = interfaces.begin(); while ( iter != interfaces.end() ) { if ( (*iter).equals("com.sun.star.lang.XComponent") ) { @@ -442,7 +443,7 @@ bool checkXComponentSupport(TypeManager const & manager, typereg::Reader reader(manager.getTypeReader((*iter).replace('.', '/'))); if ( checkXComponentSupport(manager, reader) ) return true; - iter++; + ++iter; } return false; @@ -668,9 +669,9 @@ void generateFunctionParamterMap(std::ostream& o, for ( sal_uInt16 p = 0; p < reader.getMethodParameterCount(m); ++p ) { if ( options.language == 2 ) { o << " fpm[" << p - << "] = ::rtl::OUString::createFromAscii(\"" + << "] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(\"" << codemaker::convertString(reader.getMethodParameterName(m, p)) - << "\");\n"; + << "\"));\n"; } else { if ( options.java5 ) @@ -687,8 +688,8 @@ void generateFunctionParamterMap(std::ostream& o, } if ( options.language == 2 ) { - o << " m_functionMap[::rtl::OUString::createFromAscii(\"" - << sMethod << "\")] = fpm;\n\n"; + o << " m_functionMap[::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(\"" + << sMethod << "\"))] = fpm;\n\n"; } else { o << " m_functionMap.put(\"" << sMethod << "\", fpm);\n\n"; @@ -699,11 +700,11 @@ void generateFunctionParamterMap(std::ostream& o, void generateFunctionParameterMap(std::ostream& o, ProgramOptions const & options, TypeManager const & manager, - const std::hash_set< OString, OStringHash >& interfaces) + const boost::unordered_set< OString, OStringHash >& interfaces) { ::codemaker::GeneratedTypeSet generated; bool bFirst = true; - std::hash_set< OString, OStringHash >::const_iterator iter = interfaces.begin(); + boost::unordered_set< OString, OStringHash >::const_iterator iter = interfaces.begin(); while ( iter != interfaces.end() ) { typereg::Reader reader(manager.getTypeReader((*iter).replace('.','/'))); if (!reader.isValid()) { @@ -714,9 +715,10 @@ void generateFunctionParameterMap(std::ostream& o, } generateFunctionParamterMap(o, options, manager, reader, generated, bFirst); - iter++; + ++iter; } } } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/unodevtools/source/skeletonmaker/skeletoncommon.hxx b/unodevtools/source/skeletonmaker/skeletoncommon.hxx index b4b65f64..80b6d0d1 100644 --- a/unodevtools/source/skeletonmaker/skeletoncommon.hxx +++ b/unodevtools/source/skeletonmaker/skeletoncommon.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -33,7 +34,7 @@ #include "codemaker/unotype.hxx" #include <fstream> -#include <hash_set> +#include <boost/unordered_set.hpp> #include <map> namespace skeletonmaker { @@ -110,21 +111,21 @@ codemaker::UnoType::Sort decomposeResolveAndCheck( void checkType(TypeManager const & manager, rtl::OString const & type, - std::hash_set< rtl::OString, rtl::OStringHash >& interfaceTypes, - std::hash_set< rtl::OString, rtl::OStringHash >& serviceTypes, + boost::unordered_set< rtl::OString, rtl::OStringHash >& interfaceTypes, + boost::unordered_set< rtl::OString, rtl::OStringHash >& serviceTypes, AttributeInfo& properties); void checkDefaultInterfaces( - std::hash_set< rtl::OString, rtl::OStringHash >& interfaces, - const std::hash_set< rtl::OString, rtl::OStringHash >& services, + boost::unordered_set< rtl::OString, rtl::OStringHash >& interfaces, + const boost::unordered_set< rtl::OString, rtl::OStringHash >& services, const rtl::OString & propertyhelper); rtl::OString checkPropertyHelper( ProgramOptions const & options, TypeManager const & manager, - const std::hash_set< rtl::OString, rtl::OStringHash >& services, - const std::hash_set< rtl::OString, rtl::OStringHash >& interfaces, + const boost::unordered_set< rtl::OString, rtl::OStringHash >& services, + const boost::unordered_set< rtl::OString, rtl::OStringHash >& interfaces, AttributeInfo& attributes, - std::hash_set< rtl::OString, rtl::OStringHash >& propinterfaces); + boost::unordered_set< rtl::OString, rtl::OStringHash >& propinterfaces); /** checks whether the return and parameters types are valid and allowed @@ -150,7 +151,7 @@ void checkAddInTypes(TypeManager const & manager, @return true if XComponent have to be supported */ bool checkXComponentSupport(TypeManager const & manager, - std::hash_set< rtl::OString, rtl::OStringHash >& interfaces); + boost::unordered_set< rtl::OString, rtl::OStringHash >& interfaces); sal_uInt16 checkAdditionalPropertyFlags(typereg::Reader const & reader, @@ -160,9 +161,10 @@ sal_uInt16 checkAdditionalPropertyFlags(typereg::Reader const & reader, void generateFunctionParameterMap(std::ostream& o, ProgramOptions const & options, TypeManager const & manager, - const std::hash_set< ::rtl::OString, ::rtl::OStringHash >& interfaces); + const boost::unordered_set< ::rtl::OString, ::rtl::OStringHash >& interfaces); } #endif // INCLUDED_UNODEVTOOLS_SOURCE_SKELETONMAKER_SKELETONCOMMON_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/unodevtools/source/skeletonmaker/skeletoncpp.hxx b/unodevtools/source/skeletonmaker/skeletoncpp.hxx index 6d0a49fb..6213bc1d 100644 --- a/unodevtools/source/skeletonmaker/skeletoncpp.hxx +++ b/unodevtools/source/skeletonmaker/skeletoncpp.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -140,3 +141,4 @@ void generateCalcAddin(ProgramOptions const & options, #endif // INCLUDED_UNODEVTOOLS_SOURCE_SKELETONMAKER_SKELETONCPP_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/unodevtools/source/skeletonmaker/skeletonjava.hxx b/unodevtools/source/skeletonmaker/skeletonjava.hxx index cd48b04d..36174d19 100644 --- a/unodevtools/source/skeletonmaker/skeletonjava.hxx +++ b/unodevtools/source/skeletonmaker/skeletonjava.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -114,3 +115,4 @@ void generateSkeleton(ProgramOptions const & options, TypeManager const & manage #endif // INCLUDED_UNODEVTOOLS_SKELETONJAVA_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/unodevtools/source/skeletonmaker/skeletonmaker.cxx b/unodevtools/source/skeletonmaker/skeletonmaker.cxx index e843743f..5e1858b2 100644 --- a/unodevtools/source/skeletonmaker/skeletonmaker.cxx +++ b/unodevtools/source/skeletonmaker/skeletonmaker.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -349,3 +350,5 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, /*argv*/) return 0; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/unodevtools/source/unodevtools/options.cxx b/unodevtools/source/unodevtools/options.cxx index 91649f6e..305ce54d 100644 --- a/unodevtools/source/unodevtools/options.cxx +++ b/unodevtools/source/unodevtools/options.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -123,3 +124,5 @@ sal_Bool readOption( sal_Bool * pbOpt, const sal_Char * pOpt, } } // end of namespace unodevtools + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/unodevtools/source/unodevtools/typeblob.cxx b/unodevtools/source/unodevtools/typeblob.cxx index c92e0a45..cf53d59c 100644 --- a/unodevtools/source/unodevtools/typeblob.cxx +++ b/unodevtools/source/unodevtools/typeblob.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -51,9 +52,13 @@ using namespace com::sun::star::uno; using namespace com::sun::star::beans; using namespace com::sun::star::container; using namespace com::sun::star::reflection; -using namespace rtl; using namespace codemaker; +using ::rtl::OUString; +using ::rtl::OString; +using ::rtl::OStringToOUString; +using ::rtl::OUStringToOString; + namespace unodevtools { void writeConstantData(typereg::Writer& rWriter, sal_uInt16 fieldIndex, @@ -131,7 +136,7 @@ void writeConstantData(typereg::Writer& rWriter, sal_uInt16 fieldIndex, } break; default: - OSL_ENSURE( 0, "unsupported constant type" ); + OSL_FAIL( "unsupported constant type" ); break; } @@ -793,7 +798,7 @@ void* getTypeBlob(Reference< XHierarchicalNameAccess > xTDmgr, } break; default: - OSL_ENSURE( 0, "unsupported type" ); + OSL_FAIL( "unsupported type" ); break; } @@ -801,3 +806,5 @@ void* getTypeBlob(Reference< XHierarchicalNameAccess > xTDmgr, } } // end of namespace unodevtools + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/unodevtools/source/unodevtools/typemanager.cxx b/unodevtools/source/unodevtools/typemanager.cxx index 46204bdc..70c16102 100644 --- a/unodevtools/source/unodevtools/typemanager.cxx +++ b/unodevtools/source/unodevtools/typemanager.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -141,7 +142,7 @@ sal_Bool UnoTypeManager::init( sal_True, sal_False); seqArgs[i++] = makeAny(xReg); - iter++; + ++iter; } Reference< XHierarchicalNameAccess > xTDProvider( @@ -279,3 +280,5 @@ RTTypeClass UnoTypeManager::getTypeClass(RegistryKey& rTypeKey) const } } // end of namespace unodevtools + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/unodevtools/unodevtools.pmk b/unodevtools/unodevtools.pmk index 91fe33b8..c2d119c2 100755 --- a/unodevtools/unodevtools.pmk +++ b/unodevtools/unodevtools.pmk @@ -42,17 +42,7 @@ COMMONCPPLIBST=commoncpp.lib COMMONJAVALIBST=commonjava.lib .ENDIF -.ELIF "$(GUI)"=="OS2" -UNODEVTOOLSLIBDEPN=unodevtools.lib -CODEMAKERLIBDEPN=codemaker.lib -COMMONCPPLIBDEPN=commoncpp.lib -COMMONJAVALIBDEPN=commonjava.lib -UNODEVTOOLSLIBST=unodevtools.lib -CODEMAKERLIBST=codemaker.lib -COMMONCPPLIBST=commoncpp.lib -COMMONJAVALIBST=commonjava.lib .ELSE - UNODEVTOOLSLIBDEPN=libunodevtools.a CODEMAKERLIBDEPN=libcodemaker.a COMMONCPPLIBDEPN=libcommoncpp.a |
