From 469bdedbc4289831c1e4ca136e1a06a9e985bbc6 Mon Sep 17 00:00:00 2001 From: Chris Hennes Date: Sat, 22 Mar 2025 17:48:53 -0500 Subject: [PATCH] Navlib: Eliminate compiler warnings A few unused variables, and a few cases where clang would prefer it be made clear that an initializer is initializing two separate sub-objects, rather than using a flat list. --- .../3Dconnexion/navlib/NavlibNavigation.cpp | 24 +++++++++---------- src/Gui/3Dconnexion/navlib/NavlibPivot.cpp | 14 +++++------ 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/src/Gui/3Dconnexion/navlib/NavlibNavigation.cpp b/src/Gui/3Dconnexion/navlib/NavlibNavigation.cpp index a74c21fc1f..47a0219f9e 100644 --- a/src/Gui/3Dconnexion/navlib/NavlibNavigation.cpp +++ b/src/Gui/3Dconnexion/navlib/NavlibNavigation.cpp @@ -49,8 +49,8 @@ NavlibInterface::NavlibInterface() : CNavigation3D(false, navlib::nlOptions_t::no_ui), - patternInitialized(false), - activeTab({-1, ""}) + activeTab({-1, ""}), + patternInitialized(false) {} NavlibInterface::~NavlibInterface() @@ -304,7 +304,7 @@ long NavlibInterface::GetViewFrustum(navlib::frustum_t& frustum) const return 0; } -long NavlibInterface::SetViewFrustum(const navlib::frustum_t& frustum) +long NavlibInterface::SetViewFrustum(const navlib::frustum_t&) { return navlib::make_result_code(navlib::navlib_errc::no_data_available); } @@ -334,12 +334,12 @@ long NavlibInterface::GetViewExtents(navlib::box_t& extents) const const double halfWidth = static_cast(viewVolume.getWidth() / 2.0f); const double halfDepth = 1.0e8; - extents = {-halfWidth, - -halfHeight, - -halfDepth, - halfWidth, - halfHeight, - halfDepth}; + extents = {{-halfWidth, + -halfHeight, + -halfDepth}, + {halfWidth, + halfHeight, + halfDepth}}; return 0; } @@ -385,12 +385,12 @@ long NavlibInterface::SetViewExtents(const navlib::box_t& extents) return navlib::make_result_code(navlib::navlib_errc::no_data_available); } -long NavlibInterface::GetViewFOV(double& fov) const +long NavlibInterface::GetViewFOV(double&) const { return navlib::make_result_code(navlib::navlib_errc::no_data_available); } -long NavlibInterface::SetViewFOV(double fov) +long NavlibInterface::SetViewFOV(double) { return navlib::make_result_code(navlib::navlib_errc::no_data_available); } @@ -448,7 +448,7 @@ long NavlibInterface::GetModelExtents(navlib::box_t& extents) const return navlib::make_result_code(navlib::navlib_errc::no_data_available); } -long NavlibInterface::SetTransaction(long value) +long NavlibInterface::SetTransaction(long) { return navlib::make_result_code(navlib::navlib_errc::no_data_available); } diff --git a/src/Gui/3Dconnexion/navlib/NavlibPivot.cpp b/src/Gui/3Dconnexion/navlib/NavlibPivot.cpp index 9a08f21eaf..74a2848601 100644 --- a/src/Gui/3Dconnexion/navlib/NavlibPivot.cpp +++ b/src/Gui/3Dconnexion/navlib/NavlibPivot.cpp @@ -66,7 +66,7 @@ long NavlibInterface::SetSelectionTransform(const navlib::matrix_t&) return navlib::make_result_code(navlib::navlib_errc::no_data_available); } -long NavlibInterface::GetPivotPosition(navlib::point_t& position) const +long NavlibInterface::GetPivotPosition(navlib::point_t&) const { return navlib::make_result_code(navlib::navlib_errc::no_data_available); } @@ -223,12 +223,12 @@ long NavlibInterface::GetSelectionExtents(navlib::box_t& extents) const return 0l; }); - extents = {boundingBox.MinX, - boundingBox.MinY, - boundingBox.MinZ, - boundingBox.MaxX, - boundingBox.MaxY, - boundingBox.MaxZ}; + extents = {{boundingBox.MinX, + boundingBox.MinY, + boundingBox.MinZ}, + {boundingBox.MaxX, + boundingBox.MaxY, + boundingBox.MaxZ}}; return 0; }