Big-Ugly Style Update (#278)
* Bulk replaced tabs with spaces * Bulk removed trailing whitespace from lines * Replaced c-style comments with c++-style comments in file banners * Replace nested namespace definitions with single concise definitions (C++17), this keeps the indentation more manageable * Cleanup ordering and spacing of include directives * Bulk renaming of header file extensions from '.h' to '.hpp'. * Update CODING-STYLE.md * Update target_compile_features from cxx_std_11 to cxx_std_20. * Refresh .clang-format file. Still needs a lot of tweaking.
This commit is contained in:
+15
-15
@@ -14,8 +14,8 @@ endif ()
|
||||
# Sources
|
||||
#=======================================
|
||||
# Auto-generated files
|
||||
configure_file (Version.h.in ${CMAKE_CURRENT_BINARY_DIR}/Version.h @ONLY)
|
||||
configure_file (Config.h.in ${CMAKE_CURRENT_BINARY_DIR}/Config.h @ONLY)
|
||||
configure_file (Version.hpp.in ${CMAKE_CURRENT_BINARY_DIR}/Version.hpp @ONLY)
|
||||
configure_file (Config.hpp.in ${CMAKE_CURRENT_BINARY_DIR}/Config.hpp @ONLY)
|
||||
|
||||
set (Model_sources
|
||||
Category.cpp
|
||||
@@ -73,18 +73,18 @@ set (Model_sources
|
||||
)
|
||||
|
||||
set (Model_qobject_headers
|
||||
Model.h
|
||||
ModelObject.h
|
||||
ModelBarcodeObject.h
|
||||
ModelBoxObject.h
|
||||
ModelEllipseObject.h
|
||||
ModelImageObject.h
|
||||
ModelLineObject.h
|
||||
ModelShapeObject.h
|
||||
ModelTextObject.h
|
||||
PageRenderer.h
|
||||
Settings.h
|
||||
Variables.h
|
||||
Model.hpp
|
||||
ModelObject.hpp
|
||||
ModelBarcodeObject.hpp
|
||||
ModelBoxObject.hpp
|
||||
ModelEllipseObject.hpp
|
||||
ModelImageObject.hpp
|
||||
ModelLineObject.hpp
|
||||
ModelShapeObject.hpp
|
||||
ModelTextObject.hpp
|
||||
PageRenderer.hpp
|
||||
Settings.hpp
|
||||
Variables.hpp
|
||||
)
|
||||
|
||||
qt6_wrap_cpp (Model_moc_sources ${Model_qobject_headers})
|
||||
@@ -98,7 +98,7 @@ add_library (Model STATIC
|
||||
)
|
||||
|
||||
target_compile_features (Model
|
||||
PUBLIC cxx_std_11
|
||||
PUBLIC cxx_std_20
|
||||
)
|
||||
|
||||
target_include_directories (Model
|
||||
|
||||
Reference in New Issue
Block a user