[Orxonox-commit 2702] r7407 - in code/trunk/src/modules: notifications objects

[dafrick at orxonox.net]

Author: dafrick
Date: 2010-09-11 14:52:59 +0200 (Sat, 11 Sep 2010)
New Revision: 7407

Modified:
   code/trunk/src/modules/notifications/NotificationDispatcher.cc
   code/trunk/src/modules/notifications/NotificationDispatcher.h
   code/trunk/src/modules/objects/Script.cc
   code/trunk/src/modules/objects/Script.h
Log:
xmlElement -> xmlelement


Modified: code/trunk/src/modules/notifications/NotificationDispatcher.cc
===================================================================
--- code/trunk/src/modules/notifications/NotificationDispatcher.cc	2010-09-11 12:50:21 UTC (rev 7406)
+++ code/trunk/src/modules/notifications/NotificationDispatcher.cc	2010-09-11 12:52:59 UTC (rev 7407)
@@ -71,18 +71,18 @@
     @brief
         Method for creating a NotificationDispatcher object through XML.
     */
-    void NotificationDispatcher::XMLPort(Element& xmlElement, XMLPort::Mode mode)
+    void NotificationDispatcher::XMLPort(Element& xmlelement, XMLPort::Mode mode)
     {
-        SUPER(NotificationDispatcher, XMLPort, xmlElement, mode);
+        SUPER(NotificationDispatcher, XMLPort, xmlelement, mode);
 
-        XMLPortEventSink(NotificationDispatcher, BaseObject, "trigger", trigger, xmlElement, mode); //TODO: Change BaseObject to MultiTrigger as soon as MultiTrigger is the base of all triggers.
+        XMLPortEventSink(NotificationDispatcher, BaseObject, "trigger", trigger, xmlelement, mode); //TODO: Change BaseObject to MultiTrigger as soon as MultiTrigger is the base of all triggers.
     }
 
-    void NotificationDispatcher::XMLEventPort(Element& xmlElement, XMLPort::Mode mode)
+    void NotificationDispatcher::XMLEventPort(Element& xmlelement, XMLPort::Mode mode)
     {
-        SUPER(NotificationDispatcher, XMLEventPort, xmlElement, mode);
+        SUPER(NotificationDispatcher, XMLEventPort, xmlelement, mode);
 
-        XMLPortEventState(NotificationDispatcher, BaseObject, "trigger", trigger, xmlElement, mode);
+        XMLPortEventState(NotificationDispatcher, BaseObject, "trigger", trigger, xmlelement, mode);
     }
 
     /**

Modified: code/trunk/src/modules/notifications/NotificationDispatcher.h
===================================================================
--- code/trunk/src/modules/notifications/NotificationDispatcher.h	2010-09-11 12:50:21 UTC (rev 7406)
+++ code/trunk/src/modules/notifications/NotificationDispatcher.h	2010-09-11 12:52:59 UTC (rev 7407)
@@ -54,8 +54,8 @@
             NotificationDispatcher(BaseObject* creator); //!< Default constructor. Initializes the object.
             virtual ~NotificationDispatcher(); //!< Destructor.
 
-            virtual void XMLPort(Element& xmlElement, XMLPort::Mode mode); //!< Method for creating a NotificationDispatcher object through XML.
-            virtual void XMLEventPort(Element& xmlElement, XMLPort::Mode mode);
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode); //!< Method for creating a NotificationDispatcher object through XML.
+            virtual void XMLEventPort(Element& xmlelement, XMLPort::Mode mode);
 
             /**
             @brief Get the sender of the Notification dispatched by this NotificationDispatcher.

Modified: code/trunk/src/modules/objects/Script.cc
===================================================================
--- code/trunk/src/modules/objects/Script.cc	2010-09-11 12:50:21 UTC (rev 7406)
+++ code/trunk/src/modules/objects/Script.cc	2010-09-11 12:52:59 UTC (rev 7407)
@@ -72,21 +72,21 @@
     /**
     @brief
         Method for creating a Script object through XML.
-    @param xmlElement
+    @param xmlelement
         The element.
     @param mode
         The mode.
     */
-    void Script::XMLPort(Element& xmlElement, XMLPort::Mode mode)
+    void Script::XMLPort(Element& xmlelement, XMLPort::Mode mode)
     {
         SUPER(Script, XMLPort, xmlElement, mode);
 
-        XMLPortParam(Script, "code", setCode, getCode, xmlElement, mode);
-        XMLPortParamTemplate(Script, "mode", setMode, getMode, xmlElement, mode, const std::string&).defaultValues(Script::NORMAL);
-        XMLPortParam(Script, "onLoad", setOnLoad, isOnLoad, xmlElement, mode).defaultValues(true);
-        XMLPortParam(Script, "times", setTimes, getTimes, xmlElement, mode).defaultValues(Script::INF);
+        XMLPortParam(Script, "code", setCode, getCode, xmlelement, mode);
+        XMLPortParamTemplate(Script, "mode", setMode, getMode, xmlelement, mode, const std::string&).defaultValues(Script::NORMAL);
+        XMLPortParam(Script, "onLoad", setOnLoad, isOnLoad, xmlelement, mode).defaultValues(true);
+        XMLPortParam(Script, "times", setTimes, getTimes, xmlelement, mode).defaultValues(Script::INF);
 
-        XMLPortEventSink(Script, BaseObject, "trigger", trigger, xmlElement, mode);
+        XMLPortEventSink(Script, BaseObject, "trigger", trigger, xmlelement, mode);
 
         if(this->isOnLoad()) // If the object is onLoad the code is executed at once.
             this->execute();
@@ -95,16 +95,16 @@
     /**
     @brief
         Creates a port that can be used to channel events and react to them.
-    @param xmlElement
+    @param xmlelement
         The element.
     @param mode
         The mode.
     */
-    void Script::XMLEventPort(Element& xmlElement, XMLPort::Mode mode)
+    void Script::XMLEventPort(Element& xmlelement, XMLPort::Mode mode)
     {
         SUPER(Script, XMLEventPort, xmlElement, mode);
 
-        XMLPortEventState(Script, BaseObject, "trigger", trigger, xmlElement, mode);
+        XMLPortEventState(Script, BaseObject, "trigger", trigger, xmlelement, mode);
     }
 
     /**

Modified: code/trunk/src/modules/objects/Script.h
===================================================================
--- code/trunk/src/modules/objects/Script.h	2010-09-11 12:50:21 UTC (rev 7406)
+++ code/trunk/src/modules/objects/Script.h	2010-09-11 12:52:59 UTC (rev 7407)
@@ -82,7 +82,7 @@
             virtual ~Script();
 
             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode); //!< Method for creating a Script object through XML.
-            virtual void XMLEventPort(Element& xmlElement, XMLPort::Mode mode); //!< Creates a port that can be used to channel events and react to them.
+            virtual void XMLEventPort(Element& xmlelement, XMLPort::Mode mode); //!< Creates a port that can be used to channel events and react to them.
 
             void trigger(bool triggered); //!< Is called when an event comes in trough the event port.
             void execute(); //!< Executes the Scripts code, depending on the mode.