Changeset 7407

Timestamp:

Sep 11, 2010, 2:52:59 PM (14 years ago)

Author:

dafrick

Message:

xmlElement → xmlelement

Location:

code/trunk/src/modules

Files:

• notifications/NotificationDispatcher.cc (modified) (1 diff)
• notifications/NotificationDispatcher.h (modified) (1 diff)
• objects/Script.cc (modified) (2 diffs)
• objects/Script.h (modified) (1 diff)

code/trunk/src/modules/notifications/NotificationDispatcher.cc

@@ -72 +72 @@
         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);
     }
 

code/trunk/src/modules/notifications/NotificationDispatcher.h

@@ -55 +55 @@
             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);
 
             /**

code/trunk/src/modules/objects/Script.cc

@@ -73 +73 @@
     @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);
-
-        XMLPortEventSink(Script, BaseObject, "trigger", trigger, 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);
+
+        XMLPortEventSink(Script, BaseObject, "trigger", trigger, xmlelement, mode);
 
         if(this->isOnLoad()) // If the object is onLoad the code is executed at once.
@@ -96 +96 @@
     @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);
     }
 

code/trunk/src/modules/objects/Script.h

@@ -83 +83 @@
 
             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.