# HG changeset patch
# User František Kučera <franta-hg@frantovo.cz>
# Date 1535211019 -7200
# Node ID d505eaedc35ecf34abc9fe5ae7aa235388e6108b
# Parent  53f4887dadb4c4955003dd154fc83b34a2310a44
remove format.h and use constants.h from lib-protocol

diff -r 53f4887dadb4 -r d505eaedc35e nbproject/configurations.xml
--- a/nbproject/configurations.xml	Sat Aug 25 10:13:00 2018 +0200
+++ b/nbproject/configurations.xml	Sat Aug 25 17:30:19 2018 +0200
@@ -14,7 +14,6 @@
       <itemPath>src/StreamRelationalWriter.h</itemPath>
       <itemPath>src/types/StringDataTypeWriter.h</itemPath>
       <itemPath>include/relpipe/writer/TypeId.h</itemPath>
-      <itemPath>src/format.h</itemPath>
       <itemPath>include/relpipe/writer/typedefs.h</itemPath>
     </logicalFolder>
     <logicalFolder name="ResourceFiles"
@@ -80,8 +79,6 @@
       </item>
       <item path="src/StreamRelationalWriter.h" ex="false" tool="3" flavor2="0">
       </item>
-      <item path="src/format.h" ex="false" tool="3" flavor2="0">
-      </item>
       <item path="src/types/BooleanDataTypeWriter.h" ex="false" tool="3" flavor2="0">
       </item>
       <item path="src/types/IntegerDataTypeWriter.h" ex="false" tool="3" flavor2="0">
@@ -138,8 +135,6 @@
       </item>
       <item path="src/StreamRelationalWriter.h" ex="false" tool="3" flavor2="0">
       </item>
-      <item path="src/format.h" ex="false" tool="3" flavor2="0">
-      </item>
       <item path="src/types/BooleanDataTypeWriter.h" ex="false" tool="3" flavor2="0">
       </item>
       <item path="src/types/IntegerDataTypeWriter.h" ex="false" tool="3" flavor2="0">
diff -r 53f4887dadb4 -r d505eaedc35e src/StreamRelationalWriter.h
--- a/src/StreamRelationalWriter.h	Sat Aug 25 10:13:00 2018 +0200
+++ b/src/StreamRelationalWriter.h	Sat Aug 25 17:30:19 2018 +0200
@@ -4,10 +4,11 @@
 #include <iostream>
 #include <vector>
 
+#include <relpipe/protocol/constants.h>
+
 #include "../include/relpipe/writer/typedefs.h"
 #include "../include/relpipe/writer/RelationalWriter.h"
 #include "../include/relpipe/writer/TypeId.h"
-#include "format.h"
 #include "DataTypeWriterBase.h"
 #include "types/BooleanDataTypeWriter.h"
 #include "types/IntegerDataTypeWriter.h"
@@ -16,6 +17,8 @@
 namespace relpipe {
 namespace writer {
 
+using namespace relpipe::protocol;
+
 class StreamRelationalWriter : public RelationalWriter {
 private:
 	std::ostream &output;
diff -r 53f4887dadb4 -r d505eaedc35e src/format.h
--- a/src/format.h	Sat Aug 25 10:13:00 2018 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
-#pragma once
-
-#include <cstdint>
-#include <string>
-
-#include "../include/relpipe/writer/TypeId.h"
-
-namespace relpipe {
-namespace writer {
-
-const string_t DATA_TYPE_CODE_BOOLEAN = L"boolean";
-const string_t DATA_TYPE_CODE_INTEGER = L"integer";
-const string_t DATA_TYPE_CODE_STRING = L"string";
-
-
-/**
- * With respect for the tradition and computer pioneers, we use same numbers as in ASCII texts:
- * 
- * 1C    FS  ␜  File Separator
- * 1D    GS  ␝  Group Separator
- * 1E    RS  ␞  Record Separator
- * 1F    US  ␟  Unit Separator
- * 
- */
-const integer_t DATA_PART_START = 0x1D;
-const integer_t DATA_PART_ROW = 0x1E;
-
-}
-}
\ No newline at end of file
diff -r 53f4887dadb4 -r d505eaedc35e src/types/BooleanDataTypeWriter.h
--- a/src/types/BooleanDataTypeWriter.h	Sat Aug 25 10:13:00 2018 +0200
+++ b/src/types/BooleanDataTypeWriter.h	Sat Aug 25 17:30:19 2018 +0200
@@ -3,14 +3,16 @@
 #include <string>
 #include <iostream>
 
+#include <relpipe/protocol/constants.h>
+
 #include "../../include/relpipe/writer/RelpipeWriterException.h"
 #include "../DataTypeWriter.h"
-#include "../format.h"
 
 namespace relpipe {
 namespace writer {
 namespace types {
 
+using namespace relpipe::protocol;
 using namespace relpipe::writer;
 
 class BooleanDataTypeWriter : public DataTypeWriter<boolean_t> {
diff -r 53f4887dadb4 -r d505eaedc35e src/types/IntegerDataTypeWriter.h
--- a/src/types/IntegerDataTypeWriter.h	Sat Aug 25 10:13:00 2018 +0200
+++ b/src/types/IntegerDataTypeWriter.h	Sat Aug 25 17:30:19 2018 +0200
@@ -5,13 +5,15 @@
 #include <cassert>
 #include <limits>
 
+#include <relpipe/protocol/constants.h>
+
 #include "../DataTypeWriter.h"
-#include "../format.h"
 
 namespace relpipe {
 namespace writer {
 namespace types {
 
+using namespace relpipe::protocol;
 using namespace relpipe::writer;
 
 /**
diff -r 53f4887dadb4 -r d505eaedc35e src/types/StringDataTypeWriter.h
--- a/src/types/StringDataTypeWriter.h	Sat Aug 25 10:13:00 2018 +0200
+++ b/src/types/StringDataTypeWriter.h	Sat Aug 25 17:30:19 2018 +0200
@@ -7,13 +7,15 @@
 #include <locale>
 #include <codecvt>
 
+#include <relpipe/protocol/constants.h>
+
 #include "../DataTypeWriter.h"
-#include "../format.h"
 
 namespace relpipe {
 namespace writer {
 namespace types {
 
+using namespace relpipe::protocol;
 using namespace relpipe::writer;
 /**
  * The prototype does not recognize any encoding,