removing deprecated

oxygine/src/Actor.cpp

@@ -841,46 +841,6 @@ namespace oxygine
         }
     }
 
-    void Actor::insertChildAfter(spActor actor, spActor insertAfter)
-    {
-        OX_ASSERT(actor);
-        if (!actor)
-            return;
-
-        if (insertAfter)
-        {
-            OX_ASSERT(insertAfter->getParent() == this);
-        }
-
-        actor->detach();
-
-        if (insertAfter)
-            _children.insert_after(actor, insertAfter);
-        else
-            _children.append(actor);
-        setParent(actor.get(), this);
-    }
-
-    void Actor::insertChildBefore(spActor actor, spActor insertBefore)
-    {
-        OX_ASSERT(actor);
-        if (!actor)
-            return;
-
-        if (insertBefore)
-        {
-            OX_ASSERT(insertBefore->getParent() == this);
-        }
-
-        actor->detach();
-
-        if (insertBefore)
-            _children.insert_before(actor, insertBefore);
-        else
-            _children.prepend(actor);
-        setParent(actor.get(), this);
-    }
-
     void Actor::insertSiblingBefore(spActor actor)
     {
         OX_ASSERT(actor != this);

oxygine/src/Actor.h

@@ -230,16 +230,13 @@ namespace oxygine
         /**Returns true if actor is child or located deeper in current subtree*/
         bool isDescendant(const spActor& actor) const;
 
-        /**DEPRECATED, use insertSiblingBefore Inserts the specified actor before "where" actor as a child*/
-        OXYGINE_DEPRECATED
-        void insertChildBefore(spActor actor, spActor where);
-        /**DEPRECATED, use insertSiblingAfter Inserts the specified actor after "where" actor as a child*/
-        OXYGINE_DEPRECATED
-        void insertChildAfter(spActor actor, spActor where);
-
+		/**inserts sibling before 'this' actor*/
         void insertSiblingBefore(spActor);
+		/**inserts sibling after 'this' actor*/
         void insertSiblingAfter(spActor);
+		/**adds child first in list*/
         void prependChild(spActor actor);
+		/**adds child first in list*/
         void prependChild(Actor* actor);
         void addChild(spActor actor);
         void addChild(Actor* actor);//avoid conversion to spActor
@@ -419,33 +416,14 @@ namespace oxygine
     Vector2 convert_local2stage(const Actor* child, const Vector2& pos, const Actor* root = 0);
     Vector2 convert_stage2local(spActor child, const Vector2& pos, spActor root = 0);
     Vector2 convert_stage2local(const Actor* child, const Vector2& pos, const Actor* root = 0);
-
-    /**Deprecated*/
-    OXYGINE_DEPRECATED
-    inline Vector2 convert_local2root(spActor child, const Vector2& pos, spActor root = 0) { return convert_local2stage(child, pos, root); }
-    /**Deprecated*/
-    OXYGINE_DEPRECATED
-    inline Vector2 convert_root2local(spActor child, const Vector2& pos, spActor root = 0) { return convert_stage2local(child, pos, root); }
+	
 
     /*Tests 2 actors intersection and returns contact point in space of object1.*/
     bool testIntersection(spActor obj1, spActor obj2, spActor commonParent = 0, Vector2* contact = 0);
 
 
-    //deprecated, use actor::computeGlobalTransform
-    OXYGINE_DEPRECATED
-    Transform getGlobalTransform(spActor child, spActor parent = 0);
-
-    //deprecated, use actor::computeGlobalTransform
-    OXYGINE_DEPRECATED
-    Transform getGlobalTransform2(spActor child, Actor* parent = 0);
-
-
     RectF getActorTransformedDestRect(Actor* actor, const Transform& tr);
 
-    //deprecated, use reattachActor
-    OXYGINE_DEPRECATED
-    void    changeParentAndSavePosition(spActor mutualParent, spActor actor, spActor newParent);
-
     /**changes actor parent but with the same position on the screen*/
     void    reattachActor(spActor actor, spActor newParent, spActor root = 0);
 

oxygine/src/RootActor.h

@@ -1,12 +0,0 @@
-#pragma once
-#include "oxygine_include.h"
-#include "Stage.h"
-
-namespace oxygine
-{
-    typedef Stage RootActor;
-    typedef intrusive_ptr<Stage> spRootActor;
-
-    /**Used for compatibility. Was renamed to getStage. Deprecated*/
-    inline const spRootActor& getRoot() {return getStage();}
-}

oxygine/src/oxygine-framework.h

@@ -27,7 +27,6 @@
 #include "PointerState.h"
 #include "ProgressBar.h"
 #include "RenderState.h"
-#include "RootActor.h"
 #include "Stage.h"
 #include "SlidingActor.h"
 #include "Sprite.h"

oxygine/src/oxygine_include.h

@@ -103,7 +103,7 @@ namespace oxygine { namespace log { void error(const char* format, ...); } }
 
 #define OXYGINE_RENDERER 4
 
-#define OXYGINE_VERSION 2
+#define OXYGINE_VERSION 3
 
 #ifdef __GNUC__
 #   define OXYGINE_DEPRECATED __attribute__((deprecated))