diff --git a/src/common/error.cpp b/src/common/error.cpp index 0e43a4481..14223db38 100644 --- a/src/common/error.cpp +++ b/src/common/error.cpp @@ -33,16 +33,13 @@ using util::isnil; using std::exception; -namespace lumiera - { - - namespace error - { +namespace lumiera { + namespace error { /** the message shown to the user per default * if an exception reaches one of the top-level * catch clauses. - * @todo to be localized + * @todo to be localised */ inline const string default_usermsg (Error* exception_obj) throw() { @@ -55,7 +52,7 @@ namespace lumiera LUMIERA_ERROR_DEFINE (LOGIC , "internal logic broken"); LUMIERA_ERROR_DEFINE (FATAL , "floundered"); LUMIERA_ERROR_DEFINE (CONFIG , "misconfiguration"); - LUMIERA_ERROR_DEFINE (STATE , "unforseen state"); + LUMIERA_ERROR_DEFINE (STATE , "unforeseen state"); LUMIERA_ERROR_DEFINE (INVALID , "invalid input or parameters"); LUMIERA_ERROR_DEFINE (EXTERNAL , "failure in external service"); LUMIERA_ERROR_DEFINE (ASSERTION, "assertion failure"); @@ -99,8 +96,8 @@ namespace lumiera desc_ (ref.desc_), cause_ (extractCauseMsg(ref)) { } - - + + /** Description of the problem, including the internal char constant * in accordance to Lumiera's error identification scheme. @@ -119,7 +116,7 @@ namespace lumiera return what_.c_str(); } - + /** @internal get at the description message of the * first exception encountered in a chain of exceptions */ @@ -138,29 +135,8 @@ namespace lumiera // unknown other exception type return cause.what (); } - -/* -- originally, I wanted to chain the exception objects themselfs. - but this doesn't work; we'd need to clone the "cause" error object, - because it can be destroyed when leaving the original - handler by throwing a new exception. - Anyways, not needed at the moment; maybe later? 8/2007 - const exception& - Error::rootCause () const throw() - { - const exception * root(this); - if (this->cause) - if (Error* err = dynamic_cast (this->cause)) - root = &err->rootCause (); - else - root = this->cause; - - ENSURE (root); - ENSURE (root!=this || !cause); - return *root; - } -*/ @@ -182,7 +158,7 @@ namespace lumiera std::terminate(); } - + void assertion_terminate (const string& location) { throw Fatal (location, LUMIERA_ERROR_ASSERTION) diff --git a/src/lib/lifecycleregistry.hpp b/src/lib/lifecycleregistry.hpp index 984e97481..c23395419 100644 --- a/src/lib/lifecycleregistry.hpp +++ b/src/lib/lifecycleregistry.hpp @@ -24,10 +24,10 @@ /** @file lifecycleregistry.hpp ** Helper for registering lifecycle event callbacks, which are ** provided as a global service by lumiera::Appconfig. This service - ** allows to enroll functions under a given label and then to call + ** allows to enrol functions under a given label and then to call ** all those registered functions. ** @note this is in fact an event mechanism, and if we start using - ** more than just this basic functionallity, we should switch to + ** more than just this basic functionality, we should switch to ** boost::signals. (which has the downside of being an binary ** dependency). ** @@ -47,8 +47,8 @@ #include "common/util.hpp" -namespace lumiera - { +namespace lumiera { + using boost::noncopyable; using boost::function; using util::contains; diff --git a/src/lumiera/appconfig.cpp b/src/lumiera/appconfig.cpp index 366b44331..c589ade42 100644 --- a/src/lumiera/appconfig.cpp +++ b/src/lumiera/appconfig.cpp @@ -1,5 +1,5 @@ /* - Appconfig - for global initialization and configuration + Appconfig - for global initialisation and configuration Copyright (C) Lumiera.org 2008, Hermann Vosseler @@ -29,8 +29,7 @@ using util::isnil; using util::cStr; -namespace lumiera - { +namespace lumiera { @@ -39,7 +38,7 @@ namespace lumiera Symbol ON_GLOBAL_SHUTDOWN ("ON_GLOBAL_SHUTDOWN"); - /** perform initialization triggered on first access. + /** perform initialisation triggered on first access. * Will execute the ON_BASIC_INIT hook, but under typical * circumstances this is a NOP, because when callbacks are * added to this hook, the Appconfig singleton instance has diff --git a/src/lumiera/config.c b/src/lumiera/config.c index b1cdbf68b..614f0b691 100644 --- a/src/lumiera/config.c +++ b/src/lumiera/config.c @@ -54,7 +54,7 @@ LUMIERA_ERROR_DEFINE (CONFIG_NO_ENTRY, "no configuration entry"); /** - * defaults for the configuraton system itself + * defaults for the configuration system itself */ const char* lumiera_config_defaults[] = { diff --git a/src/lumiera/config.h b/src/lumiera/config.h index ee080ae9e..c9d7b957f 100644 --- a/src/lumiera/config.h +++ b/src/lumiera/config.h @@ -95,7 +95,7 @@ typedef lumiera_config* LumieraConfig; // * does only initialize the variables, so that they get valid values, but does not allocate them as they will be allocated before as they are singleton. -// * lumiera_config_init (const char* searchpath) searchpath is a buildin-default, can be changed via configure and can be appended and overridden by using a flag, e.g. {{{ --config-path-append="" }}} or {{{ --config-path="" }}} +// * lumiera_config_init (const char* searchpath) searchpath is a builtin-default, can be changed via configure and can be appended and overridden by using a flag, e.g. {{{ --config-path-append="" }}} or {{{ --config-path="" }}} /** * Initialize the configuration subsystem. @@ -240,7 +240,7 @@ lumiera_config_wordlist_get_nth (const char* key, unsigned nth, const char* deli * @param key key under which this wordlist is stored * @param value word to find * @param delims a string literal listing all characters which are treated as delimiters - * @return index of the first occurence of the word or -1 in case of failure + * @return index of the first occurrence of the word or -1 in case of failure */ int lumiera_config_wordlist_find (const char* key, const char* value, const char* delims); diff --git a/src/lumiera/configitem.h b/src/lumiera/configitem.h index 0e4ee267e..52fd95ed6 100644 --- a/src/lumiera/configitem.h +++ b/src/lumiera/configitem.h @@ -1,5 +1,5 @@ /* - configitem.h - generalized hierachy of configuration items + configitem.h - generalized hierarchy of configuration items Copyright (C) Lumiera.org 2008, Christian Thaeter @@ -42,7 +42,7 @@ struct lumiera_configitem_vtable; /** * @file - * configitems build a 3 level hierachy: + * configitems build a 3 level hierarchy: * * 1. file: * contain sections @@ -66,7 +66,7 @@ struct lumiera_configitem_vtable; //TODO: declarations go here// /** * @file - * configitems build a 3 level hierachy: + * configitems build a 3 level hierarchy: * * 1. file: * contain sections @@ -84,7 +84,7 @@ struct lumiera_configitem_vtable; * directives are only valid at the toplevel section [] * configurationentry: * 'key = value' or 'key < redirect' - * errorneous: + * erroneous: * any line which cant be parsed */ @@ -96,11 +96,11 @@ struct lumiera_configitem_vtable struct lumiera_configitem_struct { - llist link; // all lines on the same hierachy level are linked here (see childs) + llist link; // all lines on the same hierarchy level are linked here (see childs) LumieraConfigitem parent; // parent section - llist childs; // root node for all lines below this hierachy + llist childs; // root node for all lines below this hierarchy - llist lookup; // all lines with the same key are stacked up on the loockup + llist lookup; // all lines with the same key are stacked up on the lookup char* line; // raw line as read in allocated here trailing \n will be replaced with \0 char* key; // pointer into line to start of key diff --git a/src/lumiera/interface.h b/src/lumiera/interface.h index 2af11b258..fb4aa93e7 100644 --- a/src/lumiera/interface.h +++ b/src/lumiera/interface.h @@ -290,7 +290,7 @@ LUMIERA_PLUGININTERFACE /** - * Create a plugin interface when being copiled as plugin + * Create a plugin interface when being compiled as plugin */ #ifdef LUMIERA_PLUGIN /* compile as plugin */ #define LUMIERA_PLUGIN_INTERFACEHANDLE static LUMIERA_INTERFACE_HANDLE(lumieraorg_interface, 0) lumiera_interface_handle diff --git a/src/lumiera/interfaceregistry.h b/src/lumiera/interfaceregistry.h index 51dbde6b4..98e0df83e 100644 --- a/src/lumiera/interfaceregistry.h +++ b/src/lumiera/interfaceregistry.h @@ -71,7 +71,7 @@ struct lumiera_interfacenode_struct LumieraInterfacenode lnk; /** allocated size of the following deps table */ size_t deps_size; - /** NULL terminated table of all dependenncies (interfaces opened on initialization) */ + /** NULL terminated table of all dependencies (interfaces opened on initialization) */ LumieraInterfacenode* deps; }; diff --git a/src/lumiera/lumiera_init.c b/src/lumiera/lumiera_init.c index fe4487e47..071d2439a 100644 --- a/src/lumiera/lumiera_init.c +++ b/src/lumiera/lumiera_init.c @@ -56,7 +56,7 @@ lumiera_preinit (void) /** * Standard initialization procedure - * Boots all buildin subsystems up as described in DesignProcess/GlobalInitilaization. + * Boots all builtin subsystems up as described in DesignProcess/GlobalInitilaization. * The configuration and interfaces/plugin subsystems are already started at this point and * commandline arguments are parsed. */ diff --git a/src/lumiera/nobugcfg.cpp b/src/lumiera/nobugcfg.cpp index 56e3464e5..9c50d58de 100644 --- a/src/lumiera/nobugcfg.cpp +++ b/src/lumiera/nobugcfg.cpp @@ -30,8 +30,8 @@ -namespace lumiera - { +namespace lumiera { + void initialise_NoBug () { @@ -40,7 +40,7 @@ namespace lumiera #ifdef DEBUG static uint callCount = 0; ASSERT ( 0 == callCount++ ); -#endif +#endif } } diff --git a/src/proc/asset.hpp b/src/proc/asset.hpp index 1c27585cb..2e82051d7 100644 --- a/src/proc/asset.hpp +++ b/src/proc/asset.hpp @@ -1,5 +1,5 @@ /* - ASSET.hpp - Superinterface: bookeeping view of "things" present in the session + ASSET.hpp - Superinterface: bookkeeping view of "things" present in the session Copyright (C) Lumiera.org 2008, Hermann Vosseler @@ -30,7 +30,7 @@ ** ** Assets are handled by a hierarchy of interfaces. Below the top level Asset interface ** there are interfaces for various different Kinds of Assets, like asset::Media, - ** asset::Proc, etc. Code utilizing the specific properties of e.g. Media assets, will + ** asset::Proc, etc. Code utilising the specific properties of e.g. Media assets, will ** be implemented directly against the asset::Media interface. To make this feasible ** while at the same time being able to handle all asset Kinds in a uniform manner, ** we use a hierarchy of ID classes. These IDs are actually just thin wrappers around @@ -76,8 +76,7 @@ using std::set; -namespace asset - { +namespace asset { using std::size_t; using std::tr1::shared_ptr; @@ -91,9 +90,9 @@ namespace asset /** * thin wrapper around a size_t hash ID * used as primary key for all Asset objects. - * The Templace parameter is intended for tagging + * The Template parameter is intended for tagging * the ID with type information, causing the - * compiler to select specialized behaviour + * compiler to select specialised behaviour * for the different kinds of Assets. * @see Asset * @see AssetManager#getID generating ID values @@ -122,15 +121,15 @@ namespace asset /** - * Superinterface describing especially bookeeping properties. + * Superinterface describing especially bookkeeping properties. * As of 09/2007, there are four Kinds of Assets, each * comprising a sub-Interface of the Asset Interface: *
  • asset::Media representing mediafiles
    • *
  • asset::Proc representing media data processing components (e.g. Effects)
    • - *
  • asset::Struct representing structural components used in the sesion (e.g. Tracks)
    • + *
  • asset::Struct representing structural components used in the session (e.g. Tracks)
    • *
  • asset::Meta representing meta objects created while editing (e.g. Automation)
    • *
- * And of course there are various concret Asset subclasses, like asset::Clip, + * And of course there are various concrete Asset subclasses, like asset::Clip, * asset::Effect, asset::Codec, asset::Track, asset::Dataset. * @note Assets objects have a strict unique identity and because of this are non-copyable. * You can not create an Asset derived object without registering it with the AssetManager @@ -152,7 +151,7 @@ namespace asset struct Ident : boost::totally_ordered { - /** element ID, comprehensible but sanitized. + /** element ID, comprehensible but sanitised. * The tuple (category, name, org) is unique. */ string name; @@ -164,7 +163,7 @@ namespace asset /** origin or authorship id. * Can be a project abbreviation, a package id or just the authors nickname or UID. - * This allows for the compnent name to be more generic (e.g. "blur"). + * This allows for the component name to be more generic (e.g. "blur"). * Default for all assets provided by the core Lumiera codebase is "lumi". */ const string org; diff --git a/src/proc/mobject/builder/buildertool.hpp b/src/proc/mobject/builder/buildertool.hpp index 1801bc2ef..6cdad7456 100644 --- a/src/proc/mobject/builder/buildertool.hpp +++ b/src/proc/mobject/builder/buildertool.hpp @@ -89,13 +89,13 @@ namespace mobject { * Base class of all BuilderTools, used according to the visitor pattern: * each Tool contains the concrete implementation for one task to be done * to the various MObject classes. The concrete builder tool implementation - * should not diretcly inherit from this base interface, but rather through - * an instantiation of the "Applicable" template parametrized with all + * should not directly inherit from this base interface, but rather through + * an instantiation of the "Applicable" template parametrised with all * concrete Buildable classes, for which it wants calls to be dispatched. * \par * In addition to lumiera::visitor::Tool, BuilderTool adds support for dealing * with objects normally handled by means of smart-pointers or similar - * wrappers, most notably mobject::Placement. The visitaion is initiated + * wrappers, most notably mobject::Placement. The visitation is initiated * by calling the stand-alone function \c (BuilderTool& tool, WRA& wrappedTargetObj) , * which forwards to the visitation mechanism supported by the type contained * in the wrapper, but stores away a pointer to the wrapped object, which can diff --git a/src/proc/mobject/builderfacade.hpp b/src/proc/mobject/builderfacade.hpp index 0e6ae49ea..98197ec13 100644 --- a/src/proc/mobject/builderfacade.hpp +++ b/src/proc/mobject/builderfacade.hpp @@ -29,15 +29,14 @@ -namespace mobject - { +namespace mobject { /** * Provides unified access to the builder functionality. * While individual components of the builder subsystem may be called - * if necessary or suitable, it is usually better to do all extern invocations - * via the high level methods of this Facade. + * if necessary or suitable, it is usually better to do all external + * invocations via the high level methods of this Facade. */ class BuilderFacade { diff --git a/src/proc/mobject/session/sessmanagerimpl.cpp b/src/proc/mobject/session/sessmanagerimpl.cpp index 20df3cc73..647ee1682 100644 --- a/src/proc/mobject/session/sessmanagerimpl.cpp +++ b/src/proc/mobject/session/sessmanagerimpl.cpp @@ -22,7 +22,7 @@ /** @file sessmanagerimpl.cpp - ** Implemention of the Session management functions. + ** Implementation of the Session management functions. ** The Class SessManager is declared alongside with mobject::Session, ** because it serves as smart ptr-to-Impl at the same time. Effectively, ** the session manager owns the current session object and only grants diff --git a/tests/common/appconfigtest.cpp b/tests/common/appconfigtest.cpp index 9ea44a7ff..aba78fe01 100644 --- a/tests/common/appconfigtest.cpp +++ b/tests/common/appconfigtest.cpp @@ -1,5 +1,5 @@ /* - Appconfig(Test) - accessing the allways-available Appconfig singleton + Appconfig(Test) - accessing the always-available Appconfig singleton Copyright (C) Lumiera.org 2008, Hermann Vosseler @@ -30,10 +30,8 @@ -namespace lumiera - { - namespace test - { +namespace lumiera { + namespace test { class Appconfig_test : public Test diff --git a/tests/common/meta/configflagstest.cpp b/tests/common/meta/configflagstest.cpp index 34b54be48..d7383615b 100644 --- a/tests/common/meta/configflagstest.cpp +++ b/tests/common/meta/configflagstest.cpp @@ -24,7 +24,7 @@ /** @file configflagstest.cpp ** \par build a type representing a single configuration defined by a set of flags ** - ** The semi-automatic assembly of processing node invocation code utilizes some + ** The semi-automatic assembly of processing node invocation code utilises some ** metaprogramming to generate a factory, which in turn produces node wiring objects ** according to the configuration to be used for the corresponding ProcNode. This relies on ** generating a distinct type based on a given set of configuration flags, @@ -128,7 +128,7 @@ namespace lumiera { * all possible defined specialisations of some template based on * such configuration-tuples. This allows us to assemble the glue code * for pulling data from processing nodes out of small building blocks - * in all possible configuraions. + * in all possible configurations. */ class ConfigFlags_test : public Test { @@ -280,7 +280,7 @@ namespace lumiera { /** @test use the ConfigSelector template to build a set of factories, - * based on a set of configurations. Then invoke the apropriate + * based on a set of configurations. Then invoke the appropriate * factory by specifying the configuration bit code */ void check_ConfigSelector()