Merge branch 'no-boost' of https://github.com/WagicProject/wagic into no-boost

projects/mtg/include/ObjectAnalytics.h

@@ -1,8 +1,6 @@
 #ifndef OBJECTANALYTICS_H
 #define OBJECTANALYTICS_H
 
-#include <boost/cstdint.hpp>
-
 #ifdef _DEBUG
 #define TRACK_OBJECT_USAGE
 #endif

projects/mtg/include/PrecompiledHeader.h

@@ -21,8 +21,9 @@
 
 #include "GameOptions.h"
 
-#ifndef WP8
+#if !defined(WP8) && !defined(QT_CONFIG)
 #include <boost/shared_ptr.hpp>
+#include <boost/scoped_ptr.hpp>
 #endif
 
 #if defined (WP8) || defined (IOS) || defined (ANDROID) || defined (QT_CONFIG) || defined (SDL_CONFIG)

projects/mtg/include/WResource_Fwd.h

@@ -4,6 +4,15 @@
 #if (__cplusplus > 199711L)
 #include <memory>
 typedef std::shared_ptr<JQuad> JQuadPtr;
+#elif defined(QT_CONFIG)
+#include <QSharedPointer>
+class JQuadPtr : public QSharedPointer<JQuad>
+{
+public:
+    JQuadPtr() : QSharedPointer(){};
+    JQuadPtr(JQuad*ptr) : QSharedPointer(ptr){};
+    JQuad* get() const {return data();};
+};
 #else
 #include <boost/shared_ptr.hpp>
 typedef boost::shared_ptr<JQuad> JQuadPtr;

projects/mtg/src/ExtraCost.cpp

@@ -7,7 +7,21 @@
 #include "Player.h"
 #include "Counters.h"
 #include "AllAbilities.h"
+
+#if !defined(QT_CONFIG)
 #include <boost/scoped_ptr.hpp>
+typedef boost::scoped_ptr<ManaCost> ManaCostPtr;
+#else
+#include <QScopedPointer>
+class ManaCostPtr : public QScopedPointer<ManaCost>
+{
+public:
+    ManaCostPtr(ManaCost*m) : QScopedPointer(m){
+    };
+    ManaCost* get() const {return data();};
+
+};
+#endif
 
 SUPPORT_OBJECT_ANALYTICS(ExtraCost)
 
@@ -209,7 +223,7 @@ LifeorManaCost::LifeorManaCost(TargetChooser *_tc, string manaType)
     string buildType ="{";
     buildType.append(manaType);
     buildType.append("}");
-    boost::scoped_ptr<ManaCost> cost(ManaCost::parseManaCost(buildType));
+    ManaCostPtr cost(ManaCost::parseManaCost(buildType));
     manaCost.copy(cost.get());
 }
 

projects/mtg/src/WResourceManager.cpp

@@ -11,6 +11,8 @@
 #endif
 #include "WFont.h"
 
+#include <typeinfo>
+
 #ifdef FORCE_LOW_CACHE_MEMORY
 //#define FORCE_LOW_CACHE_MEMORY
 const unsigned int kConstrainedCacheLimit = 8 * 1024 * 1024;

projects/mtg/wagic.pri

@@ -39,7 +39,6 @@ windows{
 macx:INCLUDEPATH += /opt/include
 INCLUDEPATH += ../../JGE/include
 INCLUDEPATH += ../../JGE/src/zipFS
-INCLUDEPATH += ../../Boost
 INCLUDEPATH += include
 
 unix:!symbian:LIBS += -lz