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

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;