Moved FromJSON and ToJSON into propsbrics.h

mppmu · Jun 16, 2015 · 4adbf4e · 4adbf4e
1 parent 1c47a5b
commit 4adbf4e
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 24 deletions.
diff --git a/src/propsbrics.h b/src/propsbrics.h
@@ -26,6 +26,30 @@
 namespace dbrx {
 
 
+class FromJSON: public TransformBric {
+public:
+	Input<std::string> input{this};
+	Output<PropVal> output{this};
+
+	void processInput() { output = PropVal::fromJSON(input); }
+
+	using TransformBric::TransformBric;
+};
+
+
+
+class ToJSON: public TransformBric {
+public:
+	Input<PropVal> input{this};
+	Output<std::string> output{this};
+
+	void processInput() { output = input->toJSON(); }
+
+	using TransformBric::TransformBric;
+};
+
+
+
 class PropsSplitter: public TransformBric {
 public:
 	class ContentGroup final: public DynOutputGroup {

diff --git a/src/textbrics.h b/src/textbrics.h
@@ -27,30 +27,6 @@
 namespace dbrx {
 
 
-class FromJSON: public TransformBric {
-public:
-	Input<std::string> input{this};
-	Output<PropVal> output{this};
-
-	void processInput() { output = PropVal::fromJSON(input); }
-
-	using TransformBric::TransformBric;
-};
-
-
-
-class ToJSON: public TransformBric {
-public:
-	Input<PropVal> input{this};
-	Output<std::string> output{this};
-
-	void processInput() { output = input->toJSON(); }
-
-	using TransformBric::TransformBric;
-};
-
-
-
 class TextFileReader: public MapperBric {
 protected:
 	ManagedInputStream m_inputStream;