[Orxonox-commit 1339] r6057 - code/trunk/src/orxonox/overlays

[rgrieder at orxonox.net]

Author: rgrieder
Date: 2009-11-13 11:31:30 +0100 (Fri, 13 Nov 2009)
New Revision: 6057

Modified:
   code/trunk/src/orxonox/overlays/OrxonoxOverlay.cc
   code/trunk/src/orxonox/overlays/OrxonoxOverlay.h
Log:
Moved an inline function to the source in OrxonoxOverlay.

Modified: code/trunk/src/orxonox/overlays/OrxonoxOverlay.cc
===================================================================
--- code/trunk/src/orxonox/overlays/OrxonoxOverlay.cc	2009-11-13 10:23:54 UTC (rev 6056)
+++ code/trunk/src/orxonox/overlays/OrxonoxOverlay.cc	2009-11-13 10:31:30 UTC (rev 6057)
@@ -358,4 +358,15 @@
         if (it != overlays_s.end())
             (*it).second->rotate(angle);
     }
+
+    void OrxonoxOverlay::setOverlayGroup(OverlayGroup* group)
+    {
+        if (group != this->group_)
+        {
+            if (this->group_)
+                this->group_->removeElement(this);
+            this->group_ = group;
+            this->changedOverlayGroup();
+        }
+    }
 }

Modified: code/trunk/src/orxonox/overlays/OrxonoxOverlay.h
===================================================================
--- code/trunk/src/orxonox/overlays/OrxonoxOverlay.h	2009-11-13 10:23:54 UTC (rev 6056)
+++ code/trunk/src/orxonox/overlays/OrxonoxOverlay.h	2009-11-13 10:31:30 UTC (rev 6057)
@@ -42,7 +42,6 @@
 #include "util/OgreForwardRefs.h"
 #include "core/BaseObject.h"
 #include "core/WindowEventListener.h"
-#include "OverlayGroup.h"
 
 namespace orxonox
 {
@@ -169,16 +168,7 @@
             { return this->owner_; }
         virtual void changedOwner() {}
 
-        inline void setOverlayGroup(OverlayGroup* group)
-        {
-            if (group != this->group_)
-            {
-                if(this->group_)
-                    this->group_->removeElement(this);
-                this->group_ = group;
-                this->changedOverlayGroup();
-            }
-        }
+        void setOverlayGroup(OverlayGroup* group);
         inline OverlayGroup* getOverlayGroup() const
             { return this->group_; }
         virtual void changedOverlayGroup()