Index: code/branches/core2/src/orxonox/core/Executor.cc
===================================================================
--- code/branches/core2/src/orxonox/core/Executor.cc	(revision 947)
+++ code/branches/core2/src/orxonox/core/Executor.cc	(revision 957)
@@ -64,5 +64,5 @@
     }
 
-    void Executor::setDescription(const std::string& description)
+    Executor& Executor::setDescription(const std::string& description)
     {
         if (!this->bAddedDescription_)
@@ -72,4 +72,5 @@
             this->bAddedDescription_ = true;
         }
+        return (*this);
     }
 
@@ -79,5 +80,5 @@
     }
 
-    void Executor::setDescriptionParam(int param, const std::string& description)
+    Executor& Executor::setDescriptionParam(int param, const std::string& description)
     {
         if (param >= 0 && param < MAX_FUNCTOR_ARGUMENTS)
@@ -87,5 +88,5 @@
                 std::string paramnumber;
                 if (!Convert::ToString(&paramnumber, param))
-                    return;
+                    return (*this);
 
                 this->descriptionParam_[param] = std::string("ExecutorDescription::" + this->name_ + "::param" + paramnumber);
@@ -94,4 +95,5 @@
             }
         }
+        return (*this);
     }
 
@@ -104,5 +106,5 @@
     }
 
-    void Executor::setDescriptionReturnvalue(const std::string& description)
+    Executor& Executor::setDescriptionReturnvalue(const std::string& description)
     {
         if (!this->bAddedDescriptionReturnvalue_)
@@ -112,4 +114,5 @@
             this->bAddedDescriptionReturnvalue_ = true;
         }
+        return (*this);
     }
 
@@ -119,19 +122,23 @@
     }
 
-    void Executor::setDefaultValues(const MultiTypeMath& param1)
-    {
-        this->defaultValue_[0] = param1;
-        this->bAddedDefaultValue_[0] = true;
-    }
-
-    void Executor::setDefaultValues(const MultiTypeMath& param1, const MultiTypeMath& param2)
-    {
-        this->defaultValue_[0] = param1;
-        this->bAddedDefaultValue_[0] = true;
-        this->defaultValue_[1] = param2;
-        this->bAddedDefaultValue_[1] = true;
-    }
-
-    void Executor::setDefaultValues(const MultiTypeMath& param1, const MultiTypeMath& param2, const MultiTypeMath& param3)
+    Executor& Executor::setDefaultValues(const MultiTypeMath& param1)
+    {
+        this->defaultValue_[0] = param1;
+        this->bAddedDefaultValue_[0] = true;
+
+        return (*this);
+    }
+
+    Executor& Executor::setDefaultValues(const MultiTypeMath& param1, const MultiTypeMath& param2)
+    {
+        this->defaultValue_[0] = param1;
+        this->bAddedDefaultValue_[0] = true;
+        this->defaultValue_[1] = param2;
+        this->bAddedDefaultValue_[1] = true;
+
+        return (*this);
+    }
+
+    Executor& Executor::setDefaultValues(const MultiTypeMath& param1, const MultiTypeMath& param2, const MultiTypeMath& param3)
     {
         this->defaultValue_[0] = param1;
@@ -141,7 +148,9 @@
         this->defaultValue_[2] = param3;
         this->bAddedDefaultValue_[2] = true;
-    }
-
-    void Executor::setDefaultValues(const MultiTypeMath& param1, const MultiTypeMath& param2, const MultiTypeMath& param3, const MultiTypeMath& param4)
+
+        return (*this);
+    }
+
+    Executor& Executor::setDefaultValues(const MultiTypeMath& param1, const MultiTypeMath& param2, const MultiTypeMath& param3, const MultiTypeMath& param4)
     {
         this->defaultValue_[0] = param1;
@@ -153,7 +162,9 @@
         this->defaultValue_[3] = param4;
         this->bAddedDefaultValue_[3] = true;
-    }
-
-    void Executor::setDefaultValues(const MultiTypeMath& param1, const MultiTypeMath& param2, const MultiTypeMath& param3, const MultiTypeMath& param4, const MultiTypeMath& param5)
+
+        return (*this);
+    }
+
+    Executor& Executor::setDefaultValues(const MultiTypeMath& param1, const MultiTypeMath& param2, const MultiTypeMath& param3, const MultiTypeMath& param4, const MultiTypeMath& param5)
     {
         this->defaultValue_[0] = param1;
@@ -167,7 +178,9 @@
         this->defaultValue_[4] = param5;
         this->bAddedDefaultValue_[4] = true;
-    }
-
-    void Executor::setDefaultValue(unsigned int index, const MultiTypeMath& param)
+
+        return (*this);
+    }
+
+    Executor& Executor::setDefaultValue(unsigned int index, const MultiTypeMath& param)
     {
         if (index >= 0 && index < MAX_FUNCTOR_ARGUMENTS)
@@ -176,4 +189,5 @@
             this->bAddedDefaultValue_[index] = true;
         }
+        return (*this);
     }
 
