Cleaning a bit...

4 files changed, 10 insertions, 3 deletions

diff --git a/include/ReadJob.h b/include/ReadJob.h
index 2d53125..be846fb 100644
--- a/include/ReadJob.h
+++ b/include/ReadJob.h
@@ -8,14 +8,13 @@
 
 class ReadJob : public Task {
   public:
-      ReadJob(Handle *, Handle *, String = "^$", int = REG_EXTENDED);
+      ReadJob(Handle *, Handle *);
       virtual ~ReadJob();
     virtual int Do();
     virtual String GetName();
   private:
     Handle * s, * d;
     int current;
-    regex_t * preg;
 };
 
 #else
diff --git a/include/Regex.h b/include/Regex.h
new file mode 100644
index 0000000..363be99
--- /dev/null
+++ b/include/Regex.h
@@ -0,0 +1,8 @@
+#ifndef __REGEX_H__
+#define __REGEX_H__
+#ifdef __cplusplus
+
+#else
+#error This only works with a C++ compiler
+#endif
+#endif
diff --git a/lib/ReadJob.cc b/lib/ReadJob.cc
index d5b3212..8de0108 100644
--- a/lib/ReadJob.cc
+++ b/lib/ReadJob.cc
@@ -1,7 +1,7 @@
 #include "ReadJob.h"
 #include "HttpServ.h"
 
-ReadJob::ReadJob(Handle * as, Handle * ad, String regex, int flags) : s(as), d(ad), current(0) { }
+ReadJob::ReadJob(Handle * as, Handle * ad) : s(as), d(ad), current(0) { }
 
 ReadJob::~ReadJob() { }
 
diff --git a/lib/Regex.cc b/lib/Regex.cc
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/lib/Regex.cc