From 4736579e46b072bccd1e39fb0b5ddb55f7bd5813 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82=20K=C4=99dzia?= <Pawel.Kedzia@pwr.wroc.pl>
Date: Tue, 27 Dec 2011 15:41:16 +0100
Subject: [PATCH] corpus2_whole readers has been moved to corpus2_whole/io

---
 CMakeLists.txt                                       |  5 +++--
 libcorpus2_whole/CMakeLists.txt                      | 10 +++++-----
 libcorpus2_whole/{ => io}/corpusreader.cpp           |  0
 libcorpus2_whole/{ => io}/corpusreader.h             |  0
 libcorpus2_whole/{ => io}/docreader.cpp              |  0
 libcorpus2_whole/{ => io}/docreader.h                |  0
 libcorpus2_whole/{ => io}/docreaderi.h               |  0
 libcorpus2_whole/{ => io}/poliqarpdocumentreader.cpp |  0
 libcorpus2_whole/{ => io}/poliqarpdocumentreader.h   |  0
 libcorpus2_whole/{ => io}/relreader.cpp              |  0
 libcorpus2_whole/{ => io}/relreader.h                |  0
 swig/documentreader.i                                |  2 +-
 swig/relationreader.i                                |  2 +-
 13 files changed, 10 insertions(+), 9 deletions(-)
 rename libcorpus2_whole/{ => io}/corpusreader.cpp (100%)
 rename libcorpus2_whole/{ => io}/corpusreader.h (100%)
 rename libcorpus2_whole/{ => io}/docreader.cpp (100%)
 rename libcorpus2_whole/{ => io}/docreader.h (100%)
 rename libcorpus2_whole/{ => io}/docreaderi.h (100%)
 rename libcorpus2_whole/{ => io}/poliqarpdocumentreader.cpp (100%)
 rename libcorpus2_whole/{ => io}/poliqarpdocumentreader.h (100%)
 rename libcorpus2_whole/{ => io}/relreader.cpp (100%)
 rename libcorpus2_whole/{ => io}/relreader.h (100%)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2a93df4..0f43636 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -71,14 +71,15 @@ MARK_AS_ADVANCED(LIBCORPUS2_SRC_DATA_DIR)
 
 add_subdirectory(libpwrutils)
 add_subdirectory(libcorpus2)
-add_subdirectory(corpus2tools)
-add_subdirectory(tests)
+add_subdirectory(libcorpus2_whole)
 if(CORPUS2_BUILD_POLIQARP)
 	add_subdirectory(poliqarp-library)
 	add_subdirectory(poliqarp)
 else()
 	message(STATUS "Not building Poliqarp library and wrapper")
 endif(CORPUS2_BUILD_POLIQARP)
+add_subdirectory(corpus2tools)
+add_subdirectory(tests)
 
 if(CORPUS2_BUILD_SWIG)
 	FIND_PACKAGE(SWIG)
diff --git a/libcorpus2_whole/CMakeLists.txt b/libcorpus2_whole/CMakeLists.txt
index 5b491de..004e1a1 100644
--- a/libcorpus2_whole/CMakeLists.txt
+++ b/libcorpus2_whole/CMakeLists.txt
@@ -7,13 +7,13 @@ set(LIBS ${LIBS} ${LibXML++_LIBRARIES})
 
 SET(libcorpus2_whole_SRC
 	corpus.cpp
-	corpusreader.cpp
-	docreader.cpp
 	document.cpp
-	poliqarpdocumentreader.cpp
 	relation.cpp
-	relreader.cpp
-	docreaderi.h
+	io/corpusreader.cpp
+	io/docreader.cpp
+	io/docreaderi.h
+	io/poliqarpdocumentreader.cpp
+	io/relreader.cpp
 )
 
 file(GLOB_RECURSE INCS "*.h")
diff --git a/libcorpus2_whole/corpusreader.cpp b/libcorpus2_whole/io/corpusreader.cpp
similarity index 100%
rename from libcorpus2_whole/corpusreader.cpp
rename to libcorpus2_whole/io/corpusreader.cpp
diff --git a/libcorpus2_whole/corpusreader.h b/libcorpus2_whole/io/corpusreader.h
similarity index 100%
rename from libcorpus2_whole/corpusreader.h
rename to libcorpus2_whole/io/corpusreader.h
diff --git a/libcorpus2_whole/docreader.cpp b/libcorpus2_whole/io/docreader.cpp
similarity index 100%
rename from libcorpus2_whole/docreader.cpp
rename to libcorpus2_whole/io/docreader.cpp
diff --git a/libcorpus2_whole/docreader.h b/libcorpus2_whole/io/docreader.h
similarity index 100%
rename from libcorpus2_whole/docreader.h
rename to libcorpus2_whole/io/docreader.h
diff --git a/libcorpus2_whole/docreaderi.h b/libcorpus2_whole/io/docreaderi.h
similarity index 100%
rename from libcorpus2_whole/docreaderi.h
rename to libcorpus2_whole/io/docreaderi.h
diff --git a/libcorpus2_whole/poliqarpdocumentreader.cpp b/libcorpus2_whole/io/poliqarpdocumentreader.cpp
similarity index 100%
rename from libcorpus2_whole/poliqarpdocumentreader.cpp
rename to libcorpus2_whole/io/poliqarpdocumentreader.cpp
diff --git a/libcorpus2_whole/poliqarpdocumentreader.h b/libcorpus2_whole/io/poliqarpdocumentreader.h
similarity index 100%
rename from libcorpus2_whole/poliqarpdocumentreader.h
rename to libcorpus2_whole/io/poliqarpdocumentreader.h
diff --git a/libcorpus2_whole/relreader.cpp b/libcorpus2_whole/io/relreader.cpp
similarity index 100%
rename from libcorpus2_whole/relreader.cpp
rename to libcorpus2_whole/io/relreader.cpp
diff --git a/libcorpus2_whole/relreader.h b/libcorpus2_whole/io/relreader.h
similarity index 100%
rename from libcorpus2_whole/relreader.h
rename to libcorpus2_whole/io/relreader.h
diff --git a/swig/documentreader.i b/swig/documentreader.i
index 599e6b9..efdbf0c 100644
--- a/swig/documentreader.i
+++ b/swig/documentreader.i
@@ -3,7 +3,7 @@
 
 %module libcorpusdocumentreader
 %{
-  #include <libcorpus2_whole/docreader.h>
+  #include <libcorpus2_whole/io/docreader.h>
 %}
 
 %include "exception.i"
diff --git a/swig/relationreader.i b/swig/relationreader.i
index e6ca814..bcf567a 100644
--- a/swig/relationreader.i
+++ b/swig/relationreader.i
@@ -3,7 +3,7 @@
 
 %module libcorpusrelationreader
 %{
-  #include <libcorpus2_whole/relreader.h>
+  #include <libcorpus2_whole/io/relreader.h>
 %}
 
 namespace Corpus2 {
-- 
GitLab