Index: code/branches/gcc43/src/orxonox/objects/Camera.h
===================================================================
--- code/branches/gcc43/src/orxonox/objects/Camera.h	(revision 1579)
+++ code/branches/gcc43/src/orxonox/objects/Camera.h	(revision 1634)
@@ -46,5 +46,5 @@
 
         void setPositionNode(Ogre::SceneNode* node);
-        inline Ogre::SceneNode* getCameraNode() { return this->positionNode_; }
+        Ogre::SceneNode* getCameraNode() { return this->positionNode_; }
         // maybe also BaseObject
         void setTargetNode(Ogre::SceneNode* obj);
@@ -54,5 +54,5 @@
         void tick(float dt);
         void update();
-        inline bool hasFocus() { return this->bHasFocus_; }
+        bool hasFocus() { return this->bHasFocus_; }
 
       private:
Index: code/branches/gcc43/src/orxonox/objects/CameraHandler.h
===================================================================
--- code/branches/gcc43/src/orxonox/objects/CameraHandler.h	(revision 1579)
+++ code/branches/gcc43/src/orxonox/objects/CameraHandler.h	(revision 1634)
@@ -52,7 +52,7 @@
 
     public:
-      inline static CameraHandler* getInstance() { if (!CameraHandler::singletonRef) CameraHandler::singletonRef = new CameraHandler(); return CameraHandler::singletonRef; }
-      inline ~CameraHandler() { CameraHandler::singletonRef = NULL; }
-      inline Camera* getActiveCamera() { return this->focusList_.back(); }
+      static CameraHandler* getInstance() { if (!CameraHandler::singletonRef) CameraHandler::singletonRef = new CameraHandler(); return CameraHandler::singletonRef; }
+      ~CameraHandler() { CameraHandler::singletonRef = NULL; }
+      Camera* getActiveCamera() { return this->focusList_.back(); }
       /*void registerCamera(Camera* newCam);
       void changeActiveCamera(Camera* setCam);*/
Index: code/branches/gcc43/src/orxonox/objects/ParticleSpawner.h
===================================================================
--- code/branches/gcc43/src/orxonox/objects/ParticleSpawner.h	(revision 1579)
+++ code/branches/gcc43/src/orxonox/objects/ParticleSpawner.h	(revision 1634)
@@ -43,5 +43,5 @@
             ParticleSpawner(const std::string& templateName, LODParticle::LOD detaillevel, float lifetime, float delay = 0, const Vector3& direction = Vector3::ZERO);
             virtual ~ParticleSpawner();
-            inline ParticleInterface* getParticleInterface() const
+            ParticleInterface* getParticleInterface() const
                 { return this->particle_; }
 
Index: code/branches/gcc43/src/orxonox/objects/SpaceShip.h
===================================================================
--- code/branches/gcc43/src/orxonox/objects/SpaceShip.h	(revision 1579)
+++ code/branches/gcc43/src/orxonox/objects/SpaceShip.h	(revision 1634)
@@ -66,17 +66,17 @@
             void getFocus();
 
-            inline float getMaxSpeed() const
+            float getMaxSpeed() const
                 { return this->maxSpeed_; }
-            inline float getMaxSideAndBackSpeed() const
+            float getMaxSideAndBackSpeed() const
                 { return this->maxSideAndBackSpeed_; }
-            inline float getMaxRotation() const
+            float getMaxRotation() const
                 { return this->maxRotation_; }
-            inline float getTransAcc() const
+            float getTransAcc() const
                 { return this->translationAcceleration_; }
-            inline float getRotAcc() const
+            float getRotAcc() const
                 { return this->rotationAcceleration_; }
-            inline float getTransDamp() const
+            float getTransDamp() const
                 { return this->translationDamping_; }
-            inline float getRotDamp() const
+            float getRotDamp() const
                 { return this->rotationDamping_; }
 
@@ -98,11 +98,11 @@
             void doFire();
 
-            inline const Vector3& getDir() const
+            const Vector3& getDir() const
                 { return this->currentDir_; }
-            inline const Vector3& getInitialDir() const
+            const Vector3& getInitialDir() const
                 { return this->initialDir_; }
-            inline const Vector3& getOrth() const
+            const Vector3& getOrth() const
                 { return this->currentOrth_; }
-            inline const Vector3& getInitialOrth() const
+            const Vector3& getInitialOrth() const
                 { return this->initialOrth_; }
 
Index: code/branches/gcc43/src/orxonox/objects/WorldEntity.h
===================================================================
--- code/branches/gcc43/src/orxonox/objects/WorldEntity.h	(revision 1579)
+++ code/branches/gcc43/src/orxonox/objects/WorldEntity.h	(revision 1634)
@@ -53,131 +53,131 @@
             virtual void loadParams(TiXmlElement* xmlElem);
             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
-            virtual inline bool create(){ return Synchronisable::create(); }
+            virtual bool create(){ return Synchronisable::create(); }
 
             void attachWorldEntity(WorldEntity* entity);
             const WorldEntity* getAttachedWorldEntity(unsigned int index) const;
 
-            inline Ogre::SceneNode* getNode()
+            Ogre::SceneNode* getNode()
                 { return this->node_; }
 
-            inline void setNode(Ogre::SceneNode* node)
+            void setNode(Ogre::SceneNode* node)
                 { this->node_ = node; }
 
-            inline void setPosition(const Vector3& pos)
+            void setPosition(const Vector3& pos)
                 { this->node_->setPosition(pos); }
-            inline void setPositionLoader1(const Vector3& pos)
+            void setPositionLoader1(const Vector3& pos)
                 { this->node_->setPosition(pos); }
-            inline void setPositionLoader2(Real x, Real y, Real z)
+            void setPositionLoader2(Real x, Real y, Real z)
                 { this->node_->setPosition(x, y, z); }
-            inline void setPosition(Real x, Real y, Real z)
+            void setPosition(Real x, Real y, Real z)
                 { this->node_->setPosition(x, y, z); }
-            inline const Vector3& getPosition() const
+            const Vector3& getPosition() const
                 { return this->node_->getPosition(); }
 
-            inline void translate(const Vector3 &d, Ogre::Node::TransformSpace relativeTo=Ogre::Node::TS_PARENT)
+            void translate(const Vector3 &d, Ogre::Node::TransformSpace relativeTo=Ogre::Node::TS_PARENT)
                 { this->node_->translate(d, relativeTo); }
-            inline void translate(Real x, Real y, Real z, Ogre::Node::TransformSpace relativeTo=Ogre::Node::TS_PARENT)
+            void translate(Real x, Real y, Real z, Ogre::Node::TransformSpace relativeTo=Ogre::Node::TS_PARENT)
                 { this->node_->translate(x, y, z, relativeTo); }
-            inline void translate(const Matrix3 &axes, const Vector3 &move, Ogre::Node::TransformSpace relativeTo=Ogre::Node::TS_PARENT)
+            void translate(const Matrix3 &axes, const Vector3 &move, Ogre::Node::TransformSpace relativeTo=Ogre::Node::TS_PARENT)
                 { this->node_->translate(axes, move, relativeTo); }
-            inline void translate(const Matrix3 &axes, Real x, Real y, Real z, Ogre::Node::TransformSpace relativeTo=Ogre::Node::TS_PARENT)
+            void translate(const Matrix3 &axes, Real x, Real y, Real z, Ogre::Node::TransformSpace relativeTo=Ogre::Node::TS_PARENT)
                 { this->node_->translate(axes, x, y, z, relativeTo); }
 
-            inline void yaw(const Radian &angle, Ogre::Node::TransformSpace relativeTo=Ogre::Node::TS_LOCAL)
+            void yaw(const Radian &angle, Ogre::Node::TransformSpace relativeTo=Ogre::Node::TS_LOCAL)
                 { this->node_->yaw(angle, relativeTo); }
-            inline void pitch(const Radian &angle, Ogre::Node::TransformSpace relativeTo=Ogre::Node::TS_LOCAL)
+            void pitch(const Radian &angle, Ogre::Node::TransformSpace relativeTo=Ogre::Node::TS_LOCAL)
                 { this->node_->pitch(angle, relativeTo); }
-            inline void roll(const Radian &angle, Ogre::Node::TransformSpace relativeTo=Ogre::Node::TS_LOCAL)
+            void roll(const Radian &angle, Ogre::Node::TransformSpace relativeTo=Ogre::Node::TS_LOCAL)
                 { this->node_->roll(angle, relativeTo); }
             void setYawPitchRoll(const Degree& yaw, const Degree& pitch, const Degree& roll);
 
-            inline void setYaw(const Degree &angle)
+            void setYaw(const Degree &angle)
                 { this->node_->yaw(angle, Ogre::Node::TS_LOCAL); }
-            inline void setPitch(const Degree &angle)
+            void setPitch(const Degree &angle)
                 { this->node_->pitch(angle, Ogre::Node::TS_LOCAL); }
-            inline void setRoll(const Degree &angle)
+            void setRoll(const Degree &angle)
                 { this->node_->roll(angle, Ogre::Node::TS_LOCAL); }
 
-            inline const Ogre::Quaternion& getOrientation()
+            const Ogre::Quaternion& getOrientation()
               { return this->node_->getOrientation(); }
-            inline void setOrientation(const Ogre::Quaternion& quat)
+            void setOrientation(const Ogre::Quaternion& quat)
               { this->node_->setOrientation(quat); }
-            inline void rotate(const Vector3 &axis, const Radian &angle, Ogre::Node::TransformSpace relativeTo=Ogre::Node::TS_LOCAL)
+            void rotate(const Vector3 &axis, const Radian &angle, Ogre::Node::TransformSpace relativeTo=Ogre::Node::TS_LOCAL)
               { this->node_->rotate(axis, angle, relativeTo); }
-            inline void setDirectionLoader(Real x, Real y, Real z)
+            void setDirectionLoader(Real x, Real y, Real z)
               { this->setDirection(x, y, z); }
-            inline void setDirection(Real x, Real y, Real z, Ogre::Node::TransformSpace relativeTo=Ogre::Node::TS_LOCAL, const Vector3 &localDirectionVector=Vector3::NEGATIVE_UNIT_Z)
+            void setDirection(Real x, Real y, Real z, Ogre::Node::TransformSpace relativeTo=Ogre::Node::TS_LOCAL, const Vector3 &localDirectionVector=Vector3::NEGATIVE_UNIT_Z)
               { this->node_->setDirection(x, y, z, relativeTo, localDirectionVector); }
-            inline void setDirection(const Vector3 &vec, Ogre::Node::TransformSpace relativeTo=Ogre::Node::TS_LOCAL, const Vector3 &localDirectionVector=Vector3::NEGATIVE_UNIT_Z)
+            void setDirection(const Vector3 &vec, Ogre::Node::TransformSpace relativeTo=Ogre::Node::TS_LOCAL, const Vector3 &localDirectionVector=Vector3::NEGATIVE_UNIT_Z)
               { this->node_->setDirection(vec, relativeTo, localDirectionVector); }
-            inline void lookAt(const Vector3 &targetPoint, Ogre::Node::TransformSpace relativeTo, const Vector3 &localDirectionVector=Vector3::NEGATIVE_UNIT_Z)
+            void lookAt(const Vector3 &targetPoint, Ogre::Node::TransformSpace relativeTo, const Vector3 &localDirectionVector=Vector3::NEGATIVE_UNIT_Z)
               { this->node_->lookAt(targetPoint, relativeTo, localDirectionVector); }
 
-            inline void setScale(const Vector3 &scale)
+            void setScale(const Vector3 &scale)
               { this->node_->setScale(scale); }
-            inline void setScale(Real x, Real y, Real z)
+            void setScale(Real x, Real y, Real z)
               { this->node_->setScale(x, y, z); }
-            inline void setScale(Real scale)
+            void setScale(Real scale)
               { this->node_->setScale(scale, scale, scale); }
-            inline void setTotalScale(Real scale)
+            void setTotalScale(Real scale)
               { this->node_->setScale(scale, scale, scale); }
-            inline const Vector3& getScale(void) const
+            const Vector3& getScale(void) const
               { return this->node_->getScale(); }
-            inline void scale(const Vector3 &scale)
+            void scale(const Vector3 &scale)
               { this->node_->scale(scale); }
-            inline void scale(Real x, Real y, Real z)
+            void scale(Real x, Real y, Real z)
               { this->node_->scale(x, y, z); }
-            inline void scale(Real scale)
+            void scale(Real scale)
               { this->node_->scale(scale, scale, scale); }
 
-            inline void attachObject(Ogre::MovableObject *obj)
+            void attachObject(Ogre::MovableObject *obj)
               { this->node_->attachObject(obj); }
-            inline void attachObject(Mesh &mesh)
+            void attachObject(Mesh &mesh)
               { this->node_->attachObject(mesh.getEntity()); }
-            inline void detachObject(Ogre::MovableObject *obj)
+            void detachObject(Ogre::MovableObject *obj)
               { this->node_->detachObject(obj); }
-            inline void detachAllObjects()
+            void detachAllObjects()
               { this->node_->detachAllObjects(); }
 
-            inline void setVelocity(const Vector3& velocity)
+            void setVelocity(const Vector3& velocity)
                 { this->velocity_ = velocity; }
-            inline void setVelocity(Real x, Real y, Real z)
+            void setVelocity(Real x, Real y, Real z)
                 { this->velocity_.x = x; this->velocity_.y = y; this->velocity_.z = z; }
-            inline const Vector3& getVelocity() const
+            const Vector3& getVelocity() const
                 { return this->velocity_; }
 
-            inline void setAcceleration(const Vector3& acceleration)
+            void setAcceleration(const Vector3& acceleration)
                 { this->acceleration_ = acceleration; }
-            inline void setAcceleration(Real x, Real y, Real z)
+            void setAcceleration(Real x, Real y, Real z)
                 { this->acceleration_.x = x; this->acceleration_.y = y; this->acceleration_.z = z; }
-            inline const Vector3& getAcceleration() const
+            const Vector3& getAcceleration() const
                 { return this->acceleration_; }
 
-            inline void setRotationAxisLoader(const Vector3& axis)
+            void setRotationAxisLoader(const Vector3& axis)
                 { this->rotationAxis_ = axis; rotationAxis_.normalise(); }
-            inline void setRotationAxis(const Vector3& axis)
+            void setRotationAxis(const Vector3& axis)
                 { this->rotationAxis_ = axis; rotationAxis_.normalise(); }
-            inline void setRotationAxis(Real x, Real y, Real z)
+            void setRotationAxis(Real x, Real y, Real z)
                 { this->rotationAxis_.x = x; this->rotationAxis_.y = y; this->rotationAxis_.z = z; rotationAxis_.normalise(); }
-            inline const Vector3& getRotationAxis() const
+            const Vector3& getRotationAxis() const
                 { return this->rotationAxis_; }
 
-//            inline void setRotationRate(const Radian& angle)
+//            void setRotationRate(const Radian& angle)
 //                { this->rotationRate_ = angle; }
-            inline void setRotationRate(const Degree& angle)
+            void setRotationRate(const Degree& angle)
                 { this->rotationRate_ = angle; this->setStatic(angle == Degree(0)); }
-            inline const Radian& getRotationRate() const
+            const Radian& getRotationRate() const
                 { return this->rotationRate_; }
 
-            inline void setMomentum(const Radian& angle)
+            void setMomentum(const Radian& angle)
                 { this->momentum_ = angle; }
-            inline void setMomentum(const Degree& angle)
+            void setMomentum(const Degree& angle)
                 { this->momentum_ = angle; }
-            inline const Radian& getMomentum() const
+            const Radian& getMomentum() const
                 { return this->momentum_; }
 
-            inline void setStatic(bool bStatic)
+            void setStatic(bool bStatic)
                 { this->bStatic_ = bStatic; }
-            inline bool isStatic()
+            bool isStatic()
                 { return this->bStatic_; }
 
Index: code/branches/gcc43/src/orxonox/objects/weapon/AmmunitionDump.h
===================================================================
--- code/branches/gcc43/src/orxonox/objects/weapon/AmmunitionDump.h	(revision 1579)
+++ code/branches/gcc43/src/orxonox/objects/weapon/AmmunitionDump.h	(revision 1634)
@@ -60,5 +60,5 @@
 
   protected:
-    inline bool create() { return Synchronisable::create(); }
+    bool create() { return Synchronisable::create(); }
     void registerAllVariables();
 
Index: code/branches/gcc43/src/orxonox/objects/weapon/BaseWeapon.h
===================================================================
--- code/branches/gcc43/src/orxonox/objects/weapon/BaseWeapon.h	(revision 1579)
+++ code/branches/gcc43/src/orxonox/objects/weapon/BaseWeapon.h	(revision 1634)
@@ -72,5 +72,5 @@
     void setAmmoDump(AmmunitionDump*);
 
-    inline virtual void loadParams(TiXmlElement* xmlElem) { Model::loadParams(xmlElem); };
+    virtual void loadParams(TiXmlElement* xmlElem) { Model::loadParams(xmlElem); };
 
     virtual void tick(float dt);
Index: code/branches/gcc43/src/orxonox/objects/weapon/Bullet.h
===================================================================
--- code/branches/gcc43/src/orxonox/objects/weapon/Bullet.h	(revision 1579)
+++ code/branches/gcc43/src/orxonox/objects/weapon/Bullet.h	(revision 1634)
@@ -46,5 +46,5 @@
     virtual void tick(float dt) { }
 
-    inline virtual void loadParams(TiXmlElement* xmlElem) { Model::loadParams(xmlElem); };
+    virtual void loadParams(TiXmlElement* xmlElem) { Model::loadParams(xmlElem); };
  };
 }
Index: code/branches/gcc43/src/orxonox/objects/weapon/BulletManager.h
===================================================================
--- code/branches/gcc43/src/orxonox/objects/weapon/BulletManager.h	(revision 1579)
+++ code/branches/gcc43/src/orxonox/objects/weapon/BulletManager.h	(revision 1634)
@@ -57,8 +57,8 @@
     virtual void tick(float dt);
 
-    inline virtual void loadParams(TiXmlElement* xmlElem) { BaseObject::loadParams(xmlElem); };
+    virtual void loadParams(TiXmlElement* xmlElem) { BaseObject::loadParams(xmlElem); };
 
   protected:
-    inline bool create() { return Synchronisable::create(); }
+    bool create() { return Synchronisable::create(); }
     void registerAllVariables();
 
