From f3dcf4833c6d855c27b35307e5a41fa658378017 Mon Sep 17 00:00:00 2001 From: Blake-Madden <66873089+Blake-Madden@users.noreply.github.com> Date: Thu, 5 Sep 2024 19:38:11 -0400 Subject: [PATCH] Remove stray semicolons --- src/base/commonaxisbuilder.h | 4 ++-- src/base/fillableshape.h | 4 ++-- src/base/lines.h | 4 ++-- src/base/polygon.h | 4 ++-- src/base/reportbuilder.h | 7 +++---- src/base/reportenumconvert.h | 4 ++-- src/base/reportprintout.h | 4 ++-- src/base/shapes.h | 8 ++++---- src/import/text_column.h | 4 ++-- src/import/text_matrix.h | 4 ++-- src/math/mathematics.h | 8 ++++---- 11 files changed, 27 insertions(+), 28 deletions(-) diff --git a/src/base/commonaxisbuilder.h b/src/base/commonaxisbuilder.h index 0877b92c..5e27992e 100644 --- a/src/base/commonaxisbuilder.h +++ b/src/base/commonaxisbuilder.h @@ -103,8 +103,8 @@ namespace Wisteria BuildXAxis(Canvas* canvas, const std::vector>& graphs, AxisType axisType, const bool useCommonLeftAxis = false); }; - }; // namespace Wisteria + } // namespace Wisteria - /** @}*/ +/** @}*/ #endif //__WISTERIA_COMMON_AXIS_BUILDER_H__ diff --git a/src/base/fillableshape.h b/src/base/fillableshape.h index f16e8809..6a3c2c7c 100644 --- a/src/base/fillableshape.h +++ b/src/base/fillableshape.h @@ -61,8 +61,8 @@ namespace Wisteria::GraphItems private: double m_fillPercent{ math_constants::empty }; }; - }; // namespace Wisteria::GraphItems + } // namespace Wisteria::GraphItems - /** @}*/ +/** @}*/ #endif //__WISTERIA_FILLABLE_SHAPE_H__ diff --git a/src/base/lines.h b/src/base/lines.h index 00a2c83f..1a72ccf2 100644 --- a/src/base/lines.h +++ b/src/base/lines.h @@ -109,8 +109,8 @@ namespace Wisteria::GraphItems std::vector> m_lines; LineStyle m_lineStyle{ LineStyle::Lines }; }; - }; // namespace Wisteria::GraphItems + } // namespace Wisteria::GraphItems - /** @}*/ +/** @}*/ #endif //__WISTERIA_LINES_H__ diff --git a/src/base/polygon.h b/src/base/polygon.h index 7a73bb91..b65e675d 100644 --- a/src/base/polygon.h +++ b/src/base/polygon.h @@ -387,8 +387,8 @@ namespace Wisteria::GraphItems BoxCorners m_boxCorners{ BoxCorners::Straight }; PolygonShape m_polygonShape{ PolygonShape::Irregular }; }; - }; // namespace Wisteria::GraphItems + } // namespace Wisteria::GraphItems - /** @}*/ +/** @}*/ #endif //__WISTERIA_POLYGON_H__ diff --git a/src/base/reportbuilder.h b/src/base/reportbuilder.h index f21cb9bc..c5413d4c 100644 --- a/src/base/reportbuilder.h +++ b/src/base/reportbuilder.h @@ -116,8 +116,7 @@ namespace Wisteria /// @brief Loads the base properties for a graph item /// @param itemNode The JSON node to parse. /// @param item[in,out] The item to write the properties to. - void LoadItem(const wxSimpleJSON::Ptr_t& itemNode, - GraphItems::GraphItemBase& item); + void LoadItem(const wxSimpleJSON::Ptr_t& itemNode, GraphItems::GraphItemBase& item); /// @brief Finalizes loading options for a graph. /// @details This will load general graph options from a node, /// apply them to the graph, and add the graph (and possibly its legend) to the canvas. @@ -566,8 +565,8 @@ namespace Wisteria wxString m_configFilePath; }; - }; // namespace Wisteria + } // namespace Wisteria - /** @}*/ +/** @}*/ #endif //__WISTERIA_REPORT_BUILDER_H__ diff --git a/src/base/reportenumconvert.h b/src/base/reportenumconvert.h index 054a9055..51fb66b3 100644 --- a/src/base/reportenumconvert.h +++ b/src/base/reportenumconvert.h @@ -704,8 +704,8 @@ namespace Wisteria std::nullopt); } }; - }; // namespace Wisteria + } // namespace Wisteria - /** @}*/ +/** @}*/ #endif // __WISTERIA_ENUM_CONVERT_H__ diff --git a/src/base/reportprintout.h b/src/base/reportprintout.h index a3224993..0375ad4a 100644 --- a/src/base/reportprintout.h +++ b/src/base/reportprintout.h @@ -145,8 +145,8 @@ namespace Wisteria wxSize m_originalSize; bool m_sizeChanged{ false }; }; - }; // namespace Wisteria + } // namespace Wisteria - /** @}*/ +/** @}*/ #endif //__WISTERIA_REPORT_PRINTOUT_H__ diff --git a/src/base/shapes.h b/src/base/shapes.h index 9e80e176..8998abe2 100644 --- a/src/base/shapes.h +++ b/src/base/shapes.h @@ -454,8 +454,8 @@ namespace Wisteria::GraphItems @param shape The icon shape to draw. @param sz The size of the shape (in DIPs). @param img An image to use for the shape if using IconShape::ImageIcon.*/ - Shape(GraphItems::GraphItemInfo itemInfo, const Icons::IconShape shape, - const wxSize sz, const wxBitmapBundle* img = nullptr); + Shape(GraphItems::GraphItemInfo itemInfo, const Icons::IconShape shape, const wxSize sz, + const wxBitmapBundle* img = nullptr); /// @private Shape(const Shape&) = delete; /// @private @@ -546,8 +546,8 @@ namespace Wisteria::GraphItems mutable bool m_rendererNeedsUpdating{ true }; ShapeRenderer::DrawFunction m_drawFunction{ nullptr }; }; - }; // namespace Wisteria::GraphItems + } // namespace Wisteria::GraphItems - /** @}*/ +/** @}*/ #endif //__WISTERIA_SHAPES_H__ diff --git a/src/import/text_column.h b/src/import/text_column.h index 6b61d9f1..7d72618f 100644 --- a/src/import/text_column.h +++ b/src/import/text_column.h @@ -299,8 +299,8 @@ namespace lily_of_the_valley Tparser m_parser; std::optional m_repeat_count{ std::nullopt }; }; - }; // namespace lily_of_the_valley + } // namespace lily_of_the_valley - /** @}*/ +/** @}*/ #endif //__TEXT_COLUMN_H__ diff --git a/src/import/text_matrix.h b/src/import/text_matrix.h index b857d7ca..998f559f 100644 --- a/src/import/text_matrix.h +++ b/src/import/text_matrix.h @@ -343,8 +343,8 @@ namespace lily_of_the_valley is_end_of_line is_eol; std::optional> m_mdVals{ std::nullopt }; }; - }; // namespace lily_of_the_valley + } // namespace lily_of_the_valley - /** @}*/ +/** @}*/ #endif //__TEXT_MATRIX_H__ diff --git a/src/math/mathematics.h b/src/math/mathematics.h index feb39eda..cef48a48 100644 --- a/src/math/mathematics.h +++ b/src/math/mathematics.h @@ -21,12 +21,12 @@ #include #include #include -#include #include +#include /// @todo replace this when upgrading to C++20. #ifndef M_PI -#define M_PI 3.1415926535897932384626433832795 + #define M_PI 3.1415926535897932384626433832795 #endif /// @brief Math constants. @@ -970,8 +970,8 @@ namespace geometry return downscaled_size(adjustedSize, boundingSize); } } - }; // namespace geometry + } // namespace geometry - /** @}*/ +/** @}*/ #endif //__MATHEMATICS_H__