unify include styles

LiangliangNan · Jan 12, 2025 · 44a898f · 44a898f
1 parent cca93c1
commit 44a898f
Show file tree

Hide file tree

Showing 131 changed files with 395 additions and 397 deletions.
diff --git a/code/3rd_party/QGLViewer/CMakeLists.txt b/code/3rd_party/QGLViewer/CMakeLists.txt
@@ -36,6 +36,7 @@ set(QGLViewer_SRC
 add_library(${PROJECT_NAME} STATIC ${QGLViewer_SRC})
 set_target_properties(${PROJECT_NAME} PROPERTIES FOLDER "3rd_party")
 
+target_include_directories(${PROJECT_NAME} PRIVATE ${POLYFIT_INCLUDE_DIR})
 target_include_directories(${PROJECT_NAME} INTERFACE ${CMAKE_CURRENT_SOURCE_DIR})
 target_link_libraries(${PROJECT_NAME} PUBLIC ${QtLibs} OpenGL::GL OpenGL::GLU)
 

diff --git a/code/3rd_party/QGLViewer/QGLViewer/camera.h b/code/3rd_party/QGLViewer/QGLViewer/camera.h
@@ -1,7 +1,7 @@
 #ifndef QGLVIEWER_CAMERA_H
 #define QGLVIEWER_CAMERA_H
 
-#include "../../../basic/canvas.h"
+#include <basic/canvas.h>
 #include <QMap>
 #include "keyFrameInterpolator.h"
 class QGLViewer;

diff --git a/code/3rd_party/QGLViewer/QGLViewer/qglviewer.h b/code/3rd_party/QGLViewer/QGLViewer/qglviewer.h
@@ -2,7 +2,7 @@
 #define QGLVIEWER_QGLVIEWER_H
 
 #include "camera.h"
-#include "../../../basic/canvas.h"
+#include <basic/canvas.h>
 
 #include <QClipboard>
 #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)

diff --git a/code/Examples/Example_1_reconstruction_oneshot.cpp b/code/Examples/Example_1_reconstruction_oneshot.cpp
@@ -15,12 +15,12 @@
  */
 
 
-#include "../basic/logger.h"
-#include "../model/point_set.h"
-#include "../model/map.h"
-#include "../method/reconstruction.h"
-#include "../model/map_io.h"
-#include "../model/point_set_io.h"
+#include <basic/logger.h>
+#include <model/map.h>
+#include <model/map_io.h>
+#include <model/point_set.h>
+#include <model/point_set_io.h>
+#include <method/reconstruction.h>
 
 
 int main(int argc, char **argv)

diff --git a/code/Examples/Example_2_reconstruction_with_intermediate_steps.cpp b/code/Examples/Example_2_reconstruction_with_intermediate_steps.cpp
@@ -15,14 +15,13 @@
  */
 
 
-#include "../basic/logger.h"
-#include "../model/point_set.h"
-#include "../model/map.h"
-#include "../method/method_global.h"
-#include "../method/hypothesis_generator.h"
-#include "../method/face_selection.h"
-#include "../model/map_io.h"
-#include "../model/point_set_io.h"
+#include <basic/logger.h>
+#include <model/point_set.h>
+#include <model/map.h>
+#include <model/point_set_io.h>
+#include <model/map_io.h>
+#include <method/hypothesis_generator.h>
+#include <method/face_selection.h>
 
 
 int main(int argc, char **argv)

diff --git a/code/PolyFit/dlg/weight_panel_click.cpp b/code/PolyFit/dlg/weight_panel_click.cpp
@@ -20,8 +20,8 @@
 #include <QMouseEvent>
 #include <QMessageBox>
 
-#include "../math/math_types.h"
-#include "../method/method_global.h"
+#include <math/math_types.h>
+#include <method/method_global.h>
 #include "main_window.h"
 
 

diff --git a/code/PolyFit/dlg/weight_panel_manual.cpp b/code/PolyFit/dlg/weight_panel_manual.cpp
@@ -16,8 +16,8 @@
 
 #include "weight_panel_manual.h"
 
-#include "../math/math_types.h"
-#include "../method/method_global.h"
+#include <math/math_types.h>
+#include <method/method_global.h>
 
 #include "main_window.h"
 #include "paint_canvas.h"

diff --git a/code/PolyFit/dlg/wgt_render.cpp b/code/PolyFit/dlg/wgt_render.cpp
@@ -19,8 +19,8 @@
 #include <QColorDialog>
 #include <QFileDialog>
 
-#include "../renderer/surface_render.h"
-#include "../renderer/point_set_render.h"
+#include <renderer/surface_render.h>
+#include <renderer/point_set_render.h>
 
 #include "main_window.h"
 #include "paint_canvas.h"

diff --git a/code/PolyFit/main_window.cpp b/code/PolyFit/main_window.cpp
@@ -31,14 +31,14 @@
 #include "dlg/weight_panel_click.h"
 #include "dlg/weight_panel_manual.h"
 
-#include "../basic/file_utils.h"
-#include "../model/map_attributes.h"
-#include "../model/map_builder.h"
-#include "../model/map_io.h"
-#include "../model/map_enumerator.h"
-#include "../model/point_set_io.h"
-#include "../method/method_global.h"
-#include "../basic/attribute_serializer.h"
+#include <basic/file_utils.h>
+#include <model/map_attributes.h>
+#include <model/map_builder.h>
+#include <model/map_io.h>
+#include <model/map_enumerator.h>
+#include <model/point_set_io.h>
+#include <method/method_global.h>
+#include <basic/attribute_serializer.h>
 
 
 MainWindow::MainWindow(QWidget *parent)

diff --git a/code/PolyFit/main_window.h b/code/PolyFit/main_window.h
@@ -20,10 +20,10 @@
 
 #include <QMainWindow>
 
-#include "../math/math_types.h"
-#include "../basic/logger.h"
-#include "../basic/progress.h"
-#include "../math/linear_program_solver.h"
+#include <math/math_types.h>
+#include <basic/logger.h>
+#include <basic/progress.h>
+#include <math/linear_program_solver.h>
 
 #include "ui_main_window.h"
 

diff --git a/code/PolyFit/paint_canvas.cpp b/code/PolyFit/paint_canvas.cpp
@@ -21,17 +21,17 @@
 #include <QMessageBox>
 #include <QCoreApplication>
 
-#include "../3rd_party/QGLViewer/QGLViewer/manipulatedCameraFrame.h"
-#include "../basic/file_utils.h"
-#include "../basic/stop_watch.h"
-#include "../model/map_editor.h"
-#include "../model/map_geometry.h"
-#include "../renderer/opengl_info.h"
-#include "../renderer/surface_render.h"
-#include "../renderer/point_set_render.h"
-#include "../method/hypothesis_generator.h"
-#include "../method/face_selection.h"
-#include "../method/method_global.h"
+#include <3rd_party/QGLViewer/QGLViewer/manipulatedCameraFrame.h>
+#include <basic/file_utils.h>
+#include <basic/stop_watch.h>
+#include <model/map_editor.h>
+#include <model/map_geometry.h>
+#include <renderer/opengl_info.h>
+#include <renderer/surface_render.h>
+#include <renderer/point_set_render.h>
+#include <method/hypothesis_generator.h>
+#include <method/face_selection.h>
+#include <method/method_global.h>
 
 #include "main_window.h"
 

diff --git a/code/PolyFit/paint_canvas.h b/code/PolyFit/paint_canvas.h
@@ -17,13 +17,13 @@
 #ifndef PAINTCANVAS_H
 #define PAINTCANVAS_H
 
-#include <GL/glew.h>
+#include <3rd_party/glew/include/GL/glew.h>
 
-#include "../3rd_party/QGLViewer/QGLViewer/qglviewer.h"
-#include "../basic/color.h"
-#include "../math/math_types.h"
-#include "../model/point_set.h"
-#include "../model/map.h"
+#include <3rd_party/QGLViewer/QGLViewer/qglviewer.h>
+#include <basic/color.h>
+#include <math/math_types.h>
+#include <model/point_set.h>
+#include <model/map.h>
 
 class MainWindow;
 class SurfaceRender;

diff --git a/code/basic/assertions.cpp b/code/basic/assertions.cpp
@@ -36,8 +36,8 @@
 */
 
 
-#include "assertions.h"
-#include "logger.h"
+#include <basic/assertions.h>
+#include <basic/logger.h>
 
 #include <cstdlib>
 

diff --git a/code/basic/assertions.h b/code/basic/assertions.h
@@ -39,7 +39,7 @@
 #ifndef _BASIC_ASSERTION_H_
 #define _BASIC_ASSERTION_H_
 
-#include "basic_common.h"
+#include <basic/basic_common.h>
 #include <string>
 
 

diff --git a/code/basic/attribute.h b/code/basic/attribute.h
@@ -40,9 +40,9 @@
 #define ___ATTRIBUTE__
 
 
-#include "attribute_manager.h"
-#include "attribute_store.h"
-#include "attribute_life_cycle.h"
+#include <basic/attribute_manager.h>
+#include <basic/attribute_store.h>
+#include <basic/attribute_life_cycle.h>
 
 
 class /*BASIC_API*/ AttributeBase {

diff --git a/code/basic/attribute_adapter.cpp b/code/basic/attribute_adapter.cpp
@@ -36,7 +36,7 @@
 */
 
 
-#include "attribute_adapter.h"
+#include <basic/attribute_adapter.h>
 
 
 AttributeAdapterBase::SecondaryType AttributeAdapterBase::parse_name(std::string& name) {

diff --git a/code/basic/attribute_adapter.h b/code/basic/attribute_adapter.h
@@ -38,10 +38,10 @@
 #ifndef _ATTRIBUTE_ADAPTER_H_
 #define _ATTRIBUTE_ADAPTER_H_
 
-#include "basic_common.h"
-#include "attribute.h"
-#include "../basic/assertions.h"
-#include "../math/math_types.h"
+#include <basic/basic_common.h>
+#include <basic/attribute.h>
+#include <basic//assertions.h>
+#include <math/math_types.h>
 
 
 class BASIC_API AttributeAdapterBase {

diff --git a/code/basic/attribute_copier.h b/code/basic/attribute_copier.h
@@ -39,8 +39,8 @@
 #define ___ATTRIBUTE_COPIER__
 
 
-#include "attribute.h"
-#include "../basic/logger.h"
+#include <basic/attribute.h>
+#include <basic//logger.h>
 
 #include <string>
 #include <typeinfo>

diff --git a/code/basic/attribute_life_cycle.cpp b/code/basic/attribute_life_cycle.cpp
@@ -36,7 +36,7 @@
 */
 
 
-#include "attribute_life_cycle.h"
+#include <basic/attribute_life_cycle.h>
 
 
 void AttributeLifeCycle::virtual_construct(

diff --git a/code/basic/attribute_life_cycle.h b/code/basic/attribute_life_cycle.h
@@ -38,9 +38,9 @@
 #ifndef _ATTRIBUTE_LIFE_CYCLE_H_
 #define _ATTRIBUTE_LIFE_CYCLE_H_
 
-#include "basic_common.h"
-#include "../basic/counted.h"
-#include "../basic/smart_pointer.h"
+#include <basic/basic_common.h>
+#include <basic//counted.h>
+#include <basic//smart_pointer.h>
 
 #include <string.h>
 

diff --git a/code/basic/attribute_manager.cpp b/code/basic/attribute_manager.cpp
@@ -36,8 +36,8 @@
 */
 
 
-#include "attribute_manager.h"
-#include "../basic/logger.h"
+#include <basic/attribute_manager.h>
+#include <basic//logger.h>
 #include <typeinfo>
 
 

diff --git a/code/basic/attribute_manager.h b/code/basic/attribute_manager.h
@@ -38,9 +38,9 @@
 #ifndef _ATTRIBUTE_MANAGER_H_
 #define _ATTRIBUTE_MANAGER_H_
 
-#include "basic_common.h"
-#include "rat.h"
-#include "attribute_store.h"
+#include <basic/basic_common.h>
+#include <basic/rat.h>
+#include <basic/attribute_store.h>
 
 #include <set>
 #include <map>

diff --git a/code/basic/attribute_serializer.cpp b/code/basic/attribute_serializer.cpp
@@ -37,7 +37,7 @@
 
 
 
-#include "attribute_serializer.h"
+#include <basic/attribute_serializer.h>
 
 
 

diff --git a/code/basic/attribute_serializer.h b/code/basic/attribute_serializer.h
@@ -38,8 +38,8 @@
 #ifndef ___ATTRIBUTE_SERIALIZER__
 #define ___ATTRIBUTE_SERIALIZER__
 
-#include "basic_common.h"
-#include "attribute.h"
+#include <basic/basic_common.h>
+#include <basic/attribute.h>
 
 #include <map>
 #include <string>

diff --git a/code/basic/attribute_store.cpp b/code/basic/attribute_store.cpp
@@ -36,8 +36,8 @@
 */
 
 
-#include "attribute_store.h"
-#include "attribute_manager.h"
+#include <basic/attribute_store.h>
+#include <basic/attribute_manager.h>
 
 
 

diff --git a/code/basic/attribute_store.h b/code/basic/attribute_store.h
@@ -39,11 +39,11 @@
 #define _ATTRIBUTE_STORE_H_
 
 
-#include "basic_common.h"
-#include "raw_attribute_store.h"
-#include "attribute_life_cycle.h"
-#include "../basic/smart_pointer.h"
-#include "../basic/counted.h"
+#include <basic/basic_common.h>
+#include <basic/raw_attribute_store.h>
+#include <basic/attribute_life_cycle.h>
+#include <basic//smart_pointer.h>
+#include <basic//counted.h>
 
 #include <typeinfo>
 

diff --git a/code/basic/basic_types.cpp b/code/basic/basic_types.cpp
@@ -36,7 +36,7 @@
 */
 
 
-#include "basic_types.h"
+#include <basic/basic_types.h>
 
 #include <cmath>
 #include <cctype>

diff --git a/code/basic/basic_types.h b/code/basic/basic_types.h
@@ -38,7 +38,7 @@
 #ifndef _BASIC_TYPES_H_
 #define _BASIC_TYPES_H_
 
-#include "basic_common.h"
+#include <basic/basic_common.h>
 #include <string>
 #include <vector>
 

diff --git a/code/basic/canvas.h b/code/basic/canvas.h
@@ -1,7 +1,7 @@
 #ifndef _BASIC_CANVAS_H_
 #define _BASIC_CANVAS_H_
 
-#include "basic_common.h"
+#include <basic/basic_common.h>
 #include <string>
 
 class Map;

diff --git a/code/basic/color.h b/code/basic/color.h
@@ -38,8 +38,8 @@
 *     Qt, SuperLU, WildMagic and CGAL
 */
 
-#include "../basic/basic_types.h"
-#include "../basic/assertions.h"
+#include <basic//basic_types.h>
+#include <basic//assertions.h>
 
 #include <cassert>
 #include <iostream>

diff --git a/code/basic/counted.cpp b/code/basic/counted.cpp
@@ -36,7 +36,7 @@
 */
 
 
-#include "counted.h"
+#include <basic/counted.h>
-Original file line number
+Diff line change
@@ Expand Up / @@ -36,7 +36,7 @@ @@
     */
-    #include "attribute_adapter.h"
+    #include <basic/attribute_adapter.h>
     AttributeAdapterBase::SecondaryType AttributeAdapterBase::parse_name(std::string& name) {
@@ Expand Down @@
Original file line number	Diff line number	Diff line change
Expand Up		@@ -37,7 +37,7 @@



		#include "attribute_serializer.h"
		#include <basic/attribute_serializer.h>



Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -36,7 +36,7 @@
		*/


		#include "counted.h"
		#include <basic/counted.h>



Expand Down