From fbaf75ca1a154e2e0106a31d04ffb0bca392c08e Mon Sep 17 00:00:00 2001
From: Adam Wardynski <award@.(B-4.4.46a)>
Date: Mon, 7 Mar 2011 13:39:11 +0100
Subject: [PATCH] Move actions/ to tagactions/ part 2.
---
libwccl/CMakeLists.txt | 8 ++++----
libwccl/ops/tagactions/delete.cpp | 2 +-
libwccl/ops/tagactions/delete.h | 6 +++---
libwccl/ops/tagactions/relabel.cpp | 2 +-
libwccl/ops/tagactions/relabel.h | 6 +++---
libwccl/ops/tagactions/select.cpp | 2 +-
libwccl/ops/tagactions/select.h | 6 +++---
libwccl/ops/tagactions/unify.cpp | 2 +-
libwccl/ops/tagactions/unify.h | 6 +++---
libwccl/parser/grammar.g | 8 ++++----
10 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/libwccl/CMakeLists.txt b/libwccl/CMakeLists.txt
index 5f1f429..32684ce 100644
--- a/libwccl/CMakeLists.txt
+++ b/libwccl/CMakeLists.txt
@@ -27,10 +27,6 @@ endif(WIN32)
SET(libwccl_STAT_SRC
exception.cpp
- ops/actions/delete.cpp
- ops/actions/relabel.cpp
- ops/actions/select.cpp
- ops/actions/unify.cpp
ops/formatters.cpp
ops/functions/bool/iteration.cpp
ops/functions/bool/iterations/atleast.cpp
@@ -60,6 +56,10 @@ SET(libwccl_STAT_SRC
ops/functions/tset/getsymbolsinrange.cpp
ops/rulesequence.cpp
ops/tagaction.cpp
+ ops/tagactions/delete.cpp
+ ops/tagactions/relabel.cpp
+ ops/tagactions/select.cpp
+ ops/tagactions/unify.cpp
ops/tagrule.cpp
parser/grammar.g
parser/Parser.cpp
diff --git a/libwccl/ops/tagactions/delete.cpp b/libwccl/ops/tagactions/delete.cpp
index df2cd22..05cb5b6 100644
--- a/libwccl/ops/tagactions/delete.cpp
+++ b/libwccl/ops/tagactions/delete.cpp
@@ -1,4 +1,4 @@
-#include <libwccl/ops/actions/delete.h>
+#include <libwccl/ops/tagactions/delete.h>
#include <libpwrutils/foreach.h>
#include <sstream>
diff --git a/libwccl/ops/tagactions/delete.h b/libwccl/ops/tagactions/delete.h
index 83fe105..53c8e85 100644
--- a/libwccl/ops/tagactions/delete.h
+++ b/libwccl/ops/tagactions/delete.h
@@ -1,5 +1,5 @@
-#ifndef LIBWCCL_OPS_ACTIONS_DELETE_H
-#define LIBWCCL_OPS_ACTIONS_DELETE_H
+#ifndef LIBWCCL_OPS_TAGACTIONS_DELETE_H
+#define LIBWCCL_OPS_TAGACTIONS_DELETE_H
#include <libwccl/ops/tagaction.h>
#include <libwccl/values/position.h>
@@ -66,4 +66,4 @@ private:
} /* end ns Wccl */
-#endif // LIBWCCL_OPS_ACTIONS_DELETE_H
+#endif // LIBWCCL_OPS_TAGACTIONS_DELETE_H
diff --git a/libwccl/ops/tagactions/relabel.cpp b/libwccl/ops/tagactions/relabel.cpp
index e741515..aa26439 100644
--- a/libwccl/ops/tagactions/relabel.cpp
+++ b/libwccl/ops/tagactions/relabel.cpp
@@ -1,4 +1,4 @@
-#include <libwccl/ops/actions/relabel.h>
+#include <libwccl/ops/tagactions/relabel.h>
#include <libpwrutils/foreach.h>
#include <sstream>
diff --git a/libwccl/ops/tagactions/relabel.h b/libwccl/ops/tagactions/relabel.h
index 1fa5a8c..18d78f6 100644
--- a/libwccl/ops/tagactions/relabel.h
+++ b/libwccl/ops/tagactions/relabel.h
@@ -1,5 +1,5 @@
-#ifndef LIBWCCL_OPS_ACTIONS_RELABEL_H
-#define LIBWCCL_OPS_ACTIONS_RELABEL_H
+#ifndef LIBWCCL_OPS_TAGACTIONS_RELABEL_H
+#define LIBWCCL_OPS_TAGACTIONS_RELABEL_H
#include <libwccl/ops/tagaction.h>
#include <libwccl/values/position.h>
@@ -69,4 +69,4 @@ private:
} /* end ns Wccl */
-#endif // LIBWCCL_OPS_ACTIONS_RELABEL_H
+#endif // LIBWCCL_OPS_TAGACTIONS_RELABEL_H
diff --git a/libwccl/ops/tagactions/select.cpp b/libwccl/ops/tagactions/select.cpp
index cd746b2..3205800 100644
--- a/libwccl/ops/tagactions/select.cpp
+++ b/libwccl/ops/tagactions/select.cpp
@@ -1,4 +1,4 @@
-#include <libwccl/ops/actions/select.h>
+#include <libwccl/ops/tagactions/select.h>
#include <libpwrutils/foreach.h>
#include <sstream>
diff --git a/libwccl/ops/tagactions/select.h b/libwccl/ops/tagactions/select.h
index 12a8431..b3fd95a 100644
--- a/libwccl/ops/tagactions/select.h
+++ b/libwccl/ops/tagactions/select.h
@@ -1,5 +1,5 @@
-#ifndef LIBWCCL_OPS_ACTIONS_SELECT_H
-#define LIBWCCL_OPS_ACTIONS_SELECT_H
+#ifndef LIBWCCL_OPS_TAGACTIONS_SELECT_H
+#define LIBWCCL_OPS_TAGACTIONS_SELECT_H
#include <libwccl/ops/tagaction.h>
#include <libwccl/values/position.h>
@@ -66,4 +66,4 @@ private:
} /* end ns Wccl */
-#endif // LIBWCCL_OPS_ACTIONS_SELECT_H
+#endif // LIBWCCL_OPS_TAGACTIONS_SELECT_H
diff --git a/libwccl/ops/tagactions/unify.cpp b/libwccl/ops/tagactions/unify.cpp
index 0cf5152..2c1e548 100644
--- a/libwccl/ops/tagactions/unify.cpp
+++ b/libwccl/ops/tagactions/unify.cpp
@@ -1,4 +1,4 @@
-#include <libwccl/ops/actions/unify.h>
+#include <libwccl/ops/tagactions/unify.h>
#include <libpwrutils/foreach.h>
#include <sstream>
diff --git a/libwccl/ops/tagactions/unify.h b/libwccl/ops/tagactions/unify.h
index 29f3849..e0e1527 100644
--- a/libwccl/ops/tagactions/unify.h
+++ b/libwccl/ops/tagactions/unify.h
@@ -1,5 +1,5 @@
-#ifndef LIBWCCL_OPS_ACTIONS_UNIFY_H
-#define LIBWCCL_OPS_ACTIONS_UNIFY_H
+#ifndef LIBWCCL_OPS_TAGACTIONS_UNIFY_H
+#define LIBWCCL_OPS_TAGACTIONS_UNIFY_H
#include <libwccl/ops/tagaction.h>
#include <libwccl/values/position.h>
@@ -69,4 +69,4 @@ private:
} /* end ns Wccl */
-#endif // LIBWCCL_OPS_ACTIONS_UNIFY_H
+#endif // LIBWCCL_OPS_TAGACTIONS_UNIFY_H
diff --git a/libwccl/parser/grammar.g b/libwccl/parser/grammar.g
index ce46e9e..b8d0aa4 100644
--- a/libwccl/parser/grammar.g
+++ b/libwccl/parser/grammar.g
@@ -62,10 +62,10 @@ header {
#include <libwccl/ops/tagrule.h>
#include <libwccl/ops/rulesequence.h>
//
- #include <libwccl/ops/actions/unify.h>
- #include <libwccl/ops/actions/delete.h>
- #include <libwccl/ops/actions/select.h>
- #include <libwccl/ops/actions/relabel.h>
+ #include <libwccl/ops/tagactions/unify.h>
+ #include <libwccl/ops/tagactions/delete.h>
+ #include <libwccl/ops/tagactions/select.h>
+ #include <libwccl/ops/tagactions/relabel.h>
// Unicode String
--
GitLab