diff --git a/src/libqhullcpp/Coordinates.h b/src/libqhullcpp/Coordinates.h
index 61fa88d1dfbf82a0b7f9f05c09168f9e9c8c8f90..af672317a850be39870cb3528fd80173f6a6b01c 100644
--- a/src/libqhullcpp/Coordinates.h
+++ b/src/libqhullcpp/Coordinates.h
@@ -13,7 +13,7 @@
#include "QhullIterator.h"
extern "C" {
#include "libqhull/qhull_a.h"
-};
+}
#include <cstddef> // ptrdiff_t, size_t
diff --git a/src/libqhullcpp/PointCoordinates.h b/src/libqhullcpp/PointCoordinates.h
index 44d9c6ded0b284ee6d3178c443e3e47dd8c60145..b8b68472ae9a1ce586471aeb4ea0a115660df3f7 100644
--- a/src/libqhullcpp/PointCoordinates.h
+++ b/src/libqhullcpp/PointCoordinates.h
@@ -13,7 +13,7 @@
#include "Coordinates.h"
extern "C" {
#include "libqhull/qhull_a.h"
-};
+}
#include <ostream>
#include <vector>
@@ -51,7 +51,7 @@ public:
std::vector<coordT> toStdVector() const { return point_coordinates.toStdVector(); }
#endif //QHULL_NO_STL
#ifdef QHULL_USES_QT
- void append(const QList<coordT> &coordinates) { if(!coordinates.isEmpty()){ append(coordinates.count(), &coordinates[0]); } }
+ void append(const QList<coordT> &pointCoordinates) { if(!pointCoordinates.isEmpty()){ append(pointCoordinates.count(), &pointCoordinates[0]); } }
QList<coordT> toQList() const { return point_coordinates.toQList(); }
#endif //QHULL_USES_QT
diff --git a/src/libqhullcpp/Qhull.cpp b/src/libqhullcpp/Qhull.cpp
index 84cc7fe3229cac2daf7c5106dec8298dab25eaf6..abddd41c6b6d8b52dd0b27e78349e4a23218dfd8 100644
--- a/src/libqhullcpp/Qhull.cpp
+++ b/src/libqhullcpp/Qhull.cpp
@@ -18,7 +18,7 @@
#include "Qhull.h"
extern "C" {
#include "libqhull/qhull_a.h"
-};
+}
#include <iostream>
diff --git a/src/libqhullcpp/QhullFacet.h b/src/libqhullcpp/QhullFacet.h
index eecb5cc82638fdfa635f67b608499b2182e0e7d6..d6652e649c6b211fa3520b6511b30c372969f67c 100644
--- a/src/libqhullcpp/QhullFacet.h
+++ b/src/libqhullcpp/QhullFacet.h
@@ -16,7 +16,7 @@
#include "QhullPointSet.h"
extern "C" {
#include "libqhull/qhull_a.h"
-};
+}
#include <string>
#include <vector>
diff --git a/src/libqhullcpp/QhullFacetSet.cpp b/src/libqhullcpp/QhullFacetSet.cpp
index 170ace60ee2f80efd310e9ec4be10fecce6d8dc1..855b1cd80cf404381aeea0f75325a0427aa1f39e 100644
--- a/src/libqhullcpp/QhullFacetSet.cpp
+++ b/src/libqhullcpp/QhullFacetSet.cpp
@@ -128,7 +128,7 @@ operator<<(ostream &os, const QhullFacetSet::PrintFacetSet &pr)
ostream &
operator<<(ostream &os, const QhullFacetSet::PrintIdentifiers &p)
{
- os << p.message;
+ os << p.print_message;
for(QhullFacetSet::const_iterator i=p.facet_set->begin(); i!=p.facet_set->end(); ++i){
const QhullFacet f= *i;
if(f.getFacetT()==qh_MERGEridge){
diff --git a/src/libqhullcpp/QhullFacetSet.h b/src/libqhullcpp/QhullFacetSet.h
index 27e25008c1a80d030d2e19feff437c278edf6754..d3ce34d9ba788c054e38fcd0e15dd4252a609661 100644
--- a/src/libqhullcpp/QhullFacetSet.h
+++ b/src/libqhullcpp/QhullFacetSet.h
@@ -68,16 +68,16 @@ public:
struct PrintFacetSet{
const QhullFacetSet *facet_set;
- const char *message;
+ const char *print_message;
int run_id;
- PrintFacetSet(int qhRunId, const char *message, const QhullFacetSet *s) : facet_set(s), message(message), run_id(qhRunId) {}
+ PrintFacetSet(int qhRunId, const char *message, const QhullFacetSet *s) : facet_set(s), print_message(message), run_id(qhRunId) {}
};//PrintFacetSet
const PrintFacetSet print(int qhRunId, const char *message) const { return PrintFacetSet(qhRunId, message, this); }
struct PrintIdentifiers{
const QhullFacetSet *facet_set;
- const char *message;
- PrintIdentifiers(const char *message, const QhullFacetSet *s) : facet_set(s), message(message) {}
+ const char *print_message;
+ PrintIdentifiers(const char *message, const QhullFacetSet *s) : facet_set(s), print_message(message) {}
};//PrintIdentifiers
PrintIdentifiers printIdentifiers(const char *message) const { return PrintIdentifiers(message, this); }
diff --git a/src/libqhullcpp/QhullHyperplane.cpp b/src/libqhullcpp/QhullHyperplane.cpp
index 676c80e8e3d483ce54d5c4472fe0843f687f39b8..5b0c36744d2fc559dab34cd0e975c8ed2c40181f 100644
--- a/src/libqhullcpp/QhullHyperplane.cpp
+++ b/src/libqhullcpp/QhullHyperplane.cpp
@@ -143,13 +143,13 @@ ostream &
operator<<(ostream &os, const QhullHyperplane::PrintHyperplane &pr)
{
QhullHyperplane p= *pr.hyperplane;
- if(pr.hyperplane_message){
- os << pr.hyperplane_message;
+ if(pr.print_message){
+ os << pr.print_message;
}
const realT *c= p.coordinates();
for(int k=p.dimension(); k--; ){
realT r= *c++;
- if(pr.hyperplane_message){
+ if(pr.print_message){
os << " " << r; // FIXUP QH11010 %8.4g
}else{
os << " " << r; // FIXUP QH11010 qh_REAL_1
diff --git a/src/libqhullcpp/QhullHyperplane.h b/src/libqhullcpp/QhullHyperplane.h
index 61b50edfb624ef380680f7e5b1b6bd9789047ed4..ffad4d732630a20793c4d2700369f621faacceae 100644
--- a/src/libqhullcpp/QhullHyperplane.h
+++ b/src/libqhullcpp/QhullHyperplane.h
@@ -14,7 +14,7 @@
#include "UsingLibQhull.h"
extern "C" {
#include "libqhull/qhull_a.h"
-};
+}
#include <ostream>
@@ -45,7 +45,7 @@ public:
#//Construct
QhullHyperplane() : hyperplane_coordinates(0), hyperplane_dimension(0), hyperplane_offset(0.0) {};
- QhullHyperplane(int dimension, coordT *c, coordT offset) : hyperplane_coordinates(c), hyperplane_dimension(dimension), hyperplane_offset(offset) {}
+ QhullHyperplane(int hyperplaneDimension, coordT *c, coordT hyperplaneOffset) : hyperplane_coordinates(c), hyperplane_dimension(hyperplaneDimension), hyperplane_offset(hyperplaneOffset) {}
// Creates an alias. Does not copy the hyperplane's coordinates. Needed for return by value and parameter passing.
QhullHyperplane(const QhullHyperplane &other) : hyperplane_coordinates(other.hyperplane_coordinates), hyperplane_dimension(other.hyperplane_dimension), hyperplane_offset(other.hyperplane_offset) {}
// Creates an alias. Does not copy the hyperplane's coordinates. Needed for vector<QhullHyperplane>
@@ -70,12 +70,12 @@ public:
coordT offset() const { return hyperplane_offset; }
#//Define
- void defineAs(int dimension, coordT *c, coordT offset) { QHULL_ASSERT(dimension>=0); hyperplane_coordinates= c; hyperplane_dimension= dimension; hyperplane_offset= offset; }
+ void defineAs(int hyperplaneDimension, coordT *c, coordT hyperplaneOffset) { QHULL_ASSERT(hyperplaneDimension>=0); hyperplane_coordinates= c; hyperplane_dimension= hyperplaneDimension; hyperplane_offset= hyperplaneOffset; }
//! Creates an alias to other
void defineAs(QhullHyperplane &other) { hyperplane_coordinates= other.coordinates(); hyperplane_dimension= other.dimension(); hyperplane_offset= other.offset(); }
void setCoordinates(coordT *c) { hyperplane_coordinates= c; }
- void setDimension(int dimension) { hyperplane_dimension= dimension; }
- void setOffset(coordT c) { hyperplane_offset= c; }
+ void setDimension(int hyperplaneDimension) { hyperplane_dimension= hyperplaneDimension; }
+ void setOffset(coordT hyperplaneOffset) { hyperplane_offset= hyperplaneOffset; }
#//value
double distance(const QhullPoint &p) const;
@@ -100,9 +100,9 @@ public:
#//IO
struct PrintHyperplane{
const QhullHyperplane *hyperplane;
- const char *hyperplane_message;
+ const char *print_message;
const char *hyperplane_offset_message;
- PrintHyperplane(const char *message, const char *offsetMessage, const QhullHyperplane &p) : hyperplane(&p), hyperplane_message(message), hyperplane_offset_message(offsetMessage) {}
+ PrintHyperplane(const char *message, const char *offsetMessage, const QhullHyperplane &p) : hyperplane(&p), print_message(message), hyperplane_offset_message(offsetMessage) {}
};//PrintHyperplane
PrintHyperplane print() const { return PrintHyperplane(0, 0, *this); }
PrintHyperplane print(const char *message, const char *offsetMessage) const { return PrintHyperplane(message, offsetMessage, *this); }
diff --git a/src/libqhullcpp/QhullIterator.h b/src/libqhullcpp/QhullIterator.h
index 959df1868d7835ff3fccd3f55f33a37627dd0be3..67f29fafa7301bcf367032f33ca863b3753ef647 100644
--- a/src/libqhullcpp/QhullIterator.h
+++ b/src/libqhullcpp/QhullIterator.h
@@ -11,7 +11,7 @@
extern "C" {
#include "libqhull/qhull_a.h"
-};
+}
#include <assert.h>
#include <string>
diff --git a/src/libqhullcpp/QhullPoint.h b/src/libqhullcpp/QhullPoint.h
index 51220446993f92943bda2404a8f5ebda7368aeaa..1abaa059a4ad4bf37cc3fb6d0811e26804d07cb3 100644
--- a/src/libqhullcpp/QhullPoint.h
+++ b/src/libqhullcpp/QhullPoint.h
@@ -15,7 +15,7 @@
#include "Coordinates.h"
extern "C" {
#include "libqhull/qhull_a.h"
-};
+}
#include <ostream>
diff --git a/src/libqhullcpp/QhullPointSet.cpp b/src/libqhullcpp/QhullPointSet.cpp
index ecc47f8d7b1618ac7a5607af9181d0bef2dfb103..13af7e2fbbcd8528ef1169a369b63d8bfb180838 100644
--- a/src/libqhullcpp/QhullPointSet.cpp
+++ b/src/libqhullcpp/QhullPointSet.cpp
@@ -185,8 +185,8 @@ ostream &
operator<<(ostream &os, const QhullPointSet::PrintIdentifiers &pr)
{
const QhullPointSet s= *pr.point_set;
- if (pr.message) {
- os << pr.message;
+ if (pr.print_message) {
+ os << pr.print_message;
}
for(QhullPointSet::const_iterator i=s.begin(); i != s.end(); ++i){
if(i!=s.begin()){
@@ -204,8 +204,8 @@ ostream &
operator<<(ostream &os, const QhullPointSet::PrintPointSet &pr)
{
const QhullPointSet s= *pr.point_set;
- if (pr.message) {
- os << pr.message;
+ if (pr.print_message) {
+ os << pr.print_message;
}
for(QhullPointSet::const_iterator i=s.begin(); i != s.end(); ++i){
const QhullPoint point= *i;
diff --git a/src/libqhullcpp/QhullPointSet.h b/src/libqhullcpp/QhullPointSet.h
index 0feb8a487d223574317a51717e547461f5b08e6e..274bff2ac358692cf4e17903bffc238352a9c6a8 100644
--- a/src/libqhullcpp/QhullPointSet.h
+++ b/src/libqhullcpp/QhullPointSet.h
@@ -13,7 +13,7 @@
#include "QhullPoint.h"
extern "C" {
#include "libqhull/qhull_a.h"
-};
+}
#include <ostream>
@@ -52,7 +52,7 @@ public:
#//Construct
//Conversion from setT* is not type-safe. Implicit conversion for void* to T
- QhullPointSet(int dimension, setT *s) : QhullSet<coordT *>(s), point_dimension(dimension) {}
+ QhullPointSet(int pointDimension, setT *s) : QhullSet<coordT *>(s), point_dimension(pointDimension) {}
//Copy constructor copies pointer but not contents. Needed for return by value and parameter passing.
QhullPointSet(const QhullPointSet &o) : QhullSet<coordT *>(o), point_dimension(o.point_dimension) {}
~QhullPointSet() {}
@@ -205,17 +205,17 @@ public:
#//IO
struct PrintIdentifiers{
const QhullPointSet *point_set;
- const char *message;
+ const char *print_message;
int run_id;
- PrintIdentifiers(const char *message, const QhullPointSet *s) : point_set(s), message(message) {}
+ PrintIdentifiers(const char *message, const QhullPointSet *s) : point_set(s), print_message(message) {}
};//PrintIdentifiers
PrintIdentifiers printIdentifiers(const char *message) const { return PrintIdentifiers(message, this); }
struct PrintPointSet{
const QhullPointSet *point_set;
- const char *message;
+ const char *print_message;
int run_id;
- PrintPointSet(int qhRunId, const char *message, const QhullPointSet &s) : point_set(&s), message(message), run_id(qhRunId) {}
+ PrintPointSet(int qhRunId, const char *message, const QhullPointSet &s) : point_set(&s), print_message(message), run_id(qhRunId) {}
};//PrintPointSet
PrintPointSet print(int qhRunId) const { return PrintPointSet(qhRunId, 0, *this); }
PrintPointSet print(int qhRunId, const char *message) const { return PrintPointSet(qhRunId, message, *this); }
diff --git a/src/libqhullcpp/QhullPoints.h b/src/libqhullcpp/QhullPoints.h
index eeed1f5345728f8b37e532a4216dccd5144436f6..790e2847073f4289ea67845955c6f35ddc35d210 100644
--- a/src/libqhullcpp/QhullPoints.h
+++ b/src/libqhullcpp/QhullPoints.h
@@ -12,7 +12,7 @@
#include "QhullPoint.h"
extern "C" {
#include "libqhull/qhull_a.h"
-};
+}
#include <ostream>
@@ -71,18 +71,18 @@ public:
coordT *coordinates() const { return point_first; }
int coordinateCount() const { return (int)(point_end-point_first); } // WARN64
int count() const { return (int)size(); } // WARN64
- void defineAs(int dimension, int coordinateCount, coordT *c) { QHULL_ASSERT(dimension>=0 && coordinateCount>=0 && c!=0); point_first= c; point_end= c+coordinateCount; point_dimension= dimension; }
- void defineAs(int coordinateCount, coordT *c) { QHULL_ASSERT((coordinateCount>=0 && c!=0) || (c==0 && coordinateCount==0)); point_first= c; point_end= c+coordinateCount; }
+ void defineAs(int pointDimension, int coordinatesCount, coordT *c) { QHULL_ASSERT(pointDimension>=0 && coordinatesCount>=0 && c!=0); point_first= c; point_end= c+coordinatesCount; point_dimension= pointDimension; }
+ void defineAs(int coordinatesCount, coordT *c) { QHULL_ASSERT((coordinatesCount>=0 && c!=0) || (c==0 && coordinatesCount==0)); point_first= c; point_end= c+coordinatesCount; }
void defineAs(const QhullPoints &other) { point_first= other.point_first; point_end= other.point_end; point_dimension= other.point_dimension; }
int dimension() const { return point_dimension; }
bool empty() const { return point_end==point_first; }
coordT *extraCoordinates() const { return extraCoordinatesCount() ? (point_end-extraCoordinatesCount()) : 0; }
int extraCoordinatesCount() const { return point_dimension>0 ? (int)((point_end-point_first)%(size_t)point_dimension) : 0; } // WARN64
- bool includesCoordinates(const coordT *coordinates) const { return coordinates>=point_first && coordinates<point_end; }
+ bool includesCoordinates(const coordT *c) const { return c>=point_first && c<point_end; }
bool isEmpty() const { return empty(); }
bool operator==(const QhullPoints &other) const;
bool operator!=(const QhullPoints &other) const { return !operator==(other); }
- void setDimension(int dimension) { QHULL_ASSERT(dimension>=0); point_dimension= dimension; }
+ void setDimension(int pointDimension) { QHULL_ASSERT(pointDimension>=0); point_dimension= pointDimension; }
size_t size() const { return (point_dimension ? (point_end-point_first)/point_dimension : 0); }
#//ElementAccess -- can not return references to QhullPoint
@@ -129,7 +129,7 @@ public:
iterator() : QhullPoint() {}
iterator(const iterator &other): QhullPoint(*other) {}
explicit iterator(const QhullPoints &ps) : QhullPoint(ps.dimension(), ps.coordinates()) {}
- explicit iterator(int dimension, coordT *c): QhullPoint(dimension, c) {}
+ explicit iterator(int pointDimension, coordT *c): QhullPoint(pointDimension, c) {}
iterator &operator=(const iterator &other) { defineAs( const_cast<iterator &>(other)); return *this; }
QhullPoint *operator->() { return this; }
// value instead of reference since advancePoint() modifies self
@@ -173,7 +173,7 @@ public:
const_iterator(const const_iterator &other) : QhullPoint(*other) {}
const_iterator(const QhullPoints::iterator &other) : QhullPoint(*other) {}
explicit const_iterator(const QhullPoints &ps) : QhullPoint(ps.dimension(), ps.coordinates()) {}
- explicit const_iterator(int dimension, coordT *c): QhullPoint(dimension, c) {}
+ explicit const_iterator(int pointDimension, coordT *c): QhullPoint(pointDimension, c) {}
const_iterator &operator=(const const_iterator &other) { defineAs(const_cast<const_iterator &>(other)); return *this; }
// value/non-const since advancePoint(1), etc. modifies self
QhullPoint operator*() const { return *this; }
diff --git a/src/libqhullcpp/QhullQh.h b/src/libqhullcpp/QhullQh.h
index 5f8b73a04a575d0f81594df72d619d74475efbcc..9b98b995c4c6b4e981c108335c363e19052aba0b 100644
--- a/src/libqhullcpp/QhullQh.h
+++ b/src/libqhullcpp/QhullQh.h
@@ -11,7 +11,7 @@
extern "C" {
#include "libqhull/qhull_a.h"
-};
+}
#include <string>
#include <vector>
diff --git a/src/libqhullcpp/QhullRidge.h b/src/libqhullcpp/QhullRidge.h
index 4e4f6f469552ccb13618882341ec59932449ba83..d04f9f3f8db3afe71e8b24b56fa24ca0aac525b0 100644
--- a/src/libqhullcpp/QhullRidge.h
+++ b/src/libqhullcpp/QhullRidge.h
@@ -15,7 +15,7 @@
#include "QhullFacet.h"
extern "C" {
#include "libqhull/qhull_a.h"
-};
+}
#include <ostream>
diff --git a/src/libqhullcpp/QhullSet.h b/src/libqhullcpp/QhullSet.h
index e50bb29b4a4a433ed4dfea9a0e98646c8590e38d..b6c07a815f610ef780b95b78e9fdc6b28d07c798 100644
--- a/src/libqhullcpp/QhullSet.h
+++ b/src/libqhullcpp/QhullSet.h
@@ -12,7 +12,7 @@
#include "QhullError.h"
extern "C" {
#include "libqhull/qhull_a.h"
-};
+}
#ifndef QHULL_NO_STL
diff --git a/src/libqhullcpp/QhullStat.h b/src/libqhullcpp/QhullStat.h
index f84631deea7908b8f6fa831dbda823b660f92a7d..73ce5b179aea3fb5a6daccdded08b94452cfc3e8 100644
--- a/src/libqhullcpp/QhullStat.h
+++ b/src/libqhullcpp/QhullStat.h
@@ -11,7 +11,7 @@
extern "C" {
#include "libqhull/qhull_a.h"
-};
+}
#include <string>
#include <vector>
diff --git a/src/libqhullcpp/QhullVertex.h b/src/libqhullcpp/QhullVertex.h
index a860520d715d15a64d6d69af0d351a5295276f94..200d03ef4815bff2035326288e28e895dddcec7a 100644
--- a/src/libqhullcpp/QhullVertex.h
+++ b/src/libqhullcpp/QhullVertex.h
@@ -15,7 +15,7 @@
#include "QhullSet.h"
extern "C" {
#include "libqhull/qhull_a.h"
-};
+}
#include <ostream>
diff --git a/src/libqhullcpp/QhullVertexSet.cpp b/src/libqhullcpp/QhullVertexSet.cpp
index 40044f87715439889e5be47b88d40d9ef55ed063..027a50b39cffae217a4f2707ab90edaaef86c6b3 100644
--- a/src/libqhullcpp/QhullVertexSet.cpp
+++ b/src/libqhullcpp/QhullVertexSet.cpp
@@ -78,8 +78,8 @@ using orgQhull::UsingLibQhull;
ostream &
operator<<(ostream &os, const QhullVertexSet::PrintIdentifiers &pr)
{
- if(pr.message && *pr.message){
- os << pr.message;
+ if(pr.print_message && *pr.print_message){
+ os << pr.print_message;
}
for(QhullVertexSet::const_iterator i=pr.Vertex_set->begin(); i!=pr.Vertex_set->end(); ++i){
const QhullVertex v= *i;
@@ -94,7 +94,7 @@ operator<<(ostream &os, const QhullVertexSet::PrintIdentifiers &pr)
ostream &
operator<<(ostream &os, const QhullVertexSet::PrintVertexSet &pr){
- os << pr.message;
+ os << pr.print_message;
const QhullVertexSet *vs= pr.Vertex_set;
QhullVertexSetIterator i= *vs;
while(i.hasNext()){
diff --git a/src/libqhullcpp/QhullVertexSet.h b/src/libqhullcpp/QhullVertexSet.h
index 159cff16d6f49af295e8afc94d11f04faf7a52e3..0c7e5bac993570b7be93ea8609d89c311d73f584 100644
--- a/src/libqhullcpp/QhullVertexSet.h
+++ b/src/libqhullcpp/QhullVertexSet.h
@@ -53,16 +53,16 @@ public:
#//IO
struct PrintVertexSet{
const QhullVertexSet *Vertex_set;
- const char *message;
+ const char *print_message;
int run_id;
- PrintVertexSet(int qhRunId, const char *message, const QhullVertexSet *s) : Vertex_set(s), message(message), run_id(qhRunId) {}
+ PrintVertexSet(int qhRunId, const char *message, const QhullVertexSet *s) : Vertex_set(s), print_message(message), run_id(qhRunId) {}
};//PrintVertexSet
const PrintVertexSet print(int qhRunId, const char *message) const { return PrintVertexSet(qhRunId, message, this); }
struct PrintIdentifiers{
const QhullVertexSet *Vertex_set;
- const char *message;
- PrintIdentifiers(const char *message, const QhullVertexSet *s) : Vertex_set(s), message(message) {}
+ const char *print_message;
+ PrintIdentifiers(const char *message, const QhullVertexSet *s) : Vertex_set(s), print_message(message) {}
};//PrintIdentifiers
PrintIdentifiers printIdentifiers(const char *message) const { return PrintIdentifiers(message, this); }
diff --git a/src/libqhullcpp/RboxPoints.h b/src/libqhullcpp/RboxPoints.h
index bb016ec61e3d0216f43ad547319344bee5258b1b..3d448703ae7d8f0ea61bbd7e0ad9ca57ed7d92bb 100644
--- a/src/libqhullcpp/RboxPoints.h
+++ b/src/libqhullcpp/RboxPoints.h
@@ -13,7 +13,7 @@
#include "PointCoordinates.h"
extern "C" {
#include "libqhull/libqhull.h"
-};
+}
#include <stdarg.h>
#include <string>
diff --git a/src/libqhullcpp/UsingLibQhull.h b/src/libqhullcpp/UsingLibQhull.h
index 52b6fc821b31d551f2184f9cd40ddad8b915a60b..88b5691d0649c0103ebc174e6d13e862a8c49a34 100644
--- a/src/libqhullcpp/UsingLibQhull.h
+++ b/src/libqhullcpp/UsingLibQhull.h
@@ -12,7 +12,7 @@
#include "QhullError.h"
extern "C" {
#include "libqhull/libqhull.h"
-};
+}
namespace orgQhull {
diff --git a/src/libqhullcpp/libqhullcpp.pro b/src/libqhullcpp/libqhullcpp.pro
index bd6b5812a9eb92168f4adb487b4871a0b36e79f9..6258096217a7bc4d85815ef350bb4850d22d710e 100644
--- a/src/libqhullcpp/libqhullcpp.pro
+++ b/src/libqhullcpp/libqhullcpp.pro
@@ -6,7 +6,7 @@
DESTDIR = ../../lib
TEMPLATE = lib
CONFIG += staticlib warn_on
-CONFIG -= qt
+CONFIG -= qt rtti
build_pass:CONFIG(debug, debug|release):{
TARGET = qhullcpp-d
OBJECTS_DIR = Debug
@@ -18,12 +18,12 @@ MOC_DIR = moc
DEFINES += qh_QHpointer
INCLUDEPATH += ../../src
-INCLUDEPATH += $PWD # for MOC_DIR
-*xxg++ {
- QMAKE_CXXFLAGS_WARN_ON += -Werror -Wcast-qual -Wextra -Wwrite-strings
+INCLUDEPATH += $$PWD # for MOC_DIR
+*g++ {
+ #QMAKE_CXXFLAGS_WARN_ON += -Wconversion # Qt conversion errors in qbitarray and qpalette
+ QMAKE_CXXFLAGS_WARN_ON += -Werror # Treat warnings as errors
+ QMAKE_CXXFLAGS_WARN_ON += -Wcast-qual -Wextra -Wwrite-strings
QMAKE_CXXFLAGS_WARN_ON += -Wno-sign-conversion
- QMAKE_CXXFLAGS_WARN_ON += -Wconversion
- QMAKE_CXXFLAGS_WARN_ON += -pedantic
}
SOURCES += ../road/RoadError.cpp
diff --git a/src/qhull-app-cpp.pri b/src/qhull-app-cpp.pri
index d22b14898940ad996e5e7494b0c8f0cf47db31df..281c655505359e85ce263d6c2d80cd359b7ae2b6 100644
--- a/src/qhull-app-cpp.pri
+++ b/src/qhull-app-cpp.pri
@@ -1,6 +1,7 @@
DESTDIR = ../../bin
TEMPLATE = app
CONFIG += console warn_on
+CONFIG -= rtti
LIBS += -L../../lib
build_pass:CONFIG(debug, debug|release){
LIBS += -lqhullcpp-d
@@ -11,11 +12,12 @@ build_pass:CONFIG(debug, debug|release){
LIBS += -lqhull-p # Must be last, otherwise qh_fprintf,etc. are loaded from here instead of qhullcpp.lib
OBJECTS_DIR = Release
}
-*xxg++ {
- QMAKE_CXXFLAGS_WARN_ON += -Werror -Wcast-qual -Wextra -Wshadow -Wwrite-strings
+*g++ {
+ #QMAKE_CXXFLAGS_WARN_ON += -Wshadow # Shadowing in Qt, e.g., nested foreach
+ #QMAKE_CXXFLAGS_WARN_ON += -Wconversion # Conversion errors in Qt for qbitarray and qpalette
+ QMAKE_CXXFLAGS_WARN_ON += -Werror # Treat warnings as errors
+ QMAKE_CXXFLAGS_WARN_ON += -Wcast-qual -Wextra -Wwrite-strings
QMAKE_CXXFLAGS_WARN_ON += -Wno-sign-conversion
- QMAKE_CXXFLAGS_WARN_ON += -Wconversion
- QMAKE_CXXFLAGS_WARN_ON += -pendantic
}
win32-msvc : QMAKE_LFLAGS += /INCREMENTAL:NO
diff --git a/src/qhulltest/PointCoordinates_test.cpp b/src/qhulltest/PointCoordinates_test.cpp
index be1e3c5df8202bff9641b6ab00f512fa268922b7..36ca47ca1c86f4eddffb1fd7e2e34d49d0cd81eb 100644
--- a/src/qhulltest/PointCoordinates_test.cpp
+++ b/src/qhulltest/PointCoordinates_test.cpp
@@ -219,9 +219,9 @@ t_foreach()
i2= pc2.end();
QVERIFY(i2-1!=i3);
QCOMPARE(*(i2-1), *i3);
- foreach(QhullPoint p, pc){ //Qt only
- QVERIFY(p[0]>=0.0);
- QVERIFY(p[0]<=5.0);
+ foreach(QhullPoint p3, pc){ //Qt only
+ QVERIFY(p3[0]>=0.0);
+ QVERIFY(p3[0]<=5.0);
}
Coordinates::ConstIterator i4= pc.beginCoordinates();
QCOMPARE(*i4, 0.0);
diff --git a/src/qhulltest/QhullFacet_test.cpp b/src/qhulltest/QhullFacet_test.cpp
index 6932af36d937af895040b24e657475abaf72a12c..4e3dc823b70fc80e883d2793d4da118e5a987fc3 100644
--- a/src/qhulltest/QhullFacet_test.cpp
+++ b/src/qhulltest/QhullFacet_test.cpp
@@ -136,9 +136,9 @@ t_getSet()
cout << "OuterPlane: " << ho << "outerOffset+0.5 " << outerOffset << endl;
QVERIFY(outerOffset <= 0.0);
QVERIFY(outerOffset-innerOffset < 1e-7);
- for(int i= 0; i<3; i++){
- QVERIFY(ho[i]==hi[i]);
- QVERIFY(ho[i]==h[i]);
+ for(int k= 0; k<3; k++){
+ QVERIFY(ho[k]==hi[k]);
+ QVERIFY(ho[k]==h[k]);
}
QhullPoint center= f.getCenter(q.runId());
cout << "Center: " << center << endl;
@@ -157,8 +157,8 @@ t_getSet()
QCOMPARE(center3.dimension(), 3);
QhullPoint center4= f2.getCenter(q.runId());
QCOMPARE(center4.dimension(), 3);
- for(int i= 0; i<3; i++){
- QVERIFY(center4[i]==center3[i]);
+ for(int k= 0; k<3; k++){
+ QVERIFY(center4[k]==center3[k]);
}
Qhull q3(rcube,"v Qz QR0"); // Voronoi diagram of a cube (one vertex)
diff --git a/src/qhulltest/QhullHyperplane_test.cpp b/src/qhulltest/QhullHyperplane_test.cpp
index c5c2b4ec65b6d3d128acfa6b740ca23ee36ad0c3..a2154a0760d55647e744896c23b4f3318516cb10 100644
--- a/src/qhulltest/QhullHyperplane_test.cpp
+++ b/src/qhulltest/QhullHyperplane_test.cpp
@@ -124,8 +124,8 @@ t_readonly()
const coordT *c3= h.begin();
QCOMPARE(c, c3);
QCOMPARE(h.offset(), -0.5);
- int i= h.end()-h.begin();
- QCOMPARE(i, 3);
+ int j= h.end()-h.begin();
+ QCOMPARE(j, 3);
double squareNorm= std::inner_product(h.begin(), h.end(), h.begin(), 0.0);
QCOMPARE(squareNorm, 1.0);
}
diff --git a/src/qhulltest/QhullPointSet_test.cpp b/src/qhulltest/QhullPointSet_test.cpp
index 72e17863a47540eb55ef7a9bd7fc763baaf93400..e10ca1896f1e156b6b810b08672f07fa8fe883e9 100644
--- a/src/qhulltest/QhullPointSet_test.cpp
+++ b/src/qhulltest/QhullPointSet_test.cpp
@@ -131,9 +131,9 @@ t_element()
QVERIFY(ps.value(1, p)!=p);
QhullPointSet ps8= f.coplanarPoints();
QhullPointSet::Iterator i= ps8.begin();
- foreach(QhullPoint p, ps){ // Qt only
- QCOMPARE(p.dimension(), 3);
- QCOMPARE(p, *i++);
+ foreach(QhullPoint p9, ps){ // Qt only
+ QCOMPARE(p9.dimension(), 3);
+ QCOMPARE(p9, *i++);
}
}//t_element
diff --git a/src/qhulltest/QhullPoints_test.cpp b/src/qhulltest/QhullPoints_test.cpp
index 39cdc2f4c13efcd332f94faaab05d094347b6fc0..3d5c7538b6c165f71146b673d5e31f49a851c437 100644
--- a/src/qhulltest/QhullPoints_test.cpp
+++ b/src/qhulltest/QhullPoints_test.cpp
@@ -189,9 +189,9 @@ t_element()
QCOMPARE(ps.value(3), p8);
QCOMPARE(ps.value(3, p), p);
QVERIFY(ps.value(1, p)!=p);
- foreach(QhullPoint p, ps){ // Qt only
- QCOMPARE(p.dimension(), 2);
- QVERIFY(p[0]==0.0 || p[0]==2.0 || p[0]==4.0);
+ foreach(QhullPoint p9, ps){ // Qt only
+ QCOMPARE(p9.dimension(), 2);
+ QVERIFY(p9[0]==0.0 || p9[0]==2.0 || p9[0]==4.0);
}
}//t_element
diff --git a/src/qhulltest/QhullVertex_test.cpp b/src/qhulltest/QhullVertex_test.cpp
index d745beffd7e5cafa2a09428f55fd6fe8c96dcb17..7812f3feffe1715f5f8fd872e6b974b974101ef1 100644
--- a/src/qhulltest/QhullVertex_test.cpp
+++ b/src/qhulltest/QhullVertex_test.cpp
@@ -109,9 +109,9 @@ t_getSet()
// test point()
foreach (QhullVertex v, q.vertexList()){ // Qt only
QhullPoint p= v.point();
- int i= p.id(q.runId());
- cout << "Point " << i << ":\n" << p.print(q.runId()) << endl;
- QVERIFY(i>=0 && i<8);
+ int j= p.id(q.runId());
+ cout << "Point " << j << ":\n" << p.print(q.runId()) << endl;
+ QVERIFY(j>=0 && j<8);
}
}
}//t_getSet
diff --git a/src/qhulltest/qhulltest.pro b/src/qhulltest/qhulltest.pro
index 5b0dae92aec563bbd686383cde531ba35653bd3e..7387e8c1ac13929f99aef1b74af314a5a0672ebc 100644
--- a/src/qhulltest/qhulltest.pro
+++ b/src/qhulltest/qhulltest.pro
@@ -6,7 +6,7 @@ TARGET = qhulltest
include(../qhull-app-cpp.pri)
CONFIG += qtestlib
MOC_DIR = moc
-INCLUDEPATH += $PWD # for MOC_DIR
+INCLUDEPATH += .. # for MOC_DIR
PRECOMPILED_HEADER = ../road/RoadTest.h