ios changes

include/Utils/BindableVar.h

@@ -1,12 +1,14 @@
 #ifndef BINDABLE_VAR_H_INCLUDED
 #define BINDABLE_VAR_H_INCLUDED
 
-#include "boost/signal.hpp"
+#include "boost/signals2.hpp"
 #include "boost/variant.hpp"
 
+
 namespace SE
 {
 
+
 //Must be stored in shared_ptr:
 
 template<typename TYPENAME>
@@ -17,7 +19,7 @@ protected:
 
 public:
 
-	boost::signal<void(const TYPENAME&)> OnVarChanged;
+    boost::signals2::signal<void(const TYPENAME&)> OnVarChanged;
 
 	TBindableVar()
 	{

include/Utils/IosApi/IosWrapper.h

@@ -21,5 +21,8 @@ void AppOnScroll(int shiftx, int shifty, int touchNumber);
 void AppOnScale(float scale);
 void AppOnTapUpAfterMove(int posx, int posy, int touchNumber);
 
+    
+    void SetBindDrawableFunc(void(*funcPtr)());
 
-}
+
+}

include/Utils/Network/Network.h

@@ -10,12 +10,11 @@
 
 #include "boost/asio.hpp"
 #include "boost/date_time/posix_time/posix_time.hpp"
-#include "boost/signal.hpp"
+#include "boost/signals2.hpp"
 #include "boost/variant.hpp"
 
 #include "include/Utils/Network/SignalSender.h"
 
-
 namespace SE
 {
 
@@ -28,7 +27,7 @@ void SendPropertyTree(boost::asio::io_service& ioService, boost::asio::ip::tcp::
 class TDataReadSignalMap
 {
 protected:
-	std::map<std::string, std::shared_ptr<boost::signal<void(boost::property_tree::ptree)>>> SignalMap;
+	std::map<std::string, std::shared_ptr<boost::signals2::signal<void(boost::property_tree::ptree)>>> SignalMap;
 public:
 
 	void AddSlot(const std::string& nodeName, boost::function<void(boost::property_tree::ptree)> f);
@@ -69,7 +68,7 @@ public:
 
 	void HandleReadData(const boost::system::error_code& error);
  
-	boost::signal<void()> ErrorSignal;
+	boost::signals2::signal<void()> ErrorSignal;
 };
 
 
@@ -100,9 +99,9 @@ public:
 
 	void HandleGetData(boost::property_tree::ptree pTree);
 
-	boost::signal<void()> AuthorizedSignal;
-	boost::signal<void(std::string, std::string)> SaveLoginPasswordSignal;
-	boost::signal<void()> ErrorSignal;
+	boost::signals2::signal<void()> AuthorizedSignal;
+	boost::signals2::signal<void(std::string, std::string)> SaveLoginPasswordSignal;
+	boost::signals2::signal<void()> ErrorSignal;
 };
 
 typedef boost::variant<std::shared_ptr<TSimpleAuthorization>> TAuthorizationVariant;
@@ -127,10 +126,10 @@ protected:
 	bool Opened;
 
 public:
-	boost::signal<void()> OnAddressNotResolvedSignal;
-	boost::signal<void()> OnConnectedSignal;
-	boost::signal<void()> OnAutorizedSignal;
-	boost::signal<void()> OnDisconnectedSignal;
+	boost::signals2::signal<void()> OnAddressNotResolvedSignal;
+	boost::signals2::signal<void()> OnConnectedSignal;
+	boost::signals2::signal<void()> OnAutorizedSignal;
+	boost::signals2::signal<void()> OnDisconnectedSignal;
 	
 	boost::shared_ptr<TDataReader> ClientDataReader;
 
@@ -158,4 +157,4 @@ public:
 } //namespace SE
 
 
-#endif
+#endif

include/Utils/Network/SignalSender.h

@@ -6,12 +6,14 @@
 #include "boost/shared_ptr.hpp"
 #include "boost/array.hpp"
 #include "boost/enable_shared_from_this.hpp"
-#include "boost/signal.hpp"
+#include "boost/signals2.hpp"
 #include "boost/thread.hpp"
 #include "boost/date_time/posix_time/posix_time.hpp"
 #include "boost/property_tree/ptree.hpp"
 #include "boost/property_tree/xml_parser.hpp"
 
+
+
 namespace SE
 {
 	//Xperimental -- need to optimize this
@@ -25,7 +27,7 @@ struct TSignalSender
 
 	std::string Data;
 
-	boost::signal<void()> ErrorSignal;
+	boost::signals2::signal<void()> ErrorSignal;
 
 	TSignalSender(boost::asio::ip::tcp::socket& socket, int length, std::string data)
 		: Socket(socket)

include/Utils/ThreadUtils.h

@@ -2,7 +2,7 @@
 #define THREAD_UTILS_H_INCLUDED
 
 #include "boost/asio.hpp"
-#include "boost/signal.hpp"
+#include "boost/signals2.hpp"
 #include "boost/thread.hpp"
 
 
@@ -46,4 +46,4 @@ namespace SE
 
 } //namespace SE
 
-#endif
+#endif

include/Utils/Utils.h

@@ -14,7 +14,8 @@ This code combines additional routines (such as console/log, exceptions, math ut
 
 #include "boost/asio.hpp"
 #include "boost/date_time/posix_time/posix_time.hpp"
-#include "boost/signal.hpp"
+#include "boost/signals2.hpp"
+
 
 
 #include "include/Utils/Console/Console.h"
@@ -42,4 +43,4 @@ This code combines additional routines (such as console/log, exceptions, math ut
 #endif
 
 
-#endif
+#endif