Merge pull request #80 from SCIInstitute/build_warnings

Cleaver include warnings fixed
SCIInstitute · May 23, 2019 · 99ab41c · 99ab41c
2 parents b98fccc + c0e71a1
commit 99ab41c
Show file tree

Hide file tree

Showing 30 changed files with 71 additions and 74 deletions.
diff --git a/src/examples/implicit_spheres.cpp b/src/examples/implicit_spheres.cpp
@@ -5,9 +5,9 @@
 #include <cstring>
 #include <cstdlib>
 
-#include <Cleaver/Cleaver.h>
-#include <Cleaver/InverseField.h>
-#include <Cleaver/Volume.h>
+#include <cleaver/Cleaver.h>
+#include <cleaver/InverseField.h>
+#include <cleaver/Volume.h>
 
 class MockupField : public cleaver::AbstractScalarField
 {

diff --git a/src/examples/test_data.cpp b/src/examples/test_data.cpp
@@ -1,9 +1,9 @@
-#include <Cleaver/Cleaver.h>
-#include <Cleaver/InverseField.h>
-#include <Cleaver/ConstantField.h>
-#include <Cleaver/vec3.h>
-#include <Cleaver/AbstractScalarField.h>
-#include <Cleaver/BoundingBox.h>
+#include <cleaver/Cleaver.h>
+#include <cleaver/InverseField.h>
+#include <cleaver/ConstantField.h>
+#include <cleaver/vec3.h>
+#include <cleaver/AbstractScalarField.h>
+#include <cleaver/BoundingBox.h>
 
 #include <Synthetic/PlaneField.h>
 #include <Synthetic/PlaneSizingField.h>

diff --git a/src/gui/Application/Data/DataManager.cpp b/src/gui/Application/Data/DataManager.cpp
@@ -1,7 +1,7 @@
 #include "DataManager.h"
 #include <QMessageBox>
-#include <Cleaver/InverseField.h>
-#include <Cleaver/AbstractScalarField.h>
+#include <cleaver/InverseField.h>
+#include <cleaver/AbstractScalarField.h>
 
 DataManager::DataManager() : mesh_(nullptr), sizingField_(nullptr), volume_(nullptr) {}
 
@@ -33,4 +33,4 @@ std::vector<cleaver::AbstractScalarField* > DataManager::indicators() const { re
 
 cleaver::Volume*  DataManager::volume() const { return this->volume_; }
 
-cleaver::TetMesh* DataManager::mesh() const { return this->mesh_; }
+cleaver::TetMesh* DataManager::mesh() const { return this->mesh_; }
diff --git a/src/gui/Application/Data/DataManager.h b/src/gui/Application/Data/DataManager.h
@@ -1,8 +1,8 @@
 #ifndef DATAMANAGER_H
 #define DATAMANAGER_H
 
-#include <Cleaver/TetMesh.h>
-#include <Cleaver/Volume.h>
+#include <cleaver/TetMesh.h>
+#include <cleaver/Volume.h>
 #include <QObject>
 #include <stdlib.h>
 

diff --git a/src/gui/Application/DataWidgets/DataManagerWidget.h b/src/gui/Application/DataWidgets/DataManagerWidget.h
@@ -10,9 +10,9 @@
 #include "VolumeDataWidget.h"
 #include <map>
 #include <string>
-#include <Cleaver/ScalarField.h>
-#include <Cleaver/Volume.h>
-#include <Cleaver/TetMesh.h>
+#include <cleaver/ScalarField.h>
+#include <cleaver/Volume.h>
+#include <cleaver/TetMesh.h>
 #include <Data/DataManager.h>
 
 namespace Ui {

diff --git a/src/gui/Application/DataWidgets/FieldDataWidget.cpp b/src/gui/Application/DataWidgets/FieldDataWidget.cpp
@@ -1,8 +1,8 @@
 #include "FieldDataWidget.h"
 #include "ui_FieldDataWidget.h"
 #include <sstream>
-#include <Cleaver/ScalarField.h>
-#include <Cleaver/BoundingBox.h>
+#include <cleaver/ScalarField.h>
+#include <cleaver/BoundingBox.h>
 #include <NRRDTools.h>
 #include <QMouseEvent>
 #include <QMenu>

diff --git a/src/gui/Application/DataWidgets/FieldDataWidget.h b/src/gui/Application/DataWidgets/FieldDataWidget.h
@@ -3,7 +3,7 @@
 
 #include <QWidget>
 #include <QStyle>
-#include <Cleaver/ScalarField.h>
+#include <cleaver/ScalarField.h>
 
 namespace Ui {
 class FieldDataWidget;
@@ -12,12 +12,12 @@ class FieldDataWidget;
 class FieldDataWidget : public QWidget
 {
     Q_OBJECT
-    
+
 public:
     explicit FieldDataWidget(QWidget *parent = 0);
     FieldDataWidget(cleaver::AbstractScalarField *field, QWidget *parent = 0);
     ~FieldDataWidget();
-    
+
     void setTitle(const std::string &title);
   signals:
     void exportField(void*);

diff --git a/src/gui/Application/DataWidgets/MeshDataWidget.h b/src/gui/Application/DataWidgets/MeshDataWidget.h
@@ -3,7 +3,7 @@
 
 #include <QFrame>
 #include <string>
-#include <Cleaver/TetMesh.h>
+#include <cleaver/TetMesh.h>
 
 namespace Ui {
 class MeshDataWidget;
@@ -12,7 +12,7 @@ class MeshDataWidget;
 class MeshDataWidget : public QWidget
 {
     Q_OBJECT
-    
+
 public:
     explicit MeshDataWidget(QWidget *parent = 0);
     MeshDataWidget(cleaver::TetMesh *mesh, QWidget *parent = 0);

diff --git a/src/gui/Application/DataWidgets/MiniFieldWidget.h b/src/gui/Application/DataWidgets/MiniFieldWidget.h
@@ -2,7 +2,7 @@
 #define MINIFIELDWIDGET_H
 
 #include <QWidget>
-#include <Cleaver/ScalarField.h>
+#include <cleaver/ScalarField.h>
 
 namespace Ui {
 class MiniFieldWidget;
@@ -11,7 +11,7 @@ class MiniFieldWidget;
 class MiniFieldWidget : public QWidget
 {
     Q_OBJECT
-    
+
 public:
     explicit MiniFieldWidget(QWidget *parent = 0);
     MiniFieldWidget(cleaver::AbstractScalarField *field, QWidget *parent = 0);
@@ -39,7 +39,7 @@ class MiniFieldWidget : public QWidget
     void dragLeaveEvent(QDragLeaveEvent *event);
     void dropEvent(QDropEvent *event);
 
-    
+
 private:
     Ui::MiniFieldWidget *ui;
     cleaver::AbstractScalarField *m_field;

diff --git a/src/gui/Application/DataWidgets/VolumeDataWidget.h b/src/gui/Application/DataWidgets/VolumeDataWidget.h
@@ -3,7 +3,7 @@
 
 #include <QWidget>
 #include <QStyle>
-#include <Cleaver/Volume.h>
+#include <cleaver/Volume.h>
 #include "MiniFieldWidget.h"
 #include <map>
 

diff --git a/src/gui/Application/MainWindow.cpp b/src/gui/Application/MainWindow.cpp
@@ -1,7 +1,7 @@
 #include "MainWindow.h"
-#include <Cleaver/Cleaver.h>
-#include <Cleaver/ConstantField.h>
-#include <Cleaver/InverseField.h>
+#include <cleaver/Cleaver.h>
+#include <cleaver/ConstantField.h>
+#include <cleaver/InverseField.h>
 #include <cstdio>
 #include <fstream>
 #include <QProgressDialog>
@@ -12,7 +12,7 @@
 #include <QStatusBar>
 #include <QLayoutItem>
 #include <QLabel>
-#include <Cleaver/ScalarField.h>
+#include <cleaver/ScalarField.h>
 
 MainWindow::MainWindow(QWidget *parent) :
   QMainWindow(parent) {}

diff --git a/src/gui/Application/MainWindow.h b/src/gui/Application/MainWindow.h
@@ -14,8 +14,8 @@
 #include "ToolWidgets/CleaverWidget.h"
 #include "ToolWidgets/SizingFieldWidget.h"
 #include "DataWidgets/DataManagerWidget.h"
-#include <Cleaver/Cleaver.h>
-#include <Cleaver/CleaverMesher.h>
+#include <cleaver/Cleaver.h>
+#include <cleaver/CleaverMesher.h>
 #include "Data/DataManager.h"
 #include <QProgressBar>
 
@@ -88,7 +88,7 @@ public slots :
   // Compute Menu Action
   QAction *computeAnglesAct;
 
-  // Tool Menu Actions    
+  // Tool Menu Actions
   QAction *cleaverAction;
   QAction *meshViewOptionsAction;
   QAction *sizingFieldAction;
@@ -105,7 +105,7 @@ public slots :
   QMenu *m_computeMenu;
   QMenu *m_viewMenu;
   QMenu *m_helpMenu;
-  
+
   //status bar items
   QProgressBar * progressBar_;
 

diff --git a/src/gui/Application/ToolWidgets/CleaverWidget.cpp b/src/gui/Application/ToolWidgets/CleaverWidget.cpp
@@ -1,9 +1,9 @@
 #include "CleaverWidget.h"
 #include "ui_CleaverWidget.h"
-#include <Cleaver/TetMesh.h>
-#include <Cleaver/Cleaver.h>
-#include <Cleaver/Timer.h>
-#include <Cleaver/SizingFieldCreator.h>
+#include <cleaver/TetMesh.h>
+#include <cleaver/Cleaver.h>
+#include <cleaver/Timer.h>
+#include <cleaver/SizingFieldCreator.h>
 #include <iostream>
 #include <QApplication>
 #include <stdexcept>

diff --git a/src/gui/Application/ToolWidgets/CleaverWidget.h b/src/gui/Application/ToolWidgets/CleaverWidget.h
@@ -2,7 +2,7 @@
 #define CLEAVERWIDGET_H
 
 #include <QDockWidget>
-#include <Cleaver/CleaverMesher.h>
+#include <cleaver/CleaverMesher.h>
 #include <QThread>
 
 Q_DECLARE_METATYPE(std::string)
@@ -56,7 +56,7 @@ public slots:
     void handleMessage(std::string);
     void handleProgress(int);
     void handleErrorMessage(std::string);
-    
+
 private:
     Ui::CleaverWidget *ui;
     cleaver::CleaverMesher& mesher_;

diff --git a/src/gui/Application/ToolWidgets/SizingFieldWidget.cpp b/src/gui/Application/ToolWidgets/SizingFieldWidget.cpp
@@ -6,11 +6,11 @@
 #include <iostream>
 #include <string>
 #include <vector>
-#include <Cleaver/Cleaver.h>
-#include <Cleaver/ConstantField.h>
-#include <Cleaver/InverseField.h>
-#include <Cleaver/ScaledField.h>
-#include <Cleaver/SizingFieldCreator.h>
+#include <cleaver/Cleaver.h>
+#include <cleaver/ConstantField.h>
+#include <cleaver/InverseField.h>
+#include <cleaver/ScaledField.h>
+#include <cleaver/SizingFieldCreator.h>
 #include <NRRDTools.h>
 #include <stdexcept>
 

diff --git a/src/gui/Application/ToolWidgets/SizingFieldWidget.h b/src/gui/Application/ToolWidgets/SizingFieldWidget.h
@@ -2,7 +2,7 @@
 #define DATALOADERWIDGET_H
 
 #include <QDockWidget>
-#include <Cleaver/CleaverMesher.h>
+#include <cleaver/CleaverMesher.h>
 #include <QThread>
 
 namespace Ui {

diff --git a/src/gui/Application/ViewWidgets/Camera.h b/src/gui/Application/ViewWidgets/Camera.h
@@ -1,7 +1,7 @@
 #ifndef CAMERA_H
 #define CAMERA_H
 
-#include <Cleaver/vec3.h>
+#include <cleaver/vec3.h>
 
 class Camera
 {

diff --git a/src/gui/Application/ViewWidgets/MeshViewOptionsWidget.h b/src/gui/Application/ViewWidgets/MeshViewOptionsWidget.h
@@ -5,7 +5,7 @@
 #include <QSignalMapper>
 #include <QStandardItemModel>
 #include "MeshWindow.h"
-#include <Cleaver/CleaverMesher.h>
+#include <cleaver/CleaverMesher.h>
 
 class CheckableItemModel : public QStandardItemModel
 {

diff --git a/src/gui/Application/ViewWidgets/MeshWindow.cpp b/src/gui/Application/ViewWidgets/MeshWindow.cpp
@@ -1,8 +1,8 @@
 #include "MeshWindow.h"
 #include "TrackballCamera.h"
-#include <Cleaver/BoundingBox.h>
-#include <Cleaver/vec3.h>
-#include <Cleaver/Vertex.h>
+#include <cleaver/BoundingBox.h>
+#include <cleaver/vec3.h>
+#include <cleaver/Vertex.h>
 #include "../../lib/cleaver/Plane.h"
 #include <QMouseEvent>
 #include <QFileDialog>

diff --git a/src/gui/Application/ViewWidgets/MeshWindow.h b/src/gui/Application/ViewWidgets/MeshWindow.h
@@ -5,9 +5,9 @@
 #include <QOpenGLShaderProgram>
 #include <QOpenGLBuffer>
 #include <QOpenGLVertexArrayObject>
-#include <Cleaver/CleaverMesher.h>
-#include <Cleaver/TetMesh.h>
-#include <Cleaver/Volume.h>
+#include <cleaver/CleaverMesher.h>
+#include <cleaver/TetMesh.h>
+#include <cleaver/Volume.h>
 #include "Camera.h"
 #include <QMatrix4x4>
 

diff --git a/src/gui/Application/ViewWidgets/TargetCamera.h b/src/gui/Application/ViewWidgets/TargetCamera.h
@@ -2,8 +2,8 @@
 #define TARGETCAMERA_H
 
 #include "Camera.h"
-#include <Cleaver/vec3.h>
-#include <Cleaver/BoundingBox.h>
+#include <cleaver/vec3.h>
+#include <cleaver/BoundingBox.h>
 
 class TargetCamera : public Camera
 {

diff --git a/src/gui/Application/ViewWidgets/TrackballCamera.cpp b/src/gui/Application/ViewWidgets/TrackballCamera.cpp
@@ -1,5 +1,5 @@
 #include "TrackballCamera.h"
-#include <Cleaver/vec3.h>
+#include <cleaver/vec3.h>
 #include <cmath>
 #include <QMatrix4x4>
 

diff --git a/src/gui/Application/ViewWidgets/TrackballCamera.h b/src/gui/Application/ViewWidgets/TrackballCamera.h
@@ -4,8 +4,8 @@
 #include "Camera.h"
 #include <QQuaternion>
 #include <QVector2D>
-#include <Cleaver/vec3.h>
-#include <Cleaver/BoundingBox.h>
+#include <cleaver/vec3.h>
+#include <cleaver/BoundingBox.h>
 
 class TrackballCamera : public Camera
 {

diff --git a/src/gui/Main/main.cpp b/src/gui/Main/main.cpp
@@ -1,7 +1,7 @@
 #include <QApplication>
 #include <QtGui>
 #include "MainWindow.h"
-#include <Cleaver/Cleaver.h>
+#include <cleaver/Cleaver.h>
 
 int main(int argc, char *argv[])
 {
@@ -14,5 +14,3 @@ int main(int argc, char *argv[])
     w.show();
     return a.exec();
 }
-
-
diff --git a/src/lib/synthetic/PlaneField.h b/src/lib/synthetic/PlaneField.h
@@ -1,8 +1,8 @@
 #ifndef PLANEFIELD_H
 #define PLANEFIELD_H
 
-#include <Cleaver/ScalarField.h>
-#include <Cleaver/BoundingBox.h>
+#include <cleaver/ScalarField.h>
+#include <cleaver/BoundingBox.h>
 
 
 class PlaneField : public cleaver::FloatField

diff --git a/src/lib/synthetic/PlaneSizingField.h b/src/lib/synthetic/PlaneSizingField.h
@@ -1,7 +1,7 @@
 #ifndef PLANESIZINGFIELD_H
 #define PLANESIZINGFIELD_H
 
-#include <Cleaver/ScalarField.h>
+#include <cleaver/ScalarField.h>
 #include "PlaneField.h"
 
 class PlaneSizingField : public cleaver::FloatField

diff --git a/src/lib/synthetic/SphereField.h b/src/lib/synthetic/SphereField.h
@@ -1,8 +1,8 @@
 #ifndef SPHEREFIELD_H
 #define SPHEREFIELD_H
 
-#include <Cleaver/ScalarField.h>
-#include <Cleaver/BoundingBox.h>
+#include <cleaver/ScalarField.h>
+#include <cleaver/BoundingBox.h>
 
 class SphereSizingField;
 

diff --git a/src/lib/synthetic/SphereSizingField.h b/src/lib/synthetic/SphereSizingField.h
@@ -1,7 +1,7 @@
 #ifndef SPHERESIZINGFIELD_H
 #define SPHERESIZINGFIELD_H
 
-#include <Cleaver/ScalarField.h>
+#include <cleaver/ScalarField.h>
 #include "SphereField.h"
 
 class SphereSizingField : public cleaver::FloatField
@@ -19,4 +19,3 @@ class SphereSizingField : public cleaver::FloatField
 };
 
 #endif // SPHERESIZINGFIELD_H
-