From 2f5b0233d7d2360bf937500261a5516236c1efe0 Mon Sep 17 00:00:00 2001
From: Aleksey Lobanov <alekseylobanov1@gmail.com>
Date: Sun, 7 Jun 2015 18:00:38 +0300
Subject: [PATCH] Some restructring: added crossbasetypes.hpp

---
 src/crossbasetypes.hpp        | 24 ++++++++++++++++++++++++
 src/crossgen.hpp              | 16 +---------------
 wxCrossGen/wxCrossGen.project |  1 +
 3 files changed, 26 insertions(+), 15 deletions(-)
 create mode 100644 src/crossbasetypes.hpp

diff --git a/src/crossbasetypes.hpp b/src/crossbasetypes.hpp
new file mode 100644
index 0000000..1ec31cb
--- /dev/null
+++ b/src/crossbasetypes.hpp
@@ -0,0 +1,24 @@
+#ifndef CROSSBASETYPES_HPP
+#define CROSSBASETYPES_HPP
+
+#include <set>
+#include <vector>
+#include <cstdint>
+
+typedef std::map<wxString,wxString> DictType;
+typedef std::vector< std::vector<wxChar> > GridType;
+typedef std::vector< std::vector<wxChar> > CurGridType;
+// Fisrt index is a word length
+typedef std::vector< std::vector<wxString> > AllWordsType; 
+typedef std::set< uint32_t > UsedWords;
+
+struct WordInfo {
+    size_t x;
+    size_t y;
+    size_t len;
+    size_t ind;
+    //true for vertical and false for horisontal
+    bool direct;
+};
+
+#endif // CROSSBASETYPES_HPP
diff --git a/src/crossgen.hpp b/src/crossgen.hpp
index 4d7721e..9ae1244 100644
--- a/src/crossgen.hpp
+++ b/src/crossgen.hpp
@@ -6,21 +6,7 @@
 
 #include <wx/wx.h>
 
-typedef std::map<wxString,wxString> DictType;
-typedef std::vector< std::vector<wxChar> > GridType;
-typedef std::vector< std::vector<wxChar> > CurGridType;
-// Fisrt index is a word length
-typedef std::vector< std::vector<wxString> > AllWordsType; 
-typedef std::set< uint32_t > UsedWords;
-
-struct WordInfo {
-    size_t x;
-    size_t y;
-    size_t len;
-    size_t ind;
-    //true for vertical and false for horisontal
-    bool direct;
-};
+#include "crossbasetypes.hpp"
 
 const wxChar CELL_CLEAR = wxT('+');
 
diff --git a/wxCrossGen/wxCrossGen.project b/wxCrossGen/wxCrossGen.project
index df3422c..c2f8c24 100644
--- a/wxCrossGen/wxCrossGen.project
+++ b/wxCrossGen/wxCrossGen.project
@@ -31,6 +31,7 @@
   </VirtualDirectory>
   <VirtualDirectory Name="Shared">
     <File Name="../src/crossgen.hpp"/>
+    <File Name="../src/crossbasetypes.hpp"/>
   </VirtualDirectory>
   <Settings Type="Executable">
     <GlobalSettings>