[Orxonox-commit 967] r5690 - in code/branches/resource2/src: core network util

[rgrieder at orxonox.net]

Author: rgrieder
Date: 2009-08-29 22:04:43 +0200 (Sat, 29 Aug 2009)
New Revision: 5690

Modified:
   code/branches/resource2/src/core/ConfigValueContainer.h
   code/branches/resource2/src/core/Identifier.cc
   code/branches/resource2/src/core/Identifier.h
   code/branches/resource2/src/core/TclThreadManager.cc
   code/branches/resource2/src/network/ClientInformation.h
   code/branches/resource2/src/util/Debug.h
Log:
Where the hell did those 's's come from? ;)

Modified: code/branches/resource2/src/core/ConfigValueContainer.h
===================================================================
--- code/branches/resource2/src/core/ConfigValueContainer.h	2009-08-29 20:04:04 UTC (rev 5689)
+++ code/branches/resource2/src/core/ConfigValueContainer.h	2009-08-29 20:04:43 UTC (rev 5690)
@@ -30,7 +30,7 @@
     @file
     @brief Definition of the ConfigValueContainer class.
 
-    The ConfigValueContainer class contains all needed informations about a configurable variable:
+    The ConfigValueContainer class contains all needed information about a configurable variable:
      - the name of the variable
      - the name of the class the variable belongs to
      - the default value
@@ -78,9 +78,9 @@
     };
 
 
-    //! The ConfigValuecontainer contains all needed informations about a configurable variable.
+    //! The ConfigValuecontainer contains all needed information about a configurable variable.
     /**
-        The ConfigValueContainer class contains all needed informations about a configurable variable:
+        The ConfigValueContainer class contains all needed information about a configurable variable:
          - the name of the variable
          - the name of the class the variable belongs to
          - the default value

Modified: code/branches/resource2/src/core/Identifier.cc
===================================================================
--- code/branches/resource2/src/core/Identifier.cc	2009-08-29 20:04:04 UTC (rev 5689)
+++ code/branches/resource2/src/core/Identifier.cc	2009-08-29 20:04:43 UTC (rev 5690)
@@ -137,7 +137,7 @@
         // Check if at least one object of the given type was created
         if (!this->bCreatedOneObject_ && Identifier::isCreatingHierarchy())
         {
-            // If no: We have to store the informations and initialize the Identifier
+            // If no: We have to store the information and initialize the Identifier
             COUT(4) << "*** ClassIdentifier: Register Class in " << this->getName() << "-Singleton -> Initialize Singleton." << std::endl;
             if (bRootClass)
                 this->initialize(0); // If a class is derived from two interfaces, the second interface might think it's derived from the first because of the order of constructor-calls. Thats why we set parents to zero in that case.

Modified: code/branches/resource2/src/core/Identifier.h
===================================================================
--- code/branches/resource2/src/core/Identifier.h	2009-08-29 20:04:04 UTC (rev 5689)
+++ code/branches/resource2/src/core/Identifier.h	2009-08-29 20:04:43 UTC (rev 5690)
@@ -30,7 +30,7 @@
     @file
     @brief Definition of the Identifier, ClassIdentifier and SubclassIdentifier classes, implementation of the ClassIdentifier and SubclassIdentifier classes.
 
-    The Identifier contains all needed informations about the class it belongs to:
+    The Identifier contains all needed information about the class it belongs to:
      - the name
      - a list with all objects
      - parents and children
@@ -72,9 +72,9 @@
     // ###############################
     // ###       Identifier        ###
     // ###############################
-    //! The Identifier is used to identify the class of an object and to store informations about the class.
+    //! The Identifier is used to identify the class of an object and to store information about the class.
     /**
-        The Identifier contains all needed informations about the class it belongs to:
+        The Identifier contains all needed information about the class it belongs to:
          - the name
          - a list with all objects
          - parents and children
@@ -334,7 +334,7 @@
     //! The ClassIdentifier is derived from Identifier and holds all class-specific functions and variables the Identifier cannot have.
     /**
         ClassIdentifier is a Singleton, which means that only one object of a given type T exists.
-        This makes it possible to store informations about a class, sharing them with all
+        This makes it possible to store information about a class, sharing them with all
         objects of that class without defining static variables in every class.
 
         To be really sure that not more than exactly one object exists (even with libraries),

Modified: code/branches/resource2/src/core/TclThreadManager.cc
===================================================================
--- code/branches/resource2/src/core/TclThreadManager.cc	2009-08-29 20:04:04 UTC (rev 5689)
+++ code/branches/resource2/src/core/TclThreadManager.cc	2009-08-29 20:04:43 UTC (rev 5690)
@@ -56,7 +56,7 @@
     SetConsoleCommand(TclThreadManager, source,  false).argumentCompleter(0, autocompletion::tclthreads());
 
     /**
-        @brief A struct containing all informations about a Tcl-interpreter
+        @brief A struct containing all information about a Tcl-interpreter
     */
     struct TclInterpreterBundle
     {

Modified: code/branches/resource2/src/network/ClientInformation.h
===================================================================
--- code/branches/resource2/src/network/ClientInformation.h	2009-08-29 20:04:04 UTC (rev 5689)
+++ code/branches/resource2/src/network/ClientInformation.h	2009-08-29 20:04:43 UTC (rev 5690)
@@ -48,7 +48,7 @@
 {
 
   /**
-  * This class implements a list for client informations
+  * This class implements a list for client information
   * @author Oliver Scheuss
   */
   class _NetworkExport ClientInformation{

Modified: code/branches/resource2/src/util/Debug.h
===================================================================
--- code/branches/resource2/src/util/Debug.h	2009-08-29 20:04:04 UTC (rev 5689)
+++ code/branches/resource2/src/util/Debug.h	2009-08-29 20:04:43 UTC (rev 5690)
@@ -28,7 +28,7 @@
 
 /**
     @file
-    @brief Handles different output-levels of errors, warnings, infos and debug informations.
+    @brief Handles different output-levels of errors, warnings, infos and debug information.
 
     The COUT(level) macro acts like std::cout, but the output is only performed if the given
     level is <= the soft debug level.
@@ -44,10 +44,10 @@
      0: Very important output
      1: Errors
      2: Warnings
-     3: Informations
+     3: Information
      4: Debug information
      5: More debug information
-     6: Crazy debug informations
+     6: Crazy debug information
 
     @example
     COUT(0) << "Very important output" << std::endl;