From a84919bb6b45f41ed95bd40908101fe742315422 Mon Sep 17 00:00:00 2001
From: Adam Wardynski <award@.(B-4.4.46a)>
Date: Fri, 26 Nov 2010 17:47:45 +0100
Subject: [PATCH] Organising source code in ops, part 2.: The Fixing of
Headers.
---
libwccl/ops/functions/bool/predicate.cpp | 2 +-
libwccl/ops/functions/bool/predicate.h | 8 ++++----
libwccl/ops/functions/bool/predicates/and.cpp | 6 ++----
libwccl/ops/functions/bool/predicates/and.h | 8 ++++----
libwccl/ops/functions/bool/predicates/equals.h | 10 ++++------
libwccl/ops/functions/bool/predicates/intersects.h | 8 ++++----
libwccl/ops/functions/bool/predicates/isinside.h | 8 ++++----
libwccl/ops/functions/bool/predicates/isoutside.h | 8 ++++----
libwccl/ops/functions/bool/predicates/issubsetof.h | 8 ++++----
.../functions/bool/predicates/logicalpredicate.cpp | 2 +-
.../ops/functions/bool/predicates/logicalpredicate.h | 8 ++++----
libwccl/ops/functions/bool/predicates/nor.cpp | 5 ++---
libwccl/ops/functions/bool/predicates/nor.h | 8 ++++----
libwccl/ops/functions/bool/predicates/or.cpp | 5 ++---
libwccl/ops/functions/bool/predicates/or.h | 8 ++++----
libwccl/ops/functions/bool/predicates/regex.cpp | 5 ++---
libwccl/ops/functions/bool/predicates/regex.h | 8 ++++----
libwccl/ops/functions/bool/predicates/setpredicate.h | 8 ++++----
libwccl/ops/functions/bool/varsetter.h | 8 ++++----
libwccl/ops/functions/conditional.h | 11 ++++-------
libwccl/ops/functions/constant.h | 8 ++++----
libwccl/ops/functions/position/relativeposition.cpp | 4 ++--
libwccl/ops/functions/position/relativeposition.h | 8 ++++----
libwccl/ops/functions/strset/affix.cpp | 5 ++---
libwccl/ops/functions/strset/affix.h | 8 ++++----
libwccl/ops/functions/strset/tolower.cpp | 2 +-
libwccl/ops/functions/strset/tolower.h | 8 ++++----
libwccl/ops/functions/strset/toupper.cpp | 2 +-
libwccl/ops/functions/strset/toupper.h | 8 ++++----
libwccl/ops/functions/vargetter.h | 8 ++++----
30 files changed, 96 insertions(+), 107 deletions(-)
diff --git a/libwccl/ops/functions/bool/predicate.cpp b/libwccl/ops/functions/bool/predicate.cpp
index e3d7b7f..9c5b19a 100644
--- a/libwccl/ops/functions/bool/predicate.cpp
+++ b/libwccl/ops/functions/bool/predicate.cpp
@@ -1,4 +1,4 @@
-#include <libwccl/ops/predicate.h>
+#include <libwccl/ops/functions/bool/predicate.h>
namespace Wccl {
diff --git a/libwccl/ops/functions/bool/predicate.h b/libwccl/ops/functions/bool/predicate.h
index a569b4e..644a76f 100644
--- a/libwccl/ops/functions/bool/predicate.h
+++ b/libwccl/ops/functions/bool/predicate.h
@@ -1,10 +1,10 @@
-#ifndef LIBWCCL_OPS_PREDICATE_H
-#define LIBWCCL_OPS_PREDICATE_H
+#ifndef LIBWCCL_OPS_FUNCTIONS_BOOL_PREDICATE_H
+#define LIBWCCL_OPS_FUNCTIONS_BOOL_PREDICATE_H
#include <boost/scoped_ptr.hpp>
#include <libwccl/values/bool.h>
-#include <libwccl/ops/constant.h>
+#include <libwccl/ops/functions/constant.h>
namespace Wccl {
@@ -29,4 +29,4 @@ public:
} /* end ns Wccl */
-#endif // LIBWCCL_OPS_PREDICATE_H
+#endif // LIBWCCL_OPS_FUNCTIONS_BOOL_PREDICATE_H
diff --git a/libwccl/ops/functions/bool/predicates/and.cpp b/libwccl/ops/functions/bool/predicates/and.cpp
index 2c18f47..2eab7cd 100644
--- a/libwccl/ops/functions/bool/predicates/and.cpp
+++ b/libwccl/ops/functions/bool/predicates/and.cpp
@@ -1,7 +1,5 @@
-#include <libwccl/ops/and.h>
-#include <boost/foreach.hpp>
-#undef foreach
-#define foreach BOOST_FOREACH
+#include <libwccl/ops/functions/bool/predicates/and.h>
+#include <libpwrutils/foreach.h>
namespace Wccl {
diff --git a/libwccl/ops/functions/bool/predicates/and.h b/libwccl/ops/functions/bool/predicates/and.h
index 88b019d..d7e961f 100644
--- a/libwccl/ops/functions/bool/predicates/and.h
+++ b/libwccl/ops/functions/bool/predicates/and.h
@@ -1,7 +1,7 @@
-#ifndef LIBWCCL_OPS_AND_H
-#define LIBWCCL_OPS_AND_H
+#ifndef LIBWCCL_OPS_FUNCTIONS_BOOL_PREDICATES_AND_H
+#define LIBWCCL_OPS_FUNCTIONS_BOOL_PREDICATES_AND_H
-#include <libwccl/ops/logicalpredicate.h>
+#include <libwccl/ops/functions/bool/predicates/logicalpredicate.h>
namespace Wccl {
@@ -34,4 +34,4 @@ protected :
};
} /* end ns Wccl */
-#endif // LIBWCCL_OPS_AND_H
+#endif // LIBWCCL_OPS_FUNCTIONS_BOOL_PREDICATES_AND_H
diff --git a/libwccl/ops/functions/bool/predicates/equals.h b/libwccl/ops/functions/bool/predicates/equals.h
index fe57b00..c7294cc 100644
--- a/libwccl/ops/functions/bool/predicates/equals.h
+++ b/libwccl/ops/functions/bool/predicates/equals.h
@@ -1,9 +1,7 @@
-#ifndef LIBWCCL_OPS_EQUALS_H
-#define LIBWCCL_OPS_EQUALS_H
+#ifndef LIBWCCL_OPS_FUNCTIONS_BOOL_PREDICATES_EQUALS_H
+#define LIBWCCL_OPS_FUNCTIONS_BOOL_PREDICATES_EQUALS_H
-#include <boost/mpl/list.hpp>
-#include <boost/mpl/count.hpp>
-#include <libwccl/ops/predicate.h>
+#include <libwccl/ops/functions/bool/predicate.h>
#include <libwccl/ops/formatters.h>
namespace Wccl {
@@ -104,4 +102,4 @@ protected:
} /* end ns Wccl */
-#endif // LIBWCCL_OPS_EQUALS_H
+#endif // LIBWCCL_OPS_FUNCTIONS_BOOL_PREDICATES_EQUALS_H
diff --git a/libwccl/ops/functions/bool/predicates/intersects.h b/libwccl/ops/functions/bool/predicates/intersects.h
index fda4bea..ab709a5 100644
--- a/libwccl/ops/functions/bool/predicates/intersects.h
+++ b/libwccl/ops/functions/bool/predicates/intersects.h
@@ -1,7 +1,7 @@
-#ifndef LIBWCCL_OPS_INTERSECTS_H
-#define LIBWCCL_OPS_INTERSECTS_H
+#ifndef LIBWCCL_OPS_FUNCTIONS_BOOL_PREDICATES_INTERSECTS_H
+#define LIBWCCL_OPS_FUNCTIONS_BOOL_PREDICATES_INTERSECTS_H
-#include <libwccl/ops/setpredicate.h>
+#include <libwccl/ops/functions/bool/predicates/setpredicate.h>
namespace Wccl {
@@ -43,4 +43,4 @@ protected:
} /* end ns Wccl */
-#endif // LIBWCCL_OPS_INTERSECTS_H
+#endif // LIBWCCL_OPS_FUNCTIONS_BOOL_PREDICATES_INTERSECTS_H
diff --git a/libwccl/ops/functions/bool/predicates/isinside.h b/libwccl/ops/functions/bool/predicates/isinside.h
index 7ea1f1f..2894915 100644
--- a/libwccl/ops/functions/bool/predicates/isinside.h
+++ b/libwccl/ops/functions/bool/predicates/isinside.h
@@ -1,7 +1,7 @@
-#ifndef LIBWCCL_OPS_ISINSIDE_H
-#define LIBWCCL_OPS_ISINSIDE_H
+#ifndef LIBWCCL_OPS_FUNCTIONS_BOOL_PREDICATES_ISINSIDE_H
+#define LIBWCCL_OPS_FUNCTIONS_BOOL_PREDICATES_ISINSIDE_H
-#include <libwccl/ops/predicate.h>
+#include <libwccl/ops/functions/bool/predicate.h>
#include <libwccl/ops/formatters.h>
#include <libwccl/values/position.h>
@@ -59,4 +59,4 @@ protected:
} /* end ns Wccl */
-#endif // LIBWCCL_OPS_ISINSIDE_H
+#endif // LIBWCCL_OPS_FUNCTIONS_BOOL_PREDICATES_ISINSIDE_H
diff --git a/libwccl/ops/functions/bool/predicates/isoutside.h b/libwccl/ops/functions/bool/predicates/isoutside.h
index 17322e7..d9019c4 100644
--- a/libwccl/ops/functions/bool/predicates/isoutside.h
+++ b/libwccl/ops/functions/bool/predicates/isoutside.h
@@ -1,7 +1,7 @@
-#ifndef LIBWCCL_OPS_ISOUTSIDE_H
-#define LIBWCCL_OPS_ISOUTSIDE_H
+#ifndef LIBWCCL_OPS_FUNCTIONS_BOOL_PREDICATES_ISOUTSIDE_H
+#define LIBWCCL_OPS_FUNCTIONS_BOOL_PREDICATES_ISOUTSIDE_H
-#include <libwccl/ops/predicate.h>
+#include <libwccl/ops/functions/bool/predicate.h>
#include <libwccl/ops/formatters.h>
#include <libwccl/values/position.h>
@@ -59,4 +59,4 @@ protected:
} /* end ns Wccl */
-#endif // LIBWCCL_OPS_ISOUTSIDE_H
+#endif // LIBWCCL_OPS_FUNCTIONS_BOOL_PREDICATES_ISOUTSIDE_H
diff --git a/libwccl/ops/functions/bool/predicates/issubsetof.h b/libwccl/ops/functions/bool/predicates/issubsetof.h
index 0982611..3cf3e5f 100644
--- a/libwccl/ops/functions/bool/predicates/issubsetof.h
+++ b/libwccl/ops/functions/bool/predicates/issubsetof.h
@@ -1,7 +1,7 @@
-#ifndef LIBWCCL_OPS_ISSUBSETOF_H
-#define LIBWCCL_OPS_ISSUBSETOF_H
+#ifndef LIBWCCL_OPS_FUNCTIONS_BOOL_PREDICATES_ISSUBSETOF_H
+#define LIBWCCL_OPS_FUNCTIONS_BOOL_PREDICATES_ISSUBSETOF_H
-#include <libwccl/ops/setpredicate.h>
+#include <libwccl/ops/functions/bool/predicates/setpredicate.h>
namespace Wccl {
@@ -51,4 +51,4 @@ protected:
} /* end ns Wccl */
-#endif // LIBWCCL_OPS_ISSUBSETOF_H
+#endif // LIBWCCL_OPS_FUNCTIONS_BOOL_PREDICATES_ISSUBSETOF_H
diff --git a/libwccl/ops/functions/bool/predicates/logicalpredicate.cpp b/libwccl/ops/functions/bool/predicates/logicalpredicate.cpp
index 66945ab..40db27e 100644
--- a/libwccl/ops/functions/bool/predicates/logicalpredicate.cpp
+++ b/libwccl/ops/functions/bool/predicates/logicalpredicate.cpp
@@ -1,4 +1,4 @@
-#include <libwccl/ops/logicalpredicate.h>
+#include <libwccl/ops/functions/bool/predicates/logicalpredicate.h>
#include <sstream>
diff --git a/libwccl/ops/functions/bool/predicates/logicalpredicate.h b/libwccl/ops/functions/bool/predicates/logicalpredicate.h
index 7d439b6..e03edb0 100644
--- a/libwccl/ops/functions/bool/predicates/logicalpredicate.h
+++ b/libwccl/ops/functions/bool/predicates/logicalpredicate.h
@@ -1,9 +1,9 @@
-#ifndef LIBWCCL_OPS_LOGICALPREDICATE_H
-#define LIBWCCL_OPS_LOGICALPREDICATE_H
+#ifndef LIBWCCL_OPS_FUNCTIONS_BOOL_PREDICATES_LOGICALPREDICATE_H
+#define LIBWCCL_OPS_FUNCTIONS_BOOL_PREDICATES_LOGICALPREDICATE_H
#include <vector>
-#include <libwccl/ops/predicate.h>
+#include <libwccl/ops/functions/bool/predicate.h>
namespace Wccl {
/**
@@ -42,4 +42,4 @@ protected:
} /* end ns Wccl */
-#endif // LIBWCCL_OPS_LOGICALPREDICATE_H
+#endif // LIBWCCL_OPS_FUNCTIONS_BOOL_PREDICATES_LOGICALPREDICATE_H
diff --git a/libwccl/ops/functions/bool/predicates/nor.cpp b/libwccl/ops/functions/bool/predicates/nor.cpp
index 480025b..4a88e46 100644
--- a/libwccl/ops/functions/bool/predicates/nor.cpp
+++ b/libwccl/ops/functions/bool/predicates/nor.cpp
@@ -1,6 +1,5 @@
-#include <libwccl/ops/nor.h>
-#include <boost/foreach.hpp>
-#define foreach BOOST_FOREACH
+#include <libwccl/ops/functions/bool/predicates/nor.h>
+#include <libpwrutils/foreach.h>
namespace Wccl {
diff --git a/libwccl/ops/functions/bool/predicates/nor.h b/libwccl/ops/functions/bool/predicates/nor.h
index 6374ad8..8cd5920 100644
--- a/libwccl/ops/functions/bool/predicates/nor.h
+++ b/libwccl/ops/functions/bool/predicates/nor.h
@@ -1,7 +1,7 @@
-#ifndef LIBWCCL_OPS_NOR_H
-#define LIBWCCL_OPS_NOR_H
+#ifndef LIBWCCL_OPS_FUNCTIONS_BOOL_PREDICATES_NOR_H
+#define LIBWCCL_OPS_FUNCTIONS_BOOL_PREDICATES_NOR_H
-#include <libwccl/ops/logicalpredicate.h>
+#include <libwccl/ops/functions/bool/predicates/logicalpredicate.h>
namespace Wccl {
@@ -36,4 +36,4 @@ protected :
};
} /* end ns Wccl */
-#endif // LIBWCCL_OPS_NOR_H
+#endif // LIBWCCL_OPS_FUNCTIONS_BOOL_PREDICATES_NOR_H
diff --git a/libwccl/ops/functions/bool/predicates/or.cpp b/libwccl/ops/functions/bool/predicates/or.cpp
index 24ce201..c1ff885 100644
--- a/libwccl/ops/functions/bool/predicates/or.cpp
+++ b/libwccl/ops/functions/bool/predicates/or.cpp
@@ -1,6 +1,5 @@
-#include <libwccl/ops/or.h>
-#include <boost/foreach.hpp>
-#define foreach BOOST_FOREACH
+#include <libwccl/ops/functions/bool/predicates/or.h>
+#include <libpwrutils/foreach.h>
namespace Wccl {
diff --git a/libwccl/ops/functions/bool/predicates/or.h b/libwccl/ops/functions/bool/predicates/or.h
index 0a60d69..83d13bc 100644
--- a/libwccl/ops/functions/bool/predicates/or.h
+++ b/libwccl/ops/functions/bool/predicates/or.h
@@ -1,7 +1,7 @@
-#ifndef LIBWCCL_OPS_OR_H
-#define LIBWCCL_OPS_OR_H
+#ifndef LIBWCCL_OPS_FUNCTIONS_BOOL_PREDICATES_OR_H
+#define LIBWCCL_OPS_FUNCTIONS_BOOL_PREDICATES_OR_H
-#include <libwccl/ops/logicalpredicate.h>
+#include <libwccl/ops/functions/bool/predicates/logicalpredicate.h>
namespace Wccl {
@@ -33,4 +33,4 @@ protected :
};
} /* end ns Wccl */
-#endif // LIBWCCL_OPS_OR_H
+#endif // LIBWCCL_OPS_FUNCTIONS_BOOL_PREDICATES_OR_H
diff --git a/libwccl/ops/functions/bool/predicates/regex.cpp b/libwccl/ops/functions/bool/predicates/regex.cpp
index 1d0ac36..1e4a7d8 100644
--- a/libwccl/ops/functions/bool/predicates/regex.cpp
+++ b/libwccl/ops/functions/bool/predicates/regex.cpp
@@ -1,6 +1,5 @@
-#include <libwccl/ops/regex.h>
-#include <boost/foreach.hpp>
-#define foreach BOOST_FOREACH
+#include <libwccl/ops/functions/bool/predicates/regex.h>
+#include <libpwrutils/foreach.h>
#include <sstream>
#include <libpwrutils/util.h>
diff --git a/libwccl/ops/functions/bool/predicates/regex.h b/libwccl/ops/functions/bool/predicates/regex.h
index 1c738c1..abc4829 100644
--- a/libwccl/ops/functions/bool/predicates/regex.h
+++ b/libwccl/ops/functions/bool/predicates/regex.h
@@ -1,11 +1,11 @@
-#ifndef LIBWCCL_OPS_REGEX_H
-#define LIBWCCL_OPS_REGEX_H
+#ifndef LIBWCCL_OPS_FUNCTIONS_BOOL_PREDICATES_REGEX_H
+#define LIBWCCL_OPS_FUNCTIONS_BOOL_PREDICATES_REGEX_H
#include <unicode/regex.h>
#include <libwccl/exception.h>
#include <libwccl/values/strset.h>
-#include <libwccl/ops/predicate.h>
+#include <libwccl/ops/functions/bool/predicate.h>
namespace Wccl {
@@ -79,4 +79,4 @@ public:
} /* end ns Wccl */
-#endif // LIBWCCL_OPS_REGEX_H
+#endif // LIBWCCL_OPS_FUNCTIONS_BOOL_PREDICATES_REGEX_H
diff --git a/libwccl/ops/functions/bool/predicates/setpredicate.h b/libwccl/ops/functions/bool/predicates/setpredicate.h
index 8886b5b..d845c47 100644
--- a/libwccl/ops/functions/bool/predicates/setpredicate.h
+++ b/libwccl/ops/functions/bool/predicates/setpredicate.h
@@ -1,9 +1,9 @@
-#ifndef LIBWCCL_OPS_SETPREDICATE_H
-#define LIBWCCL_OPS_SETPREDICATE_H
+#ifndef LIBWCCL_OPS_FUNCTIONS_BOOL_PREDICATES_SETPREDICATE_H
+#define LIBWCCL_OPS_FUNCTIONS_BOOL_PREDICATES_SETPREDICATE_H
#include <boost/mpl/list.hpp>
#include <boost/mpl/count.hpp>
-#include <libwccl/ops/predicate.h>
+#include <libwccl/ops/functions/bool/predicate.h>
#include <libwccl/values/strset.h>
#include <libwccl/values/tset.h>
@@ -52,4 +52,4 @@ protected:
} /* end ns Wccl */
-#endif // LIBWCCL_OPS_SETPREDICATE_H
+#endif // LIBWCCL_OPS_FUNCTIONS_BOOL_PREDICATES_SETPREDICATE_H
diff --git a/libwccl/ops/functions/bool/varsetter.h b/libwccl/ops/functions/bool/varsetter.h
index 0484c6f..cd68211 100644
--- a/libwccl/ops/functions/bool/varsetter.h
+++ b/libwccl/ops/functions/bool/varsetter.h
@@ -1,7 +1,7 @@
-#ifndef LIBWCCL_OPS_VARSETTER_H
-#define LIBWCCL_OPS_VARSETTER_H
+#ifndef LIBWCCL_OPS_FUNCTIONS_BOOL_VARSETTER_H
+#define LIBWCCL_OPS_FUNCTIONS_BOOL_VARSETTER_H
-#include <libwccl/ops/predicate.h>
+#include <libwccl/ops/functions/bool/predicate.h>
#include <libwccl/ops/formatters.h>
namespace Wccl {
@@ -72,4 +72,4 @@ private:
} /* end ns Wccl */
-#endif // LIBWCCL_OPS_VARSETTER_H
+#endif // LIBWCCL_OPS_FUNCTIONS_BOOL_VARSETTER_H
diff --git a/libwccl/ops/functions/conditional.h b/libwccl/ops/functions/conditional.h
index 03485d0..73e7d0a 100644
--- a/libwccl/ops/functions/conditional.h
+++ b/libwccl/ops/functions/conditional.h
@@ -1,13 +1,10 @@
-#ifndef LIBWCCL_OPS_CONDITIONAL_H
-#define LIBWCCL_OPS_CONDITIONAL_H
+#ifndef LIBWCCL_OPS_FUNCTIONS_CONDITIONAL_H
+#define LIBWCCL_OPS_FUNCTIONS_CONDITIONAL_H
-#include <boost/mpl/list.hpp>
-#include <boost/mpl/count.hpp>
#include <sstream>
#include <boost/format.hpp>
-#include <libwccl/ops/predicate.h>
-#include <libwccl/ops/constant.h>
+#include <libwccl/ops/functions/constant.h>
#include <libwccl/ops/formatters.h>
namespace Wccl {
@@ -170,4 +167,4 @@ std::string ConditionalOp<T>::to_string(const Corpus2::Tagset &tagset) const
} /* end ns Wccl */
-#endif // LIBWCCL_OPS_CONDITIONAL_H
+#endif // LIBWCCL_OPS_FUNCTIONS_CONDITIONAL_H
diff --git a/libwccl/ops/functions/constant.h b/libwccl/ops/functions/constant.h
index 3620c55..006419f 100644
--- a/libwccl/ops/functions/constant.h
+++ b/libwccl/ops/functions/constant.h
@@ -1,9 +1,9 @@
-#ifndef LIBWCCL_OPS_CONSTANT_H
-#define LIBWCCL_OPS_CONSTANT_H
+#ifndef LIBWCCL_OPS_FUNCTIONS_CONSTANT_H
+#define LIBWCCL_OPS_FUNCTIONS_CONSTANT_H
#include <boost/concept_check.hpp>
-#include <libwccl/ops/functions.h>
+#include <libwccl/ops/function.h>
namespace Wccl {
@@ -64,4 +64,4 @@ private:
} /* end ns Wccl */
-#endif // LIBWCCL_OPS_CONSTANT_H
+#endif // LIBWCCL_OPS_FUNCTIONS_CONSTANT_H
diff --git a/libwccl/ops/functions/position/relativeposition.cpp b/libwccl/ops/functions/position/relativeposition.cpp
index 0a0d73d..a2e98d2 100644
--- a/libwccl/ops/functions/position/relativeposition.cpp
+++ b/libwccl/ops/functions/position/relativeposition.cpp
@@ -1,6 +1,6 @@
-#include <libwccl/ops/relativeposition.h>
+#include <libwccl/ops/functions/position/relativeposition.h>
#include <sstream>
-#include <libwccl/ops/constant.h>
+#include <libwccl/ops/functions/constant.h>
namespace Wccl {
diff --git a/libwccl/ops/functions/position/relativeposition.h b/libwccl/ops/functions/position/relativeposition.h
index dc27cae..9324d42 100644
--- a/libwccl/ops/functions/position/relativeposition.h
+++ b/libwccl/ops/functions/position/relativeposition.h
@@ -1,7 +1,7 @@
-#ifndef LIBWCCL_OPS_RELATIVEPOSITION_H
-#define LIBWCCL_OPS_RELATIVEPOSITION_H
+#ifndef LIBWCCL_OPS_FUNCTIONS_POSITION_RELATIVEPOSITION_H
+#define LIBWCCL_OPS_FUNCTIONS_POSITION_RELATIVEPOSITION_H
-#include <libwccl/ops/functions.h>
+#include <libwccl/ops/function.h>
#include <libwccl/ops/formatters.h>
#include <libwccl/values/position.h>
@@ -64,4 +64,4 @@ protected:
} /* end ns Wccl */
-#endif // LIBWCCL_OPS_RELATIVEPOSITION_H
+#endif // LIBWCCL_OPS_FUNCTIONS_POSITION_RELATIVEPOSITION_H
diff --git a/libwccl/ops/functions/strset/affix.cpp b/libwccl/ops/functions/strset/affix.cpp
index c9bc7e0..5344fcc 100644
--- a/libwccl/ops/functions/strset/affix.cpp
+++ b/libwccl/ops/functions/strset/affix.cpp
@@ -1,7 +1,6 @@
-#include <libwccl/ops/affix.h>
+#include <libwccl/ops/functions/strset/affix.h>
#include <sstream>
-#include <boost/foreach.hpp>
-#define foreach BOOST_FOREACH
+#include <libpwrutils/foreach.h>
namespace Wccl {
diff --git a/libwccl/ops/functions/strset/affix.h b/libwccl/ops/functions/strset/affix.h
index ddda767..2dbc16f 100644
--- a/libwccl/ops/functions/strset/affix.h
+++ b/libwccl/ops/functions/strset/affix.h
@@ -1,8 +1,8 @@
-#ifndef LIBWCCL_OPS_AFFIX_H
-#define LIBWCCL_OPS_AFFIX_H
+#ifndef LIBWCCL_OPS_FUNCTIONS_STRSET_AFFIX_H
+#define LIBWCCL_OPS_FUNCTIONS_STRSET_AFFIX_H
#include <libwccl/values/strset.h>
-#include <libwccl/ops/functions.h>
+#include <libwccl/ops/function.h>
namespace Wccl {
@@ -56,4 +56,4 @@ protected:
} /* end ns Wccl */
-#endif // LIBWCCL_OPS_AFFIX_H
+#endif // LIBWCCL_OPS_FUNCTIONS_STRSET_AFFIX_H
diff --git a/libwccl/ops/functions/strset/tolower.cpp b/libwccl/ops/functions/strset/tolower.cpp
index f88ce8a..696371b 100644
--- a/libwccl/ops/functions/strset/tolower.cpp
+++ b/libwccl/ops/functions/strset/tolower.cpp
@@ -1,4 +1,4 @@
-#include <libwccl/ops/tolower.h>
+#include <libwccl/ops/functions/strset/tolower.h>
#include <libwccl/ops/formatters.h>
namespace Wccl {
diff --git a/libwccl/ops/functions/strset/tolower.h b/libwccl/ops/functions/strset/tolower.h
index 28175f1..bacbd91 100644
--- a/libwccl/ops/functions/strset/tolower.h
+++ b/libwccl/ops/functions/strset/tolower.h
@@ -1,8 +1,8 @@
-#ifndef LIBWCCL_OPS_TOLOWER_H
-#define LIBWCCL_OPS_TOLOWER_H
+#ifndef LIBWCCL_OPS_FUNCTIONS_STRSET_TOLOWER_H
+#define LIBWCCL_OPS_FUNCTIONS_STRSET_TOLOWER_H
#include <libwccl/values/strset.h>
-#include <libwccl/ops/functions.h>
+#include <libwccl/ops/function.h>
namespace Wccl {
@@ -53,4 +53,4 @@ protected:
} /* end ns Wccl */
-#endif // LIBWCCL_OPS_TOLOWER_H
+#endif // LIBWCCL_OPS_FUNCTIONS_STRSET_TOLOWER_H
diff --git a/libwccl/ops/functions/strset/toupper.cpp b/libwccl/ops/functions/strset/toupper.cpp
index edbc3c7..1a9f4b5 100644
--- a/libwccl/ops/functions/strset/toupper.cpp
+++ b/libwccl/ops/functions/strset/toupper.cpp
@@ -1,4 +1,4 @@
-#include <libwccl/ops/toupper.h>
+#include <libwccl/ops/functions/strset/toupper.h>
#include <libwccl/ops/formatters.h>
namespace Wccl {
diff --git a/libwccl/ops/functions/strset/toupper.h b/libwccl/ops/functions/strset/toupper.h
index e550e54..c39d7a1 100644
--- a/libwccl/ops/functions/strset/toupper.h
+++ b/libwccl/ops/functions/strset/toupper.h
@@ -1,8 +1,8 @@
-#ifndef LIBWCCL_OPS_TOUPPER_H
-#define LIBWCCL_OPS_TOUPPER_H
+#ifndef LIBWCCL_OPS_FUNCTIONS_STRSET_TOUPPER_H
+#define LIBWCCL_OPS_FUNCTIONS_STRSET_TOUPPER_H
#include <libwccl/values/strset.h>
-#include <libwccl/ops/functions.h>
+#include <libwccl/ops/function.h>
namespace Wccl {
@@ -52,4 +52,4 @@ protected:
} /* end ns Wccl */
-#endif // LIBWCCL_OPS_TOUPPER_H
+#endif // LIBWCCL_OPS_FUNCTIONS_STRSET_TOUPPER_H
diff --git a/libwccl/ops/functions/vargetter.h b/libwccl/ops/functions/vargetter.h
index 0e4b4a9..4ed7986 100644
--- a/libwccl/ops/functions/vargetter.h
+++ b/libwccl/ops/functions/vargetter.h
@@ -1,7 +1,7 @@
-#ifndef LIBWCCL_OPS_VARGETTER_H
-#define LIBWCCL_OPS_VARGETTER_H
+#ifndef LIBWCCL_OPS_FUNCTIONS_VARGETTER_H
+#define LIBWCCL_OPS_FUNCTIONS_VARGETTER_H
-#include <libwccl/ops/functions.h>
+#include <libwccl/ops/function.h>
namespace Wccl {
@@ -55,4 +55,4 @@ private:
} /* end ns Wccl */
-#endif // LIBWCCL_OPS_VARGETTER_H
+#endif // LIBWCCL_OPS_FUNCTIONS_VARGETTER_H
--
GitLab