X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbooleanevaluator.h;h=c3f61f2b543e943878465e3aea564ff87d7cf759;hb=302977793935e100a5bf37822836531cafb03bf3;hp=08ed432665bd48fd6822e2215b53b3adc2d3d6ca;hpb=02097e6a1ddbffbc2217005c3c2ebba528f5248f;p=builder.git

diff --git a/source/booleanevaluator.h b/source/booleanevaluator.h
index 08ed432..c3f61f2 100644
--- a/source/booleanevaluator.h
+++ b/source/booleanevaluator.h
@@ -1,17 +1,18 @@
 #ifndef BOOLEANEVALUATOR_H_
 #define BOOLEANEVALUATOR_H_
 
+#include <functional>
 #include <string>
 #include <vector>
-#include <sigc++/slot.h>
 
 class BooleanEvaluator
 {
 public:
-	typedef sigc::slot<bool, const std::string &, const std::string *> Slot;
+	using ValueFunction = std::function<bool(const std::string &)>;
+	using CompareFunction = std::function<bool(const std::string &, const std::string *)>;
 
 private:
-	Slot slot;
+	CompareFunction func;
 	std::string ops;
 	std::vector<std::string> var_stack;
 	std::vector<unsigned char> value_stack;
@@ -19,7 +20,8 @@ private:
 	bool last_was_op;
 
 public:
-	BooleanEvaluator(const Slot &, bool = true);
+	BooleanEvaluator(const ValueFunction &);
+	BooleanEvaluator(const CompareFunction &);
 
 	bool evaluate(const std::string &);
 private: