diff --git a/.gitignore b/.gitignore
index bd7f446b4406a79eb7fd69ccef761526b57e7dac..ecd27fbafe522e65c211eadc6a8435817cae623e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,20 +17,24 @@ r?
*.rej
# Build products
+bin/*
+lib/*
+build/*
tmp/*
-project/Makefile*
-project/*/Makefile*
-project/*/object_script*
-project/*/Release/*
-project/*/Debug/*
-project/*/release/*
-project/*/debug/*
*.a
*.dll
*.lib
*.exe
*.o
*.md5sum
+*.vcproj
+
+# Out-of-date directories
+config/*
+project/*
+working/*
+working/*/*
+
# Qt files
*.pro.user
diff --git a/CMakeLists.txt b/CMakeLists.txt
deleted file mode 100644
index 61c978e3831c27a2feb12b4c5cef39aa4120db1f..0000000000000000000000000000000000000000
--- a/CMakeLists.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-project(qhull)
-cmake_minimum_required(VERSION 2.4)
-if(COMMAND cmake_policy)
- cmake_policy(SET CMP0003 NEW)
-endif(COMMAND cmake_policy)
-
-add_subdirectory(src)
-
-install(DIRECTORY html DESTINATION share/doc/qhull)
diff --git a/project/patch/qhull-2003.1/poly.c-qh_gethash.patch b/eg/patch/qhull-2003.1/poly.c-qh_gethash.patch
similarity index 100%
rename from project/patch/qhull-2003.1/poly.c-qh_gethash.patch
rename to eg/patch/qhull-2003.1/poly.c-qh_gethash.patch
diff --git a/html/qhull-cpp.xml b/html/qhull-cpp.xml
index 9bfb95562f9d85344704c6673e1a29560d6e1648..b5ad052bcebba9d87140ec38d02e8be65f146391 100644
--- a/html/qhull-cpp.xml
+++ b/html/qhull-cpp.xml
@@ -6,8 +6,8 @@
xmlns:rf="http://schemas.roadintranet.org/road-faq-1"
title=" C++ interface to Qhull"
file="qhull-cpp.xml"
- fileid="$Id: //product/qhull/main/rel/html/qhull-cpp.xml#25 $$Change: 1327 $"
- fileChange="$DateTime: 2011/03/06 18:21:13 $$Author: bbarber $">
+ fileid="$Id: //main/2011/qhull/html/qhull-cpp.xml#1 $$Change: 1330 $"
+ fileChange="$DateTime: 2011/03/06 21:30:00 $$Author: bbarber $">
<div><h4>Qhull C++ -- C++ interface to Qhull</h4></div>
<rf:copyright>
<a href="../cpp/COPYING.txt">Copyright</a> (c) 2009-2010, C.B. Barber
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 45e246ed3b1875f2b40a2e06ef559b02b601922b..61c978e3831c27a2feb12b4c5cef39aa4120db1f 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,73 +1,9 @@
-project(qhull_lib)
+project(qhull)
+cmake_minimum_required(VERSION 2.4)
+if(COMMAND cmake_policy)
+ cmake_policy(SET CMP0003 NEW)
+endif(COMMAND cmake_policy)
-# Order object files by frequency of execution. Small files at end.
-set(
- qhull_src
- rboxlib.c
- user.c
- global.c
- stat.c
- io.c
- geom2.c
- poly2.c
- merge.c
- libqhull.c
- geom.c
- poly.c
- qset.c
- mem.c
- usermem.c
- userprintf.c
- random.c
-)
+add_subdirectory(src)
-file(GLOB qhull_hdr *.h)
-
-add_library(qhull SHARED ${qhull_src})
-target_link_libraries(qhull m)
-if(UNIX)
- if(APPLE)
- set_target_properties(qhull PROPERTIES
- INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib")
- else(APPLE)
- set_target_properties(qhull PROPERTIES
- INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib"
- INSTALL_RPATH_USE_LINK_PATH TRUE
- BUILD_WITH_INSTALL_RPATH FALSE)
- endif(APPLE)
-endif(UNIX)
-add_library(qhullstatic STATIC ${qhull_src})
-set_property(TARGET qhullstatic PROPERTY OUTPUT_NAME "qhull")
-
-set(qhullcmd_SOURCES unix.c)
-set(rbox_SOURCES rbox.c)
-set(qconvex_SOURCES qconvex.c)
-set(qdelaunay_SOURCES qdelaun.c)
-set(qvoronoi_SOURCES qvoronoi.c)
-set(qhalf_SOURCES qhalf.c)
-
-
-add_executable(qhullcmd ${qhullcmd_SOURCES})
-target_link_libraries(qhullcmd qhull)
-set_property(TARGET qhullcmd PROPERTY OUTPUT_NAME "qhull")
-
-add_executable(rbox ${rbox_SOURCES})
-target_link_libraries(rbox qhull)
-
-add_executable(qconvex ${qconvex_SOURCES})
-target_link_libraries(qconvex qhull)
-
-add_executable(qdelaunay ${qdelaunay_SOURCES})
-target_link_libraries(qdelaunay qhull)
-
-add_executable(qvoronoi ${qvoronoi_SOURCES})
-target_link_libraries(qvoronoi qhull)
-
-add_executable(qhalf ${qhalf_SOURCES})
-target_link_libraries(qhalf qhull)
-
-install(TARGETS qhull qhullstatic qhullcmd rbox qconvex qdelaunay qvoronoi qhalf
- RUNTIME DESTINATION bin
- LIBRARY DESTINATION lib
- ARCHIVE DESTINATION lib)
-install(FILES libqhull.h DESTINATION include)
+install(DIRECTORY html DESTINATION share/doc/qhull)
diff --git a/src/Changes.txt b/src/Changes.txt
index 4cbefe2e7fd206bc57872ec16cbcc18f3f2def57..77ef9adaa9a58183969d8d60b089c167ca98ca09 100644
--- a/src/Changes.txt
+++ b/src/Changes.txt
@@ -61,6 +61,7 @@ gitorious.org/qhull 2011/03/06
- qhull-cpp.xml: Add naming conventions, try, Temporarily, p, end, private, error
- Changes.txt: More to do. Links to build systems
- Delete src/MBorland
+ - Renamed RoadError::defined() to RoadError::isDefined()
------------
gitorious.org/qhull 2010/03/17
diff --git a/src/libqhull/CMakeLists.txt b/src/libqhull/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..45e246ed3b1875f2b40a2e06ef559b02b601922b
--- /dev/null
+++ b/src/libqhull/CMakeLists.txt
@@ -0,0 +1,73 @@
+project(qhull_lib)
+
+# Order object files by frequency of execution. Small files at end.
+set(
+ qhull_src
+ rboxlib.c
+ user.c
+ global.c
+ stat.c
+ io.c
+ geom2.c
+ poly2.c
+ merge.c
+ libqhull.c
+ geom.c
+ poly.c
+ qset.c
+ mem.c
+ usermem.c
+ userprintf.c
+ random.c
+)
+
+file(GLOB qhull_hdr *.h)
+
+add_library(qhull SHARED ${qhull_src})
+target_link_libraries(qhull m)
+if(UNIX)
+ if(APPLE)
+ set_target_properties(qhull PROPERTIES
+ INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib")
+ else(APPLE)
+ set_target_properties(qhull PROPERTIES
+ INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib"
+ INSTALL_RPATH_USE_LINK_PATH TRUE
+ BUILD_WITH_INSTALL_RPATH FALSE)
+ endif(APPLE)
+endif(UNIX)
+add_library(qhullstatic STATIC ${qhull_src})
+set_property(TARGET qhullstatic PROPERTY OUTPUT_NAME "qhull")
+
+set(qhullcmd_SOURCES unix.c)
+set(rbox_SOURCES rbox.c)
+set(qconvex_SOURCES qconvex.c)
+set(qdelaunay_SOURCES qdelaun.c)
+set(qvoronoi_SOURCES qvoronoi.c)
+set(qhalf_SOURCES qhalf.c)
+
+
+add_executable(qhullcmd ${qhullcmd_SOURCES})
+target_link_libraries(qhullcmd qhull)
+set_property(TARGET qhullcmd PROPERTY OUTPUT_NAME "qhull")
+
+add_executable(rbox ${rbox_SOURCES})
+target_link_libraries(rbox qhull)
+
+add_executable(qconvex ${qconvex_SOURCES})
+target_link_libraries(qconvex qhull)
+
+add_executable(qdelaunay ${qdelaunay_SOURCES})
+target_link_libraries(qdelaunay qhull)
+
+add_executable(qvoronoi ${qvoronoi_SOURCES})
+target_link_libraries(qvoronoi qhull)
+
+add_executable(qhalf ${qhalf_SOURCES})
+target_link_libraries(qhalf qhull)
+
+install(TARGETS qhull qhullstatic qhullcmd rbox qconvex qdelaunay qvoronoi qhalf
+ RUNTIME DESTINATION bin
+ LIBRARY DESTINATION lib
+ ARCHIVE DESTINATION lib)
+install(FILES libqhull.h DESTINATION include)
diff --git a/src/Makefile.txt b/src/libqhull/Makefile.txt
similarity index 100%
rename from src/Makefile.txt
rename to src/libqhull/Makefile.txt
diff --git a/src/Mborland b/src/libqhull/Mborland
similarity index 100%
rename from src/Mborland
rename to src/libqhull/Mborland
diff --git a/src/geom.c b/src/libqhull/geom.c
similarity index 99%
rename from src/geom.c
rename to src/libqhull/geom.c
index 9b683759ac8b617935de416600f71ae825189c75..60ad336a483c48b9ea13093cd294bea292eb2c0d 100644
--- a/src/geom.c
+++ b/src/libqhull/geom.c
@@ -7,8 +7,8 @@
see qh-geom.htm and geom.h
copyright (c) 1993-2010 The Geometry Center.
- $Id: //product/qhull/main/rel/src/geom.c#29 $$Change: 1164 $
- $DateTime: 2010/01/07 21:52:00 $$Author: bbarber $
+ $Id: //main/2011/qhull/src/libqhull/geom.c#1 $$Change: 1330 $
+ $DateTime: 2011/03/06 21:30:00 $$Author: bbarber $
infrequent code goes into geom2.c
*/
diff --git a/src/geom.h b/src/libqhull/geom.h
similarity index 98%
rename from src/geom.h
rename to src/libqhull/geom.h
index b9d7627c2492ea876315883a8fd62c6676d5a2fb..7d56bb2c61ddc25d8815bea98f42555d265cc136 100644
--- a/src/geom.h
+++ b/src/libqhull/geom.h
@@ -7,8 +7,8 @@
see qh-geom.htm and geom.c
copyright (c) 1993-2010 The Geometry Center.
- $Id: //product/qhull/main/rel/src/geom.h#18 $$Change: 1164 $
- $DateTime: 2010/01/07 21:52:00 $$Author: bbarber $
+ $Id: //main/2011/qhull/src/libqhull/geom.h#1 $$Change: 1330 $
+ $DateTime: 2011/03/06 21:30:00 $$Author: bbarber $
*/
#ifndef qhDEFgeom
diff --git a/src/geom2.c b/src/libqhull/geom2.c
similarity index 99%
rename from src/geom2.c
rename to src/libqhull/geom2.c
index 33e2e4db1f53fa169560a0c5d162341dc594f2f1..cb1f8e5f5dee1d0b2f219abd1acf6a35c513b8f5 100644
--- a/src/geom2.c
+++ b/src/libqhull/geom2.c
@@ -8,8 +8,8 @@
see qh-geom.htm and geom.h
copyright (c) 1993-2010 The Geometry Center.
- $Id: //product/qhull/main/rel/src/geom2.c#29 $$Change: 1164 $
- $DateTime: 2010/01/07 21:52:00 $$Author: bbarber $
+ $Id: //main/2011/qhull/src/libqhull/geom2.c#1 $$Change: 1330 $
+ $DateTime: 2011/03/06 21:30:00 $$Author: bbarber $
frequently used code goes into geom.c
*/
diff --git a/src/global.c b/src/libqhull/global.c
similarity index 99%
rename from src/global.c
rename to src/libqhull/global.c
index 3c6141a6a0adfd4c788dd830952bcea18ae48b7f..d4fefc40db0bb7914370af027add0f99d7a589de 100644
--- a/src/global.c
+++ b/src/libqhull/global.c
@@ -12,8 +12,8 @@
see qhull_a.h for internal functions
copyright (c) 1993-2010 The Geometry Center.
- $Id: //product/qhull/main/rel/src/global.c#60 $$Change: 1183 $
- $DateTime: 2010/01/13 20:59:32 $$Author: bbarber $
+ $Id: //main/2011/qhull/src/libqhull/global.c#1 $$Change: 1330 $
+ $DateTime: 2011/03/06 21:30:00 $$Author: bbarber $
*/
#include "qhull_a.h"
diff --git a/src/index.htm b/src/libqhull/index.htm
similarity index 100%
rename from src/index.htm
rename to src/libqhull/index.htm
diff --git a/src/io.c b/src/libqhull/io.c
similarity index 99%
rename from src/io.c
rename to src/libqhull/io.c
index 0ca93ae2a5adb3120209ac494475015f5e0a7d90..acedc86533d5b32a539cbe90056b91263c16b62b 100644
--- a/src/io.c
+++ b/src/libqhull/io.c
@@ -14,8 +14,8 @@
This allows the user to avoid loading io.o from qhull.a
copyright (c) 1993-2010 The Geometry Center.
- $Id: //product/qhull/main/rel/src/io.c#40 $$Change: 1213 $
- $DateTime: 2010/03/14 19:09:59 $$Author: bbarber $
+ $Id: //main/2011/qhull/src/libqhull/io.c#1 $$Change: 1330 $
+ $DateTime: 2011/03/06 21:30:00 $$Author: bbarber $
*/
#include "qhull_a.h"
diff --git a/src/io.h b/src/libqhull/io.h
similarity index 98%
rename from src/io.h
rename to src/libqhull/io.h
index eb78b755509b0c0a23ec8ac9ab9e599c2e1325a8..aa2d26adcb9e6bca74053066cf973cba921db606 100644
--- a/src/io.h
+++ b/src/libqhull/io.h
@@ -7,8 +7,8 @@
see README, libqhull.h and io.c
copyright (c) 1993-2010 The Geometry Center.
- $Id: //product/qhull/main/rel/src/io.h#25 $$Change: 1164 $
- $DateTime: 2010/01/07 21:52:00 $$Author: bbarber $
+ $Id: //main/2011/qhull/src/libqhull/io.h#1 $$Change: 1330 $
+ $DateTime: 2011/03/06 21:30:00 $$Author: bbarber $
*/
#ifndef qhDEFio
diff --git a/src/libqhull.c b/src/libqhull/libqhull.c
similarity index 99%
rename from src/libqhull.c
rename to src/libqhull/libqhull.c
index 0854b0a2d7034861ab4883cc5d86f89054e38ccb..1f1ffb60fc90c2b8430864aa60ee4d7942134a9f 100644
--- a/src/libqhull.c
+++ b/src/libqhull/libqhull.c
@@ -11,8 +11,8 @@
see qhull_a.h for internal functions
copyright (c) 1993-2010 The Geometry Center.
- $Id: //product/qhull/main/rel/src/libqhull.c#7 $$Change: 1164 $
- $DateTime: 2010/01/07 21:52:00 $$Author: bbarber $
+ $Id: //main/2011/qhull/src/libqhull/libqhull.c#1 $$Change: 1330 $
+ $DateTime: 2011/03/06 21:30:00 $$Author: bbarber $
*/
#include "qhull_a.h"
diff --git a/src/libqhull.h b/src/libqhull/libqhull.h
similarity index 99%
rename from src/libqhull.h
rename to src/libqhull/libqhull.h
index 2bf4435f8d1e3275bc4f41d348a817672ed155ca..35355b296086e41886ff6137bf6eebbd58969020 100644
--- a/src/libqhull.h
+++ b/src/libqhull/libqhull.h
@@ -7,8 +7,8 @@
see qh-qhull.htm, qhull_a.h
copyright (c) 1993-2010 The Geometry Center.
- $Id: //product/qhull/main/rel/src/libqhull.h#9 $$Change: 1172 $
- $DateTime: 2010/01/09 21:42:16 $$Author: bbarber $
+ $Id: //main/2011/qhull/src/libqhull/libqhull.h#1 $$Change: 1330 $
+ $DateTime: 2011/03/06 21:30:00 $$Author: bbarber $
NOTE: access to qh_qh is via the 'qh' macro. This allows
qh_qh to be either a pointer or a structure. An example
diff --git a/project/libqhull/libqhull.pro b/src/libqhull/libqhull.pro
similarity index 100%
rename from project/libqhull/libqhull.pro
rename to src/libqhull/libqhull.pro
diff --git a/src/mem.c b/src/libqhull/mem.c
similarity index 99%
rename from src/mem.c
rename to src/libqhull/mem.c
index c1a533b3a73326dd63e53bc429255c3c78fc85a6..86d731131a18a00a6078a4fd963614f707fb11d9 100644
--- a/src/mem.c
+++ b/src/libqhull/mem.c
@@ -30,8 +30,8 @@
global.c (qh_initbuffers) for an example of using mem.c
copyright (c) 1993-2010 The Geometry Center.
- $Id: //product/qhull/main/rel/src/mem.c#32 $$Change: 1164 $
- $DateTime: 2010/01/07 21:52:00 $$Author: bbarber $
+ $Id: //main/2011/qhull/src/libqhull/mem.c#1 $$Change: 1330 $
+ $DateTime: 2011/03/06 21:30:00 $$Author: bbarber $
*/
#include "mem.h"
diff --git a/src/mem.h b/src/libqhull/mem.h
similarity index 98%
rename from src/mem.h
rename to src/libqhull/mem.h
index 90ca632c50ba8b9d69a599f5d412ac13a1c93060..eb5c13b8ff45425ea20fd0fed347ce73474a20aa 100644
--- a/src/mem.h
+++ b/src/libqhull/mem.h
@@ -12,8 +12,8 @@
qh_errexit(qhmem_ERRqhull, NULL, NULL) otherwise
copyright (c) 1993-2010 The Geometry Center.
- $Id: //product/qhull/main/rel/src/mem.h#28 $$Change: 1164 $
- $DateTime: 2010/01/07 21:52:00 $$Author: bbarber $
+ $Id: //main/2011/qhull/src/libqhull/mem.h#1 $$Change: 1330 $
+ $DateTime: 2011/03/06 21:30:00 $$Author: bbarber $
*/
#ifndef qhDEFmem
diff --git a/src/merge.c b/src/libqhull/merge.c
similarity index 99%
rename from src/merge.c
rename to src/libqhull/merge.c
index 8fcc1bb84ce807c7e89fea978e13055e2d93b714..12ca3e9ddac590e7223e052f745ec031e20cf0e0 100644
--- a/src/merge.c
+++ b/src/libqhull/merge.c
@@ -21,8 +21,8 @@
vertex->neighbors not set until the first merge occurs
copyright (c) 1993-2010 C.B. Barber.
- $Id: //product/qhull/main/rel/src/merge.c#27 $$Change: 1164 $
- $DateTime: 2010/01/07 21:52:00 $$Author: bbarber $
+ $Id: //main/2011/qhull/src/libqhull/merge.c#1 $$Change: 1330 $
+ $DateTime: 2011/03/06 21:30:00 $$Author: bbarber $
*/
#include "qhull_a.h"
diff --git a/src/merge.h b/src/libqhull/merge.h
similarity index 98%
rename from src/merge.h
rename to src/libqhull/merge.h
index 7ca9a4f5ddffd3f4bd1e9695cc2193fade119852..a1073c2e1bd969d593466656d38069b89eff97d0 100644
--- a/src/merge.h
+++ b/src/libqhull/merge.h
@@ -7,8 +7,8 @@
see qh-merge.htm and merge.c
copyright (c) 1993-2010 C.B. Barber.
- $Id: //product/qhull/main/rel/src/merge.h#21 $$Change: 1164 $
- $DateTime: 2010/01/07 21:52:00 $$Author: bbarber $
+ $Id: //main/2011/qhull/src/libqhull/merge.h#1 $$Change: 1330 $
+ $DateTime: 2011/03/06 21:30:00 $$Author: bbarber $
*/
#ifndef qhDEFmerge
diff --git a/src/poly.c b/src/libqhull/poly.c
similarity index 99%
rename from src/poly.c
rename to src/libqhull/poly.c
index bc87bc645874f49c2dda18db06d1d3fb7f7d3e17..5650d037de004774641814666cd0932d67f69f23 100644
--- a/src/poly.c
+++ b/src/libqhull/poly.c
@@ -10,8 +10,8 @@
(all but top 50 and their callers 12/3/95)
copyright (c) 1993-2010 The Geometry Center.
- $Id: //product/qhull/main/rel/src/poly.c#26 $$Change: 1171 $
- $DateTime: 2010/01/09 10:11:25 $$Author: bbarber $
+ $Id: //main/2011/qhull/src/libqhull/poly.c#1 $$Change: 1330 $
+ $DateTime: 2011/03/06 21:30:00 $$Author: bbarber $
*/
#include "qhull_a.h"
diff --git a/src/poly.h b/src/libqhull/poly.h
similarity index 98%
rename from src/poly.h
rename to src/libqhull/poly.h
index 929de2c584656209c0f7270dc7a10b41fb56b404..17d0495c55120eb560b91d6d7e157e0d4575bdb2 100644
--- a/src/poly.h
+++ b/src/libqhull/poly.h
@@ -7,8 +7,8 @@
see qh-poly.htm, libqhull.h and poly.c
copyright (c) 1993-2010 The Geometry Center.
- $Id: //product/qhull/main/rel/src/poly.h#22 $$Change: 1164 $
- $DateTime: 2010/01/07 21:52:00 $$Author: bbarber $
+ $Id: //main/2011/qhull/src/libqhull/poly.h#1 $$Change: 1330 $
+ $DateTime: 2011/03/06 21:30:00 $$Author: bbarber $
*/
#ifndef qhDEFpoly
diff --git a/src/poly2.c b/src/libqhull/poly2.c
similarity index 99%
rename from src/poly2.c
rename to src/libqhull/poly2.c
index 451d66fe20cd5330a0d93e6e35255a932a2cd7fb..8b210286322eddb2996914ffe765c622f270d3dc 100644
--- a/src/poly2.c
+++ b/src/libqhull/poly2.c
@@ -9,8 +9,8 @@
frequently used code is in poly.c
copyright (c) 1993-2010 The Geometry Center.
- $Id: //product/qhull/main/rel/src/poly2.c#40 $$Change: 1164 $
- $DateTime: 2010/01/07 21:52:00 $$Author: bbarber $
+ $Id: //main/2011/qhull/src/libqhull/poly2.c#1 $$Change: 1330 $
+ $DateTime: 2011/03/06 21:30:00 $$Author: bbarber $
*/
#include "qhull_a.h"
diff --git a/src/qh-geom.htm b/src/libqhull/qh-geom.htm
similarity index 100%
rename from src/qh-geom.htm
rename to src/libqhull/qh-geom.htm
diff --git a/src/qh-globa.htm b/src/libqhull/qh-globa.htm
similarity index 100%
rename from src/qh-globa.htm
rename to src/libqhull/qh-globa.htm
diff --git a/src/qh-io.htm b/src/libqhull/qh-io.htm
similarity index 100%
rename from src/qh-io.htm
rename to src/libqhull/qh-io.htm
diff --git a/src/qh-mem.htm b/src/libqhull/qh-mem.htm
similarity index 100%
rename from src/qh-mem.htm
rename to src/libqhull/qh-mem.htm
diff --git a/src/qh-merge.htm b/src/libqhull/qh-merge.htm
similarity index 100%
rename from src/qh-merge.htm
rename to src/libqhull/qh-merge.htm
diff --git a/src/qh-poly.htm b/src/libqhull/qh-poly.htm
similarity index 100%
rename from src/qh-poly.htm
rename to src/libqhull/qh-poly.htm
diff --git a/src/qh-qhull.htm b/src/libqhull/qh-qhull.htm
similarity index 100%
rename from src/qh-qhull.htm
rename to src/libqhull/qh-qhull.htm
diff --git a/src/qh-set.htm b/src/libqhull/qh-set.htm
similarity index 100%
rename from src/qh-set.htm
rename to src/libqhull/qh-set.htm
diff --git a/src/qh-stat.htm b/src/libqhull/qh-stat.htm
similarity index 100%
rename from src/qh-stat.htm
rename to src/libqhull/qh-stat.htm
diff --git a/src/qh-user.htm b/src/libqhull/qh-user.htm
similarity index 100%
rename from src/qh-user.htm
rename to src/libqhull/qh-user.htm
diff --git a/src/qhull.h b/src/libqhull/qhull.h
similarity index 73%
rename from src/qhull.h
rename to src/libqhull/qhull.h
index 714d8e8b429320d8f7e4823f40c3916608c1a0f1..725b4205806587f9f3ba5f6e767af08d39b31d7e 100644
--- a/src/qhull.h
+++ b/src/libqhull/qhull.h
@@ -6,8 +6,8 @@
Proxy for libqhull.h for backwards compatability
copyright (c) 1993-2010 The Geometry Center.
- $Id: //product/qhull/main/rel/src/qhull.h#51 $$Change: 1188 $
- $DateTime: 2010/01/14 22:35:43 $$Author: bbarber $
+ $Id: //main/2011/qhull/src/libqhull/qhull.h#1 $$Change: 1330 $
+ $DateTime: 2011/03/06 21:30:00 $$Author: bbarber $
*/
#ifndef qhDEFqhull
diff --git a/src/qhull_a.h b/src/libqhull/qhull_a.h
similarity index 97%
rename from src/qhull_a.h
rename to src/libqhull/qhull_a.h
index 8bd29246f1a44a7e719a7a8769ed397421d45378..aaab5a91efe0d52804d75a03d4abfe254367f8bd 100644
--- a/src/qhull_a.h
+++ b/src/libqhull/qhull_a.h
@@ -13,8 +13,8 @@
defines internal functions for libqhull.c global.c
copyright (c) 1993-2010 The Geometry Center.
- $Id: //product/qhull/main/rel/src/qhull_a.h#27 $$Change: 1164 $
- $DateTime: 2010/01/07 21:52:00 $$Author: bbarber $
+ $Id: //main/2011/qhull/src/libqhull/qhull_a.h#1 $$Change: 1330 $
+ $DateTime: 2011/03/06 21:30:00 $$Author: bbarber $
Notes: grep for ((" and (" to catch fprintf("lkasdjf");
full parens around (x?y:z)
diff --git a/src/qset.c b/src/libqhull/qset.c
similarity index 99%
rename from src/qset.c
rename to src/libqhull/qset.c
index 08082b403c53d1241269e9798a7ec3d30337397e..33cd9f2f1598eb60a84d0e5ac833bb21610545f8 100644
--- a/src/qset.c
+++ b/src/libqhull/qset.c
@@ -7,8 +7,8 @@
see qh-set.htm and qset.h
copyright (c) 1993-2010 The Geometry Center.
- $Id: //product/qhull/main/rel/src/qset.c#29 $$Change: 1164 $
- $DateTime: 2010/01/07 21:52:00 $$Author: bbarber $
+ $Id: //main/2011/qhull/src/libqhull/qset.c#1 $$Change: 1330 $
+ $DateTime: 2011/03/06 21:30:00 $$Author: bbarber $
*/
#include "qset.h"
diff --git a/src/qset.h b/src/libqhull/qset.h
similarity index 99%
rename from src/qset.h
rename to src/libqhull/qset.h
index 611040bc2c4e46d3a69a3e7866c6c5b802b3cdc2..6d5b7a19b3eae7faff824b722cdff3907368fc25 100644
--- a/src/qset.h
+++ b/src/libqhull/qset.h
@@ -17,8 +17,8 @@
- sets may be sorted or unsorted, the caller must distinguish this
copyright (c) 1993-2010 The Geometry Center.
- $Id: //product/qhull/main/rel/src/qset.h#20 $$Change: 1164 $
- $DateTime: 2010/01/07 21:52:00 $$Author: bbarber $
+ $Id: //main/2011/qhull/src/libqhull/qset.h#1 $$Change: 1330 $
+ $DateTime: 2011/03/06 21:30:00 $$Author: bbarber $
*/
#ifndef qhDEFset
diff --git a/src/random.c b/src/libqhull/random.c
similarity index 100%
rename from src/random.c
rename to src/libqhull/random.c
diff --git a/src/random.h b/src/libqhull/random.h
similarity index 87%
rename from src/random.h
rename to src/libqhull/random.h
index 5a0ecd5f86b8d4318d7285823ff707c0b27d7c7b..4fb9426a675e356a3cca4969922d6ec6ce1e7838 100644
--- a/src/random.h
+++ b/src/libqhull/random.h
@@ -7,8 +7,8 @@
see qh-geom.htm and random.c
copyright (c) 1993-2010 The Geometry Center.
- $Id: //product/qhull/main/rel/src/random.h#11 $$Change: 1164 $
- $DateTime: 2010/01/07 21:52:00 $$Author: bbarber $
+ $Id: //main/2011/qhull/src/libqhull/random.h#1 $$Change: 1330 $
+ $DateTime: 2011/03/06 21:30:00 $$Author: bbarber $
*/
#ifndef qhDEFrandom
diff --git a/src/rboxlib.c b/src/libqhull/rboxlib.c
similarity index 100%
rename from src/rboxlib.c
rename to src/libqhull/rboxlib.c
diff --git a/src/stat.c b/src/libqhull/stat.c
similarity index 99%
rename from src/stat.c
rename to src/libqhull/stat.c
index ac158c8072b7d4b5d0e03c52db196e5e11b83219..43043216448f50d1840dfdbdc77a9a37731f973c 100644
--- a/src/stat.c
+++ b/src/libqhull/stat.c
@@ -7,8 +7,8 @@
see qh-stat.htm and stat.h
copyright (c) 1993-2010 The Geometry Center.
- $Id: //product/qhull/main/rel/src/stat.c#28 $$Change: 1164 $
- $DateTime: 2010/01/07 21:52:00 $$Author: bbarber $
+ $Id: //main/2011/qhull/src/libqhull/stat.c#1 $$Change: 1330 $
+ $DateTime: 2011/03/06 21:30:00 $$Author: bbarber $
*/
#include "qhull_a.h"
diff --git a/src/stat.h b/src/libqhull/stat.h
similarity index 99%
rename from src/stat.h
rename to src/libqhull/stat.h
index da06165ca1e034611842ae1a80f1451fce90f0d3..ab1a775b932d0391cfedefb9177167cfed71e9c4 100644
--- a/src/stat.h
+++ b/src/libqhull/stat.h
@@ -7,8 +7,8 @@
see qh-stat.htm and stat.c
copyright (c) 1993-2010 The Geometry Center.
- $Id: //product/qhull/main/rel/src/stat.h#28 $$Change: 1164 $
- $DateTime: 2010/01/07 21:52:00 $$Author: bbarber $
+ $Id: //main/2011/qhull/src/libqhull/stat.h#1 $$Change: 1330 $
+ $DateTime: 2011/03/06 21:30:00 $$Author: bbarber $
recompile qhull if you change this file
diff --git a/src/user.c b/src/libqhull/user.c
similarity index 100%
rename from src/user.c
rename to src/libqhull/user.c
diff --git a/src/user.h b/src/libqhull/user.h
similarity index 100%
rename from src/user.h
rename to src/libqhull/user.h
diff --git a/src/usermem.c b/src/libqhull/usermem.c
similarity index 100%
rename from src/usermem.c
rename to src/libqhull/usermem.c
diff --git a/src/userprintf.c b/src/libqhull/userprintf.c
similarity index 100%
rename from src/userprintf.c
rename to src/libqhull/userprintf.c
diff --git a/cpp/Coordinates.cpp b/src/libqhullcpp/Coordinates.cpp
similarity index 96%
rename from cpp/Coordinates.cpp
rename to src/libqhullcpp/Coordinates.cpp
index 8940fcbc2ebec001725e7bdcdb46420c3e8fb75d..bccce6537d9c2472a12e8c13bdd531f2f9972e27 100644
--- a/cpp/Coordinates.cpp
+++ b/src/libqhullcpp/Coordinates.cpp
@@ -1,8 +1,8 @@
/****************************************************************************
**
** Copyright (C) 2009-2010 C.B. Barber. All rights reserved.
-** $Id: //product/qhull/main/rel/cpp/Coordinates.cpp#19 $$Change: 1150 $
-** $DateTime: 2010/01/04 22:43:14 $$Author: bbarber $
+** $Id: //main/2011/qhull/src/libqhullcpp/Coordinates.cpp#1 $$Change: 1330 $
+** $DateTime: 2011/03/06 21:30:00 $$Author: bbarber $
**
****************************************************************************/
diff --git a/cpp/Coordinates.h b/src/libqhullcpp/Coordinates.h
similarity index 99%
rename from cpp/Coordinates.h
rename to src/libqhullcpp/Coordinates.h
index 774fd4819d8ef4a9db54672602331319b8023d06..58fcb2b9417ecac085f02a3db3b362738886ad62 100644
--- a/cpp/Coordinates.h
+++ b/src/libqhullcpp/Coordinates.h
@@ -1,8 +1,8 @@
/****************************************************************************
**
** Copyright (C) 2009-2010 C.B. Barber. All rights reserved.
-** $Id: //product/qhull/main/rel/cpp/Coordinates.h#36 $$Change: 1193 $
-** $DateTime: 2010/01/23 11:31:35 $$Author: bbarber $
+** $Id: //main/2011/qhull/src/libqhullcpp/Coordinates.h#1 $$Change: 1330 $
+** $DateTime: 2011/03/06 21:30:00 $$Author: bbarber $
**
****************************************************************************/
diff --git a/cpp/PointCoordinates.cpp b/src/libqhullcpp/PointCoordinates.cpp
similarity index 98%
rename from cpp/PointCoordinates.cpp
rename to src/libqhullcpp/PointCoordinates.cpp
index 38ded1ecccc8b861aeb4b46fa8c16d07dfd5daae..2f871c8bcd998ba174d1e16b44e2f70ad41f0235 100644
--- a/cpp/PointCoordinates.cpp
+++ b/src/libqhullcpp/PointCoordinates.cpp
@@ -1,8 +1,8 @@
/****************************************************************************
**
** Copyright (C) 2009-2010 C.B. Barber. All rights reserved.
-** $Id: //product/qhull/main/rel/cpp/PointCoordinates.cpp#23 $$Change: 1164 $
-** $DateTime: 2010/01/07 21:52:00 $$Author: bbarber $
+** $Id: //main/2011/qhull/src/libqhullcpp/PointCoordinates.cpp#1 $$Change: 1330 $
+** $DateTime: 2011/03/06 21:30:00 $$Author: bbarber $
**
****************************************************************************/
diff --git a/cpp/PointCoordinates.h b/src/libqhullcpp/PointCoordinates.h
similarity index 98%
rename from cpp/PointCoordinates.h
rename to src/libqhullcpp/PointCoordinates.h
index 037a1ad57b49251ceb453cd7c9cdab413c0d6e1b..bc364a5088647b25b8deb8f116ceea8a300275e4 100644
--- a/cpp/PointCoordinates.h
+++ b/src/libqhullcpp/PointCoordinates.h
@@ -1,8 +1,8 @@
/****************************************************************************
**
** Copyright (C) 2009-2010 C.B. Barber. All rights reserved.
-** $Id: //product/qhull/main/rel/cpp/PointCoordinates.h#17 $$Change: 1193 $
-** $DateTime: 2010/01/23 11:31:35 $$Author: bbarber $
+** $Id: //main/2011/qhull/src/libqhullcpp/PointCoordinates.h#1 $$Change: 1330 $
+** $DateTime: 2011/03/06 21:30:00 $$Author: bbarber $
**
****************************************************************************/
diff --git a/cpp/Qhull.cpp b/src/libqhullcpp/Qhull.cpp
similarity index 99%
rename from cpp/Qhull.cpp
rename to src/libqhullcpp/Qhull.cpp
index 61a2b5572b62ce47ca766e7be23c27186316c35c..8defd15dc5c6bf316ecd45c04ec9aada6276fe16 100644
--- a/cpp/Qhull.cpp
+++ b/src/libqhullcpp/Qhull.cpp
@@ -1,8 +1,8 @@
/****************************************************************************
**
** Copyright (C) 2008-2010 C.B. Barber. All rights reserved.
-** $Id: //product/qhull/main/rel/cpp/Qhull.cpp#47 $$Change: 1213 $
-** $DateTime: 2010/03/14 19:09:59 $$Author: bbarber $
+** $Id: //main/2011/qhull/src/libqhullcpp/Qhull.cpp#1 $$Change: 1330 $
+** $DateTime: 2011/03/06 21:30:00 $$Author: bbarber $
**
****************************************************************************/
diff --git a/cpp/Qhull.h b/src/libqhullcpp/Qhull.h
similarity index 98%
rename from cpp/Qhull.h
rename to src/libqhullcpp/Qhull.h
index 2f69b212e0bbad5f5fa2ef070921116ff9f532da..0aa018daf214a46b4e71168ff75650e18392d49d 100644
--- a/cpp/Qhull.h
+++ b/src/libqhullcpp/Qhull.h
@@ -1,8 +1,8 @@
/****************************************************************************
**
** Copyright (C) 2008-2010 C.B. Barber. All rights reserved.
-** $Id: //product/qhull/main/rel/cpp/Qhull.h#40 $$Change: 1213 $
-** $DateTime: 2010/03/14 19:09:59 $$Author: bbarber $
+** $Id: //main/2011/qhull/src/libqhullcpp/Qhull.h#1 $$Change: 1330 $
+** $DateTime: 2011/03/06 21:30:00 $$Author: bbarber $
**
****************************************************************************/
diff --git a/cpp/QhullError.cpp b/src/libqhullcpp/QhullError.cpp
similarity index 100%
rename from cpp/QhullError.cpp
rename to src/libqhullcpp/QhullError.cpp
diff --git a/cpp/QhullError.h b/src/libqhullcpp/QhullError.h
similarity index 94%
rename from cpp/QhullError.h
rename to src/libqhullcpp/QhullError.h
index 2f3e226491f3c80611737a57df8fe6c82b91c147..02168e77fc44084336b3605330d1e006861d91dd 100644
--- a/cpp/QhullError.h
+++ b/src/libqhullcpp/QhullError.h
@@ -1,8 +1,8 @@
/****************************************************************************
**
** Copyright (C) 2008-2010 C.B. Barber. All rights reserved.
-** $Id: //product/qhull/main/rel/cpp/QhullError.h#34 $$Change: 1193 $
-** $DateTime: 2010/01/23 11:31:35 $$Author: bbarber $
+** $Id: //main/2011/qhull/src/libqhullcpp/QhullError.h#1 $$Change: 1330 $
+** $DateTime: 2011/03/06 21:30:00 $$Author: bbarber $
**
****************************************************************************/
diff --git a/cpp/QhullEvent.cpp b/src/libqhullcpp/QhullEvent.cpp
similarity index 100%
rename from cpp/QhullEvent.cpp
rename to src/libqhullcpp/QhullEvent.cpp
diff --git a/cpp/QhullEvent.h b/src/libqhullcpp/QhullEvent.h
similarity index 93%
rename from cpp/QhullEvent.h
rename to src/libqhullcpp/QhullEvent.h
index 98c77e91ef073bb7d0ff026aab4bbc7867540f75..47817bb07b4ef389e6259e6017c869b8fb9570d2 100644
--- a/cpp/QhullEvent.h
+++ b/src/libqhullcpp/QhullEvent.h
@@ -1,8 +1,8 @@
/****************************************************************************
**
** Copyright (C) 2008-2010 C.B. Barber. All rights reserved.
-** $Id: //product/qhull/main/rel/cpp/QhullEvent.h#9 $$Change: 1139 $
-** $DateTime: 2010/01/03 11:20:29 $$Author: bbarber $
+** $Id: //main/2011/qhull/src/libqhullcpp/QhullEvent.h#1 $$Change: 1330 $
+** $DateTime: 2011/03/06 21:30:00 $$Author: bbarber $
**
****************************************************************************/
diff --git a/cpp/QhullFacet.cpp b/src/libqhullcpp/QhullFacet.cpp
similarity index 99%
rename from cpp/QhullFacet.cpp
rename to src/libqhullcpp/QhullFacet.cpp
index eb306b1b4ec28a2a89a7a6ab4e9190271179283d..37935f3c8a12afc4dfa9b8b9669e629c40e3d857 100644
--- a/cpp/QhullFacet.cpp
+++ b/src/libqhullcpp/QhullFacet.cpp
@@ -1,8 +1,8 @@
/****************************************************************************
**
** Copyright (C) 2008-2010 C.B. Barber. All rights reserved.
-** $Id: //product/qhull/main/rel/cpp/QhullFacet.cpp#38 $$Change: 1193 $
-** $DateTime: 2010/01/23 11:31:35 $$Author: bbarber $
+** $Id: //main/2011/qhull/src/libqhullcpp/QhullFacet.cpp#1 $$Change: 1330 $
+** $DateTime: 2011/03/06 21:30:00 $$Author: bbarber $
**
****************************************************************************/
diff --git a/cpp/QhullFacet.h b/src/libqhullcpp/QhullFacet.h
similarity index 98%
rename from cpp/QhullFacet.h
rename to src/libqhullcpp/QhullFacet.h
index 4d8bbe76fbf5b2713effa7d3d7bf5d78ce944a95..f2ea58ba0825a2b3a0d916d44f15a87db56f2426 100644
--- a/cpp/QhullFacet.h
+++ b/src/libqhullcpp/QhullFacet.h
@@ -1,8 +1,8 @@
/****************************************************************************
**
** Copyright (C) 2008-2010 C.B. Barber. All rights reserved.
-** $Id: //product/qhull/main/rel/cpp/QhullFacet.h#38 $$Change: 1193 $
-** $DateTime: 2010/01/23 11:31:35 $$Author: bbarber $
+** $Id: //main/2011/qhull/src/libqhullcpp/QhullFacet.h#1 $$Change: 1330 $
+** $DateTime: 2011/03/06 21:30:00 $$Author: bbarber $
**
****************************************************************************/
diff --git a/cpp/QhullFacetList.cpp b/src/libqhullcpp/QhullFacetList.cpp
similarity index 96%
rename from cpp/QhullFacetList.cpp
rename to src/libqhullcpp/QhullFacetList.cpp
index dce1efbc8f77dd151955b5784e0de520dafff620..3b5b1e9f174aa0efc55ae915397422ed3b7e0016 100644
--- a/cpp/QhullFacetList.cpp
+++ b/src/libqhullcpp/QhullFacetList.cpp
@@ -1,8 +1,8 @@
/****************************************************************************
**
** Copyright (C) 2008-2010 C.B. Barber. All rights reserved.
-** $Id: //product/qhull/main/rel/cpp/QhullFacetList.cpp#24 $$Change: 1176 $
-** $DateTime: 2010/01/11 19:40:05 $$Author: bbarber $
+** $Id: //main/2011/qhull/src/libqhullcpp/QhullFacetList.cpp#1 $$Change: 1330 $
+** $DateTime: 2011/03/06 21:30:00 $$Author: bbarber $
**
****************************************************************************/
diff --git a/cpp/QhullFacetList.h b/src/libqhullcpp/QhullFacetList.h
similarity index 96%
rename from cpp/QhullFacetList.h
rename to src/libqhullcpp/QhullFacetList.h
index d7dfb88e750786a5cb8d7dfbda4bd40aaa6cf7ef..853861f1a0b5abd307e3f82472ff7cbd9bb23e5c 100644
--- a/cpp/QhullFacetList.h
+++ b/src/libqhullcpp/QhullFacetList.h
@@ -1,8 +1,8 @@
/****************************************************************************
**
** Copyright (C) 2008-2010 C.B. Barber. All rights reserved.
-** $Id: //product/qhull/main/rel/cpp/QhullFacetList.h#26 $$Change: 1193 $
-** $DateTime: 2010/01/23 11:31:35 $$Author: bbarber $
+** $Id: //main/2011/qhull/src/libqhullcpp/QhullFacetList.h#1 $$Change: 1330 $
+** $DateTime: 2011/03/06 21:30:00 $$Author: bbarber $
**
****************************************************************************/
diff --git a/cpp/QhullFacetSet.cpp b/src/libqhullcpp/QhullFacetSet.cpp
similarity index 96%
rename from cpp/QhullFacetSet.cpp
rename to src/libqhullcpp/QhullFacetSet.cpp
index 1bb320e6fc7543be13ce4a5fd0633e2aab86964b..2b581eef4a64a09fca11db54aad047743cb77954 100644
--- a/cpp/QhullFacetSet.cpp
+++ b/src/libqhullcpp/QhullFacetSet.cpp
@@ -1,8 +1,8 @@
/****************************************************************************
**
** Copyright (C) 2008-2010 C.B. Barber. All rights reserved.
-** $Id: //product/qhull/main/rel/cpp/QhullFacetSet.cpp#20 $$Change: 1176 $
-** $DateTime: 2010/01/11 19:40:05 $$Author: bbarber $
+** $Id: //main/2011/qhull/src/libqhullcpp/QhullFacetSet.cpp#1 $$Change: 1330 $
+** $DateTime: 2011/03/06 21:30:00 $$Author: bbarber $
**
****************************************************************************/
diff --git a/cpp/QhullFacetSet.h b/src/libqhullcpp/QhullFacetSet.h
similarity index 96%
rename from cpp/QhullFacetSet.h
rename to src/libqhullcpp/QhullFacetSet.h
index fc66ec4cb6e8344c711e011c3ea6857364b840ce..e23e3c101ed14a12b34f2e693aa18532fadf3276 100644
--- a/cpp/QhullFacetSet.h
+++ b/src/libqhullcpp/QhullFacetSet.h
@@ -1,8 +1,8 @@
/****************************************************************************
**
** Copyright (C) 2008-2010 C.B. Barber. All rights reserved.
-** $Id: //product/qhull/main/rel/cpp/QhullFacetSet.h#24 $$Change: 1193 $
-** $DateTime: 2010/01/23 11:31:35 $$Author: bbarber $
+** $Id: //main/2011/qhull/src/libqhullcpp/QhullFacetSet.h#1 $$Change: 1330 $
+** $DateTime: 2011/03/06 21:30:00 $$Author: bbarber $
**
****************************************************************************/
diff --git a/cpp/QhullHyperplane.cpp b/src/libqhullcpp/QhullHyperplane.cpp
similarity index 96%
rename from cpp/QhullHyperplane.cpp
rename to src/libqhullcpp/QhullHyperplane.cpp
index 946dbadd3d4d45069f375834c4be6af5f022b785..502c96ef40463f8927ec9868956e8424e8bcc069 100644
--- a/cpp/QhullHyperplane.cpp
+++ b/src/libqhullcpp/QhullHyperplane.cpp
@@ -1,8 +1,8 @@
/****************************************************************************
**
** Copyright (C) 2009-2010 C.B. Barber. All rights reserved.
-** $Id: //product/qhull/main/rel/cpp/QhullHyperplane.cpp#12 $$Change: 1193 $
-** $DateTime: 2010/01/23 11:31:35 $$Author: bbarber $
+** $Id: //main/2011/qhull/src/libqhullcpp/QhullHyperplane.cpp#1 $$Change: 1330 $
+** $DateTime: 2011/03/06 21:30:00 $$Author: bbarber $
**
****************************************************************************/
diff --git a/cpp/QhullHyperplane.h b/src/libqhullcpp/QhullHyperplane.h
similarity index 97%
rename from cpp/QhullHyperplane.h
rename to src/libqhullcpp/QhullHyperplane.h
index 29c9385f7154965e90a166a3704b198120ac4b78..d75c4a7ba2ee3be5a54065db7ebe37b8825189f3 100644
--- a/cpp/QhullHyperplane.h
+++ b/src/libqhullcpp/QhullHyperplane.h
@@ -1,8 +1,8 @@
/****************************************************************************
**
** Copyright (C) 2009-2010 C.B. Barber. All rights reserved.
-** $Id: //product/qhull/main/rel/cpp/QhullHyperplane.h#14 $$Change: 1193 $
-** $DateTime: 2010/01/23 11:31:35 $$Author: bbarber $
+** $Id: //main/2011/qhull/src/libqhullcpp/QhullHyperplane.h#1 $$Change: 1330 $
+** $DateTime: 2011/03/06 21:30:00 $$Author: bbarber $
**
****************************************************************************/
diff --git a/cpp/QhullIterator.h b/src/libqhullcpp/QhullIterator.h
similarity index 98%
rename from cpp/QhullIterator.h
rename to src/libqhullcpp/QhullIterator.h
index 5b034614522a42d8be32ce34601873c8a306fed9..3badc7f56f438781abd05a223b6e6ba2e8f2d76f 100644
--- a/cpp/QhullIterator.h
+++ b/src/libqhullcpp/QhullIterator.h
@@ -1,8 +1,8 @@
/****************************************************************************
**
** Copyright (C) 2008-2010 C.B. Barber. All rights reserved.
-** $Id: //product/qhull/main/rel/cpp/QhullIterator.h#19 $$Change: 1139 $
-** $DateTime: 2010/01/03 11:20:29 $$Author: bbarber $
+** $Id: //main/2011/qhull/src/libqhullcpp/QhullIterator.h#1 $$Change: 1330 $
+** $DateTime: 2011/03/06 21:30:00 $$Author: bbarber $
**
****************************************************************************/
diff --git a/cpp/QhullLinkedList.h b/src/libqhullcpp/QhullLinkedList.h
similarity index 98%
rename from cpp/QhullLinkedList.h
rename to src/libqhullcpp/QhullLinkedList.h
index 4de29b0abc0177351a19c0c3bc3f3d5bcbca555b..dfc6870773b41c3fb763ef773980c892ffebf9b6 100644
--- a/cpp/QhullLinkedList.h
+++ b/src/libqhullcpp/QhullLinkedList.h
@@ -1,8 +1,8 @@
/****************************************************************************
**
** Copyright (C) 2008-2010 C.B. Barber. All rights reserved.
-** $Id: //product/qhull/main/rel/cpp/QhullLinkedList.h#34 $$Change: 1193 $
-** $DateTime: 2010/01/23 11:31:35 $$Author: bbarber $
+** $Id: //main/2011/qhull/src/libqhullcpp/QhullLinkedList.h#1 $$Change: 1330 $
+** $DateTime: 2011/03/06 21:30:00 $$Author: bbarber $
**
****************************************************************************/
diff --git a/cpp/QhullLog.cpp b/src/libqhullcpp/QhullLog.cpp
similarity index 96%
rename from cpp/QhullLog.cpp
rename to src/libqhullcpp/QhullLog.cpp
index 613206ea153e2877520337a831b0a9d250b0e394..61b0bcbf774814be0c0e307f1b9b5db2bdf07929 100644
--- a/cpp/QhullLog.cpp
+++ b/src/libqhullcpp/QhullLog.cpp
@@ -1,8 +1,8 @@
/****************************************************************************
**
** Copyright (C) 2008-2010 C.B. Barber. All rights reserved.
-** $Id: //product/qhull/main/rel/cpp/QhullLog.cpp#11 $$Change: 1167 $
-** $DateTime: 2010/01/08 19:03:17 $$Author: bbarber $
+** $Id: //main/2011/qhull/src/libqhullcpp/QhullLog.cpp#1 $$Change: 1330 $
+** $DateTime: 2011/03/06 21:30:00 $$Author: bbarber $
**
****************************************************************************/
diff --git a/cpp/QhullLog.h b/src/libqhullcpp/QhullLog.h
similarity index 95%
rename from cpp/QhullLog.h
rename to src/libqhullcpp/QhullLog.h
index 1fb2b6a2e500ab3d5ab4caf7eb7437d045736938..81b8b5bc12b98e3d1e4c51137e44a2c4a7d8782d 100644
--- a/cpp/QhullLog.h
+++ b/src/libqhullcpp/QhullLog.h
@@ -1,8 +1,8 @@
/****************************************************************************
**
** Copyright (C) 2008-2010 C.B. Barber. All rights reserved.
-** $Id: //product/qhull/main/rel/cpp/QhullLog.h#12 $$Change: 1164 $
-** $DateTime: 2010/01/07 21:52:00 $$Author: bbarber $
+** $Id: //main/2011/qhull/src/libqhullcpp/QhullLog.h#1 $$Change: 1330 $
+** $DateTime: 2011/03/06 21:30:00 $$Author: bbarber $
**
****************************************************************************/
diff --git a/cpp/QhullPoint.cpp b/src/libqhullcpp/QhullPoint.cpp
similarity index 97%
rename from cpp/QhullPoint.cpp
rename to src/libqhullcpp/QhullPoint.cpp
index d8ef470e232adbf7a38121f5b1223c20f1849146..a71f9b7187f377adca2297c72de06dcd14720820 100644
--- a/cpp/QhullPoint.cpp
+++ b/src/libqhullcpp/QhullPoint.cpp
@@ -1,8 +1,8 @@
/****************************************************************************
**
** Copyright (C) 2009-2010 C.B. Barber. All rights reserved.
-** $Id: //product/qhull/main/rel/cpp/QhullPoint.cpp#30 $$Change: 1193 $
-** $DateTime: 2010/01/23 11:31:35 $$Author: bbarber $
+** $Id: //main/2011/qhull/src/libqhullcpp/QhullPoint.cpp#1 $$Change: 1330 $
+** $DateTime: 2011/03/06 21:30:00 $$Author: bbarber $
**
****************************************************************************/
diff --git a/cpp/QhullPoint.h b/src/libqhullcpp/QhullPoint.h
similarity index 97%
rename from cpp/QhullPoint.h
rename to src/libqhullcpp/QhullPoint.h
index 097586c04f83bfa493b3c03185a1ff224c3a63c0..61014b0d05c2550cdcb042b950c0cfc95d97d4b8 100644
--- a/cpp/QhullPoint.h
+++ b/src/libqhullcpp/QhullPoint.h
@@ -1,8 +1,8 @@
/****************************************************************************
**
** Copyright (C) 2009-2010 C.B. Barber. All rights reserved.
-** $Id: //product/qhull/main/rel/cpp/QhullPoint.h#35 $$Change: 1193 $
-** $DateTime: 2010/01/23 11:31:35 $$Author: bbarber $
+** $Id: //main/2011/qhull/src/libqhullcpp/QhullPoint.h#1 $$Change: 1330 $
+** $DateTime: 2011/03/06 21:30:00 $$Author: bbarber $
**
****************************************************************************/
diff --git a/cpp/QhullPointSet.cpp b/src/libqhullcpp/QhullPointSet.cpp
similarity index 97%
rename from cpp/QhullPointSet.cpp
rename to src/libqhullcpp/QhullPointSet.cpp
index 52ceca774fe6df44f4f6e378a4b72b4e15e70d6c..8fd3d9c7ed5f5cbda88842c25f03a74aa9f12251 100644
--- a/cpp/QhullPointSet.cpp
+++ b/src/libqhullcpp/QhullPointSet.cpp
@@ -1,8 +1,8 @@
/****************************************************************************
**
** Copyright (C) 2009-2010 C.B. Barber. All rights reserved.
-** $Id: //product/qhull/main/rel/cpp/QhullPointSet.cpp#11 $$Change: 1176 $
-** $DateTime: 2010/01/11 19:40:05 $$Author: bbarber $
+** $Id: //main/2011/qhull/src/libqhullcpp/QhullPointSet.cpp#1 $$Change: 1330 $
+** $DateTime: 2011/03/06 21:30:00 $$Author: bbarber $
**
****************************************************************************/
diff --git a/cpp/QhullPointSet.h b/src/libqhullcpp/QhullPointSet.h
similarity index 98%
rename from cpp/QhullPointSet.h
rename to src/libqhullcpp/QhullPointSet.h
index b954cf477441f824c21be9fbaeccecf47c64223e..563932ed88cfae3c25fbefc3a4f65948a12dd54b 100644
--- a/cpp/QhullPointSet.h
+++ b/src/libqhullcpp/QhullPointSet.h
@@ -1,8 +1,8 @@
/****************************************************************************
**
** Copyright (C) 2009-2010 C.B. Barber. All rights reserved.
-** $Id: //product/qhull/main/rel/cpp/QhullPointSet.h#21 $$Change: 1193 $
-** $DateTime: 2010/01/23 11:31:35 $$Author: bbarber $
+** $Id: //main/2011/qhull/src/libqhullcpp/QhullPointSet.h#1 $$Change: 1330 $
+** $DateTime: 2011/03/06 21:30:00 $$Author: bbarber $
**
****************************************************************************/
diff --git a/cpp/QhullPoints.cpp b/src/libqhullcpp/QhullPoints.cpp
similarity index 97%
rename from cpp/QhullPoints.cpp
rename to src/libqhullcpp/QhullPoints.cpp
index 3d715343499003e5a3768c31ca76ce97f7043266..5e8f0d469f569be2972eae1ed591cc0d3c077758 100644
--- a/cpp/QhullPoints.cpp
+++ b/src/libqhullcpp/QhullPoints.cpp
@@ -1,8 +1,8 @@
/****************************************************************************
**
** Copyright (C) 2009-2010 C.B. Barber. All rights reserved.
-** $Id: //product/qhull/main/rel/cpp/QhullPoints.cpp#21 $$Change: 1176 $
-** $DateTime: 2010/01/11 19:40:05 $$Author: bbarber $
+** $Id: //main/2011/qhull/src/libqhullcpp/QhullPoints.cpp#1 $$Change: 1330 $
+** $DateTime: 2011/03/06 21:30:00 $$Author: bbarber $
**
****************************************************************************/
diff --git a/cpp/QhullPoints.h b/src/libqhullcpp/QhullPoints.h
similarity index 99%
rename from cpp/QhullPoints.h
rename to src/libqhullcpp/QhullPoints.h
index 68265b6c6487bcbeaa8302e78f78e46aab53f03a..d98c6025c8209ce5812025f070e02c90149581db 100644
--- a/cpp/QhullPoints.h
+++ b/src/libqhullcpp/QhullPoints.h
@@ -1,8 +1,8 @@
/****************************************************************************
**
** Copyright (C) 2009-2010 C.B. Barber. All rights reserved.
-** $Id: //product/qhull/main/rel/cpp/QhullPoints.h#32 $$Change: 1193 $
-** $DateTime: 2010/01/23 11:31:35 $$Author: bbarber $
+** $Id: //main/2011/qhull/src/libqhullcpp/QhullPoints.h#1 $$Change: 1330 $
+** $DateTime: 2011/03/06 21:30:00 $$Author: bbarber $
**
****************************************************************************/
diff --git a/cpp/QhullQh.cpp b/src/libqhullcpp/QhullQh.cpp
similarity index 96%
rename from cpp/QhullQh.cpp
rename to src/libqhullcpp/QhullQh.cpp
index ef406f68e974c72ca9fbd1c168ad55113186bcc0..9e1350576bf268787911dc77d0d3c480499db32b 100644
--- a/cpp/QhullQh.cpp
+++ b/src/libqhullcpp/QhullQh.cpp
@@ -1,8 +1,8 @@
/****************************************************************************
**
** Copyright (C) 2008-2010 C.B. Barber. All rights reserved.
-** $Id: //product/qhull/main/rel/cpp/QhullQh.cpp#26 $$Change: 1164 $
-** $DateTime: 2010/01/07 21:52:00 $$Author: bbarber $
+** $Id: //main/2011/qhull/src/libqhullcpp/QhullQh.cpp#1 $$Change: 1330 $
+** $DateTime: 2011/03/06 21:30:00 $$Author: bbarber $
**
****************************************************************************/
diff --git a/cpp/QhullQh.h b/src/libqhullcpp/QhullQh.h
similarity index 90%
rename from cpp/QhullQh.h
rename to src/libqhullcpp/QhullQh.h
index f4e1957f10d50ed30acb810e86b11fbfcce1cb7b..4c3ef8286b78f75b79343569dc8a23a90579642f 100644
--- a/cpp/QhullQh.h
+++ b/src/libqhullcpp/QhullQh.h
@@ -1,8 +1,8 @@
/****************************************************************************
**
** Copyright (C) 2008-2010 C.B. Barber. All rights reserved.
-** $Id: //product/qhull/main/rel/cpp/QhullQh.h#20 $$Change: 1164 $
-** $DateTime: 2010/01/07 21:52:00 $$Author: bbarber $
+** $Id: //main/2011/qhull/src/libqhullcpp/QhullQh.h#1 $$Change: 1330 $
+** $DateTime: 2011/03/06 21:30:00 $$Author: bbarber $
**
****************************************************************************/
diff --git a/cpp/QhullRidge.cpp b/src/libqhullcpp/QhullRidge.cpp
similarity index 95%
rename from cpp/QhullRidge.cpp
rename to src/libqhullcpp/QhullRidge.cpp
index 550e8d879041accb94b1d1cef1459b024d147e8e..a495003009e1893c09930c6b006223a4887c4173 100644
--- a/cpp/QhullRidge.cpp
+++ b/src/libqhullcpp/QhullRidge.cpp
@@ -1,8 +1,8 @@
/****************************************************************************
**
** Copyright (C) 2008-2010 C.B. Barber. All rights reserved.
-** $Id: //product/qhull/main/rel/cpp/QhullRidge.cpp#18 $$Change: 1180 $
-** $DateTime: 2010/01/12 21:45:49 $$Author: bbarber $
+** $Id: //main/2011/qhull/src/libqhullcpp/QhullRidge.cpp#1 $$Change: 1330 $
+** $DateTime: 2011/03/06 21:30:00 $$Author: bbarber $
**
****************************************************************************/
diff --git a/cpp/QhullRidge.h b/src/libqhullcpp/QhullRidge.h
similarity index 96%
rename from cpp/QhullRidge.h
rename to src/libqhullcpp/QhullRidge.h
index 68f7ddf93225b083c140616ec20651cf9913881d..877d7372fe310dffae1584f3d0617cc64dcf6f54 100644
--- a/cpp/QhullRidge.h
+++ b/src/libqhullcpp/QhullRidge.h
@@ -1,8 +1,8 @@
/****************************************************************************
**
** Copyright (C) 2008-2010 C.B. Barber. All rights reserved.
-** $Id: //product/qhull/main/rel/cpp/QhullRidge.h#25 $$Change: 1193 $
-** $DateTime: 2010/01/23 11:31:35 $$Author: bbarber $
+** $Id: //main/2011/qhull/src/libqhullcpp/QhullRidge.h#1 $$Change: 1330 $
+** $DateTime: 2011/03/06 21:30:00 $$Author: bbarber $
**
****************************************************************************/
diff --git a/cpp/QhullSet.cpp b/src/libqhullcpp/QhullSet.cpp
similarity index 89%
rename from cpp/QhullSet.cpp
rename to src/libqhullcpp/QhullSet.cpp
index ebe3f87e82a7693117bab74d45aba6d650632569..bccc2881cb15394b87cc50876916052307bffc7f 100644
--- a/cpp/QhullSet.cpp
+++ b/src/libqhullcpp/QhullSet.cpp
@@ -1,8 +1,8 @@
/****************************************************************************
**
** Copyright (C) 2008-2010 C.B. Barber. All rights reserved.
-** $Id: //product/qhull/main/rel/cpp/QhullSet.cpp#21 $$Change: 1193 $
-** $DateTime: 2010/01/23 11:31:35 $$Author: bbarber $
+** $Id: //main/2011/qhull/src/libqhullcpp/QhullSet.cpp#1 $$Change: 1330 $
+** $DateTime: 2011/03/06 21:30:00 $$Author: bbarber $
**
****************************************************************************/
diff --git a/cpp/QhullSet.h b/src/libqhullcpp/QhullSet.h
similarity index 98%
rename from cpp/QhullSet.h
rename to src/libqhullcpp/QhullSet.h
index 0a3ee5a5ca8f5f7d6fac67106233378666fa2b8c..3d3174acf4719899daaa1c10e51afbf3c6d10e48 100644
--- a/cpp/QhullSet.h
+++ b/src/libqhullcpp/QhullSet.h
@@ -1,8 +1,8 @@
/****************************************************************************
**
** Copyright (C) 2008-2010 C.B. Barber. All rights reserved.
-** $Id: //product/qhull/main/rel/cpp/QhullSet.h#39 $$Change: 1193 $
-** $DateTime: 2010/01/23 11:31:35 $$Author: bbarber $
+** $Id: //main/2011/qhull/src/libqhullcpp/QhullSet.h#1 $$Change: 1330 $
+** $DateTime: 2011/03/06 21:30:00 $$Author: bbarber $
**
****************************************************************************/
diff --git a/cpp/QhullSets.h b/src/libqhullcpp/QhullSets.h
similarity index 83%
rename from cpp/QhullSets.h
rename to src/libqhullcpp/QhullSets.h
index e1b4593b7d987b97da43bbc7052595dc0580a0ac..a4bcf5c7f6c204cafe9c434f7dd59105afc095d9 100644
--- a/cpp/QhullSets.h
+++ b/src/libqhullcpp/QhullSets.h
@@ -1,8 +1,8 @@
/****************************************************************************
**
** Copyright (C) 2008-2010 C.B. Barber. All rights reserved.
-** $Id: //product/qhull/main/rel/cpp/QhullSets.h#6 $$Change: 1139 $
-** $DateTime: 2010/01/03 11:20:29 $$Author: bbarber $
+** $Id: //main/2011/qhull/src/libqhullcpp/QhullSets.h#1 $$Change: 1330 $
+** $DateTime: 2011/03/06 21:30:00 $$Author: bbarber $
**
****************************************************************************/
diff --git a/cpp/QhullStat.cpp b/src/libqhullcpp/QhullStat.cpp
similarity index 85%
rename from cpp/QhullStat.cpp
rename to src/libqhullcpp/QhullStat.cpp
index 4ac347e2d1cb1bdef3124fc60212e76ec099360b..65603549733b1615d524b09863cd45dc7025c5e2 100644
--- a/cpp/QhullStat.cpp
+++ b/src/libqhullcpp/QhullStat.cpp
@@ -1,8 +1,8 @@
/****************************************************************************
**
** Copyright (C) 2008-2010 C.B. Barber. All rights reserved.
-** $Id: //product/qhull/main/rel/cpp/QhullStat.cpp#9 $$Change: 1164 $
-** $DateTime: 2010/01/07 21:52:00 $$Author: bbarber $
+** $Id: //main/2011/qhull/src/libqhullcpp/QhullStat.cpp#1 $$Change: 1330 $
+** $DateTime: 2011/03/06 21:30:00 $$Author: bbarber $
**
****************************************************************************/
diff --git a/cpp/QhullStat.h b/src/libqhullcpp/QhullStat.h
similarity index 90%
rename from cpp/QhullStat.h
rename to src/libqhullcpp/QhullStat.h
index 3c7f433ad6b5fea5b71879f2e37789e84fa267ad..c2d71a13bc8cfe103c433297f257ee05349ff714 100644
--- a/cpp/QhullStat.h
+++ b/src/libqhullcpp/QhullStat.h
@@ -1,8 +1,8 @@
/****************************************************************************
**
** Copyright (C) 2008-2010 C.B. Barber. All rights reserved.
-** $Id: //product/qhull/main/rel/cpp/QhullStat.h#11 $$Change: 1164 $
-** $DateTime: 2010/01/07 21:52:00 $$Author: bbarber $
+** $Id: //main/2011/qhull/src/libqhullcpp/QhullStat.h#1 $$Change: 1330 $
+** $DateTime: 2011/03/06 21:30:00 $$Author: bbarber $
**
****************************************************************************/
diff --git a/cpp/QhullVertex.cpp b/src/libqhullcpp/QhullVertex.cpp
similarity index 95%
rename from cpp/QhullVertex.cpp
rename to src/libqhullcpp/QhullVertex.cpp
index e4c978067275ef428620a3ed2774b68b6ea698c3..5431b7f5b0bb76fe3385d84af229c0d5d9273fc9 100644
--- a/cpp/QhullVertex.cpp
+++ b/src/libqhullcpp/QhullVertex.cpp
@@ -1,8 +1,8 @@
/****************************************************************************
**
** Copyright (C) 2008-2010 C.B. Barber. All rights reserved.
-** $Id: //product/qhull/main/rel/cpp/QhullVertex.cpp#27 $$Change: 1213 $
-** $DateTime: 2010/03/14 19:09:59 $$Author: bbarber $
+** $Id: //main/2011/qhull/src/libqhullcpp/QhullVertex.cpp#1 $$Change: 1330 $
+** $DateTime: 2011/03/06 21:30:00 $$Author: bbarber $
**
****************************************************************************/
diff --git a/cpp/QhullVertex.h b/src/libqhullcpp/QhullVertex.h
similarity index 96%
rename from cpp/QhullVertex.h
rename to src/libqhullcpp/QhullVertex.h
index 84510b0ec6c19dd635c4ec7438fd16528cfdc619..f08843b6340f45e4d3b2be416a5c5cd9832e0064 100644
--- a/cpp/QhullVertex.h
+++ b/src/libqhullcpp/QhullVertex.h
@@ -1,8 +1,8 @@
/****************************************************************************
**
** Copyright (C) 2008-2010 C.B. Barber. All rights reserved.
-** $Id: //product/qhull/main/rel/cpp/QhullVertex.h#28 $$Change: 1213 $
-** $DateTime: 2010/03/14 19:09:59 $$Author: bbarber $
+** $Id: //main/2011/qhull/src/libqhullcpp/QhullVertex.h#1 $$Change: 1330 $
+** $DateTime: 2011/03/06 21:30:00 $$Author: bbarber $
**
****************************************************************************/
diff --git a/cpp/QhullVertexSet.cpp b/src/libqhullcpp/QhullVertexSet.cpp
similarity index 95%
rename from cpp/QhullVertexSet.cpp
rename to src/libqhullcpp/QhullVertexSet.cpp
index c182026a076acb368a7e3439f85deee9c8d0e556..cb96f03eb70e4b5403999a267f6a867bddaaf202 100644
--- a/cpp/QhullVertexSet.cpp
+++ b/src/libqhullcpp/QhullVertexSet.cpp
@@ -1,8 +1,8 @@
/****************************************************************************
**
** Copyright (C) 2009-2010 C.B. Barber. All rights reserved.
-** $Id: //product/qhull/main/rel/cpp/QhullVertexSet.cpp#8 $$Change: 1139 $
-** $DateTime: 2010/01/03 11:20:29 $$Author: bbarber $
+** $Id: //main/2011/qhull/src/libqhullcpp/QhullVertexSet.cpp#1 $$Change: 1330 $
+** $DateTime: 2011/03/06 21:30:00 $$Author: bbarber $
**
****************************************************************************/
diff --git a/cpp/QhullVertexSet.h b/src/libqhullcpp/QhullVertexSet.h
similarity index 95%
rename from cpp/QhullVertexSet.h
rename to src/libqhullcpp/QhullVertexSet.h
index f609c93a38d6d70da7a4a6fe4138d4153b23ebd0..cda347ecb8c5a2749204da522ce29f14497c2628 100644
--- a/cpp/QhullVertexSet.h
+++ b/src/libqhullcpp/QhullVertexSet.h
@@ -1,8 +1,8 @@
/****************************************************************************
**
** Copyright (C) 2009-2010 C.B. Barber. All rights reserved.
-** $Id: //product/qhull/main/rel/cpp/QhullVertexSet.h#9 $$Change: 1164 $
-** $DateTime: 2010/01/07 21:52:00 $$Author: bbarber $
+** $Id: //main/2011/qhull/src/libqhullcpp/QhullVertexSet.h#1 $$Change: 1330 $
+** $DateTime: 2011/03/06 21:30:00 $$Author: bbarber $
**
****************************************************************************/
diff --git a/cpp/RboxPoints.cpp b/src/libqhullcpp/RboxPoints.cpp
similarity index 97%
rename from cpp/RboxPoints.cpp
rename to src/libqhullcpp/RboxPoints.cpp
index 04eb6fa3c0ae9f16a4ef32f9e1bc989394e8e87c..7f7ea7703f0c1059c92496ae7b39ff0ba0e7f008 100644
--- a/cpp/RboxPoints.cpp
+++ b/src/libqhullcpp/RboxPoints.cpp
@@ -1,8 +1,8 @@
/****************************************************************************
**
** Copyright (C) 2008-2010 C.B. Barber. All rights reserved.
-** $Id: //product/qhull/main/rel/cpp/RboxPoints.cpp#34 $$Change: 1167 $
-** $DateTime: 2010/01/08 19:03:17 $$Author: bbarber $
+** $Id: //main/2011/qhull/src/libqhullcpp/RboxPoints.cpp#1 $$Change: 1330 $
+** $DateTime: 2011/03/06 21:30:00 $$Author: bbarber $
**
****************************************************************************/
diff --git a/cpp/RboxPoints.h b/src/libqhullcpp/RboxPoints.h
similarity index 93%
rename from cpp/RboxPoints.h
rename to src/libqhullcpp/RboxPoints.h
index 72836f74b1905a5efebda5df17c1b9fd1bff489d..03c4fe80a3a9f04e295f446e6a35f1175de71989 100644
--- a/cpp/RboxPoints.h
+++ b/src/libqhullcpp/RboxPoints.h
@@ -1,8 +1,8 @@
/****************************************************************************
**
** Copyright (C) 2008-2010 C.B. Barber. All rights reserved.
-** $Id: //product/qhull/main/rel/cpp/RboxPoints.h#28 $$Change: 1164 $
-** $DateTime: 2010/01/07 21:52:00 $$Author: bbarber $
+** $Id: //main/2011/qhull/src/libqhullcpp/RboxPoints.h#1 $$Change: 1330 $
+** $DateTime: 2011/03/06 21:30:00 $$Author: bbarber $
**
****************************************************************************/
diff --git a/cpp/UsingLibQhull.cpp b/src/libqhullcpp/UsingLibQhull.cpp
similarity index 98%
rename from cpp/UsingLibQhull.cpp
rename to src/libqhullcpp/UsingLibQhull.cpp
index 5e4b15178c25a02481ae116880a4a6917270dfd2..d6c1d604ebe8c0d49765278a97663b2a9f7463c3 100644
--- a/cpp/UsingLibQhull.cpp
+++ b/src/libqhullcpp/UsingLibQhull.cpp
@@ -1,8 +1,8 @@
/****************************************************************************
**
** Copyright (C) 2008-2010 C.B. Barber. All rights reserved.
-** $Id: //product/qhull/main/rel/cpp/UsingLibQhull.cpp#9 $$Change: 1193 $
-** $DateTime: 2010/01/23 11:31:35 $$Author: bbarber $
+** $Id: //main/2011/qhull/src/libqhullcpp/UsingLibQhull.cpp#1 $$Change: 1330 $
+** $DateTime: 2011/03/06 21:30:00 $$Author: bbarber $
**
****************************************************************************/
diff --git a/cpp/UsingLibQhull.h b/src/libqhullcpp/UsingLibQhull.h
similarity index 97%
rename from cpp/UsingLibQhull.h
rename to src/libqhullcpp/UsingLibQhull.h
index f971b69ccdcf315e239ae1dbf66349a0402a943d..7b7e72437e171b6553ce25f6beca17b3b7799b7d 100644
--- a/cpp/UsingLibQhull.h
+++ b/src/libqhullcpp/UsingLibQhull.h
@@ -1,8 +1,8 @@
/****************************************************************************
**
** Copyright (C) 2008-2010 C.B. Barber. All rights reserved.
-** $Id: //product/qhull/main/rel/cpp/UsingLibQhull.h#7 $$Change: 1193 $
-** $DateTime: 2010/01/23 11:31:35 $$Author: bbarber $
+** $Id: //main/2011/qhull/src/libqhullcpp/UsingLibQhull.h#1 $$Change: 1330 $
+** $DateTime: 2011/03/06 21:30:00 $$Author: bbarber $
**
****************************************************************************/
diff --git a/cpp/functionObjects.h b/src/libqhullcpp/functionObjects.h
similarity index 91%
rename from cpp/functionObjects.h
rename to src/libqhullcpp/functionObjects.h
index dd91a10e46bc94159fbba02e3c168c81c99265ee..ccd1cda2b0e4bbe896de0556dcaa9a489eb6faca 100644
--- a/cpp/functionObjects.h
+++ b/src/libqhullcpp/functionObjects.h
@@ -1,8 +1,8 @@
/****************************************************************************
**
** Copyright (C) 2008-2010 C.B. Barber. All rights reserved.
-** $Id: //product/qhull/main/rel/cpp/functionObjects.h#8 $$Change: 1164 $
-** $DateTime: 2010/01/07 21:52:00 $$Author: bbarber $
+** $Id: //main/2011/qhull/src/libqhullcpp/functionObjects.h#1 $$Change: 1330 $
+** $DateTime: 2011/03/06 21:30:00 $$Author: bbarber $
**
****************************************************************************/
diff --git a/project/libqhullcpp/libqhullcpp.pro b/src/libqhullcpp/libqhullcpp.pro
similarity index 100%
rename from project/libqhullcpp/libqhullcpp.pro
rename to src/libqhullcpp/libqhullcpp.pro
diff --git a/cpp/qhull_interface.cpp b/src/libqhullcpp/qhull_interface.cpp
similarity index 100%
rename from cpp/qhull_interface.cpp
rename to src/libqhullcpp/qhull_interface.cpp
diff --git a/cpp/qt-qhull.cpp b/src/libqhullcpp/qt-qhull.cpp
similarity index 95%
rename from cpp/qt-qhull.cpp
rename to src/libqhullcpp/qt-qhull.cpp
index 07887cd5f35161bb281eb77ff3464b0308a21720..7b71a83d0fb77d8ccc0050bf7964668e843fa309 100644
--- a/cpp/qt-qhull.cpp
+++ b/src/libqhullcpp/qt-qhull.cpp
@@ -1,8 +1,8 @@
/****************************************************************************
**
** Copyright (C) 2009-2010 C.B. Barber. All rights reserved.
-** $Id: //product/qhull/main/rel/cpp/qt-qhull.cpp#2 $$Change: 1327 $
-** $DateTime: 2011/03/06 18:21:13 $$Author: bbarber $
+** $Id: //main/2011/qhull/src/libqhullcpp/qt-qhull.cpp#1 $$Change: 1330 $
+** $DateTime: 2011/03/06 21:30:00 $$Author: bbarber $
**
****************************************************************************/
diff --git a/project/libqhullp/libqhullp.pro b/src/libqhullp/libqhullp.pro
similarity index 100%
rename from project/libqhullp/libqhullp.pro
rename to src/libqhullp/libqhullp.pro
diff --git a/src/qconvex.c b/src/qconvex/qconvex.c
similarity index 100%
rename from src/qconvex.c
rename to src/qconvex/qconvex.c
diff --git a/project/qconvex/qconvex.pro b/src/qconvex/qconvex.pro
similarity index 100%
rename from project/qconvex/qconvex.pro
rename to src/qconvex/qconvex.pro
diff --git a/src/qdelaun.c b/src/qdelaunay/qdelaun.c
similarity index 100%
rename from src/qdelaun.c
rename to src/qdelaunay/qdelaun.c
diff --git a/project/qdelaunay/qdelaunay.pro b/src/qdelaunay/qdelaunay.pro
similarity index 100%
rename from project/qdelaunay/qdelaunay.pro
rename to src/qdelaunay/qdelaunay.pro
diff --git a/src/qhalf.c b/src/qhalf/qhalf.c
similarity index 100%
rename from src/qhalf.c
rename to src/qhalf/qhalf.c
diff --git a/project/qhalf/qhalf.pro b/src/qhalf/qhalf.pro
similarity index 100%
rename from project/qhalf/qhalf.pro
rename to src/qhalf/qhalf.pro
diff --git a/project/qhull-all.pro b/src/qhull-all.pro
similarity index 100%
rename from project/qhull-all.pro
rename to src/qhull-all.pro
diff --git a/project/qhull/qhull.pro b/src/qhull/qhull.pro
similarity index 100%
rename from project/qhull/qhull.pro
rename to src/qhull/qhull.pro
diff --git a/src/unix.c b/src/qhull/unix.c
similarity index 99%
rename from src/unix.c
rename to src/qhull/unix.c
index d0643ad1e6c4575ba3a4e5046b67e0a315e46013..61822faeedb613aff905fb1cd07fb20dea810cbf 100644
--- a/src/unix.c
+++ b/src/qhull/unix.c
@@ -8,8 +8,8 @@
see qh-qhull.htm
copyright (c) 1993-2010 The Geometry Center.
- $Id: //product/qhull/main/rel/src/unix.c#26 $$Change: 1164 $
- $DateTime: 2010/01/07 21:52:00 $$Author: bbarber $
+ $Id: //main/2011/qhull/src/qhull/unix.c#1 $$Change: 1330 $
+ $DateTime: 2011/03/06 21:30:00 $$Author: bbarber $
*/
#include "mem.h"
diff --git a/cpp/qhulltest/Coordinates_test.cpp b/src/qhulltest/Coordinates_test.cpp
similarity index 98%
rename from cpp/qhulltest/Coordinates_test.cpp
rename to src/qhulltest/Coordinates_test.cpp
index 54b58c692b5a54e551ff5dfc3689107533c3d107..918fcf98c75ca3a3cefa758185c7d131411f26b3 100644
--- a/cpp/qhulltest/Coordinates_test.cpp
+++ b/src/qhulltest/Coordinates_test.cpp
@@ -1,8 +1,8 @@
/****************************************************************************
**
** Copyright (C) 2009-2010 C.B. Barber. All rights reserved.
-** $Id: //product/qhull/main/rel/cpp/qhulltest/Coordinates_test.cpp#18 $$Change: 1176 $
-** $DateTime: 2010/01/11 19:40:05 $$Author: bbarber $
+** $Id: //main/2011/qhull/src/qhulltest/Coordinates_test.cpp#1 $$Change: 1330 $
+** $DateTime: 2011/03/06 21:30:00 $$Author: bbarber $
**
****************************************************************************/
diff --git a/cpp/qhulltest/PointCoordinates_test.cpp b/src/qhulltest/PointCoordinates_test.cpp
similarity index 98%
rename from cpp/qhulltest/PointCoordinates_test.cpp
rename to src/qhulltest/PointCoordinates_test.cpp
index c93676427c6758b7028d02b7a8b5c5bb11e714b9..8227a770d8b44241199376c17fc38f9406f381c7 100644
--- a/cpp/qhulltest/PointCoordinates_test.cpp
+++ b/src/qhulltest/PointCoordinates_test.cpp
@@ -1,8 +1,8 @@
/****************************************************************************
**
** Copyright (C) 2009-2010 C.B. Barber. All rights reserved.
-** $Id: //product/qhull/main/rel/cpp/qhulltest/PointCoordinates_test.cpp#16 $$Change: 1176 $
-** $DateTime: 2010/01/11 19:40:05 $$Author: bbarber $
+** $Id: //main/2011/qhull/src/qhulltest/PointCoordinates_test.cpp#1 $$Change: 1330 $
+** $DateTime: 2011/03/06 21:30:00 $$Author: bbarber $
**
****************************************************************************/
diff --git a/cpp/qhulltest/Point_test.cpp b/src/qhulltest/Point_test.cpp
similarity index 97%
rename from cpp/qhulltest/Point_test.cpp
rename to src/qhulltest/Point_test.cpp
index e4f697901ddd43ac3b5e9b3e1a21e5232c6beff5..259c00c746b1a0233669c6dfbf23507cee75f115 100644
--- a/cpp/qhulltest/Point_test.cpp
+++ b/src/qhulltest/Point_test.cpp
@@ -1,8 +1,8 @@
/****************************************************************************
**
** Copyright (p) 2009-2010 p. Bradford Barber. All rights reserved.
-** $Id: //product/qhull/main/rel/cpp/qhulltest/Point_test.cpp#12 $$Change: 1164 $
-** $DateTime: 2010/01/07 21:52:00 $$Author: bbarber $
+** $Id: //main/2011/qhull/src/qhulltest/Point_test.cpp#1 $$Change: 1330 $
+** $DateTime: 2011/03/06 21:30:00 $$Author: bbarber $
**
****************************************************************************/
diff --git a/cpp/qhulltest/QhullFacetList_test.cpp b/src/qhulltest/QhullFacetList_test.cpp
similarity index 97%
rename from cpp/qhulltest/QhullFacetList_test.cpp
rename to src/qhulltest/QhullFacetList_test.cpp
index 1994c9059e084fb8ab93d8e37f7c3d602b6b7881..7dc1efe42cbfb84d76dc644a6ea432fc06a5d223 100644
--- a/cpp/qhulltest/QhullFacetList_test.cpp
+++ b/src/qhulltest/QhullFacetList_test.cpp
@@ -1,8 +1,8 @@
/****************************************************************************
**
** Copyright (C) 2008-2010 C.B. Barber. All rights reserved.
-** $Id: //product/qhull/main/rel/cpp/qhulltest/QhullFacetList_test.cpp#17 $$Change: 1176 $
-** $DateTime: 2010/01/11 19:40:05 $$Author: bbarber $
+** $Id: //main/2011/qhull/src/qhulltest/QhullFacetList_test.cpp#1 $$Change: 1330 $
+** $DateTime: 2011/03/06 21:30:00 $$Author: bbarber $
**
****************************************************************************/
diff --git a/cpp/qhulltest/QhullFacetSet_test.cpp b/src/qhulltest/QhullFacetSet_test.cpp
similarity index 96%
rename from cpp/qhulltest/QhullFacetSet_test.cpp
rename to src/qhulltest/QhullFacetSet_test.cpp
index 642a1d1ca2e82675a8c25baf7bb16f56ab526635..ca0c1605a4a57533e6be357a876b801275ccebd3 100644
--- a/cpp/qhulltest/QhullFacetSet_test.cpp
+++ b/src/qhulltest/QhullFacetSet_test.cpp
@@ -1,8 +1,8 @@
/****************************************************************************
**
** Copyright (C) 2008-2010 C.B. Barber. All rights reserved.
-** $Id: //product/qhull/main/rel/cpp/qhulltest/QhullFacetSet_test.cpp#15 $$Change: 1179 $
-** $DateTime: 2010/01/12 19:53:15 $$Author: bbarber $
+** $Id: //main/2011/qhull/src/qhulltest/QhullFacetSet_test.cpp#1 $$Change: 1330 $
+** $DateTime: 2011/03/06 21:30:00 $$Author: bbarber $
**
****************************************************************************/
diff --git a/cpp/qhulltest/QhullFacet_test.cpp b/src/qhulltest/QhullFacet_test.cpp
similarity index 98%
rename from cpp/qhulltest/QhullFacet_test.cpp
rename to src/qhulltest/QhullFacet_test.cpp
index e661620e67ffb03d16c4f2777882ab492a6dcca4..fb612136f4a0bb988f811582161f4729bce7b4ac 100644
--- a/cpp/qhulltest/QhullFacet_test.cpp
+++ b/src/qhulltest/QhullFacet_test.cpp
@@ -1,8 +1,8 @@
/****************************************************************************
**
** Copyright (C) 2008-2010 C.B. Barber. All rights reserved.
-** $Id: //product/qhull/main/rel/cpp/qhulltest/QhullFacet_test.cpp#32 $$Change: 1164 $
-** $DateTime: 2010/01/07 21:52:00 $$Author: bbarber $
+** $Id: //main/2011/qhull/src/qhulltest/QhullFacet_test.cpp#1 $$Change: 1330 $
+** $DateTime: 2011/03/06 21:30:00 $$Author: bbarber $
**
****************************************************************************/
diff --git a/cpp/qhulltest/QhullHyperplane_test.cpp b/src/qhulltest/QhullHyperplane_test.cpp
similarity index 98%
rename from cpp/qhulltest/QhullHyperplane_test.cpp
rename to src/qhulltest/QhullHyperplane_test.cpp
index ac59a864dfb7e1a7da45ba63857ead3669b49845..eef916d0ea82237eed77e7e7b410c7e5c53a737f 100644
--- a/cpp/qhulltest/QhullHyperplane_test.cpp
+++ b/src/qhulltest/QhullHyperplane_test.cpp
@@ -1,8 +1,8 @@
/****************************************************************************
**
** Copyright (C) 2009-2010 C.B. Barber. All rights reserved.
-** $Id: //product/qhull/main/rel/cpp/qhulltest/QhullHyperplane_test.cpp#12 $$Change: 1176 $
-** $DateTime: 2010/01/11 19:40:05 $$Author: bbarber $
+** $Id: //main/2011/qhull/src/qhulltest/QhullHyperplane_test.cpp#1 $$Change: 1330 $
+** $DateTime: 2011/03/06 21:30:00 $$Author: bbarber $
**
****************************************************************************/
diff --git a/cpp/qhulltest/QhullLinkedList_test.cpp b/src/qhulltest/QhullLinkedList_test.cpp
similarity index 98%
rename from cpp/qhulltest/QhullLinkedList_test.cpp
rename to src/qhulltest/QhullLinkedList_test.cpp
index 2e8c7fc878ccf524655c9ec561b8365e1d4c1636..1beda7c44548f8acb7e732d9f929d37e647f2922 100644
--- a/cpp/qhulltest/QhullLinkedList_test.cpp
+++ b/src/qhulltest/QhullLinkedList_test.cpp
@@ -1,8 +1,8 @@
/****************************************************************************
**
** Copyright (f) 2009-2010 C.B. Barber. All rights reserved.
-** $Id: //product/qhull/main/rel/cpp/qhulltest/QhullLinkedList_test.cpp#16 $$Change: 1179 $
-** $DateTime: 2010/01/12 19:53:15 $$Author: bbarber $
+** $Id: //main/2011/qhull/src/qhulltest/QhullLinkedList_test.cpp#1 $$Change: 1330 $
+** $DateTime: 2011/03/06 21:30:00 $$Author: bbarber $
**
****************************************************************************/
diff --git a/cpp/qhulltest/QhullPointSet_test.cpp b/src/qhulltest/QhullPointSet_test.cpp
similarity index 98%
rename from cpp/qhulltest/QhullPointSet_test.cpp
rename to src/qhulltest/QhullPointSet_test.cpp
index 7f5c791b65bc01740aafbd31a0ea388634f0b769..409733dfa16be2d4880741401a1b5a7e408955ba 100644
--- a/cpp/qhulltest/QhullPointSet_test.cpp
+++ b/src/qhulltest/QhullPointSet_test.cpp
@@ -1,8 +1,8 @@
/****************************************************************************
**
** Copyright (p) 2009-2010 C.B. Barber. All rights reserved.
-** $Id: //product/qhull/main/rel/cpp/qhulltest/QhullPointSet_test.cpp#10 $$Change: 1176 $
-** $DateTime: 2010/01/11 19:40:05 $$Author: bbarber $
+** $Id: //main/2011/qhull/src/qhulltest/QhullPointSet_test.cpp#1 $$Change: 1330 $
+** $DateTime: 2011/03/06 21:30:00 $$Author: bbarber $
**
****************************************************************************/
diff --git a/cpp/qhulltest/QhullPoint_test.cpp b/src/qhulltest/QhullPoint_test.cpp
similarity index 98%
rename from cpp/qhulltest/QhullPoint_test.cpp
rename to src/qhulltest/QhullPoint_test.cpp
index 03f5d4b45c653e0bf99bee4014ba7dc7319b79b3..97515e9aaf7d30401e9bcfb601d452b5c2ccdd4c 100644
--- a/cpp/qhulltest/QhullPoint_test.cpp
+++ b/src/qhulltest/QhullPoint_test.cpp
@@ -1,8 +1,8 @@
/****************************************************************************
**
** Copyright (C) 2008-2010 C.B. Barber. All rights reserved.
-** $Id: //product/qhull/main/rel/cpp/qhulltest/QhullPoint_test.cpp#17 $$Change: 1176 $
-** $DateTime: 2010/01/11 19:40:05 $$Author: bbarber $
+** $Id: //main/2011/qhull/src/qhulltest/QhullPoint_test.cpp#1 $$Change: 1330 $
+** $DateTime: 2011/03/06 21:30:00 $$Author: bbarber $
**
****************************************************************************/
diff --git a/cpp/qhulltest/QhullPoints_test.cpp b/src/qhulltest/QhullPoints_test.cpp
similarity index 98%
rename from cpp/qhulltest/QhullPoints_test.cpp
rename to src/qhulltest/QhullPoints_test.cpp
index 1def8accd9e49ef7ba5b4e28eb8b63f1bcedbb5e..39bba8076da4c2abdd58b13bd3c5a0de9935c0c6 100644
--- a/cpp/qhulltest/QhullPoints_test.cpp
+++ b/src/qhulltest/QhullPoints_test.cpp
@@ -1,8 +1,8 @@
/****************************************************************************
**
** Copyright (p) 2009-2010 C.B. Barber. All rights reserved.
-** $Id: //product/qhull/main/rel/cpp/qhulltest/QhullPoints_test.cpp#19 $$Change: 1176 $
-** $DateTime: 2010/01/11 19:40:05 $$Author: bbarber $
+** $Id: //main/2011/qhull/src/qhulltest/QhullPoints_test.cpp#1 $$Change: 1330 $
+** $DateTime: 2011/03/06 21:30:00 $$Author: bbarber $
**
****************************************************************************/
diff --git a/cpp/qhulltest/QhullRidge_test.cpp b/src/qhulltest/QhullRidge_test.cpp
similarity index 96%
rename from cpp/qhulltest/QhullRidge_test.cpp
rename to src/qhulltest/QhullRidge_test.cpp
index 68ee13869ae3fd49e33e9a9fb2634d9bb1aead99..f969ad4169bc78edb40dae0363c3c32012c3b18b 100644
--- a/cpp/qhulltest/QhullRidge_test.cpp
+++ b/src/qhulltest/QhullRidge_test.cpp
@@ -1,8 +1,8 @@
/****************************************************************************
**
** Copyright (C) 2008-2010 C.B. Barber. All rights reserved.
-** $Id: //product/qhull/main/rel/cpp/qhulltest/QhullRidge_test.cpp#12 $$Change: 1164 $
-** $DateTime: 2010/01/07 21:52:00 $$Author: bbarber $
+** $Id: //main/2011/qhull/src/qhulltest/QhullRidge_test.cpp#1 $$Change: 1330 $
+** $DateTime: 2011/03/06 21:30:00 $$Author: bbarber $
**
****************************************************************************/
diff --git a/cpp/qhulltest/QhullSet_test.cpp b/src/qhulltest/QhullSet_test.cpp
similarity index 98%
rename from cpp/qhulltest/QhullSet_test.cpp
rename to src/qhulltest/QhullSet_test.cpp
index b309c5086dc764863e48572979da78a486bba734..2146aeebccd7142aa07590329748b46025517597 100644
--- a/cpp/qhulltest/QhullSet_test.cpp
+++ b/src/qhulltest/QhullSet_test.cpp
@@ -1,8 +1,8 @@
/****************************************************************************
**
** Copyright (f) 2009-2010 C.B. Barber. All rights reserved.
-** $Id: //product/qhull/main/rel/cpp/qhulltest/QhullSet_test.cpp#21 $$Change: 1179 $
-** $DateTime: 2010/01/12 19:53:15 $$Author: bbarber $
+** $Id: //main/2011/qhull/src/qhulltest/QhullSet_test.cpp#1 $$Change: 1330 $
+** $DateTime: 2011/03/06 21:30:00 $$Author: bbarber $
**
****************************************************************************/
diff --git a/cpp/qhulltest/QhullVertexSet_test.cpp b/src/qhulltest/QhullVertexSet_test.cpp
similarity index 96%
rename from cpp/qhulltest/QhullVertexSet_test.cpp
rename to src/qhulltest/QhullVertexSet_test.cpp
index 5d65091fba2261ed5f99f9b0359346d854ba540c..464d2eb502a00a3f7e47ff6e8f6439a9718d5503 100644
--- a/cpp/qhulltest/QhullVertexSet_test.cpp
+++ b/src/qhulltest/QhullVertexSet_test.cpp
@@ -1,8 +1,8 @@
/****************************************************************************
**
** Copyright (C) 2008-2010 C.B. Barber. All rights reserved.
-** $Id: //product/qhull/main/rel/cpp/qhulltest/QhullVertexSet_test.cpp#4 $$Change: 1164 $
-** $DateTime: 2010/01/07 21:52:00 $$Author: bbarber $
+** $Id: //main/2011/qhull/src/qhulltest/QhullVertexSet_test.cpp#1 $$Change: 1330 $
+** $DateTime: 2011/03/06 21:30:00 $$Author: bbarber $
**
****************************************************************************/
diff --git a/cpp/qhulltest/QhullVertex_test.cpp b/src/qhulltest/QhullVertex_test.cpp
similarity index 97%
rename from cpp/qhulltest/QhullVertex_test.cpp
rename to src/qhulltest/QhullVertex_test.cpp
index c0cc46892e0cf2534105fe834721baf5c276f3e9..9b6a55bc4d9feb19c199e3f24a848ca718b9e44b 100644
--- a/cpp/qhulltest/QhullVertex_test.cpp
+++ b/src/qhulltest/QhullVertex_test.cpp
@@ -1,8 +1,8 @@
/****************************************************************************
**
** Copyright (C) 2008-2010 C.B. Barber. All rights reserved.
-** $Id: //product/qhull/main/rel/cpp/qhulltest/QhullVertex_test.cpp#13 $$Change: 1213 $
-** $DateTime: 2010/03/14 19:09:59 $$Author: bbarber $
+** $Id: //main/2011/qhull/src/qhulltest/QhullVertex_test.cpp#1 $$Change: 1330 $
+** $DateTime: 2011/03/06 21:30:00 $$Author: bbarber $
**
****************************************************************************/
//pre-compiled headers
diff --git a/cpp/qhulltest/Qhull_test.cpp b/src/qhulltest/Qhull_test.cpp
similarity index 98%
rename from cpp/qhulltest/Qhull_test.cpp
rename to src/qhulltest/Qhull_test.cpp
index bac814d0b6d1fa6133d542fb6cfc3c25a8b0b7c1..b07294692004131f8656f25282ea62ef7a981b38 100644
--- a/cpp/qhulltest/Qhull_test.cpp
+++ b/src/qhulltest/Qhull_test.cpp
@@ -1,8 +1,8 @@
/****************************************************************************
**
** Copyright (C) 2008-2010 C.B. Barber. All rights reserved.
-** $Id: //product/qhull/main/rel/cpp/qhulltest/Qhull_test.cpp#41 $$Change: 1213 $
-** $DateTime: 2010/03/14 19:09:59 $$Author: bbarber $
+** $Id: //main/2011/qhull/src/qhulltest/Qhull_test.cpp#1 $$Change: 1330 $
+** $DateTime: 2011/03/06 21:30:00 $$Author: bbarber $
**
****************************************************************************/
diff --git a/cpp/qhulltest/RboxPoints_test.cpp b/src/qhulltest/RboxPoints_test.cpp
similarity index 97%
rename from cpp/qhulltest/RboxPoints_test.cpp
rename to src/qhulltest/RboxPoints_test.cpp
index dd78394370d8537eb0f101df4fd1b93db9174574..20b89de3892e2272a41ac0c358d851e4a70d04e0 100644
--- a/cpp/qhulltest/RboxPoints_test.cpp
+++ b/src/qhulltest/RboxPoints_test.cpp
@@ -1,8 +1,8 @@
/****************************************************************************
**
** Copyright (C) 2006-2010 C.B. Barber. All rights reserved.
-** $Id: //product/qhull/main/rel/cpp/qhulltest/RboxPoints_test.cpp#20 $$Change: 1164 $
-** $DateTime: 2010/01/07 21:52:00 $$Author: bbarber $
+** $Id: //main/2011/qhull/src/qhulltest/RboxPoints_test.cpp#1 $$Change: 1330 $
+** $DateTime: 2011/03/06 21:30:00 $$Author: bbarber $
**
****************************************************************************/
//pre-compiled headers
diff --git a/cpp/qhulltest/UsingLibQhull_test.cpp b/src/qhulltest/UsingLibQhull_test.cpp
similarity index 98%
rename from cpp/qhulltest/UsingLibQhull_test.cpp
rename to src/qhulltest/UsingLibQhull_test.cpp
index f5f8dda5d4ad02c967e4a4b95ef72d17bf7c2d1c..fe3ea819e16531ed00608b5468ad2b169eec3b91 100644
--- a/cpp/qhulltest/UsingLibQhull_test.cpp
+++ b/src/qhulltest/UsingLibQhull_test.cpp
@@ -1,8 +1,8 @@
/****************************************************************************
**
** Copyright (C) 2008-2010 C.B. Barber. All rights reserved.
-** $Id: //product/qhull/main/rel/cpp/qhulltest/UsingLibQhull_test.cpp#7 $$Change: 1194 $
-** $DateTime: 2010/01/23 12:14:35 $$Author: bbarber $
+** $Id: //main/2011/qhull/src/qhulltest/UsingLibQhull_test.cpp#1 $$Change: 1330 $
+** $DateTime: 2011/03/06 21:30:00 $$Author: bbarber $
**
****************************************************************************/
diff --git a/cpp/qhulltest/qhulltest.cpp b/src/qhulltest/qhulltest.cpp
similarity index 94%
rename from cpp/qhulltest/qhulltest.cpp
rename to src/qhulltest/qhulltest.cpp
index dd201610f56a8444e8d123b70447ea7d98b7bcd7..487e04ab680a86eaae29446731f4291246ba601e 100644
--- a/cpp/qhulltest/qhulltest.cpp
+++ b/src/qhulltest/qhulltest.cpp
@@ -1,8 +1,8 @@
/****************************************************************************
**
** Copyright (C) 2008-2010 C.B. Barber. All rights reserved.
-** $Id: //product/qhull/main/rel/cpp/qhulltest/qhulltest.cpp#56 $$Change: 1213 $
-** $DateTime: 2010/03/14 19:09:59 $$Author: bbarber $
+** $Id: //main/2011/qhull/src/qhulltest/qhulltest.cpp#1 $$Change: 1330 $
+** $DateTime: 2011/03/06 21:30:00 $$Author: bbarber $
**
****************************************************************************/
diff --git a/project/qhulltest/qhulltest.pro b/src/qhulltest/qhulltest.pro
similarity index 100%
rename from project/qhulltest/qhulltest.pro
rename to src/qhulltest/qhulltest.pro
diff --git a/src/qvoronoi.c b/src/qvoronoi/qvoronoi.c
similarity index 100%
rename from src/qvoronoi.c
rename to src/qvoronoi/qvoronoi.c
diff --git a/project/qvoronoi/qvoronoi.pro b/src/qvoronoi/qvoronoi.pro
similarity index 100%
rename from project/qvoronoi/qvoronoi.pro
rename to src/qvoronoi/qvoronoi.pro
diff --git a/src/rbox.c b/src/rbox/rbox.c
similarity index 100%
rename from src/rbox.c
rename to src/rbox/rbox.c
diff --git a/project/rbox/rbox.pro b/src/rbox/rbox.pro
similarity index 100%
rename from project/rbox/rbox.pro
rename to src/rbox/rbox.pro
diff --git a/cpp/road/RoadError.cpp b/src/road/RoadError.cpp
similarity index 88%
rename from cpp/road/RoadError.cpp
rename to src/road/RoadError.cpp
index e9446471012830a956605c88960b28a04d14ce38..04fae1a806500e4e272a1f005a95b098047d56e9 100644
--- a/cpp/road/RoadError.cpp
+++ b/src/road/RoadError.cpp
@@ -1,8 +1,8 @@
/****************************************************************************
**
** Copyright (C) 2008-2010 C.B. Barber. All rights reserved.
-** $Id: //product/qhull/main/rel/cpp/road/RoadError.cpp#17 $$Change: 1167 $
-** $DateTime: 2010/01/08 19:03:17 $$Author: bbarber $
+** $Id: //main/2011/qhull/src/road/RoadError.cpp#2 $$Change: 1334 $
+** $DateTime: 2011/03/06 22:46:44 $$Author: bbarber $
**
****************************************************************************/
@@ -44,10 +44,10 @@ RoadError()
{ }
RoadError::
-RoadError(const RoadError &e)
-: error_code(e.error_code)
-, log_event(e.log_event)
-, error_message(e.error_message)
+RoadError(const RoadError &other)
+: error_code(other.error_code)
+, log_event(other.log_event)
+, error_message(other.error_message)
{
}//copy construct
@@ -124,11 +124,11 @@ RoadError(int code, const char *fmt, int d, int d2, float f, double e)
{ }
RoadError & RoadError::
-operator=(const RoadError &e)
+operator=(const RoadError &other)
{
- error_code= e.error_code;
- error_message= e.error_message;
- log_event= e.log_event;
+ error_code= other.error_code;
+ error_message= other.error_message;
+ log_event= other.log_event;
return *this;
}//operator=
diff --git a/cpp/road/RoadError.h b/src/road/RoadError.h
similarity index 91%
rename from cpp/road/RoadError.h
rename to src/road/RoadError.h
index c1b5cc3e4c78358201d7e979f2a3820e77e971bd..f98af9f9d03c4b0622d34a8c69f38411f88f1679 100644
--- a/cpp/road/RoadError.h
+++ b/src/road/RoadError.h
@@ -1,8 +1,8 @@
/****************************************************************************
**
** Copyright (C) 2008-2010 C.B. Barber. All rights reserved.
-** $Id: //product/qhull/main/rel/cpp/road/RoadError.h#23 $$Change: 1193 $
-** $DateTime: 2010/01/23 11:31:35 $$Author: bbarber $
+** $Id: //main/2011/qhull/src/road/RoadError.h#2 $$Change: 1334 $
+** $DateTime: 2011/03/06 22:46:44 $$Author: bbarber $
**
****************************************************************************/
@@ -43,7 +43,7 @@ public:
#//Constructors
RoadError();
- RoadError(const RoadError &e); //! Called on throw, generates error_message
+ RoadError(const RoadError &other); //! Called on throw, generates error_message
RoadError(int code, const std::string &message);
RoadError(int code, const char *fmt);
RoadError(int code, const char *fmt, int d);
@@ -55,7 +55,7 @@ public:
RoadError(int code, const char *fmt, int d, int d2, float f, long long i);
RoadError(int code, const char *fmt, int d, int d2, float f, double e);
- RoadError &operator=(const RoadError&);
+ RoadError &operator=(const RoadError &other);
~RoadError() throw() {};
#//Class methods
diff --git a/cpp/road/RoadLogEvent.cpp b/src/road/RoadLogEvent.cpp
similarity index 87%
rename from cpp/road/RoadLogEvent.cpp
rename to src/road/RoadLogEvent.cpp
index a81201b0891dc67bea784ae693d1c53e0e11de5c..071c3c760e74b79bc3942969f5a0cf7b146f512b 100644
--- a/cpp/road/RoadLogEvent.cpp
+++ b/src/road/RoadLogEvent.cpp
@@ -1,8 +1,8 @@
/****************************************************************************
**
-** Copyright (C) 2008-2010 C.B. Barber. All rights reserved.
-** $Id: //product/qhull/main/rel/cpp/road/RoadLogEvent.cpp#13 $$Change: 1164 $
-** $DateTime: 2010/01/07 21:52:00 $$Author: bbarber $
+** Copyright (C) 2008-2011 C.B. Barber. All rights reserved.
+** $Id: //main/2011/qhull/src/road/RoadLogEvent.cpp#1 $$Change: 1330 $
+** $Date: 2011/03/06 $$Author: bbarber $
**
****************************************************************************/
@@ -24,7 +24,7 @@ using std::string;
namespace orgQhull {
-#//Conversion
+#//!\name Conversion
string RoadLogEvent::
toString(const char *tag, int code) const
{
@@ -80,6 +80,11 @@ toString(const char *tag, int code) const
os << cstr_1;
}
break;
+ case 'u':
+ if(firstExtraCode(os, c, &extraCode)){
+ os << "0x" << std::hex << int64_1 << std::dec;
+ }
+ break;
case 'x':
if(firstExtraCode(os, c, &extraCode)){
os << void_1;
diff --git a/cpp/road/RoadLogEvent.h b/src/road/RoadLogEvent.h
similarity index 94%
rename from cpp/road/RoadLogEvent.h
rename to src/road/RoadLogEvent.h
index bfe2cf63617f4814f2c5a28ed66cabcde81e2207..9939c58c7088e10f0deada60a5aa7060473bf4a0 100644
--- a/cpp/road/RoadLogEvent.h
+++ b/src/road/RoadLogEvent.h
@@ -1,8 +1,8 @@
/****************************************************************************
**
** Copyright (C) 2008-2010 C.B. Barber. All rights reserved.
-** $Id: //product/qhull/main/rel/cpp/road/RoadLogEvent.h#12 $$Change: 1164 $
-** $DateTime: 2010/01/07 21:52:00 $$Author: bbarber $
+** $Id: //main/2011/qhull/src/road/RoadLogEvent.h#2 $$Change: 1334 $
+** $DateTime: 2011/03/06 22:46:44 $$Author: bbarber $
**
****************************************************************************/
@@ -51,7 +51,7 @@ public:
//! Default copy constructor and assignment
#//GetSet
- bool defined() const { return format_string!=0; }
+ bool isDefined() const { return format_string!=0; }
int int1() const { return int_1; };
int int2() const { return int_2; };
float float1() const { return float_1; };
diff --git a/cpp/road/RoadTest.cpp b/src/road/RoadTest.cpp
similarity index 87%
rename from cpp/road/RoadTest.cpp
rename to src/road/RoadTest.cpp
index d363c7fbf48098fe994e726be8aad556af2cea15..ce3dce41e9da6a4e22970e02680c62495493fe6f 100644
--- a/cpp/road/RoadTest.cpp
+++ b/src/road/RoadTest.cpp
@@ -1,8 +1,8 @@
/****************************************************************************
**
-** Copyright (C) 2008-2010 C.B. Barber. All rights reserved.
-** $Id: //product/qhull/main/rel/cpp/road/RoadTest.cpp#13 $$Change: 1164 $
-** $DateTime: 2010/01/07 21:52:00 $$Author: bbarber $
+** Copyright (C) 2008-2011 C.B. Barber. All rights reserved.
+** $Id: //main/2011/qhull/src/road/RoadTest.cpp#1 $$Change: 1330 $
+** $Date: 2011/03/06 $$Author: bbarber $
**
****************************************************************************/
@@ -81,4 +81,4 @@ runTests(QStringList arguments)
}//orgQhull
-#include "moc/moc_RoadTest.cpp"
+//! \todo -- got duplicate definitions #include "moc/moc_RoadTest.cpp"
diff --git a/cpp/road/RoadTest.h b/src/road/RoadTest.h
similarity index 78%
rename from cpp/road/RoadTest.h
rename to src/road/RoadTest.h
index dec711a859472f9d2b4f1a89104dea90078288ff..7b052eb37b39a42a2bad6592fcd68835a86f3b4f 100644
--- a/cpp/road/RoadTest.h
+++ b/src/road/RoadTest.h
@@ -1,8 +1,8 @@
/****************************************************************************
**
-** Copyright (C) 2008-2010 C.B. Barber. All rights reserved.
-** $Id: //product/qhull/main/rel/cpp/road/RoadTest.h#16 $$Change: 1176 $
-** $DateTime: 2010/01/11 19:40:05 $$Author: bbarber $
+** Copyright (C) 2008-2011 C.B. Barber. All rights reserved.
+** $Id: //main/2011/qhull/src/road/RoadTest.h#1 $$Change: 1330 $
+** $Date: 2011/03/06 $$Author: bbarber $
**
****************************************************************************/
@@ -13,13 +13,12 @@
#include <QObject> // Qt C++ Framework
#include <QtTest/QtTest>
-#ifndef QHULL_USES_QT
#define QHULL_USES_QT 1
-#endif
namespace orgQhull {
-#//Types
+#//!\name Defined here
+
//! RoadTest -- Generic test for Qt's QTest
class RoadTest;
//! TESTadd_(t) -- Add a RoadTest
@@ -56,28 +55,28 @@ class RoadTest : public QObject
{
Q_OBJECT
+#//!\name Class globals
protected:
-#//class variable
- static QList<RoadTest*>
+ static QList<RoadTest *>
s_testcases; ///! List of testcases to execute. Initialized via add_...()
static int s_test_count; ///! Total number of tests executed
static int s_test_fail; ///! Number of failed tests
static QStringList s_failed_tests; ///! List of failed tests
-#//Test slots
+#//!\name Test slots
public slots:
void cleanup();
public:
-#//constructor, destructor
- RoadTest() { s_testcases.append(this); };
- ~RoadTest() { s_testcases.removeAll(this); };
+#//!\name Constructors, etc.
+ RoadTest() { s_testcases.append(this); }
+ ~RoadTest() { s_testcases.removeAll(this); }
#//Helper
void recordFailedTest();
-#//class function
+#//!\name Class functions
static int runTests(QStringList arguments);
};//RoadTest
@@ -87,7 +86,7 @@ public:
}//orgQhull
-namespace QTest {
+namespace QTest{
template<>
inline char *
diff --git a/src/user_eg.c b/src/user_eg/user_eg.c
similarity index 100%
rename from src/user_eg.c
rename to src/user_eg/user_eg.c
diff --git a/project/user_eg/user_eg.pro b/src/user_eg/user_eg.pro
similarity index 100%
rename from project/user_eg/user_eg.pro
rename to src/user_eg/user_eg.pro
diff --git a/src/user_eg2.c b/src/user_eg2/user_eg2.c
similarity index 100%
rename from src/user_eg2.c
rename to src/user_eg2/user_eg2.c
diff --git a/project/user_eg2/user_eg2.pro b/src/user_eg2/user_eg2.pro
similarity index 100%
rename from project/user_eg2/user_eg2.pro
rename to src/user_eg2/user_eg2.pro
diff --git a/cpp/user_eg3.cpp b/src/user_eg3/user_eg3.cpp
similarity index 100%
rename from cpp/user_eg3.cpp
rename to src/user_eg3/user_eg3.cpp
diff --git a/project/user_eg3/user_eg3.pro b/src/user_eg3/user_eg3.pro
similarity index 100%
rename from project/user_eg3/user_eg3.pro
rename to src/user_eg3/user_eg3.pro