Ported QCache and related code away from Qt

5 files changed, 6 insertions, 9 deletions

diff --git a/tests/CSGTextCache.cc b/tests/CSGTextCache.cc
index 4234c63..e512dfb 100644
--- a/tests/CSGTextCache.cc
+++ b/tests/CSGTextCache.cc
@@ -2,23 +2,23 @@
 
 bool CSGTextCache::contains(const AbstractNode &node) const
 {
-	return this->cache.contains(this->tree.getString(node));
+	return this->cache.find(this->tree.getString(node)) != this->cache.end();
 }
 
 // We cannot return a reference since the [] operator returns a temporary value
 string CSGTextCache::operator[](const AbstractNode &node) const
 {
-	return this->cache[this->tree.getString(node)];
+	return this->cache.at(this->tree.getString(node));
 }
 
 void CSGTextCache::insert(const class AbstractNode &node, const string & value)
 {
-	this->cache.insert(this->tree.getString(node), value);
+	this->cache.insert(std::make_pair(this->tree.getString(node), value));
 }
 
 void CSGTextCache::remove(const class AbstractNode &node)
 {
-	this->cache.remove(this->tree.getString(node));
+	this->cache.erase(this->tree.getString(node));
 }
 
 void CSGTextCache::clear()
diff --git a/tests/CSGTextCache.h b/tests/CSGTextCache.h
index 57a6972..62f26ce 100644
--- a/tests/CSGTextCache.h
+++ b/tests/CSGTextCache.h
@@ -1,9 +1,9 @@
 #ifndef CSGTEXTCACHE_H_
 #define CSGTEXTCACHE_H_
 
-#include "myqhash.h"
 #include "Tree.h"
 #include <string>
+#include <boost/unordered_map.hpp>
 
 using std::string;
 
@@ -20,7 +20,7 @@ public:
 	void clear();
 
 private:
-	QHash<string, string> cache;
+	boost::unordered_map<string, string> cache;
 	const Tree &tree;
 };
 
diff --git a/tests/cgalpngtest.cc b/tests/cgalpngtest.cc
index 01722cf..bfa92da 100644
--- a/tests/cgalpngtest.cc
+++ b/tests/cgalpngtest.cc
@@ -24,7 +24,6 @@
  *
  */
 
-#include "myqhash.h"
 #include "tests-common.h"
 #include "openscad.h"
 #include "node.h"
diff --git a/tests/cgaltest.cc b/tests/cgaltest.cc
index 0b433bf..055e970 100644
--- a/tests/cgaltest.cc
+++ b/tests/cgaltest.cc
@@ -24,7 +24,6 @@
  *
  */
 
-#include "myqhash.h"
 #include "tests-common.h"
 #include "openscad.h"
 #include "node.h"
diff --git a/tests/csgtermtest.cc b/tests/csgtermtest.cc
index c8fcc6b..8f2d76e 100644
--- a/tests/csgtermtest.cc
+++ b/tests/csgtermtest.cc
@@ -24,7 +24,6 @@
  *
  */
 
-#include "myqhash.h"
 #include "tests-common.h"
 #include "PolySetEvaluator.h"
 #include "CSGTermEvaluator.h"